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

runescape-api/src/main/java/net/runelite/rs/api/RSClient.java

@@ -1406,4 +1406,10 @@ public interface RSClient extends RSGameEngine, Client
 
 	@Construct
 	RSSceneTilePaint createSceneTilePaint(int swColor, int seColor, int neColor, int nwColor, int texture, int rgb, boolean isFlat);
+
+	@Import("crossWorldMessageIds")
+	long[] getCrossWorldMessageIds();
+
+	@Import("crossWorldMessageIdsIndex")
+	int getCrossWorldMessageIdsIndex();
 }

runescape-api/src/main/java/net/runelite/rs/api/RSPlayerComposition.java

@@ -9,7 +9,7 @@ public interface RSPlayerComposition extends PlayerComposition
 	boolean isFemale();
 
 	@Import("bodyColors")
-	int[] getBodyPartColours();
+	int[] getColors();
 
 	@Import("hash")
 	long getHash();