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

Message formatting still WIP

Browse source
This commit is contained in:
Norbi Peti 2016-06-27 00:36:36 +02:00
parent ea5e7ae87d
commit c6ffdf1868
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/io/github/norbipeti/thebuttonmcchat/ChatProcessing.java
View file

@ -72,7 +72,6 @@ public class ChatProcessing {
colormode = ChatFormatter.Color.Green; colormode = ChatFormatter.Color.Green;
// If greentext, ignore channel or player colors // If greentext, ignore channel or player colors
if (!colormode.equals(ChatFormatter.Color.RPC))
formatters.add(new ChatFormatter(Pattern.compile(".+"), colormode, formatters.add(new ChatFormatter(Pattern.compile(".+"), colormode,
"")); ""));
@ -98,24 +97,18 @@ public class ChatProcessing {
// URLs + Rainbow text // URLs + Rainbow text
formatters.add(new ChatFormatter(Pattern formatters.add(new ChatFormatter(Pattern
.compile("http[\\w:/?=$\\-_.+!*'(),]+"), .compile("http[\\w:/?=$\\-_.+!*'(),]+"),
ChatFormatter.Format.Underlined, "")); ChatFormatter.Format.Underlined, "", true));
//TODO: Only format name mentions outisde open_url
/*formattedmessage = formattedmessage /*formattedmessage = formattedmessage
.replace( .replace(
item, item,
String.format( String.format(
"\",\"color\":\"%s\"},{\"text\":\"%s\",\"color\":\"%s\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"%s\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"Open URL\",\"color\":\"blue\"}]}}},{\"text\":\"", "\",\"color\":\"%s\"},{\"text\":\"%s\",\"color\":\"%s\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"%s\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"Open URL\",\"color\":\"blue\"}]}}},{\"text\":\"",
colormode, url, colormode, url));*/ colormode, url, colormode, url));*/
}
if (colormode.equals("rpc")) { // TODO: Fix URLs in rainbow mode (^)
StringBuffer buf = new StringBuffer(formattedmessage);
String replacestr = ",{\"text\":\"";
buf.append(replacestr);
formattedmessage = buf.toString();
}
if (!hadurls) { if (!hadurls) {
for (Player p : PluginMain.GetPlayers()) { for (Player p : PluginMain.GetPlayers()) {
String color = ""; String color = ""; //TODO: Regex with all names and check for the correct JSON behind them
if (formattedmessage.matches("(?i).*" if (formattedmessage.matches("(?i).*"
+ Pattern.quote(p.getName()) + ".*")) { + Pattern.quote(p.getName()) + ".*")) {
if (PlayerListener.NotificationSound == null) if (PlayerListener.NotificationSound == null)