Skip to content

GH-140 Bump run server version to 1.21.4 and add old legacy hex color transformers #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 10, 2025
Merged

GH-140 Bump run server version to 1.21.4 and add old legacy hex color transformers #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ad67f8
Bump run server version to 1.21.4 and add old legacy hex color transf…
CitralFlo Mar 9, 2025
445c9e2
Add test for legacy hex formatting
CitralFlo Mar 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ runPaper {
}

tasks.runServer {
minecraftVersion("1.20.4")
minecraftVersion("1.21.4")
dependsOn("shadowAll")
pluginJars = files("/build/libs/ChatFormatter v${project.version}.jar")
}
8 changes: 7 additions & 1 deletion chatformatter-core/src/main/java/com/eternalcode/formatter/legacy/Legacy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public final class Legacy {
public static final Pattern AMPERSAND_PATTERN = Pattern.compile("(?i)" + AMPERSAND + "([0-9A-FK-ORX#])");
public static final Pattern SHADOW_PATTERN = Pattern.compile("(?i)" + SHADOW + "[0-9A-FK-ORX#]");
public static final Pattern HEX_PATTERN = Pattern.compile("(?i)" + AMPERSAND + "#([0-9A-F]{6})");
public static final Pattern HEX_COLOR_PATTERN = Pattern.compile("(?i)&x(&[0-9A-F]){6}");

public static final Map<String, String> codeTranslations = new ImmutableMap.Builder<String, String>()
.put("0", "<black>")
Expand Down Expand Up @@ -96,7 +97,12 @@ static String placeholderToAmpersand(String text) {
}

public static String legacyToAdventure(String input) {
String result = HEX_PATTERN.matcher(input).replaceAll(matchResult -> {
String result = HEX_COLOR_PATTERN.matcher(input).replaceAll(matchResult -> {
String hexColor = matchResult.group().replace("&x", "").replace("&", "");
return "<#" + hexColor + ">";
});

result = HEX_PATTERN.matcher(result).replaceAll(matchResult -> {
String hex = matchResult.group(1);
return "<#" + hex + ">";
});
Expand Down
10 changes: 10 additions & 0 deletions chatformatter-core/src/test/java/com/eternalcode/formatter/legacy/LegacyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,14 @@ void testLegacyToAdventure() {
assertEquals("<red> SIEMA <#8376d3> <reset>test<green>!", result);
}

@Test
@DisplayName("Conversion of legacy hex formatting used in plugins like HexNicks default format")
void testLegacyHexToAdventure() {
String input = "&x&c&c&d&d&7&7&lSIEMA &x&7&7&5&5&4&4test&a!";

String result = Legacy.legacyToAdventure(input);

assertEquals("<#ccdd77><bold>SIEMA <#775544>test<green>!", result);
}

}
Loading