Skip to content
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

Jump to bottom

Support new color codes #2147

Merged
merged 1 commit into from
Oct 24, 2023
Merged

Support new color codes #2147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/main/java/cn/nukkit/command/defaults/StatusCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)

TextFormat tpsColor = TextFormat.GREEN;
float tps = server.getTicksPerSecond();
if (tps < 17) {
tpsColor = TextFormat.GOLD;
} else if (tps < 12) {
if (tps < 12) {
tpsColor = TextFormat.RED;
} else if (tps < 17) {
tpsColor = TextFormat.GOLD;
}

sender.sendMessage(TextFormat.GOLD + "Current TPS: " + tpsColor + NukkitMath.round(tps, 2));
Expand Down
30 changes: 20 additions & 10 deletions src/main/java/cn/nukkit/utils/TextFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package cn.nukkit.utils;

import com.google.common.collect.Maps;

import java.util.HashMap;
import java.util.Map;
import java.util.regex.Pattern;
Expand Down Expand Up @@ -101,26 +99,37 @@ public enum TextFormat {
/**
* Resets all previous chat colors or formats.
*/
RESET('r', 0x15);
RESET('r', 0x15),

MATERIAL_QUARTZ('h', 0),
MATERIAL_IRON('i', 0),
MATERIAL_NETHERITE('j', 0),
MATERIAL_REDSTONE('m', 0),
MATERIAL_COPPER('n', 0),
MATERIAL_GOLD('p', 0),
MATERIAL_EMERALD('q', 0),
MATERIAL_DIAMOND('s', 0),
MATERIAL_LAPIS('t', 0),
MATERIAL_AMETHYST('u', 0);

/**
* The special character which prefixes all format codes. Use this if
* you need to dynamically convert format codes from your custom format.
*/
public static final char ESCAPE = '\u00A7';

private static final Pattern CLEAN_PATTERN = Pattern.compile("(?i)" + ESCAPE + "[0-9A-GK-OR]");
private final static Map<Integer, TextFormat> BY_ID = Maps.newTreeMap();
private static final Pattern CLEAN_PATTERN = Pattern.compile("(?i)" + ESCAPE + "[0-9A-U]");
//private final static Map<Integer, TextFormat> BY_ID = new TreeMap<>(); //unused
private final static Map<Character, TextFormat> BY_CHAR = new HashMap<>();

static {
for (TextFormat color : values()) {
BY_ID.put(color.intCode, color);
//BY_ID.put(color.intCode, color);
BY_CHAR.put(color.code, color);
}
}

private final int intCode;
//private final int intCode;
private final char code;
private final boolean isFormat;
private final String toString;
Expand All @@ -131,7 +140,7 @@ public enum TextFormat {

TextFormat(char code, int intCode, boolean isFormat) {
this.code = code;
this.intCode = intCode;
//this.intCode = intCode;
this.isFormat = isFormat;
this.toString = new String(new char[]{ESCAPE, code});
}
Expand Down Expand Up @@ -198,9 +207,10 @@ public static String clean(final String input, final boolean recursive) {
public static String colorize(char altFormatChar, String textToTranslate) {
char[] b = textToTranslate.toCharArray();
for (int i = 0; i < b.length - 1; i++) {
if (b[i] == altFormatChar && "0123456789AaBbCcDdEeFfGgKkLlMmNnOoRr".indexOf(b[i + 1]) > -1) {
int x = i + 1;
if (b[i] == altFormatChar && "0123456789AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUu".indexOf(b[x]) > -1) {
b[i] = TextFormat.ESCAPE;
b[i + 1] = Character.toLowerCase(b[i + 1]);
b[x] = Character.toLowerCase(b[x]);
}
}
return new String(b);
Expand Down