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

Progressing with processing

Browse source
This commit is contained in:
Norbi Peti 2017-06-09 12:28:52 +02:00
parent bcd6d3f194
commit 12b1a45558
3 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,7 +50,7 @@ public class ChatProcessing {
static {
commonFormatters.add(new ChatFormatterBuilder().setRegex(BOLD_PATTERN).setBold(true)
.setRemoveCharCount((short) 2).setRange(true).build());
.setRemoveCharCount((short) 2).setRange(true).setPriority(Priority.High).build());
commonFormatters.add(new ChatFormatterBuilder().setRegex(ITALIC_PATTERN).setItalic(true)
.setRemoveCharCount((short) 1).setRange(true).build());
commonFormatters.add(new ChatFormatterBuilder().setRegex(UNDERLINED_PATTERN).setUnderlined(true)

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

@ -67,12 +67,10 @@ public final class ChatFormatter {
sections.add(section);
}
}
sections.sort((s1, s2) -> {
if (s1.Start == s2.Start)
return Integer.compare(s1.End, s2.End);
else
return Integer.compare(s1.Start, s2.Start);
});
sections.sort((s1, s2) -> s1.Start == s2.Start
? s1.End == s2.End ? Integer.compare(s2.Formatters.get(0).priority.GetValue(),
s1.Formatters.get(0).priority.GetValue()) : Integer.compare(s2.End, s1.End)
: Integer.compare(s1.Start, s2.Start));
ArrayList<FormattedSection> combined = new ArrayList<>();
Map<ChatFormatter, FormattedSection> nextSection = new HashMap<>();
boolean escaped = false;
@ -90,8 +88,16 @@ public final class ChatFormatter {
continue;
}
if (!escaped) {
if (section.Start >= takenStart && section.Start <= takenEnd) {
if (section.RemCharFromStart <= takenEnd - takenStart) {
if (combined.stream().anyMatch(s -> s.IsRange && (s.Start == section.Start
|| (s.Start < section.Start ? s.End >= section.Start : s.Start <= section.End)))) {
DebugCommand.SendDebugMessage("Range " + section + " overlaps with a combined section, ignoring.");
continue;
}
if (section.Start == takenStart || (section.Start > takenStart && section.Start < takenEnd)) {
/*
* if (nextSection.containsKey(section.Formatters.get(0)) ? section.RemCharFromStart <= takenEnd - takenStart : section.RemCharFromStart > takenEnd - takenStart) {
*/
if (section.RemCharFromStart < takenEnd - takenStart) {
System.out.println("Lose: " + section);
System.out.println("And win: " + takenFormatter);
continue; // The current section loses
@ -106,7 +112,7 @@ public final class ChatFormatter {
if (nextSection.containsKey(section.Formatters.get(0))) {
FormattedSection s = nextSection.remove(section.Formatters.get(0));
s.End = section.Start + section.RemCharFromStart - 1;
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);
DebugCommand.SendDebugMessage("Finished section: " + s);
} else {
@ -176,7 +182,8 @@ public final class ChatFormatter {
found = true;
}
for (int j = i - 1; j <= i + 1; j++) {
if (j < sections.size() && sections.get(j).End < sections.get(j).Start) {
if (j < sections.size() && sections.get(j).End - sections.get(j).RemCharFromEnd < sections.get(j).Start
+ sections.get(j).RemCharFromStart) {
DebugCommand.SendDebugMessage("Removing section: " + sections.get(j));
sections.remove(j);
found = true;
@ -188,12 +195,10 @@ public final class ChatFormatter {
if (found) {
i = 1;
found = false;
sections.sort((s1, s2) -> {
if (s1.Start == s2.Start)
return Integer.compare(s1.End, s2.End);
else
return Integer.compare(s1.Start, s2.Start);
});
sections.sort((s1, s2) -> s1.Start == s2.Start
? s1.End == s2.End ? Integer.compare(s2.Formatters.get(0).priority.GetValue(),
s1.Formatters.get(0).priority.GetValue()) : Integer.compare(s2.End, s1.End)
: Integer.compare(s1.Start, s2.Start));
} else
cont = false;
}
@ -203,6 +208,7 @@ public final class ChatFormatter {
DebugCommand.SendDebugMessage("Applying section: " + section);
String originaltext;
int start = section.Start + section.RemCharFromStart, end = section.End + 1 - section.RemCharFromEnd; // TODO: RemCharPos
DebugCommand.SendDebugMessage("Start: " + start + " - End: " + end);
StringBuilder textsb = new StringBuilder(str.substring(start, end));
originaltext = textsb.toString();
DebugCommand.SendDebugMessage("Section text: " + originaltext);

4
src/test/java/buttondevteam/chat/ChatFormatTest.java
View file

@ -21,11 +21,11 @@ public class ChatFormatTest extends TestCase {
DebugCommand.DebugMode = true;
testMessage(sender, "*test*", new TellrawPart("test").setItalic(true).setColor(Color.White));
testMessage(sender, "**test**", new TellrawPart("test").setBold(true).setColor(Color.White));
/*testMessage(sender, "***test***", new TellrawPart("test").setBold(true).setItalic(true).setColor(Color.White));
testMessage(sender, "***test***", new TellrawPart("test").setBold(true).setItalic(true).setColor(Color.White));
testMessage(sender, "***_test_***",
new TellrawPart("test").setBold(true).setItalic(true).setUnderlined(true).setColor(Color.White));
testMessage(sender, "***_~~test~~_***", new TellrawPart("test").setBold(true).setItalic(true)
.setUnderlined(true).setStrikethrough(true).setColor(Color.White));*/
.setUnderlined(true).setStrikethrough(true).setColor(Color.White));
}
void testMessage(final CommandSender sender, final String message, TellrawPart... extras) {