config cleanup + varbits

2019-05-30 16:38:39 +01:00
parent dbbb4d6e44
commit 54da439263
2 changed files with 51 additions and 25 deletions
--- a/runelite-api/src/main/java/net/runelite/api/Varbits.java
+++ b/runelite-api/src/main/java/net/runelite/api/Varbits.java
@@ -293,6 +293,7 @@ public enum Varbits
 	 * Theatre of Blood 1=In Party, 2=Inside/Spectator, 3=Dead Spectating
 	 */
 	THEATRE_OF_BLOOD(6440),
+	BLOAT_DOOR(6447),

 	/**
 	 * Nightmare Zone
--- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatreConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatreConfig.java
@@ -37,7 +37,8 @@ public interface TheatreConfig extends Config
 		position = 0,
 		keyName = "showMaidenBloodToss",
 		name = "Show Maiden Blood Toss",
-		description = "Displays the tile location where tossed blood will land."
+		description = "Displays the tile location where tossed blood will land.",
+		group = "Maiden"
 	)
 	default boolean showMaidenBloodToss() 
 	{
@@ -48,7 +49,8 @@ public interface TheatreConfig extends Config
 		position = 1,
 		keyName = "showMaidenBloodSpawns",
 		name = "Show Maiden Blood Spawns",
-		description = "Show the tiles that blood spawns will travel to."
+		description = "Show the tiles that blood spawns will travel to.",
+		group = "Maiden"
 	)
 	default boolean showMaidenBloodSpawns() 
 	{
@@ -59,7 +61,8 @@ public interface TheatreConfig extends Config
 		position = 2,
 		keyName = "showBloatIndicator",
 		name = "Show Bloat Status",
-		description = "Displays Bloat's status (asleep, wake, and enrage) using color code."
+		description = "Displays Bloat's status (asleep, wake, and enrage) using color code.",
+		group = "Bloat"
 	)
 	default boolean showBloatIndicator() 
 	{
@@ -70,7 +73,8 @@ public interface TheatreConfig extends Config
 		position = 3,
 		keyName = "showBloatHands",
 		name = "Show Bloat Hands",
-		description = "Highlights the falling hands inside Bloat."
+		description = "Highlights the falling hands inside Bloat.",
+		group = "Bloat"
 	)
 	default boolean showBloatHands() 
 	{
@@ -81,7 +85,8 @@ public interface TheatreConfig extends Config
 		position = 4,
 		keyName = "bloatFeet",
 		name = "Bloat Hands Rave Edition",
-		description = ""
+		description = "",
+		group = "Bloat"
 	)
 	default boolean BloatFeetIndicatorRaveEdition() 
 	{ 
@@ -92,7 +97,8 @@ public interface TheatreConfig extends Config
 		position = 4,
 		keyName = "showBloatTimer",
 		name = "Show Bloat Timer",
-		description = "Show the estimated time when Bloat will go down."
+		description = "Show the estimated time when Bloat will go down.",
+		group = "Bloat"
 	)
 	default boolean showBloatTimer()
 	{
@@ -103,7 +109,8 @@ public interface TheatreConfig extends Config
 		position = 5,
 		keyName = "showNyloPillarHealth",
 		name = "Show Nylocas Pillar Health",
-		description = "Show the health bars of the Nylocas pillars."
+		description = "Show the health bars of the Nylocas pillars.",
+		group = "Nylocas"
 	)
 	default boolean showNyloPillarHealth()
 	{
@@ -114,7 +121,8 @@ public interface TheatreConfig extends Config
 		position = 6,
 		keyName = "showNylocasExplosions",
 		name = "Highlight Old Nylocas",
-		description = "Either a timer on the nylo counting down to explosion, or a tile underneath."
+		description = "Either a timer on the nylo counting down to explosion, or a tile underneath.",
+		group = "Nylocas"
 	)
 	default NYLOOPTION showNylocasExplosions()
 	{
@@ -125,7 +133,8 @@ public interface TheatreConfig extends Config
 		position = 7,
 		keyName = "showNylocasAmount",
 		name = "Show Nylocas Amount",
-		description = "An overlay will appear that counts the amount of Nylocas in the room."
+		description = "An overlay will appear that counts the amount of Nylocas in the room.",
+		group = "Nylocas"
 	)
 	default boolean showNylocasAmount() 
 	{
@@ -171,7 +180,8 @@ public interface TheatreConfig extends Config
 		position = 11,
 		keyName = "highlightNyloAgros",
 		name = "Show Nylocas Agros",
-		description = "Highlight the Nylocas that are aggressive to the player."
+		description = "Highlight the Nylocas that are aggressive to the player.",
+		group = "Nylocas"
 	)
 	default boolean highlightNyloAgros()
 	{
@@ -182,7 +192,8 @@ public interface TheatreConfig extends Config
 		position = 12,
 		keyName = "showSotetsegAttacks",
 		name = "Show Sotetseg Attacks",
-		description = "Highlight the attacks which Sotetseg throws at you."
+		description = "Highlight the attacks which Sotetseg throws at you.",
+		group = "Sotetseg"
 	)
 	default boolean showSotetsegAttacks()
 	{
@@ -193,7 +204,8 @@ public interface TheatreConfig extends Config
 		position = 13,
 		keyName = "showSotetsegMaze",
 		name = "Mark Sotetseg Maze",
-		description = "Marks the tiles of Sotetseg's maze while in the overworld."
+		description = "Marks the tiles of Sotetseg's maze while in the overworld.",
+		group = "Sotetseg"
 	)
 	default boolean showSotetsegMaze()
 	{
@@ -204,7 +216,8 @@ public interface TheatreConfig extends Config
 		position = 14,
 		keyName = "showSotetsegSolo",
 		name = "Mark Sotetseg Maze (Solo)",
-		description = "Marks the tiles of Sotetseg's maze while in the underworld."
+		description = "Marks the tiles of Sotetseg's maze while in the underworld.",
+		group = "Sotetseg"
 	)
 	default boolean showSotetsegSolo() 
 	{
@@ -215,7 +228,8 @@ public interface TheatreConfig extends Config
 		position = 14,
 		keyName = "markerColor",
 		name = "Sotey Tile Colour",
-		description = "Configures the color of marked tile"
+		description = "Configures the color of marked tile",
+		group = "Sotetseg"
 	)
 	default Color mazeTileColour()
 	{
@@ -225,7 +239,8 @@ public interface TheatreConfig extends Config
 		position = 15,
 		keyName = "showXarpusHeals",
 		name = "Show Xarpus Heals",
-		description = "Highlights the tiles that Xarpus is healing with."
+		description = "Highlights the tiles that Xarpus is healing with.",
+		group = "Xarpus"
 	)
 	default boolean showXarpusHeals()
 	{
@@ -236,7 +251,8 @@ public interface TheatreConfig extends Config
 		position = 16,
 		keyName = "showXarpusTick",
 		name = "Show Xarpus Turn Tick",
-		description = "Count down the ticks until Xarpus turns their head."
+		description = "Count down the ticks until Xarpus turns their head.",
+		group = "Xarpus"
 	)
 	default boolean showXarpusTick()
 	{
@@ -247,7 +263,8 @@ public interface TheatreConfig extends Config
 		position = 17,
 		keyName = "showVerzikAttacks",
 		name = "Show Verzik Attack Tick",
-		description = "Count down the ticks until Verzik attacks."
+		description = "Count down the ticks until Verzik attacks.",
+		group = "Verzik"
 	)
 	default boolean showVerzikAttacks()
 	{
@@ -258,7 +275,8 @@ public interface TheatreConfig extends Config
 		position = 18,
 		keyName = "showVerzikYellows",
 		name = "Show Yellows Tick",
-		description = "Count down the ticks until Verzik yellow's damage tick."
+		description = "Count down the ticks until Verzik yellow's damage tick.",
+		group = "Verzik"
 	)
 	default boolean showVerzikYellows()
 	{
@@ -269,7 +287,8 @@ public interface TheatreConfig extends Config
 		position = 19,
 		keyName = "showCrabTargets",
 		name = "Show Crab Targets",
-		description = "Shows the target of crabs at Verzik."
+		description = "Shows the target of crabs at Verzik.",
+		group = "Verzik"
 	)
 	default boolean showCrabTargets()
 	{
@@ -280,7 +299,8 @@ public interface TheatreConfig extends Config
 		position = 20,
 		keyName = "VerzikTankTile",
 		name = "Verzik P3 Tile Overlay",
-		description = ""
+		description = "",
+		group = "Verzik"
 	)
 	default boolean VerzikTankTile()
 	{ 
@@ -291,7 +311,8 @@ public interface TheatreConfig extends Config
 		position = 22,
 		keyName = "verzikrangeattacks",
 		name = "Show Verzik Range Attacks",
-		description = ""
+		description = "",
+		group = "Verzik"
 	)
 	default boolean verzikRangeAttacks()
 	{ 
@@ -302,7 +323,8 @@ public interface TheatreConfig extends Config
 		position = 23,
 		keyName = "extratimers",
 		name = "Show Extra Timers",
-		description = ""
+		description = "",
+		group = "Verzik"
 	)
 	default boolean extraTimers()
 	{
@@ -313,7 +335,8 @@ public interface TheatreConfig extends Config
 		position = 24,
 		keyName = "p1attacks",
 		name = "Verzik P1 Timer",
-		description = ""
+		description = "",
+		group = "Verzik"
 	)
 	default boolean p1attacks()
 	{
@@ -324,7 +347,8 @@ public interface TheatreConfig extends Config
 		position = 25,
 		keyName = "p2attacks",
 		name = "Verzik P2 Timer",
-		description = ""
+		description = "",
+		group = "Verzik"
 	)
 	default boolean p2attacks()
 	{
@@ -335,7 +359,8 @@ public interface TheatreConfig extends Config
 		position = 26,
 		keyName = "p3attacks",
 		name = "Verzik P3 Timer",
-		description = ""
+		description = "",
+		group = "Verzik"
 	)
 	default boolean p3attacks()
 	{