updated pom to define compiler settings in properties, updated spigot and papi dependencies, updated spigot dependency to be provided

.gitignore

@@ -12,8 +12,6 @@ local.properties
 .loadpath
 .recommenders
 
-/.idea/
-
 # External tool builders
 .externalToolBuilders/
 
@@ -116,7 +114,7 @@ fabric.properties
 ### Intellij Patch ###
 # Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
 
-*.iml
+# *.iml
 # modules.xml
 # .idea/misc.xml
 # *.ipr
@@ -145,7 +143,4 @@ nbbuild/
 dist/
 nbdist/
 .nb-gradle/
-nbactions.xml
-
-### Piggy's Debugging Shit ###
-server/
+nbactions.xml

pom.xml

@@ -1,12 +1,13 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.extendedclip.papi.expansion.player</groupId>
-  <artifactId>player-expansion</artifactId>
-  <version>2.0.3</version>
+    <groupId>com.extendedclip.papi.expansion.player</groupId>
+    <artifactId>player-expansion</artifactId>
+    <version>1.7.2</version>
 
-  <name>PAPI-Expansion-Player</name>
-  <description>PlaceholderAPI expansion for player placeholders</description>
+    <name>PAPI-Expansion-Player</name>
+    <description>PlaceholderAPI expansion for player placeholders</description>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -14,6 +15,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+
     <repositories>
         <repository>
             <id>spigot-repo</id>
@@ -21,7 +23,7 @@
         </repository>
         <repository>
             <id>placeholderapi</id>
-            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+            <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
         </repository>
     </repositories>
 
@@ -30,17 +32,18 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.17-R0.1-SNAPSHOT</version>
+            <version>1.16.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-         <groupId>me.clip</groupId>
-          <artifactId>placeholderapi</artifactId>
-          <version>2.10.9</version>
-         <scope>provided</scope>
+            <groupId>me.clip</groupId>
+            <artifactId>placeholderapi</artifactId>
+            <version>2.10.6</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
+
     <build>
         <plugins>
             <plugin>

src/main/java/com/extendedclip/papi/expansion/player/PlayerExpansion.java

@@ -21,6 +21,9 @@
 
 package com.extendedclip.papi.expansion.player;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.expansion.Configurable;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
@@ -28,41 +31,18 @@ import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.World;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
-import org.bukkit.potion.PotionEffectType;
 
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import static com.extendedclip.papi.expansion.player.PlayerUtil.durability;
-import static com.extendedclip.papi.expansion.player.PlayerUtil.format12;
-import static com.extendedclip.papi.expansion.player.PlayerUtil.format24;
-import static com.extendedclip.papi.expansion.player.PlayerUtil.getBiome;
-import static com.extendedclip.papi.expansion.player.PlayerUtil.getCapitalizedBiome;
-import static com.extendedclip.papi.expansion.player.PlayerUtil.getEmptySlots;
-import static com.extendedclip.papi.expansion.player.PlayerUtil.getDirection;
-import static com.extendedclip.papi.expansion.player.PlayerUtil.getTotalExperience;
-import static com.extendedclip.papi.expansion.player.PlayerUtil.getXZDirection;
-import static com.extendedclip.papi.expansion.player.PlayerUtil.itemInHand;
+import java.util.Date;
 
-public final class PlayerExpansion extends PlaceholderExpansion implements Configurable {
-    private String low;
-    private String medium;
-    private String high;
+import static com.extendedclip.papi.expansion.player.PlayerUtil.*;
 
-    private int mediumValue;
-    private int highValue;
+public class PlayerExpansion extends PlaceholderExpansion implements Configurable {
 
-    private String north;
-    private String northEast;
-    private String east;
-    private String southEast;
-    private String south;
-    private String southWest;
-    private String west;
-    private String northWest;
+    private final String VERSION = getClass().getPackage().getImplementationVersion();
+
+    private String low, medium, high;
 
     @Override
     public String getIdentifier() {
@@ -76,36 +56,43 @@ public final class PlayerExpansion extends PlaceholderExpansion implements Confi
 
     @Override
     public String getVersion() {
-        return "2.0.3";
+        return VERSION;
     }
 
     @Override
     public Map<String, Object> getDefaults() {
         Map<String, Object> defaults = new HashMap<>();
-        defaults.put("ping_color.high", "&c");
+        defaults.put("ping_color.high", "&a");
         defaults.put("ping_color.medium", "&e");
-        defaults.put("ping_color.low", "&a");
-        defaults.put("ping_value.medium", 50);
-        defaults.put("ping_value.high", 100);
-        defaults.put("direction.north", "N");
-        defaults.put("direction.north_east", "NE");
-        defaults.put("direction.east", "E");
-        defaults.put("direction.south_east", "SE");
-        defaults.put("direction.south", "S");
-        defaults.put("direction.south_west", "SW");
-        defaults.put("direction.west", "W");
-        defaults.put("direction.north_west", "NW");
+        defaults.put("ping_color.low", "&c");
         return defaults;
     }
 
-    @Override
     public String onRequest(OfflinePlayer player, String identifier) {
+        high = this.getString("ping_color.high", "&a");
+        medium = this.getString("ping_color.medium", "&e");
+        low = this.getString("ping_color.low", "&c");
 
-        final boolean targetedPing = identifier.startsWith("ping_");
-        if (targetedPing || identifier.startsWith("colored_ping_")) {
-            final Player target = Bukkit.getPlayer(identifier.substring(targetedPing ? 5 : 13)); // yes, I know, magic value
-
-            return target == null ? "0" : retrievePing(target, false);
+        if (identifier.startsWith("ping_")) {
+            if (identifier.split("ping_").length > 1) {
+                identifier = identifier.split("ping_")[1];
+                Player t = Bukkit.getPlayer(identifier);
+                if (t != null) {
+                    return getPing(t);
+                }
+            }
+            return "0";
+        }
+        if (identifier.startsWith("colored_ping_")) {
+            if (identifier.split("colored_ping_").length > 1) {
+                identifier = identifier.split("colored_ping_")[1];
+                Player t = Bukkit.getPlayer(identifier);
+                if (t != null) {
+                    int p = Integer.valueOf(getPing(t));
+                    return ChatColor.translateAlternateColorCodes('&', p > 100 ? low : p >= 50 ? medium : high) + getPing(t);
+                }
+            }
+            return "0";
         }
 
         if (player == null) {
@@ -149,7 +136,6 @@ public final class PlayerExpansion extends PlaceholderExpansion implements Confi
             case "bed_world":
                 return player.getBedSpawnLocation() != null ? player.getBedSpawnLocation().getWorld()
                         .getName() : "";
-
         }
 
         // online placeholders
@@ -159,11 +145,6 @@ public final class PlayerExpansion extends PlaceholderExpansion implements Confi
 
         Player p = player.getPlayer();
 
-        // to get rid of IDE warnings
-        if (p == null) {
-            return "";
-        }
-
         if (identifier.startsWith("has_permission_")) {
             if (identifier.split("has_permission_").length > 1) {
                 String perm = identifier.split("has_permission_")[1];
@@ -172,22 +153,14 @@ public final class PlayerExpansion extends PlaceholderExpansion implements Confi
             return bool(false);
         }
 
-        if (identifier.startsWith("has_potioneffect_")) {
-            if (identifier.split("has_potioneffect_").length > 1) {
-                String effect = identifier.split("has_potioneffect_")[1];
-                PotionEffectType potion = PotionEffectType.getByName(effect);
-                return bool(p.hasPotionEffect(potion));
-            }
-        }
-
-        if (identifier.startsWith("item_in_hand_level_")) {
-            if (identifier.split("item_in_hand_level_").length > 1) {
+        if (identifier.startsWith("item_in_hand_level_")){
+            if (identifier.split("item_in_hand_level_").length > 1){
                 String enchantment = identifier.split("item_in_hand_level_")[1];
                 return String.valueOf(itemInHand(p).getEnchantmentLevel(Enchantment.getByName(enchantment)));
             }
             return "0";
         }
-        if (identifier.startsWith("item_in_offhand_level_")) {
+        if (identifier.startsWith("item_in_offhand_level_")){
             if (identifier.split("item_in_offhand_level_").length > 1) {
                 String enchantment = identifier.split("item_in_offhand_level_")[1];
                 return String.valueOf(p.getInventory().getItemInOffHand().getEnchantmentLevel(Enchantment.getByName(enchantment)));
@@ -195,43 +168,9 @@ public final class PlayerExpansion extends PlaceholderExpansion implements Confi
             return "0";
         }
 
-        if (identifier.startsWith("locale")) {
-            String localeStr = PlayerUtil.getLocale(p);
-            String localeStrISO = localeStr.replace("_", "-");
-
-            switch (identifier) {
-                case "locale":
-                    return localeStr;
-                case "locale_country":
-                    Locale locale = Locale.forLanguageTag(localeStrISO);
-                    if (locale == null)
-                        return "";
-                    return locale.getCountry();
-                case "locale_display_country":
-                    locale = Locale.forLanguageTag(localeStrISO);
-                    if (locale == null)
-                        return "";
-                    return locale.getDisplayCountry();
-                case "locale_display_name":
-                    locale = Locale.forLanguageTag(localeStrISO);
-                    if (locale == null)
-                        return "";
-                    return locale.getDisplayName();
-                case "locale_short":
-                    return localeStr.substring(0, localeStr.indexOf("_"));
-            }
-        }
-
         switch (identifier) {
-            case "absorption": {
-                if (VersionHelper.HAS_ABSORPTION_METHODS) {
-                    return Integer.toString((int) p.getAbsorptionAmount());
-                } else {
-                    return "-1";
-                }
-            }
             case "has_empty_slot":
-                return bool(p.getInventory().firstEmpty() > -1);
+                return bool(p.getInventory().firstEmpty() > - 1);
             case "empty_slots":
                 return String.valueOf(getEmptySlots(p));
             case "server":
@@ -239,66 +178,22 @@ public final class PlayerExpansion extends PlaceholderExpansion implements Confi
                 return "now available in the server expansion";
             case "displayname":
                 return p.getDisplayName();
-            case "list_name":
-                return p.getPlayerListName();
+            case "locale":
+                return p.getLocale();
             case "gamemode":
                 return p.getGameMode().name();
             case "direction":
-                switch (getDirection(p)) {
-                    case NORTH:
-                        return north;
-                    case NORTH_EAST:
-                        return northEast;
-                    case EAST:
-                        return east;
-                    case SOUTH_EAST:
-                        return southEast;
-                    case SOUTH:
-                        return south;
-                    case SOUTH_WEST:
-                        return southWest;
-                    case WEST:
-                        return west;
-                    case NORTH_WEST:
-                        return northWest;
-                }
-                return "";
-            case "direction_xz":
-                return getXZDirection(p);
+                return getCardinalDirection(p);
             case "world":
                 return p.getWorld().getName();
-            case "world_type":
-                World.Environment environment = p.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";
-                }
-                return "";
             case "x":
                 return String.valueOf(p.getLocation().getBlockX());
-            case "x_long":
-                return String.valueOf(p.getLocation().getX());
             case "y":
                 return String.valueOf(p.getLocation().getBlockY());
-            case "y_long":
-                return String.valueOf(p.getLocation().getY());
             case "z":
                 return String.valueOf(p.getLocation().getBlockZ());
-            case "z_long":
-                return String.valueOf(p.getLocation().getZ());
-            case "yaw":
-                return String.valueOf(p.getLocation().getYaw());
-            case "pitch":
-                return String.valueOf(p.getLocation().getPitch());
             case "biome":
-                return getBiome(p);
-            case "biome_capitalized":
-                return getCapitalizedBiome(p);
-            case "light_level":
-                return String.valueOf(p.getLocation().getBlock().getLightLevel());
+                return String.valueOf(p.getLocation().getBlock().getBiome());
             case "ip":
                 return p.getAddress().getAddress().getHostAddress();
             case "allow_flight":
@@ -313,8 +208,6 @@ public final class PlayerExpansion extends PlaceholderExpansion implements Confi
                 return p.getCompassTarget() != null ? String.valueOf(p.getCompassTarget().getBlockZ()) : "";
             case "compass_world":
                 return p.getCompassTarget() != null ? p.getCompassTarget().getWorld().getName() : "";
-            case "block_underneath":
-                return String.valueOf(p.getLocation().clone().subtract(0, 1, 0).getBlock().getType());
             case "custom_name":
                 return p.getCustomName() != null ? p.getCustomName() : p.getName();
             case "exp":
@@ -343,16 +236,12 @@ public final class PlayerExpansion extends PlaceholderExpansion implements Confi
                 return itemInHand(p).getType() != Material.AIR && itemInHand(p).getItemMeta().hasDisplayName() ? itemInHand(p).getItemMeta().getDisplayName() : "";
             case "item_in_hand_data":
                 return itemInHand(p).getType() != Material.AIR ? String.valueOf(itemInHand(p).getDurability()) : "0";
-            case "item_in_hand_durability":
-                return String.valueOf(durability(itemInHand(p)));
             case "item_in_offhand":
                 return String.valueOf(p.getInventory().getItemInOffHand().getType());
             case "item_in_offhand_name":
                 return p.getInventory().getItemInOffHand().getType() != Material.AIR && p.getInventory().getItemInOffHand().getItemMeta().hasDisplayName() ? p.getInventory().getItemInOffHand().getItemMeta().getDisplayName() : "";
             case "item_in_offhand_data":
                 return p.getInventory().getItemInOffHand().getType() != Material.AIR ? String.valueOf(p.getInventory().getItemInOffHand().getDurability()) : "0";
-            case "item_in_offhand_durability":
-                return String.valueOf(durability(p.getInventory().getItemInOffHand()));
             case "last_damage":
                 return String.valueOf(p.getLastDamage());
             case "max_health":
@@ -369,30 +258,23 @@ public final class PlayerExpansion extends PlaceholderExpansion implements Confi
                 return Optional.ofNullable(p.getInventory().getHelmet()).map(a -> a.getItemMeta().getDisplayName()).orElse("");
             case "armor_helmet_data":
                 return p.getInventory().getHelmet() != null ? String.valueOf(p.getInventory().getHelmet().getDurability()) : "0";
-            case "armor_helmet_durability":
-                return String.valueOf(durability(p.getInventory().getHelmet()));
             case "armor_chestplate_name":
                 return Optional.ofNullable(p.getInventory().getChestplate()).map(a -> a.getItemMeta().getDisplayName()).orElse("");
             case "armor_chestplate_data":
                 return p.getInventory().getChestplate() != null ? String.valueOf(p.getInventory().getChestplate().getDurability()) : "0";
-            case "armor_chestplate_durability":
-                return String.valueOf(durability(p.getInventory().getChestplate()));
             case "armor_leggings_name":
                 return Optional.ofNullable(p.getInventory().getLeggings()).map(a -> a.getItemMeta().getDisplayName()).orElse("");
             case "armor_leggings_data":
                 return p.getInventory().getLeggings() != null ? String.valueOf(p.getInventory().getLeggings().getDurability()) : "0";
-            case "armor_leggings_durability":
-                return String.valueOf(durability(p.getInventory().getLeggings()));
             case "armor_boots_name":
                 return Optional.ofNullable(p.getInventory().getBoots()).map(a -> a.getItemMeta().getDisplayName()).orElse("");
             case "armor_boots_data":
                 return p.getInventory().getBoots() != null ? String.valueOf(p.getInventory().getBoots().getDurability()) : "0";
-            case "armor_boots_durability":
-                return String.valueOf(durability(p.getInventory().getBoots()));
             case "ping":
-                return retrievePing(p, false);
+                return getPing(p);
             case "colored_ping":
-                return retrievePing(p, true);
+                int ping = Integer.valueOf(getPing(p));
+                return ChatColor.translateAlternateColorCodes('&', ping > 100 ? low : ping >= 50 ? medium : high) + getPing(p);
             case "time":
                 return String.valueOf(p.getPlayerTime());
             case "time_offset":
@@ -408,9 +290,9 @@ public final class PlayerExpansion extends PlaceholderExpansion implements Confi
             case "ticks_lived":
                 return String.valueOf(p.getTicksLived());
             case "seconds_lived":
-                return String.valueOf(p.getTicksLived() / 20);
+                return String.valueOf(p.getTicksLived() * 20);
             case "minutes_lived":
-                return String.valueOf((p.getTicksLived() / 20) / 60);
+                return String.valueOf((p.getTicksLived() * 20) / 60);
             case "walk_speed":
                 return String.valueOf(p.getWalkSpeed());
             case "weather_duration":
@@ -421,59 +303,13 @@ public final class PlayerExpansion extends PlaceholderExpansion implements Confi
                 return format12(p.getWorld().getTime());
             case "world_time_24":
                 return format24(p.getWorld().getTime());
-            case "is_flying":
-                return bool(p.isFlying());
-            case "is_sleeping":
-                return bool(p.isSleeping());
-            case "is_conversing":
-                return bool(p.isConversing());
-            case "is_dead":
-                return bool(p.isDead());
-            case "is_sneaking":
-                return bool(p.isSneaking());
-            case "is_sprinting":
-                return bool(p.isSprinting());
-            case "is_leashed":
-                return bool(p.isLeashed());
-            case "is_inside_vehicle":
-                return bool(p.isInsideVehicle());
         }
         // return null for unknown placeholders
         return null;
     }
 
-    @Override
-    public boolean register() {
-        low = this.getString("ping_color.low", "&a");
-        medium = this.getString("ping_color.medium", "&e");
-        high = this.getString("ping_color.high", "&c");
-        mediumValue = this.getInt("ping_value.medium", 50);
-        highValue = this.getInt("ping_value.high", 100);
-        north = this.getString("direction.north", "N");
-        northEast = this.getString("direction.north_east", "NE");
-        east = this.getString("direction.east", "E");
-        southEast = this.getString("direction.south_east", "SE");
-        south = this.getString("direction.south", "S");
-        southWest = this.getString("direction.south_west", "SW");
-        west = this.getString("direction.west", "W");
-        northWest = this.getString("direction.north_west", "NW");
-
-
-        return super.register();
-    }
-
     public String bool(boolean b) {
         return b ? PlaceholderAPIPlugin.booleanTrue() : PlaceholderAPIPlugin.booleanFalse();
     }
 
-
-    private String retrievePing(final Player player, final boolean colored) {
-        final int ping = PlayerUtil.getPing(player);
-        if (!colored) {
-            return String.valueOf(ping);
-        }
-
-        return ChatColor.translateAlternateColorCodes('&', ping > highValue ? high : ping > mediumValue ? medium : low) + ping;
-    }
-
-}
+}

src/main/java/com/extendedclip/papi/expansion/player/PlayerUtil.java

@@ -2,18 +2,15 @@ package com.extendedclip.papi.expansion.player;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Locale;
-import java.util.function.Function;
 
 /*
  *
@@ -35,154 +32,93 @@ import java.util.function.Function;
  *
  *
  */
-public final class PlayerUtil {
+public class PlayerUtil {
 
-    public static final int ticksAtMidnight = 18000;
-    public static final int ticksPerDay = 24000;
-    public static final int ticksPerHour = 1000;
-    public static final double ticksPerMinute = 1000d / 60d;
-    private static final SimpleDateFormat twentyFour = new SimpleDateFormat("HH:mm", Locale.ENGLISH);
-    private static final SimpleDateFormat twelve = new SimpleDateFormat("h:mm aa", Locale.ENGLISH);
-    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 };
+  public static final int ticksAtMidnight = 18000;
+  public static final int ticksPerDay = 24000;
+  public static final int ticksPerHour = 1000;
+  public static final double ticksPerMinute = 1000d / 60d;
+  public static final double ticksPerSecond = 1000d / 60d / 60d;
+  private static final SimpleDateFormat twentyFour = new SimpleDateFormat("HH:mm", Locale.ENGLISH);
+  private static final SimpleDateFormat twelve = new SimpleDateFormat("h:mm aa", Locale.ENGLISH);
 
-    private PlayerUtil() { }
-
-    private static final Function<Player, Integer> PLAYER_GET_PING = new Function<Player, Integer>() {
-
-        private Field ping;
-        private Method getHandle;
-
-        @Override
-        public Integer apply(final Player player) {
-            if (ping == null) {
-                try {
-                    cacheReflection(player);
-                } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException | NoSuchFieldException ex) {
-                    ex.printStackTrace();
-                }
-            }
-
-            try {
-                return ping.getInt(getHandle.invoke(player));
-            } catch (final IllegalAccessException | InvocationTargetException ex) {
-                ex.printStackTrace();
-            }
-            return -1;
-        }
-
-
-        private void cacheReflection(final Player player) throws NoSuchFieldException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
-            getHandle = player.getClass().getDeclaredMethod("getHandle");
-            getHandle.setAccessible(true);
-
-            final Object entityPlayer = getHandle.invoke(player);
-
-            ping = entityPlayer.getClass().getDeclaredField(VersionHelper.IS_1_17_OR_NEWER ? "e" : "ping");
-            ping.setAccessible(true);
-        }
-    };
-
-    private static final Function<Player, String> PLAYER_GET_LOCALE = new Function<Player, String>() {
-
-        private Field locale;
-        private Method getHandle;
-
-        @Override
-        public String apply(final Player player) {
-            if (locale == null) {
-                try {
-                    cacheReflection(player);
-                } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException | NoSuchFieldException ex) {
-                    ex.printStackTrace();
-                }
-            }
-
-            try {
-                final Object entityPlayer = getHandle.invoke(player);
-                return (String) locale.get(entityPlayer);
-            } catch (final IllegalAccessException | InvocationTargetException ex) {
-                ex.printStackTrace();
-            }
-            return "en_US";
-        }
-
-
-        private void cacheReflection(final Player player) throws NoSuchFieldException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
-            getHandle = player.getClass().getDeclaredMethod("getHandle");
-            getHandle.setAccessible(true);
-
-            final Object entityPlayer = getHandle.invoke(player);
-
-            locale = entityPlayer.getClass().getField("locale");
-        }
-    };
-
-
-    public static int getPing(final Player player) {
-        return PLAYER_GET_PING.apply(player);
+  public static String getPing(Player p) {
+    try {
+      Method getHandleMethod = p.getClass().getDeclaredMethod("getHandle", new Class[0]);
+      Object nmsplayer = getHandleMethod.invoke(p, new Object[0]);
+      Field pingField = nmsplayer.getClass().getDeclaredField("ping");
+      return String.valueOf(pingField.getInt(nmsplayer));
+    } catch (Exception e) {
+      e.printStackTrace();
     }
+    return "0";
+  }
 
-    public static String getLocale(final Player player) {
-        return PLAYER_GET_LOCALE.apply(player);
+  public static String format12(long ticks) {
+    try {
+      return twelve.format(twentyFour.parse(ticksToTime(ticks)));
+    } catch (ParseException e) {
+      return ticksToTime(ticks);
     }
+  }
 
-    public static String format12(long ticks) {
-        try {
-            return twelve.format(twentyFour.parse(ticksToTime(ticks)));
-        } catch (ParseException e) {
-            return ticksToTime(ticks);
-        }
+  public static String format24(long ticks) {
+    return ticksToTime(ticks);
+  }
+
+  private static String ticksToTime(long ticks) {
+    ticks = ticks - ticksAtMidnight + ticksPerDay;
+    long hours = ticks / ticksPerHour;
+    ticks -= hours * ticksPerHour;
+    long mins = (long) Math.floor(ticks / ticksPerMinute);
+    if (hours >= 24) {
+      hours = hours - 24;
     }
+    return (hours < 10 ? "0" + hours : hours) + ":" + (mins < 10 ? "0" + mins : mins);
+  }
 
-    public static String format24(long ticks) {
-        return ticksToTime(ticks);
+  public static String getCardinalDirection(Player player) {
+    double rotation = player.getLocation().getYaw() - 180.0F;
+    if (rotation < 0.0D) {
+      rotation += 360.0D;
     }
-
-    private static String ticksToTime(long ticks) {
-        ticks = ticks - ticksAtMidnight + ticksPerDay;
-        long hours = ticks / ticksPerHour;
-        ticks -= hours * ticksPerHour;
-        long mins = (long) Math.floor(ticks / ticksPerMinute);
-        if (hours >= 24) {
-            hours = hours - 24;
-        }
-        return (hours < 10 ? "0" + hours : hours) + ":" + (mins < 10 ? "0" + mins : mins);
+    if ((0.0D <= rotation) && (rotation < 22.5D)) {
+      return "N";
     }
-
-    public static BlockFace getDirection(Player player) {
-        return radial[Math.round(player.getLocation().getYaw() / 45f) & 0x7].getOppositeFace();
+    if ((22.5D <= rotation) && (rotation < 67.5D)) {
+      return "NE";
     }
-
-    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";
-        }
-
-        return "";
+    if ((67.5D <= rotation) && (rotation < 112.5D)) {
+      return "E";
     }
-
-    public static ItemStack itemInHand(Player p) {
-        try {
-            return p.getInventory().getItemInMainHand();
-        } catch (NoSuchMethodError e) {
-            return p.getInventory().getItemInHand();
-        }
+    if ((112.5D <= rotation) && (rotation < 157.5D)) {
+      return "SE";
     }
-
-    public static int durability(ItemStack item) {
-        return item != null ? item.getType().getMaxDurability() - item.getDurability() : 0;
+    if ((157.5D <= rotation) && (rotation < 202.5D)) {
+      return "S";
     }
+    if ((202.5D <= rotation) && (rotation < 247.5D) || (rotation <= -119.33) && (rotation > -179)) {
+      return "SW";
+    }
+    if ((247.5D <= rotation) && (rotation < 292.5D) || (rotation <= -59.66) && (rotation > -119.33)) {
+      return "W";
+    }
+    if ((292.5D <= rotation) && (rotation < 337.5D) || (rotation <= -0.0) && (rotation > -59.66)) {
+      return "NW";
+    }
+    if ((337.5D <= rotation) && (rotation < 360.0D)) {
+      return "N";
+    }
+    return "";
+  }
+
+  public static ItemStack itemInHand(Player p) {
+    try {
+      return p.getInventory().getItemInMainHand();
+    } catch (NoSuchMethodError e) {
+      return p.getInventory().getItemInHand();
+    }
+  }
 
     public static int getEmptySlots(Player p) {
         int slots = 0;
@@ -192,11 +128,11 @@ public final class PlayerUtil {
         }
 
         if (!Bukkit.getBukkitVersion().contains("1.7") && !Bukkit.getBukkitVersion().contains("1.8")) {
-            if (inv.getItemInOffHand() == null || inv.getItemInOffHand().getType() == Material.AIR) slots--;
-            if (inv.getHelmet() == null) slots--;
-            if (inv.getChestplate() == null) slots--;
-            if (inv.getLeggings() == null) slots--;
-            if (inv.getBoots() == null) slots--;
+          if (inv.getItemInOffHand() == null || inv.getItemInOffHand().getType() == Material.AIR) slots--;
+          if (inv.getHelmet() == null) slots--;
+          if (inv.getChestplate() == null) slots--;
+          if (inv.getLeggings() == null) slots--;
+          if (inv.getBoots() == null) slots--;
         }
         return slots;
     }
@@ -223,16 +159,4 @@ public final class PlayerUtil {
         }
         return experience;
     }
-
-    public static String getBiome(Player p) {
-        return String.valueOf(p.getLocation().getBlock().getBiome());
-    }
-
-    public static String getCapitalizedBiome(Player p) {
-        String[] biomeWords = getBiome(p).split("_");
-        for (int i = 0; i < biomeWords.length; i++) {
-            biomeWords[i] = biomeWords[i].substring(0, 1).toUpperCase() + biomeWords[i].substring(1).toLowerCase();
-        }
-        return String.join(" ", biomeWords);
-    }
 }

src/main/java/com/extendedclip/papi/expansion/player/VersionHelper.java

@@ -1,55 +0,0 @@
-package com.extendedclip.papi.expansion.player;
-
-import com.google.common.primitives.Ints;
-import org.bukkit.Bukkit;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @author Matt (<a href="https://github.com/ipsk">@ipsk</a>)
- */
-public final class VersionHelper {
-
-    private static final int VERSION = getCurrentVersion();
-
-    /**
-     * <a href="https://docs.docdex.helpch.at/1.15/org/bukkit/entity/Damageable.html#getAbsorptionAmount--">
-     * Damageable#getAbsorptionAmount
-     * </a>
-     */
-    public static final boolean HAS_ABSORPTION_METHODS = VERSION >= 1_15_0;
-
-    public static final boolean IS_1_17_OR_NEWER = 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;
-    }
-
-}