4.3h Add Mson split method

src/com/massivecraft/massivecore/command/editor/CommandEditContainerAbstract.java

@@ -101,7 +101,7 @@ public abstract class CommandEditContainerAbstract<O, V> extends CommandEditAbst
 			" for ",
 			this.getObjectVisual(),
 			" not changed."	
-			).color(ChatColor.GRAY);
+		).color(ChatColor.GRAY);
 	}
 	
 	@SuppressWarnings("unchecked")
@@ -109,29 +109,40 @@ public abstract class CommandEditContainerAbstract<O, V> extends CommandEditAbst
 	public void attemptSetPerform(V after)
 	{
 		V before = this.getInheritedValue();
-		String descProperty = this.getProperty().getDisplayName();
+		Mson descProperty = this.getProperty().getDisplayNameMson();
 		
 		// Apply
 		// We set the new property value.
 		this.getProperty().setValue(this.getObject(), after);
 		
 		// Create messages
-		List<String> messages = new MassiveList<>();
+		List<Mson> messages = new MassiveList<>();
 		
-		messages.add(Txt.parse("%s<silver> for %s<silver> edited:", descProperty, this.getObjectVisual()));
+		messages.add(mson(
+			descProperty,
+			mson(" for ").color(ChatColor.GRAY),
+			this.getObjectVisual(),
+			mson(" edited:").color(ChatColor.GRAY)
+		));
 		
 		// Note: The result of getAdditions is not actually V, but the implementation doesn't care.
 		Collection<Object> additions = ContainerUtil.getAdditions(before, after);
 		if ( ! additions.isEmpty())
 		{
-			messages.add(Txt.parse("<k>Additions: %s", this.getValueType().getVisual((V) additions)));
+			messages.add(mson(
+				mson("Additions: ").color(ChatColor.AQUA),
+				this.getValueType().getVisualMson((V) additions)
+			));
 		}
 		
 		// Note: The result of getDeletions is not actually V, but the implementation doesn't care.
 		Collection<Object> deletions = ContainerUtil.getDeletions(before, after);
 		if ( ! deletions.isEmpty())
 		{
-			messages.add(Txt.parse("<k>Deletions: %s", this.getValueType().getVisual((V) deletions)));
+			messages.add(mson(
+				mson("Deletions: ").color(ChatColor.AQUA),
+				this.getValueType().getVisualMson((V) deletions)
+			));
 		}
 		
 		message(messages);

src/com/massivecraft/massivecore/command/editor/Property.java

@@ -194,16 +194,20 @@ public abstract class Property<O, V> implements Named
 		return ChatColor.AQUA.toString() + this.getName();
 	}
 	
-	public List<String> getShowLines(O object, CommandSender sender)
+	public List<Mson> getShowLines(O object, CommandSender sender)
 	{
-		String ret = Txt.parse("<aqua>%s<silver>: <pink>%s", this.getDisplayName(), this.getInheritedVisual(object, sender));
+		Mson ret = Mson.mson(
-		return new MassiveList<String>(Txt.PATTERN_NEWLINE.split(ret));
+			this.getDisplayNameMson(),
+			Mson.mson(": ").color(ChatColor.GRAY),
+			this.getInheritedVisual(object, sender)
+			);
+		return ret.split(Txt.PATTERN_NEWLINE);
 	}
 	
-	public static <O> List<String> getShowLines(O object, CommandSender sender, Collection<? extends Property<O, ?>> properties)
+	public static <O> List<Mson> getShowLines(O object, CommandSender sender, Collection<? extends Property<O, ?>> properties)
 	{
 		// Create
-		List<String> ret = new MassiveList<String>();
+		List<Mson> ret = new MassiveList<>();
 		
 		// Fill
 		for (Property<O, ?> property : properties)

src/com/massivecraft/massivecore/command/type/TypeAbstract.java

@@ -122,7 +122,7 @@ public abstract class TypeAbstract<T> implements Type<T>
 	
 	public Mson getVisualMsonInner(T value, CommandSender sender)
 	{
-		return Mson.fromParsedMessage(this.getVisualInner(value, sender)).tooltip("LUL, TEST");
+		return Mson.fromParsedMessage(this.getVisualInner(value, sender));
 	}
 	
 	public Mson getVisualMsonInner(T value)

src/com/massivecraft/massivecore/mson/Mson.java

@@ -4,7 +4,6 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Objects;
@@ -99,32 +98,32 @@ public class Mson implements Serializable
 	// FIELD: bold
 	private final Boolean bold;
 	public Boolean isBold() { return bold; }
-	public boolean isEffectiveBold() { return bold != null ? bold : isInheritedBold(); }
+	public Boolean isEffectiveBold() { return bold != null ? bold : isInheritedBold(); }
-	public boolean isInheritedBold() { return hasParent() && getParent().isEffectiveBold(); }
+	public Boolean isInheritedBold() { return hasParent() ? getParent().isEffectiveBold() : null; }
 
 	// FIELD: italic
 	private final Boolean italic;
 	public Boolean isItalic() { return this.italic; }
-	public boolean isEffectiveItalic() { return italic != null ? italic : isInheritedItalic(); }
+	public Boolean isEffectiveItalic() { return italic != null ? italic : isInheritedItalic(); }
-	protected boolean isInheritedItalic() { return hasParent() && getParent().isEffectiveItalic(); }
+	protected Boolean isInheritedItalic() { return hasParent() ? getParent().isEffectiveItalic() : null; }
 
 	// FIELD: underlined
 	private final Boolean underlined;
 	public Boolean isUnderlined() { return this.underlined; }
-	public boolean isEffectiveUnderlined() { return underlined != null ? underlined : isInheritedUnderlined(); }
+	public Boolean isEffectiveUnderlined() { return underlined != null ? underlined : isInheritedUnderlined(); }
-	protected boolean isInheritedUnderlined() { return hasParent() && getParent().isEffectiveUnderlined(); }
+	protected Boolean isInheritedUnderlined() { return hasParent() ? getParent().isEffectiveUnderlined() : null; }
 
 	// FIELD: strikethrough
 	private final Boolean strikethrough;
 	public Boolean isStrikethrough() { return this.strikethrough; }
-	public boolean isEffectiveStrikethrough() { return strikethrough != null ? strikethrough : isInheritedStrikethrough(); }
+	public Boolean isEffectiveStrikethrough() { return strikethrough != null ? strikethrough : isInheritedStrikethrough(); }
-	protected boolean isInheritedStrikethrough() { return hasParent() && getParent().isEffectiveStrikethrough(); }
+	protected Boolean isInheritedStrikethrough() { return hasParent() ? getParent().isEffectiveStrikethrough() : null; }
 
 	// FIELD: obfuscated
 	private final Boolean obfuscated;
 	public Boolean isObfuscated() { return this.obfuscated; }
-	public boolean isEffectiveObfuscated() { return obfuscated != null ? obfuscated : isInheritedObfuscated(); }
+	public Boolean isEffectiveObfuscated() { return obfuscated != null ? obfuscated : isInheritedObfuscated(); }
-	protected boolean isInheritedObfuscated() { return hasParent() && getParent().isEffectiveObfuscated(); }
+	protected Boolean isInheritedObfuscated() { return hasParent() ? getParent().isEffectiveObfuscated() : null; }
 
 	// FIELD: The Events which happen when you click, hover over or shift-click the message
 	protected final MsonEvent clickEvent;
@@ -255,7 +254,7 @@ public class Mson implements Serializable
 	
 	public Mson insertionString(String insertionString) { return Mson.valueOf(text, color, bold, italic, underlined, strikethrough, obfuscated, clickEvent, hoverEvent, insertionString, extra, parent); }
 	public Mson extra(List<Mson> extra) { return Mson.valueOf(text, color, bold, italic, underlined, strikethrough, obfuscated, clickEvent, hoverEvent, insertionString, extra, parent); }
-	public Mson extra(Mson[] extra) { return Mson.valueOf(text, color, bold, italic, underlined, strikethrough, obfuscated, clickEvent, hoverEvent, insertionString, ImmutableList.copyOf(extra), parent); }
+	public Mson extra(Mson[] extra) { return Mson.valueOf(text, color, bold, italic, underlined, strikethrough, obfuscated, clickEvent, hoverEvent, insertionString, extra == null ? null : ImmutableList.copyOf(extra), parent); }
 	public Mson parent(Mson parent) { return Mson.valueOf(text, color, bold, italic, underlined, strikethrough, obfuscated, clickEvent, hoverEvent, insertionString, extra, parent); }
 	
 	// -------------------------------------------- //
@@ -379,6 +378,26 @@ public class Mson implements Serializable
 		return ret;
 	}
 	
+	// This will set all style and behaviour to the effective value.
+	// So parents won't affect this.
+	public Mson enforced()
+	{
+		return valueOf(
+			this.getText(), 
+			this.getEffectiveColor(),
+			this.isEffectiveBold(),
+			this.isEffectiveItalic(),
+			this.isEffectiveUnderlined(),
+			this.isEffectiveStrikethrough(),
+			this.isEffectiveObfuscated(),
+			this.getEffectiveEvent(MsonEventType.CLICK),
+			this.getEffectiveEvent(MsonEventType.HOVER),
+			this.getEffectiveInsertionString(),
+			this.getExtra(),
+			null
+		);
+	}
+	
 	// -------------------------------------------- //
 	// CONSTRUCT
 	// -------------------------------------------- //
@@ -720,7 +739,118 @@ public class Mson implements Serializable
 		return ret;
 	}
 	
-	// Replace
+	// Contains
+	public boolean contains(CharSequence sequence)
+	{
+		if (sequence == null) throw new NullPointerException("sequence");
+		
+		if (this.getText().contains(sequence)) return true;
+		
+		if (this.hasExtra())
+		{
+			for (Mson part : this.getExtra())
+			{
+				if (part.contains(sequence)) return true;
+			}
+		}
+		
+		return false;
+	}
+	public boolean contains(Pattern pattern)
+	{
+		if (pattern == null) throw new NullPointerException("pattern");
+		
+		if (pattern.matcher(this.getText()).find()) return true;
+		
+		if (this.hasExtra())
+		{
+			for (Mson part : this.getExtra())
+			{
+				if (part.contains(pattern)) return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	public List<Mson> split(String regex)
+	{
+		if (regex == null) throw new NullPointerException("regex");
+		
+		return this.split(Pattern.compile(regex));
+	}
+	
+	public List<Mson> split(Pattern pattern)
+	{
+		if (pattern == null) throw new NullPointerException("pattern");
+		
+		List<Mson> ret = new MassiveList<>();
+		Mson recent = this.splitInner(pattern, ret, null);
+		if ( ! recent.isEmpty()) ret.add(recent);
+		return ret;
+	}
+	
+	private Mson splitInner(Pattern pattern, List<Mson> ret, Mson recent)
+	{
+		String[] parts = pattern.split(this.getText(), -1);
+		
+		// If it starts with a split ...
+		if (parts[0].isEmpty() && ! this.getText().isEmpty())
+		{
+			// ... add the most recent.
+			if (recent != null) ret.add(recent);
+			else ret.add(mson());
+			recent = null;
+			parts = Arrays.copyOfRange(parts, 1, parts.length);
+		}
+		
+		for (int i = 0; i < parts.length; i++)
+		{
+			Mson part = this.enforced().extra((List<Mson>) null).text(parts[i]);
+			boolean ultimate = (i == parts.length - 1);
+			if ( ! ultimate)
+			{
+				Mson mson;
+				if (recent != null) mson = mson(recent, part);
+				else mson = part;
+				ret.add(mson);
+				recent = null;
+			}
+			else
+			{
+				boolean empty = parts[i].isEmpty();
+				if (empty && ! this.getText().isEmpty())
+				{
+					
+					if (recent != null) ret.add(recent);
+					recent = mson();
+				}
+				else
+				{
+					Mson mson;
+					if (recent != null) mson = mson(recent, part);
+					else mson = part;
+					recent = mson;
+				}
+			}
+		}
+		
+		if (this.hasExtra())
+		{
+			for (Mson extra : this.getExtra())
+			{
+				recent = extra.splitInner(pattern, ret, recent);
+			}
+		}
+		
+		return recent;
+	}
+	
+	// -------------------------------------------- //
+	// REPLACE
+	// -------------------------------------------- //
+	
+	// Needed?
 	public Mson replace(char oldChar, char newChar)
 	{
 		Mson ret = this.text(this.getText().replace(oldChar, newChar));
@@ -739,29 +869,7 @@ public class Mson implements Serializable
 
 		return ret;
 	}
-	
-	public Mson replace(CharSequence replace, CharSequence replacement)
-	{
-		if (replace == null) throw new NullPointerException("replace");
-		if (replacement == null) throw new NullPointerException("replacement");
 		
-		Mson ret = this.text(this.getText().replace(replace, replacement));
-		
-		if (this.hasExtra())
-		{
-			Mson[] extra = new Mson[this.getExtra().size()];
-			int i = 0;
-			for (Mson part : this.getExtra())
-			{
-				extra[i] = part.replace(replace, replacement);
-				i++;
-			}
-			ret = ret.extra(extra);
-		}
-
-		return ret;
-	}
-	
 	public Mson replaceAll(String regex, String replacement)
 	{
 		if (regex == null) throw new NullPointerException("regex");
@@ -1009,34 +1117,29 @@ public class Mson implements Serializable
 	// If the centerpiece is multiple Strings it concatenates prefix + suffix and then appends the centerpice at the end.
 	// This algorithm is used in the editor system.
 	
-	public static List<Mson> prepondfix(Mson prefix, List<Mson> msons, Mson suffix)
-	{
-		// Create
-		List<Mson> ret = new MassiveList<>();
-		
-		// Fill
-		List<Mson> parts = new MassiveList<>();
-		if (prefix != null) parts.add(prefix);
-		if (msons.size() == 1) parts.add(msons.get(0));
-		if (suffix != null) parts.add(suffix);
-		
-		ret.add(implode(parts, SPACE));
-		
-		if (msons.size() != 1)
-		{
-			ret.addAll(msons);
-		}
-		
-		// Return
-		return ret;
-	}
-	
 	public static Mson prepondfix(Mson prefix, Mson mson, Mson suffix)
 	{
-		// HELP! How do I do this?
+		// Fill
-		//List<Mson> strings = Arrays.asList(PATTERN_NEWLINE.split(string));
+		if (mson.contains("\n"))
-		List<Mson> ret = prepondfix(prefix, Collections.singletonList(mson), suffix);
+		{
-		return implode(ret, mson("\n"));
+			List<Mson> parts = new MassiveList<>();
+			if (prefix != null) parts.add(prefix);
+			if (suffix != null) parts.add(suffix);
+			
+			return mson(
+				implode(parts, SPACE),
+				"\n",
+				mson
+			);
+		}
+		else
+		{
+			List<Mson> parts = new MassiveList<>();
+			if (prefix != null) parts.add(prefix);
+			parts.add(mson);
+			if (suffix != null) parts.add(suffix);
+			return implode(parts, SPACE);
+		}
 	}
 	
 	// -------------------------------------------- //
@@ -1083,12 +1186,12 @@ public class Mson implements Serializable
 	
 	public String toPlain(boolean styled)
 	{
-		StringBuilder ret = new StringBuilder();
+		final StringBuilder ret = new StringBuilder();
 		this.toPlain0(ret, styled);
 		return ret.toString();
 	}
 
-	private void toPlain0(StringBuilder builder, boolean styled)
+	private void toPlain0(final StringBuilder builder, boolean styled)
 	{
 		if ( ! this.getText().isEmpty())
 		{
@@ -1097,11 +1200,11 @@ public class Mson implements Serializable
 			if (styled)
 			{
 				if (this.getEffectiveColor() != null) builder.append(this.getEffectiveColor());
-				if (this.isEffectiveBold()) builder.append(ChatColor.BOLD);
+				if (this.isEffectiveBold() != null && this.isEffectiveBold()) builder.append(ChatColor.BOLD);
-				if (this.isEffectiveItalic()) builder.append(ChatColor.ITALIC);
+				if (this.isEffectiveItalic() != null && this.isEffectiveItalic()) builder.append(ChatColor.ITALIC);
-				if (this.isEffectiveUnderlined()) builder.append(ChatColor.UNDERLINE);
+				if (this.isEffectiveUnderlined() != null && this.isEffectiveUnderlined()) builder.append(ChatColor.UNDERLINE);
-				if (this.isEffectiveStrikethrough()) builder.append(ChatColor.STRIKETHROUGH);
+				if (this.isEffectiveStrikethrough() != null && this.isEffectiveStrikethrough()) builder.append(ChatColor.STRIKETHROUGH);
-				if (this.isEffectiveObfuscated()) builder.append(ChatColor.MAGIC);
+				if (this.isEffectiveObfuscated() != null && this.isEffectiveObfuscated()) builder.append(ChatColor.MAGIC);
 			}
 			
 			builder.append(this.getText());

src/com/massivecraft/massivecore/mson/Test.java

@@ -1,7 +1,12 @@
 package com.massivecraft.massivecore.mson;
 
 import static com.massivecraft.massivecore.mson.Mson.mson;
-import static org.bukkit.ChatColor.*;
+import static org.bukkit.ChatColor.BLUE;
+import static org.bukkit.ChatColor.GREEN;
+import static org.bukkit.ChatColor.RED;
+import static org.bukkit.ChatColor.YELLOW;
+
+import java.util.List;
 
 import com.massivecraft.massivecore.collections.MassiveList;
 import com.massivecraft.massivecore.util.Txt;
@@ -66,15 +71,31 @@ public class Test
 		mson = Mson.format("Just a %s simple string! :)", "very");
 		test("format");
 		
+		// -------------------------------------------- //
+		// TEST SPLIT
+		// -------------------------------------------- //
+		
+		mson = mson(mson("1 2 3 4").split(Txt.PATTERN_NEWLINE));
+		test("split0");
+		
+		mson = mson(mson("\n1 2 \n3 4").split(Txt.PATTERN_NEWLINE));
+		test("split1");
+		
+		mson = mson(mson(" 1 2 3 4 ").add("5 6 7").split(Txt.PATTERN_WHITESPACE));
+		test("split2");
+		
+		Mson split = mson(" 1 2 3 4 ").add("5 6 7").add("8 9");
+		List<Mson> splits = split.split(Txt.PATTERN_WHITESPACE);
+		
+		test("splitA", split);
+		test("splitB", Mson.implode(splits, Mson.SPACE));
+		
 		// -------------------------------------------- //
 		// TEST REPLACE
 		// -------------------------------------------- //
 		
 		mson = mson("1 2 3 4 5 6 1 7 tests", " 01010101").getRoot().replace('1', '0');
 		test("charr");
-		
-		mson = mson("1 2 3 4 5 6 1 7 tests", " 01010101").getRoot().replace("1", "0");
-		test("sequence");
 	
 		mson = mson("1 2 3 4 5 6 1 7 tests", " 01010101").getRoot().replaceAll("1", "0");
 		test("regex");