From 3a5ac9f725d8ba152fa2f4d501a53f54ab18f3c1 Mon Sep 17 00:00:00 2001
From: Matthew Abel <32851341+Mabel5@users.noreply.github.com>
Date: Mon, 11 Feb 2019 04:14:23 -0500
Subject: [PATCH] Hide auto retaliate from combat options (#7713)

Closes #7686
---
 .../java/net/runelite/api/widgets/WidgetID.java     |  1 +
 .../java/net/runelite/api/widgets/WidgetInfo.java   |  1 +
 .../plugins/attackstyles/AttackStylesConfig.java    | 13 ++++++++++++-
 .../plugins/attackstyles/AttackStylesPlugin.java    |  2 ++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
index bb9d8b6000..9f07f9ba37 100644
--- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
+++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
@@ -513,6 +513,7 @@ public class WidgetID
 		static final int SPELL_BOX = 25;
 		static final int SPELL_ICON = 27;
 		static final int SPELL_TEXT = 28;
+		static final int AUTO_RETALIATE = 29;
 	}
 
 	static class VolcanicMine
diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
index ef02681690..556dc57bf5 100644
--- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
+++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
@@ -305,6 +305,7 @@ public enum WidgetInfo
 	COMBAT_SPELL_BOX(WidgetID.COMBAT_GROUP_ID, WidgetID.Combat.SPELL_BOX),
 	COMBAT_SPELL_ICON(WidgetID.COMBAT_GROUP_ID, WidgetID.Combat.SPELL_ICON),
 	COMBAT_SPELL_TEXT(WidgetID.COMBAT_GROUP_ID, WidgetID.Combat.SPELL_TEXT),
+	COMBAT_AUTO_RETALIATE(WidgetID.COMBAT_GROUP_ID, WidgetID.Combat.AUTO_RETALIATE),
 
 	DIALOG_OPTION(WidgetID.DIALOG_OPTION_GROUP_ID, 0),
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesConfig.java
index 111fb9dc85..c3715481d1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesConfig.java
@@ -97,11 +97,22 @@ public interface AttackStylesConfig extends Config
 		return false;
 	}
 
+	@ConfigItem(
+		keyName = "hideAutoRetaliate",
+		name = "Hide auto retaliate",
+		description = "Hide auto retaliate from the combat options tab",
+		position = 7
+	)
+	default boolean hideAutoRetaliate()
+	{
+		return false;
+	}
+
 	@ConfigItem(
 		keyName = "removeWarnedStyles",
 		name = "Remove warned styles",
 		description = "Remove warned styles from the combat options tab",
-		position = 7
+		position = 8
 	)
 	default boolean removeWarnedStyles()
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java
index 4b6de0ea1d..db7a9ed751 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java
@@ -126,6 +126,7 @@ public class AttackStylesPlugin extends Plugin
 		overlayManager.remove(overlay);
 		hideWarnedStyles(false);
 		processWidgets();
+		hideWidget(client.getWidget(WidgetInfo.COMBAT_AUTO_RETALIATE), false);
 	}
 
 	public AttackStyle getAttackStyle()
@@ -174,6 +175,7 @@ public class AttackStylesPlugin extends Plugin
 				hideWidget(client.getWidget(widgetKey), widgetsToHide.get(equippedWeaponType, widgetKey));
 			}
 		}
+		hideWidget(client.getWidget(WidgetInfo.COMBAT_AUTO_RETALIATE), config.hideAutoRetaliate());
 	}
 
 	@Subscribe