2 files changed, 24 insertions, 30 deletions

diff --git a/src/main/java/los/numeros/EPHS/Main.java b/src/main/java/los/numeros/EPHS/Main.java
index 530bc20..06ff133 100644
--- a/src/main/java/los/numeros/EPHS/Main.java
+++ b/src/main/java/los/numeros/EPHS/Main.java
@@ -14,25 +14,25 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.LiteralText;
-import los.numeros.HidersAndDiggers.modules.*;
+import los.numeros.EPHS.modules.*;
 
 public class Main implements Engine {
   BooleanSupplier running = () -> { return true; };
   Module modules[] = new Module[10];
 
-  public Main(ServerCommandSource source, int numDiggers) {
+  public Main(ServerCommandSource source, int numSeekers) {
     int i;
     MinecraftServer server = source.getMinecraftServer();
-    ServerPlayerEntity[] players, diggers, hiders;
+    ServerPlayerEntity[] players, seekers, hiders;
     Random r = new Random(new Date().getTime());
 
     /* get all the players on the server */
     Collection<ServerPlayerEntity> playerCollection = PlayerLookup.all(server);
     players = playerCollection.toArray(new ServerPlayerEntity[playerCollection.size()]);
 
-    /* create the hiders and diggers array of appropriate sizes */
-    diggers = new ServerPlayerEntity[numDiggers];
-    hiders = new ServerPlayerEntity[players.length - numDiggers];
+    /* create the hiders and seekers array of appropriate sizes */
+    seekers = new ServerPlayerEntity[numSeekers];
+    hiders = new ServerPlayerEntity[players.length - numSeekers];
 
     /* too few players to start the game */
     if (players.length <= 2) {
@@ -45,24 +45,24 @@ public class Main implements Engine {
       return;
     }
 
-    /* creates an array of diggers */
-    for (i = 0; numDiggers > 0; numDiggers--, i++) {
-      /* TODO: make sure the same person isn't picked to be all of the diggers */
-      diggers[i] = players[r.nextInt(players.length)];
+    /* creates an array of seekers */
+    for (i = 0; numSeekers > 0; numSeekers--, i++) {
+      /* TODO: make sure the same person isn't picked to be all of the seekers */
+      seekers[i] = players[r.nextInt(players.length)];
     }
 
     /* creates an array of hiders */
     i = 0;
     for (ServerPlayerEntity p : players) {
-      /* add all players who arent diggers to the hiders array */
-      if (!hasPlayer(diggers, p)) {
+      /* add all players who arent seekers to the hiders array */
+      if (!hasPlayer(seekers, p)) {
         hiders[i++] = p;
       }
     }
 
     /* populate the modules */
-    modules[0] = new MainModule(diggers, hiders, players, source);
-    modules[1] = new GameClockModule(diggers, hiders, players, server);
+    modules[0] = new MainModule(seekers, hiders, players, source);
+    modules[1] = new GameClockModule(seekers, hiders, players, server);
 
     /* start the game */
     Engine.StartEngine(running, modules);
diff --git a/src/main/java/los/numeros/EPHS/modules/GameClockModule.java b/src/main/java/los/numeros/EPHS/modules/GameClockModule.java
index 9c64a88..0906a55 100644
--- a/src/main/java/los/numeros/EPHS/modules/GameClockModule.java
+++ b/src/main/java/los/numeros/EPHS/modules/GameClockModule.java
@@ -4,9 +4,6 @@ import java.util.UUID;
 
 import los.numeros.GameEngine.Module;
 import los.numeros.utils.MinecraftTick;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
-import net.minecraft.entity.effect.StatusEffectInstance;
-import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.network.MessageType;
 import net.minecraft.network.packet.s2c.play.TitleS2CPacket;
 import net.minecraft.server.MinecraftServer;
@@ -17,17 +14,14 @@ import net.minecraft.text.Style;
 import net.minecraft.text.TextColor;
 
 public class GameClockModule implements Module {
-  private ServerPlayerEntity[] diggers, hiders, players;
+  private ServerPlayerEntity[] seekers, hiders, players;
   private MinecraftServer server;
   private MinecraftTick minecraftTick = new MinecraftTick();
   private int i, j;
-  private LiteralText diggersString;
+  private LiteralText seekersString;
 
-  private long tickCounter;
-  private boolean hidersVisible = false;
-
-  public GameClockModule(ServerPlayerEntity diggers[], ServerPlayerEntity hiders[], ServerPlayerEntity[] players, MinecraftServer server) {
-    this.diggers = diggers;
+  public GameClockModule(ServerPlayerEntity seekers[], ServerPlayerEntity hiders[], ServerPlayerEntity[] players, MinecraftServer server) {
+    this.seekers = seekers;
     this.hiders = hiders;
     this.players = players;
     this.server = server;
@@ -75,25 +69,25 @@ public class GameClockModule implements Module {
     /* wait 20 seconds */
     minecraftTick.delayCallback(MinecraftTick.secondToTick(20), (tickDelay) -> {
       /* make title screen adhere to gammar */
-      if (diggers.length > 1) {
-        diggersString = new LiteralText("The Diggers are Digging");
+      if (seekers.length > 1) {
+        seekersString = new LiteralText("The Seekers are Seeking");
       } else {
-        diggersString = new LiteralText("The Digger is Digging");
+        seekersString = new LiteralText("The Seeker is Seeking");
       }
 
       /* style text */
-      diggersString.setStyle(Style.EMPTY.withColor(TextColor.parse("red")));
+      seekersString.setStyle(Style.EMPTY.withColor(TextColor.parse("red")));
 
       /* send chat message */
       server.getPlayerManager().broadcastChatMessage(
-        diggersString,
+        seekersString,
         MessageType.SYSTEM,
         new UUID(0, 0)
       );
 
       /* set title screen */
       server.getPlayerManager().sendToAll(
-        new TitleS2CPacket(TitleS2CPacket.Action.TITLE, diggersString)
+        new TitleS2CPacket(TitleS2CPacket.Action.TITLE, seekersString)
       );
 
       for (ServerPlayerEntity p : players) {