Merge remote-tracking branch 'runelite/master'

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

@@ -29,6 +29,7 @@ import java.awt.Polygon;
 import java.awt.Shape;
 import java.awt.image.BufferedImage;
 import javax.annotation.Nullable;
+import net.runelite.api.annotations.VisibleForDevtools;
 import net.runelite.api.coords.LocalPoint;
 import net.runelite.api.coords.WorldArea;
 import net.runelite.api.coords.WorldPoint;
@@ -105,10 +106,6 @@ public interface Actor extends Renderable, Locatable
 	 */
 	LocalPoint getLocalLocation();
 
-	void setIdlePoseAnimation(int animation);
-
-	void setPoseAnimation(int animation);
-
 	/**
 	 * Get the index of the PoseFrame (the index as it appears in the sequenceDefinition "frames" array).
 	 */
@@ -138,22 +135,84 @@ public interface Actor extends Renderable, Locatable
 	int getAnimation();
 
 	/**
-	 * Gets the secondary animation the actor is performing.
+	 * Gets the secondary animation the actor is performing. Usually an idle animation, or one of the walking ones.
 	 *
 	 * @return the animation ID
 	 * @see AnimationID
 	 */
 	int getPoseAnimation();
 
+	@VisibleForDevtools
+	void setPoseAnimation(int animation);
+
 	/**
-	 * If this is equal to the pose animation, the pose animation is ignored when
-	 * you are doing another action.
+	 * The idle pose animation. If the actor is not walking or otherwise animating, this will be used
+	 * for their pose animation.
 	 *
 	 * @return the animation ID
 	 * @see AnimationID
 	 */
 	int getIdlePoseAnimation();
 
+	@VisibleForDevtools
+	void setIdlePoseAnimation(int animation);
+
+	/**
+	 * Animation used for rotating left if the actor is also not walking
+	 *
+	 * @return the animation ID
+	 * @see AnimationID
+	 */
+	int getIdleRotateLeft();
+
+	/**
+	 * Animation used for rotating right if the actor is also not walking
+	 *
+	 * @return the animation ID
+	 * @see AnimationID
+	 */
+	int getIdleRotateRight();
+
+	/**
+	 * Animation used for walking
+	 *
+	 * @return the animation ID
+	 * @see AnimationID
+	 */
+	int getWalkAnimation();
+
+	/**
+	 * Animation used for rotating left while walking
+	 *
+	 * @return the animation ID
+	 * @see AnimationID
+	 */
+	int getWalkRotateLeft();
+
+	/**
+	 * Animation used for rotating right while walking
+	 *
+	 * @return the animation ID
+	 * @see AnimationID
+	 */
+	int getWalkRotateRight();
+
+	/**
+	 * Animation used for an about-face while walking
+	 *
+	 * @return the animation ID
+	 * @see AnimationID
+	 */
+	int getWalkRotate180();
+
+	/**
+	 * Animation used for running
+	 *
+	 * @return the animation ID
+	 * @see AnimationID
+	 */
+	int getRunAnimation();
+
 	/**
 	 * Sets an animation for the actor to perform.
 	 *
@@ -291,16 +350,18 @@ public interface Actor extends Renderable, Locatable
 
 	int getTurnRightAnimation();
 
-	int getWalkAnimation();
-
+	// TODO: Remove next major
+	@Deprecated
 	int getWalkBackAnimation();
 
+	// TODO: Remove next major
+	@Deprecated
 	int getWalkLeftAnimation();
 
+	// TODO: Remove next major
+	@Deprecated
 	int getWalkRightAnimation();
 
-	int getRunAnimation();
-
 	/**
 	 * Returns true if this NPC has died
 	 *

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

@@ -395,11 +395,16 @@ public enum Varbits
 	MULTICOMBAT_AREA(4605),
 
 	/**
-	 * Kingdom Management
+	 * Kingdom of Miscellania Management
+	 * Kingdom Approval is represented as a 7-bit unsigned integer; 127 corresponds to 100% approval
 	 */
-	KINGDOM_FAVOR(72),
+	KINGDOM_APPROVAL(72),
 	KINGDOM_COFFER(74),
 
+	// TODO: Remove next major
+	@Deprecated
+	KINGDOM_FAVOR(72),
+
 	/**
 	 * The Hand in the Sand quest status
 	 */

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

@@ -26,6 +26,7 @@ package net.runelite.api.widgets;
 
 import java.awt.Rectangle;
 import java.util.Collection;
+import javax.annotation.Nullable;
 import net.runelite.api.FontTypeFace;
 import net.runelite.api.Point;
 import net.runelite.api.SpritePixels;
@@ -117,6 +118,7 @@ public interface Widget
 	/**
 	 * Gets the dynamic children of this widget in a sparse array
 	 */
+	@Nullable
 	Widget[] getChildren();
 
 	/**