Merge branch 'master' of https://github.com/runelite/runelite into 0206-upstream

runelite-api/src/main/java/net/runelite/api/Client.java

@@ -1979,6 +1979,7 @@ public interface Client extends OAuthApi, GameEngine
 	 *
 	 * @param delay the number of game cycles to delay dragging
 	 */
+	@Deprecated
 	void setInventoryDragDelay(int delay);
 
 	boolean isHdMinimapEnabled();
@@ -2086,11 +2087,13 @@ public interface Client extends OAuthApi, GameEngine
 	/**
 	 * Get the if1 widget whose item is being dragged
 	 */
+	@Deprecated
 	Widget getIf1DraggedWidget();
 
 	/**
 	 * Get the item index of the item being dragged on an if1 widget
 	 */
+	@Deprecated
 	int getIf1DraggedItemIndex();
 
 	/**

runelite-api/src/main/java/net/runelite/api/MenuAction.java

@@ -35,6 +35,7 @@ public enum MenuAction
 	/**
 	 * Menu action for using an item in your inventory on a tile object (GameObject or GroundObject).
 	 */
+	@Deprecated
 	ITEM_USE_ON_GAME_OBJECT(1),
 	/**
 	 * Menu action for using a widget on a tile object (GameObject or GroundObject).
@@ -64,6 +65,7 @@ public enum MenuAction
 	/**
 	 * Menu action for using an item in your inventory on an NPC.
 	 */
+	@Deprecated
 	ITEM_USE_ON_NPC(7),
 	/**
 	 * Menu action for using a widget on an NPC.
@@ -93,6 +95,7 @@ public enum MenuAction
 	/**
 	 * Menu action for using an item on a player.
 	 */
+	@Deprecated
 	ITEM_USE_ON_PLAYER(14),
 	/**
 	 * Menu action for using a widget on a player.
@@ -102,6 +105,7 @@ public enum MenuAction
 	/**
 	 * Menu action for using an item on an item on the ground.
 	 */
+	@Deprecated
 	ITEM_USE_ON_GROUND_ITEM(16),
 	/**
 	 * Menu action for using a widget on an item on the ground.
@@ -161,6 +165,7 @@ public enum MenuAction
 	/**
 	 * Menu action when using an item on another item
 	 */
+	@Deprecated
 	ITEM_USE_ON_ITEM(31),
 	/**
 	 * Menu action when using a component on an item
@@ -170,26 +175,32 @@ public enum MenuAction
 	/**
 	 * First menu action for an item.
 	 */
+	@Deprecated
 	ITEM_FIRST_OPTION(33),
 	/**
 	 * Second menu action for an item.
 	 */
+	@Deprecated
 	ITEM_SECOND_OPTION(34),
 	/**
 	 * Third menu action for an item.
 	 */
+	@Deprecated
 	ITEM_THIRD_OPTION(35),
 	/**
 	 * Fourth menu action for an item.
 	 */
+	@Deprecated
 	ITEM_FOURTH_OPTION(36),
 	/**
 	 * Fifth menu action for an item.
 	 */
+	@Deprecated
 	ITEM_FIFTH_OPTION(37),
 	/**
 	 * Menu action to use an item.
 	 */
+	@Deprecated
 	ITEM_USE(38),
 
 	/**
@@ -252,6 +263,7 @@ public enum MenuAction
 	/**
 	 * Menu action triggered by examining item in inventory.
 	 */
+	@Deprecated
 	EXAMINE_ITEM(1005),
 	/**
 	 * Menu action triggered by canceling a menu.

runelite-api/src/main/java/net/runelite/api/Varbits.java

@@ -47,6 +47,21 @@ public final class Varbits
 	 */
 	public static final int RUN_SLOWED_DEPLETION_ACTIVE = 25;
 
+	/**
+	 * Stamina effect timer
+	 * Number of game ticks remaining on stamina effect in intervals of 10; for a value X there are 10 * X game ticks remaining.
+	 * The stamina effect expires once this reaches 0.
+	 */
+	public static final int STAMINA_EFFECT = 24;
+
+	/**
+	 * Ring of endurance effect timer, stamina duration extended from using the ring of endurance
+	 * Number of game ticks remaining on ring of endurance effect in intervals of 10; for a value X there are 10 * X game ticks remaining.
+	 * Unequipping the ring of endurance will cause this to change to 0.
+	 * When this reaches 0, {@link #STAMINA_EFFECT} will begin counting down.
+	 */
+	public static final int RING_OF_ENDURANCE_EFFECT = 10385;
+
 	/**
 	 * If scrollbar in resizable mode chat is on the left
 	 */

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

@@ -478,6 +478,7 @@ public interface Widget
 	 *
 	 * @return any items displayed, or null if there are no items
 	 */
+	@Deprecated
 	Collection<WidgetItem> getWidgetItems();
 
 	/**
@@ -488,6 +489,7 @@ public interface Widget
 	 * does not exist
 	 * @throws IndexOutOfBoundsException if the index is out of bounds
 	 */
+	@Deprecated
 	WidgetItem getWidgetItem(int index);
 
 	/**