diff --git a/src/main/java/net/coreprotect/language/Language.java b/src/main/java/net/coreprotect/language/Language.java index 37e7bda9..8b1708fc 100644 --- a/src/main/java/net/coreprotect/language/Language.java +++ b/src/main/java/net/coreprotect/language/Language.java @@ -2,6 +2,8 @@ import java.util.concurrent.ConcurrentHashMap; +import org.bukkit.ChatColor; + public class Language { private static ConcurrentHashMap phrases = new ConcurrentHashMap<>(); @@ -21,10 +23,16 @@ protected static String getTranslatedPhrase(Phrase phrase) { } protected static void setUserPhrase(Phrase phrase, String value) { + if (value != null) { + value = ChatColor.translateAlternateColorCodes('&', value); + } userPhrases.put(phrase, value); } protected static void setTranslatedPhrase(Phrase phrase, String value) { + if (value != null) { + value = ChatColor.translateAlternateColorCodes('&', value); + } translatedPhrases.put(phrase, value); } diff --git a/src/main/java/net/coreprotect/utility/Chat.java b/src/main/java/net/coreprotect/utility/Chat.java index df50fbd1..fd99ec2b 100644 --- a/src/main/java/net/coreprotect/utility/Chat.java +++ b/src/main/java/net/coreprotect/utility/Chat.java @@ -23,7 +23,15 @@ private Chat() { throw new IllegalStateException("Utility class"); } + public static String translateColorCodes(String text) { + if (text == null) { + return null; + } + return ChatColor.translateAlternateColorCodes('&', text); + } + public static void sendComponent(CommandSender sender, String string, String bypass) { + string = translateColorCodes(string); SpigotAdapter.ADAPTER.sendComponent(sender, string, bypass); } @@ -32,6 +40,7 @@ public static void sendComponent(CommandSender sender, String string) { } public static void sendMessage(CommandSender sender, String message) { + message = translateColorCodes(message); if (sender instanceof ConsoleCommandSender) { message = message.replace(Color.DARK_AQUA, ChatColor.DARK_AQUA.toString()); } @@ -40,10 +49,12 @@ public static void sendMessage(CommandSender sender, String message) { } public static void sendConsoleMessage(String string) { + string = translateColorCodes(string); Bukkit.getServer().getConsoleSender().sendMessage(string); } public static void console(String string) { + string = translateColorCodes(string); if (string.startsWith("-") || string.startsWith("[")) { Bukkit.getLogger().log(Level.INFO, string); } @@ -53,6 +64,7 @@ public static void console(String string) { } public static void sendGlobalMessage(CommandSender user, String string) { + string = translateColorCodes(string); if (user instanceof ConsoleCommandSender) { sendMessage(user, Color.DARK_AQUA + "[CoreProtect] " + Color.WHITE + string); return;