amalthea-mc/ShopChest
1
0
Fork 0
mirror of https://github.com/amalthea-mc/ShopChest.git synced 2024-11-22 02:12:25 +00:00
Code Issues Projects Releases Wiki Activity

Fix hologram for hex colored item names

Browse Source
This commit is contained in:
Eric 2020-08-22 19:48:25 +02:00
parent d3574f1519
commit 967b9f2ce3
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/de/epiceric/shopchest/nms/JsonBuilder.java
View File

@ -109,7 +109,8 @@ public class JsonBuilder {
} }
} }
private static final Pattern PART_PATTERN = Pattern.compile("(([§][a-fA-Fk-oK-OrR0-9])+)([^§]*)"); private static final Pattern PART_PATTERN = Pattern.compile("((§(?:[a-fA-Fk-oK-OrR0-9]|#[a-fA-F0-9]{6}))+)([^§]*)");
private static final Pattern HEX_PATTERN = Pattern.compile("(§[a-fA-F0-9]){6}");
private Part rootPart; private Part rootPart;
private ShopChest plugin; private ShopChest plugin;
@ -145,6 +146,12 @@ public class JsonBuilder {
} }
public static Part parse(String text) { public static Part parse(String text) {
Matcher hexMatcher = HEX_PATTERN.matcher(text);
while (hexMatcher.find()) {
String hexCode = hexMatcher.group(0).replace("§", "");
text = text.replace(hexMatcher.group(0), "§#" + hexCode);
}
Matcher matcher = PART_PATTERN.matcher(text); Matcher matcher = PART_PATTERN.matcher(text);
if (!matcher.find()) { if (!matcher.find()) {
@ -200,7 +207,11 @@ public class JsonBuilder {
part.removeValue("color"); part.removeValue("color");
break; break;
default: default:
part.setValue("color", new Part(ChatColor.getByChar(f).name().toLowerCase())); if (f.startsWith("#")) {
part.setValue("color", new Part(f));
} else {
part.setValue("color", new Part(ChatColor.getByChar(f).name().toLowerCase()));
}
} }
} }