mysql support, always glow, countdown_last, kill stat change, game board null fix

3 files changed, 45 insertions, 8 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java
index 03d7504..4aeac68 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java
@@ -55,7 +55,13 @@ public class Config {
 		locale,
 		leaveServer,
 		placeholderError,
-		placeholderNoData;
+		placeholderNoData,
+		databaseType,
+		databaseHost,
+		databasePort,
+		databaseUser,
+		databasePass,
+		databaseName;
 	
 	public static Vector
 		spawnPosition,
@@ -71,6 +77,7 @@ public class Config {
 		tauntEnabled,
 		tauntCountdown,
 		tauntLast,
+		alwaysGlow,
 		glowEnabled,
 		glowStackable,
 		pvpEnabled,
@@ -218,9 +225,10 @@ public class Config {
 		tauntLast = config.getBoolean("taunt.whenLastPerson");
 
 		//Glow
+		alwaysGlow = config.getBoolean("alwaysGlow") && Main.getInstance().supports(9);
 		glowLength = Math.max(1, config.getInt("glow.time"));
 		glowStackable = config.getBoolean("glow.stackable");
-		glowEnabled = config.getBoolean("glow.enabled") && Main.getInstance().supports(9);
+		glowEnabled = config.getBoolean("glow.enabled") && Main.getInstance().supports(9) && !alwaysGlow;
 		if (glowEnabled) {
 			glowPowerupItem = createItemStack("glow");
 		}
@@ -314,6 +322,19 @@ public class Config {
 
 		teleportItem = createItemStack("spectatorItems.teleport");
 		teleportItemPosition = config.getInt("spectatorItems.teleport.position");
+
+		//Database
+		databaseHost = config.getString("databaseHost");
+		databasePort = config.getString("databasePort");
+		databaseUser = config.getString("databaseUser");
+		databasePass = config.getString("databasePass");
+		databaseName = config.getString("databaseName");
+
+		databaseType = config.getString("databaseType").toUpperCase();
+		if(!databaseType.equals("SQLITE") && !databaseType.equals("MYSQL")){
+			Main.getInstance().getLogger().warning("databaseType: "+databaseType+" is not a valid configuration option!");
+			databaseType = "SQLITE";
+		}
 	}
 	
 	public static void addToConfig(String path, Object value) {
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java
index f02eaba..381a41c 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java
@@ -205,6 +205,10 @@ public class ConfigManager {
         }
     }
 
+    public ConfigurationSection getDefaultConfigurationSection(String path) {
+        return defaultConfig.getConfigurationSection(path);
+    }
+
     public void set(String path, Object value) {
         config.set(path, value);
     }
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java
index be60b61..9418414 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java
@@ -28,6 +28,7 @@ import java.util.Map;
 public class Localization {
 
 	public static final Map<String,LocalizationString> LOCAL = new HashMap<>();
+	public static final Map<String,LocalizationString> DEFAULT_LOCAL = new HashMap<>();
 
 	private static final Map<String,String[][]> CHANGES = new HashMap<String,String[][]>() {{
 		put("en-US", new String[][]{{"WORLDBORDER_DECREASING"},{"START","TAUNTED"}});
@@ -61,17 +62,28 @@ public class Localization {
 
 		for(String key : manager.getConfigurationSection("Localization").getKeys(false)) {
 			LOCAL.put(
-					key, 
+					key,
 					new LocalizationString( ChatColor.translateAlternateColorCodes('&', manager.getString("Localization."+key) ) )
-					);
+			);
+		}
+
+		for(String key : manager.getDefaultConfigurationSection("Localization").getKeys(false)) {
+			DEFAULT_LOCAL.put(
+					key,
+					new LocalizationString( ChatColor.translateAlternateColorCodes('&', manager.getString("Localization."+key) ) )
+			);
 		}
 	}
 	
 	public static LocalizationString message(String key) {
-		LocalizationString temp = LOCAL.get(key);
-		if (temp == null) {
-			return new LocalizationString(ChatColor.RED + "" + ChatColor.ITALIC + key + " is not found in localization.yml. This is a plugin issue, please report it.");
+		LocalizationString message = LOCAL.get(key);
+		if (message == null) {
+			LocalizationString defaultMessage = DEFAULT_LOCAL.get(key);
+			if(defaultMessage == null) {
+				return new LocalizationString(ChatColor.RED + "" + ChatColor.ITALIC + key + " is not found in localization.yml. This is a plugin issue, please report it.");
+			}
+			return new LocalizationString(defaultMessage.toString());
 		}
-		return new LocalizationString(temp.toString());
+		return new LocalizationString(message.toString());
 	}
 }