Merge remote-tracking branch 'upstream/master' into master

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

@@ -222,30 +222,62 @@ public interface Actor extends Renderable, Locatable
 	void setAnimation(int animation);
 
 	/**
-	 * Sets the frame of the animation the actor is performing.
+	 * Get the frame of the animation the actor is performing
 	 *
-	 * @param actionFrame the animation frame
+	 * @return the frame
 	 */
-	void setActionFrame(int actionFrame);
+	int getAnimationFrame();
 
 	/**
-	 * Gets the graphic that is currently on the player.
+	 * Sets the frame of the animation the actor is performing.
 	 *
-	 * @return the graphic of the actor
+	 * @param frame the animation frame
+	 * @deprecated use setAnimationFrame
+	 */
+	@Deprecated(since = "5.0.0", forRemoval = false) // deprecated upstream
+	void setActionFrame(int frame);
+
+	/**
+	 * Sets the frame of the animation the actor is performing.
+	 *
+	 * @param frame the animation frame
+	 */
+	void setAnimationFrame(int frame);
+
+	/**
+	 * Get the graphic/spotanim that is currently on the actor.
+	 *
+	 * @return the spotanim of the actor
 	 * @see GraphicID
 	 */
 	int getGraphic();
 
+	/**
+	 * Set the graphic/spotanim that is currently on the actor.
+	 *
+	 * @param graphic The spotanim id
+	 * @see GraphicID
+	 */
 	void setGraphic(int graphic);
 
-	int getSpotAnimationFrame();
+	/**
+	 * Get the frame of the currently playing spotanim
+	 *
+	 * @return
+	 */
+	int getSpotAnimFrame();
 
+	/**
+	 * Set the frame of the currently playing spotanim
+	 *
+	 * @param spotAnimFrame
+	 */
 	void setSpotAnimFrame(int spotAnimFrame);
 
 	/**
 	 * Get the number of cycles the SpotAnimation frame has been displayed for.
 	 */
-	int getSpotAnimationFrameCycle();
+	int getSpotAnimFrameCycle();
 
 	/**
 	 * Gets the canvas area of the current tile the actor is standing on.
@@ -281,11 +313,11 @@ public interface Actor extends Renderable, Locatable
 	 * Gets the point at which a sprite should be drawn, relative to the
 	 * current location with the given z-axis offset.
 	 *
-	 * @param spritePixels the sprite to draw
+	 * @param sprite the sprite to draw
 	 * @param zOffset the z-axis offset
 	 * @return the sprite drawing location
 	 */
-	Point getCanvasSpriteLocation(SpritePixels spritePixels, int zOffset);
+	Point getCanvasSpriteLocation(SpritePixels sprite, int zOffset);
 
 	/**
 	 * Gets a point on the canvas of where this actors mini-map indicator
@@ -350,18 +382,6 @@ public interface Actor extends Renderable, Locatable
 
 	int getTurnRightAnimation();
 
-	// TODO: Remove next major
-	@Deprecated
-	int getWalkBackAnimation();
-
-	// TODO: Remove next major
-	@Deprecated
-	int getWalkLeftAnimation();
-
-	// TODO: Remove next major
-	@Deprecated
-	int getWalkRightAnimation();
-
 	/**
 	 * Returns true if this NPC has died
 	 *

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

@@ -11806,5 +11806,17 @@ public final class ItemID
 	public static final int GREGGS_IOU = 25608;
 	public static final int PASTEL_FLOWERS = 25609;
 	public static final int THICK_DYE = 25610;
+	public static final int STASH_CHART = 25611;
+	public static final int STASH_BLUEPRINT = 25612;
+	public static final int BABY_MOLERAT = 25613;
+	public static final int LARGE_WATER_CONTAINER = 25615;
+	public static final int TEA_FLASK_25617 = 25617;
+	public static final int PLAIN_SATCHEL_25618 = 25618;
+	public static final int GREEN_SATCHEL_25619 = 25619;
+	public static final int RED_SATCHEL_25620 = 25620;
+	public static final int BLACK_SATCHEL_25621 = 25621;
+	public static final int GOLD_SATCHEL_25622 = 25622;
+	public static final int RUNE_SATCHEL_25623 = 25623;
+	public static final int UNSIRED_25624 = 25624;
 	/* This file is automatically generated. Do not edit. */
 }

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

@@ -9004,5 +9004,7 @@ public final class NpcID
 	public static final int GREGG_10643 = 10643;
 	public static final int CAT_10644 = 10644;
 	public static final int AGGIE_10645 = 10645;
+	public static final int BABY_MOLERAT = 10650;
+	public static final int BABY_MOLERAT_10651 = 10651;
 	/* This file is automatically generated. Do not edit. */
 }

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

@@ -13594,5 +13594,7 @@ public final class NullItemID
 	public static final int NULL_25603 = 25603;
 	public static final int NULL_25605 = 25605;
 	public static final int NULL_25607 = 25607;
+	public static final int NULL_25614 = 25614;
+	public static final int NULL_25616 = 25616;
 	/* This file is automatically generated. Do not edit. */
 }

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

@@ -20218,5 +20218,6 @@ public final class NullObjectID
 	public static final int NULL_41431 = 41431;
 	public static final int NULL_41432 = 41432;
 	public static final int NULL_41433 = 41433;
+	public static final int NULL_41437 = 41437;
 	/* This file is automatically generated. Do not edit. */
 }

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

@@ -21202,5 +21202,9 @@ public final class ObjectID
 	public static final int EASTER_EGGS = 41370;
 	public static final int BASKET_41371 = 41371;
 	public static final int POST_41373 = 41373;
+	public static final int STASH_CHART = 41434;
+	public static final int REWARDS_CHEST_41435 = 41435;
+	public static final int REWARDS_CHEST_41436 = 41436;
+	public static final int STILE_41438 = 41438;
 	/* This file is automatically generated. Do not edit. */
 }