Merge pull request #60 from BlitzOffline/master

Made direction output configurable

Author: BlitzOffline

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

@@ -32,7 +32,6 @@
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffectType;
-import org.bukkit.Location;
 
 import java.util.*;
 import java.util.regex.Matcher;
@@ -42,8 +41,8 @@
 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.getCardinalDirection;
 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;
@@ -56,6 +55,15 @@ public final class PlayerExpansion extends PlaceholderExpansion implements Confi
     private int mediumValue;
     private int highValue;
 
+    private String north;
+    private String northEast;
+    private String east;
+    private String southEast;
+    private String south;
+    private String southWest;
+    private String west;
+    private String northWest;
+
     @Override
     public String getIdentifier() {
         return "player";
@@ -79,6 +87,14 @@ public Map<String, Object> getDefaults() {
         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");
         return defaults;
     }
 
@@ -214,7 +230,25 @@ public String onRequest(OfflinePlayer player, String identifier) {
             case "gamemode":
                 return p.getGameMode().name();
             case "direction":
-                return getCardinalDirection(p);
+                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);
             case "world":
@@ -401,6 +435,14 @@ public boolean register() {
         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();

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

@@ -2,6 +2,7 @@
 
 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;
@@ -42,6 +43,7 @@ public final class PlayerUtil {
     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 };
 
     private PlayerUtil() {
     }
@@ -148,39 +150,8 @@ private static String ticksToTime(long ticks) {
         return (hours < 10 ? "0" + hours : hours) + ":" + (mins < 10 ? "0" + mins : mins);
     }
 
-    public static String getCardinalDirection(Player player) {
-        double rotation = player.getLocation().getYaw() - 180.0F;
-        if (rotation < 0.0D) {
-            rotation += 360.0D;
-        }
-        if ((0.0D <= rotation) && (rotation < 22.5D)) {
-            return "N";
-        }
-        if ((22.5D <= rotation) && (rotation < 67.5D)) {
-            return "NE";
-        }
-        if ((67.5D <= rotation) && (rotation < 112.5D)) {
-            return "E";
-        }
-        if ((112.5D <= rotation) && (rotation < 157.5D)) {
-            return "SE";
-        }
-        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 BlockFace getDirection(Player player) {
+        return radial[Math.round(player.getLocation().getYaw() / 45f) & 0x7].getOppositeFace();
     }
 
     public static String getXZDirection(Player player) {