Add content and metadata to guis

src/main/java/com/clubobsidian/dynamicform/parser/gui/GuiToken.java

@@ -38,20 +38,22 @@ public class GuiToken implements Serializable {
 	private static final int MAX_SLOT_SIZE = 100; //Temporary fix
 
 	private String title;
+	private String content;
 	private List<String> alias;
 	private List<String> locations;
 	private Map<String, List<Integer>> npcs;
 	private Map<Integer, SlotToken> slots;
 	private MacroParser macroParser;
 	private FunctionTree functions;
 	private List<String> loadMacros;
+	private Map<String, String> metadata;
 
 	public GuiToken(ConfigurationSection section) {
 		this(section, new ArrayList<MacroToken>());
 	}
 
 	public GuiToken(ConfigurationSection section, List<MacroToken> macroTokens) {
-		List<MacroToken> copyMacroTokens = new ArrayList<MacroToken>();
+		List<MacroToken> copyMacroTokens = new ArrayList<>();
 		for(MacroToken token : macroTokens) {
 			copyMacroTokens.add(token);
 		}
@@ -61,6 +63,7 @@ public GuiToken(ConfigurationSection section, List<MacroToken> macroTokens) {
 
 		this.macroParser = new MacroParser(copyMacroTokens);
 		this.title = this.macroParser.parseStringMacros(section.getString("title"));
+		this.content = this.macroParser.parseStringMacros(section.getString("content"));
 		this.alias = this.macroParser.parseListMacros(section.getStringList("alias"));
 		this.locations = this.macroParser.parseListMacros(section.getStringList("locations"));
 		this.loadNpcs(section);
@@ -69,6 +72,9 @@ public GuiToken(ConfigurationSection section, List<MacroToken> macroTokens) {
 		ConfigurationSection guiFunctionsSection = section.getConfigurationSection("functions");
 		this.functions = new FunctionTree(guiFunctionsSection, this.macroParser);
 		this.loadMacros = section.getStringList("load-macros");
+
+		ConfigurationSection metadataSection = section.getConfigurationSection("metadata");
+		this.metadata = this.parseMetadata(metadataSection);
 	}
 
 	private void loadNpcs(ConfigurationSection section) {
@@ -91,10 +97,25 @@ private void loadSlots(ConfigurationSection section) {
 			}
 		}
 	}
-
+
+	private Map<String, String> parseMetadata(ConfigurationSection section) {
+		Map<String, String> metadata = new HashMap<>();
+		for(String key : section.getKeys()) {
+			String parsedKey = this.macroParser.parseStringMacros(key);
+			String value = section.getString(parsedKey);
+			value = this.macroParser.parseStringMacros(value);
+			metadata.put(parsedKey, value);
+		}
+		return metadata;
+	}
+
 	public String getTitle() {
 		return this.title;
 	}
+
+	public String getContent() {
+		return this.content;
+	}
 
 	public List<String> getAlias() {
 		return this.alias;
@@ -123,4 +144,8 @@ public MacroParser getMacroParser() {
 	public List<String> getLoadMacros() {
 		return this.loadMacros;
 	}
+
+	public Map<String, String> getMetadata() {
+		return this.metadata;
+	}
 }

src/test/java/com/clubobsidian/dynamicform/parser/test/GuiTokenTest.java

@@ -15,6 +15,7 @@
  */
 package com.clubobsidian.dynamicform.parser.test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
@@ -50,6 +51,19 @@ public void testTitle() {
 		String title = token.getTitle();
 		assertTrue("Gui title is not 'test gui title'", title.equals("test gui title"));
 	}
+
+	@Test
+	public void testContent() {
+		String title = token.getContent();
+		assertEquals(title, "foobar");
+	}
+
+	@Test
+	public void testMetadata() {
+		Map<String, String> metadata = token.getMetadata();
+		System.out.println(metadata.get("some"));
+		assertEquals(metadata.get("some"), "metadata");
+	}
 
 	@Test
 	public void testNpcs() {

test.yml

@@ -1,7 +1,10 @@
 title: "test gui title"
+content: "foobar"
 rows: 1
 mode: "set"
 close: true
+metadata:
+  some: "metadata"
 npcs:
   citizens:
   - 5