Release 2.11.1

Fix #771

.github/label-commenter-config.yml

@@ -86,7 +86,7 @@ labels:
           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 targets the [`docs/wiki`](https://github.com/PlaceholderAPI/PlaceholderAPI/tree/docs/wiki) branch of the Repository.
+          - The Pull request is based on AND targets the [`docs/wiki`](https://github.com/PlaceholderAPI/PlaceholderAPI/tree/docs/wiki) branch of the Repository.
           - You only made changes to the files inside the [`wiki`](https://github.com/PlaceholderAPI/PlaceholderAPI/tree/docs/wiki/wiki) folder.
           - You followed the general Styling Guidelines mentioned in the wiki's [README](https://github.com/PlaceholderAPI/PlaceholderAPI/blob/docs/wiki/wiki/README.md) file.
           

.github/release.yml

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

.github/workflows/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

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

README.md

@@ -15,7 +15,7 @@
 [ciImg]: http://ci.extendedclip.com/buildStatus/icon?job=PlaceholderAPI
 
 [APIversionImg]: https://img.shields.io/nexus/placeholderapi/me.clip/placeholderapi?server=https%3A%2F%2Frepo.extendedclip.com&label=API%20Version
-[logo]: https://i.imgur.com/Ea4PURv.png
+[logo]: https://raw.githubusercontent.com/PlaceholderAPI/PlaceholderAPI/master/wiki/img/papi-logo.png
 
 [contributing]: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/.github/CONTRIBUTING.md
 [placeholderexpansion]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki/PlaceholderExpansion
@@ -30,7 +30,7 @@
 
 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 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.
+PlaceholderAPI has been downloaded over 750,000 times and has been used concurrently on over 35,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.

build.gradle

@@ -3,12 +3,12 @@ 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"
+    id "org.cadixdev.licenser" version "0.6.1"
+    id "com.github.johnrengelman.shadow" version "7.1.0"
 }
 
 group "me.clip"
-version "2.10.10-DEV-${System.getProperty("BUILD_NUMBER")}"
+version "2.11.1"
 
 description "An awesome placeholder provider!"
 
@@ -18,23 +18,22 @@ repositories {
     mavenCentral()
     mavenLocal()
 
-    maven({ url = "https://repo.codemc.org/repository/maven-public" })
+    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.1"
 
-    implementation "net.kyori:adventure-platform-bukkit:4.0.0-SNAPSHOT"
+    compileOnly "org.spigotmc:spigot-api:1.18-R0.1-SNAPSHOT"
+    compileOnly "org.jetbrains:annotations:22.0.0"
 
-    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.32"
+    testImplementation "org.openjdk.jmh:jmh-generator-annprocess:1.32"
 
-    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"
+    testImplementation "org.junit.jupiter:junit-jupiter-engine:5.8.2"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.1"
 }
 
 processResources {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright <20> 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions <20>$var<61>, <20>${var}<7D>, <20>${var:-default}<7D>, <20>${var+SET}<7D>,
+#           <20>${var#prefix}<7D>, <20>${var%suffix}<7D>, and <20>$( cmd )<29>;
+#         * compound commands having a testable exit status, especially <20>case<73>;
+#         * various built-in commands including <20>command<6E>, <20>set<65>, and <20>ulimit<69>.
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -81,7 +81,7 @@ public final class PlaceholderAPI {
    */
   @NotNull
   public static List<String> setPlaceholders(final OfflinePlayer player,
-      @NotNull final List<@NotNull String> text) {
+      @NotNull final List<String> text) {
     return text.stream().map(line -> setPlaceholders(player, line)).collect(Collectors.toList());
   }
 
@@ -136,7 +136,7 @@ public final class PlaceholderAPI {
    */
   @NotNull
   public static List<String> setBracketPlaceholders(final OfflinePlayer player,
-      @NotNull final List<@NotNull String> text) {
+      @NotNull final List<String> text) {
     return text.stream().map(line -> setBracketPlaceholders(player, line))
         .collect(Collectors.toList());
   }
@@ -292,14 +292,14 @@ public final class PlaceholderAPI {
   // === Deprecated API ===
 
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static boolean registerExpansion(PlaceholderExpansion expansion)
   {
     return expansion.register();
   }
 
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static boolean unregisterExpansion(PlaceholderExpansion expansion)
   {
     return expansion.unregister();
@@ -313,7 +313,7 @@ public final class PlaceholderAPI {
    * @return Map of registered placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static Map<String, PlaceholderHook> getPlaceholders() {
     return PlaceholderAPIPlugin.getInstance().getLocalExpansionManager()
         .getExpansions().stream()
@@ -329,7 +329,7 @@ public final class PlaceholderAPI {
    * @return always false
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static boolean registerPlaceholderHook(Plugin plugin, PlaceholderHook placeholderHook) {
     PlaceholderAPIPlugin.getInstance().getLogger().warning(plugin.getName()
         + " is attempting to register placeholders via a PlaceholderHook class which is no longer supported!"
@@ -347,7 +347,7 @@ public final class PlaceholderAPI {
    * @return always false
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static boolean registerPlaceholderHook(String identifier,
       PlaceholderHook placeholderHook) {
     PlaceholderAPIPlugin.getInstance().getLogger().warning(identifier
@@ -363,7 +363,7 @@ public final class PlaceholderAPI {
    * @return always false
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static boolean unregisterPlaceholderHook(Plugin plugin) {
     PlaceholderAPIPlugin.getInstance().getLogger().warning(plugin.getName()
         + " is attempting to unregister placeholders via the PlaceholderAPI class which is no longer supported!"
@@ -380,7 +380,7 @@ public final class PlaceholderAPI {
    * @return always false
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static boolean unregisterPlaceholderHook(String identifier) {
     PlaceholderAPIPlugin.getInstance().getLogger().warning(identifier
         + " is attempting to unregister placeholders through the PlaceholderAPI class which is no longer supported!");
@@ -393,7 +393,7 @@ public final class PlaceholderAPI {
    * @return Set of registered identifiers
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static Set<String> getRegisteredPlaceholderPlugins() {
     return getRegisteredIdentifiers();
   }
@@ -404,7 +404,7 @@ public final class PlaceholderAPI {
    * @return always null
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static Set<String> getExternalPlaceholderPlugins() {
     return null;
   }
@@ -419,7 +419,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static String setPlaceholders(OfflinePlayer player,
       String text, Pattern pattern, boolean colorize) {
     return setPlaceholders(player, text);
@@ -435,7 +435,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static List<String> setPlaceholders(OfflinePlayer player,
       List<String> text, Pattern pattern, boolean colorize) {
     return setPlaceholders(player, text);
@@ -450,7 +450,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static List<String> setPlaceholders(OfflinePlayer player, List<String> text,
       boolean colorize) {
     return setPlaceholders(player, text);
@@ -465,7 +465,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static List<String> setPlaceholders(OfflinePlayer player, List<String> text,
       Pattern pattern) {
     return setPlaceholders(player, text);
@@ -479,7 +479,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static String setPlaceholders(Player player, String text, boolean colorize) {
     return setPlaceholders(player, text);
   }
@@ -493,7 +493,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static List<String> setPlaceholders(Player player, List<String> text, boolean colorize) {
     return setPlaceholders(player, text);
   }
@@ -507,7 +507,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static String setPlaceholders(OfflinePlayer player, String text, boolean colorize) {
     return setPlaceholders(player, text);
   }
@@ -521,7 +521,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static String setPlaceholders(OfflinePlayer player, String text, Pattern pattern) {
     return setPlaceholders(player, text);
   }
@@ -535,7 +535,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static List<String> setBracketPlaceholders(OfflinePlayer player, List<String> text,
       boolean colorize) {
     return setBracketPlaceholders(player, text);
@@ -550,7 +550,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static String setBracketPlaceholders(OfflinePlayer player, String text, boolean colorize) {
     return setBracketPlaceholders(player, text);
   }
@@ -564,7 +564,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static String setBracketPlaceholders(Player player, String text, boolean colorize) {
     return setBracketPlaceholders(player, text);
   }
@@ -578,7 +578,7 @@ public final class PlaceholderAPI {
    * @return String with the parsed placeholders
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static List<String> setBracketPlaceholders(Player player, List<String> text,
       boolean colorize) {
     return setBracketPlaceholders(player, text);
@@ -596,7 +596,7 @@ public final class PlaceholderAPI {
    * @deprecated Use {@link #setPlaceholders(OfflinePlayer, String)} instead.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static String setRelationalPlaceholders(Player one, Player two, String text,
       boolean colorize) {
     return setRelationalPlaceholders(one, two, text);
@@ -614,7 +614,7 @@ public final class PlaceholderAPI {
    * @deprecated Use {@link #setRelationalPlaceholders(Player, Player, List)} instead.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public static List<String> setRelationalPlaceholders(Player one, Player two, List<String> text,
       boolean colorize) {
     return setRelationalPlaceholders(one, two, text);

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -33,7 +33,6 @@ import me.clip.placeholderapi.expansion.manager.LocalExpansionManager;
 import me.clip.placeholderapi.listeners.ServerLoadEventListener;
 import me.clip.placeholderapi.updatechecker.UpdateChecker;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
-import net.kyori.adventure.text.serializer.craftbukkit.MinecraftComponentSerializer;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.AdvancedPie;
 import org.bstats.charts.SimplePie;
@@ -249,7 +248,7 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
     try {
       Class.forName("org.bukkit.event.server.ServerLoadEvent");
       new ServerLoadEventListener(this);
-    } catch (final ExceptionInInitializerError | ClassNotFoundException ignored) {
+    } catch (final ClassNotFoundException ignored) {
       Bukkit.getScheduler()
           .runTaskLater(this, () -> getLocalExpansionManager().load(Bukkit.getConsoleSender()), 1);
     }

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -23,9 +23,10 @@ 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) player, params);
@@ -34,6 +35,7 @@ public abstract class PlaceholderHook {
     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

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

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -31,15 +31,7 @@ import java.util.Map;
 import java.util.stream.Stream;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.commands.impl.cloud.CommandECloud;
-import me.clip.placeholderapi.commands.impl.local.CommandDump;
-import me.clip.placeholderapi.commands.impl.local.CommandExpansionRegister;
-import me.clip.placeholderapi.commands.impl.local.CommandExpansionUnregister;
-import me.clip.placeholderapi.commands.impl.local.CommandHelp;
-import me.clip.placeholderapi.commands.impl.local.CommandInfo;
-import me.clip.placeholderapi.commands.impl.local.CommandList;
-import me.clip.placeholderapi.commands.impl.local.CommandParse;
-import me.clip.placeholderapi.commands.impl.local.CommandReload;
-import me.clip.placeholderapi.commands.impl.local.CommandVersion;
+import me.clip.placeholderapi.commands.impl.local.*;
 import me.clip.placeholderapi.util.Msg;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -179,6 +179,10 @@ public final class CommandDump extends PlaceholderCommand {
         .append(plugin.getServer().getBukkitVersion())
         .append('/')
         .append(plugin.getServer().getVersion())
+        .append("\n");
+
+    builder.append("Java Version: ")
+        .append(System.getProperty("java.version"))
         .append("\n\n");
 
     builder.append("Plugin Info:")

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -27,8 +27,11 @@ import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Indicates that a {@link PlaceholderExpansion} has been registered by
- * PlaceholderAPI.
+ * This event indicates that a <b>single</b> {@link PlaceholderExpansion PlaceholderExpansion} has
+ * been registered in PlaceholderAPI.
+ * 
+ * <p>To know when <b>all</b> Expansions have been registered, use the
+ * {@link me.clip.placeholderapi.events.ExpansionsLoadedEvent ExpansionsLoadedEvent} instead.
  */
 public final class ExpansionRegisterEvent extends Event implements Cancellable {
 
@@ -48,15 +51,25 @@ public final class ExpansionRegisterEvent extends Event implements Cancellable {
   }
   
   /**
-   * The {@link PlaceholderExpansion expansion} that was registered.
+   * The {@link PlaceholderExpansion PlaceholderExpansion} that was registered in PlaceholderAPI.
+   * <br>The PlaceholderExpansion will be available for use when the event
+   * {@link #isCancelled() was not cancelled}!
    * 
-   * @return The {@link PlaceholderExpansion} instance.
+   * @return Current instance of the registered {@link PlaceholderExpansion PlaceholderExpansion}
    */
   @NotNull
   public PlaceholderExpansion getExpansion() {
     return expansion;
   }
 
+  /**
+   * Indicates if this event was cancelled or not.
+   * <br>A cancelled Event will result in the {@link #getExpansion() PlaceholderExpansion} NOT
+   * being added to PlaceholderAPI's internal list and will therefore be considered not registered
+   * anymore.
+   * 
+   * @return Whether the event has been cancelled or not.
+   */
   @Override
   public boolean isCancelled() {
     return cancelled;

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -26,15 +26,19 @@ import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Indicates that a {@link PlaceholderExpansion} had been unregistered by
- * PlaceholderAPI.
+ * This event indicates that a {@link PlaceholderExpansion PlaceholderExpansion} has been
+ * unregistered by PlaceholderAPI.
+ * 
+ * <p>Note that this event is triggered <b>before</b> the PlaceholderExpansion is completely
+ * removed.
+ * <br>This includes removing any Listeners, stopping active tasks and clearing the cache of
+ * the PlaceholderExpansion.
  */
 public final class ExpansionUnregisterEvent extends Event {
 
   @NotNull
   private static final HandlerList HANDLERS = new HandlerList();
-
-
+  
   @NotNull
   private final PlaceholderExpansion expansion;
 
@@ -48,9 +52,9 @@ public final class ExpansionUnregisterEvent extends Event {
   }
   
   /**
-   * The {@link PlaceholderExpansion expansion} that was unregistered.
+   * The {@link PlaceholderExpansion PlaceholderExpansion} that was unregistered.
    * 
-   * @return The {@link PlaceholderExpansion} instance.
+   * @return The {@link PlaceholderExpansion PlaceholderExpansion} instance.
    */
   @NotNull
   public PlaceholderExpansion getExpansion() {

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -21,18 +21,42 @@
 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;
 
 /**
- * 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.
+ * This event indicated that <b>all</b> {@link PlaceholderExpansion PlaceholderExpansions} have
+ * been registered in PlaceholderAPI and can now be used.
+ * <br>This even will also be triggered whenever PlaceholderAPI gets reloaded.
+ * 
+ * <p>All PlaceholderExpansions, except for those loaded by plugins, are loaded
+ * after Spigot triggered its ServerLoadEvent (1.13+), or after PlaceholderAPI has been enabled.
  */
 public class ExpansionsLoadedEvent extends Event {
+    
+    private final List<PlaceholderExpansion> expansions;
+    
+    public ExpansionsLoadedEvent(List<PlaceholderExpansion> expansions) {
+        this.expansions = Collections.unmodifiableList(expansions);
+    }
 
+    /**
+     * Returns a unmodifiable list of {@link PlaceholderExpansion PlaceholderExpansions} that
+     * have been registered by PlaceholderAPI.
+     * 
+     * <p><b>This list does not include manually registered PlaceholderExpansions.</b>
+     * 
+     * @return List of {@link PlaceholderExpansion registered PlaceholderExpansions}.
+     */
+    @NotNull
+    public final List<PlaceholderExpansion> getExpansions(){
+        return expansions;
+    }
+    
     @NotNull
     private static final HandlerList HANDLERS = new HandlerList();
 

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

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

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

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

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -21,9 +21,11 @@
 package me.clip.placeholderapi.expansion;
 
 /**
- * This interface allows a class which extends a {@link PlaceholderExpansion} to have the clear
- * method called when the implementing expansion is unregistered from PlaceholderAPI. This is useful
- * if we want to do things when the implementing hook is unregistered
+ * Classes implementing this interface will have a {@link #clear() clear void} that is called
+ * by PlaceholderAPI whenever the {@link me.clip.placeholderapi.expansion.PlaceholderExpansion PlaceholderExpansion}
+ * is unregistered.
+ * 
+ * <p>This allows you to execute things such as clearing internal caches, saving data to files, etc.
  *
  * @author Ryan McCarthy
  */

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -23,9 +23,11 @@ package me.clip.placeholderapi.expansion;
 import org.bukkit.entity.Player;
 
 /**
- * This interface allows a class which extends a {@link PlaceholderExpansion} to have the cleanup
- * method called every time a player leaves the server. This is useful if we want to clean up after
- * the player
+ * Classes implementing this interface will have a {@link #cleanup(Player) cleanup void} that is
+ * called by PlaceholderAPI whenever a Player leaves the server.
+ * 
+ * <p>This can be useful for cases where you keep data of the player in a cache or similar
+ * and want to free up space whenever they leave.
  *
  * @author Ryan McCarthy
  */

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -23,18 +23,32 @@ package me.clip.placeholderapi.expansion;
 import java.util.Map;
 
 /**
- * Any {@link PlaceholderExpansion} class which implements configurable will have any options listed
- * in the {@link #getDefaults()} map automatically added to the PlaceholderAPI config.yml file
+ * Implementing this interface allows {@link me.clip.placeholderapi.expansion.PlaceholderExpansion PlaceholderExpansions}
+ * to set a list of default configuration values through the {@link #getDefaults() getDefaults method}
+ * that should be added to the config.yml of PlaceholderAPI.
+ * 
+ * <p>The entries will be added under {@code expansions} as their own section.
+ * <h2>Example:</h2>
+ * returning a Map with key {@code foo} and value {@code bar} will result in the following config entry:
+ * 
+ * <pre><code>
+ * expansions:
+ *   myexpansion:
+ *     foo: "bar"
+ * </code></pre>
+ * 
+ * <p><b>The configuration is set before the PlaceholderExpansion is registered!</b>
  *
  * @author Ryan McCarthy
  */
 public interface Configurable {
 
   /**
-   * This method will be called before the implementing class is registered to obtain a map of
-   * configuration options that the implementing class needs These paths and values will be added to
-   * the PlaceholderAPI config.yml in the configuration section expansions.(placeholder
-   * identifier).(your key): (your value)
+   * The map returned by this method will be used to set config options in PlaceholderAPI's config.yml.
+   * 
+   * <p>The key and value pairs are set under a section named after your
+   * {@link me.clip.placeholderapi.expansion.PlaceholderExpansion PlaceholderExpansion} in the
+   * {@code expansions} section of the config.
    *
    * @return Map of config path / values which need to be added / removed from the PlaceholderAPI
    * config.yml file

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -42,7 +42,8 @@ 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_17_R1("v1_17_R1"),
+  SPIGOT_1_18_R1("v1_18_R1");
 
   private final String version;
 

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -22,6 +22,7 @@ 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;
@@ -275,7 +276,6 @@ 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);
@@ -293,6 +293,71 @@ 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.
@@ -341,7 +406,7 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
    * @return The plugin name.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public String getPlugin() {
     return null;
   }
@@ -352,7 +417,7 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
    * @return The description of the expansion.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public String getDescription() {
     return null;
   }
@@ -363,7 +428,7 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
    * @return The link for the expansion.
    */
   @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2.11.0")
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.13.0")
   public String getLink() {
     return null;
   }

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -22,7 +22,22 @@ 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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -20,18 +20,24 @@
 
 package me.clip.placeholderapi.expansion;
 
-
+/**
+ * Implementing this interface adds the {@link #start() start} and {@link #stop() stop} void
+ * methods to your {@link me.clip.placeholderapi.expansion.PlaceholderExpansion PlaceholderExpansion}.
+ * 
+ * <p>This can be used to execute methods and tasks whenever the PlaceholderExpansion has been
+ * successfully (un)registered.
+ */
 public interface Taskable {
 
   /**
-   * Called when the implementing class has successfully been registered to the placeholder map
-   * Tasks that need to be performed when this expansion is registered should go here
+   * Called when the implementing class has successfully been registered to the placeholder map.
+   * <br>Tasks that need to be performed when this expansion is registered should go here
    */
   void start();
 
   /**
-   * Called when the implementing class has been unregistered from PlaceholderAPI Tasks that need to
-   * be performed when this expansion has unregistered should go here
+   * Called when the implementing class has been unregistered from PlaceholderAPI.
+   * <br>Tasks that need to be performed when this expansion has unregistered should go here
    */
   void stop();
 }

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

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

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

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

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

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

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

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

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -160,7 +160,11 @@ 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!");
@@ -259,7 +263,8 @@ public final class LocalExpansionManager implements Listener {
       Bukkit.getPluginManager().registerEvents(((Listener) expansion), plugin);
     }
 
-    plugin.getLogger().info("Successfully registered expansion: " + expansion.getIdentifier());
+    plugin.getLogger().info("Successfully registered expansion: " + expansion.getIdentifier() + 
+        " [" + expansion.getVersion() + "]");
 
     if (expansion instanceof Taskable) {
       ((Taskable) expansion).start();
@@ -319,18 +324,37 @@ public final class LocalExpansionManager implements Listener {
         plugin.getLogger().log(Level.SEVERE, "failed to load class files of expansions", exception);
         return;
       }
-
-      final long registered = classes.stream()
+      
+      final List<PlaceholderExpansion> registered = classes.stream()
           .filter(Objects::nonNull)
           .map(this::register)
           .filter(Optional::isPresent)
+          .map(Optional::get)
+          .collect(Collectors.toList());
+
+      final long needsUpdate = registered.stream()
+          .map(expansion -> plugin.getCloudExpansionManager().findCloudExpansionByName(expansion.getName()).orElse(null))
+          .filter(Objects::nonNull)
+          .filter(CloudExpansion::shouldUpdate)
           .count();
 
-      Msg.msg(sender,
-          registered == 0 ? "&6No expansions were registered!"
-              : registered + "&a placeholder hooks successfully registered!");
+      StringBuilder message = new StringBuilder(registered.size() == 0 ? "&6" : "&a")
+          .append(registered.size())
+          .append(' ')
+          .append("placeholder hook(s) registered!");
+      
+      if (needsUpdate > 0) {
+        message.append(' ')
+            .append("&6")
+            .append(needsUpdate)
+            .append(' ')
+            .append("placeholder hook(s) have an update available.");
+      }
+      
+      
+      Msg.msg(sender, message.toString());
 
-      Bukkit.getPluginManager().callEvent(new ExpansionsLoadedEvent());
+      Bukkit.getPluginManager().callEvent(new ExpansionsLoadedEvent(registered));
     });
   }
 
@@ -346,7 +370,12 @@ public final class LocalExpansionManager implements Listener {
 
   @NotNull
   public CompletableFuture<@NotNull List<@Nullable Class<? extends PlaceholderExpansion>>> findExpansionsOnDisk() {
-    return Arrays.stream(folder.listFiles((dir, name) -> name.endsWith(".jar")))
+    File[] files = folder.listFiles((dir, name) -> name.endsWith(".jar"));
+    if(files == null){
+      return CompletableFuture.completedFuture(Collections.emptyList());
+    }
+    
+    return Arrays.stream(files)
         .map(this::findExpansionInFile)
         .collect(Futures.collector());
   }

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

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

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -39,16 +39,6 @@ public final class ServerLoadEventListener implements Listener {
     Bukkit.getPluginManager().registerEvents(this, plugin);
   }
 
-  /**
-   * This method will be called when the server is first loaded
-   * <p>
-   * The goal of the method is to register all the expansions as soon as possible especially before
-   * players can join
-   * <p>
-   * This will ensure no issues with expansions and hooks.
-   *
-   * @param event the server load event
-   */
   @EventHandler
   public void onServerLoad(@NotNull final ServerLoadEvent event) {
     HandlerList.unregisterAll(this);

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -126,7 +126,8 @@ public final class CharsReplacer implements Replacer {
         }
       }
 
-      final String identifierString = identifier.toString().toLowerCase();
+      final String identifierString = identifier.toString();
+      final String lowercaseIdentifierString = identifierString.toLowerCase();
       final String parametersString = parameters.toString();
 
       identifier.setLength(0);
@@ -145,9 +146,9 @@ public final class CharsReplacer implements Replacer {
         continue;
       }
 
-      final PlaceholderExpansion placeholder = lookup.apply(identifierString);
+      final PlaceholderExpansion placeholder = lookup.apply(lowercaseIdentifierString);
       if (placeholder == null) {
-        builder.append(closure.head).append(identifierString);
+        builder.append(closure.head).append(lowercaseIdentifierString);
 
         if (identified) {
           builder.append('_');
@@ -159,7 +160,7 @@ public final class CharsReplacer implements Replacer {
 
       final String replacement = placeholder.onRequest(player, parametersString);
       if (replacement == null) {
-        builder.append(closure.head).append(identifierString);
+        builder.append(closure.head).append(lowercaseIdentifierString);
 
         if (identified) {
           builder.append('_');

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

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

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

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

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

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

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

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

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

@@ -4,7 +4,7 @@
  * PlaceholderAPI
  * Copyright (c) 2015 - 2021 PlaceholderAPI Team
  *
- * PlaceholderAPI is free software: you can redistribute it and/or modify
+ * PlaceholderAPI free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -50,7 +50,7 @@ public final class Format {
   }
 
   @NotNull
-  private static String buildFormat(@NotNull final Align align, @NotNull final int[] spacing) {
+  private static String buildFormat(@NotNull final Align align, final int[] spacing) {
     return stream(spacing)
         .mapToObj(space -> "%" + (align == Align.LEFT ? "-" : "") + (space + 2) + "s")
         .collect(joining());

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

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

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

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

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

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

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

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

wiki/Commands.md

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

wiki/Home.md

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

wiki/PlaceholderExpansion.md

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

wiki/Plugins-using-PlaceholderAPI.md

@@ -41,9 +41,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[Advanced Abilities](https://www.spigotmc.org/resources/21983/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#advanced-abilities]]**]
-- **[Advanced Achievements](https://www.spigotmc.org/resources/6239/)**
-  - [x] Supports placeholders.
-  - [ ] Provides own placeholders. [Link]
+- **[Advanced Achievements](https://www.spigotmc.org/resources/83466/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#advanced-achievements]]**]
 - **[AdvancedAFK](https://www.spigotmc.org/resources/60761/)**
   - [x] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#advancedafk]]**]
@@ -461,6 +461,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 
 ----
 ## L
+- **[Lands](https://www.spigotmc.org/resources/53313/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#lands]]**]
 - **[LastLoginAPI](https://www.spigotmc.org/resources/66348/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#lastloginapi]]**]
@@ -476,6 +479,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[LemonMobCoins](https://www.spigotmc.org/resources/59402/)**
   - [x] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#lemonmobcoins]]**]
+- **[LevelledMobs](https://www.spigotmc.org/resources/levelledmobs-for-1-14-x-1-17-x.74304/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#levelledmobs]]**]
 - **[LuckPerms](https://www.spigotmc.org/resources/28140/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#luckperms]]**]
@@ -581,9 +587,15 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[OnTime](http://dev.bukkit.org/bukkit-plugins/ontime/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#ontime]]**]
+- **[OpEconomy](https://www.spigotmc.org/resources/95674)**
+  - [x] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#opeconomy]]**]
 - **[OreAnnouncer](https://www.spigotmc.org/resources/33464/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#oreannouncer]]**]
+- **[OreMarket](https://www.spigotmc.org/resources/91015/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#oremarket]]**]
 - **[Outpost](https://www.spigotmc.org/resources/38657/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#outpost]]**]
@@ -730,7 +742,7 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
   - [x] Supports placeholders.
   - [ ] Provides own placeholders. [Link]
 - **[RocketPlaceholders](https://www.spigotmc.org/resources/82678/)**
-  - [ ] Supports placeholders.
+  - [x] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#rocketplaceholders]]**]
 - **[RogueParkour](https://www.spigotmc.org/resources/26563/)**
   - [ ] Supports placeholders.
@@ -747,6 +759,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[RPGInventory](https://www.spigotmc.org/resources/12498/)**
   - [x] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#rpginventory]]**]
+- **[RTP](https://www.spigotmc.org/resources/94812/)**
+  - [x] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#rtp]]**]
 
 ----
 ## S
@@ -834,6 +849,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[Staff Facilities](https://www.spigotmc.org/resources/13097/)**
   - [x] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#staff-facilities]]**]
+- **[Staff++](https://www.spigotmc.org/resources/staff.83562/)**
+  - [x] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#staffplusplus]]**]
 - **[Statz](https://www.spigotmc.org/resources/25969/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#statz]]**]
@@ -900,6 +918,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[Tokens](https://www.spigotmc.org/resources/71941/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#tokens]]**]
+- **[TokensPlus](https://www.spigotmc.org/resources/90507/)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#tokensplus]]**]
 - **[Towny](https://github.com/TownyAdvanced/Towny)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#towny]]**]
@@ -921,6 +942,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[TrickOrTreat](https://www.spigotmc.org/resources/61370/)**
   - [x] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#trickortreat]]**]
+- **[Two Factor Authentication](https://www.spigotmc.org/resources/85594/)**
+  - [x] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#twofactorauthentication]]**]
 
 ----
 ## U
@@ -933,6 +957,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[UltimateBossBar](https://www.spigotmc.org/resources/19303/)**
   - [x] Supports placeholders.
   - [ ] Provides own placeholders.
+- **[UltimateClaims](https://songoda.com/marketplace/product/65)**
+  - [ ] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#ultimateclaims]]**]
 - **[UltimateSigns](https://www.spigotmc.org/resources/72462/)**
   - [x] Supports placeholders.
   - [ ] Provides own placeholders.
@@ -972,6 +999,9 @@ If your plugin isn't shown here and you want it to be added, [open an issue](/Pl
 - **[VentureChat](https://www.spigotmc.org/resources/771/)**
   - [x] Supports placeholders.
   - [ ] Provides own placeholders. [Link]
+- **[VenturahCalendar](https://www.spigotmc.org/resources/94096/)**
+  - [x] Supports placeholders.
+  - [x] Provides own placeholders. [**[[Link|Placeholders#venturacalendar]]**]
 - **[ViaVersion](https://www.spigotmc.org/resources/19254/)**
   - [ ] Supports placeholders.
   - [x] Provides own placeholders. [**[[Link|Placeholders#viaversion]]**]

wiki/README.md

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

wiki/_Sidebar.md

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