Merge remote-tracking branch 'runelite/master'

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

@@ -127,6 +127,23 @@ public interface Actor extends Entity, Locatable
 	 */
 	int getAnimation();
 
+	/**
+	 * Gets the secondary animation the actor is performing.
+	 *
+	 * @return the animation ID
+	 * @see AnimationID
+	 */
+	int getPoseAnimation();
+
+	/**
+	 * If this is equal to the pose animation, the pose animation is ignored when
+	 * you are doing another action.
+	 *
+	 * @return the animation ID
+	 * @see AnimationID
+	 */
+	int getIdlePoseAnimation();
+
 	/**
 	 * Sets an animation for the actor to perform.
 	 *
@@ -268,11 +285,4 @@ public interface Actor extends Entity, Locatable
 	int getWalkRightAnimation();
 
 	int getRunAnimation();
-
-	/**
-	 * This gets used for drawing the correct animation.
-	 *
-	 * The client moves one of the other animation fields into this field based off the actor's state
-	 */
-	int getMovementAnimation();
 }

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

@@ -69,11 +69,11 @@ public enum ChatMessageType
 	 */
 	MODPRIVATECHAT(7),
 	/**
-	 * A message received in clan chat.
+	 * A message received in friends chat.
 	 */
 	FRIENDSCHAT(9),
 	/**
-	 * A message received with information about the current clan chat.
+	 * A message received with information about the current friends chat.
 	 */
 	FRIENDSCHATNOTIFICATION(11),
 	/**
@@ -133,7 +133,7 @@ public enum ChatMessageType
 	 */
 	CHALREQ_TRADE(103),
 	/**
-	 * A message received when someone sends a clan challenge offer.
+	 * A message received when someone sends a friends chat challenge offer.
 	 */
 	CHALREQ_FRIENDSCHAT(104),
 	/**

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

@@ -1199,10 +1199,12 @@ public interface Client extends GameShell
 	boolean isFriended(String name, boolean mustBeLoggedIn);
 
 	/**
-	 * Retrieve the clan member manager
+	 * Retrieve the friends chat manager
+	 *
+	 * @return
 	 */
 	@Nullable
-	ClanMemberManager getClanMemberManager();
+	FriendsChatManager getFriendsChatManager();
 
 	/**
 	 * Retrieve the nameable container containing friends
@@ -1527,11 +1529,11 @@ public interface Client extends GameShell
 	void setFriendsHidden(boolean state);
 
 	/**
-	 * Sets whether or not clan mates are hidden.
+	 * Sets whether or not friends chat members are hidden.
 	 *
-	 * @param state the new clan mates hidden state
+	 * @param state the new friends chat member hidden state
 	 */
-	void setClanMatesHidden(boolean state);
+	void setFriendsChatMembersHidden(boolean state);
 
 	/**
 	 * Sets whether the local player is hidden.

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

@@ -24,22 +24,20 @@
  */
 package net.runelite.api;
 
-/**
- * Represents the friend and ignore list manager.
- */
-public interface ClanMemberManager extends NameableContainer<ClanMember>
+
+public interface FriendsChatManager extends NameableContainer<FriendsChatMember>
 {
 	/**
-	 * Gets the clan owner of the currently joined clan chat
+	 * Gets the owner of the currently joined friends chat
 	 *
 	 * @return
 	 */
-	String getClanOwner();
+	String getOwner();
 
 	/**
-	 * Gets the clan chat name of the currently joined clan chat
+	 * Gets the name of the currently joined friends chat
 	 *
 	 * @return
 	 */
-	String getClanChatName();
+	String getName();
 }

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

@@ -25,9 +25,9 @@
 package net.runelite.api;
 
 /**
- * Represents a clan member.
+ * Represents a friends chat member.
  */
-public interface ClanMember extends ChatPlayer
+public interface FriendsChatMember extends ChatPlayer
 {
 	/**
 	 * Gets the world the member is in.
@@ -37,9 +37,9 @@ public interface ClanMember extends ChatPlayer
 	int getWorld();
 
 	/**
-	 * Gets the rank of the clan member.
+	 * Gets the rank of the friends chat member.
 	 *
 	 * @return the rank
 	 */
-	ClanMemberRank getRank();
+	FriendsChatRank getRank();
 }

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

@@ -30,14 +30,14 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * An enumeration of ranks of clan members.
+ * An enumeration of ranks of friends chat members.
  */
 @AllArgsConstructor
 @Getter
-public enum ClanMemberRank
+public enum FriendsChatRank
 {
 	/**
-	 * Not in a clan.
+	 * Not ranked.
 	 */
 	UNRANKED(-1),
 	/**
@@ -77,30 +77,30 @@ public enum ClanMemberRank
 	 */
 	JMOD(127);
 
-	private static final Map<Integer, ClanMemberRank> RANKS = new HashMap<>();
+	private static final Map<Integer, FriendsChatRank> RANKS = new HashMap<>();
 
 	static
 	{
-		for (final ClanMemberRank clanMemberRank : ClanMemberRank.values())
+		for (final FriendsChatRank friendsChatRank : FriendsChatRank.values())
 		{
-			RANKS.put(clanMemberRank.value, clanMemberRank);
+			RANKS.put(friendsChatRank.value, friendsChatRank);
 		}
 	}
 
 	/**
 	 * Utility method that maps the rank value to its respective
-	 * {@link ClanMemberRank} value.
+	 * {@link FriendsChatRank} value.
 	 *
 	 * @param rank the rank value
 	 * @return rank type
 	 */
-	public static ClanMemberRank valueOf(int rank)
+	public static FriendsChatRank valueOf(int rank)
 	{
 		return RANKS.get(rank);
 	}
 
 	/**
-	 * The value of the clan rank.
+	 * The value of the rank.
 	 */
 	private final int value;
 }

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

@@ -284,6 +284,10 @@ public enum MenuOpcode
 	 * a player and have its identifier set to a player index.
 	 */
 	RUNELITE_PLAYER(1503),
+	/**
+	 * Menu action for InfoBox menu entries
+	 */
+	RUNELITE_INFOBOX(1504),
 
 	FOLLOW(2046),
 	TRADE(2047),

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

@@ -58,7 +58,7 @@ public interface MessageNode extends Node
 	void setName(String name);
 
 	/**
-	 * Gets the sender of the message (ie. clan name).
+	 * Gets the sender of the message (ie. friends chat name).
 	 *
 	 * @return the message sender
 	 */

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

@@ -60,12 +60,12 @@ public interface Player extends Actor
 	int getTeam();
 
 	/**
-	 * Checks whether this player is a member of the same clan as
+	 * Checks whether this player is a member of the same friends chat
 	 * the local player.
 	 *
-	 * @return true if the player is a clan member, false otherwise
+	 * @return true if the player is a friends chat member, false otherwise
 	 */
-	boolean isClanMember();
+	boolean isFriendsChatMember();
 
 	/**
 	 * Checks whether this player is a friend of the local player.

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

@@ -219,13 +219,13 @@ public final class ScriptID
 	public static final int PUBLICMSG = 13337;
 
 	/**
-	 * Attempts to kick the specified player from the Clan Chat
+	 * Attempts to kick the specified player from the friends chat
 	 * <ul>
 	 * <li>String Players in-game name</li>
 	 * </ul>
 	 */
 	@ScriptArguments(string = 1)
-	public static final int CLAN_SEND_KICK = 215;
+	public static final int FRIENDS_CHAT_SEND_KICK = 215;
 
 	/**
 	 * Toggles the bank search
@@ -248,10 +248,10 @@ public final class ScriptID
 	public static final int DEATH_KEEP_BUILD = 1601;
 
 	/**
-	 * Builds the widget that holds all of the players inside a clan chat
+	 * Builds the widget that holds all of the players inside a friends chat
 	 */
 	@ScriptArguments(integer = 15)
-	public static final int CLAN_CHAT_CHANNEL_BUILD = 1658;
+	public static final int FRIENDS_CHAT_CHANNEL_REBUILD = 1658;
 
 	/**
 	 * Builds the widget for making an offer in Grand Exchange

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

@@ -776,7 +776,7 @@ public final class SpriteID
 	public static final int RS2_TAB_EQUIPMENT = 778;
 	public static final int RS2_TAB_PRAYER = 779;
 	public static final int TAB_MAGIC = 780;
-	public static final int RS2_TAB_CLAN_CHAT = 781;
+	public static final int RS2_TAB_FRIENDS_CHAT = 781;
 	public static final int TAB_FRIENDS = 782;
 	public static final int TAB_IGNORES = 783;
 	public static final int RS2_TAB_LOGOUT = 784;
@@ -888,7 +888,7 @@ public final class SpriteID
 	public static final int TAB_EQUIPMENT = 901;
 	public static final int TAB_PRAYER = 902;
 	public static final int UNUSED_TAB_MAGIC_903 = 903;
-	public static final int TAB_CLAN_CHAT = 904;
+	public static final int TAB_FRIENDS_CHAT = 904;
 	public static final int TAB_LOGOUT = 907;
 	public static final int TAB_OPTIONS = 908;
 	public static final int TAB_EMOTES = 909;
@@ -977,15 +977,15 @@ public final class SpriteID
 	public static final int STASH_UNITS_SLANTED_TAB_EDGE_LEFT_HOVERED = 1001;
 	public static final int STASH_UNITS_SLANTED_TAB_MIDDLE_HOVERED = 1002;
 	public static final int STASH_UNITS_SLANTED_TAB_EDGE_RIGHT_HOVERED = 1003;
-	public static final int CLAN_CHAT_RANK_SMILEY_FRIEND = 1004;
-	public static final int CLAN_CHAT_RANK_CROWN_JAGEX_MODERATOR = 1005;
-	public static final int CLAN_CHAT_RANK_KEY_CHANNEL_OWNER = 1006;
-	public static final int CLAN_CHAT_RANK_GOLD_STAR_GENERAL = 1007;
-	public static final int CLAN_CHAT_RANK_SILVER_STAR_CAPTAIN = 1008;
-	public static final int CLAN_CHAT_RANK_BRONZE_STAR_LIEUTENANT = 1009;
-	public static final int CLAN_CHAT_RANK_TRIPLE_CHEVRON_SERGEANT = 1010;
-	public static final int CLAN_CHAT_RANK_DOUBLE_CHEVRON_CORPORAL = 1011;
-	public static final int CLAN_CHAT_RANK_SINGLE_CHEVRON_RECRUIT = 1012;
+	public static final int FRIENDS_CHAT_RANK_SMILEY_FRIEND = 1004;
+	public static final int FRIENDS_CHAT_RANK_CROWN_JAGEX_MODERATOR = 1005;
+	public static final int FRIENDS_CHAT_RANK_KEY_CHANNEL_OWNER = 1006;
+	public static final int FRIENDS_CHAT_RANK_GOLD_STAR_GENERAL = 1007;
+	public static final int FRIENDS_CHAT_RANK_SILVER_STAR_CAPTAIN = 1008;
+	public static final int FRIENDS_CHAT_RANK_BRONZE_STAR_LIEUTENANT = 1009;
+	public static final int FRIENDS_CHAT_RANK_TRIPLE_CHEVRON_SERGEANT = 1010;
+	public static final int FRIENDS_CHAT_RANK_DOUBLE_CHEVRON_CORPORAL = 1011;
+	public static final int FRIENDS_CHAT_RANK_SINGLE_CHEVRON_RECRUIT = 1012;
 	public static final int UNKNOWN_BUTTON_METAL_CORNERS = 1013;
 	public static final int UNKNOWN_BUTTON_METAL_CORNERS_HOVERED = 1014;
 	public static final int UNKNOWN_SLANTED_TAB_LONG = 1015;
@@ -1017,7 +1017,7 @@ public final class SpriteID
 	public static final int BANK_DEPOSIT_INVENTORY = 1041;
 	public static final int BANK_DEPOSIT_EQUIPMENT = 1042;
 	public static final int BANK_SEARCH = 1043;
-	public static final int MINIMAP_MARKER_PURPLE_PLAYER_CLAN_CHAT = 1044;
+	public static final int MINIMAP_MARKER_PURPLE_PLAYER_FRIENDS_CHAT = 1044;
 	public static final int OPTIONS_PROFANITY_FILTER = 1045;
 	public static final int PLAYER_KILLER_SKULL_1046 = 1046;
 	public static final int PLAYER_KILLING_DISABLED_OVERLAY = 1047;

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

@@ -42,7 +42,7 @@ public enum VarClientStr
 	CHATBOX_TYPED_TEXT(335),
 	INPUT_TEXT(359),
 	PRIVATE_MESSAGE_TARGET(360),
-	RECENT_CLAN_CHAT(362);
+	RECENT_FRIENDS_CHAT(362);
 
 	private final int index;
 }

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

@@ -64,11 +64,11 @@ public enum VarPlayer
 	/**
 	 * The ID of the party. This Var is only set in the raid bank area and the raid lobby
 	 *
-	 * This gets set to -1 when the raid starts. This is first set when the first player of the clan forms a party
+	 * This gets set to -1 when the raid starts. This is first set when the first player of the friends chat forms a party
 	 * on the recruiting board and it changes again when the first person actually enters the raid.
 	 *
 	 * -1 : Not in a party or in the middle of an ongoing raid
-	 * Anything else : This means that your clan has a raid party being formed and has not started yet
+	 * Anything else : This means that your friends chat has a raid party being formed and has not started yet
 	 */
 	IN_RAID_PARTY(1427),
 

runelite-api/src/main/java/net/runelite/api/events/CannonChanged.java

@@ -37,10 +37,10 @@ public class CannonChanged implements Event
 	 * The projectile id.
 	 */
 	@Nullable
-	private final Integer cannonballId;
+	Integer cannonballId;
 
 	/**
 	 * The amount of cannonballs left.
 	 */
-	private final int cannonballs;
+	int cannonballs;
 }

runelite-api/src/main/java/net/runelite/api/events/CannonPlaced.java

@@ -38,17 +38,17 @@ public class CannonPlaced implements Event
 	/**
 	 * Cannon placed or picked up.
 	 */
-	private final boolean placed;
+	boolean placed;
 
 	/**
 	 * The location of the cannon.
 	 */
 	@Nullable
-	private final WorldPoint cannonLocation;
+	WorldPoint cannonLocation;
 
 	/**
 	 * The cannon object.
 	 */
 	@Nullable
-	private final GameObject cannon;
+	GameObject cannon;
 }

runelite-api/src/main/java/net/runelite/api/events/ChatMessage.java

@@ -62,8 +62,8 @@ public class ChatMessage implements Event
 	/**
 	 * The sender of the message.
 	 * <p>
-	 * This field is only used for clan messages and refers to the
-	 * current name of the clan chat the client is in.
+	 * This field is only used for friends chat messages and refers to the
+	 * current name of the friends chat the client is in.
 	 */
 	private String sender;
 	/**

runelite-api/src/main/java/net/runelite/api/events/CommandExecuted.java

@@ -47,9 +47,9 @@ public class CommandExecuted implements Event
 	/**
 	 * The name of the command entered.
 	 */
-	private String command;
+	String command;
 	/**
 	 * The command arguments that have been entered.
 	 */
-	private String[] arguments;
+	String[] arguments;
 }

runelite-api/src/main/java/net/runelite/api/events/FakeXpDrop.java

@@ -30,6 +30,6 @@ import net.runelite.api.Skill;
 @Value
 public class FakeXpDrop implements Event
 {
-	private final Skill skill;
-	private final int xp;
+	Skill skill;
+	int xp;
 }

runelite-api/src/main/java/net/runelite/api/events/FriendAdded.java

@@ -11,5 +11,5 @@ public class FriendAdded implements Event
 	/**
 	 * The name of the added friend.
 	 */
-	private final String name;
+	String name;
 }

runelite-api/src/main/java/net/runelite/api/events/FriendRemoved.java

@@ -35,5 +35,5 @@ public class FriendRemoved implements Event
 	/**
 	 * The name of the removed friend.
 	 */
-	private final String name;
+	String name;
 }

runelite-api/src/main/java/net/runelite/api/events/FriendsChatChanged.java

@@ -27,13 +27,13 @@ package net.runelite.api.events;
 import lombok.Value;
 
 /**
- * An event where the client has joined or left a clan chat.
+ * An event where the client has joined or left a friends chat.
  */
 @Value
-public class ClanChanged implements Event
+public class FriendsChatChanged implements Event
 {
 	/**
-	 * Whether or not the client is now in a clan chat.
+	 * Whether or not the client is now in a friends chat.
 	 */
-	private boolean joined;
+	boolean joined;
 }

runelite-api/src/main/java/net/runelite/api/events/FriendsChatMemberJoined.java

@@ -24,14 +24,14 @@
  */
 package net.runelite.api.events;
 
-import net.runelite.api.ClanMember;
 import lombok.Value;
+import net.runelite.api.FriendsChatMember;
 
 @Value
-public class ClanMemberJoined implements Event
+public class FriendsChatMemberJoined implements Event
 {
 	/**
-	 * The ClanMember that joined
+	 * The member that joined
 	 */
-	private ClanMember member;
+	FriendsChatMember member;
 }

runelite-api/src/main/java/net/runelite/api/events/FriendsChatMemberLeft.java

@@ -24,14 +24,14 @@
  */
 package net.runelite.api.events;
 
-import net.runelite.api.ClanMember;
 import lombok.Value;
+import net.runelite.api.FriendsChatMember;
 
 @Value
-public class ClanMemberLeft implements Event
+public class FriendsChatMemberLeft implements Event
 {
 	/**
-	 * The ClanMember that left
+	 * The member that left
 	 */
-	private ClanMember member;
+	FriendsChatMember member;
 }

runelite-api/src/main/java/net/runelite/api/events/GraphicsObjectCreated.java

@@ -36,5 +36,5 @@ public class GraphicsObjectCreated implements Event
 	/**
 	 * The newly created graphics object.
 	 */
-	private final GraphicsObject graphicsObject;
+	GraphicsObject graphicsObject;
 }

runelite-api/src/main/java/net/runelite/api/events/InteractingChanged.java

@@ -9,10 +9,10 @@ import lombok.Value;
 @Value
 public class InteractingChanged implements Event
 {
-	private final Actor source;
+	Actor source;
 
 	/**
 	 * Target actor, may be null
 	 */
-	private final Actor target;
+	Actor target;
 }

runelite-api/src/main/java/net/runelite/api/events/ItemContainerChanged.java

@@ -44,10 +44,10 @@ public class ItemContainerChanged implements Event
 	/**
 	 * The modified container's ID.
 	 */
-	private final int containerId;
+	int containerId;
 
 	/**
 	 * The modified item container.
 	 */
-	private final ItemContainer itemContainer;
+	ItemContainer itemContainer;
 }

runelite-api/src/main/java/net/runelite/api/events/ItemDespawned.java

@@ -36,6 +36,6 @@ import lombok.Value;
 @Value
 public class ItemDespawned implements Event
 {
-	private final Tile tile;
-	private final TileItem item;
+	Tile tile;
+	TileItem item;
 }

runelite-api/src/main/java/net/runelite/api/events/ItemQuantityChanged.java

@@ -35,8 +35,8 @@ import lombok.Value;
 @Value
 public class ItemQuantityChanged implements Event
 {
-	private final TileItem item;
-	private final Tile tile;
-	private final int oldQuantity;
-	private final int newQuantity;
+	TileItem item;
+	Tile tile;
+	int oldQuantity;
+	int newQuantity;
 }

runelite-api/src/main/java/net/runelite/api/events/ItemSpawned.java

@@ -36,6 +36,6 @@ import lombok.Value;
 @Value
 public class ItemSpawned implements Event
 {
-	private final Tile tile;
-	private final TileItem item;
+	Tile tile;
+	TileItem item;
 }

runelite-api/src/main/java/net/runelite/api/events/NameableNameChanged.java

@@ -36,5 +36,5 @@ public class NameableNameChanged implements Event
 	/**
 	 * The nameable that changed names.
 	 */
-	private final Nameable nameable;
+	Nameable nameable;
 }

runelite-api/src/main/java/net/runelite/api/events/NpcDefinitionChanged.java

@@ -36,5 +36,5 @@ public class NpcDefinitionChanged implements Event
 	/**
 	 * The NPC of which the composition changed.
 	 */
-	private final NPC npc;
+	NPC npc;
 }

runelite-api/src/main/java/net/runelite/api/events/NpcDespawned.java

@@ -37,7 +37,7 @@ public class NpcDespawned implements Event
 	/**
 	 * The despawned NPC.
 	 */
-	private final NPC npc;
+	NPC npc;
 
 	public Actor getActor()
 	{

runelite-api/src/main/java/net/runelite/api/events/NpcSpawned.java

@@ -37,7 +37,7 @@ public class NpcSpawned implements Event
 	/**
 	 * The spawned NPC.
 	 */
-	private final NPC npc;
+	NPC npc;
 
 	public Actor getActor()
 	{

runelite-api/src/main/java/net/runelite/api/events/OverheadTextChanged.java

@@ -6,7 +6,7 @@ import lombok.Value;
 @Value
 public class OverheadTextChanged implements Event
 {
-	private final Actor actor;
+	Actor actor;
 
-	private final String overheadText;
+	String overheadText;
 }

runelite-api/src/main/java/net/runelite/api/events/PlayerAppearanceChanged.java

@@ -9,5 +9,5 @@ import net.runelite.api.Player;
 @Value
 public class PlayerAppearanceChanged implements Event
 {
-	private Player player;
+	Player player;
 }

runelite-api/src/main/java/net/runelite/api/events/PlayerDeath.java

@@ -33,5 +33,5 @@ import net.runelite.api.Player;
 @Value
 public class PlayerDeath implements Event
 {
-	private final Player player;
+	Player player;
 }

runelite-api/src/main/java/net/runelite/api/events/PlayerDespawned.java

@@ -39,7 +39,7 @@ public class PlayerDespawned implements Event
 	/**
 	 * The despawned player.
 	 */
-	private final Player player;
+	Player player;
 
 	public Actor getActor()
 	{

runelite-api/src/main/java/net/runelite/api/events/PlayerSpawned.java

@@ -37,7 +37,7 @@ public class PlayerSpawned implements Event
 	/**
 	 * The spawned player.
 	 */
-	private final Player player;
+	Player player;
 
 	public Actor getActor()
 	{

runelite-api/src/main/java/net/runelite/api/events/ScriptPostFired.java

@@ -35,5 +35,5 @@ public class ScriptPostFired implements Event
 	/**
 	 * The script id of the invoked script
 	 */
-	private final int scriptId;
+	int scriptId;
 }

runelite-api/src/main/java/net/runelite/api/events/StatChanged.java

@@ -33,8 +33,8 @@ import net.runelite.api.Skill;
 @Value
 public class StatChanged implements Event
 {
-	private final Skill skill;
-	private final int xp;
-	private final int level;
-	private final int boostedLevel;
+	Skill skill;
+	int xp;
+	int level;
+	int boostedLevel;
 }

runelite-api/src/main/java/net/runelite/api/events/VarClientIntChanged.java

@@ -34,5 +34,5 @@ import lombok.Value;
 @Value
 public class VarClientIntChanged implements Event
 {
-	private int index;
+	int index;
 }

runelite-api/src/main/java/net/runelite/api/events/VarClientStrChanged.java

@@ -34,5 +34,5 @@ import lombok.Value;
 @Value
 public class VarClientStrChanged implements Event
 {
-	private int index;
+	int index;
 }

runelite-api/src/main/java/net/runelite/api/events/VolumeChanged.java

@@ -37,5 +37,5 @@ public class VolumeChanged implements Event
 		AREA
 	}
 
-	private final Type type;
+	Type type;
 }

runelite-api/src/main/java/net/runelite/api/events/WorldListLoad.java

@@ -33,5 +33,5 @@ import lombok.Value;
 @Value
 public class WorldListLoad implements Event
 {
-	private final World[] worlds;
+	World[] worlds;
 }

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

@@ -61,7 +61,7 @@ public class WidgetID
 	public static final int PEST_CONTROL_GROUP_ID = 408;
 	public static final int PEST_CONTROL_EXCHANGE_WINDOW_GROUP_ID = 243;
 	public static final int DIALOG_MINIGAME_GROUP_ID = 229;
-	public static final int CLAN_CHAT_GROUP_ID = 7;
+	public static final int FRIENDS_CHAT_GROUP_ID = 7;
 	public static final int MINIMAP_GROUP_ID = 160;
 	public static final int LOGIN_CLICK_TO_PLAY_GROUP_ID = 378;
 	public static final int CLUE_SCROLL_GROUP_ID = 203;
@@ -300,7 +300,7 @@ public class WidgetID
 		static final int PREVIOUS_NAME_HOLDER = 16;
 	}
 
-	static class ClanChat
+	static class FriendsChat
 	{
 		static final int TITLE = 1;
 		static final int NAME = 4;
@@ -469,14 +469,14 @@ public class WidgetID
 		static final int MINIMAP_DRAW_AREA = 8;
 		static final int MULTICOMBAT_INDICATOR = 21;
 		static final int BANK_PIN = 22;
-		static final int CLAN_CHAT_TAB = 33;
+		static final int FRIENDS_CHAT_TAB = 33;
 		static final int FRIENDS_TAB = 35;
 		static final int IGNORES_TAB = 34;
 		static final int LOGOUT_TAB = 36;
 		static final int OPTIONS_TAB = 37;
 		static final int EMOTES_TAB = 38;
 		static final int MUSIC_TAB = 39;
-		static final int CLAN_CHAT_ICON = 40;
+		static final int FRIENDS_CHAT_ICON = 40;
 		static final int FRIENDS_ICON = 42;
 		static final int IGNORES_ICON = 41;
 		static final int LOGOUT_ICON = 43;
@@ -508,14 +508,14 @@ public class WidgetID
 		static final int ITEMS_KEPT_ON_DEATH = 13;
 		static final int BANK_PIN = 13;
 		static final int MULTICOMBAT_INDICATOR = 17;
-		static final int CLAN_CHAT_TAB = 37;
+		static final int FRIENDS_CHAT_TAB = 37;
 		static final int FRIENDS_TAB = 39;
 		static final int IGNORES_TAB = 38;
 		static final int LOGOUT_TAB = 40;
 		static final int OPTIONS_TAB = 41;
 		static final int EMOTES_TAB = 42;
 		static final int MUSIC_TAB = 43;
-		static final int CLAN_CHAT_ICON = 44;
+		static final int FRIENDS_CHAT_ICON = 44;
 		static final int FRIENDS_ICON = 46;
 		static final int IGNORES_ICON = 45;
 		static final int LOGOUT_ICON = 47;

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

@@ -46,7 +46,7 @@ public enum WidgetInfo
 	INVENTORY(WidgetID.INVENTORY_GROUP_ID, 0),
 	FRIENDS_LIST(WidgetID.FRIENDS_LIST_GROUP_ID, 0),
 	IGNORE_LIST(WidgetID.IGNORE_LIST_GROUP_ID, 0),
-	CLAN_CHAT(WidgetID.CLAN_CHAT_GROUP_ID, 0),
+	FRIENDS_CHAT(WidgetID.FRIENDS_CHAT_GROUP_ID, 0),
 	RAIDING_PARTY(WidgetID.RAIDING_PARTY_GROUP_ID, 0),
 
 	WORLD_MAP_VIEW(WidgetID.WORLD_MAP_GROUP_ID, WidgetID.WorldMap.MAPVIEW),
@@ -144,10 +144,10 @@ public enum WidgetInfo
 
 	EXPLORERS_RING_ALCH_INVENTORY(WidgetID.EXPLORERS_RING_ALCH_GROUP_ID, WidgetID.ExplorersRing.INVENTORY),
 
-	CLAN_CHAT_TITLE(WidgetID.CLAN_CHAT_GROUP_ID, WidgetID.ClanChat.TITLE),
-	CLAN_CHAT_NAME(WidgetID.CLAN_CHAT_GROUP_ID, WidgetID.ClanChat.NAME),
-	CLAN_CHAT_OWNER(WidgetID.CLAN_CHAT_GROUP_ID, WidgetID.ClanChat.OWNER),
-	CLAN_CHAT_LIST(WidgetID.CLAN_CHAT_GROUP_ID, WidgetID.ClanChat.LIST),
+	FRIENDS_CHAT_TITLE(WidgetID.FRIENDS_CHAT_GROUP_ID, WidgetID.FriendsChat.TITLE),
+	FRIENDS_CHAT_NAME(WidgetID.FRIENDS_CHAT_GROUP_ID, WidgetID.FriendsChat.NAME),
+	FRIENDS_CHAT_OWNER(WidgetID.FRIENDS_CHAT_GROUP_ID, WidgetID.FriendsChat.OWNER),
+	FRIENDS_CHAT_LIST(WidgetID.FRIENDS_CHAT_GROUP_ID, WidgetID.FriendsChat.LIST),
 
 	BANK_CONTAINER(WidgetID.BANK_GROUP_ID, WidgetID.Bank.BANK_CONTAINER),
 	BANK_SEARCH_BUTTON_BACKGROUND(WidgetID.BANK_GROUP_ID, WidgetID.Bank.SEARCH_BUTTON_BACKGROUND),
@@ -246,7 +246,7 @@ public enum WidgetInfo
 	FIXED_VIEWPORT_EQUIPMENT_TAB(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.EQUIPMENT_TAB),
 	FIXED_VIEWPORT_PRAYER_TAB(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.PRAYER_TAB),
 	FIXED_VIEWPORT_MAGIC_TAB(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.MAGIC_TAB),
-	FIXED_VIEWPORT_CLAN_CHAT_TAB(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.CLAN_CHAT_TAB),
+	FIXED_VIEWPORT_FRIENDS_CHAT_TAB(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.FRIENDS_CHAT_TAB),
 	FIXED_VIEWPORT_FRIENDS_TAB(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.FRIENDS_TAB),
 	FIXED_VIEWPORT_IGNORES_TAB(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.IGNORES_TAB),
 	FIXED_VIEWPORT_LOGOUT_TAB(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.LOGOUT_TAB),
@@ -260,7 +260,7 @@ public enum WidgetInfo
 	FIXED_VIEWPORT_EQUIPMENT_ICON(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.EQUIPMENT_ICON),
 	FIXED_VIEWPORT_PRAYER_ICON(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.PRAYER_ICON),
 	FIXED_VIEWPORT_MAGIC_ICON(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.MAGIC_ICON),
-	FIXED_VIEWPORT_CLAN_CHAT_ICON(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.CLAN_CHAT_ICON),
+	FIXED_VIEWPORT_FRIENDS_CHAT_ICON(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.FRIENDS_CHAT_ICON),
 	FIXED_VIEWPORT_FRIENDS_ICON(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.FRIENDS_ICON),
 	FIXED_VIEWPORT_IGNORES_ICON(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.IGNORES_ICON),
 	FIXED_VIEWPORT_LOGOUT_ICON(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.LOGOUT_ICON),
@@ -291,7 +291,7 @@ public enum WidgetInfo
 	RESIZABLE_VIEWPORT_EQUIPMENT_TAB(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.EQUIPMENT_TAB),
 	RESIZABLE_VIEWPORT_PRAYER_TAB(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.PRAYER_TAB),
 	RESIZABLE_VIEWPORT_MAGIC_TAB(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.MAGIC_TAB),
-	RESIZABLE_VIEWPORT_CLAN_CHAT_TAB(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.CLAN_CHAT_TAB),
+	RESIZABLE_VIEWPORT_FRIENDS_CHAT_TAB(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.FRIENDS_CHAT_TAB),
 	RESIZABLE_VIEWPORT_FRIENDS_TAB(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.FRIENDS_TAB),
 	RESIZABLE_VIEWPORT_IGNORES_TAB(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.IGNORES_TAB),
 	RESIZABLE_VIEWPORT_LOGOUT_TAB(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.LOGOUT_TAB),
@@ -305,7 +305,7 @@ public enum WidgetInfo
 	RESIZABLE_VIEWPORT_EQUIPMENT_ICON(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.EQUIPMENT_ICON),
 	RESIZABLE_VIEWPORT_PRAYER_ICON(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.PRAYER_ICON),
 	RESIZABLE_VIEWPORT_MAGIC_ICON(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.MAGIC_ICON),
-	RESIZABLE_VIEWPORT_CLAN_CHAT_ICON(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.CLAN_CHAT_ICON),
+	RESIZABLE_VIEWPORT_FRIENDS_CHAT_ICON(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.FRIENDS_CHAT_ICON),
 	RESIZABLE_VIEWPORT_FRIENDS_ICON(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.FRIENDS_ICON),
 	RESIZABLE_VIEWPORT_IGNORES_ICON(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.IGNORES_ICON),
 	RESIZABLE_VIEWPORT_LOGOUT_ICON(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.LOGOUT_ICON),