Customizable plugin prefix and RGB support in strings

pom.xml

@@ -96,6 +96,11 @@
 		</plugins>
 	</build>
 	<repositories>
+		<repository>
+			<!-- GriefPrevention, SlimeFun, Towny, Brewery -->
+			<id>jitpack.io</id>
+			<url>https://jitpack.io</url>
+		</repository>
 		<repository>
 			<id>md_5-public</id>
 			<url>https://repo.md-5.net/content/groups/public/</url>
@@ -113,11 +118,6 @@
 			<id>enginehub-maven</id>
 			<url>https://maven.enginehub.org/repo/</url>
 		</repository>
-		<repository>
-			<!-- GriefPrevention, SlimeFun, Towny, Brewery -->
-			<id>jitpack.io</id>
-			<url>https://jitpack.io</url>
-		</repository>
 		<repository>
 			<!-- LWC Extended -->
 			<id>ender-repo</id>
@@ -248,7 +248,7 @@
 			<!-- https://www.spigotmc.org/resources/griefprevention.1884/history -->
 			<groupId>com.github.TechFortress</groupId>
 			<artifactId>GriefPrevention</artifactId>
-			<version>16.18.1</version>
+			<version>16.18</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -296,7 +296,7 @@
 			<!-- https://www.spigotmc.org/resources/towny-advanced.72694/history -->
 			<groupId>com.github.TownyAdvanced</groupId>
 			<artifactId>Towny</artifactId>
-			<version>0.100.0.0</version>
+			<version>0.100.1.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

resources/config/v12/de/config.yml

@@ -7,6 +7,9 @@
 # Sprachedatei die genutzt werden sollte (befindet sich in plugins/Brewery/languages)
 language: de
 
+# Prefix used on messages
+pluginPrefix: '&2[Brewery]&f '
+
 # Ob der Spieler beim nächsten Einloggen nach starker Trunkenheit am nächsten morgen Zuhause "aufwacht" (Ein home Plugin muss installiert sein!) [true]
 enableHome: true
 

resources/config/v12/en/config.yml

@@ -7,6 +7,9 @@
 # Languagefile to be used (found in plugins/Brewery/languages)
 language: en
 
+# Prefix used on messages
+pluginPrefix: '&2[Brewery]&f '
+
 # If the player wakes up at /home when logging in after excessive drinking (/home plugin must be installed!) [true]
 enableHome: true
 

resources/config/v12/fr/config.yml

@@ -8,6 +8,9 @@
 # Fichier de langage utilisé (trouvable dans plugins/Brewery/languages)
 language: fr
 
+# Prefix used on messages
+pluginPrefix: '&2[Brewery]&f '
+
 # Si le joueur se réveille à son /home lors de sa connexion après un excès alcool (Un plugin de /home est nécessaire!) [true]
 enableHome: true
 

resources/config/v12/it/config.yml

@@ -7,6 +7,9 @@
 # Lingua da usare (fra quelle in plugins/Brewery/languages)
 language: it
 
+# Prefix used on messages
+pluginPrefix: '&2[Brewery]&f '
+
 # Se il giocatore si sveglia nella sua /home dopo aver bevuto troppo(il plugin di /home deve essere installato!) [true]
 enableHome: true
 

resources/config/v13/de/config.yml

@@ -7,6 +7,9 @@
 # Sprachedatei die genutzt werden sollte (befindet sich in plugins/Brewery/languages)
 language: de
 
+# Prefix used on messages
+pluginPrefix: '&2[Brewery]&f '
+
 # Ob der Spieler beim nächsten Einloggen nach starker Trunkenheit am nächsten morgen Zuhause "aufwacht" (Ein home Plugin muss installiert sein!) [true]
 enableHome: true
 

resources/config/v13/en/config.yml

@@ -7,6 +7,9 @@
 # Languagefile to be used (found in plugins/Brewery/languages)
 language: en
 
+# Prefix used on messages
+pluginPrefix: '&2[Brewery]&f '
+
 # If the player wakes up at /home when logging in after excessive drinking (/home plugin must be installed!) [true]
 enableHome: true
 

resources/config/v13/es/config.yml

@@ -7,6 +7,9 @@
 # Languagefile to be used (found in plugins/Brewery/languages)
 language: es
 
+# Prefix used on messages
+pluginPrefix: '&2[Brewery]&f '
+
 # If the player wakes up at /home when logging in after excessive drinking (/home plugin must be installed!) [true]
 enableHome: true
 

resources/config/v13/fr/config.yml

@@ -8,6 +8,9 @@
 # Fichier de langage utilisé (trouvable dans plugins/Brewery/languages)
 language: fr
 
+# Prefix used on messages
+pluginPrefix: '&2[Brewery]&f '
+
 # Si le joueur se réveille à son /home lors de sa connexion après un excès alcool (Un plugin de /home est nécessaire!) [true]
 enableHome: true
 

resources/config/v13/it/config.yml

@@ -7,6 +7,9 @@
 # Lingua da usare (fra quelle in plugins/Brewery/languages)
 language: it
 
+# Prefix used on messages
+pluginPrefix: '&2[Brewery]&f '
+
 # Se il giocatore si sveglia nella sua /home dopo aver bevuto troppo(il plugin di /home deve essere installato!) [true]
 enableHome: true
 

resources/config/v13/zh/config.yml

@@ -9,6 +9,9 @@
 # 语言文件(可在plugins/Brewery/languages下找到)
 language: zh
 
+# Prefix used on messages
+pluginPrefix: '&2[Brewery]&f '
+
 # 喝高了的下线玩家会在家里醒来(需要/home等功能支持)[true]
 enableHome: true
 

src/com/dre/brewery/P.java

@@ -312,7 +312,7 @@ public static P getInstance() {
 	// Utility
 
 	public void msg(CommandSender sender, String msg) {
-		sender.sendMessage(color("&2[Brewery] &f" + msg));
+		sender.sendMessage(color(BConfig.pluginPrefix + msg));
 	}
 
 	public void log(String msg) {
@@ -326,9 +326,9 @@ public void debugLog(String msg) {
 	}
 
 	public void errorLog(String msg) {
-		Bukkit.getConsoleSender().sendMessage(ChatColor.DARK_GREEN + "[Brewery] " + ChatColor.DARK_RED + "ERROR: " + ChatColor.RED + msg);
+		Bukkit.getConsoleSender().sendMessage(ChatColor.DARK_GREEN + BConfig.pluginPrefix + ChatColor.DARK_RED + "ERROR: " + ChatColor.RED + msg);
 		if (BConfig.reloader != null) {
-			BConfig.reloader.sendMessage(ChatColor.DARK_GREEN + "[Brewery] " + ChatColor.DARK_RED + "ERROR: " + ChatColor.RED + msg);
+			BConfig.reloader.sendMessage(ChatColor.DARK_GREEN + BConfig.pluginPrefix + ChatColor.DARK_RED + "ERROR: " + ChatColor.RED + msg);
 		}
 	}
 

src/com/dre/brewery/filedata/BConfig.java

@@ -95,6 +95,7 @@ public class BConfig {
 	//Features
 	public static boolean craftSealingTable; // Allow Crafting of Sealing Table
 	public static boolean enableSealingTable; // Allow Usage of Sealing Table
+	public static String pluginPrefix = "&2[Brewery]&f ";
 
 	//Item
 	public static List<RecipeItem> customItems = new ArrayList<>();
@@ -234,6 +235,7 @@ public static void readConfig(FileConfiguration config) {
 		enableWake = config.getBoolean("enableWake", false);
 		craftSealingTable = config.getBoolean("craftSealingTable", false);
 		enableSealingTable = config.getBoolean("enableSealingTable", false);
+		pluginPrefix = config.getString("pluginPrefix", "&2[Brewery]&f ");
 		colorInBarrels = config.getBoolean("colorInBarrels", false);
 		colorInBrewer = config.getBoolean("colorInBrewer", false);
 		alwaysShowQuality = config.getBoolean("alwaysShowQuality", false);

src/com/dre/brewery/utility/BUtil.java

@@ -38,18 +38,40 @@ public class BUtil {
 	/* *********                      ********* */
 	/* **************************************** */
 
+	private static final String WITH_DELIMITER = "((?<=%1$s)|(?=%1$s))";
+
 	/**
 	 * Check if the Chunk of a Block is loaded !without loading it in the process!
 	 */
 	public static boolean isChunkLoaded(Block block) {
 		return block.getWorld().isChunkLoaded(block.getX() >> 4, block.getZ() >> 4);
 	}
 
+	/**
+	 * Color code a message. Supports HEX colors and default minecraft colors! &2 &#FFFFFF
+	 * @param msg The message to color
+	 * @return The colored message, or null if msg was null
+	 */
 	public static String color(String msg) {
-		if (msg != null) {
-			msg = ChatColor.translateAlternateColorCodes('&', msg);
+		if (msg == null) return null;
+		String[] texts = msg.split(String.format(WITH_DELIMITER, "&"));
+
+		StringBuilder finalText = new StringBuilder();
+
+		for (int i = 0; i < texts.length; i++) {
+			if (texts[i].equalsIgnoreCase("&")) {
+				//get the next string
+				i++;
+				if (texts[i].charAt(0) == '#') {
+					finalText.append(net.md_5.bungee.api.ChatColor.of(texts[i].substring(0, 7)) + texts[i].substring(7));
+				} else {
+					finalText.append(ChatColor.translateAlternateColorCodes('&', "&" + texts[i]));
+				}
+			} else {
+				finalText.append(texts[i]);
+			}
 		}
-		return msg;
+		return finalText.toString();
 	}
 
 	/**