Merge remote-tracking branch 'runelite/master'

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

@@ -173,9 +173,9 @@ public enum ChatMessageType
 	 */
 	CLAN_CREATION_INVITATION(109),
 	/**
-	 * Clan wars challenge for clans rather than FCs
+	 * Challenge offer for the clan tab
 	 */
-	CLAN_CLAN_WARS_CHALLENGE(110),
+	CHALREQ_CLANCHAT(110),
 
 	CLAN_GIM_FORM_GROUP(111),
 	CLAN_GIM_GROUP_WITH(112),

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

@@ -205,7 +205,38 @@ public enum VarPlayer
 	/**
 	 * {@link NpcID} for the HP HUD
 	 */
-	HP_HUD_NPC_ID(1683);
+	HP_HUD_NPC_ID(1683),
+
+	/**
+	 * Colors for chat messages
+	 */
+	SETTINGS_OPAQUE_CHAT_PUBLIC(2992),
+	SETTINGS_OPAQUE_CHAT_PRIVATE(2993),
+	SETTINGS_OPAQUE_CHAT_AUTO(2994),
+	SETTINGS_OPAQUE_CHAT_BROADCAST(2995),
+	SETTINGS_OPAQUE_CHAT_FRIEND(2996),
+	SETTINGS_OPAQUE_CHAT_CLAN(2997),
+	SETTINGS_OPAQUE_CHAT_GUEST_CLAN(3060),
+	SETTINGS_OPAQUE_CHAT_CLAN_BROADCAST(3192),
+	SETTINGS_OPAQUE_CHAT_IRON_GROUP_CHAT(3191),
+	SETTINGS_OPAQUE_CHAT_IRON_GROUP_BROADCAST(3193),
+	SETTINGS_OPAQUE_CHAT_TRADE_REQUEST(2998),
+	SETTINGS_OPAQUE_CHAT_CHALLENGE_REQUEST(2999),
+
+	SETTINGS_TRANSPARENT_CHAT_PUBLIC(3000),
+	SETTINGS_TRANSPARENT_CHAT_PRIVATE(3001),
+	SETTINGS_TRANSPARENT_CHAT_AUTO(3002),
+	SETTINGS_TRANSPARENT_CHAT_BROADCAST(3003),
+	SETTINGS_TRANSPARENT_CHAT_FRIEND(3004),
+	SETTINGS_TRANSPARENT_CHAT_CLAN(3005),
+	SETTINGS_TRANSPARENT_CHAT_GUEST_CLAN(3061),
+	SETTINGS_TRANSPARENT_CHAT_CLAN_BROADCAST(3195),
+	SETTINGS_TRANSPARENT_CHAT_IRON_GROUP_CHAT(3194),
+	SETTINGS_TRANSPARENT_CHAT_IRON_GROUP_BROADCAST(3196),
+	SETTINGS_TRANSPARENT_CHAT_TRADE_REQUEST(3006),
+	SETTINGS_TRANSPARENT_CHAT_CHALLENGE_REQUEST(3007),
+
+	;
 
 	private final int id;
 }

runelite-api/src/main/java/net/runelite/api/clan/ClanMember.java

@@ -24,21 +24,18 @@
  */
 package net.runelite.api.clan;
 
-import lombok.Value;
-
 /**
  * A member of a clan.
  */
-@Value
-public class ClanMember
+public interface ClanMember
 {
 	/**
 	 * The clan member's name
 	 */
-	String name;
+	String getName();
 
 	/**
 	 * The clan member's rank
 	 */
-	ClanRank rank;
+	ClanRank getRank();
 }