diff --git a/.github/README.md b/.github/README.md index a4d68a0b..810cde23 100644 --- a/.github/README.md +++ b/.github/README.md @@ -3,7 +3,7 @@ # Development Welcome to the public code repository for MultiChat by Revilo410. (Oliver Martin) -MultiChat is an advanced chat management system for Spigot/Bungeecord with over **15000** downloads. +MultiChat is an advanced chat management system for Spigot/Bungeecord with over **20000** downloads. [Official Listing](https://www.spigotmc.org/resources/multichat.26204/) diff --git a/multichat/src/main/java/xyz/olivermartin/multichat/bungee/MultiChat.java b/multichat/src/main/java/xyz/olivermartin/multichat/bungee/MultiChat.java index 94c62c62..bc043ef1 100644 --- a/multichat/src/main/java/xyz/olivermartin/multichat/bungee/MultiChat.java +++ b/multichat/src/main/java/xyz/olivermartin/multichat/bungee/MultiChat.java @@ -54,6 +54,7 @@ public class MultiChat extends Plugin implements Listener { public static final String[] ALLOWED_VERSIONS = new String[] { LATEST_VERSION, + "1.9.4", "1.9.3", "1.9.2", "1.9.1", diff --git a/multichat/src/main/java/xyz/olivermartin/multichat/local/spigot/LocalSpigotMetaManager.java b/multichat/src/main/java/xyz/olivermartin/multichat/local/spigot/LocalSpigotMetaManager.java index 7e0be27d..2c5a0f01 100644 --- a/multichat/src/main/java/xyz/olivermartin/multichat/local/spigot/LocalSpigotMetaManager.java +++ b/multichat/src/main/java/xyz/olivermartin/multichat/local/spigot/LocalSpigotMetaManager.java @@ -28,7 +28,7 @@ public String getPrefix(UUID uuid) { return MultiChatUtil.approximateHexCodes(vaultChat.getPlayerPrefix(Bukkit.getServer().getPlayer(uuid))); } - return vaultChat.getPlayerPrefix(Bukkit.getServer().getPlayer(uuid)); + return MultiChatUtil.reformatRGB(vaultChat.getPlayerPrefix(Bukkit.getServer().getPlayer(uuid))); } @@ -50,7 +50,7 @@ public String getSuffix(UUID uuid) { return MultiChatUtil.approximateHexCodes(vaultChat.getPlayerSuffix(Bukkit.getServer().getPlayer(uuid))); } - return vaultChat.getPlayerSuffix(Bukkit.getServer().getPlayer(uuid)); + return MultiChatUtil.reformatRGB(vaultChat.getPlayerSuffix(Bukkit.getServer().getPlayer(uuid))); } @@ -86,6 +86,7 @@ public String getDisplayName(UUID uuid) { displayNameFormat = displayNameFormat.replaceAll("%NAME%", player.getName()); displayNameFormat = displayNameFormat.replaceAll("%PREFIX%", getPrefix(uuid)); displayNameFormat = displayNameFormat.replaceAll("%SUFFIX%", getSuffix(uuid)); + displayNameFormat = MultiChatUtil.reformatRGB(displayNameFormat); displayNameFormat = displayNameFormat.replaceAll("&(?=[a-f,0-9,k-o,r,x])", "§"); // LEGACY HACK diff --git a/multichat/src/main/java/xyz/olivermartin/multichat/local/sponge/LocalSpongeMetaManager.java b/multichat/src/main/java/xyz/olivermartin/multichat/local/sponge/LocalSpongeMetaManager.java index 0a2ce8de..bcb10967 100644 --- a/multichat/src/main/java/xyz/olivermartin/multichat/local/sponge/LocalSpongeMetaManager.java +++ b/multichat/src/main/java/xyz/olivermartin/multichat/local/sponge/LocalSpongeMetaManager.java @@ -24,7 +24,7 @@ public String getPrefix(UUID uuid) { Player player = opPlayer.get(); if (player.getOption("prefix").isPresent()) { - return MultiChatUtil.approximateHexCodes(player.getOption("prefix").get()); + return MultiChatUtil.approximateHexCodes(MultiChatUtil.reformatRGB(player.getOption("prefix").get())); } else { return ""; } @@ -45,7 +45,7 @@ public String getSuffix(UUID uuid) { Player player = opPlayer.get(); if (player.getOption("suffix").isPresent()) { - return MultiChatUtil.approximateHexCodes(player.getOption("suffix").get()); + return MultiChatUtil.approximateHexCodes(MultiChatUtil.reformatRGB(player.getOption("suffix").get())); } else { return ""; } @@ -92,8 +92,9 @@ public String getDisplayName(UUID uuid) { displayNameFormat = displayNameFormat.replaceAll("%NAME%", player.getName()); displayNameFormat = displayNameFormat.replaceAll("%PREFIX%", getPrefix(uuid)); displayNameFormat = displayNameFormat.replaceAll("%SUFFIX%", getSuffix(uuid)); + displayNameFormat = MultiChatUtil.reformatRGB(displayNameFormat); displayNameFormat = displayNameFormat.replaceAll("&(?=[a-f,0-9,k-o,r,x])", "§"); - + displayNameFormat = MultiChatUtil.approximateHexCodes(displayNameFormat); // TODO Sponge doesn't seem to like this... So we tend to work around it by sending back our original string