From 18ae134294eefbd6315d99654c059a1b79cfe26c Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Sat, 25 Jun 2016 14:33:25 +0200
Subject: [PATCH] Changed rainbow mode to tellraw format and fixed /mwiki bugs

---
 .../thebuttonmcchat/ChatProcessing.java       | 45 ++++++++++---------
 .../commands/MWikiCommand.java                |  2 +-
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/io/github/norbipeti/thebuttonmcchat/ChatProcessing.java b/src/io/github/norbipeti/thebuttonmcchat/ChatProcessing.java
index fc94a06..707b3f2 100644
--- a/src/io/github/norbipeti/thebuttonmcchat/ChatProcessing.java
+++ b/src/io/github/norbipeti/thebuttonmcchat/ChatProcessing.java
@@ -64,6 +64,8 @@ public class ChatProcessing {
 		String colormode = currentchannel.Color;
 		if (mp != null && mp.OtherColorMode.length() > 0)
 			colormode = mp.OtherColorMode;
+		if (mp != null && mp.RainbowPresserColorMode)
+			colormode = "rpc";
 		if (message.startsWith(">"))
 			colormode = "green"; // If greentext, ignore channel or player
 									// colors
@@ -115,8 +117,8 @@ public class ChatProcessing {
 		// URLs + Rainbow text
 		String[] parts = formattedmessage.split("\\s+");
 		boolean hadurls = false;
-		final String[] RainbowPresserColors = new String[] { "c", "6", "e",
-				"a", "9", "5" };
+		final String[] RainbowPresserColors = new String[] { "red", "gold",
+				"yellow", "green", "blue", "dark_purple" };
 		int rpc = 0;
 		int currentindex = 0;
 		for (String item : parts) {
@@ -131,32 +133,33 @@ public class ChatProcessing {
 				hadurls = true;
 			} catch (MalformedURLException e) {
 			}
-			if (mp != null && mp.RainbowPresserColorMode) {
-				if (item.startsWith(RainbowPresserColors[rpc])) { // Prevent
-																	// words
-																	// being
-																	// equal/starting
-																	// with a
-																	// color
-																	// code
-																	// letter to
-																	// be messed
-																	// up
-					if (rpc + 1 < RainbowPresserColors.length)
-						rpc++;
-					else
-						rpc = 0;
-				}
+			if (colormode.equals("rpc")) {
 				StringBuffer buf = new StringBuffer(formattedmessage);
-				buf.replace(currentindex, currentindex + item.length(),
-						String.format("§%s%s", RainbowPresserColors[rpc], item));
+				String replacestr;
+				if (currentindex == 0)
+					replacestr = String
+							.format("\",\"color\":\"blue\"},{\"text\":\"%s\",\"color\":\"%s\"}",
+									item, RainbowPresserColors[rpc]);
+				else
+					replacestr = String.format(
+							",{\"text\":\" %s\",\"color\":\"%s\"}", item,
+							RainbowPresserColors[rpc]);
+				buf.replace(currentindex, currentindex + item.length() + 1,
+						replacestr); // +1: spaces
+				currentindex += replacestr.length();
 				formattedmessage = buf.toString();
 				if (rpc + 1 < RainbowPresserColors.length)
 					rpc++;
 				else
 					rpc = 0;
 			}
-			currentindex += item.length() + 3;
+		} // TODO: Set properties (color, formatting) per word, so it won't
+			// embed formatting into formatting into formatting...
+		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) {
diff --git a/src/io/github/norbipeti/thebuttonmcchat/commands/MWikiCommand.java b/src/io/github/norbipeti/thebuttonmcchat/commands/MWikiCommand.java
index 1041b97..014f3b1 100644
--- a/src/io/github/norbipeti/thebuttonmcchat/commands/MWikiCommand.java
+++ b/src/io/github/norbipeti/thebuttonmcchat/commands/MWikiCommand.java
@@ -19,7 +19,7 @@ public class MWikiCommand extends TBMCCommandBase {
 	public boolean OnCommand(CommandSender sender, String alias, String[] args) {
 		String query = "";
 		for (int i = 0; i < args.length; i++)
-			query += args[i];
+			query += args[i] + " ";
 		query = query.trim();
 		if (args.length == 0)
 			sender.sendMessage("§bMinecraft Wiki link: http://minecraft.gamepedia.com/");