ChromaGaming/Chroma-Chat
1
0
Fork 0
Code Issues 15 Pull requests 1 Packages Projects Releases 8 Wiki Activity

F I X E D F O R M A T T I N G

Browse source 
Except /shrug
#71
Also added strikethrough
This commit is contained in:
Norbi Peti 2018-07-17 18:29:55 +02:00
parent e6ac18e0c7
commit 4f2abe41b8
No known key found for this signature in database
GPG key ID: DBA4C4549A927E56
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/buttondevteam/chat/ChatProcessing.java
View file

@ -47,6 +47,7 @@ public class ChatProcessing {
private static final Pattern CODE_PATTERN = Pattern.compile("`"); private static final Pattern CODE_PATTERN = Pattern.compile("`");
private static final Pattern MASKED_LINK_PATTERN = Pattern.compile("\\[([^\\[\\]])\\]\\(([^()])\\)"); private static final Pattern MASKED_LINK_PATTERN = Pattern.compile("\\[([^\\[\\]])\\]\\(([^()])\\)");
private static final Pattern SOMEONE_PATTERN = Pattern.compile("@someone"); //TODO private static final Pattern SOMEONE_PATTERN = Pattern.compile("@someone"); //TODO
private static final Pattern STRIKETHROUGH_PATTERN = Pattern.compile("~~");
private static final Color[] RainbowPresserColors = new Color[]{Color.Red, Color.Gold, Color.Yellow, Color.Green, private static final Color[] RainbowPresserColors = new Color[]{Color.Red, Color.Gold, Color.Yellow, Color.Green,
Color.Blue, Color.DarkPurple}; Color.Blue, Color.DarkPurple};
private static boolean pingedconsole = false; private static boolean pingedconsole = false;
@ -59,6 +60,8 @@ public class ChatProcessing {
ChatFormatter.builder().regex(ITALIC_PATTERN).italic(true).removeCharCount((short) 1).range(true).build(), ChatFormatter.builder().regex(ITALIC_PATTERN).italic(true).removeCharCount((short) 1).range(true).build(),
ChatFormatter.builder().regex(UNDERLINED_PATTERN).underlined(true).removeCharCount((short) 1).range(true) ChatFormatter.builder().regex(UNDERLINED_PATTERN).underlined(true).removeCharCount((short) 1).range(true)
.build(), .build(),
ChatFormatter.builder().regex(STRIKETHROUGH_PATTERN).strikethrough(true).removeCharCount((short) 2).range(true)
.build(),
ESCAPE_FORMATTER, ChatFormatter.builder().regex(URL_PATTERN).underlined(true).openlink("$1").build(), ESCAPE_FORMATTER, ChatFormatter.builder().regex(URL_PATTERN).underlined(true).openlink("$1").build(),
ChatFormatter.builder().regex(NULL_MENTION_PATTERN).color(Color.DarkRed).build(), // Properly added a bug as a feature ChatFormatter.builder().regex(NULL_MENTION_PATTERN).color(Color.DarkRed).build(), // Properly added a bug as a feature
ChatFormatter.builder().regex(CONSOLE_PING_PATTERN).color(Color.Aqua).onmatch((match, builder) -> { ChatFormatter.builder().regex(CONSOLE_PING_PATTERN).color(Color.Aqua).onmatch((match, builder) -> {

18
src/main/java/buttondevteam/chat/formatting/ChatFormatter.java
View file

@ -71,7 +71,7 @@ public final class ChatFormatter {
: Integer.compare(s1.Start, s2.Start)); : Integer.compare(s1.Start, s2.Start));
/** /**
* 0: Start - 1: End * 0: Start - 1: End index
*/ */
val remchars = new ArrayList<int[]>(); val remchars = new ArrayList<int[]>();
@ -87,7 +87,7 @@ public final class ChatFormatter {
if (!section.IsRange) { if (!section.IsRange) {
escaped = section.Formatters.contains(ChatProcessing.ESCAPE_FORMATTER) && !escaped; // Enable escaping on first \, disable on second escaped = section.Formatters.contains(ChatProcessing.ESCAPE_FORMATTER) && !escaped; // Enable escaping on first \, disable on second
if (escaped) // Don't add the escape character if (escaped) // Don't add the escape character
remchars.add(new int[] { section.Start, section.Start + 1 }); remchars.add(new int[]{section.Start, section.Start});
combined.add(section); // This will delete the \ combined.add(section); // This will delete the \
DebugCommand.SendDebugMessage("Added " + (!escaped ? "not " : "") + "escaper section: " + section); DebugCommand.SendDebugMessage("Added " + (!escaped ? "not " : "") + "escaper section: " + section);
sendMessageWithPointer(str, section.Start, section.End); sendMessageWithPointer(str, section.Start, section.End);
@ -120,7 +120,8 @@ public final class ChatFormatter {
takenFormatter = section.Formatters.get(0); takenFormatter = section.Formatters.get(0);
if (nextSection.containsKey(section.Formatters.get(0))) { if (nextSection.containsKey(section.Formatters.get(0))) {
FormattedSection s = nextSection.remove(section.Formatters.get(0)); FormattedSection s = nextSection.remove(section.Formatters.get(0));
s.End = section.Start; // section: the ending marker section - s: the to-be full section // section: the ending marker section - s: the to-be full section
s.End = takenEnd - 1; //Take the remCharCount into account as well
// s.IsRange = false; // IsRange means it's a 1 long section indicating a start or an end // s.IsRange = false; // IsRange means it's a 1 long section indicating a start or an end
combined.add(s); combined.add(s);
DebugCommand.SendDebugMessage("Finished section: " + s); DebugCommand.SendDebugMessage("Finished section: " + s);
@ -145,22 +146,22 @@ public final class ChatFormatter {
DebugCommand.SendDebugMessage("Finished unfinished section: " + sec); DebugCommand.SendDebugMessage("Finished unfinished section: " + sec);
sendMessageWithPointer(str, sec.Start, sec.End); sendMessageWithPointer(str, sec.Start, sec.End);
} }
sections = combined;
header("Adding remove chars (RC)"); // Important to add after the range section conversion header("Adding remove chars (RC)"); // Important to add after the range section conversion
sections.stream() sections.stream()
.flatMap(fs -> fs.Formatters.stream().filter(cf -> cf.removeCharCount > 0) .flatMap(fs -> fs.Formatters.stream().filter(cf -> cf.removeCharCount > 0)
.mapToInt(cf -> cf.removeCharCount).mapToObj(rcc -> new int[] { fs.Start, fs.Start + rcc })) .mapToInt(cf -> cf.removeCharCount).mapToObj(rcc -> new int[]{fs.Start, fs.Start + rcc - 1}))
.forEach(rc -> remchars.add(rc)); .forEach(rc -> remchars.add(rc));
sections.stream() sections.stream()
.flatMap(fs -> fs.Formatters.stream().filter(cf -> cf.removeCharCount > 0) .flatMap(fs -> fs.Formatters.stream().filter(cf -> cf.removeCharCount > 0)
.mapToInt(cf -> cf.removeCharCount).mapToObj(rcc -> new int[] { fs.End, fs.End - rcc })) .mapToInt(cf -> cf.removeCharCount).mapToObj(rcc -> new int[]{fs.End - rcc + 1, fs.End}))
.forEach(rc -> remchars.add(rc)); .forEach(rc -> remchars.add(rc));
DebugCommand.SendDebugMessage("Added remchars:"); DebugCommand.SendDebugMessage("Added remchars:");
DebugCommand DebugCommand
.SendDebugMessage(remchars.stream().map(rc -> Arrays.toString(rc)).collect(Collectors.joining("; "))); .SendDebugMessage(remchars.stream().map(rc -> Arrays.toString(rc)).collect(Collectors.joining("; ")));
header("Section combining"); header("Section combining");
sections = combined;
boolean cont = true; boolean cont = true;
boolean found = false; boolean found = false;
for (int i = 1; cont;) { for (int i = 1; cont;) {
@ -190,7 +191,6 @@ public final class ChatFormatter {
origend = origend2; origend = origend2;
origend2 = tmp; origend2 = tmp;
} }
// int rc1start, rc1end, rc2start, rc2end, rc3start, rc3end; // Remove characters - TODO: Store positions
FormattedSection section = new FormattedSection(firstSection.Formatters, sections.get(i).Start, origend, FormattedSection section = new FormattedSection(firstSection.Formatters, sections.get(i).Start, origend,
firstSection.Matches, false); firstSection.Matches, false);
section.Formatters.addAll(sections.get(i).Formatters); section.Formatters.addAll(sections.get(i).Formatters);
@ -271,9 +271,9 @@ public final class ChatFormatter {
val rce = remchars.stream().filter(rc -> rc[0] <= end && end <= rc[1]).findAny(); val rce = remchars.stream().filter(rc -> rc[0] <= end && end <= rc[1]).findAny();
int s = start, e = end; int s = start, e = end;
if (rcs.isPresent()) if (rcs.isPresent())
s = rcs.get()[1]; s = rcs.get()[1] + 1;
if (rce.isPresent()) if (rce.isPresent())
e = rce.get()[0]; e = rce.get()[0] - 1;
DebugCommand.SendDebugMessage("After RC - Start: " + s + " - End: " + e); DebugCommand.SendDebugMessage("After RC - Start: " + s + " - End: " + e);
if (e - s < 0) { //e-s==0 means the end char is the same as start char, so one char message if (e - s < 0) { //e-s==0 means the end char is the same as start char, so one char message
DebugCommand.SendDebugMessage("Skipping section because of remchars (length would be " + (e - s + 1) + ")"); DebugCommand.SendDebugMessage("Skipping section because of remchars (length would be " + (e - s + 1) + ")");