Skip to content

Fix rgb color codes getting stripped in some cases #5076

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
JRoy merged 3 commits into from
Aug 18, 2022
Merged

Fix rgb color codes getting stripped in some cases #5076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
649e803
Support hex color codes in test suite
JRoy Aug 18, 2022
6017940
Fix rgb color codes getting stripped in some cases
JRoy Aug 18, 2022
2c636aa
Merge branch '2.x' into fix/5058
JRoy Aug 18, 2022
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
4 changes: 4 additions & 0 deletions Essentials/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ dependencies {
}
}

test {
testLogging.showStandardStreams = true
}

shadowJar {
dependencies {
include (dependency('io.papermc:paperlib'))
Expand Down
6 changes: 3 additions & 3 deletions Essentials/src/main/java/com/earth2me/essentials/utils/FormatUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,12 +226,12 @@ public static String formatString(final IUser user, final String permBase, Strin
final EnumSet<ChatColor> strip = EnumSet.complementOf(supported);

final boolean rgb = user.isAuthorized(permBase + ".rgb");
if (!supported.isEmpty() || rgb) {
message = replaceColor(message, supported, rgb);
}
if (!strip.isEmpty()) {
message = stripColor(message, strip);
}
if (!supported.isEmpty() || rgb) {
message = replaceColor(message, supported, rgb);
}
return message;
}

Expand Down
2 changes: 1 addition & 1 deletion Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public static BukkitVersion fromString(final String string) {
if (!Bukkit.getName().equals("Essentials Fake Server")) {
throw new IllegalArgumentException(string + " is not in valid version format. e.g. 1.8.8-R0.1");
}
matcher = VERSION_PATTERN.matcher(v1_14_R01.toString());
matcher = VERSION_PATTERN.matcher(v1_16_1_R01.toString());
Preconditions.checkArgument(matcher.matches(), string + " is not in valid version format. e.g. 1.8.8-R0.1");
}

Expand Down
11 changes: 11 additions & 0 deletions Essentials/src/test/java/com/earth2me/essentials/utils/FormatUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,17 @@ public void testFormatCase() {
checkFormatPerms("§aT§Aest", "§aT§Aest", "color");
}

@Test
public void testFormatHexColors() {
checkFormatPerms("&#ffffff", "&#ffffff");
checkFormatPerms("&#ffffff", "§x§f§f§f§f§f§f", "color", "rgb");
checkFormatPerms("&#ff0000test", "§x§f§f§0§0§0§0test", "rgb");
checkFormatPerms("&#ff0000test", "§x§f§f§0§0§0§0test", "rgb", "color");
checkFormatPerms("&#ff0000test", "§x§f§f§0§0§0§0test", "rgb", "white");
checkFormatPerms("&#ff0000test", "§x§f§f§0§0§0§0test", "rgb", "black");
checkFormatPerms("&#ff0000test", "§x§f§f§0§0§0§0test", "rgb", "black", "white");
}

@Test
public void testFormatCategoryPerms() {
checkFormatPerms("Test", "Test");
Expand Down