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

This commit is contained in:
ThatGamerBlue
2021-04-26 17:36:22 +01:00
28 changed files with 553 additions and 80 deletions

View File

@@ -101,6 +101,7 @@ public final class AnimationID
public static final int SMITHING_SMELTING = 899;
public static final int SMITHING_CANNONBALL = 827; //cball smithing uses this and SMITHING_SMELTING
public static final int SMITHING_ANVIL = 898;
public static final int SMITHING_IMCANDO_HAMMER = 8911;
public static final int FISHING_BIG_NET = 620;
public static final int FISHING_NET = 621;
public static final int FISHING_POLE_CAST = 623; // pole is in the water
@@ -205,6 +206,7 @@ public final class AnimationID
public static final int LEAGUE_HOME_TELEPORT_6 = 8807;
public static final int CONSTRUCTION = 3676;
public static final int CONSTRUCTION_IMCANDO = 8192;
public static final int SAND_COLLECTION = 895;
public static final int PISCARILIUS_CRANE_REPAIR = 7199;
public static final int HOME_MAKE_TABLET = 4067;

View File

@@ -2174,4 +2174,19 @@ public interface Client extends GameEngine
* use createBuffer to create a new byte buffer
*/
Buffer createBuffer(byte[] initialBytes);
/**
* Get the list of message ids for the recently received cross-world messages. The upper 32 bits of the
* id is the world id, the lower is a sequence number per-world.
*
* @return
*/
long[] getCrossWorldMessageIds();
/**
* Get the index of the next message to be inserted in the cross world message id list
*
* @return
*/
int getCrossWorldMessageIdsIndex();
}

View File

@@ -38,6 +38,13 @@ public interface PlayerComposition
*/
boolean isFemale();
/**
* Get the body part colors for this player composition.
*
* @return an array of the colors, always size 5
*/
int[] getColors();
/**
* Gets an array of IDs related to equipment slots.
* <p>

View File

@@ -433,7 +433,8 @@ public enum WidgetInfo
EXPERIENCE_TRACKER_WIDGET(WidgetID.EXPERIENCE_TRACKER_GROUP_ID, WidgetID.ExperienceTracker.WIDGET),
EXPERIENCE_TRACKER_BOTTOM_BAR(WidgetID.EXPERIENCE_TRACKER_GROUP_ID, WidgetID.ExperienceTracker.BOTTOM_BAR),
FISHING_TRAWLER_TIMER(WidgetID.FISHING_TRAWLER_GROUP_ID, 14),
FISHING_TRAWLER_CONTRIBUTION(WidgetID.FISHING_TRAWLER_GROUP_ID, 14),
FISHING_TRAWLER_TIMER(WidgetID.FISHING_TRAWLER_GROUP_ID, 15),
TITHE_FARM(WidgetID.TITHE_FARM_GROUP_ID, 3),