SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix up hex colors

Browse Source
This commit is contained in:
libraryaddict 2021-05-22 06:34:58 +12:00
parent dd4556824a
commit 74af3acfc3
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
View File

@ -256,17 +256,19 @@ public class DisguiseUtilities {
team = ((Player) player).getScoreboard().getEntryTeam(((Player) player).getUniqueId().toString()); team = ((Player) player).getScoreboard().getEntryTeam(((Player) player).getUniqueId().toString());
} }
String name;
if (team == null || (StringUtils.isEmpty(team.getPrefix()) && StringUtils.isEmpty(team.getSuffix()))) { if (team == null || (StringUtils.isEmpty(team.getPrefix()) && StringUtils.isEmpty(team.getSuffix()))) {
String name = ((Player) player).getDisplayName(); name = ((Player) player).getDisplayName();
if (name.equals(player.getName())) { if (name.equals(player.getName())) {
return ((Player) player).getPlayerListName(); name = ((Player) player).getPlayerListName();
} }
} else {
return name; name = team.getPrefix() + team.getColor() + player.getName() + team.getSuffix();
} }
return team.getPrefix() + team.getColor() + player.getName() + team.getSuffix(); return name.replaceAll("§x§([0-9a-fA-F])§([0-9a-fA-F])§([0-9a-fA-F])§([0-9a-fA-F])§([0-9a-fA-F])§([0-9a-fA-F])", "<#$1$2$3$4$5$6>");
} }
public static String getDisplayName(String playerName) { public static String getDisplayName(String playerName) {
@ -2491,12 +2493,12 @@ public class DisguiseUtilities {
} }
public static String translateAlternateColorCodes(String string) { public static String translateAlternateColorCodes(String string) {
string = ChatColor.translateAlternateColorCodes('&', string);
if (NmsVersion.v1_16.isSupported()) { if (NmsVersion.v1_16.isSupported()) {
return string.replaceAll("&(?=#[0-9a-fA-F]{6})", ChatColor.COLOR_CHAR + ""); return string.replaceAll("&(?=#[0-9a-fA-F]{6})", ChatColor.COLOR_CHAR + "");
} }
string = ChatColor.translateAlternateColorCodes('&', string);
return string; return string;
} }
@ -2530,7 +2532,7 @@ public class DisguiseUtilities {
if (c != ChatColor.COLOR_CHAR || (message.length() - i >= 7 && Pattern.matches("#[0-9a-fA-F]{6}", message.substring(i, i + 7)))) { if (c != ChatColor.COLOR_CHAR || (message.length() - i >= 7 && Pattern.matches("#[0-9a-fA-F]{6}", message.substring(i, i + 7)))) {
format = net.md_5.bungee.api.ChatColor.of(message.substring(i, i + 7)); format = net.md_5.bungee.api.ChatColor.of(message.substring(i, i + 7));
i += c == ChatColor.COLOR_CHAR ? 7 : 8; i += c == '<' ? 7 : 8;
} else { } else {
c = message.charAt(i); c = message.charAt(i);
@ -2980,7 +2982,7 @@ public class DisguiseUtilities {
if (NmsVersion.v1_13.isSupported()) { if (NmsVersion.v1_13.isSupported()) {
name = Optional.of(WrappedChatComponent.fromJson(ComponentSerializer.toString(DisguiseUtilities.getColoredChat(newNames[i])))); name = Optional.of(WrappedChatComponent.fromJson(ComponentSerializer.toString(DisguiseUtilities.getColoredChat(newNames[i]))));
} else { } else {
name = newNames[i]; name = ChatColor.translateAlternateColorCodes('&', newNames[i]);
} }
WrappedDataWatcher.WrappedDataWatcherObject obj = ReflectionManager WrappedDataWatcher.WrappedDataWatcherObject obj = ReflectionManager
@ -3020,9 +3022,9 @@ public class DisguiseUtilities {
} else if (index == MetaIndex.ARMORSTAND_META) { } else if (index == MetaIndex.ARMORSTAND_META) {
val = (byte) 19; val = (byte) 19;
} else if (index == MetaIndex.ENTITY_CUSTOM_NAME) { } else if (index == MetaIndex.ENTITY_CUSTOM_NAME) {
val = Optional.of(WrappedChatComponent.fromText(newNames[i])); val = Optional.of(WrappedChatComponent.fromJson(ComponentSerializer.toString(DisguiseUtilities.getColoredChat(newNames[i]))));
} else if (index == MetaIndex.ENTITY_CUSTOM_NAME_OLD) { } else if (index == MetaIndex.ENTITY_CUSTOM_NAME_OLD) {
val = newNames[i]; val = ChatColor.translateAlternateColorCodes('&', newNames[i]);
} else if (index == MetaIndex.ENTITY_CUSTOM_NAME_VISIBLE) { } else if (index == MetaIndex.ENTITY_CUSTOM_NAME_VISIBLE) {
val = true; val = true;
} }