Skip to content

Commit 7b2c3a5

Browse files
committed
Refactor color handling in MessageAPI to use ChatColor for encoding
1 parent 332fbbd commit 7b2c3a5

File tree

5 files changed

+206
-191
lines changed

5 files changed

+206
-191
lines changed

SimpleAPI/.settings/org.eclipse.core.resources.prefs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ encoding//src/main/java/com/bencodez/simpleapi/sql/mysql/config/MysqlConfigSpigo
66
encoding//src/main/resources=Cp1252
77
encoding//src/test/java=Cp1252
88
encoding//src/test/resources=Cp1252
9-
encoding/<project>=Cp1252
109
encoding/src=Cp1252

SimpleAPI/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<properties>
1010
<!-- github server corresponds to entry in ~/.m2/settings.xml -->
1111
<github.global.server>github</github.global.server>
12-
<project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
12+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<timestamp>${maven.build.timestamp}</timestamp>
1414
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
1515
<build.number>NOTSET</build.number>

SimpleAPI/src/main/java/com/bencodez/simpleapi/messages/MessageAPI.java

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,23 @@ public static String colorize(String format) {
2727
if (format == null) {
2828
return null;
2929
}
30-
format = format.replace("{AQUA}", "§b").replace("{BLACK}", "§0").replace("{BLUE}", "§9")
31-
.replace("{DARK_AQUA}", "§3").replace("{DARK_BLUE}", "§1").replace("{DARK_GRAY}", "§8")
32-
.replace("{DARK_GREEN}", "§2").replace("{DARK_PURPLE}", "§5").replace("{DARK_RED}", "§4")
33-
.replace("{GOLD}", "§6").replace("{GRAY}", "§7").replace("{GREEN}", "§a")
34-
.replace("{LIGHT_PURPLE}", "§d").replace("{RED}", "§c").replace("{WHITE}", "§f")
35-
.replace("{YELLOW}", "§e").replace("{BOLD}", "§l").replace("{ITALIC}", "§o").replace("{MAGIC}", "§k")
36-
.replace("{RESET}", "§r").replace("{STRIKE}", "§m").replace("{STRIKETHROUGH}", "§m")
37-
.replace("{UNDERLINE}", "§n");
30+
31+
final String cc = String.valueOf(COLOR_CHAR);
32+
33+
format = format.replace("{AQUA}", cc + "b").replace("{BLACK}", cc + "0").replace("{BLUE}", cc + "9")
34+
.replace("{DARK_AQUA}", cc + "3").replace("{DARK_BLUE}", cc + "1").replace("{DARK_GRAY}", cc + "8")
35+
.replace("{DARK_GREEN}", cc + "2").replace("{DARK_PURPLE}", cc + "5").replace("{DARK_RED}", cc + "4")
36+
.replace("{GOLD}", cc + "6").replace("{GRAY}", cc + "7").replace("{GREEN}", cc + "a")
37+
.replace("{LIGHT_PURPLE}", cc + "d").replace("{RED}", cc + "c").replace("{WHITE}", cc + "f")
38+
.replace("{YELLOW}", cc + "e").replace("{BOLD}", cc + "l").replace("{ITALIC}", cc + "o")
39+
.replace("{MAGIC}", cc + "k").replace("{RESET}", cc + "r").replace("{STRIKE}", cc + "m")
40+
.replace("{STRIKETHROUGH}", cc + "m").replace("{UNDERLINE}", cc + "n");
3841

3942
// hex format: &#FF0000#
4043
format = translateHexColorCodes("&#", "#", format);
4144
// hex format: &#FF0000
4245
format = translateHexColorCodes("&#", "", format);
46+
4347
return ChatColor.translateAlternateColorCodes('&', format);
4448
}
4549

0 commit comments

Comments
 (0)