Added config group item

runelite-client/src/main/java/net/runelite/client/config/ConfigDescriptor.java

@@ -24,17 +24,18 @@
  */
 package net.runelite.client.config;
 
+import java.util.ArrayList;
 import java.util.Collection;
 
 public class ConfigDescriptor
 {
 	private final ConfigGroup group;
-	private final Collection<ConfigItemDescriptor> items;
+	private final Collection<ConfigItemsGroup> itemGroups;
 
-	public ConfigDescriptor(ConfigGroup group, Collection<ConfigItemDescriptor> items)
+	public ConfigDescriptor(ConfigGroup group, Collection<ConfigItemsGroup> itemGroups)
 	{
 		this.group = group;
-		this.items = items;
+		this.itemGroups = itemGroups;
 	}
 
 	public ConfigGroup getGroup()
@@ -42,8 +43,22 @@ public class ConfigDescriptor
 		return group;
 	}
 
+	public Collection<ConfigItemsGroup> getItemGroups()
+	{
+		return itemGroups;
+	}
+
 	public Collection<ConfigItemDescriptor> getItems()
 	{
-		return items;
+		Collection<ConfigItemDescriptor> allItems = new ArrayList<>();
+		for (ConfigItemsGroup g : itemGroups)
+		{
+			for (ConfigItemDescriptor item : g.getItems())
+			{
+				allItems.add(item);
+			}
+		}
+		return allItems;
 	}
+
 }

runelite-client/src/main/java/net/runelite/client/config/ConfigItem.java

@@ -46,4 +46,7 @@ public @interface ConfigItem
 	String warning() default "";
 
 	boolean secret() default false;
+
+	String group() default "";
+
 }

runelite-client/src/main/java/net/runelite/client/config/ConfigItemsGroup.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2018, Craftiii4 <craftiii4@gmail.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.client.config;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import java.util.ArrayList;
+import java.util.Collection;
+
+public class ConfigItemsGroup
+{
+
+    @Getter(AccessLevel.PUBLIC)
+    private final String group;
+
+    @Getter(AccessLevel.PUBLIC)
+    private Collection<ConfigItemDescriptor> items;
+
+    public ConfigItemsGroup(String group)
+    {
+        this.group = group;
+        this.items = new ArrayList<>();
+    }
+
+    public void addItem(ConfigItemDescriptor item)
+    {
+        items.add(item);
+    }
+
+}

runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java

@@ -47,7 +47,9 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.Duration;
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -459,7 +461,35 @@ public class ConfigManager
 				.result())
 			.collect(Collectors.toList());
 
-		return new ConfigDescriptor(group, items);
+		Collection<ConfigItemsGroup> itemGroups = new ArrayList<>();
+
+		for (ConfigItemDescriptor item : items)
+		{
+			String groupName = item.getItem().group();
+			boolean found = false;
+			for (ConfigItemsGroup g : itemGroups)
+			{
+				if (g.getGroup().equals(groupName))
+				{
+					g.addItem(item);
+					found = true;
+					break;
+				}
+			}
+			if (!found)
+			{
+				ConfigItemsGroup newGroup = new ConfigItemsGroup(groupName);
+				newGroup.addItem(item);
+				itemGroups.add(newGroup);
+			}
+		}
+
+		itemGroups = itemGroups.stream().sorted((a, b) -> ComparisonChain.start()
+				.compare(a.getGroup(), b.getGroup())
+				.result())
+				.collect(Collectors.toList());
+
+		return new ConfigDescriptor(group, itemGroups);
 	}
 
 	/**