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

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

@@ -108,6 +108,22 @@ public enum ChatMessageType
 	 * Adding player to ignore list.
 	 */
 	IGNORENOTIFICATION(31),
+	/**
+	 * A chat message in a clan chat.
+	 */
+	CLAN_CHAT(41),
+	/**
+	 * A system message in a clan chat.
+	 */
+	CLAN_MESSAGE(43),
+	/**
+	 * A chat message in the guest clan chat.
+	 */
+	CLAN_GUEST_CHAT(44),
+	/**
+	 * A system message in the guest clan chat.
+	 */
+	CLAN_GUEST_MESSAGE(46),
 	/**
 	 * An autotyper message from a player.
 	 */
@@ -152,6 +168,14 @@ public enum ChatMessageType
 	 * The "Welcome to RuneScape" message
 	 */
 	WELCOME(108),
+	/**
+	 * Clan creation invitation.
+	 */
+	CLAN_CREATION_INVITATION(109),
+	/**
+	 * Clan wars challenge for clans rather than FCs
+	 */
+	CLAN_CLAN_WARS_CHALLENGE(110),
 	/**
 	 * An unknown message type.
 	 */

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

@@ -26,6 +26,8 @@ package net.runelite.api;
 
 public interface EnumComposition
 {
+	int size();
+
 	int[] getKeys();
 
 	int[] getIntVals();

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

@@ -47,4 +47,6 @@ public final class EnumID
 	public static final int ANCIENT_SPELLBOOK = 1983;
 	public static final int LUNAR_SPELLBOOK = 1984;
 	public static final int ARCEUUS_SPELLBOOK = 1985;
+
+	public static final int FRIENDS_CHAT_RANK_ICONS = 1543;
 }

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

@@ -9094,5 +9094,6 @@ public final class NpcID
 	public static final int GARDENER_JAY_JR_10757 = 10757;
 	public static final int GARDENER_JAY_JR_10758 = 10758;
 	public static final int CLERK_10759 = 10759;
+	public static final int STRAY_DOG_10760 = 10760;
 	/* This file is automatically generated. Do not edit. */
 }

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

@@ -20303,8 +20303,6 @@ public final class NullObjectID
 	public static final int NULL_41599 = 41599;
 	public static final int NULL_41608 = 41608;
 	public static final int NULL_41609 = 41609;
-	public static final int NULL_41610 = 41610;
-	public static final int NULL_41611 = 41611;
 	public static final int NULL_41612 = 41612;
 	public static final int NULL_41614 = 41614;
 	public static final int NULL_41616 = 41616;

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

@@ -21293,6 +21293,8 @@ public final class ObjectID
 	public static final int BOXES_41605 = 41605;
 	public static final int SIGNPOST_41606 = 41606;
 	public static final int TABLE_41607 = 41607;
+	public static final int BUSH_41610 = 41610;
+	public static final int BUSH_41611 = 41611;
 	public static final int RED_BARRIER_41613 = 41613;
 	public static final int POSTER_41615 = 41615;
 	public static final int PORTAL_41617 = 41617;

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

@@ -47,6 +47,12 @@ public final class ScriptID
 	@ScriptArguments(integer = 1, string = 1)
 	public static final int CHATBOX_INPUT = 96;
 
+	/**
+	 * Rebuilds the chatbox and the pmbox
+	 */
+	@ScriptArguments()
+	public static final int SPLITPM_CHANGED = 83;
+
 	/**
 	 * Rebuilds the chatbox
 	 */

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

@@ -1000,6 +1000,13 @@ public interface Widget
 	 */
 	void setDragParent(Widget dragParent);
 
+	/**
+	 * Gets the script and arguments to be ran when one of the listened for vars changes.
+	 *
+	 * @return
+	 */
+	Object[] getOnVarTransmitListener();
+
 	/**
 	 * Sets a script to be ran when a varplayer changes
 	 *

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

@@ -271,6 +271,8 @@ public class WidgetID
 
 	static class FriendsChat
 	{
+		static final int ROOT = 0;
+		static final int TITLE = 1;
 		static final int OWNER = 2;
 		static final int LIST = 12;
 	}
@@ -558,7 +560,8 @@ public class WidgetID
 		static final int TAB_ALL = 4;
 		static final int TAB_GAME = 7;
 		static final int TAB_PUBLIC = 11;
-		static final int TAB_PRIVATE = 19;
+		static final int TAB_PRIVATE = 15;
+		static final int TAB_CHANNEL = 19;
 		static final int TAB_CLAN = 23;
 		static final int TAB_TRADE = 27;
 		static final int REPORT_TEXT = 33;

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

@@ -126,6 +126,8 @@ public enum WidgetInfo
 
 	EXPLORERS_RING_ALCH_INVENTORY(WidgetID.EXPLORERS_RING_ALCH_GROUP_ID, WidgetID.ExplorersRing.INVENTORY),
 
+	FRIENDS_CHAT_ROOT(WidgetID.FRIENDS_CHAT_GROUP_ID, WidgetID.FriendsChat.ROOT),
+	FRIENDS_CHAT_TITLE(WidgetID.FRIENDS_CHAT_GROUP_ID, WidgetID.FriendsChat.TITLE),
 	FRIENDS_CHAT_OWNER(WidgetID.FRIENDS_CHAT_GROUP_ID, WidgetID.FriendsChat.OWNER),
 	FRIENDS_CHAT_LIST(WidgetID.FRIENDS_CHAT_GROUP_ID, WidgetID.FriendsChat.LIST),
 
@@ -366,6 +368,7 @@ public enum WidgetInfo
 	CHATBOX_TAB_GAME(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TAB_GAME),
 	CHATBOX_TAB_PUBLIC(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TAB_PUBLIC),
 	CHATBOX_TAB_PRIVATE(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TAB_PRIVATE),
+	CHATBOX_TAB_CHANNEL(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TAB_CHANNEL),
 	CHATBOX_TAB_CLAN(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TAB_CLAN),
 	CHATBOX_TAB_TRADE(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TAB_TRADE),