8 files changed, 46 insertions, 18 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/Location.java b/src/main/java/dev/tylerm/khs/util/Location.java
index 916b6f9..658b3cc 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/Location.java
+++ b/src/main/java/dev/tylerm/khs/util/Location.java
@@ -1,7 +1,7 @@
-package net.tylermurphy.hideAndSeek.util;
+package dev.tylerm.khs.util;
 
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.world.VoidGenerator;
+import dev.tylerm.khs.world.VoidGenerator;
+import dev.tylerm.khs.Main;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.spawnPatch;
+import static dev.tylerm.khs.configuration.Config.spawnPatch;
 
 public class Location {
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java b/src/main/java/dev/tylerm/khs/util/PAPIExpansion.java
index 8e4078e..e29a098 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/PAPIExpansion.java
+++ b/src/main/java/dev/tylerm/khs/util/PAPIExpansion.java
@@ -1,9 +1,12 @@
-package net.tylermurphy.hideAndSeek.util;
+package dev.tylerm.khs.util;
 
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.database.Database;
-import net.tylermurphy.hideAndSeek.database.util.PlayerInfo;
+import dev.tylerm.khs.Main;
+import dev.tylerm.khs.database.Database;
+import dev.tylerm.khs.database.util.PlayerInfo;
+import dev.tylerm.khs.game.Board;
+import dev.tylerm.khs.game.util.Status;
+
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -11,8 +14,8 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Optional;
 import java.util.UUID;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.placeholderError;
-import static net.tylermurphy.hideAndSeek.configuration.Config.placeholderNoData;
+import static dev.tylerm.khs.configuration.Config.placeholderError;
+import static dev.tylerm.khs.configuration.Config.placeholderNoData;
 
 public class PAPIExpansion extends PlaceholderExpansion  {
 
@@ -28,7 +31,7 @@ public class PAPIExpansion extends PlaceholderExpansion  {
 
     @Override
     public @NotNull String getVersion() {
-        return "1.4.3";
+        return "1.7.5";
     }
 
     @Override
@@ -41,8 +44,33 @@ public class PAPIExpansion extends PlaceholderExpansion  {
     public String onRequest(OfflinePlayer player, @NotNull String params) {
         Database database = Main.getInstance().getDatabase();
         String[] args = params.split("_");
+        Status status = Main.getInstance().getGame().getStatus();
+        Board board = Main.getInstance().getBoard();
+
+        System.out.println(args);
 
         if (args.length < 1) return null;
+
+        if (args.length == 1 && args[0].equals("hiders")) {
+            if (!board.containsUUID(player.getUniqueId())) {
+                return "-";
+            } else if (status == Status.PLAYING || status == Status.STARTING) {
+                return "" + Main.getInstance().getBoard().getHiders().size();
+            } else {
+                return "-";
+            }
+        }
+        
+        if (args.length == 1 && args[0].equals("seekers")) {
+            if (!board.containsUUID(player.getUniqueId())) {
+                return "-";
+            } else if (status == Status.PLAYING || status == Status.STARTING) {
+                return "" + Main.getInstance().getBoard().getSeekers().size();
+            } else {
+                return "-";
+            }
+        }
+
         if ((args.length == 2 || args.length == 3) && (args[0].equals("stats") || args[0].equals("rank-place"))) {
             Optional<PlayerInfo> info = this.getPlayerInfo(args.length == 2 ? player.getUniqueId() : database.getNameData().getUUID(args[2]));
             if (info.isPresent()) {
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/Pair.java b/src/main/java/dev/tylerm/khs/util/Pair.java
index 0aad195..a650e76 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/Pair.java
+++ b/src/main/java/dev/tylerm/khs/util/Pair.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.util;
+package dev.tylerm.khs.util;
 
 public class Pair<L, R> {
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/Tuple.java b/src/main/java/dev/tylerm/khs/util/Tuple.java
index 5a40ff8..64ebda6 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/Tuple.java
+++ b/src/main/java/dev/tylerm/khs/util/Tuple.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.util;
+package dev.tylerm.khs.util;
 
 public class Tuple<L, C, R> {
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/packet/AbstractPacket.java b/src/main/java/dev/tylerm/khs/util/packet/AbstractPacket.java
index 4e3fc3b..e6113ac 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/packet/AbstractPacket.java
+++ b/src/main/java/dev/tylerm/khs/util/packet/AbstractPacket.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.util.packet;
+package dev.tylerm.khs.util.packet;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/packet/BlockChangePacket.java b/src/main/java/dev/tylerm/khs/util/packet/BlockChangePacket.java
index 53f3f9c..0603832 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/packet/BlockChangePacket.java
+++ b/src/main/java/dev/tylerm/khs/util/packet/BlockChangePacket.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.util.packet;
+package dev.tylerm.khs.util.packet;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.wrappers.BlockPosition;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/packet/EntityMetadataPacket.java b/src/main/java/dev/tylerm/khs/util/packet/EntityMetadataPacket.java
index 051e4ae..cf5d2a1 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/packet/EntityMetadataPacket.java
+++ b/src/main/java/dev/tylerm/khs/util/packet/EntityMetadataPacket.java
@@ -1,11 +1,11 @@
-package net.tylermurphy.hideAndSeek.util.packet;
+package dev.tylerm.khs.util.packet;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.wrappers.WrappedDataValue;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher;
 import com.comphenix.protocol.wrappers.WrappedWatchableObject;
 
-import net.tylermurphy.hideAndSeek.Main;
+import dev.tylerm.khs.Main;
 
 import org.bukkit.entity.Entity;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/packet/EntityTeleportPacket.java b/src/main/java/dev/tylerm/khs/util/packet/EntityTeleportPacket.java
index b3c7734..cd29e28 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/packet/EntityTeleportPacket.java
+++ b/src/main/java/dev/tylerm/khs/util/packet/EntityTeleportPacket.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.util.packet;
+package dev.tylerm.khs.util.packet;
 
 import com.comphenix.protocol.PacketType;
 import org.bukkit.entity.Entity;