1.3.1 build 2

6 files changed, 22 insertions, 29 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/About.java b/src/main/java/net/tylermurphy/hideAndSeek/command/About.java
index 4b207fb..897a9a0 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/About.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/About.java
@@ -7,7 +7,7 @@ public class About implements ICommand {
 
 	public void execute(CommandSender sender, String[] args) {
 		sender.sendMessage(
-				String.format("%s%sHide and Seek %s(1.3.0%s)\n", ChatColor.AQUA, ChatColor.BOLD, ChatColor.GRAY,ChatColor.WHITE,ChatColor.GRAY) + 
+				String.format("%s%sHide and Seek %s(1.3.1%s)\n", ChatColor.AQUA, ChatColor.BOLD, ChatColor.GRAY,ChatColor.WHITE,ChatColor.GRAY) +
 				String.format("%sAuthor: %s[KenshinEto]\n", ChatColor.GRAY, ChatColor.WHITE) + 
 				String.format("%sHelp Command: %s/hs %shelp", ChatColor.GRAY, ChatColor.AQUA, ChatColor.WHITE)
 			);
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java
index cf580c9..2c7ba04 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java
@@ -19,7 +19,7 @@ public class Reload implements ICommand {
 			return;
 		}
 		Config.loadConfig();
-		Localization.init();
+		Localization.loadLocalization();
 		sender.sendMessage(messagePrefix + message("CONFIG_RELOAD"));
 	}
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java
index 25e0a87..472396c 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java
@@ -26,9 +26,7 @@ public class SetBorder implements ICommand {
 		}
 		if(args.length < 2) {
 			worldborderEnabled = false;
-			Map<String, Object> temp = new HashMap<String,Object>();
-			temp.put("enabled", false);
-			addToSection("worldBorder",temp);
+			addToConfig("worldBorder.enabled",false);
 			saveConfig();
 			sender.sendMessage(messagePrefix + message("WORLDBORDER_DISABLE"));
 			Worldborder.resetWorldborder(spawnWorld);
@@ -60,13 +58,11 @@ public class SetBorder implements ICommand {
 		worldborderSize = num;
 		worldborderDelay = delay;
 		worldborderEnabled = true;
-		Map<String, Object> temp = new HashMap<String,Object>();
-		temp.put("x", worldborderPosition.getBlockX());
-		temp.put("z", worldborderPosition.getBlockZ());
-		temp.put("delay", worldborderDelay);
-		temp.put("size", worldborderSize);
-		temp.put("enabled", true);
-		addToSection("worldBorder",temp);
+		addToConfig("worldBorder.x", worldborderPosition.getBlockX());
+		addToConfig("worldBorder.z", worldborderPosition.getBlockZ());
+		addToConfig("worldBorder.delay", worldborderDelay);
+		addToConfig("worldBorder.size", worldborderSize);
+		addToConfig("worldBorder.enabled", true);
 		sender.sendMessage(messagePrefix + message("WORLDBORDER_ENABLE").addAmount(num).addAmount(delay));
 		saveConfig();
 		Worldborder.resetWorldborder(spawnWorld);
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/SetExitLocation.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetExitLocation.java
index e82d0e4..c9d2fae 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/SetExitLocation.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetExitLocation.java
@@ -27,11 +27,10 @@ public class SetExitLocation implements ICommand {
 		exitPosition = newExitPosition;
 		sender.sendMessage(messagePrefix + message("EXIT_SPAWN"));
 		Map<String, Object> temp = new HashMap<String,Object>();
-		temp.put("x", exitPosition.getX());
-		temp.put("y", exitPosition.getY());
-		temp.put("z", exitPosition.getZ());
-		temp.put("world", player.getLocation().getWorld().getName());
-		addToSection("spawns.exit",temp);
+		addToConfig("spawns.exit.x", exitPosition.getX());
+		addToConfig("spawns.exit.y", exitPosition.getY());
+		addToConfig("spawns.exit.z", exitPosition.getZ());
+		addToConfig("spawns.exit.world", player.getLocation().getWorld().getName());
 		saveConfig();
 	}
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/SetLobbyLocation.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetLobbyLocation.java
index 31cad53..a8a1887 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/SetLobbyLocation.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetLobbyLocation.java
@@ -26,12 +26,10 @@ public class SetLobbyLocation implements ICommand {
 		}
 		lobbyPosition = newLobbyPosition;
 		sender.sendMessage(messagePrefix + message("LOBBY_SPAWN"));
-		Map<String, Object> temp = new HashMap<String,Object>();
-		temp.put("x", lobbyPosition.getX());
-		temp.put("y", lobbyPosition.getY());
-		temp.put("z", lobbyPosition.getZ());
-		temp.put("world", player.getLocation().getWorld().getName());
-		addToSection("spawns.lobby",temp);
+		addToConfig("spawns.lobby.x", lobbyPosition.getX());
+		addToConfig("spawns.lobby.y", lobbyPosition.getY());
+		addToConfig("spawns.lobby.z", lobbyPosition.getZ());
+		addToConfig("spawns.lobby.world", player.getLocation().getWorld().getName());
 		saveConfig();
 	}
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/SetSpawnLocation.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetSpawnLocation.java
index 45ee758..d634968 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/SetSpawnLocation.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetSpawnLocation.java
@@ -10,6 +10,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
 import net.tylermurphy.hideAndSeek.Main;
+
+import static net.tylermurphy.hideAndSeek.configuration.Config.addToConfig;
 import static net.tylermurphy.hideAndSeek.configuration.Localization.*;
 
 public class SetSpawnLocation implements ICommand {
@@ -30,12 +32,10 @@ public class SetSpawnLocation implements ICommand {
 		}
 		spawnPosition = newSpawnPosition;
 		sender.sendMessage(messagePrefix + message("GAME_SPAWN"));
-		Map<String, Object> temp = new HashMap<String,Object>();
-		temp.put("x", spawnPosition.getX());
-		temp.put("y", spawnPosition.getY());
-		temp.put("z", spawnPosition.getZ());
-		temp.put("world", player.getLocation().getWorld().getName());
-		addToSection("spawns.game",temp);
+		addToConfig("spawns.game.x", spawnPosition.getX());
+		addToConfig("spawns.game.y", spawnPosition.getY());
+		addToConfig("spawns.game.z", spawnPosition.getZ());
+		addToConfig("spawns.game.world", player.getLocation().getWorld().getName());
 		saveConfig();
 	}