Allow message parts to be initialized without text

mkremins · Apr 22, 2014 · c9eb890 · c9eb890
1 parent bcb7365
commit c9eb890
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/src/main/java/mkremins/fanciful/FancyMessage.java b/src/main/java/mkremins/fanciful/FancyMessage.java
@@ -39,6 +39,23 @@ public FancyMessage(final String firstPartText) {
 		dirty = false;
 	}
 
+	public FancyMessage() {
+		messageParts = new ArrayList<MessagePart>();
+		messageParts.add(new MessagePart());
+		jsonString = null;
+		dirty = false;
+	}
+
+	public FancyMessage text(String text) {
+		MessagePart latest = latest();
+		if (latest.hasText()) {
+			throw new IllegalStateException("text for this message part is already set");
+		}
+		latest.text = text;
+		dirty = true;
+		return this;
+	}
+
 	public FancyMessage color(final ChatColor color) {
 		if (!color.isColor()) {
 			throw new IllegalArgumentException(color.name() + " is not a color");
@@ -175,11 +192,23 @@ public FancyMessage tooltip(final String... lines) {
 	}
 
 	public FancyMessage then(final Object obj) {
+		if (!latest().hasText()) {
+			throw new IllegalStateException("previous message part has no text");
+		}
 		messageParts.add(new MessagePart(obj.toString()));
 		dirty = true;
 		return this;
 	}
 
+	public FancyMessage then() {
+		if (!latest().hasText()) {
+			throw new IllegalStateException("previous message part has no text");
+		}
+		messageParts.add(new MessagePart());
+		dirty = true;
+		return this;
+	}
+
 	public String toJSONString() {
 		if (!dirty && jsonString != null) {
 			return jsonString;

diff --git a/src/main/java/mkremins/fanciful/MessagePart.java b/src/main/java/mkremins/fanciful/MessagePart.java
@@ -9,11 +9,17 @@ final class MessagePart {
 	ChatColor[] styles = {};
 	String clickActionName = null, clickActionData = null,
 		   hoverActionName = null, hoverActionData = null;
-	final String text;
+	String text = null;
 
 	MessagePart(final String text) {
 		this.text = text;
 	}
+
+	MessagePart() {}
+
+	boolean hasText() {
+		return text != null;
+	}
 
 	JsonWriter writeJson(JsonWriter json) {
 		try {