1 files changed, 34 insertions, 25 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/Main.java b/src/main/java/dev/tylerm/khs/Main.java
index be1c445..bb69c99 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/Main.java
+++ b/src/main/java/dev/tylerm/khs/Main.java
@@ -1,18 +1,24 @@
-package net.tylermurphy.hideAndSeek;
+package dev.tylerm.khs;
 
-import net.tylermurphy.hideAndSeek.command.*;
-import net.tylermurphy.hideAndSeek.command.map.*;
-import net.tylermurphy.hideAndSeek.command.map.blockhunt.Enabled;
-import net.tylermurphy.hideAndSeek.command.map.set.*;
-import net.tylermurphy.hideAndSeek.command.world.Create;
-import net.tylermurphy.hideAndSeek.command.world.Delete;
-import net.tylermurphy.hideAndSeek.command.world.Tp;
-import net.tylermurphy.hideAndSeek.configuration.*;
-import net.tylermurphy.hideAndSeek.database.Database;
-import net.tylermurphy.hideAndSeek.game.*;
-import net.tylermurphy.hideAndSeek.command.util.CommandGroup;
-import net.tylermurphy.hideAndSeek.game.listener.*;
-import net.tylermurphy.hideAndSeek.util.PAPIExpansion;
+import dev.tylerm.khs.command.*;
+import dev.tylerm.khs.command.map.Debug;
+import dev.tylerm.khs.command.map.GoTo;
+import dev.tylerm.khs.command.map.Save;
+import dev.tylerm.khs.command.map.blockhunt.blocks.Add;
+import dev.tylerm.khs.command.map.blockhunt.blocks.List;
+import dev.tylerm.khs.command.map.blockhunt.blocks.Remove;
+import dev.tylerm.khs.command.map.set.*;
+import dev.tylerm.khs.configuration.*;
+import dev.tylerm.khs.game.*;
+import dev.tylerm.khs.game.listener.*;
+import dev.tylerm.khs.game.util.Status;
+import dev.tylerm.khs.util.PAPIExpansion;
+import dev.tylerm.khs.command.map.blockhunt.Enabled;
+import dev.tylerm.khs.command.world.Create;
+import dev.tylerm.khs.command.world.Delete;
+import dev.tylerm.khs.command.world.Tp;
+import dev.tylerm.khs.database.Database;
+import dev.tylerm.khs.command.util.CommandGroup;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -27,8 +33,8 @@ import java.util.Arrays;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
+import static dev.tylerm.khs.configuration.Config.*;
+import static dev.tylerm.khs.configuration.Localization.message;
 
 public class Main extends JavaPlugin implements Listener {
 	
@@ -94,9 +100,9 @@ public class Main extends JavaPlugin implements Listener {
 				new CommandGroup("map",
 						new CommandGroup("blockhunt",
 								new CommandGroup("blocks",
-									new net.tylermurphy.hideAndSeek.command.map.blockhunt.blocks.Add(),
-									new net.tylermurphy.hideAndSeek.command.map.blockhunt.blocks.Remove(),
-									new net.tylermurphy.hideAndSeek.command.map.blockhunt.blocks.List()
+									new Add(),
+									new Remove(),
+									new List()
 								),
 								new Enabled()
 						),
@@ -107,10 +113,13 @@ public class Main extends JavaPlugin implements Listener {
 								new Border(),
 								new Bounds()
 						),
-						new Add(),
-						new Remove(),
-						new List(),
-						new Status(),
+						new CommandGroup("unset",
+								new dev.tylerm.khs.command.map.unset.Border()
+						),
+						new dev.tylerm.khs.command.map.Add(),
+						new dev.tylerm.khs.command.map.Remove(),
+						new dev.tylerm.khs.command.map.List(),
+						new dev.tylerm.khs.command.map.Status(),
 						new Save(),
 						new Debug(),
 						new GoTo()
@@ -118,7 +127,7 @@ public class Main extends JavaPlugin implements Listener {
 				new CommandGroup("world",
 					new Create(),
 					new Delete(),
-					new net.tylermurphy.hideAndSeek.command.world.List(),
+					new dev.tylerm.khs.command.world.List(),
 					new Tp()
 				),
 				new SetExitLocation(),
@@ -170,7 +179,7 @@ public class Main extends JavaPlugin implements Listener {
 	}
 
 	private void onTick() {
-		if(game.getStatus() == net.tylermurphy.hideAndSeek.game.util.Status.ENDED) game = new Game(game.getCurrentMap(), board);
+		if(game.getStatus() == Status.ENDED) game = new Game(game.getCurrentMap(), board);
 		game.onTick();
 		disguiser.check();
 	}