1.7.5 rc4

2 files changed, 13 insertions, 14 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/location/LocationUtils.java b/src/main/java/dev/tylerm/khs/command/location/LocationUtils.java
index 5e4afb5..8c8e3f7 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/location/LocationUtils.java
+++ b/src/main/java/dev/tylerm/khs/command/location/LocationUtils.java
@@ -1,17 +1,16 @@
-package net.tylermurphy.hideAndSeek.command.location;
+package dev.tylerm.khs.command.location;
 
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.configuration.Map;
-import net.tylermurphy.hideAndSeek.configuration.Maps;
-import net.tylermurphy.hideAndSeek.game.util.Status;
+import dev.tylerm.khs.Main;
+import dev.tylerm.khs.configuration.Config;
+import dev.tylerm.khs.configuration.Localization;
+import dev.tylerm.khs.configuration.Map;
+import dev.tylerm.khs.configuration.Maps;
+import dev.tylerm.khs.game.util.Status;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Consumer;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
-
 /**
  * @author bobby29831
  */
@@ -20,12 +19,12 @@ public class LocationUtils {
     public static void setLocation(@NotNull Player player, @NotNull Locations place, String mapName, @NotNull Consumer<Map> consumer) {
 
         if (Main.getInstance().getGame().getStatus() != Status.STANDBY) {
-            player.sendMessage(errorPrefix + message("GAME_INPROGRESS"));
+            player.sendMessage(Config.errorPrefix + Localization.message("GAME_INPROGRESS"));
             return;
         }
 
         if (player.getLocation().getBlockX() == 0 || player.getLocation().getBlockZ() == 0 || player.getLocation().getBlockY() == 0){
-            player.sendMessage(errorPrefix + message("NOT_AT_ZERO"));
+            player.sendMessage(Config.errorPrefix + Localization.message("NOT_AT_ZERO"));
             return;
         }
 
@@ -33,7 +32,7 @@ public class LocationUtils {
         if(mapName != null) {
             map = Maps.getMap(mapName);
             if (map == null) {
-                player.sendMessage(errorPrefix + message("INVALID_MAP"));
+                player.sendMessage(Config.errorPrefix + Localization.message("INVALID_MAP"));
                 return;
             }
         }
@@ -41,13 +40,13 @@ public class LocationUtils {
         try {
             consumer.accept(map);
         } catch (Exception e) {
-            player.sendMessage(errorPrefix + e.getMessage());
+            player.sendMessage(Config.errorPrefix + e.getMessage());
             return;
         }
 
         if(map != null)
             Maps.setMap(mapName, map);
-        player.sendMessage(messagePrefix + message(place.message()));
+        player.sendMessage(Config.messagePrefix + Localization.message(place.message()));
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/location/Locations.java b/src/main/java/dev/tylerm/khs/command/location/Locations.java
index c1316f8..c3d505c 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/location/Locations.java
+++ b/src/main/java/dev/tylerm/khs/command/location/Locations.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.command.location;
+package dev.tylerm.khs.command.location;
 
 /**
  * @author bobby29831