Gazivodag master (#10)

* Transform objects now use an interface

* Plugins can now accept colors (not my code)

* mixins: renderWidgetLayer: skip hidden widgets

* World Map: Identify Both Shield of Arrav Quest Start Points (#8442)

Closes #8437

* widgetitem: associate Widget with WidgetItem

* widgetitem overlay: allow configuring which interfaces to overlay

Update overlays to behave consistent with how they behaved before
removal of query api, with the exception of adding the rune pouch
overlay to the bank.

* Update .gitignore

* Revert "Adding external plugin support (#4)"

This reverts commit bfe1482

* Update QuestStartLocation.java

* Revert "Plugins update (#7)"

This reverts commit 216f7d9

* Adding external plugin support (#4)

* Adding archetype

* Update RuneLiteConfig.java

* Update Plugin.java

* Update PluginManager.java

* Adding pluginwatcher & classloader

* Update RuneLite.java

* Update pom.xml

* Update settings.xml

* Update pom.xml

* Update pom.xml

* Removing old example plugin

* Fixing the fix of the fix for plugin archetype.

(cherry picked from commit bfe1482705)

* Plugins can now accept colors (not my code)

(cherry picked from commit 8e094f7386)

* Update MenuEntrySwapperConfig.java

.gitignore

@@ -8,3 +8,7 @@ project.properties
 .project
 .settings/
 .classpath
+runelite-client/src/main/resources/META-INF/MANIFEST.MF
+git
+classes/artifacts/client_jar/run.bat
+classes/artifacts/client_jar/client.jar

runelite-api/src/main/java/net/runelite/api/widgets/WidgetItem.java

@@ -26,6 +26,7 @@ package net.runelite.api.widgets;
 
 import java.awt.Rectangle;
 import lombok.AllArgsConstructor;
+import lombok.Getter;
 import lombok.ToString;
 import net.runelite.api.Point;
 
@@ -34,55 +35,34 @@ import net.runelite.api.Point;
  */
 @AllArgsConstructor
 @ToString
+@Getter
 public class WidgetItem
 {
-	private final int id;
-	private final int quantity;
-	private final int index;
-	private final Rectangle canvasBounds;
-
 	/**
-	 * Gets the ID of the item represented.
+	 * The ID of the item represented.
 	 *
-	 * @return the items ID
 	 * @see net.runelite.api.ItemID
 	 */
-	public int getId()
+	private final int id;
-	{
-		return id;
-	}
-
 	/**
-	 * Gets the quantity of the represented item.
+	 * The quantity of the represented item.
-	 *
-	 * @return the items quantity
 	 */
-	public int getQuantity()
+	private final int quantity;
-	{
-		return quantity;
-	}
-
 	/**
-	 * Gets the index position of this WidgetItem inside its parents
+	 * The index position of this WidgetItem inside its parents
 	 * WidgetItem array.
 	 *
-	 * @return the index in the parent widget
 	 * @see Widget#getWidgetItems()
 	 */
-	public int getIndex()
+	private final int index;
-	{
-		return index;
-	}
-
 	/**
-	 * Gets the area where the widget is drawn on the canvas.
+	 * The area where the widget is drawn on the canvas.
-	 *
-	 * @return the occupied area of the widget
 	 */
-	public Rectangle getCanvasBounds()
+	private final Rectangle canvasBounds;
-	{
+	/**
-		return canvasBounds;
+	 * The widget which contains this item.
-	}
+	 */
+	private final Widget widget;
 
 	/**
 	 * Gets the upper-left coordinate of where the widget is being drawn

runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java

@@ -130,7 +130,7 @@ public class ConfigPanel extends PluginPanel
 	}
 
 	ConfigPanel(PluginManager pluginManager, ConfigManager configManager, ScheduledExecutorService executorService,
-		RuneLiteConfig runeLiteConfig, ChatColorConfig chatColorConfig)
+				RuneLiteConfig runeLiteConfig, ChatColorConfig chatColorConfig)
 	{
 		super(false);
 		this.pluginManager = pluginManager;
@@ -195,28 +195,28 @@ public class ConfigPanel extends PluginPanel
 
 		// populate pluginList with all non-hidden plugins
 		pluginManager.getPlugins().stream()
-			.filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).hidden())
+				.filter(plugin -> !plugin.getClass().getAnnotation(PluginDescriptor.class).hidden())
-			.forEach(plugin ->
+				.forEach(plugin ->
-			{
+				{
-				final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class);
+					final PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class);
-				final Config config = pluginManager.getPluginConfigProxy(plugin);
+					final Config config = pluginManager.getPluginConfigProxy(plugin);
-				final ConfigDescriptor configDescriptor = config == null ? null : configManager.getConfigDescriptor(config);
+					final ConfigDescriptor configDescriptor = config == null ? null : configManager.getConfigDescriptor(config);
 
-				final PluginListItem listItem = new PluginListItem(this, plugin, descriptor, config, configDescriptor);
+					final PluginListItem listItem = new PluginListItem(this, plugin, descriptor, config, configDescriptor);
-				listItem.setPinned(pinnedPlugins.contains(listItem.getName()));
+					listItem.setPinned(pinnedPlugins.contains(listItem.getName()));
-				pluginList.add(listItem);
+					pluginList.add(listItem);
-			});
+				});
 
 		// add special entries for core client configurations
 		final PluginListItem runeLite = new PluginListItem(this, runeLiteConfig,
-			configManager.getConfigDescriptor(runeLiteConfig),
+				configManager.getConfigDescriptor(runeLiteConfig),
-			RUNELITE_PLUGIN, "RuneLite client settings", "client");
+				RUNELITE_PLUGIN, "RuneLite client settings", "client");
 		runeLite.setPinned(pinnedPlugins.contains(RUNELITE_PLUGIN));
 		pluginList.add(runeLite);
 
 		final PluginListItem chatColor = new PluginListItem(this, chatColorConfig,
-			configManager.getConfigDescriptor(chatColorConfig),
+				configManager.getConfigDescriptor(chatColorConfig),
-			CHAT_COLOR_PLUGIN, "Recolor chat text", "colour", "messages");
+				CHAT_COLOR_PLUGIN, "Recolor chat text", "colour", "messages");
 		chatColor.setPinned(pinnedPlugins.contains(CHAT_COLOR_PLUGIN));
 		pluginList.add(chatColor);
 
@@ -421,7 +421,7 @@ public class ConfigPanel extends PluginPanel
 					public void mouseClicked(MouseEvent e)
 					{
 						RuneliteColorPicker colorPicker = new RuneliteColorPicker(SwingUtilities.windowForComponent(ConfigPanel.this),
-							colorPickerBtn.getBackground(), cid.getItem().name(), cid.getAlpha() == null);
+								colorPickerBtn.getBackground(), cid.getItem().name(), cid.getAlpha() == null);
 						colorPicker.setLocation(getLocationOnScreen());
 						colorPicker.setOnColorChange(c ->
 						{
@@ -467,7 +467,7 @@ public class ConfigPanel extends PluginPanel
 				heightSpinnerTextField.setColumns(4);
 
 				ChangeListener listener = e ->
-					configManager.setConfiguration(cd.getGroup().value(), cid.getItem().keyName(), widthSpinner.getValue() + "x" + heightSpinner.getValue());
+						configManager.setConfiguration(cd.getGroup().value(), cid.getItem().keyName(), widthSpinner.getValue() + "x" + heightSpinner.getValue());
 
 				widthSpinner.addChangeListener(listener);
 				heightSpinner.addChangeListener(listener);
@@ -512,8 +512,8 @@ public class ConfigPanel extends PluginPanel
 			if (cid.getType() == Keybind.class || cid.getType() == ModifierlessKeybind.class)
 			{
 				Keybind startingValue = configManager.getConfiguration(cd.getGroup().value(),
-					cid.getItem().keyName(),
+						cid.getItem().keyName(),
-					(Class<? extends Keybind>) cid.getType());
+						(Class<? extends Keybind>) cid.getType());
 
 				HotkeyButton button = new HotkeyButton(startingValue, cid.getType() == ModifierlessKeybind.class);
 
@@ -536,8 +536,8 @@ public class ConfigPanel extends PluginPanel
 		resetButton.addActionListener((e) ->
 		{
 			final int result = JOptionPane.showOptionDialog(resetButton, "Are you sure you want to reset this plugin's configuration?",
-				"Are you sure?", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE,
+					"Are you sure?", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE,
-				null, new String[]{"Yes", "No"}, "No");
+					null, new String[]{"Yes", "No"}, "No");
 
 			if (result == JOptionPane.YES_OPTION)
 			{
@@ -564,8 +564,8 @@ public class ConfigPanel extends PluginPanel
 		if (!Strings.isNullOrEmpty(configItem.warning()))
 		{
 			final int result = JOptionPane.showOptionDialog(component, configItem.warning(),
-				"Are you sure?", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE,
+					"Are you sure?", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE,
-				null, new String[]{"Yes", "No"}, "No");
+					null, new String[]{"Yes", "No"}, "No");
 
 			if (result != JOptionPane.YES_OPTION)
 			{
@@ -659,9 +659,9 @@ public class ConfigPanel extends PluginPanel
 	void savePinnedPlugins()
 	{
 		final String value = pluginList.stream()
-			.filter(PluginListItem::isPinned)
+				.filter(PluginListItem::isPinned)
-			.map(PluginListItem::getName)
+				.map(PluginListItem::getName)
-			.collect(Collectors.joining(","));
+				.collect(Collectors.joining(","));
 
 		configManager.setConfiguration(RUNELITE_GROUP_NAME, PINNED_PLUGINS_CONFIG_KEY, value);
 	}

runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java

@@ -99,17 +99,17 @@ class PluginListItem extends JPanel
 		ON_STAR = new ImageIcon(onStar);
 		CONFIG_ICON_HOVER = new ImageIcon(ImageUtil.grayscaleOffset(configIcon, -100));
 		BufferedImage offSwitcherImage = ImageUtil.flipImage(
-			ImageUtil.grayscaleOffset(
+				ImageUtil.grayscaleOffset(
-				ImageUtil.grayscaleImage(onSwitcher),
+						ImageUtil.grayscaleImage(onSwitcher),
-				0.61f
+						0.61f
-			),
+				),
-			true,
+				true,
-			false
+				false
 		);
 		OFF_SWITCHER = new ImageIcon(offSwitcherImage);
 		BufferedImage offStar = ImageUtil.grayscaleOffset(
-			ImageUtil.grayscaleImage(onStar),
+				ImageUtil.grayscaleImage(onStar),
-			0.77f
+				0.77f
 		);
 		OFF_STAR = new ImageIcon(offStar);
 	}
@@ -121,23 +121,23 @@ class PluginListItem extends JPanel
 	 * if there is no configuration associated with the plugin.
 	 */
 	PluginListItem(ConfigPanel configPanel, Plugin plugin, PluginDescriptor descriptor,
-		@Nullable Config config, @Nullable ConfigDescriptor configDescriptor)
+				   @Nullable Config config, @Nullable ConfigDescriptor configDescriptor)
 	{
 		this(configPanel, plugin, config, configDescriptor,
-			descriptor.name(), descriptor.description(), descriptor.tags());
+				descriptor.name(), descriptor.description(), descriptor.tags());
 	}
 
 	/**
 	 * Creates a new {@code PluginListItem} for a core configuration.
 	 */
 	PluginListItem(ConfigPanel configPanel, Config config, ConfigDescriptor configDescriptor,
-		String name, String description, String... tags)
+				   String name, String description, String... tags)
 	{
 		this(configPanel, null, config, configDescriptor, name, description, tags);
 	}
 
 	private PluginListItem(ConfigPanel configPanel, @Nullable Plugin plugin, @Nullable Config config,
-		@Nullable ConfigDescriptor configDescriptor, String name, String description, String... tags)
+						   @Nullable ConfigDescriptor configDescriptor, String name, String description, String... tags)
 	{
 		this.configPanel = configPanel;
 		this.plugin = plugin;
@@ -260,7 +260,7 @@ class PluginListItem extends JPanel
 		for (String term : searchTerms)
 		{
 			if (keywords.stream().noneMatch((t) -> t.contains(term) ||
-				DISTANCE.apply(t, term) > 0.9))
+					DISTANCE.apply(t, term) > 0.9))
 			{
 				return false;
 			}

runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java

@@ -43,6 +43,8 @@ public class InventoryTagsOverlay extends WidgetItemOverlay
 	{
 		this.itemManager = itemManager;
 		this.plugin = plugin;
+		showOnEquipment();
+		showOnInventory();
 	}
 
 	@Override

runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java

@@ -51,6 +51,8 @@ class ItemChargeOverlay extends WidgetItemOverlay
 	{
 		this.itemChargePlugin = itemChargePlugin;
 		this.config = config;
+		showOnInventory();
+		showOnEquipment();
 	}
 
 	@Override

runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java

@@ -1,3 +1,4 @@
+
 /*
  * Copyright (c) 2018, Adam <Adam@sigterm.info>
  * All rights reserved.

runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java

@@ -69,6 +69,8 @@ public class RunepouchOverlay extends WidgetItemOverlay
 		this.tooltipManager = tooltipManager;
 		this.client = client;
 		this.config = config;
+		showOnInventory();
+		showOnBank();
 	}
 
 	@Override

runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java

@@ -87,6 +87,8 @@ class SlayerOverlay extends WidgetItemOverlay
 	{
 		this.plugin = plugin;
 		this.config = config;
+		showOnInventory();
+		showOnEquipment();
 	}
 
 	@Override

runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java

@@ -46,7 +46,10 @@ enum QuestStartLocation
 	THE_RESTLESS_GHOST("The Restless Ghost", new WorldPoint(3240, 3210, 0)),
 	RUNE_MYSTERIES("Rune Mysteries", new WorldPoint(3210, 3220, 0)),
 	SHEEP_SHEARER("Sheep Shearer", new WorldPoint(3190, 3272, 0)),
-	SHIELD_OF_ARRAV("Shield of Arrav", new WorldPoint(3208, 3495, 0)),
+
+	SHIELD_OF_ARRAV_PHOENIX_GANG("Shield of Arrav (Phoenix Gang)", new WorldPoint(3208, 3495, 0)),
+	SHIELD_OF_ARRAV_BLACK_ARM_GANG("Shield of Arrav (Black Arm Gang)", new WorldPoint(3208, 3392, 0)),
+
 	VAMPIRE_SLAYER("Vampire Slayer", new WorldPoint(3096, 3266, 0)),
 	WITCHS_POTION("Witch's Potion", new WorldPoint(2967, 3203, 0)),
 	X_MARKS_THE_SPOT("X Marks the Spot", new WorldPoint(3227, 3242, 0)),

runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java

@@ -26,15 +26,33 @@ package net.runelite.client.ui.overlay;
 
 import java.awt.Dimension;
 import java.awt.Graphics2D;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import lombok.AccessLevel;
 import lombok.Setter;
+import net.runelite.api.widgets.Widget;
+import static net.runelite.api.widgets.WidgetID.BANK_GROUP_ID;
+import static net.runelite.api.widgets.WidgetID.BANK_INVENTORY_GROUP_ID;
+import static net.runelite.api.widgets.WidgetID.DEPOSIT_BOX_GROUP_ID;
+import static net.runelite.api.widgets.WidgetID.EQUIPMENT_GROUP_ID;
+import static net.runelite.api.widgets.WidgetID.EQUIPMENT_INVENTORY_GROUP_ID;
+import static net.runelite.api.widgets.WidgetID.GRAND_EXCHANGE_INVENTORY_GROUP_ID;
+import static net.runelite.api.widgets.WidgetID.GUIDE_PRICES_INVENTORY_GROUP_ID;
+import static net.runelite.api.widgets.WidgetID.INVENTORY_GROUP_ID;
+import static net.runelite.api.widgets.WidgetID.SHOP_INVENTORY_GROUP_ID;
+import static net.runelite.api.widgets.WidgetInfo.TO_GROUP;
 import net.runelite.api.widgets.WidgetItem;
 
 public abstract class WidgetItemOverlay extends Overlay
 {
 	@Setter(AccessLevel.PACKAGE)
 	private OverlayManager overlayManager;
+	/**
+	 * Interfaces to draw overlay over.
+	 */
+	private final Set<Integer> interfaceGroups = new HashSet<>();
 
 	protected WidgetItemOverlay()
 	{
@@ -49,13 +67,49 @@ public abstract class WidgetItemOverlay extends Overlay
 	public Dimension render(Graphics2D graphics)
 	{
 		final List<WidgetItem> itemWidgets = overlayManager.getItemWidgets();
-		for (WidgetItem widget : itemWidgets)
+		for (WidgetItem widgetItem : itemWidgets)
 		{
-			renderItemOverlay(graphics, widget.getId(), widget);
+			Widget widget = widgetItem.getWidget();
+			int interfaceGroup = TO_GROUP(widget.getId());
+
+			// Don't draw if this widget isn't one of the allowed
+			if (!interfaceGroups.contains(interfaceGroup))
+			{
+				continue;
+			}
+
+			renderItemOverlay(graphics, widgetItem.getId(), widgetItem);
 		}
 		return null;
 	}
 
+	protected void showOnInventory()
+	{
+		showOnInterfaces(
+			DEPOSIT_BOX_GROUP_ID,
+			BANK_INVENTORY_GROUP_ID,
+			SHOP_INVENTORY_GROUP_ID,
+			GRAND_EXCHANGE_INVENTORY_GROUP_ID,
+			GUIDE_PRICES_INVENTORY_GROUP_ID,
+			EQUIPMENT_INVENTORY_GROUP_ID,
+			INVENTORY_GROUP_ID);
+	}
+
+	protected void showOnBank()
+	{
+		showOnInterfaces(BANK_GROUP_ID);
+	}
+
+	protected void showOnEquipment()
+	{
+		showOnInterfaces(EQUIPMENT_GROUP_ID);
+	}
+
+	protected void showOnInterfaces(int... ids)
+	{
+		Arrays.stream(ids).forEach(interfaceGroups::add);
+	}
+
 	// Don't allow setting position, priority, or layer
 
 	@Override

runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java

@@ -1335,7 +1335,7 @@ public abstract class RSClientMixin implements RSClient
 		for (Widget rlWidget : widgets)
 		{
 			RSWidget widget = (RSWidget) rlWidget;
-			if (widget == null || widget.getRSParentId() != parentId)
+			if (widget == null || widget.getRSParentId() != parentId || widget.isSelfHidden())
 			{
 				continue;
 			}
@@ -1355,7 +1355,7 @@ public abstract class RSClientMixin implements RSClient
 			{
 				if (renderX >= minX && renderX <= maxX && renderY >= minY && renderY <= maxY)
 				{
-					WidgetItem widgetItem = new WidgetItem(widget.getItemId(), widget.getItemQuantity(), -1, widget.getBounds());
+					WidgetItem widgetItem = new WidgetItem(widget.getItemId(), widget.getItemQuantity(), -1, widget.getBounds(), widget);
 					callbacks.drawItem(widget.getItemId(), widgetItem);
 				}
 			}

runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java

@@ -300,7 +300,7 @@ public abstract class RSWidgetMixin implements RSWidget
 		int itemY = widgetCanvasLocation.getY() + ((ITEM_SLOT_SIZE + yPitch) * row);
 
 		Rectangle bounds = new Rectangle(itemX - 1, itemY - 1, ITEM_SLOT_SIZE, ITEM_SLOT_SIZE);
-		return new WidgetItem(itemId - 1, itemQuantity, index, bounds);
+		return new WidgetItem(itemId - 1, itemQuantity, index, bounds, this);
 	}
 
 	@Inject