Merge remote-tracking branch 'runelite/master'

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

@@ -1,5 +1,7 @@
 package net.runelite.api;
 
+import javax.annotation.Nullable;
+
 /**
  * Represents the template of a specific item type.
  */
@@ -127,4 +129,29 @@ public interface ItemDefinition
 	 * @param id The itemID of the item with desired model
 	 */
 	void setModelOverride(int id);
+
+	/**
+	 * Gets the model ID of the inventory item.
+	 *
+	 * @return the model ID
+	 */
+	int getInventoryModel();
+
+	/**
+	 * Since the client reuses item models, it stores colors that can be replaced.
+	 * This returns what colors the item model will be replaced with.
+	 *
+	 * @return the colors to replace with
+	 */
+	@Nullable
+	short[] getColorToReplaceWith();
+
+	/**
+	 * Since the client reuses item models, it stores textures that can be replaced.
+	 * This returns what textures the item model will be replaced with.
+	 *
+	 * @return the textures to replace with
+	 */
+	@Nullable
+	short[] getTextureToReplaceWith();
 }

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

@@ -27,7 +27,7 @@ package net.runelite.api;
 /**
  * Represents a message in the chatbox.
  */
-public interface MessageNode
+public interface MessageNode extends Node
 {
 	/**
 	 * Get the id for this message node

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

@@ -241,5 +241,34 @@ public final class ScriptID
 	@ScriptArguments(integer = 18)
 	public static final int BANKMAIN_SEARCH_TOGGLE = 281;
 
+	/**
+	 * Builds the items kept on death widget
+	 */
+	@ScriptArguments(integer = 4, string = 2)
+	public static final int DEATH_KEEP_BUILD = 1601;
+
+	/**
+	 * Builds the widget that holds all of the players inside a clan chat
+	 */
+	@ScriptArguments(integer = 15)
+	public static final int CLAN_CHAT_CHANNEL_BUILD = 1658;
+
+	/**
+	 * Builds the widget for making an offer in Grand Exchange
+	 */
+	@ScriptArguments(integer = 15)
+	public static final int GE_OFFERS_SETUP_BUILD = 779;
+
+	/**
+	 * Builds the quest list inside the quest tab that shows each quest's progress
+	 */
+	@ScriptArguments(integer = 3)
+	public static final int QUESTLIST_PROGRESS_LIST_SHOW = 1354;
+
+	/**
+	 * Procedure called when the toplevel interface is resized
+	 */
+	@ScriptArguments(integer = 2)
+	public static final int TOPLEVEL_RESIZE = 909;
 }
 

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

@@ -1293,7 +1293,7 @@ public final class SpriteID
 	public static final int SPELL_REANIMATE_CROPS_DISABLED = 1327;
 	/* Unmapped: 1328~1337 */
 	public static final int WORLD_SWITCHER_WORLD_STAR_BLUE = 1338;
-	public static final int GAMEBLAST16_PROMO_BANNER = 1339;
+	public static final int HITSPLAT_DARK_GREEN_VENOM = 1339;
 	public static final int FAIRY_RING_REMOVE_FAVOURITE = 1340;
 	public static final int FAIRY_RING_ADD_FAVOURITE = 1341;
 	public static final int BANK_PLACEHOLDERS_LOCK = 1342;
@@ -1317,7 +1317,7 @@ public final class SpriteID
 	public static final int HITSPLAT_GREEN_POISON = 1360;
 	public static final int HITSPLAT_ORANGE = 1361;
 	public static final int HITSPLAT_ORANGE_DISEASE = 1362;
-	public static final int HITSPLAT_DARK_GREEN_VENOM = 1363;
+	public static final int HITSPLAT_GREY = 1363;
 	public static final int BOUNTY_HUNTER_SKIP_TARGET = 1364;
 	public static final int BOUNTY_HUNTER_SKIP_TARGET_HOVERED = 1365;
 	public static final int HOUSE_VIEWER_ROTATE_CLOCKWISE = 1366;

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

@@ -167,6 +167,7 @@ public class WidgetID
 	public static final int GWD_KC_GROUP_ID = 406;
 	public static final int ADVENTURE_LOG_ID = 187;
 	public static final int COUNTERS_LOG_GROUP_ID = 625;
+	public static final int GAUNTLET_TIMER_GROUP_ID = 637;
 
 	static class WorldMap
 	{
@@ -1228,7 +1229,7 @@ public class WidgetID
 
 	static class LmsKDA
 	{
-		static final int INFO = 4;
+		static final int INFO = 5;
 	}
 
 	static class AdventureLog
@@ -1241,4 +1242,9 @@ public class WidgetID
 		static final int OWNER = 4;
 		static final int TEXT = 6;
 	}
+
+	static class GauntletTimer
+	{
+		static final int CONTAINER = 2;
+	}
 }

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

@@ -797,7 +797,9 @@ public enum WidgetInfo
 
 	SKILLS_CONTAINER(WidgetID.SKILLS_GROUP_ID, WidgetID.Skills.CONTAINER),
 
-	TRADING_WITH(WidgetID.PLAYER_TRADE_SCREEN_GROUP_ID, WidgetID.TradeScreen.FIRST_TRADING_WITH);
+	TRADING_WITH(WidgetID.PLAYER_TRADE_SCREEN_GROUP_ID, WidgetID.TradeScreen.FIRST_TRADING_WITH),
+
+	GAUNTLET_TIMER_CONTAINER(WidgetID.GAUNTLET_TIMER_GROUP_ID, WidgetID.GauntletTimer.CONTAINER);
 
 	private final int groupId;
 	private final int childId;