Merge remote-tracking branch 'runelite/master'

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

@@ -2056,6 +2056,18 @@ public interface Client extends GameEngine
 	 */
 	void setSpellSelected(boolean selected);
 
+	/**
+	 * Get if an item is selected with "Use"
+	 * @return 1 if selected, else 0
+	 */
+	int getSelectedItem();
+
+	/**
+	 * If an item is selected, this is the item index in the inventory.
+	 * @return
+	 */
+	int getSelectedItemIndex();
+
 	/**
 	 * Returns client item composition cache
 	 */

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

@@ -48,8 +48,6 @@ public interface NPCComposition extends ParamHolder
 
 	boolean isClickable();
 
-	boolean isFollower();
-
 	/**
 	 * NPC can be interacting with via menu options
 	 * @return
@@ -98,4 +96,11 @@ public interface NPCComposition extends ParamHolder
 	 * Gets the displayed overhead icon of the NPC.
 	 */
 	HeadIcon getOverheadIcon();
-}
+
+	/**
+	 * If the npc is a follower, such as a pet. Is affected by the
+	 * "Move follower options lower down" setting.
+	 * @return
+	 */
+	boolean isFollower();
+}