Updating how I want to handle things with colors

Signed-off-by: Nicolas Khoury <nick.khry@gmail.com>
128keaton · Mar 15, 2012 · e560acf · e560acf
1 parent d2515b5
commit e560acf
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/Broadcaster/dist/Broadcaster.jar b/Broadcaster/dist/Broadcaster.jar
diff --git a/Broadcaster/src/com/github/xrevolut1onzx/broadcaster/Broadcaster.java b/Broadcaster/src/com/github/xrevolut1onzx/broadcaster/Broadcaster.java
@@ -1,5 +1,6 @@
 package com.github.xrevolut1onzx.broadcaster;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.logging.Logger;
 
@@ -166,7 +167,7 @@ public void run()
 							{
 								return;
 							}
-							String finalMessage = new String(rawMessage.replaceAll("&([0-9a-f])", "\u00A7$1"));
+							String finalMessage = replaceColors(rawMessage);
 							for (Player player : getServer().getOnlinePlayers())
 							{
 								if (usingSuperPerms)
@@ -231,9 +232,13 @@ else if (permissionType.equalsIgnoreCase("Op"))
 	 */
 	public void manageConfigFile()
 	{
-		reloadConfig();
-		getConfig().options().copyDefaults(true);
-		saveConfig();
+		final String CONFIG_FILE_PATH = "plugins/" + this.getName() + "/config.yml";
+		File file = new File(CONFIG_FILE_PATH);
+		if (!file.exists())
+		{
+			getConfig().options().copyDefaults(true);
+			saveConfig();
+		}
 		permissionType = getConfig().getString("Permission-type");
 		numberOfMessages = getConfig().getInt("Number-of-messages");
 
@@ -347,6 +352,11 @@ public void log(String m)
 		log.info(LOG_PREFIX + m);
 	}
 
+	public String replaceColors(String message)
+	{
+		return message.replaceAll("&([0-9a-f])", "\u00A7$1");
+	}
+
 	/** Returns the number of online players */
 	public int numberOfOnlinePlayers()
 	{

diff --git a/Broadcaster/src/com/github/xrevolut1onzx/broadcaster/commands/CommandHandler.java b/Broadcaster/src/com/github/xrevolut1onzx/broadcaster/commands/CommandHandler.java
@@ -70,7 +70,7 @@ public void preview(Player typer, String numberString)
 				}
 				if (rawMessage != null)
 				{
-					String finalMessage = new String(rawMessage.replaceAll("&([0-9a-f])", "\u00A7$1"));
+					String finalMessage = plugin.replaceColors(rawMessage);
 					typer.sendMessage("Preview: " + finalMessage);
 				}
 				else
@@ -95,7 +95,7 @@ else if (plugin.isUsingSuperPerms())
 				}
 				if (rawMessage != null)
 				{
-					String finalMessage = new String(rawMessage.replaceAll("&([0-9a-f])", "\u00A7$1"));
+					String finalMessage = plugin.replaceColors(rawMessage);
 					typer.sendMessage("Preview: " + finalMessage);
 				}
 				else
@@ -131,7 +131,7 @@ public void broadcast(Player typer, String numberString)
 				}
 				if (rawMessage != null)
 				{
-					String finalMessage = new String(rawMessage.replaceAll("&([0-9a-f])", "\u00A7$1"));
+					String finalMessage = plugin.replaceColors(rawMessage);
 					for (Player player : plugin.getServer().getOnlinePlayers())
 					{
 						if (broadcastMessage.getOpSeesMessage())
@@ -174,7 +174,7 @@ else if (plugin.isUsingSuperPerms())
 				}
 				if (rawMessage != null)
 				{
-					String finalMessage = new String(rawMessage.replaceAll("&([0-9a-f])", "\u00A7$1"));
+					String finalMessage = plugin.replaceColors(rawMessage);
 					for (Player player : plugin.getServer().getOnlinePlayers())
 					{
 						if (!player.hasPermission("broadcaster.exemptfrommessage" + (number + 1)))

diff --git a/Broadcaster/src/com/github/xrevolut1onzx/broadcaster/commands/ConsoleCommandHandler.java b/Broadcaster/src/com/github/xrevolut1onzx/broadcaster/commands/ConsoleCommandHandler.java
@@ -47,7 +47,7 @@ public void preview(String numberString)
 		}
 		if (rawMessage != null)
 		{
-			String finalMessage = new String(rawMessage.replaceAll("&([0-9a-f])", "\u00A7$1"));
+			String finalMessage = plugin.replaceColors(rawMessage);
 			plugin.log("Preview: " + finalMessage);
 		}
 		else
@@ -77,7 +77,7 @@ public void broadcast(String numberString)
 				plugin.log("No one online!");
 				return;
 			}
-			String finalMessage = new String(rawMessage.replaceAll("&([0-9a-f])", "\u00A7$1"));
+			String finalMessage = plugin.replaceColors(rawMessage);
 			if (plugin.isUsingOp())
 			{
 				for (Player player : plugin.getServer().getOnlinePlayers())