Merge pull request '1.7.5' (#10) from dev into main

Reviewed-on: https://g.tylerm.dev/tylermurphy534/KenshinsHideAndSeek/pulls/10

17 files changed, 387 insertions, 211 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/map/Add.java b/src/main/java/dev/tylerm/khs/command/map/Add.java
index 72f0740..761db0f 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/map/Add.java
+++ b/src/main/java/dev/tylerm/khs/command/map/Add.java
@@ -1,35 +1,33 @@
-package net.tylermurphy.hideAndSeek.command.map;
+package dev.tylerm.khs.command.map;
 
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.command.util.ICommand;
-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.command.util.ICommand;
+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.Collections;
 import java.util.List;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.errorPrefix;
-import static net.tylermurphy.hideAndSeek.configuration.Config.messagePrefix;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
-
 public class Add implements ICommand {
 
     public void execute(Player sender, String[] args) {
         if (Main.getInstance().getGame().getStatus() != Status.STANDBY) {
-            sender.sendMessage(errorPrefix + message("GAME_INPROGRESS"));
+            sender.sendMessage(Config.errorPrefix + Localization.message("GAME_INPROGRESS"));
             return;
         }
         Map map = Maps.getMap(args[0]);
         if(map != null) {
-            sender.sendMessage(errorPrefix + message("MAP_ALREADY_EXISTS"));
+            sender.sendMessage(Config.errorPrefix + Localization.message("MAP_ALREADY_EXISTS"));
         } else if(!args[0].matches("[a-zA-Z0-9]*") || args[0].length() < 1) {
-            sender.sendMessage(errorPrefix + message("INVALID_MAP_NAME"));
+            sender.sendMessage(Config.errorPrefix + Localization.message("INVALID_MAP_NAME"));
         } else {
             Maps.setMap(args[0], new Map(args[0]));
-            sender.sendMessage(messagePrefix + message("MAP_CREATED").addAmount(args[0]));
+            sender.sendMessage(Config.messagePrefix + Localization.message("MAP_CREATED").addAmount(args[0]));
         }
     }
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/map/Debug.java b/src/main/java/dev/tylerm/khs/command/map/Debug.java
index 209d0d6..07f4e69 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/map/Debug.java
+++ b/src/main/java/dev/tylerm/khs/command/map/Debug.java
@@ -1,11 +1,13 @@
-package net.tylermurphy.hideAndSeek.command.map;
+package dev.tylerm.khs.command.map;
 
 import com.cryptomorin.xseries.XMaterial;
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.command.util.ICommand;
-import net.tylermurphy.hideAndSeek.configuration.Maps;
-import net.tylermurphy.hideAndSeek.game.PlayerLoader;
-import net.tylermurphy.hideAndSeek.game.util.Status;
+import dev.tylerm.khs.Main;
+import dev.tylerm.khs.command.util.ICommand;
+import dev.tylerm.khs.configuration.Config;
+import dev.tylerm.khs.configuration.Localization;
+import dev.tylerm.khs.configuration.Maps;
+import dev.tylerm.khs.game.PlayerLoader;
+import dev.tylerm.khs.game.util.Status;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -20,46 +22,43 @@ import java.util.Map;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
-
 public class Debug implements ICommand {
 
     private static final Map<Player, Map<Integer, Consumer<Player>>> debugMenuFunctions = new HashMap<>();
 
     public void execute(Player sender, String[] args) {
-        net.tylermurphy.hideAndSeek.configuration.Map map = Maps.getMap(args[0]);
+        dev.tylerm.khs.configuration.Map map = Maps.getMap(args[0]);
         if(map == null) {
-            sender.sendMessage(errorPrefix + message("INVALID_MAP"));
+            sender.sendMessage(Config.errorPrefix + Localization.message("INVALID_MAP"));
             return;
         }
         Inventory debugMenu = createMenu(map, sender);
         sender.openInventory(debugMenu);
     }
 
-    private Inventory createMenu(net.tylermurphy.hideAndSeek.configuration.Map map, Player sender){
+    private Inventory createMenu(dev.tylerm.khs.configuration.Map map, Player sender){
         Map<Integer, Consumer<Player>> functions = new HashMap<>();
         Inventory debugMenu = Main.getInstance().getServer().createInventory(null, 9, "Debug Menu");
         debugMenu.setItem(0, createOption(functions, 0, XMaterial.LEATHER_CHESTPLATE.parseMaterial(), "&6Become a &lHider", 1, player -> {
-            if(mapSaveEnabled) {
+            if(Config.mapSaveEnabled) {
                 if(map.getGameSpawn().getWorld() == null) map.getWorldLoader().loadMap();
             }
             Main.getInstance().getBoard().addHider(player);
             PlayerLoader.loadHider(player, map);
-            if(Main.getInstance().getGame().getStatus() != Status.STARTING)
+            if(Main.getInstance().getGame().getStatus() != dev.tylerm.khs.game.util.Status.STARTING)
                 PlayerLoader.resetPlayer(player, Main.getInstance().getBoard());
         }));
         debugMenu.setItem(1, createOption(functions, 1, XMaterial.GOLDEN_CHESTPLATE.parseMaterial(), "&cBecome a &lSeeker", 1, player -> {
-            if(mapSaveEnabled) {
+            if(Config.mapSaveEnabled) {
                 if(map.getGameSpawn().getWorld() == null) map.getWorldLoader().loadMap();
             }
             Main.getInstance().getBoard().addSeeker(player);
             PlayerLoader.loadSeeker(player, map);
-            if(Main.getInstance().getGame().getStatus() != Status.STARTING)
+            if(Main.getInstance().getGame().getStatus() != dev.tylerm.khs.game.util.Status.STARTING)
                 PlayerLoader.resetPlayer(player, Main.getInstance().getBoard());
         }));
         debugMenu.setItem(2, createOption(functions, 2, XMaterial.IRON_CHESTPLATE.parseMaterial(), "&8Become a &lSpectator", 1, player -> {
-            if(mapSaveEnabled) {
+            if(Config.mapSaveEnabled) {
                 if(map.getGameSpawn().getWorld() == null) map.getWorldLoader().loadMap();
             }
             Main.getInstance().getBoard().addSpectator(player);
@@ -68,7 +67,7 @@ public class Debug implements ICommand {
         debugMenu.setItem(3, createOption(functions, 3, XMaterial.BARRIER.parseMaterial(), "&cUnload from Game", 1, player -> {
             Main.getInstance().getBoard().remove(player);
             PlayerLoader.unloadPlayer(player);
-            exitPosition.teleport(player);
+            Config.exitPosition.teleport(player);
         }));
         debugMenu.setItem(4, createOption(functions, 4, XMaterial.BARRIER.parseMaterial(), "&cDie In Game", 2, player -> {
             if((Main.getInstance().getBoard().isSeeker(player) || Main.getInstance().getBoard().isHider(player)) && Main.getInstance().getGame().getStatus() == Status.PLAYING){
@@ -115,7 +114,7 @@ public class Debug implements ICommand {
 
     public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
         if(parameter.equals("map")) {
-            return Maps.getAllMaps().stream().map(net.tylermurphy.hideAndSeek.configuration.Map::getName).collect(Collectors.toList());
+            return Maps.getAllMaps().stream().map(dev.tylerm.khs.configuration.Map::getName).collect(Collectors.toList());
         }
         return null;
     }
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/map/GoTo.java b/src/main/java/dev/tylerm/khs/command/map/GoTo.java
index 7d27642..5cce5a6 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/map/GoTo.java
+++ b/src/main/java/dev/tylerm/khs/command/map/GoTo.java
@@ -1,8 +1,10 @@
-package net.tylermurphy.hideAndSeek.command.map;
+package dev.tylerm.khs.command.map;
 
-import net.tylermurphy.hideAndSeek.command.util.ICommand;
-import net.tylermurphy.hideAndSeek.configuration.Map;
-import net.tylermurphy.hideAndSeek.configuration.Maps;
+import dev.tylerm.khs.command.util.ICommand;
+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 org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
@@ -10,19 +12,16 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
-
 public class GoTo implements ICommand {
 
     public void execute(Player sender, String[] args) {
         Map map = Maps.getMap(args[0]);
         if(map == null) {
-            sender.sendMessage(errorPrefix + message("INVALID_MAP"));
+            sender.sendMessage(Config.errorPrefix + Localization.message("INVALID_MAP"));
             return;
         }
         if (map.isNotSetup()) {
-            sender.sendMessage(errorPrefix + message("MAP_NOT_SETUP").addAmount(map.getName()));
+            sender.sendMessage(Config.errorPrefix + Localization.message("MAP_NOT_SETUP").addAmount(map.getName()));
             return;
         }
         switch (args[1].toLowerCase()) {
@@ -33,9 +32,9 @@ public class GoTo implements ICommand {
             case "seekerlobby":
                 map.getSeekerLobby().teleport(sender); break;
             case "exit":
-                exitPosition.teleport(sender); break;
+                Config.exitPosition.teleport(sender); break;
             default:
-                sender.sendMessage(errorPrefix + message("COMMAND_INVALID_ARG").addAmount(args[1].toLowerCase()));
+                sender.sendMessage(Config.errorPrefix + Localization.message("COMMAND_INVALID_ARG").addAmount(args[1].toLowerCase()));
         }
     }
 
@@ -53,7 +52,7 @@ public class GoTo implements ICommand {
 
     public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
         if(parameter.equals("map")) {
-            return Maps.getAllMaps().stream().map(net.tylermurphy.hideAndSeek.configuration.Map::getName).collect(Collectors.toList());
+            return Maps.getAllMaps().stream().map(Map::getName).collect(Collectors.toList());
         } else if(parameter.equals("spawn")) {
             return Arrays.asList("spawn","lobby","seekerlobby","exit");
         }
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/map/List.java b/src/main/java/dev/tylerm/khs/command/map/List.java
index ac2badf..987138d 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/map/List.java
+++ b/src/main/java/dev/tylerm/khs/command/map/List.java
@@ -1,27 +1,25 @@
-package net.tylermurphy.hideAndSeek.command.map;
+package dev.tylerm.khs.command.map;
 
-import net.tylermurphy.hideAndSeek.command.util.ICommand;
-import net.tylermurphy.hideAndSeek.configuration.Map;
-import net.tylermurphy.hideAndSeek.configuration.Maps;
+import dev.tylerm.khs.command.util.ICommand;
+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 org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.errorPrefix;
-import static net.tylermurphy.hideAndSeek.configuration.Config.messagePrefix;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
-
 public class List implements ICommand {
 
     public void execute(Player sender, String[] args) {
         Collection<Map> maps = Maps.getAllMaps();
         if(maps.size() < 1) {
-            sender.sendMessage(errorPrefix + message("NO_MAPS"));
+            sender.sendMessage(Config.errorPrefix + Localization.message("NO_MAPS"));
             return;
         }
-        StringBuilder response = new StringBuilder(messagePrefix + message("LIST_MAPS"));
+        StringBuilder response = new StringBuilder(Config.messagePrefix + Localization.message("LIST_MAPS"));
         for(Map map : maps) {
             response.append("\n    ").append(map.getName()).append(": ").append(map.isNotSetup() ? ChatColor.RED + "NOT SETUP" : ChatColor.GREEN + "SETUP").append(ChatColor.WHITE);
         }
diff --git a/src/main/java/dev/tylerm/khs/command/map/Remove.java b/src/main/java/dev/tylerm/khs/command/map/Remove.java
new file mode 100644
index 0000000..b5231a5
--- /dev/null
+++ b/src/main/java/dev/tylerm/khs/command/map/Remove.java
@@ -0,0 +1,52 @@
+package dev.tylerm.khs.command.map;
+
+import dev.tylerm.khs.Main;
+import dev.tylerm.khs.command.util.ICommand;
+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.List;
+import java.util.stream.Collectors;
+
+public class Remove implements ICommand {
+
+    public void execute(Player sender, String[] args) {
+        if (Main.getInstance().getGame().getStatus() != Status.STANDBY) {
+            sender.sendMessage(Config.errorPrefix + Localization.message("GAME_INPROGRESS"));
+            return;
+        }
+        Map map = Maps.getMap(args[0]);
+        if(map == null) {
+            sender.sendMessage(Config.errorPrefix + Localization.message("INVALID_MAP"));
+        } else if(!Maps.removeMap(args[0])){
+            sender.sendMessage(Config.errorPrefix + Localization.message("MAP_FAIL_DELETE").addAmount(args[0]));
+        } else {
+            sender.sendMessage(Config.messagePrefix + Localization.message("MAP_DELETED").addAmount(args[0]));
+        }
+    }
+
+    public String getLabel() {
+        return "remove";
+    }
+
+    public String getUsage() {
+        return "<map>";
+    }
+
+    public String getDescription() {
+        return "Remove a map from the plugin!";
+    }
+
+    public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
+        if(parameter.equals("map")) {
+            return Maps.getAllMaps().stream().map(Map::getName).collect(Collectors.toList());
+        }
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/map/Save.java b/src/main/java/dev/tylerm/khs/command/map/Save.java
index 03e23a8..86871d4 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/map/Save.java
+++ b/src/main/java/dev/tylerm/khs/command/map/Save.java
@@ -1,10 +1,12 @@
-package net.tylermurphy.hideAndSeek.command.map;
+package dev.tylerm.khs.command.map;
 
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.command.util.ICommand;
-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.command.util.ICommand;
+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.World;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -13,40 +15,37 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
-
 public class Save implements ICommand {
 
 	public static boolean runningBackup = false;
 	
 	public void execute(Player sender, String[] args) {
-		if (!mapSaveEnabled) {
-			sender.sendMessage(errorPrefix + message("MAPSAVE_DISABLED"));
+		if (!Config.mapSaveEnabled) {
+			sender.sendMessage(Config.errorPrefix + Localization.message("MAPSAVE_DISABLED"));
 			return;
 		}
 		if (Main.getInstance().getGame().getStatus() != Status.STANDBY) {
-			sender.sendMessage(errorPrefix + message("GAME_INPROGRESS"));
+			sender.sendMessage(Config.errorPrefix + Localization.message("GAME_INPROGRESS"));
 			return;
 		}
 		Map map = Maps.getMap(args[0]);
 		if(map == null) {
-			sender.sendMessage(errorPrefix + message("INVALID_MAP"));
+			sender.sendMessage(Config.errorPrefix + Localization.message("INVALID_MAP"));
 			return;
 		}
 		if (map.getSpawn().isNotSetup()) {
-			sender.sendMessage(errorPrefix + message("ERROR_GAME_SPAWN"));
+			sender.sendMessage(Config.errorPrefix + Localization.message("ERROR_GAME_SPAWN"));
 			return;
 		}
 		if (map.isBoundsNotSetup()) {
-			sender.sendMessage(errorPrefix + message("ERROR_MAP_BOUNDS"));
+			sender.sendMessage(Config.errorPrefix + Localization.message("ERROR_MAP_BOUNDS"));
 			return;
 		}
-		sender.sendMessage(messagePrefix + message("MAPSAVE_START"));
-		sender.sendMessage(warningPrefix + message("MAPSAVE_WARNING"));
+		sender.sendMessage(Config.messagePrefix + Localization.message("MAPSAVE_START"));
+		sender.sendMessage(Config.warningPrefix + Localization.message("MAPSAVE_WARNING"));
 		World world = map.getSpawn().load();
 		if (world == null) {
-			sender.sendMessage(warningPrefix + message("MAPSAVE_FAIL_WORLD"));
+			sender.sendMessage(Config.warningPrefix + Localization.message("MAPSAVE_FAIL_WORLD"));
 			return;
 		}
 		world.save();
@@ -76,7 +75,7 @@ public class Save implements ICommand {
 
 	public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
 		if(parameter.equals("map")) {
-			return Maps.getAllMaps().stream().map(net.tylermurphy.hideAndSeek.configuration.Map::getName).collect(Collectors.toList());
+			return Maps.getAllMaps().stream().map(Map::getName).collect(Collectors.toList());
 		}
 		return null;
 	}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/map/Status.java b/src/main/java/dev/tylerm/khs/command/map/Status.java
index 79036b1..869fc26 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/map/Status.java
+++ b/src/main/java/dev/tylerm/khs/command/map/Status.java
@@ -1,58 +1,57 @@
-package net.tylermurphy.hideAndSeek.command.map;
+package dev.tylerm.khs.command.map;
 
-import net.tylermurphy.hideAndSeek.command.util.ICommand;
-import net.tylermurphy.hideAndSeek.configuration.Map;
-import net.tylermurphy.hideAndSeek.configuration.Maps;
+import dev.tylerm.khs.command.util.ICommand;
+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 org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
-
 public class Status implements ICommand {
 	
 	public void execute(Player sender, String[] args) {
 		
-		String msg = message("SETUP").toString();
+		String msg = Localization.message("SETUP").toString();
 		int count = 0;
 		Map map = Maps.getMap(args[0]);
 		if(map == null) {
-			sender.sendMessage(errorPrefix + message("INVALID_MAP"));
+			sender.sendMessage(Config.errorPrefix + Localization.message("INVALID_MAP"));
 			return;
 		}
 		if (map.getSpawn().getBlockX() == 0 && map.getSpawn().getBlockY() == 0 && map.getSpawn().getBlockZ() == 0 || !map.getSpawn().exists()) {
-			msg = msg + "\n" + message("SETUP_GAME");
+			msg = msg + "\n" + Localization.message("SETUP_GAME");
 			count++;
 		}
 		if (map.getLobby().getBlockX() == 0 && map.getLobby().getBlockY() == 0 && map.getLobby().getBlockZ() == 0 || !map.getLobby().exists()) {
-			msg = msg + "\n" + message("SETUP_LOBBY");
+			msg = msg + "\n" + Localization.message("SETUP_LOBBY");
 			count++;
 		}
 		if (map.getSeekerLobby().getBlockX() == 0 && map.getSeekerLobby().getBlockY() == 0 && map.getSeekerLobby().getBlockZ() == 0 || !map.getSeekerLobby().exists()) {
-			msg = msg + "\n" + message("SETUP_SEEKER_LOBBY");
+			msg = msg + "\n" + Localization.message("SETUP_SEEKER_LOBBY");
 			count++;
 		}
-		if (exitPosition.getBlockX() == 0 && exitPosition.getBlockY() == 0 && exitPosition.getBlockZ() == 0 || !exitPosition.exists()) {
-			msg = msg + "\n" + message("SETUP_EXIT");
+		if (Config.exitPosition.getBlockX() == 0 && Config.exitPosition.getBlockY() == 0 && Config.exitPosition.getBlockZ() == 0 || !Config.exitPosition.exists()) {
+			msg = msg + "\n" + Localization.message("SETUP_EXIT");
 			count++;
 		}
 		if (map.isBoundsNotSetup()) {
-			msg = msg + "\n" + message("SETUP_BOUNDS");
+			msg = msg + "\n" + Localization.message("SETUP_BOUNDS");
 			count++;
 		}
-		if (mapSaveEnabled && !map.getGameSpawn().exists()) {
-			msg = msg + "\n" + message("SETUP_SAVEMAP");
+		if (Config.mapSaveEnabled && !map.getGameSpawn().exists()) {
+			msg = msg + "\n" + Localization.message("SETUP_SAVEMAP");
 			count++;
 		}
 		if (map.isBlockHuntEnabled() && map.getBlockHunt().isEmpty()) {
-			msg = msg + "\n" + message("SETUP_BLOCKHUNT");
+			msg = msg + "\n" + Localization.message("SETUP_BLOCKHUNT");
             count++;
 		}
 		if (count < 1) {
-			sender.sendMessage(messagePrefix + message("SETUP_COMPLETE"));
+			sender.sendMessage(Config.messagePrefix + Localization.message("SETUP_COMPLETE"));
 		} else {
 			sender.sendMessage(msg);
 		}
@@ -72,7 +71,7 @@ public class Status implements ICommand {
 
 	public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
 		if(parameter.equals("map")) {
-			return Maps.getAllMaps().stream().map(net.tylermurphy.hideAndSeek.configuration.Map::getName).collect(Collectors.toList());
+			return Maps.getAllMaps().stream().map(Map::getName).collect(Collectors.toList());
 		}
 		return null;
 	}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/map/blockhunt/Enabled.java b/src/main/java/dev/tylerm/khs/command/map/blockhunt/Enabled.java
index 2567427..1d49473 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/map/blockhunt/Enabled.java
+++ b/src/main/java/dev/tylerm/khs/command/map/blockhunt/Enabled.java
@@ -1,10 +1,12 @@
-package net.tylermurphy.hideAndSeek.command.map.blockhunt;
+package dev.tylerm.khs.command.map.blockhunt;
 
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.command.util.ICommand;
-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.command.util.ICommand;
+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.ChatColor;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -13,30 +15,26 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.errorPrefix;
-import static net.tylermurphy.hideAndSeek.configuration.Config.messagePrefix;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
-
 public class Enabled implements ICommand {
 
     public void execute(Player sender, String[] args) {
         if (!Main.getInstance().supports(9)) {
-            sender.sendMessage(errorPrefix + message("BLOCKHUNT_UNSUPPORTED"));
+            sender.sendMessage(Config.errorPrefix + Localization.message("BLOCKHUNT_UNSUPPORTED"));
             return;
         }
         if (Main.getInstance().getGame().getStatus() != Status.STANDBY) {
-            sender.sendMessage(errorPrefix + message("GAME_INPROGRESS"));
+            sender.sendMessage(Config.errorPrefix + Localization.message("GAME_INPROGRESS"));
             return;
         }
         Map map = Maps.getMap(args[0]);
         if(map == null) {
-            sender.sendMessage(errorPrefix + message("INVALID_MAP"));
+            sender.sendMessage(Config.errorPrefix + Localization.message("INVALID_MAP"));
             return;
         }
         boolean bool = Boolean.parseBoolean(args[1]);
         map.setBlockhunt(bool, map.getBlockHunt());
         Maps.setMap(map.getName(), map);
-        sender.sendMessage(messagePrefix + message("BLOCKHUNT_SET_TO")
+        sender.sendMessage(Config.messagePrefix + Localization.message("BLOCKHUNT_SET_TO")
                 .addAmount(bool ? ChatColor.GREEN + "true" : ChatColor.RED + "false") + ChatColor.WHITE);
     }
 
@@ -54,7 +52,7 @@ public class Enabled implements ICommand {
 
     public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
         if(parameter.equals("map")) {
-            return Maps.getAllMaps().stream().map(net.tylermurphy.hideAndSeek.configuration.Map::getName).collect(Collectors.toList());
+            return Maps.getAllMaps().stream().map(Map::getName).collect(Collectors.toList());
         }
         if(parameter.equals("bool")) {
             return Arrays.asList("true", "false");
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/map/blockhunt/blocks/Add.java b/src/main/java/dev/tylerm/khs/command/map/blockhunt/blocks/Add.java
index fea08ef..4232bb5 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/map/blockhunt/blocks/Add.java
+++ b/src/main/java/dev/tylerm/khs/command/map/blockhunt/blocks/Add.java
@@ -1,10 +1,12 @@
-package net.tylermurphy.hideAndSeek.command.map.blockhunt.blocks;
+package dev.tylerm.khs.command.map.blockhunt.blocks;
 
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.command.util.ICommand;
-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.command.util.ICommand;
+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.Material;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -13,40 +15,36 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.errorPrefix;
-import static net.tylermurphy.hideAndSeek.configuration.Config.messagePrefix;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
-
 public class Add implements ICommand {
 
     public void execute(Player sender, String[] args) {
         if (!Main.getInstance().supports(9)) {
-            sender.sendMessage(errorPrefix + message("BLOCKHUNT_UNSUPPORTED"));
+            sender.sendMessage(Config.errorPrefix + Localization.message("BLOCKHUNT_UNSUPPORTED"));
             return;
         }
         if (Main.getInstance().getGame().getStatus() != Status.STANDBY) {
-            sender.sendMessage(errorPrefix + message("GAME_INPROGRESS"));
+            sender.sendMessage(Config.errorPrefix + Localization.message("GAME_INPROGRESS"));
             return;
         }
         Map map = Maps.getMap(args[0]);
         if(map == null) {
-            sender.sendMessage(errorPrefix + message("INVALID_MAP"));
+            sender.sendMessage(Config.errorPrefix + Localization.message("INVALID_MAP"));
             return;
         }
         Material block;
         try { block = Material.valueOf(args[1]); }
         catch (IllegalArgumentException e) {
-            sender.sendMessage(errorPrefix + message("COMMAND_INVALID_ARG").addAmount(args[1]));
+            sender.sendMessage(Config.errorPrefix + Localization.message("COMMAND_INVALID_ARG").addAmount(args[1]));
             return;
         }
         List<Material> blocks = map.getBlockHunt();
         if(blocks.contains(block)) {
-            sender.sendMessage(errorPrefix + message("BLOCKHUNT_BLOCK_EXISTS").addAmount(args[1]));
+            sender.sendMessage(Config.errorPrefix + Localization.message("BLOCKHUNT_BLOCK_EXISTS").addAmount(args[1]));
         }
         blocks.add(block);
         map.setBlockhunt(map.isBlockHuntEnabled(), blocks);
         Maps.setMap(map.getName(), map);
-        sender.sendMessage(messagePrefix + message("BLOCKHUNT_BLOCK_ADDED").addAmount(args[1]));
+        sender.sendMessage(Config.messagePrefix + Localization.message("BLOCKHUNT_BLOCK_ADDED").addAmount(args[1]));
     }
 
     public String getLabel() {
@@ -63,7 +61,7 @@ public class Add implements ICommand {
 
     public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
         if(parameter.equals("map")) {
-            return Maps.getAllMaps().stream().map(net.tylermurphy.hideAndSeek.configuration.Map::getName).collect(Collectors.toList());
+            return Maps.getAllMaps().stream().map(Map::getName).collect(Collectors.toList());
         } else if(parameter.equals("block")) {
             return Arrays.stream(Material.values())
                     .filter(Material::isBlock)
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/map/blockhunt/blocks/List.java b/src/main/java/dev/tylerm/khs/command/map/blockhunt/blocks/List.java
index de783ce..9ba90fa 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/map/blockhunt/blocks/List.java
+++ b/src/main/java/dev/tylerm/khs/command/map/blockhunt/blocks/List.java
@@ -1,9 +1,11 @@
-package net.tylermurphy.hideAndSeek.command.map.blockhunt.blocks;
+package dev.tylerm.khs.command.map.blockhunt.blocks;
 
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.command.util.ICommand;
-import net.tylermurphy.hideAndSeek.configuration.Map;
-import net.tylermurphy.hideAndSeek.configuration.Maps;
+import dev.tylerm.khs.Main;
+import dev.tylerm.khs.command.util.ICommand;
+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 org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -11,28 +13,24 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.stream.Collectors;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.errorPrefix;
-import static net.tylermurphy.hideAndSeek.configuration.Config.messagePrefix;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
-
 public class List implements ICommand {
 
     public void execute(Player sender, String[] args) {
         if (!Main.getInstance().supports(9)) {
-            sender.sendMessage(errorPrefix + message("BLOCKHUNT_UNSUPPORTED"));
+            sender.sendMessage(Config.errorPrefix + Localization.message("BLOCKHUNT_UNSUPPORTED"));
             return;
         }
         Map map = Maps.getMap(args[0]);
         if(map == null) {
-            sender.sendMessage(errorPrefix + message("INVALID_MAP"));
+            sender.sendMessage(Config.errorPrefix + Localization.message("INVALID_MAP"));
             return;
         }
         java.util.List<Material> blocks = map.getBlockHunt();
         if(blocks.isEmpty()) {
-            sender.sendMessage(errorPrefix + message("NO_BLOCKS"));
+            sender.sendMessage(Config.errorPrefix + Localization.message("NO_BLOCKS"));
             return;
         }
-        StringBuilder response = new StringBuilder(messagePrefix + message("BLOCKHUNT_LIST_BLOCKS"));
+        StringBuilder response = new StringBuilder(Config.messagePrefix + Localization.message("BLOCKHUNT_LIST_BLOCKS"));
         for(int i = 0; i < blocks.size(); i++) {
             response.append(String.format("\n%s. %s", i, blocks.get(i).toString()));
         }
@@ -53,7 +51,7 @@ public class List implements ICommand {
 
     public java.util.List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
         if(parameter.equals("map")) {
-            return Maps.getAllMaps().stream().map(net.tylermurphy.hideAndSeek.configuration.Map::getName).collect(Collectors.toList());
+            return Maps.getAllMaps().stream().map(Map::getName).collect(Collectors.toList());
         }
         return null;
     }
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/map/blockhunt/blocks/Remove.java b/src/main/java/dev/tylerm/khs/command/map/blockhunt/blocks/Remove.java
index 1c16fdc..38ab4a3 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/map/blockhunt/blocks/Remove.java
+++ b/src/main/java/dev/tylerm/khs/command/map/blockhunt/blocks/Remove.java
@@ -1,10 +1,12 @@
-package net.tylermurphy.hideAndSeek.command.map.blockhunt.blocks;
+package dev.tylerm.khs.command.map.blockhunt.blocks;
 
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.command.util.ICommand;
-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.command.util.ICommand;
+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.Material;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -13,40 +15,36 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.errorPrefix;
-import static net.tylermurphy.hideAndSeek.configuration.Config.messagePrefix;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
-
 public class Remove implements ICommand {
 
     public void execute(Player sender, String[] args) {
         if (!Main.getInstance().supports(9)) {
-            sender.sendMessage(errorPrefix + message("BLOCKHUNT_UNSUPPORTED"));
+            sender.sendMessage(Config.errorPrefix + Localization.message("BLOCKHUNT_UNSUPPORTED"));
             return;
         }
         if (Main.getInstance().getGame().getStatus() != Status.STANDBY) {
-            sender.sendMessage(errorPrefix + message("GAME_INPROGRESS"));
+            sender.sendMessage(Config.errorPrefix + Localization.message("GAME_INPROGRESS"));
             return;
         }
         Map map = Maps.getMap(args[0]);
         if(map == null) {
-            sender.sendMessage(errorPrefix + message("INVALID_MAP"));
+            sender.sendMessage(Config.errorPrefix + Localization.message("INVALID_MAP"));
             return;
         }
         Material block;
         try { block = Material.valueOf(args[1]); }
         catch (IllegalArgumentException e) {
-            sender.sendMessage(errorPrefix + message("COMMAND_INVALID_ARG").addAmount(args[1]));
+            sender.sendMessage(Config.errorPrefix + Localization.message("COMMAND_INVALID_ARG").addAmount(args[1]));
             return;
         }
         java.util.List<Material> blocks = map.getBlockHunt();
         if(!blocks.contains(block)) {
-            sender.sendMessage(errorPrefix + message("BLOCKHUNT_BLOCK_DOESNT_EXIT").addAmount(args[1]));
+            sender.sendMessage(Config.errorPrefix + Localization.message("BLOCKHUNT_BLOCK_DOESNT_EXIT").addAmount(args[1]));
         }
         blocks.remove(block);
         map.setBlockhunt(map.isBlockHuntEnabled(), blocks);
         Maps.setMap(map.getName(), map);
-        sender.sendMessage(messagePrefix + message("BLOCKHUNT_BLOCK_REMOVED").addAmount(args[1]));
+        sender.sendMessage(Config.messagePrefix + Localization.message("BLOCKHUNT_BLOCK_REMOVED").addAmount(args[1]));
     }
 
     public String getLabel() {
@@ -63,7 +61,7 @@ public class Remove implements ICommand {
 
     public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
         if(parameter.equals("map")) {
-            return Maps.getAllMaps().stream().map(net.tylermurphy.hideAndSeek.configuration.Map::getName).collect(Collectors.toList());
+            return Maps.getAllMaps().stream().map(Map::getName).collect(Collectors.toList());
         } else if(parameter.equals("block")) {
             return Arrays.stream(Material.values())
                     .filter(Material::isBlock)
diff --git a/src/main/java/dev/tylerm/khs/command/map/set/Border.java b/src/main/java/dev/tylerm/khs/command/map/set/Border.java
new file mode 100644
index 0000000..7ef3bf9
--- /dev/null
+++ b/src/main/java/dev/tylerm/khs/command/map/set/Border.java
@@ -0,0 +1,86 @@
+package dev.tylerm.khs.command.map.set;
+
+import dev.tylerm.khs.Main;
+import dev.tylerm.khs.command.util.ICommand;
+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.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class Border implements ICommand {
+
+	public void execute(Player sender, String[] args) {
+		if (Main.getInstance().getGame().getStatus() != Status.STANDBY) {
+			sender.sendMessage(Config.errorPrefix + Localization.message("GAME_INPROGRESS"));
+			return;
+		}
+		Map map = Maps.getMap(args[0]);
+		if(map == null) {
+			sender.sendMessage(Config.errorPrefix + Localization.message("INVALID_MAP"));
+			return;
+		}
+		if (map.getSpawn().isNotSetup()) {
+			sender.sendMessage(Config.errorPrefix + Localization.message("ERROR_GAME_SPAWN"));
+			return;
+		}
+
+		int num,delay,change;
+		try { num = Integer.parseInt(args[1]); } catch (Exception e) {
+			sender.sendMessage(Config.errorPrefix + Localization.message("WORLDBORDER_INVALID_INPUT").addAmount(args[0]));
+			return;
+		}
+		try { delay = Integer.parseInt(args[2]); } catch (Exception e) {
+			sender.sendMessage(Config.errorPrefix + Localization.message("WORLDBORDER_INVALID_INPUT").addAmount(args[1]));
+			return;
+		}
+		try { change = Integer.parseInt(args[3]); } catch (Exception e) {
+			sender.sendMessage(Config.errorPrefix + Localization.message("WORLDBORDER_INVALID_INPUT").addAmount(args[2]));
+			return;
+		}
+		if (num < 100) {
+			sender.sendMessage(Config.errorPrefix + Localization.message("WORLDBORDER_MIN_SIZE"));
+			return;
+		}
+		if (change < 1) {
+			sender.sendMessage(Config.errorPrefix + Localization.message("WORLDBORDER_CHANGE_SIZE"));
+			return;
+		}
+		map.setWorldBorderData(
+				sender.getLocation().getBlockX(),
+				sender.getLocation().getBlockZ(),
+				num,
+				delay,
+				change
+		);
+		Maps.setMap(map.getName(), map);
+		sender.sendMessage(Config.messagePrefix + Localization.message("WORLDBORDER_ENABLE").addAmount(num).addAmount(delay).addAmount(change));
+		map.getWorldBorder().resetWorldBorder();
+	}
+
+	public String getLabel() {
+		return "border";
+	}
+	
+	public String getUsage() {
+		return "<map> <size> <delay> <move>";
+	}
+
+	public String getDescription() {
+		return "Sets a maps world border information";
+	}
+
+	public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
+		if(parameter.equals("map")) {
+			return Maps.getAllMaps().stream().map(Map::getName).collect(Collectors.toList());
+		}
+		return Collections.singletonList(parameter);
+	}
+
+}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/map/set/Bounds.java b/src/main/java/dev/tylerm/khs/command/map/set/Bounds.java
index 3d1f036..5fde50e 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/map/set/Bounds.java
+++ b/src/main/java/dev/tylerm/khs/command/map/set/Bounds.java
@@ -1,46 +1,45 @@
-package net.tylermurphy.hideAndSeek.command.map.set;
+package dev.tylerm.khs.command.map.set;
 
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.command.util.ICommand;
-import net.tylermurphy.hideAndSeek.configuration.Map;
-import net.tylermurphy.hideAndSeek.configuration.Maps;
-import net.tylermurphy.hideAndSeek.game.util.Status;
-import net.tylermurphy.hideAndSeek.util.Location;
+import dev.tylerm.khs.Main;
+import dev.tylerm.khs.command.util.ICommand;
+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 dev.tylerm.khs.util.Location;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
-
 public class Bounds implements ICommand {
 
 	public void execute(Player sender, String[] args) {
 		if (Main.getInstance().getGame().getStatus() != Status.STANDBY) {
-			sender.sendMessage(errorPrefix + message("GAME_INPROGRESS"));
+			sender.sendMessage(Config.errorPrefix + Localization.message("GAME_INPROGRESS"));
 			return;
 		}
 		Map map = Maps.getMap(args[0]);
 		if(map == null) {
-			sender.sendMessage(errorPrefix + message("INVALID_MAP"));
+			sender.sendMessage(Config.errorPrefix + Localization.message("INVALID_MAP"));
 			return;
 		}
 		if (map.getSpawn().isNotSetup()) {
-			sender.sendMessage(errorPrefix + message("ERROR_GAME_SPAWN"));
+			sender.sendMessage(Config.errorPrefix + Localization.message("ERROR_GAME_SPAWN"));
 			return;
 		}
 		if (map.getSeekerLobby().isNotSetup()) {
-			sender.sendMessage(errorPrefix + message("ERROR_GAME_SEEKER_SPAWN"));
+			sender.sendMessage(Config.errorPrefix + Localization.message("ERROR_GAME_SEEKER_SPAWN"));
 			return;
 		}
 		if (!sender.getWorld().getName().equals(map.getSpawnName())) {
-			sender.sendMessage(errorPrefix + message("BOUNDS_WRONG_WORLD"));
+			sender.sendMessage(Config.errorPrefix + Localization.message("BOUNDS_WRONG_WORLD"));
 			return;
 		}
 		if (sender.getLocation().getBlockX() == 0 || sender.getLocation().getBlockZ() == 0) {
-			sender.sendMessage(errorPrefix + message("NOT_AT_ZERO"));
+			sender.sendMessage(Config.errorPrefix + Localization.message("NOT_AT_ZERO"));
 			return;
 		}
 		boolean first = true;
@@ -77,18 +76,18 @@ public class Bounds implements ICommand {
 			if(!map.getSpawn().isNotSetup()) {
 				if(map.getSpawn().isNotInBounds(bxs, bxl, bzs, bzl)) {
 					map.setSpawn(Location.getDefault());
-					sender.sendMessage(warningPrefix + message("WARN_SPAWN_RESET"));
+					sender.sendMessage(Config.warningPrefix + Localization.message("WARN_SPAWN_RESET"));
 				}
 			}
 			if(!map.getSeekerLobby().isNotSetup()) {
 				if(map.getSeekerLobby().isNotInBounds(bxs, bxl, bzs, bzl)) {
 					map.setSeekerLobby(Location.getDefault());
-					sender.sendMessage(warningPrefix + message("WARN_SEEKER_SPAWN_RESET"));
+					sender.sendMessage(Config.warningPrefix + Localization.message("WARN_SEEKER_SPAWN_RESET"));
 				}
 			}
 		}
 		Maps.setMap(map.getName(), map);
-		sender.sendMessage(messagePrefix + message("BOUNDS").addAmount(first ? 1 : 2));
+		sender.sendMessage(Config.messagePrefix + Localization.message("BOUNDS").addAmount(first ? 1 : 2));
 	}
 
 	public String getLabel() {
@@ -105,7 +104,7 @@ public class Bounds implements ICommand {
 
 	public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
 		if(parameter.equals("map")) {
-			return Maps.getAllMaps().stream().map(net.tylermurphy.hideAndSeek.configuration.Map::getName).collect(Collectors.toList());
+			return Maps.getAllMaps().stream().map(Map::getName).collect(Collectors.toList());
 		}
 		return null;
 	}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/map/set/Lobby.java b/src/main/java/dev/tylerm/khs/command/map/set/Lobby.java
index 6690ae9..a1c8036 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/map/set/Lobby.java
+++ b/src/main/java/dev/tylerm/khs/command/map/set/Lobby.java
@@ -1,10 +1,11 @@
-package net.tylermurphy.hideAndSeek.command.map.set;
+package dev.tylerm.khs.command.map.set;
 
-import net.tylermurphy.hideAndSeek.command.util.ICommand;
-import net.tylermurphy.hideAndSeek.command.location.LocationUtils;
-import net.tylermurphy.hideAndSeek.command.location.Locations;
-import net.tylermurphy.hideAndSeek.configuration.Maps;
-import net.tylermurphy.hideAndSeek.util.Location;
+import dev.tylerm.khs.command.location.LocationUtils;
+import dev.tylerm.khs.command.location.Locations;
+import dev.tylerm.khs.command.util.ICommand;
+import dev.tylerm.khs.configuration.Map;
+import dev.tylerm.khs.configuration.Maps;
+import dev.tylerm.khs.util.Location;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
@@ -33,7 +34,7 @@ public class Lobby implements ICommand {
 
 	public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
 		if(parameter.equals("map")) {
-			return Maps.getAllMaps().stream().map(net.tylermurphy.hideAndSeek.configuration.Map::getName).collect(Collectors.toList());
+			return Maps.getAllMaps().stream().map(Map::getName).collect(Collectors.toList());
 		}
 		return null;
 	}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/map/set/SeekerLobby.java b/src/main/java/dev/tylerm/khs/command/map/set/SeekerLobby.java
index b6c5cf0..7187ac9 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/map/set/SeekerLobby.java
+++ b/src/main/java/dev/tylerm/khs/command/map/set/SeekerLobby.java
@@ -1,10 +1,11 @@
-package net.tylermurphy.hideAndSeek.command.map.set;
+package dev.tylerm.khs.command.map.set;
 
-import net.tylermurphy.hideAndSeek.command.util.ICommand;
-import net.tylermurphy.hideAndSeek.command.location.LocationUtils;
-import net.tylermurphy.hideAndSeek.command.location.Locations;
-import net.tylermurphy.hideAndSeek.configuration.Maps;
-import net.tylermurphy.hideAndSeek.util.Location;
+import dev.tylerm.khs.command.location.LocationUtils;
+import dev.tylerm.khs.command.location.Locations;
+import dev.tylerm.khs.command.util.ICommand;
+import dev.tylerm.khs.configuration.*;
+import dev.tylerm.khs.util.Location;
+import dev.tylerm.khs.configuration.Maps;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
@@ -12,25 +13,22 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;;
 import java.util.stream.Collectors;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.warningPrefix;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
-
 public class SeekerLobby implements ICommand {
 
     public void execute(Player sender, String[] args) {
         LocationUtils.setLocation(sender, Locations.SEEKER, args[0], map -> {
             if(map.getSpawn().isNotSetup()) {
-                throw new RuntimeException(message("GAME_SPAWN_NEEDED").toString());
+                throw new RuntimeException(Localization.message("GAME_SPAWN_NEEDED").toString());
             }
             if(!map.getSpawnName().equals(sender.getLocation().getWorld().getName())) {
-                throw new RuntimeException(message("SEEKER_LOBBY_INVALID").toString());
+                throw new RuntimeException(Localization.message("SEEKER_LOBBY_INVALID").toString());
             }
             map.setSeekerLobby(Location.from(sender));
             if(!map.isBoundsNotSetup()) {
                 Vector boundsMin = map.getBoundsMin();
                 Vector boundsMax = map.getBoundsMax();
                 if(map.getSeekerLobby().isNotInBounds(boundsMin.getBlockX(), boundsMax.getBlockX(), boundsMin.getBlockZ(), boundsMax.getBlockZ())) {
-                    sender.sendMessage(warningPrefix + message("WARN_MAP_BOUNDS"));
+                    sender.sendMessage(Config.warningPrefix + Localization.message("WARN_MAP_BOUNDS"));
                 }
             }
         });
@@ -50,7 +48,7 @@ public class SeekerLobby implements ICommand {
 
     public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
         if(parameter.equals("map")) {
-            return Maps.getAllMaps().stream().map(net.tylermurphy.hideAndSeek.configuration.Map::getName).collect(Collectors.toList());
+            return Maps.getAllMaps().stream().map(Map::getName).collect(Collectors.toList());
         }
         return null;
     }
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/map/set/Spawn.java b/src/main/java/dev/tylerm/khs/command/map/set/Spawn.java
index 0baf55e..6541fac 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/map/set/Spawn.java
+++ b/src/main/java/dev/tylerm/khs/command/map/set/Spawn.java
@@ -1,10 +1,11 @@
-package net.tylermurphy.hideAndSeek.command.map.set;
+package dev.tylerm.khs.command.map.set;
 
-import net.tylermurphy.hideAndSeek.command.util.ICommand;
-import net.tylermurphy.hideAndSeek.command.location.LocationUtils;
-import net.tylermurphy.hideAndSeek.command.location.Locations;
-import net.tylermurphy.hideAndSeek.configuration.Maps;
-import net.tylermurphy.hideAndSeek.util.Location;
+import dev.tylerm.khs.command.location.LocationUtils;
+import dev.tylerm.khs.command.location.Locations;
+import dev.tylerm.khs.command.util.ICommand;
+import dev.tylerm.khs.configuration.*;
+import dev.tylerm.khs.util.Location;
+import dev.tylerm.khs.configuration.Maps;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
@@ -12,9 +13,6 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
-
 public class Spawn implements ICommand {
 
 	public void execute(Player sender, String[] args) {
@@ -22,7 +20,7 @@ public class Spawn implements ICommand {
 
 			if (map.isWorldBorderEnabled() &&
 					new Vector(sender.getLocation().getX(), 0, sender.getLocation().getZ()).distance(map.getWorldBorderPos()) > 100) {
-				sender.sendMessage(errorPrefix + message("WORLDBORDER_POSITION"));
+				sender.sendMessage(Config.errorPrefix + Localization.message("WORLDBORDER_POSITION"));
 				throw new RuntimeException("World border not enabled or not in valid position!");
 			}
 
@@ -32,16 +30,16 @@ public class Spawn implements ICommand {
 				Vector boundsMin = map.getBoundsMin();
 				Vector boundsMax = map.getBoundsMax();
 				if(map.getSpawn().isNotInBounds(boundsMin.getBlockX(), boundsMax.getBlockX(), boundsMin.getBlockZ(), boundsMax.getBlockZ())) {
-					sender.sendMessage(warningPrefix + message("WARN_MAP_BOUNDS"));
+					sender.sendMessage(Config.warningPrefix + Localization.message("WARN_MAP_BOUNDS"));
 				}
 			}
 
 			if(map.getSeekerLobby().getWorld() != null && !map.getSeekerLobby().getWorld().equals(sender.getLocation().getWorld().getName())) {
-				sender.sendMessage(warningPrefix + message("SEEKER_LOBBY_SPAWN_RESET"));
+				sender.sendMessage(Config.warningPrefix + Localization.message("SEEKER_LOBBY_SPAWN_RESET"));
 				map.setSeekerLobby(Location.getDefault());
 			}
 
-			if (!sender.getLocation().getWorld().getName().equals(map.getSpawnName()) && mapSaveEnabled) {
+			if (!sender.getLocation().getWorld().getName().equals(map.getSpawnName()) && Config.mapSaveEnabled) {
 				map.getWorldLoader().unloadMap();
 			}
 		});
@@ -61,7 +59,7 @@ public class Spawn implements ICommand {
 
 	public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
 		if(parameter.equals("map")) {
-			return Maps.getAllMaps().stream().map(net.tylermurphy.hideAndSeek.configuration.Map::getName).collect(Collectors.toList());
+			return Maps.getAllMaps().stream().map(Map::getName).collect(Collectors.toList());
 		}
 		return null;
 	}
diff --git a/src/main/java/dev/tylerm/khs/command/map/unset/Border.java b/src/main/java/dev/tylerm/khs/command/map/unset/Border.java
new file mode 100644
index 0000000..f26b0e1
--- /dev/null
+++ b/src/main/java/dev/tylerm/khs/command/map/unset/Border.java
@@ -0,0 +1,58 @@
+package dev.tylerm.khs.command.map.unset;
+
+import dev.tylerm.khs.Main;
+import dev.tylerm.khs.command.util.ICommand;
+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.List;
+import java.util.stream.Collectors;
+
+public class Border implements ICommand {
+
+    public void execute(Player sender, String[] args) {
+        if (Main.getInstance().getGame().getStatus() != Status.STANDBY) {
+            sender.sendMessage(Config.errorPrefix + Localization.message("GAME_INPROGRESS"));
+            return;
+        }
+        Map map = Maps.getMap(args[0]);
+        if(map == null) {
+            sender.sendMessage(Config.errorPrefix + Localization.message("INVALID_MAP"));
+            return;
+        }
+        if (map.getSpawn().isNotSetup()) {
+            sender.sendMessage(Config.errorPrefix + Localization.message("ERROR_GAME_SPAWN"));
+            return;
+        }
+        map.setWorldBorderData(0, 0, 0, 0, 0);
+        Config.addToConfig("worldBorder.enabled",false);
+        Config.saveConfig();
+        sender.sendMessage(Config.messagePrefix + Localization.message("WORLDBORDER_DISABLE"));
+        map.getWorldBorder().resetWorldBorder();
+    }
+
+    public String getLabel() {
+        return "border";
+    }
+
+    public String getUsage() {
+        return "<map>";
+    }
+
+    public String getDescription() {
+        return "Removes a maps world border information";
+    }
+
+    public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
+        if(parameter.equals("map")) {
+            return Maps.getAllMaps().stream().map(Map::getName).collect(Collectors.toList());
+        }
+        return null;
+    }
+
+}