diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java index c460d07ef4..8b955ca420 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -11325,5 +11325,34 @@ public final class ItemID public static final int BOUNTY_HUNTER_HAT_TIER_4 = 24344; public static final int BOUNTY_HUNTER_HAT_TIER_5 = 24346; public static final int BOUNTY_HUNTER_HAT_TIER_6 = 24348; + public static final int SCROLL_BOX_BEGINNER = 24361; + public static final int SCROLL_BOX_EASY = 24362; + public static final int SCROLL_BOX_MEDIUM = 24363; + public static final int SCROLL_BOX_HARD = 24364; + public static final int SCROLL_BOX_ELITE = 24365; + public static final int SCROLL_BOX_MASTER = 24366; + public static final int CABBAGE_24367 = 24367; + public static final int TWISTED_SLAYER_HELMET = 24370; + public static final int TWISTED_LEAGUE_DRAGON_TROPHY = 24372; + public static final int TWISTED_LEAGUE_RUNE_TROPHY = 24374; + public static final int TWISTED_LEAGUE_ADAMANT_TROPHY = 24376; + public static final int TWISTED_LEAGUE_MITHRIL_TROPHY = 24378; + public static final int TWISTED_LEAGUE_STEEL_TROPHY = 24380; + public static final int TWISTED_LEAGUE_IRON_TROPHY = 24382; + public static final int TWISTED_LEAGUE_BRONZE_TROPHY = 24384; + public static final int TWISTED_HAT_T3 = 24387; + public static final int TWISTED_COAT_T3 = 24389; + public static final int TWISTED_TROUSERS_T3 = 24391; + public static final int TWISTED_BOOTS_T3 = 24393; + public static final int TWISTED_CANE = 24395; + public static final int TWISTED_HAT_T2 = 24397; + public static final int TWISTED_COAT_T2 = 24399; + public static final int TWISTED_TROUSERS_T2 = 24401; + public static final int TWISTED_BOOTS_T2 = 24403; + public static final int TWISTED_HAT_T1 = 24405; + public static final int TWISTED_COAT_T1 = 24407; + public static final int TWISTED_TROUSERS_T1 = 24409; + public static final int TWISTED_BOOTS_T1 = 24411; + public static final int TWISTED_LEAGUE_BANNER = 24413; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index fac80584cc..c40eac4e49 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -308,7 +308,8 @@ public final class NpcID public static final int FROG = 312; public static final int REACHER_313 = 313; public static final int DR_JEKYLL_314 = 314; - public static final int PAUL = 317; + public static final int LEAGUES_TUTOR = 315; + public static final int LEAGUES_TUTOR_316 = 316; public static final int DARK_CORE = 318; public static final int CORPOREAL_BEAST = 319; public static final int DARK_ENERGY_CORE = 320; @@ -7160,6 +7161,7 @@ public final class NpcID public static final int REVENANT_DARK_BEAST = 7938; public static final int REVENANT_KNIGHT = 7939; public static final int REVENANT_DRAGON = 7940; + public static final int PAUL = 7941; public static final int EMBLEM_TRADER_7943 = 7943; public static final int FISHING_SPOT_7946 = 7946; public static final int FISHING_SPOT_7947 = 7947; diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java index f5a405debc..91f4b15a8d 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -12814,5 +12814,41 @@ public final class NullItemID public static final int NULL_24345 = 24345; public static final int NULL_24347 = 24347; public static final int NULL_24349 = 24349; + public static final int NULL_24350 = 24350; + public static final int NULL_24351 = 24351; + public static final int NULL_24352 = 24352; + public static final int NULL_24353 = 24353; + public static final int NULL_24354 = 24354; + public static final int NULL_24355 = 24355; + public static final int NULL_24356 = 24356; + public static final int NULL_24357 = 24357; + public static final int NULL_24358 = 24358; + public static final int NULL_24359 = 24359; + public static final int NULL_24360 = 24360; + public static final int NULL_24368 = 24368; + public static final int NULL_24369 = 24369; + public static final int NULL_24371 = 24371; + public static final int NULL_24373 = 24373; + public static final int NULL_24375 = 24375; + public static final int NULL_24377 = 24377; + public static final int NULL_24379 = 24379; + public static final int NULL_24381 = 24381; + public static final int NULL_24383 = 24383; + public static final int NULL_24385 = 24385; + public static final int NULL_24386 = 24386; + public static final int NULL_24388 = 24388; + public static final int NULL_24390 = 24390; + public static final int NULL_24392 = 24392; + public static final int NULL_24394 = 24394; + public static final int NULL_24396 = 24396; + public static final int NULL_24398 = 24398; + public static final int NULL_24400 = 24400; + public static final int NULL_24402 = 24402; + public static final int NULL_24404 = 24404; + public static final int NULL_24406 = 24406; + public static final int NULL_24408 = 24408; + public static final int NULL_24410 = 24410; + public static final int NULL_24412 = 24412; + public static final int NULL_24414 = 24414; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java index feaf84d503..86b6e4a5bd 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -18041,6 +18041,8 @@ public final class NullObjectID public static final int NULL_37436 = 37436; public static final int NULL_37437 = 37437; public static final int NULL_37438 = 37438; + public static final int NULL_37439 = 37439; + public static final int NULL_37440 = 37440; public static final int NULL_37446 = 37446; public static final int NULL_37447 = 37447; public static final int NULL_37448 = 37448; @@ -18052,5 +18054,21 @@ public final class NullObjectID public static final int NULL_37455 = 37455; public static final int NULL_37456 = 37456; public static final int NULL_37457 = 37457; + public static final int NULL_37467 = 37467; + public static final int NULL_37468 = 37468; + public static final int NULL_37469 = 37469; + public static final int NULL_37470 = 37470; + public static final int NULL_37471 = 37471; + public static final int NULL_37472 = 37472; + public static final int NULL_37473 = 37473; + public static final int NULL_37474 = 37474; + public static final int NULL_37475 = 37475; + public static final int NULL_37476 = 37476; + public static final int NULL_37477 = 37477; + public static final int NULL_37478 = 37478; + public static final int NULL_37479 = 37479; + public static final int NULL_37480 = 37480; + public static final int NULL_37481 = 37481; + public static final int NULL_37490 = 37490; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java index 1b3e52cf3b..3eaebb674f 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -19385,7 +19385,28 @@ public final class ObjectID public static final int ROUGH_WALL_37431 = 37431; public static final int STREAK_INFO = 37434; public static final int SWAMPY_SINK = 37435; + public static final int SHUTTERED_WINDOW_37441 = 37441; + public static final int DECORATIVE_WINDOW_37442 = 37442; + public static final int STAINEDGLASS_WINDOW_37443 = 37443; public static final int LOG_PILE_37444 = 37444; public static final int HOTSPOT_MARKER = 37445; + public static final int DECORATIVE_WINDOW_37450 = 37450; + public static final int STAINEDGLASS_WINDOW_37458 = 37458; + public static final int DECORATIVE_WINDOW_37459 = 37459; + public static final int STAINEDGLASS_WINDOW_37460 = 37460; + public static final int DECORATIVE_WINDOW_37461 = 37461; + public static final int STAINEDGLASS_WINDOW_37462 = 37462; + public static final int DOOR_37463 = 37463; + public static final int DOOR_37464 = 37464; + public static final int DOOR_37465 = 37465; + public static final int DOOR_37466 = 37466; + public static final int LEAGUE_FIRSTS_BOARD = 37482; + public static final int DRAGON_TROPHY_DISPLAY = 37483; + public static final int DRAGON_TROPHY_DISPLAY_37484 = 37484; + public static final int DRAGON_TROPHY_DISPLAY_37485 = 37485; + public static final int DRAGON_TROPHY_DISPLAY_37486 = 37486; + public static final int DRAGON_TROPHY_DISPLAY_37487 = 37487; + public static final int DRAGON_TROPHY_DISPLAY_37488 = 37488; + public static final int DRAGON_TROPHY_DISPLAY_37489 = 37489; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 3ccaf94371..7c27c4fd9e 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -131,7 +131,6 @@ public class WidgetID public static final int FULLSCREEN_MAP_GROUP_ID = 165; public static final int QUESTLIST_GROUP_ID = 399; public static final int SKILLS_GROUP_ID = 320; - public static final int QUESTTAB_GROUP_ID = 629; public static final int MUSIC_GROUP_ID = 239; public static final int BARROWS_PUZZLE_GROUP_ID = 25; public static final int KEPT_ON_DEATH_GROUP_ID = 4; @@ -327,120 +326,120 @@ public class WidgetID static class Viewport { - static final int MINIMAP_RESIZABLE_WIDGET = 17; - static final int MINIMAP_RESIZABLE_CLICKBOX = 18; - static final int MINIMAP_RESIZABLE_DRAW_AREA = 25; - static final int MINIMAP_RESIZABLE_DECORATIONS = 27; - static final int MINIMAP_RESIZABLE_ORB_HOLDER = 28; - static final int MINIMAP_RESIZABLE_LOGOUT_BUTTON = 30; + static final int MINIMAP_RESIZABLE_WIDGET = 18; + static final int MINIMAP_RESIZABLE_CLICKBOX = 19; + static final int MINIMAP_RESIZABLE_DRAW_AREA = 26; + static final int MINIMAP_RESIZABLE_DECORATIONS = 28; + static final int MINIMAP_RESIZABLE_ORB_HOLDER = 29; + static final int MINIMAP_RESIZABLE_LOGOUT_BUTTON = 31; static final int FIXED_VIEWPORT = 17; - static final int RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX = 12; - static final int RESIZABLE_VIEWPORT_BOTTOM_LINE = 12; + static final int RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX = 13; + static final int RESIZABLE_VIEWPORT_BOTTOM_LINE = 13; } static class FixedViewport { static final int MINIMAP = 3; static final int MINIMAP_DRAW_AREA = 8; - static final int CLAN_CHAT_TAB = 31; - static final int FRIENDS_TAB = 33; - static final int IGNORES_TAB = 32; - static final int LOGOUT_TAB = 34; - static final int OPTIONS_TAB = 35; - static final int EMOTES_TAB = 36; - static final int MUSIC_TAB = 37; - static final int CLAN_CHAT_ICON = 38; - static final int FRIENDS_ICON = 40; - static final int IGNORES_ICON = 39; - static final int LOGOUT_ICON = 41; - static final int OPTIONS_ICON = 42; - static final int EMOTES_ICON = 43; - static final int MUSIC_ICON = 44; - static final int COMBAT_TAB = 48; - static final int STATS_TAB = 49; - static final int QUESTS_TAB = 50; - static final int INVENTORY_TAB = 51; - static final int EQUIPMENT_TAB = 52; - static final int PRAYER_TAB = 53; - static final int MAGIC_TAB = 54; - static final int COMBAT_ICON = 55; - static final int STATS_ICON = 56; - static final int QUESTS_ICON = 57; - static final int INVENTORY_ICON = 58; - static final int EQUIPMENT_ICON = 59; - static final int PRAYER_ICON = 60; - static final int MAGIC_ICON = 61; - static final int ROOT_INTERFACE_CONTAINER = 62; - static final int BANK_CONTAINER = 64; - static final int INTERFACE_CONTAINER = 65; - static final int INVENTORY_CONTAINER = 69; + static final int CLAN_CHAT_TAB = 32; + static final int FRIENDS_TAB = 34; + static final int IGNORES_TAB = 33; + static final int LOGOUT_TAB = 35; + static final int OPTIONS_TAB = 36; + static final int EMOTES_TAB = 37; + static final int MUSIC_TAB = 38; + static final int CLAN_CHAT_ICON = 39; + static final int FRIENDS_ICON = 41; + static final int IGNORES_ICON = 40; + static final int LOGOUT_ICON = 42; + static final int OPTIONS_ICON = 43; + static final int EMOTES_ICON = 44; + static final int MUSIC_ICON = 45; + static final int COMBAT_TAB = 49; + static final int STATS_TAB = 50; + static final int QUESTS_TAB = 51; + static final int INVENTORY_TAB = 52; + static final int EQUIPMENT_TAB = 53; + static final int PRAYER_TAB = 54; + static final int MAGIC_TAB = 55; + static final int COMBAT_ICON = 56; + static final int STATS_ICON = 57; + static final int QUESTS_ICON = 58; + static final int INVENTORY_ICON = 59; + static final int EQUIPMENT_ICON = 60; + static final int PRAYER_ICON = 61; + static final int MAGIC_ICON = 62; + static final int ROOT_INTERFACE_CONTAINER = 63; + static final int BANK_CONTAINER = 65; + static final int INTERFACE_CONTAINER = 66; + static final int INVENTORY_CONTAINER = 70; } static class ResizableViewport { - static final int CLAN_CHAT_TAB = 35; - static final int FRIENDS_TAB = 37; - static final int IGNORES_TAB = 36; - static final int LOGOUT_TAB = 38; - static final int OPTIONS_TAB = 39; - static final int EMOTES_TAB = 40; - static final int MUSIC_TAB = 41; - static final int CLAN_CHAT_ICON = 42; - static final int FRIENDS_ICON = 44; - static final int IGNORES_ICON = 43; - static final int LOGOUT_ICON = 45; - static final int OPTIONS_ICON = 46; - static final int EMOTES_ICON = 47; - static final int MUSIC_ICON = 48; - static final int COMBAT_TAB = 51; - static final int STATS_TAB = 52; - static final int QUESTS_TAB = 53; - static final int INVENTORY_TAB = 54; - static final int EQUIPMENT_TAB = 55; - static final int PRAYER_TAB = 56; - static final int MAGIC_TAB = 57; - static final int COMBAT_ICON = 58; - static final int STATS_ICON = 59; - static final int QUESTS_ICON = 60; - static final int INVENTORY_ICON = 61; - static final int EQUIPMENT_ICON = 62; - static final int PRAYER_ICON = 63; - static final int MAGIC_ICON = 64; - static final int INTERFACE_CONTAINER = 65; - static final int INVENTORY_CONTAINER = 71; + static final int CLAN_CHAT_TAB = 36; + static final int FRIENDS_TAB = 38; + static final int IGNORES_TAB = 37; + static final int LOGOUT_TAB = 39; + static final int OPTIONS_TAB = 40; + static final int EMOTES_TAB = 41; + static final int MUSIC_TAB = 42; + static final int CLAN_CHAT_ICON = 43; + static final int FRIENDS_ICON = 45; + static final int IGNORES_ICON = 44; + static final int LOGOUT_ICON = 46; + static final int OPTIONS_ICON = 47; + static final int EMOTES_ICON = 48; + static final int MUSIC_ICON = 49; + static final int COMBAT_TAB = 52; + static final int STATS_TAB = 53; + static final int QUESTS_TAB = 54; + static final int INVENTORY_TAB = 55; + static final int EQUIPMENT_TAB = 56; + static final int PRAYER_TAB = 57; + static final int MAGIC_TAB = 58; + static final int COMBAT_ICON = 59; + static final int STATS_ICON = 60; + static final int QUESTS_ICON = 61; + static final int INVENTORY_ICON = 62; + static final int EQUIPMENT_ICON = 63; + static final int PRAYER_ICON = 64; + static final int MAGIC_ICON = 65; + static final int INTERFACE_CONTAINER = 66; + static final int INVENTORY_CONTAINER = 72; } static class ResizableViewportBottomLine { - static final int LOGOUT_BUTTON_OVERLAY = 29; + static final int LOGOUT_BUTTON_OVERLAY = 30; static final int CMB_TAB = 50; - static final int CMB_ICON = 57; + static final int CMB_ICON = 58; static final int SKILLS_TAB = 51; - static final int SKILLS_ICON = 58; + static final int SKILLS_ICON = 59; static final int QUESTS_TAB = 52; - static final int QUESTS_ICON = 59; - static final int INVENTORY_TAB = 53; - static final int INVENTORY_ICON = 60; + static final int QUESTS_ICON = 60; + static final int INVENTORY_TAB = 54; + static final int INVENTORY_ICON = 61; static final int EQUIP_TAB = 54; - static final int EQUIP_ICON = 61; - static final int PRAYER_TAB = 55; - static final int PRAYER_ICON = 62; + static final int EQUIP_ICON = 62; + static final int PRAYER_TAB = 56; + static final int PRAYER_ICON = 63; static final int SPELL_TAB = 56; static final int SPELL_ICON = 53; static final int FC_TAB = 35; - static final int FC_ICON = 41; + static final int FC_ICON = 42; static final int IGNORE_TAB = 36; static final int IGNORE_ICON = 42; static final int FRIEND_TAB = 37; - static final int FRIEND_ICON = 43; + static final int FRIEND_ICON = 44; static final int SETTINGS_TAB = 38; - static final int SETTINGS_ICON = 44; + static final int SETTINGS_ICON = 45; static final int EMOTE_TAB = 39; - static final int EMOTE_ICON = 45; + static final int EMOTE_ICON = 46; static final int MUSIC_TAB = 40; - static final int MUSIC_ICON = 46; - static final int MAGIC_ICON = 63; - static final int INVENTORY_CONTAINER = 71; + static final int MUSIC_ICON = 47; + static final int MAGIC_ICON = 64; + static final int INVENTORY_CONTAINER = 72; } static class Chatbox @@ -732,22 +731,22 @@ public class WidgetID static class StandardSpellBook { - static final int LUMBRIDGE_HOME_TELEPORT = 4; + static final int LUMBRIDGE_HOME_TELEPORT = 5; } static class AncientSpellBook { - static final int EDGEVILLE_HOME_TELEPORT = 98; + static final int EDGEVILLE_HOME_TELEPORT = 99; } static class LunarSpellBook { - static final int LUNAR_HOME_TELEPORT = 99; + static final int LUNAR_HOME_TELEPORT = 100; } static class ArceuusSpellBook { - static final int ARCEUUS_HOME_TELEPORT = 143; + static final int ARCEUUS_HOME_TELEPORT = 144; } static class Pvp @@ -781,7 +780,7 @@ public class WidgetID static class FullScreenMap { - static final int ROOT = 25; + static final int ROOT = 26; } static class QuestList @@ -793,12 +792,6 @@ public class WidgetID static final int MEMBERS_CONTAINER = 7; static final int MINIQUEST_CONTAINER = 8; } - - static class QuestTab - { - static final int QUEST_TAB = 3; - } - static class Music { static final int CONTAINER = 0; diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index fe2e03e720..aa1260990b 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -492,8 +492,6 @@ public enum WidgetInfo QUESTLIST_MEMBERS_CONTAINER(WidgetID.QUESTLIST_GROUP_ID, WidgetID.QuestList.MEMBERS_CONTAINER), QUESTLIST_MINIQUEST_CONTAINER(WidgetID.QUESTLIST_GROUP_ID, WidgetID.QuestList.MINIQUEST_CONTAINER), - QUESTTAB_QUEST_TAB(WidgetID.QUESTTAB_GROUP_ID, WidgetID.QuestTab.QUEST_TAB), - ITEMS_KEPT_ON_DEATH_TEXT(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.KEPT_ITEMS_TEXT), ITEMS_KEPT_ON_DEATH_CONTAINER(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.KEPT_ITEMS_CONTAINER), ITEMS_LOST_ON_DEATH_TEXT(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.LOST_ITEMS_TEXT), diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index 8958eaa923..66ef2d3c50 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -2456,7 +2456,8 @@ 1965, 1967, 22519, - 22520 + 22520, + 24367 ], "empty cup": [ 1980, @@ -7784,7 +7785,8 @@ 21888, 21890, 23073, - 23075 + 23075, + 24370 ], "slayer ring": [ 11866, @@ -9638,5 +9640,33 @@ 24344, 24346, 24348 + ], + "scroll box": [ + 24361, + 24362, + 24363, + 24364, + 24365, + 24366 + ], + "twisted hat": [ + 24387, + 24397, + 24405 + ], + "twisted coat": [ + 24389, + 24399, + 24407 + ], + "twisted trousers": [ + 24391, + 24401, + 24409 + ], + "twisted boots": [ + 24393, + 24403, + 24411 ] } \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.hash b/runelite-client/src/main/scripts/ChatSplitBuilder.hash index 9e67531c83..dae4dd64a2 100644 --- a/runelite-client/src/main/scripts/ChatSplitBuilder.hash +++ b/runelite-client/src/main/scripts/ChatSplitBuilder.hash @@ -1 +1 @@ -5BCAA21926CF079794AAF3DA80E512297DD6F8353741929302FE6490D17DDF8C \ No newline at end of file +2A7509A05B336AC79015C479B39CDB3E1D3F10A57C6B96B2162E87352B4F25A3 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm index 354aa42e71..ed561e82ef 100644 --- a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm @@ -62,7 +62,7 @@ LABEL49: iconst 73 iconst 73 iload 6 - iconst 10551325 + iconst 10551326 enum if_getheight add @@ -361,9 +361,9 @@ CHAT_FILTER: iload 15 ; Load the messageType iload 12 ; Load the id of the messageNode sconst "chatFilterCheck" - runelite_callback - pop_int ; Pop the id of the messageNode - pop_int ; Pop the messageType + runelite_callback + pop_int ; Pop the id of the messageNode + pop_int ; Pop the messageType iconst 1 ; 2nd half of conditional sstore 0 ; Override the message with our filtered message if_icmpeq LABEL327 ; Check if we are building this message @@ -380,8 +380,8 @@ LABEL330: iload 12 ; Load the id of the messageNode sconst "" ; Push a container for the timestamp sconst "addTimestamp" ; Push event name - runelite_callback ; Invoke callback - pop_int ; Pop the id of the messageNode + runelite_callback ; Invoke callback + pop_int ; Pop the id of the messageNode sconst "From " sload 1 sconst ":" @@ -409,8 +409,8 @@ LABEL351: iload 12 ; Load the id of the messageNode sconst "" ; Push container for the timestamp sconst "addTimestamp" ; Push event name - runelite_callback ; Invoke callback - pop_int ; Pop the id of the messageNode + runelite_callback ; Invoke callback + pop_int ; Pop the id of the messageNode sconst "To " sload 1 sconst ":" @@ -438,8 +438,8 @@ LABEL372: iload 12 ; Load the id of the messageNode sconst "" ; Push a container for the timestamp sconst "addTimestamp" ; Push event name - runelite_callback ; Invoke callback - pop_int ; Pop the id of the messageNode + runelite_callback ; Invoke callback + pop_int ; Pop the id of the messageNode sload 0 ; Load the log in/out message join_string 2 ; Add the timestamp to the message iload 9 diff --git a/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash b/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash index 95e14db861..a90e9082b0 100644 --- a/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash +++ b/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash @@ -1 +1 @@ -1D663B889321070027599B4B8437A321C0C83336C703BBBA34BE22A183E1D7B9 \ No newline at end of file +A55D398EBF2C1CE70F2CFC6BEA21939307B69840DEBF46E0384EC2E7EFBBC58A \ No newline at end of file diff --git a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm index afb820ff0f..9a2fbfe92f 100644 --- a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm +++ b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm @@ -12,19 +12,19 @@ iconst 73 iconst 73 iload 1 - iconst 10551306 + iconst 10551307 enum istore 3 iconst 73 iconst 73 iload 1 - iconst 10551301 + iconst 10551302 enum istore 4 iconst 73 iconst 73 iload 1 - iconst 10551308 + iconst 10551309 enum istore 5 iconst 103 @@ -76,14 +76,14 @@ LABEL70: iconst 0 iload 16 - iconst 39387148 + iconst 39387149 if_getwidth sub invoke 1045 istore 14 iconst 0 iload 17 - iconst 39387148 + iconst 39387149 if_getheight sub invoke 1045 @@ -248,7 +248,7 @@ LABEL163: iconst 73 iconst 73 iload 1 - iconst 10551307 + iconst 10551308 enum iload 5 iload 8 @@ -260,7 +260,7 @@ LABEL242: iconst 73 iconst 73 iload 1 - iconst 10551307 + iconst 10551308 enum iload 3 iconst 0 @@ -386,7 +386,7 @@ LABEL316: iconst 73 iconst 73 iload 1 - iconst 10551307 + iconst 10551308 enum iload 5 iload 8 @@ -398,7 +398,7 @@ LABEL359: iconst 73 iconst 73 iload 1 - iconst 10551307 + iconst 10551308 enum iload 3 iconst 0 @@ -408,7 +408,7 @@ LABEL369: iconst 73 iconst 73 iload 1 - iconst 10551309 + iconst 10551310 enum istore 18 iload 18 @@ -472,7 +472,7 @@ LABEL423: iconst 73 iconst 73 iload 1 - iconst 10551311 + iconst 10551312 enum istore 18 iconst 0 @@ -487,7 +487,7 @@ LABEL437: iconst 73 iconst 73 iload 1 - iconst 10551303 + iconst 10551304 enum if_hassub iconst 1 @@ -542,7 +542,7 @@ LABEL481: iconst 73 iconst 73 iload 1 - iconst 10551303 + iconst 10551304 enum istore 18 iconst 0 diff --git a/runelite-client/src/main/scripts/QuestListShowProgress.hash b/runelite-client/src/main/scripts/QuestListShowProgress.hash index d3899f1431..c235a4ae9b 100644 --- a/runelite-client/src/main/scripts/QuestListShowProgress.hash +++ b/runelite-client/src/main/scripts/QuestListShowProgress.hash @@ -1 +1 @@ -A6B3A7BFE7B688A08F69B91A7FD5C7184D71147D3DAF74B1262369D85DBB3A03 \ No newline at end of file +FC7F8B54745582D6DD530D5458E129B67D6B3CFF61BACD4BBE7BC8C40E26F3C6 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm b/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm index 275080edfc..ca43ff61b9 100644 --- a/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm +++ b/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm @@ -15,39 +15,49 @@ LABEL8: iload 5 iload 6 if_icmplt LABEL12 - jump LABEL56 + jump LABEL64 LABEL12: iload 0 iload 5 cc_find iconst 1 if_icmpeq LABEL18 - jump LABEL51 + jump LABEL59 LABEL18: iload 5 invoke 1357 istore 3 + iload 5 + invoke 3236 + iconst 1 + if_icmpeq LABEL26 + jump LABEL29 +LABEL26: + iconst 10461087 + istore 4 + jump LABEL45 +LABEL29: iload 3 iconst 2 - if_icmpeq LABEL25 - jump LABEL28 -LABEL25: + if_icmpeq LABEL33 + jump LABEL36 +LABEL33: iconst 901389 istore 4 - jump LABEL37 -LABEL28: + jump LABEL45 +LABEL36: iload 3 iconst 0 - if_icmpeq LABEL32 - jump LABEL35 -LABEL32: + if_icmpeq LABEL40 + jump LABEL43 +LABEL40: iconst 16776960 istore 4 - jump LABEL37 -LABEL35: + jump LABEL45 +LABEL43: iconst 16711680 istore 4 -LABEL37: +LABEL45: iload 4 cc_setcolour iconst 85 @@ -62,54 +72,64 @@ LABEL37: iload 4 sconst "Iii" cc_setonmouseleave -LABEL51: +LABEL59: iload 5 iconst 1 add istore 5 jump LABEL8 -LABEL56: +LABEL64: iconst 0 invoke 2245 istore 6 istore 5 -LABEL60: +LABEL68: iload 5 iload 6 - if_icmplt LABEL64 - jump LABEL108 -LABEL64: + if_icmplt LABEL72 + jump LABEL124 +LABEL72: iload 1 iload 5 cc_find iconst 1 - if_icmpeq LABEL70 - jump LABEL103 -LABEL70: + if_icmpeq LABEL78 + jump LABEL119 +LABEL78: iload 5 invoke 1358 istore 3 + iload 5 + invoke 3237 + iconst 1 + if_icmpeq LABEL86 + jump LABEL89 +LABEL86: + iconst 10461087 + istore 4 + jump LABEL105 +LABEL89: iload 3 iconst 2 - if_icmpeq LABEL77 - jump LABEL80 -LABEL77: + if_icmpeq LABEL93 + jump LABEL96 +LABEL93: iconst 901389 istore 4 - jump LABEL89 -LABEL80: + jump LABEL105 +LABEL96: iload 3 iconst 0 - if_icmpeq LABEL84 - jump LABEL87 -LABEL84: + if_icmpeq LABEL100 + jump LABEL103 +LABEL100: iconst 16776960 istore 4 - jump LABEL89 -LABEL87: + jump LABEL105 +LABEL103: iconst 16711680 istore 4 -LABEL89: +LABEL105: iload 4 cc_setcolour iconst 85 @@ -124,54 +144,64 @@ LABEL89: iload 4 sconst "Iii" cc_setonmouseleave -LABEL103: +LABEL119: iload 5 iconst 1 add istore 5 - jump LABEL60 -LABEL108: + jump LABEL68 +LABEL124: iconst 0 invoke 2265 istore 6 istore 5 -LABEL112: +LABEL128: iload 5 iload 6 - if_icmplt LABEL116 - jump LABEL160 -LABEL116: + if_icmplt LABEL132 + jump LABEL184 +LABEL132: iload 2 iload 5 cc_find iconst 1 - if_icmpeq LABEL122 - jump LABEL155 -LABEL122: + if_icmpeq LABEL138 + jump LABEL179 +LABEL138: iload 5 invoke 1359 istore 3 + iload 5 + invoke 3238 + iconst 1 + if_icmpeq LABEL146 + jump LABEL149 +LABEL146: + iconst 10461087 + istore 4 + jump LABEL165 +LABEL149: iload 3 iconst 2 - if_icmpeq LABEL129 - jump LABEL132 -LABEL129: + if_icmpeq LABEL153 + jump LABEL156 +LABEL153: iconst 901389 istore 4 - jump LABEL141 -LABEL132: + jump LABEL165 +LABEL156: iload 3 iconst 0 - if_icmpeq LABEL136 - jump LABEL139 -LABEL136: + if_icmpeq LABEL160 + jump LABEL163 +LABEL160: iconst 16776960 istore 4 - jump LABEL141 -LABEL139: + jump LABEL165 +LABEL163: iconst 16711680 istore 4 -LABEL141: +LABEL165: iload 4 cc_setcolour iconst 85 @@ -186,13 +216,13 @@ LABEL141: iload 4 sconst "Iii" cc_setonmouseleave -LABEL155: +LABEL179: iload 5 iconst 1 add istore 5 - jump LABEL112 -LABEL160: + jump LABEL128 +LABEL184: sconst "questProgressUpdated" runelite_callback return diff --git a/runelite-client/src/main/scripts/ResetChatboxInput.hash b/runelite-client/src/main/scripts/ResetChatboxInput.hash index 12bd3c5bb1..2c90f09832 100644 --- a/runelite-client/src/main/scripts/ResetChatboxInput.hash +++ b/runelite-client/src/main/scripts/ResetChatboxInput.hash @@ -1 +1 @@ -E8B1910003198AB024BADC89831AF1735A2C77256C23551212105F25439E022D \ No newline at end of file +9985AC752BF689CA5353232CF302B41E83EC1901D8615B507EA10DFAA9F5AF9A \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm b/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm index 40f4b02c6f..17070abc16 100644 --- a/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm +++ b/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm @@ -165,16 +165,18 @@ LABEL40: get_varc_int 41 iconst 1337 if_icmpeq LABEL154 - jump LABEL156 + jump LABEL158 LABEL154: invoke 2526 pop_int -LABEL156: + clientclock + set_varc_int 384 +LABEL158: invoke 1972 iconst 1 - if_icmpeq LABEL160 - jump LABEL161 -LABEL160: + if_icmpeq LABEL162 + jump LABEL163 +LABEL162: invoke 2581 -LABEL161: +LABEL163: return