Merge pull request #63 from Frcsty/3.0.0

3.0.0

.gitignore

@@ -1,5 +1,2 @@
-.idea/
-.gradle/
 build/
-
-*.iml
+out/

build.gradle

@@ -0,0 +1,3 @@
+dependencies {
+    compileOnly project(":common")
+}

build.gradle.kts

@@ -1,36 +0,0 @@
-plugins {
-    java
-    id("com.github.johnrengelman.shadow") version ("7.0.0")
-}
-
-group = "at.helpch.placeholderapi.expansion"
-version = "2.1.0"
-
-repositories {
-    mavenCentral()
-    maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
-    maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
-}
-
-dependencies {
-    compileOnly("org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT")
-    compileOnly("me.clip:placeholderapi:2.11.3")
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-tasks {
-    jar {
-        manifest {
-            attributes["Implementation-Title"] = "player"
-            attributes["Implementation-Version"] = project.version
-        }
-    }
-
-    shadowJar {
-        archiveFileName.set("PAPI-Expansion-Player-${project.version}.jar")
-    }
-}

gradle/wrapper/gradle-wrapper.properties

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

gradlew

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

gradlew.bat

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

settings.gradle

@@ -1 +0,0 @@
-rootProject.name = 'player-expansion'

src/main/java/at/helpch/placeholderapi/expansion/player/PlayerExpansion.java

@@ -1,526 +1,49 @@
 package at.helpch.placeholderapi.expansion.player;
 
-import at.helpch.placeholderapi.expansion.player.handler.PlayerLocaleHandler;
-import at.helpch.placeholderapi.expansion.player.ping.PingFormatter;
-import at.helpch.placeholderapi.expansion.player.util.ItemUtil;
-import at.helpch.placeholderapi.expansion.player.util.PlayerUtil;
-import at.helpch.placeholderapi.expansion.player.util.TimeUtil;
-import at.helpch.placeholderapi.expansion.player.util.VersionHelper;
-import com.google.common.collect.ImmutableMap;
-import me.clip.placeholderapi.PlaceholderAPIPlugin;
-import me.clip.placeholderapi.expansion.Configurable;
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.NamespacedKey;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.World;
-import org.bukkit.block.BlockFace;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
+import at.helpch.placeholderapi.api.expansion.Expansion;
+import at.helpch.placeholderapi.api.expansion.ExpansionDescription;
+import at.helpch.placeholderapi.api.expansion.Platform;
+import at.helpch.placeholderapi.api.expansion.placeholder.Placeholder;
+import at.helpch.placeholderapi.api.expansion.placeholder.PlaceholderContext;
+import at.helpch.placeholderapi.api.player.Player;
+import at.helpch.placeholderapi.api.player.keyable.key.PlayerKeys;
+import at.helpch.placeholderapi.api.server.Server;
+import at.helpch.placeholderapi.expansion.time.TimeFormatter;
+import at.helpch.placeholderapi.expansion.time.file.Config;
+import com.google.inject.Inject;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Optional;
-import java.util.StringJoiner;
-import java.util.concurrent.TimeUnit;
+import java.sql.Time;
+import java.util.function.Function;
 
-public final class PlayerExpansion extends PlaceholderExpansion implements Configurable {
+@ExpansionDescription(
+        name = "Player",
+        version = "2.0.0",
+        identifier = "player",
+        authors = "HelpChat",
+        platforms = {Platform.BUKKIT, Platform.SPONGE, Platform.NUKKIT}
+)
+public final class PlayerExpansion extends Expansion {
 
-    private PingFormatter pingFormatter;
-    private Map<String, Object> directionNames;
+    private final TimeFormatter timeFormatter;
+    private final Config config;
 
-    @Override
-    public @NotNull String getIdentifier() {
-        return "player";
+    @Inject
+    public PlayerExpansion(@NotNull final Config config) {
+        this.config = config;
+
+        // TODO: instantiate a single TimeFormatted through out the project, with a main config
+        this.timeFormatter = new TimeFormatter(config);
     }
 
     @Override
-    public @NotNull String getAuthor() {
-        return "HelpChat";
+    public void enable() {
+
     }
 
-    @Override
-    public @NotNull String getVersion() {
-        return getClass().getPackage().getImplementationVersion();
-    }
-
-    @Override
-    public Map<String, Object> getDefaults() {
-        return ImmutableMap.<String, Object>builder()
-            .put("direction.north", "N")
-            .put("direction.north_east", "NE")
-            .put("direction.east", "E")
-            .put("direction.south_east", "SE")
-            .put("direction.south", "S")
-            .put("direction.south_west", "SW")
-            .put("direction.west", "W")
-            .put("direction.north_west", "NW")
-            .put("ping.formatting.>200", "&4")
-            .put("ping.formatting.>150", "&c")
-            .put("ping.formatting.>100", "&e")
-            .put("ping.formatting.>75", "&2")
-            .put("ping.formatting.>50", "&a")
-            .put("ping.formatting.>25", "&b")
-            .put("ping.formatting.=0", "&9")
-            .build();
-    }
-
-    @Override
-    public boolean canRegister() {
-        pingFormatter = new PingFormatter(getConfigSection("ping.formatting"));
-        directionNames = Optional.ofNullable(getConfigSection("direction"))
-            .map(section -> section.getValues(false))
-            .orElseGet(HashMap::new);
-        return true;
-    }
-
-    /**
-     * Format a {@code boolean} as {@link PlaceholderAPIPlugin#booleanTrue()} or {@link PlaceholderAPIPlugin#booleanFalse()}
-     *
-     * @param bool boolean
-     * @return {@link PlaceholderAPIPlugin#booleanTrue()} if the boolean is true, otherwise {@link PlaceholderAPIPlugin#booleanFalse()}
-     */
-    private @NotNull String bool(final boolean bool) {
-        return bool ? PlaceholderAPIPlugin.booleanTrue() : PlaceholderAPIPlugin.booleanFalse();
-    }
-
-    private @NotNull String getItemInfo(@Nullable final ItemStack item, @NotNull final String args) {
-        switch (args) {
-            case "_name":
-                return ItemUtil.getName(item);
-            case "_data":
-                return String.valueOf(ItemUtil.getDamage(item));
-            case "_durability":
-                return String.valueOf(ItemUtil.getDurability(item));
-            default:
-                return ItemUtil.getMaterialName(item);
-        }
-    }
-
-    @SuppressWarnings("SpellCheckingInspection")
-    @Override
-    public @Nullable String onRequest(OfflinePlayer offlinePlayer, @NotNull String params) {
-        final boolean targetedPing = params.startsWith("ping_");
-        final boolean targetedColoredPing = params.startsWith("colored_ping_");
-
-        if (targetedPing || targetedColoredPing) {
-            final String targetName = params.substring((targetedPing ? "ping_" : "colored_ping_").length());
-            return Optional.ofNullable(Bukkit.getPlayerExact(targetName))
-                .map(target -> pingFormatter.getPing(target, targetedColoredPing))
-                .orElse("0");
-        }
-
-        if (offlinePlayer == null) {
-            return "";
-        }
-
-        switch (params) {
-            case "name":
-                return offlinePlayer.getName();
-            case "uuid":
-                return offlinePlayer.getUniqueId().toString();
-            case "first_played":
-            case "first_join":
-                return String.valueOf(offlinePlayer.getFirstPlayed());
-            case "first_played_formatted":
-            case "first_join_date":
-                return PlaceholderAPIPlugin.getDateFormat().format(new Date(offlinePlayer.getFirstPlayed()));
-            case "last_played":
-            case "last_join":
-                //noinspection deprecation
-                return String.valueOf(offlinePlayer.getLastPlayed());
-            case "last_played_formatted":
-            case "last_join_date":
-                //noinspection deprecation
-                return PlaceholderAPIPlugin.getDateFormat().format(new Date(offlinePlayer.getLastPlayed()));
-
-            //<editor-fold desc="Bed location placeholders">
-            case "bed_is_set":
-                return bool(offlinePlayer.getBedSpawnLocation() != null);
-            case "bed_x":
-                return PlayerUtil.getBedLocationInfo(offlinePlayer, "0", Location::getBlockX);
-            case "bed_y":
-                return PlayerUtil.getBedLocationInfo(offlinePlayer, "0", Location::getBlockY);
-            case "bed_z":
-                return PlayerUtil.getBedLocationInfo(offlinePlayer, "0", Location::getBlockZ);
-            case "bed_world":
-                return PlayerUtil.getBedLocationInfo(offlinePlayer, "N/A", location -> location.getWorld().getName());
-            //</editor-fold>
-
-            //<editor-fold desc="Various boolean placeholders">
-            case "has_played_before":
-                return bool(offlinePlayer.hasPlayedBefore());
-            case "is_banned":
-                return bool(offlinePlayer.isBanned());
-            case "is_op":
-                return bool(offlinePlayer.isOp());
-            case "is_whitelisted":
-                return bool(offlinePlayer.isWhitelisted());
-            case "online":
-                return bool(offlinePlayer.isOnline());
-            //</editor-fold>
-        }
-
-        if (!offlinePlayer.isOnline()) {
-            return "";
-        }
-
-        final Player player = offlinePlayer.getPlayer();
-
-        // To get rid of IDE warnings
-        if (player == null) {
-            return "";
-        }
-
-        switch (params) {
-            //<editor-fold desc="General placeholders">
-            case "displayname":
-                //noinspection deprecation
-                return player.getDisplayName();
-            case "custom_name":
-                return Optional.ofNullable(player.getCustomName()).orElseGet(player::getName);
-            case "list_name":
-                //noinspection deprecation
-                return player.getPlayerListName();
-
-            case "absorption": {
-                if (VersionHelper.HAS_ABSORPTION_METHODS) {
-                    return String.valueOf((int) player.getAbsorptionAmount());
-                } else {
-                    return "-1";
-                }
-            }
-            case "fly_speed":
-                return String.valueOf(player.getFlySpeed());
-            case "food_level":
-                return String.valueOf(player.getFoodLevel());
-
-            case "gamemode":
-                return player.getGameMode().name();
-
-            case "health":
-                return String.valueOf(player.getHealth());
-            case "health_rounded":
-                return String.valueOf(Math.round(player.getHealth()));
-            case "health_scale":
-                return String.valueOf(player.getHealthScale());
-            case "health_boost": {
-                if (player.getHealthScale() > 20) {
-                    return String.valueOf(player.getHealthScale() - 20);
-                } else {
-                    return "0";
-                }
-            }
-
-            case "last_damage":
-                return String.valueOf(player.getLastDamage());
-            case "max_air":
-                return String.valueOf(player.getMaximumAir());
-            case "max_health":
-                return String.valueOf(PlayerUtil.getMaxHealth(player));
-            case "max_health_rounded":
-                return String.valueOf(Math.round(PlayerUtil.getMaxHealth(player)));
-            case "max_no_damage_ticks":
-                return String.valueOf(player.getMaximumNoDamageTicks());
-            case "no_damage_ticks":
-                return String.valueOf(player.getNoDamageTicks());
-            case "remaining_air":
-                return String.valueOf(player.getRemainingAir());
-            case "saturation":
-                return String.valueOf(player.getSaturation());
-            case "sleep_ticks":
-                return String.valueOf(player.getSleepTicks());
-            case "ticks_lived":
-                return String.valueOf(player.getTicksLived());
-            case "seconds_lived":
-                return String.valueOf(player.getTicksLived() / 20L);
-            case "minutes_lived":
-                return String.valueOf(TimeUnit.SECONDS.toMinutes(player.getTicksLived() / 20L));
-            case "walk_speed":
-                return String.valueOf(player.getWalkSpeed());
-
-            case "ip":
-                return Optional.ofNullable(player.getAddress())
-                    .map(InetSocketAddress::getAddress)
-                    .map(InetAddress::getHostAddress)
-                    .orElse("");
-            case "ping":
-            case "colored_ping":
-                return pingFormatter.getPing(player, params.startsWith("colored"));
-
-            case "time":
-                return String.valueOf(player.getPlayerTime());
-            case "time_offset":
-                return String.valueOf(player.getPlayerTimeOffset());
-            //</editor-fold>
-
-            //<editor-fold desc="Location / position placeholders">
-            case "world":
-                return player.getWorld().getName();
-            case "world_type": {
-                final World.Environment environment = player.getWorld().getEnvironment();
-                if (environment == World.Environment.NETHER) {
-                    return "Nether";
-                } else if (environment == World.Environment.THE_END) {
-                    return "The End";
-                } else if (environment == World.Environment.NORMAL) {
-                    return "Overworld";
-                } else if (environment.name().equals("CUSTOM")) {
-                    return "Custom";
-                } else {
-                    return environment.name();
-                }
-            }
-            case "world_time":
-                return String.valueOf(player.getWorld().getTime());
-            case "world_time_12":
-            case "world_time_24":
-                return TimeUtil.formatWorldTime(player.getWorld().getTime(), params.equals("world_time_24"));
-            case "weather_duration":
-                return String.valueOf(player.getWorld().getWeatherDuration());
-            case "thunder_duration":
-                return String.valueOf(player.getWorld().getThunderDuration());
-
-            case "direction":
-                // NORTH_EAST -> north_east -> value from config (e.g. NE)
-                return Optional.of(PlayerUtil.getDirection(player))
-                    .map(BlockFace::name)
-                    .map(String::toLowerCase)
-                    .map(directionNames::get)
-                    .map(String::valueOf)
-                    .orElse("");
-            case "direction_xz":
-                return PlayerUtil.getXZDirection(player);
-            case "x":
-                return String.valueOf(player.getLocation().getBlockX());
-            case "x_long":
-                return String.valueOf(player.getLocation().getX());
-            case "y":
-                return String.valueOf(player.getLocation().getBlockY());
-            case "y_long":
-                return String.valueOf(player.getLocation().getY());
-            case "z":
-                return String.valueOf(player.getLocation().getBlockZ());
-            case "z_long":
-                return String.valueOf(player.getLocation().getZ());
-            case "yaw":
-                return String.valueOf(player.getLocation().getYaw());
-            case "pitch":
-                return String.valueOf(player.getLocation().getPitch());
-            case "block_underneath":
-                return String.valueOf(
-                    player.getLocation()
-                        .clone()
-                        .subtract(0, 1, 0)
-                        .getBlock()
-                        .getType()
-                );
-            case "light_level":
-                return String.valueOf(player.getLocation().getBlock().getLightLevel());
-            case "biome":
-            case "biome_capitalized": {
-                final String biome = player.getLocation().getBlock().getBiome().toString();
-
-                if (!params.endsWith("_capitalized")) {
-                    return biome;
-                }
-
-                final StringJoiner joiner = new StringJoiner(" ");
-
-                for (String part : biome.split("_")) {
-                    joiner.add(part.substring(0, 1).toUpperCase() + part.substring(1).toLowerCase());
-                }
-
-                return joiner.toString();
-            }
-
-            case "compass_x":
-                return PlayerUtil.getCompassLocationInfo(player, "0", Location::getBlockX);
-            case "compass_y":
-                return PlayerUtil.getCompassLocationInfo(player, "0", Location::getBlockY);
-            case "compass_z":
-                return PlayerUtil.getCompassLocationInfo(player, "0", Location::getBlockZ);
-            case "compass_world":
-                return PlayerUtil.getCompassLocationInfo(player, Bukkit.getWorlds().get(0).getName(), location -> location.getWorld().getName());
-            //</editor-fold>
-
-            //<editor-fold desc="Experience placeholders">
-            case "exp":
-                return String.valueOf(player.getExp());
-            case "current_exp":
-                return String.valueOf(PlayerUtil.getTotalExperience(player));
-            case "total_exp":
-                return String.valueOf(player.getTotalExperience());
-            case "exp_to_level":
-                return String.valueOf(player.getExpToLevel());
-            case "level":
-                return String.valueOf(player.getLevel());
-            //</editor-fold>
-
-            //<editor-fold desc="Inventory placeholders">
-            case "has_empty_slot":
-                return bool(player.getInventory().firstEmpty() > -1);
-            case "empty_slots":
-                return String.valueOf(PlayerUtil.getEmptySlotsCount(player));
-
-            case "item_in_hand":
-            case "item_in_hand_name":
-            case "item_in_hand_data":
-            case "item_in_hand_durability":
-                return getItemInfo(PlayerUtil.getItemInMainHand(player), params.substring("item_in_hand".length()));
-
-            case "item_in_offhand":
-            case "item_in_offhand_name":
-            case "item_in_offhand_data":
-            case "item_in_offhand_durability":
-                return getItemInfo(player.getInventory().getItemInOffHand(), params.substring("item_in_offhand".length()));
-
-            case "armor_helmet":
-            case "armor_helmet_name":
-            case "armor_helmet_data":
-            case "armor_helmet_durability":
-                return getItemInfo(player.getInventory().getHelmet(), params.substring("armor_helmet".length()));
-
-            case "armor_chestplate":
-            case "armor_chestplate_name":
-            case "armor_chestplate_data":
-            case "armor_chestplate_durability":
-                return getItemInfo(player.getInventory().getChestplate(), params.substring("armor_chestplate".length()));
-
-            case "armor_leggings":
-            case "armor_leggings_name":
-            case "armor_leggings_data":
-            case "armor_leggings_durability":
-                return getItemInfo(player.getInventory().getLeggings(), params.substring("armor_leggings".length()));
-
-            case "armor_boots":
-            case "armor_boots_name":
-            case "armor_boots_data":
-            case "armor_boots_durability":
-                return getItemInfo(player.getInventory().getBoots(), params.substring("armor_boots".length()));
-            //</editor-fold>
-
-            //<editor-fold desc="Various boolean placeholders">
-            case "allow_flight":
-                return bool(player.getAllowFlight());
-            case "can_pickup_items":
-                return bool(player.getCanPickupItems());
-            case "has_health_boost":
-                return bool(player.hasPotionEffect(PotionEffectType.HEALTH_BOOST));
-            case "is_conversing":
-                return bool(player.isConversing());
-            case "is_dead":
-                return bool(player.isDead());
-            case "is_flying":
-                return bool(player.isFlying());
-            case "is_gliding":
-                return bool(player.isGliding());
-            case "is_inside_vehicle":
-                return bool(player.isInsideVehicle());
-            case "is_leashed":
-                return bool(player.isLeashed());
-            case "is_sleeping":
-                return bool(player.isSleeping());
-            case "is_sneaking":
-                return bool(player.isSneaking());
-            case "is_sprinting":
-                return bool(player.isSprinting());
-            //</editor-fold>
-
-            //<editor-fold desc="⚠ Deprecated placeholders">
-            case "server":
-            case "servername":
-                return "now available in the server expansion";
-            //</editor-fold>
-        }
-
-        // has_permission_<permission.node>
-        if (params.startsWith("has_permission_")) {
-            final String permission = params.substring("has_permission_".length());
-            return bool(player.hasPermission(permission));
-        }
-
-        // has_potioneffect_<effect>
-        if (params.startsWith("has_potioneffect_")) {
-            final String effectName = params.substring("has_potioneffect_".length());
-            final Optional<PotionEffectType> effectType = Optional.ofNullable(PotionEffectType.getByName(effectName));
-
-            if (!effectType.isPresent()) {
-                return "Unknown potion effect " + effectName;
-            }
-
-            return effectType.map(player::hasPotionEffect)
-                .map(this::bool)
-                .get();
-        }
-
-        // potion_effect_level_<effect>
-        if (params.startsWith("potion_effect_level_")) {
-            final String effectName = params.substring("potion_effect_level_".length());
-            final Optional<PotionEffectType> effectType = Optional.ofNullable(PotionEffectType.getByName(effectName));
-
-            if (!effectType.isPresent()) {
-                return "Unknown potion effect " + effectName;
-            }
-
-            return effectType.filter(player::hasPotionEffect)
-                .map(player::getPotionEffect)
-                .map(PotionEffect::getAmplifier)
-                .map(String::valueOf)
-                .orElse("0");
-        }
-
-        // item_in_hand_level_<enchantment name or key>
-        if (params.startsWith("item_in_hand_level_")) {
-            return ItemUtil.getEnchantmentLevel(PlayerUtil.getItemInMainHand(player), params.substring("item_in_hand_level_".length()));
-        }
-
-        // item_in_offhand_level_<enchantment name or key>
-        if (params.startsWith("item_in_offhand_level_")) {
-            return ItemUtil.getEnchantmentLevel(player.getInventory().getItemInOffHand(), params.substring("item_in_offhand_level_".length()));
-        }
-
-        // locale or locale_<option>
-        if (params.startsWith("locale")) {
-            final String localeString = PlayerLocaleHandler.INSTANCE.apply(player);
-            final Locale locale = Locale.forLanguageTag(localeString.replace('_', '-'));
-
-            switch (params) {
-                case "locale":
-                    return localeString;
-                case "locale_country":
-                    return Optional.ofNullable(locale).map(Locale::getCountry).orElse("");
-                case "locale_display_country":
-                    return Optional.ofNullable(locale).map(Locale::getDisplayCountry).orElse("");
-                case "locale_display_name":
-                    return Optional.ofNullable(locale).map(Locale::getDisplayName).orElse("");
-                case "locale_short":
-                    return localeString.substring(0, localeString.indexOf("_"));
-            }
-        }
-
-        // has_unlocked_recipe_<recipe-key>
-        if (params.startsWith("has_unlocked_recipe_") && VersionHelper.HAS_KEYED_API) {
-            final String recipeName = params.substring("has_unlocked_recipe_".length());
-            final NamespacedKey recipeKey = (recipeName.contains(":")) ? NamespacedKey.fromString(recipeName) : NamespacedKey.minecraft(recipeName);
-
-            if (recipeKey == null) {
-                return "Unknown recipe " + recipeName;
-            }
-
-            return bool(player.hasDiscoveredRecipe(recipeKey));
-        }
-
-        return null;
+    @Placeholder("name")
+    private String name(final PlaceholderContext context) {
+        return context.getPlayer().get(PlayerKeys.NAME).orElse("");
     }
 
 }

src/main/java/at/helpch/placeholderapi/expansion/player/handler/PlayerLocaleHandler.java

@@ -1,56 +0,0 @@
-package at.helpch.placeholderapi.expansion.player.handler;
-
-import at.helpch.placeholderapi.expansion.player.util.Logging;
-import at.helpch.placeholderapi.expansion.player.util.VersionHelper;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.function.Function;
-
-public class PlayerLocaleHandler implements Function<@NotNull Player, @NotNull String> {
-
-    public static final PlayerLocaleHandler INSTANCE = new PlayerLocaleHandler();
-
-    private Field locale;
-    private Method getHandle;
-
-    private PlayerLocaleHandler() { }
-
-    private void cacheReflection(@NotNull final Player player) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, NoSuchFieldException {
-        getHandle = player.getClass().getDeclaredMethod("getHandle");
-        getHandle.setAccessible(true);
-
-        locale = getHandle.invoke(player).getClass().getDeclaredField("locale");
-    }
-
-    @Override
-    public @NotNull String apply(@NotNull final Player player) {
-        if (VersionHelper.HAS_PLAYER_LOCALE_METHOD) {
-            //noinspection deprecation
-            return player.getLocale();
-        }
-
-        if (locale == null) {
-            try {
-                cacheReflection(player);
-            } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException |
-                     NoSuchFieldException e) {
-                Logging.error(e, "Could not cache reflection for {0} (player: {1})", getClass().getSimpleName(), player.getName());
-            }
-        }
-
-        if (locale != null) {
-            try {
-                return (String) locale.get(getHandle.invoke(player));
-            } catch (IllegalAccessException | InvocationTargetException e) {
-                Logging.error(e, "Could not get the locale of {0}, fallback to en_US", player.getName());
-            }
-        }
-
-        return "en_US";
-    }
-
-}

src/main/java/at/helpch/placeholderapi/expansion/player/handler/PlayerPingHandler.java

@@ -1,56 +0,0 @@
-package at.helpch.placeholderapi.expansion.player.handler;
-
-import at.helpch.placeholderapi.expansion.player.util.Logging;
-import at.helpch.placeholderapi.expansion.player.util.VersionHelper;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.function.Function;
-
-public class PlayerPingHandler implements Function<@NotNull Player, @NotNull Integer> {
-
-    public static final PlayerPingHandler INSTANCE = new PlayerPingHandler();
-
-    private Field ping;
-    private Method getHandle;
-
-    private PlayerPingHandler() { }
-
-    private void cacheReflection(@NotNull final Player player) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, NoSuchFieldException {
-        getHandle = player.getClass().getDeclaredMethod("getHandle");
-        getHandle.setAccessible(true);
-
-        ping = getHandle.invoke(player).getClass().getDeclaredField("ping");
-        ping.setAccessible(true);
-    }
-
-    @Override
-    public Integer apply(@NotNull final Player player) {
-        if (VersionHelper.HAS_PLAYER_PING_METHOD) {
-            return player.getPing();
-        }
-
-        if (ping == null) {
-            try {
-                cacheReflection(player);
-            } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException |
-                     NoSuchFieldException e) {
-                Logging.error(e, "Could not cache reflection for {0} (player: {1})", getClass().getSimpleName(), player.getName());
-            }
-        }
-
-        if (ping != null) {
-            try {
-                return ping.getInt(getHandle.invoke(player));
-            } catch (IllegalAccessException | InvocationTargetException e) {
-                Logging.error(e, "Could not get the ping of {0}, fallback to -1", player.getName());
-            }
-        }
-
-        return -1;
-    }
-
-}

src/main/java/at/helpch/placeholderapi/expansion/player/ping/PingFormatter.java

@@ -1,75 +0,0 @@
-package at.helpch.placeholderapi.expansion.player.ping;
-
-import at.helpch.placeholderapi.expansion.player.handler.PlayerPingHandler;
-import at.helpch.placeholderapi.expansion.player.util.Logging;
-import at.helpch.placeholderapi.expansion.player.util.PlayerUtil;
-import com.google.common.primitives.Ints;
-import org.bukkit.ChatColor;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public final class PingFormatter {
-
-    private final List<PingFormattingRule> pingFormattingRules = new ArrayList<>();
-
-    public PingFormatter(@Nullable final ConfigurationSection config) {
-        if (config == null) {
-            Logging.warn("Could not find the 'ping.formatting' section in config");
-            return;
-        }
-
-        load(config);
-    }
-
-    private void load(@NotNull ConfigurationSection config) {
-        for (final String key : config.getKeys(false)) {
-            final String formatting = config.getString(key);
-
-            if (formatting == null) {
-                continue;
-            }
-
-            Integer ping = Ints.tryParse(key.replaceAll("\\D", ""));
-
-            if (ping == null) {
-                Logging.warn("(ping formatting) Invalid ping condition \"{0}\"", key);
-                continue;
-            }
-
-            switch (key.charAt(0)) {
-                case '>':
-                    this.pingFormattingRules.add(PingFormattingRule.greaterThan(ping, formatting));
-                    break;
-
-                case '<':
-                    this.pingFormattingRules.add(PingFormattingRule.lessThan(ping, formatting));
-                    break;
-
-                case '=':
-                default:
-                    this.pingFormattingRules.add(PingFormattingRule.equalTo(ping, formatting));
-                    break;
-            }
-        }
-    }
-
-    public @NotNull String getPing(@NotNull final Player player, final boolean colored) {
-        final int ping = PlayerPingHandler.INSTANCE.apply(player);
-
-        if (ping < 0 || !colored) {
-            return String.valueOf(ping);
-        }
-
-        return pingFormattingRules.stream()
-            .filter(rule -> rule.test(ping))
-            .findFirst()
-            .map(rule ->  ChatColor.translateAlternateColorCodes('&', rule.getFormatting() + ping))
-            .orElseGet(() -> String.valueOf(ping));
-    }
-
-}

src/main/java/at/helpch/placeholderapi/expansion/player/ping/PingFormattingRule.java

@@ -1,38 +0,0 @@
-package at.helpch.placeholderapi.expansion.player.ping;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.function.Predicate;
-
-public class PingFormattingRule implements Predicate<Integer> {
-
-    private final Predicate<@NotNull Integer> predicate;
-    private final String formatting;
-
-    public static @NotNull PingFormattingRule equalTo(final int pingValue, @NotNull final String formatting) {
-        return new PingFormattingRule((ping) -> ping == pingValue, formatting);
-    }
-
-    public static @NotNull PingFormattingRule greaterThan(final int pingValue, @NotNull final String formatting) {
-        return new PingFormattingRule((ping) -> ping > pingValue, formatting);
-    }
-
-    public static @NotNull PingFormattingRule lessThan(final int pingValue, @NotNull final String formatting) {
-        return new PingFormattingRule((ping) -> ping < pingValue, formatting);
-    }
-
-    private PingFormattingRule(Predicate<Integer> predicate, String formatting) {
-        this.predicate = predicate;
-        this.formatting = formatting;
-    }
-
-    @Override
-    public boolean test(@NotNull final Integer ping) {
-        return predicate.test(ping);
-    }
-
-    public String getFormatting() {
-        return formatting;
-    }
-
-}

src/main/java/at/helpch/placeholderapi/expansion/player/util/ItemUtil.java

@@ -1,98 +0,0 @@
-package at.helpch.placeholderapi.expansion.player.util;
-
-import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.Damageable;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Optional;
-
-@SuppressWarnings("deprecation")
-public final class ItemUtil {
-
-    /**
-     * Whether an item is null or its type is air (ends with _AIR)
-     *
-     * @param itemStack item to check
-     * @return whether the item is null or air
-     */
-    public static boolean isNullOrAir(@Nullable final ItemStack itemStack) {
-        return itemStack == null || itemStack.getType().name().equals("AIR") || itemStack.getType().name().contains("_AIR");
-    }
-
-    /**
-     * Get the material name of an item
-     *
-     * @param item item
-     * @return {@link Material#name()} or empty string if the item {@link #isNullOrAir(ItemStack) is null or air}
-     */
-    public static @NotNull String getMaterialName(@Nullable final ItemStack item) {
-        return isNullOrAir(item) ? "" : item.getType().name();
-    }
-
-    /**
-     * Get the {@link ItemMeta#getDisplayName() display name} of an item
-     *
-     * @param item item
-     * @return {@link ItemMeta#getDisplayName()} or empty string if the item {@link #isNullOrAir(ItemStack) is null or air}
-     */
-    public static @NotNull String getName(@Nullable final ItemStack item) {
-        if (isNullOrAir(item)) {
-            return "";
-        }
-
-        //noinspection DataFlowIssue
-        return item.hasItemMeta() ? item.getItemMeta().getDisplayName() : "";
-    }
-
-    public static int getDamage(@Nullable final ItemStack item) {
-        if (isNullOrAir(item)) {
-            return 0;
-        }
-
-        if (VersionHelper.HAS_DAMAGEABLE_ITEM_META) {
-            //noinspection DataFlowIssue
-            return item.hasItemMeta() ? ((Damageable) item.getItemMeta()).getDamage() : 0;
-        } else {
-            //noinspection deprecation
-            return item.getDurability();
-        }
-    }
-
-    /**
-     * Get the durability left of an item
-     *
-     * @param item item
-     * @return durability left or 0 if the item {@link #isNullOrAir(ItemStack) is null or air}
-     */
-    public static int getDurability(@Nullable final ItemStack item) {
-        return isNullOrAir(item) ? 0 : item.getType().getMaxDurability() - getDamage(item);
-    }
-
-    public static @Nullable Enchantment getEnchantmentFromString(@NotNull final String string) {
-        if (VersionHelper.HAS_KEYED_API) {
-            final NamespacedKey key = (string.contains(":")) ? NamespacedKey.fromString(string) : NamespacedKey.minecraft(string);
-            return Optional.ofNullable(key)
-                .map(Enchantment::getByKey)
-                .orElseGet(() -> Enchantment.getByName(string));
-        }
-
-        return Enchantment.getByName(string);
-    }
-
-    public static @NotNull String getEnchantmentLevel(@Nullable final ItemStack item, @NotNull final String enchantmentNameOrKey) {
-        if (isNullOrAir(item)) {
-            return "0";
-        }
-
-        return Optional.ofNullable(getEnchantmentFromString(enchantmentNameOrKey))
-            .map(item::getEnchantmentLevel)
-            .map(String::valueOf)
-            .orElse("0");
-    }
-
-}

src/main/java/at/helpch/placeholderapi/expansion/player/util/Logging.java

@@ -1,32 +0,0 @@
-package at.helpch.placeholderapi.expansion.player.util;
-
-import me.clip.placeholderapi.PlaceholderAPIPlugin;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.text.MessageFormat;
-import java.util.logging.Level;
-
-public final class Logging {
-
-    private static void log(
-        @NotNull final Level level, @Nullable final Throwable throwable,
-        @NotNull final String message, @NotNull final Object... args
-    ) {
-        PlaceholderAPIPlugin.getInstance()
-            .getLogger()
-            .log(level, MessageFormat.format(message, args), throwable);
-    }
-
-    public static void error(
-        @Nullable final Throwable throwable, @NotNull final String message,
-        @NotNull final Object... args
-    ) {
-        log(Level.SEVERE, throwable, message, args);
-    }
-
-    public static void warn(@NotNull final String message, @NotNull final Object... args) {
-        log(Level.WARNING, null, message, args);
-    }
-
-}

src/main/java/at/helpch/placeholderapi/expansion/player/util/PlayerUtil.java

@@ -1,139 +0,0 @@
-package at.helpch.placeholderapi.expansion.player.util;
-
-import org.bukkit.Location;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.attribute.Attribute;
-import org.bukkit.attribute.AttributeInstance;
-import org.bukkit.block.BlockFace;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.PlayerInventory;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Function;
-
-public final class PlayerUtil {
-
-    private static final BlockFace[] radial = {
-        BlockFace.NORTH, BlockFace.NORTH_EAST,
-        BlockFace.EAST, BlockFace.SOUTH_EAST,
-        BlockFace.SOUTH, BlockFace.SOUTH_WEST,
-        BlockFace.WEST, BlockFace.NORTH_WEST
-    };
-
-    /**
-     * Get player's item in hand using the right method depending on the server version
-     *
-     * @param player player
-     * @return item in hand
-     * @see Player#getItemInHand() method for < 1.9
-     * @see PlayerInventory#getItemInMainHand() method for >= 1.9
-     */
-    @SuppressWarnings({"DataFlowIssue", "deprecation"})
-    public static @Nullable ItemStack getItemInMainHand(@NotNull final Player player) {
-        return VersionHelper.HAS_OFF_HAND ? player.getInventory().getItemInMainHand() : player.getItemInHand();
-    }
-
-    public static @NotNull String getLocationInfo(
-        @Nullable final Location location, @NotNull final String defaultValue,
-        @NotNull final Function<@NotNull Location, @NotNull Object> coordinateMapper
-    ) {
-        return Optional.ofNullable(location)
-            .map(coordinateMapper)
-            .map(String::valueOf)
-            .orElse(defaultValue);
-    }
-
-    public static @NotNull String getBedLocationInfo(
-        @NotNull final OfflinePlayer player, @NotNull final String defaultValue,
-        @NotNull final Function<@NotNull Location, @NotNull Object> coordinateMapper
-    ) {
-        return getLocationInfo(player.getBedSpawnLocation(), defaultValue, coordinateMapper);
-    }
-
-    public static @NotNull String getCompassLocationInfo(
-        @NotNull final Player player, @NotNull final String defaultValue,
-        @NotNull final Function<@NotNull Location, @NotNull Object> coordinateMapper
-    ) {
-        return getLocationInfo(player.getCompassTarget(), defaultValue, coordinateMapper);
-    }
-
-    public static int getEmptySlotsCount(@NotNull final Player player) {
-        final PlayerInventory inventory = player.getInventory();
-        final List<ItemStack> items = new ArrayList<>(Arrays.asList(inventory.getContents()));
-        items.add(inventory.getHelmet());
-        items.add(inventory.getChestplate());
-        items.add(inventory.getLeggings());
-        items.add(inventory.getBoots());
-
-        if (VersionHelper.HAS_OFF_HAND) {
-            items.add(inventory.getItemInOffHand());
-        }
-
-        return (int) items.stream().filter(ItemUtil::isNullOrAir).count();
-    }
-
-    public static @NotNull BlockFace getDirection(@NotNull final Player player) {
-        return radial[Math.round(player.getLocation().getYaw() / 45f) & 0x7].getOppositeFace();
-    }
-
-    public static String getXZDirection(Player player) {
-        double rotation = player.getLocation().getYaw();
-
-        if (rotation < 0.0D) {
-            rotation += 360.0D;
-        }
-
-        if (Math.abs(rotation) <= 45 || Math.abs(rotation - 360) <= 45) {
-            return "+Z";
-        } else if (Math.abs(rotation - 90) <= 45) {
-            return "-X";
-        } else if (Math.abs(rotation - 180) <= 45) {
-            return "-Z";
-        } else if (Math.abs(rotation - 270) <= 45) {
-            return "+X";
-        } else {
-            return "";
-        }
-    }
-
-    public static double getMaxHealth(@NotNull final Player player) {
-        if (VersionHelper.HAS_ATTRIBUTE_API) {
-            return Optional.ofNullable(player.getAttribute(Attribute.GENERIC_MAX_HEALTH))
-                .map(AttributeInstance::getValue)
-                .orElse(20.0);
-        } else {
-            //noinspection deprecation
-            return player.getMaxHealth();
-        }
-    }
-
-    private static int getExperienceAtLevel(int level) {
-        if (level <= 15) {
-            return (level << 1) + 7;
-        }
-        if (level <= 30) {
-            return (level * 5) - 38;
-        }
-        return (level * 9) - 158;
-    }
-
-    public static int getTotalExperience(Player player) {
-        int experience = Math.round(getExperienceAtLevel(player.getLevel()) * player.getExp());
-        int currentLevel = player.getLevel();
-        while (currentLevel > 0) {
-            currentLevel--;
-            experience += getExperienceAtLevel(currentLevel);
-        }
-        if (experience < 0) {
-            experience = 0;
-        }
-        return experience;
-    }
-
-}

src/main/java/at/helpch/placeholderapi/expansion/player/util/TimeUtil.java

@@ -1,19 +0,0 @@
-package at.helpch.placeholderapi.expansion.player.util;
-
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-
-public final class TimeUtil {
-
-    private static final LocalTime SIX_O_CLOCK = LocalTime.of(6, 0);
-    private static final double MINECRAFT_SECONDS_PER_TICK = 3.6d;
-
-    private static final DateTimeFormatter TWENTY_FOUR_FORMAT = DateTimeFormatter.ofPattern("HH:mm");
-    private static final DateTimeFormatter TWELVE_FORMAT = DateTimeFormatter.ofPattern("hh:mm a");
-
-    public static String formatWorldTime(final long ticks, final boolean twentyFourHourFormat) {
-        final LocalTime time = SIX_O_CLOCK.plusSeconds((long) (ticks * MINECRAFT_SECONDS_PER_TICK));
-        return time.format(twentyFourHourFormat ? TWENTY_FOUR_FORMAT : TWELVE_FORMAT);
-    }
-
-}

src/main/java/at/helpch/placeholderapi/expansion/player/util/VersionHelper.java

@@ -1,92 +0,0 @@
-package at.helpch.placeholderapi.expansion.player.util;
-
-import com.google.common.primitives.Ints;
-import org.bukkit.Bukkit;
-import org.bukkit.attribute.Attribute;
-import org.bukkit.entity.Damageable;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.PlayerInventory;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @author Matt (<a href="https://github.com/lichthund">@LichtHund</a>)
- */
-public final class VersionHelper {
-
-    private static final int VERSION = getCurrentVersion();
-
-    /**
-     * @see Player#getAttribute(Attribute) 
-     * @since MC 1.9
-     */
-    public static final boolean HAS_ATTRIBUTE_API = VERSION >= 1_9_0;
-
-    /**
-     * @see PlayerInventory#getItemInOffHand()
-     * @since MC 1.9
-     */
-    public static final boolean HAS_OFF_HAND = VERSION >= 1_9_0;
-
-    /**
-     * @see Player#getLocale()
-     * @since MC 1.12
-     */
-    public static final boolean HAS_PLAYER_LOCALE_METHOD = VERSION >= 1_12_0;
-
-    /**
-     * @see org.bukkit.inventory.meta.Damageable
-     * @since MC 1.13
-     */
-    public static final boolean HAS_DAMAGEABLE_ITEM_META = VERSION >= 1_13_0;
-
-    /**
-     * @see org.bukkit.Keyed
-     * @since MC 1.13
-     */
-    public static final boolean HAS_KEYED_API = VERSION >= 1_13_0;
-
-    /**
-     * @see Damageable#getAbsorptionAmount()
-     * @since MC 1.15
-     */
-    public static final boolean HAS_ABSORPTION_METHODS = VERSION >= 1_15_0;
-
-    /**
-     * @see Player#getPing()
-     * @since MC 1.17
-     */
-    public static final boolean HAS_PLAYER_PING_METHOD = VERSION >= 1_17_0;
-
-    private VersionHelper() { }
-
-    /**
-     * Gets the current server version
-     *
-     * @return A protocol like number representing the version, for example 1.16.5 - 1165
-     */
-    private static int getCurrentVersion() {
-        // No need to cache since will only run once
-        final Matcher matcher = Pattern.compile("(?<version>\\d+\\.\\d+)(?<patch>\\.\\d+)?").matcher(Bukkit.getBukkitVersion());
-        final StringBuilder stringBuilder = new StringBuilder();
-
-        if (matcher.find()) {
-            final String patch = matcher.group("patch");
-
-            stringBuilder
-                .append(matcher.group("version").replace(".", ""))
-                .append((patch == null) ? "0" : patch.replace(".", ""));
-        }
-
-        final Integer version = Ints.tryParse(stringBuilder.toString());
-
-        // Should never fail
-        if (version == null) {
-            throw new IllegalArgumentException("Could not retrieve server version!");
-        }
-
-        return version;
-    }
-
-}