From a70ba37cd01d2a5809bbec1cdfc7df9f70adb505 Mon Sep 17 00:00:00 2001
From: Ron Young <admin@ryoung.io>
Date: Sat, 6 Apr 2019 20:35:28 -0400
Subject: [PATCH 01/18] api: add before menu render event

---
 .../runelite/api/events/BeforeMenuRender.java | 38 +++++++++++++++++++
 .../net/runelite/client/callback/Hooks.java   |  8 ++++
 2 files changed, 46 insertions(+)
 create mode 100644 runelite-api/src/main/java/net/runelite/api/events/BeforeMenuRender.java

diff --git a/runelite-api/src/main/java/net/runelite/api/events/BeforeMenuRender.java b/runelite-api/src/main/java/net/runelite/api/events/BeforeMenuRender.java
new file mode 100644
index 0000000000..5d1e10994b
--- /dev/null
+++ b/runelite-api/src/main/java/net/runelite/api/events/BeforeMenuRender.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2019, Ron Young <https://github.com/raiyni>
+ * 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.api.events;
+
+import lombok.Data;
+
+@Data
+public class BeforeMenuRender
+{
+	private boolean consumed;
+
+	public void consume()
+	{
+		this.consumed = true;
+	}
+}
diff --git a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
index ae1dff022f..fea751ffcf 100644
--- a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
+++ b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
@@ -47,6 +47,7 @@ import net.runelite.api.NullItemID;
 import net.runelite.api.RenderOverview;
 import net.runelite.api.Renderable;
 import net.runelite.api.WorldMapManager;
+import net.runelite.api.events.BeforeMenuRender;
 import net.runelite.api.events.BeforeRender;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.hooks.Callbacks;
@@ -508,4 +509,11 @@ public class Hooks implements Callbacks
 			overlayManager.getItemWidgets().add(widgetItem);
 		}
 	}
+
+	public static boolean drawMenu()
+	{
+		BeforeMenuRender event = new BeforeMenuRender();
+		client.getCallbacks().post(event);
+		return event.isConsumed();
+	}
 }

From 917921dd477fc7aca442a96fc4d9a34ee00dc281 Mon Sep 17 00:00:00 2001
From: Ron Young <admin@ryoung.io>
Date: Sat, 6 Apr 2019 20:37:03 -0400
Subject: [PATCH 02/18] interface styles: add 2010 menu

---
 .../main/java/net/runelite/api/Client.java    |   2 +
 .../InterfaceStylesConfig.java                |  10 ++
 .../InterfaceStylesPlugin.java                |  11 ++
 .../java/net/runelite/mixins/MenuMixin.java   | 112 ++++++++++++++++++
 .../java/net/runelite/rs/api/RSClient.java    |  33 ++++++
 .../main/java/net/runelite/rs/api/RSFont.java |  30 +++++
 .../net/runelite/rs/api/RSFontTypeFace.java   |   3 +
 7 files changed, 201 insertions(+)
 create mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/MenuMixin.java
 create mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSFont.java

diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java
index 47a969ccb4..b9cb1faf4a 100644
--- a/runelite-api/src/main/java/net/runelite/api/Client.java
+++ b/runelite-api/src/main/java/net/runelite/api/Client.java
@@ -1600,4 +1600,6 @@ public interface Client extends GameEngine
 	NodeCache getItemCompositionCache();
 
 	EnumComposition getEnum(int id);
+
+	void draw2010Menu();
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesConfig.java
index 281361eebc..540186558c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesConfig.java
@@ -52,4 +52,14 @@ public interface InterfaceStylesConfig extends Config
 	{
 		return false;
 	}
+
+	@ConfigItem(
+		keyName = "hdMenu",
+		name = "High Detail menu",
+		description = "Replaces game menu with the RuneScape High Detail mode design"
+	)
+	default boolean hdMenu()
+	{
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
index 226b8da617..3be1e31cee 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
@@ -34,6 +34,7 @@ import net.runelite.api.Client;
 import net.runelite.api.HealthBarOverride;
 import net.runelite.api.SpriteID;
 import net.runelite.api.SpritePixels;
+import net.runelite.api.events.BeforeMenuRender;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.WidgetPositioned;
 import net.runelite.api.widgets.Widget;
@@ -115,6 +116,16 @@ public class InterfaceStylesPlugin extends Plugin
 		overrideHealthBars();
 	}
 
+	@Subscribe
+	public void onBeforeMenuRender(BeforeMenuRender event)
+	{
+		if (config.hdMenu())
+		{
+			client.draw2010Menu();
+			event.consume();
+		}
+	}
+
 	private void overrideSprites()
 	{
 		for (SpriteOverride spriteOverride : SpriteOverride.values())
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/MenuMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/MenuMixin.java
new file mode 100644
index 0000000000..9bfb4af721
--- /dev/null
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/MenuMixin.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2019, Ron Young <https://github.com/raiyni>
+ * 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.mixins;
+
+import net.runelite.api.mixins.Inject;
+import net.runelite.api.mixins.Mixin;
+import net.runelite.rs.api.RSClient;
+import net.runelite.rs.api.RSFont;
+
+@Mixin(RSClient.class)
+public abstract class MenuMixin implements RSClient
+{
+	private static final int MENU_BORDER_OUTER_2010 = 0x6D6A5B;
+	private static final int MENU_BORDER_INNER_2010 = 0x524A3D;
+	private static final int MENU_PADDING_2010 = 0x2B2622;
+	private static final int MENU_BACKGROUND_2010 = 0x2B271C;
+	private static final int MENU_TEXT_2010 = 0xC6B895;
+	private static final int MENU_HEADER_GRADIENT_TOP_2010 = 0x322E22;
+	private static final int MENU_HEADER_GRADIENT_BOTTOM_2010 = 0x090A04;
+
+	@Inject
+	@Override
+	public void draw2010Menu()
+	{
+		int x = getMenuX();
+		int y = getMenuY();
+		int w = getMenuWidth();
+		int h = getMenuHeight();
+
+		// Outside border
+		RasterizerDrawHorizontalLine(x + 2, y, w - 4, MENU_BORDER_OUTER_2010);
+		RasterizerDrawHorizontalLine(x + 2, y + h - 1, w - 4, MENU_BORDER_OUTER_2010);
+		RasterizerDrawVerticalLine(x, y + 2, h - 4, MENU_BORDER_OUTER_2010);
+		RasterizerDrawVerticalLine(x + w - 1, y + 2, h - 4, MENU_BORDER_OUTER_2010);
+
+		// Padding
+		RasterizerDrawRectangle(x + 1, y + 5, w - 2, h - 6, MENU_PADDING_2010);
+		RasterizerDrawHorizontalLine(x + 1, y + 17, w - 2, MENU_PADDING_2010);
+		RasterizerDrawCircle(x + 2, y + h - 3, 0, MENU_PADDING_2010);
+		RasterizerDrawCircle(x + w - 3, y + h - 3, 0, MENU_PADDING_2010);
+
+		// Header
+		RasterizerDrawGradient(x + 2, y + 1, w - 4, 16, MENU_HEADER_GRADIENT_TOP_2010, MENU_HEADER_GRADIENT_BOTTOM_2010);
+		RasterizerFillRectangle(x + 1, y + 1, 2, 4, MENU_PADDING_2010);
+		RasterizerFillRectangle(x + w - 3, y + 1, 2, 4, MENU_PADDING_2010);
+
+		// Inside border
+		RasterizerDrawHorizontalLine(x + 2, y + 18, w - 4, MENU_BORDER_INNER_2010);
+		RasterizerDrawHorizontalLine(x + 3, y + h - 3, w - 6, MENU_BORDER_INNER_2010);
+		RasterizerDrawVerticalLine(x + 2, y + 18, h - 21, MENU_BORDER_INNER_2010);
+		RasterizerDrawVerticalLine(x + w - 3, y + 18, h - 21, MENU_BORDER_INNER_2010);
+
+		// Options background
+		RasterizerFillRectangle(x + 3, y + 19, w - 6, h - 22, MENU_BACKGROUND_2010);
+
+		// Corner insets
+		RasterizerDrawCircle(x + 1, y + 1, 0, MENU_BORDER_OUTER_2010);
+		RasterizerDrawCircle(x + w - 2, y + 1, 0, MENU_BORDER_OUTER_2010);
+		RasterizerDrawCircle(x + 1, y + h - 2, 0, MENU_BORDER_OUTER_2010);
+		RasterizerDrawCircle(x + w - 2, y + h - 2, 0, MENU_BORDER_OUTER_2010);
+
+		RSFont font = getFontBold12();
+		font.drawTextLeftAligned("Choose Option", x + 3, y + 14, MENU_TEXT_2010, -1);
+
+		int mouseX = getMouseX();
+		int mouseY = getMouseY();
+
+		int count = getMenuOptionCount();
+		String[] targets = getMenuTargets();
+		String[] options = getMenuOptions();
+		for (int i = 0; i < count; i++)
+		{
+			int rowY = y + (count - 1 - i) * 15 + 31;
+
+			String s = options[i];
+			if (!targets[i].isEmpty())
+			{
+				s += " " + targets[i];
+			}
+
+			font.drawTextLeftAligned(s, x + 3, rowY, MENU_TEXT_2010, -1);
+
+			// Highlight current option
+			if (mouseX > x && mouseX < w + x && mouseY > rowY - 13 && mouseY < rowY + 3)
+			{
+				RasterizerFillRectangleAlpha(x + 3, rowY - 12, w - 6, 15, 0xffffff, 80);
+			}
+		}
+	}
+}
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
index 654e0048ea..b51376bb1a 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
@@ -932,4 +932,37 @@ public interface RSClient extends RSGameEngine, Client
 
 	@Import("getEnum")
 	RSEnum getRsEnum(int id);
+
+	@Import("menuX")
+	int getMenuX();
+
+	@Import("menuY")
+	int getMenuY();
+
+	@Import("menuHeight")
+	int getMenuHeight();
+
+	@Import("menuWidth")
+	int getMenuWidth();
+
+	@Import("fontBold12")
+	RSFont getFontBold12();
+
+	@Import("drawHorizontalLine")
+	void RasterizerDrawHorizontalLine(int x, int y, int w, int rgb);
+
+	@Import("drawVerticalLine")
+	void RasterizerDrawVerticalLine(int x, int y, int h, int rgb);
+
+	@Import("drawGradient")
+	void RasterizerDrawGradient(int x, int y, int w, int h, int rgbTop, int rgbBottom);
+
+	@Import("fillRectangleAlpha")
+	void RasterizerFillRectangleAlpha(int x, int y, int w, int h, int rgb, int a);
+
+	@Import("drawRectangle")
+	void RasterizerDrawRectangle(int x, int y, int w, int h, int rgb);
+
+	@Import("drawCircle")
+	void RasterizerDrawCircle(int x, int y, int r, int rgb);
 }
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFont.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFont.java
new file mode 100644
index 0000000000..243193302a
--- /dev/null
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFont.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2019, Ron Young <https://github.com/raiyni>
+ * 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.rs.api;
+
+public interface RSFont extends RSFontTypeFace
+{
+}
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFontTypeFace.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFontTypeFace.java
index dca901798e..36fe246e0f 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSFontTypeFace.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFontTypeFace.java
@@ -36,4 +36,7 @@ public interface RSFontTypeFace extends FontTypeFace
 	@Import("verticalSpace")
 	@Override
 	int getBaseline();
+
+	@Import("drawTextLeftAligned")
+	void drawTextLeftAligned(String text, int x, int y, int fontColor, int shadowColor);
 }

From 56edd6169f98e0b78ce702afc3247b8a5b8212a5 Mon Sep 17 00:00:00 2001
From: Ganom <theariall@gmail.com>
Date: Mon, 22 Apr 2019 15:44:44 -0400
Subject: [PATCH 03/18] Adding overload varbit

---
 runelite-api/src/main/java/net/runelite/api/Varbits.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runelite-api/src/main/java/net/runelite/api/Varbits.java b/runelite-api/src/main/java/net/runelite/api/Varbits.java
index 66dfcef672..987115bd28 100644
--- a/runelite-api/src/main/java/net/runelite/api/Varbits.java
+++ b/runelite-api/src/main/java/net/runelite/api/Varbits.java
@@ -292,6 +292,7 @@ public enum Varbits {
      */
     NMZ_ABSORPTION(3956),
     NMZ_POINTS(3949),
+    NMZ_OVERLOAD(3955),
 
     /**
      * Blast Furnace

From 545251819d6f57a079b3ac550fe12201f1563f58 Mon Sep 17 00:00:00 2001
From: Jonathan <48493132+Raieverr@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:23:45 -0600
Subject: [PATCH 04/18] Type Change

---
 .../plugins/barbarianassault/BarbarianAssaultPlugin.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
index 30e6a56b90..695a8cc779 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
@@ -64,7 +64,8 @@ import net.runelite.client.util.ImageUtil;
 @PluginDescriptor(
 	name = "Barbarian Assault",
 	description = "Show a timer to the next call change and game/wave duration in chat.",
-	tags = {"minigame", "overlay", "timer"}
+	tags = {"minigame", "overlay", "timer"},
+	type = "utility"
 )
 public class BarbarianAssaultPlugin extends Plugin {
 	private static final int BA_WAVE_NUM_INDEX = 2;
@@ -398,4 +399,4 @@ public class BarbarianAssaultPlugin extends Plugin {
 	{
 		return clockImage;
 	}
-}
\ No newline at end of file
+}

From 1f1e80cce61a37e40224bdf35da0a1c8670d5748 Mon Sep 17 00:00:00 2001
From: Jonathan <48493132+Raieverr@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:25:50 -0600
Subject: [PATCH 05/18] Update BarbarianAssaultPlugin.java

---
 .../client/plugins/barbarianassault/BarbarianAssaultPlugin.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
index 695a8cc779..79146bcf21 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
@@ -65,7 +65,6 @@ import net.runelite.client.util.ImageUtil;
 	name = "Barbarian Assault",
 	description = "Show a timer to the next call change and game/wave duration in chat.",
 	tags = {"minigame", "overlay", "timer"},
-	type = "utility"
 )
 public class BarbarianAssaultPlugin extends Plugin {
 	private static final int BA_WAVE_NUM_INDEX = 2;

From e9595f99118dad41f919edb7c3bbdbb855b10528 Mon Sep 17 00:00:00 2001
From: Jonathan <48493132+Raieverr@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:26:35 -0600
Subject: [PATCH 06/18] Type Update

---
 .../net/runelite/client/plugins/batools/BAToolsPlugin.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsPlugin.java
index 961e8760cb..7c5e60b201 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsPlugin.java
@@ -79,7 +79,7 @@ import net.runelite.client.util.Text;
 	name = "BA Tools",
 	description = "Custom tools for Barbarian Assault",
 	tags = {"minigame", "overlay", "timer"},
-	type = "utility"
+	type = "PVM"
 )
 public class BAToolsPlugin extends Plugin implements KeyListener
 {
@@ -641,4 +641,4 @@ public class BAToolsPlugin extends Plugin implements KeyListener
 			shiftDown = false;
 		}
 	}
-}
\ No newline at end of file
+}

From 9d03fc4401b344a4bfb339f015815b668923eee7 Mon Sep 17 00:00:00 2001
From: Jonathan <48493132+Raieverr@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:27:45 -0600
Subject: [PATCH 07/18] Update LootingBagViewerPlugin.java

---
 .../client/plugins/lootingbagviewer/LootingBagViewerPlugin.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java
index 5d28a4bbea..6f8e366e73 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java
@@ -35,7 +35,7 @@ import javax.inject.Inject;
 	name = "PvP Looting Bag Viewer",
 	description = "Add an overlay showing the contents of your looting bag",
 	tags = {"alternate", "items", "overlay", "second"},
-	type = "utility",
+	type = "PVP",
 	enabledByDefault = false
 )
 public class LootingBagViewerPlugin extends Plugin

From eb1ebe180da50c3b7e475fc8239ceb7af6db31a0 Mon Sep 17 00:00:00 2001
From: Jonathan <48493132+Raieverr@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:28:20 -0600
Subject: [PATCH 08/18] Update PlayerIndicatorsPlugin.java

---
 .../client/plugins/playerindicators/PlayerIndicatorsPlugin.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java
index fd56c88fea..5ddf521c15 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java
@@ -58,7 +58,7 @@ import net.runelite.client.util.WildcardMatcher;
 	name = "Player Indicators",
 	description = "Highlight players on-screen and/or on the minimap",
 	tags = {"highlight", "minimap", "overlay", "players"},
-	type = "utility"
+	type = "PVP"
 )
 public class PlayerIndicatorsPlugin extends Plugin
 {

From 39e612ceb350eca8427626b582882fb328d89f9f Mon Sep 17 00:00:00 2001
From: Jonathan <48493132+Raieverr@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:29:23 -0600
Subject: [PATCH 09/18] Update HydraPlugin.java

---
 .../java/net/runelite/client/plugins/hydra/HydraPlugin.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/HydraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/HydraPlugin.java
index f976a9cd2b..9468cb707e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/HydraPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/HydraPlugin.java
@@ -15,7 +15,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @PluginDescriptor(
-	name = "Hydra",
+	name = "Hydra Helper",
 	description = "Hydra Helper",
 	tags = {"Hydra", "Helper"},
 	type = "PVM"
@@ -143,4 +143,4 @@ public class HydraPlugin extends Plugin
 			}
 		}
 	}
-}
\ No newline at end of file
+}

From 4c91e97ead38734374b40fe0e682e67c2d1df4f9 Mon Sep 17 00:00:00 2001
From: Jonathan <48493132+Raieverr@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:30:22 -0600
Subject: [PATCH 10/18] Update SuppliesTrackerPlugin.java

---
 .../client/plugins/suppliestracker/SuppliesTrackerPlugin.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java
index 9212432d7e..6041a02eb2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java
@@ -63,7 +63,7 @@ import java.awt.image.BufferedImage;
 	name = "Supplies Used Tracker",
 	description = "Tracks supplies used during the session",
 	tags = {"cost"},
-	type = "PVM",
+	type = "utility",
 	enabledByDefault = false
 )
 @Slf4j

From 59c82c4b781486bef5f5d28d50c856baf1eae5a2 Mon Sep 17 00:00:00 2001
From: Jonathan <48493132+Raieverr@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:30:44 -0600
Subject: [PATCH 11/18] Update VetionPlugin.java

---
 .../java/net/runelite/client/plugins/vetion/VetionPlugin.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java
index 847c1f3678..60516a9dc4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java
@@ -40,7 +40,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @PluginDescriptor(
-        name = "Vetion",
+        name = "Vetion Helper",
         description = "Tracks Vet'ion's special attacks",
         tags = {"bosses", "combat", "pve", "overlay"},
         type = "PVM"

From 0d92e4a27e3f2d7310c82def37fc536b3552f03b Mon Sep 17 00:00:00 2001
From: Jonathan <48493132+Raieverr@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:31:15 -0600
Subject: [PATCH 12/18] Update VorkathPlugin.java

---
 .../net/runelite/client/plugins/vorkath/VorkathPlugin.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java
index 060a9d2246..7040584b3e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java
@@ -14,10 +14,10 @@ import net.runelite.client.ui.overlay.OverlayManager;
 import org.apache.commons.lang3.ArrayUtils;
 
 @PluginDescriptor(
-	name = "Vorkath",
+	name = "Vorkath Helper",
 	description = "Vorkath Helper",
 	tags = {"Vorkath", "Helper"},
-		type = "PVM"
+	type = "PVM"
 )
 public class VorkathPlugin extends Plugin
 {

From 09e608ee04b95ebe96f9e4d36ff9bbcc766708ac Mon Sep 17 00:00:00 2001
From: Jonathan <48493132+Raieverr@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:31:40 -0600
Subject: [PATCH 13/18] Update ZulrahPlugin.java

---
 .../java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java
index 4fdbe3fa25..b7cd6311b6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java
@@ -21,10 +21,10 @@ import net.runelite.client.ui.overlay.OverlayManager;
 import net.runelite.client.util.ImageUtil;
 
 @PluginDescriptor(
-	name = "Zulrah",
+	name = "Zulrah Helper",
 	description = "Zulrah Helper",
 	tags = {"Zulrah", "Helper"},
-		type = "PVM"
+	type = "PVM"
 )
 public class ZulrahPlugin extends Plugin
 {

From 31a792d7b9a5dda88bf465c6d74db9c12bb097b1 Mon Sep 17 00:00:00 2001
From: Jonathan <48493132+Raieverr@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:32:35 -0600
Subject: [PATCH 14/18] Update EquipmentInspectorPlugin.java

---
 .../plugins/equipmentinspector/EquipmentInspectorPlugin.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java
index 29904c2fb8..d707731c76 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java
@@ -36,7 +36,7 @@ import java.util.concurrent.ScheduledExecutorService;
 @PluginDescriptor(
         name = "Equipment Inspector",
         enabledByDefault = false,
-        type = "utility"
+        type = "PVP"
 )
 
 @Slf4j
@@ -225,4 +225,4 @@ public class EquipmentInspectorPlugin extends Plugin {
             });
         }
     }
-}
\ No newline at end of file
+}

From 582966c6a62bed3aace14f6f3e4532dac84c3212 Mon Sep 17 00:00:00 2001
From: Jonathan <48493132+Raieverr@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:33:57 -0600
Subject: [PATCH 15/18] Update ProfilesPlugin.java

---
 .../runelite/client/plugins/profiles/ProfilesPlugin.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java
index 4128adba44..d1aca754fd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java
@@ -25,7 +25,14 @@ import net.runelite.client.ui.ClientToolbar;
 import net.runelite.client.ui.NavigationButton;
 import net.runelite.client.util.ImageUtil;
 
-@PluginDescriptor(name="Account Switcher", description="Allow for a allows you to easily switch between multiple OSRS Accounts", tags={"profile", "account", "login", "log in"})
+@PluginDescriptor(
+   
+    name="Account Switcher",
+    description="Allow for a allows you to easily switch between multiple OSRS Accounts", 
+    tags={"profile", "account", "login", "log in"},
+    type = "utility"
+)
+
 public class ProfilesPlugin
 extends Plugin {
     @Inject

From 0ed019ed1d0af49e6411b6965e01adc3ab72b9fc Mon Sep 17 00:00:00 2001
From: Jonathan <48493132+Raieverr@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:34:33 -0600
Subject: [PATCH 16/18] Update RaidsPlugin.java

---
 .../java/net/runelite/client/plugins/raids/RaidsPlugin.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
index 4e1689eaee..39b7fa320e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
@@ -87,7 +87,8 @@ import net.runelite.client.util.HotkeyListener;
 @PluginDescriptor(
 	name = "Chambers Of Xeric",
 	description = "Show helpful information for the Chambers of Xeric raid",
-	tags = {"combat", "raid", "overlay", "pve", "pvm", "bosses", "cox", "olm"}
+	tags = {"combat", "raid", "overlay", "pve", "pvm", "bosses", "cox", "olm"},
+	type = "PVM"
 )
 @Slf4j
 public class RaidsPlugin extends Plugin

From 88743b562da61fe9a1d65fcc7d268fb381525d23 Mon Sep 17 00:00:00 2001
From: Jonathan <48493132+Raieverr@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:35:42 -0600
Subject: [PATCH 17/18] Update PyramidPlunderPlugin.java

---
 .../client/plugins/pyramidplunder/PyramidPlunderPlugin.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java
index 64a009f2cb..4109b4c7e7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java
@@ -58,6 +58,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
 	name = "PyramidPlunder",
 	description = "Highlights doors and spear traps in pyramid plunder and adds a numerical timer",
 	tags = {"pyramidplunder", "pyramid", "plunder", "overlay", "skilling", "thieving"},
+	type = "utility",
 	enabledByDefault = false
 )
 

From da764fc7dfb10a1ed221610ab07fad0801a1a105 Mon Sep 17 00:00:00 2001
From: Jonathan <48493132+Raieverr@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:45:47 -0600
Subject: [PATCH 18/18] Update BarbarianAssaultPlugin.java

---
 .../client/plugins/barbarianassault/BarbarianAssaultPlugin.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
index 79146bcf21..7124cd71d2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
@@ -64,7 +64,7 @@ import net.runelite.client.util.ImageUtil;
 @PluginDescriptor(
 	name = "Barbarian Assault",
 	description = "Show a timer to the next call change and game/wave duration in chat.",
-	tags = {"minigame", "overlay", "timer"},
+	tags = {"minigame", "overlay", "timer"}
 )
 public class BarbarianAssaultPlugin extends Plugin {
 	private static final int BA_WAVE_NUM_INDEX = 2;