Merge remote-tracking branch 'runelite/master'

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

@@ -151,6 +151,13 @@ public interface Client extends GameEngine
 	 */
 	void setPassword(String password);
 
+	/**
+	 * Sets the 6 digit pin used for authenticator on login screen.
+	 *
+	 * @param otp one time password
+	 */
+	void setOtp(String otp);
+
 	/**
 	 * Gets currently selected login field. 0 is username, and 1 is password.
 	 *
@@ -158,6 +165,13 @@ public interface Client extends GameEngine
 	 */
 	int getCurrentLoginField();
 
+	/**
+	 * Gets index of current login state. 2 is username/password form, 4 is authenticator form
+	 *
+	 * @return current login state index
+	 */
+	int getLoginIndex();
+
 	/**
 	 * Gets the account type of the logged in player.
 	 *
@@ -1352,6 +1366,13 @@ public interface Client extends GameEngine
 	 */
 	boolean isInInstancedRegion();
 
+	/**
+	 * Get the number of client ticks an item has been pressed
+	 *
+	 * @return the number of client ticks an item has been pressed
+	 */
+	int getItemPressedDuration();
+
 	/**
 	 * Sets whether the client is hiding entities.
 	 * <p>
@@ -1598,6 +1619,19 @@ public interface Client extends GameEngine
 
 	void checkClickbox(Model model, int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, long hash);
 
+	/**
+	 * Get the if1 widget whose item is being dragged
+	 *
+	 * @return
+	 */
+	Widget getIf1DraggedWidget();
+
+	/**
+	 * Get the item index of the item being dragged on an if1 widget
+	 * @return
+	 */
+	int getIf1DraggedItemIndex();
+
 	/**
 	 * Sets if a widget is in target mode
 	 */

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

@@ -41,6 +41,10 @@ public enum GameState
 	 * The client is at the login screen.
 	 */
 	LOGIN_SCREEN(10),
+	/**
+	 * The client is at the login screen entering authenticator code.
+	 */
+	LOGIN_SCREEN_AUTHENTICATOR(11),
 	/**
 	 * There is a player logging in.
 	 */

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

@@ -27,6 +27,7 @@ package net.runelite.api;
 
 public class GraphicID
 {
+	public static final int WINE_MAKE = 47;
 	public static final int SPLASH = 85;
 	public static final int GREY_BUBBLE_TELEPORT = 86;
 	public static final int TELEPORT = 111;