From 5ed21155ea596200ddb5e181a4cdac9f13a4d3a3 Mon Sep 17 00:00:00 2001 From: Roch Blonndiaux Date: Wed, 9 Nov 2022 16:50:25 +0100 Subject: [PATCH] fixed --- .../src/main/java/net/Indyuce/mmoitems/stat/DisplayName.java | 3 ++- .../src/main/java/net/Indyuce/mmoitems/util/ColorUtils.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/MMOItems-API/src/main/java/net/Indyuce/mmoitems/stat/DisplayName.java b/MMOItems-API/src/main/java/net/Indyuce/mmoitems/stat/DisplayName.java index 4a2fd9ba..91fcadef 100644 --- a/MMOItems-API/src/main/java/net/Indyuce/mmoitems/stat/DisplayName.java +++ b/MMOItems-API/src/main/java/net/Indyuce/mmoitems/stat/DisplayName.java @@ -32,11 +32,12 @@ public class DisplayName extends StringStat implements GemStoneStat { // Bake String format = data.toString() - .replace("", tier != null ? ChatColor.stripColor(tier.getName()) : "") + .replace("", tier != null ? ColorUtils.stripColors(tier.getName()) : "") .replace("", tier != null ? ChatColor.getLastColors(tier.getName()) : "&f") .replace("", tier != null ? ColorUtils.stripDecoration(ChatColor.getLastColors(tier.getName())) : "&f"); if (tier != null) { + System.out.println("Name: " + tier.getName()); System.out.println("Format: " + format); System.out.println("Last Colors: " + ChatColor.getLastColors(tier.getName()) + " w: " + ColorUtils.stripDecoration(ChatColor.getLastColors(tier.getName()))); System.out.println("===================\n"); diff --git a/MMOItems-API/src/main/java/net/Indyuce/mmoitems/util/ColorUtils.java b/MMOItems-API/src/main/java/net/Indyuce/mmoitems/util/ColorUtils.java index e472fc1b..f4a38a71 100644 --- a/MMOItems-API/src/main/java/net/Indyuce/mmoitems/util/ColorUtils.java +++ b/MMOItems-API/src/main/java/net/Indyuce/mmoitems/util/ColorUtils.java @@ -14,8 +14,13 @@ import java.util.regex.Pattern; public class ColorUtils { private static final Pattern STRIP_DECORATION_PATTERN = Pattern.compile("(?i)" + '§' + "[K-O]"); + private static final Pattern COLOR_TAG_PATTERN = Pattern.compile("(?i)<.*>"); public static @NotNull String stripDecoration(@NotNull String input) { return "%s%s".formatted(ChatColor.RESET, STRIP_DECORATION_PATTERN.matcher(input).replaceAll("")).replace('§', '&'); } + + public static @NotNull String stripColors(@NotNull String input) { + return ChatColor.stripColor(COLOR_TAG_PATTERN.matcher(input).replaceAll("")); + } }