diff --git a/runelite-client/src/main/scripts/BankSearchLayout.hash b/runelite-client/src/main/scripts/BankSearchLayout.hash index eb4360c955..a6d2a3aaf6 100644 --- a/runelite-client/src/main/scripts/BankSearchLayout.hash +++ b/runelite-client/src/main/scripts/BankSearchLayout.hash @@ -1 +1 @@ -D32D30CB1B79698A15B3314C3782659FF25382008857E7CEB07CA17C1CD5E62A \ No newline at end of file +90076B6F48BDA11B9905808D70A53D53F894350AD46B7ED3AF75C7C60BB304D1 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/BankSearchLayout.rs2asm b/runelite-client/src/main/scripts/BankSearchLayout.rs2asm index 485a6d08e9..70ed2a945d 100644 --- a/runelite-client/src/main/scripts/BankSearchLayout.rs2asm +++ b/runelite-client/src/main/scripts/BankSearchLayout.rs2asm @@ -794,7 +794,7 @@ LABEL703: sconst "setSearchBankInputTextFound" ; load event name runelite_callback ; invoke callback pop_int ; pop number of matches - iconst 10616876 + iconst 10616873 if_settext LABEL710: jump LABEL725 @@ -814,7 +814,7 @@ LABEL722: sconst "Show items whose names contain the following text:" sconst "setSearchBankInputText" ; load event name runelite_callback ; invoke callback - iconst 10616876 + iconst 10616873 if_settext LABEL725: jump LABEL729 diff --git a/runelite-client/src/main/scripts/ChatBuilder.hash b/runelite-client/src/main/scripts/ChatBuilder.hash index 8a4a68666c..68eba8647c 100644 --- a/runelite-client/src/main/scripts/ChatBuilder.hash +++ b/runelite-client/src/main/scripts/ChatBuilder.hash @@ -1 +1 @@ -E5BD8C9AD501548FDE7AA21B76E6186E5E2B30B7824959D09E517989EFE30687 \ No newline at end of file +4AEE5325C78CB639C5CB3DC6838082DBD926696CEBDE6DEE0D84D7CD929B8197 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatBuilder.rs2asm b/runelite-client/src/main/scripts/ChatBuilder.rs2asm index 30e4da40d4..c4967ebecf 100644 --- a/runelite-client/src/main/scripts/ChatBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatBuilder.rs2asm @@ -1,9 +1,9 @@ .id 84 .int_stack_count 1 .string_stack_count 0 -.int_var_count 17 -.string_var_count 13 - iconst 10616891 +.int_var_count 23 +.string_var_count 17 + iconst 10616888 if_getwidth istore 1 chat_playername @@ -35,15 +35,21 @@ LABEL14: sstore 5 sconst "" sstore 6 - sconst "" + sconst "" sstore 7 - sconst "" + sconst "" sstore 8 + sconst "" + sstore 9 + sconst "" + sstore 10 + iconst 0 + istore 5 invoke 921 iconst 1 - if_icmpeq LABEL38 - jump LABEL58 -LABEL38: + if_icmpeq LABEL44 + jump LABEL68 +LABEL44: iconst 16777215 iconst 1 istore 4 @@ -57,40 +63,66 @@ LABEL38: sstore 2 sstore 1 sconst "" + sconst "" sconst "" sconst "" sconst "" - sstore 8 - sstore 7 + sstore 10 + sstore 9 sstore 6 sstore 5 -LABEL58: - iconst 0 + sstore 7 + iconst 1 istore 5 +LABEL68: + iload 3 + sconst "col" + invoke 3739 + sstore 11 + sload 1 + sload 2 + sload 3 + sload 11 + sload 6 + sload 8 + sload 9 + sload 10 + iload 5 + invoke 4484 + sstore 10 + sstore 9 + sstore 8 + sstore 6 + sstore 11 + sstore 3 + sstore 2 + sstore 1 iconst 0 istore 6 iconst 0 istore 7 + iconst 0 + istore 8 iconst 105 iconst 73 iconst 579 - iload 7 + iload 8 enum - istore 8 + istore 9 get_varc_int 41 iconst 0 - if_icmpeq LABEL77 + if_icmpeq LABEL109 get_varc_int 41 iconst 2 - if_icmpeq LABEL77 - jump LABEL133 -LABEL77: + if_icmpeq LABEL109 + jump LABEL165 +LABEL109: chat_getmessagefilter string_length iconst 0 - if_icmpgt LABEL82 - jump LABEL133 -LABEL82: + if_icmpgt LABEL114 + jump LABEL165 +LABEL114: sload 1 sconst "Public chat filtering:" sconst "" @@ -101,274 +133,321 @@ LABEL82: lowercase sconst "" join_string 7 - iload 7 iload 8 - iconst 10616891 + iload 9 + iconst 10616888 iload 1 iconst 3 iconst 14 - iload 5 + iload 6 iconst 0 iconst 103 iload 3 iload 4 invoke 199 - istore 6 - iload 8 + istore 7 + iload 9 if_clearops iconst -1 sconst "" - iload 8 + iload 9 if_setonop iconst -1 sconst "" - iload 8 + iload 9 if_setonmouserepeat iconst -1 sconst "" - iload 8 + iload 9 if_setonmouseleave - iload 5 iload 6 - sub - istore 5 iload 7 + sub + istore 6 + iload 8 iconst 1 add - istore 7 + istore 8 iconst 105 iconst 73 iconst 579 - iload 7 + iload 8 enum - istore 8 -LABEL133: - iload 0 istore 9 - iconst 0 +LABEL165: + iload 0 istore 10 - iconst -1 + iconst 0 istore 11 - sconst "" - sstore 9 - sconst "" - sstore 10 - sconst "" - sstore 11 - sconst "" - sstore 12 iconst -1 istore 12 - iconst 0 + sconst "" + sstore 12 + sconst "" + sstore 13 + sconst "" + sstore 14 + sconst "" + sstore 15 + iconst -1 istore 13 iconst 0 istore 14 -LABEL153: - iload 9 + iconst 0 + istore 15 + sconst "" + sstore 16 iconst -1 - if_icmpne LABEL157 - jump LABEL689 -LABEL157: - iload 8 + istore 16 iconst -1 - if_icmpne LABEL161 - jump LABEL689 -LABEL161: - iload 9 - chat_gethistory_byuid - istore 14 - sstore 11 - sstore 10 - sstore 9 - istore 11 - istore 10 + istore 17 + iconst -1 + istore 18 + iconst 126 + istore 19 + iconst 126 + istore 20 + iconst 0 + 3801 + iconst 1 + if_icmpeq LABEL202 + jump LABEL222 +LABEL202: + iconst 0 + 3851 + iconst 1 + if_icmpeq LABEL207 + jump LABEL222 +LABEL207: + sload 0 + 3860 + istore 17 + iload 17 + iconst -1 + if_icmpne LABEL214 + jump LABEL217 +LABEL214: + iload 17 + 3857 + istore 18 +LABEL217: + 3853 + iconst 2956 + invoke 4456 + istore 20 + istore 19 +LABEL222: iload 10 - sload 9 - iload 14 + iconst -1 + if_icmpne LABEL226 + jump LABEL1270 +LABEL226: + iload 9 + iconst -1 + if_icmpne LABEL230 + jump LABEL1270 +LABEL230: + iload 10 + chat_gethistory_byuid + istore 15 + sstore 14 + sstore 13 + sstore 12 + istore 12 + istore 11 + iload 11 + sload 12 + iload 15 invoke 193 iconst 1 if_icmpeq CHAT_FILTER - jump LABEL685 + jump LABEL1266 CHAT_FILTER: - sload 11 ; Load the message + sload 14 ; Load the message iconst 1 ; Gets changed to 0 if message is blocked - iload 10 ; Load the messageType - iload 9 ; Load the id of the messageNode + iload 11 ; Load the messageType + iload 10 ; Load the id of the messageNode sconst "chatFilterCheck" runelite_callback pop_int ; Pop the id of the messageNode pop_int ; Pop the messageType iconst 1 ; 2nd half of conditional - sstore 11 ; Override the message with our filtered message - if_icmpeq LABEL176 ; Check if we are building this message - jump LABEL685 ; continue to next message, skipping this -LABEL176: - iload 10 - sload 9 - sload 11 + sstore 14 ; Override the message with our filtered message + if_icmpeq LABEL245 ; Check if we are building this message + jump LABEL1266 ; continue to next message, skipping this +LABEL245: iload 11 + sload 12 + sload 14 + iload 12 iload 2 sload 0 - iload 14 + iload 15 invoke 90 iconst 1 - if_icmpeq LABEL187 - jump LABEL685 -LABEL187: - iload 10 + if_icmpeq LABEL256 + jump LABEL1266 +LABEL256: + iload 11 switch - 1: LABEL190 - 2: LABEL190 - 3: LABEL232 - 101: LABEL254 - 5: LABEL272 - 6: LABEL305 - 7: LABEL232 - 103: LABEL327 - 104: LABEL327 - 9: LABEL345 - 107: LABEL395 - 14: LABEL371 - 90: LABEL211 - 91: LABEL211 - jump LABEL431 -LABEL190: - iload 9 ; The id of the messageNode of the message being built + 1: LABEL259 + 2: LABEL259 + 3: LABEL301 + 101: LABEL323 + 5: LABEL341 + 6: LABEL374 + 7: LABEL301 + 103: LABEL396 + 104: LABEL396 + 9: LABEL432 + 41: LABEL458 + 43: LABEL766 + 107: LABEL892 + 44: LABEL613 + 109: LABEL414 + 110: LABEL396 + 46: LABEL816 + 14: LABEL865 + 90: LABEL280 + 91: LABEL280 + jump LABEL928 +LABEL259: + iload 10 ; The id of the messageNode of the message being built sconst "" sconst "addTimestamp" runelite_callback pop_int ; pop message id - sload 9 + sload 12 sconst ":" join_string 3 ; + 1 for timestamp sload 1 - sload 11 + sload 14 sconst "" join_string 3 - iload 7 iload 8 - iconst 10616891 + iload 9 + iconst 10616888 iload 1 iconst 3 iconst 14 - iload 5 + iload 6 iconst 0 iconst 103 iload 3 iload 4 invoke 203 - istore 6 - jump LABEL445 -LABEL211: - iload 9 ; The id of the messageNode of the message being built + istore 7 + jump LABEL942 +LABEL280: + iload 10 ; The id of the messageNode of the message being built sconst "" sconst "addTimestamp" runelite_callback pop_int ; pop message id - sload 9 + sload 12 sconst ":" join_string 3 ; + 1 for timestamp sload 3 - sload 11 + sload 14 sconst "" join_string 3 - iload 7 iload 8 - iconst 10616891 + iload 9 + iconst 10616888 iload 1 iconst 3 iconst 14 - iload 5 + iload 6 iconst 0 iconst 103 iload 3 iload 4 invoke 203 - istore 6 - jump LABEL445 -LABEL232: - iload 9 ; The id of the messageNode of the message being built + istore 7 + jump LABEL942 +LABEL301: + iload 10 ; The id of the messageNode of the message being built sconst "" sconst "addTimestamp" runelite_callback pop_int ; pop message id sconst "From " - sload 9 + sload 12 sconst ":" sconst "privateChatFrom" runelite_callback ; for prepending color tags join_string 4 ; + 1 for timestamp sload 2 - sload 11 + sload 14 sconst "" join_string 3 - iload 7 iload 8 - iconst 10616891 + iload 9 + iconst 10616888 iload 1 iconst 3 iconst 14 - iload 5 + iload 6 iconst 0 iconst 103 iload 3 iload 4 invoke 203 - istore 6 - jump LABEL445 -LABEL254: - iload 9 ; The id of the messageNode of the message being built + istore 7 + jump LABEL942 +LABEL323: + iload 10 ; The id of the messageNode of the message being built sconst "" sconst "addTimestamp" runelite_callback pop_int ; pop message id - sload 7 - sload 11 + sload 9 + sload 14 sconst "" join_string 4 ; + 1 for timestamp - iload 7 iload 8 - iconst 10616891 + iload 9 + iconst 10616888 iload 1 iconst 3 iconst 14 - iload 5 + iload 6 iconst 0 iconst 103 iload 3 iload 4 invoke 199 - istore 6 - jump LABEL445 -LABEL272: - iload 9 ; The id of the messageNode of the message being built + istore 7 + jump LABEL942 +LABEL341: + iload 10 ; The id of the messageNode of the message being built sconst "" sconst "addTimestamp" runelite_callback pop_int ; pop message id sload 2 - sload 11 + sload 14 sconst "" join_string 4 ; + 1 for timestamp - iload 7 iload 8 - iconst 10616891 + iload 9 + iconst 10616888 iload 1 iconst 3 iconst 14 - iload 5 + iload 6 iconst 0 iconst 103 iload 3 iload 4 invoke 199 - istore 6 + istore 7 get_varbit 1627 iconst 0 - if_icmpeq LABEL293 - jump LABEL304 -LABEL293: - iload 11 + if_icmpeq LABEL362 + jump LABEL373 +LABEL362: + iload 12 iconst 500 add iconst 1 @@ -379,634 +458,1256 @@ LABEL293: sconst "1" iconst 10616832 if_setontimer -LABEL304: - jump LABEL445 -LABEL305: - iload 9 ; The id of the messageNode of the message being built +LABEL373: + jump LABEL942 +LABEL374: + iload 10 ; The id of the messageNode of the message being built sconst "" sconst "addTimestamp" runelite_callback pop_int ; pop message id sconst "To " - sload 9 + sload 12 sconst ":" sconst "privateChatTo" runelite_callback ; for chat recolors join_string 4 ; + 1 for timestamp sload 2 - sload 11 + sload 14 sconst "" join_string 3 - iload 7 iload 8 - iconst 10616891 + iload 9 + iconst 10616888 iload 1 iconst 3 iconst 14 - iload 5 + iload 6 iconst 0 iconst 103 iload 3 iload 4 invoke 203 - istore 6 - jump LABEL445 -LABEL327: - iload 9 ; The id of the messageNode of the message being built - sconst "" - sconst "addTimestamp" - runelite_callback - pop_int ; pop message id - sload 8 - sload 11 + istore 7 + jump LABEL942 +LABEL396: + sload 10 + sload 14 sconst "" - join_string 4 ; + 1 for time stamp - iload 7 + join_string 3 iload 8 - iconst 10616891 + iload 9 + iconst 10616888 iload 1 iconst 3 iconst 14 - iload 5 + iload 6 iconst 0 iconst 103 iload 3 iload 4 invoke 199 - istore 6 - jump LABEL445 -LABEL345: - iload 9 ; The id of the messageNode of the message being built + istore 7 + jump LABEL942 +LABEL414: + sconst "" + sload 14 + sconst "" + join_string 3 + iload 8 + iload 9 + iconst 10616888 + iload 1 + iconst 3 + iconst 14 + iload 6 + iconst 0 + iconst 103 + iload 3 + iload 4 + invoke 199 + istore 7 + jump LABEL942 +LABEL432: + iload 10 ; The id of the messageNode of the message being built sconst "" sconst "addTimestamp" runelite_callback pop_int ; pop message id sconst "[" sload 5 - sload 10 + sload 13 sconst "" sconst "] " - sload 9 + sload 12 sconst ":" - join_string 8 ; + 1 for timestamp + join_string 8 ; + 1 for time stamp sload 6 - sload 11 + sload 14 sconst "" join_string 3 - iload 7 iload 8 - iconst 10616891 + iload 9 + iconst 10616888 iload 1 iconst 3 iconst 14 - iload 5 + iload 6 iconst 0 iconst 103 iload 3 iload 4 invoke 203 - istore 6 - jump LABEL445 -LABEL371: - sload 11 + istore 7 + jump LABEL942 +LABEL458: + iconst 0 + 3801 + iconst 1 + if_icmpeq LABEL463 + jump LABEL583 +LABEL463: + iconst 0 + 3851 + iconst 1 + if_icmpeq LABEL468 + jump LABEL583 +LABEL468: + sload 12 + removetags + 3860 + istore 17 + iload 17 + iconst -1 + if_icmpne LABEL476 + jump LABEL549 +LABEL476: + iload 17 + 3857 + invoke 4302 + istore 16 + sstore 16 + iload 16 + iconst -1 + if_icmpne LABEL485 + jump LABEL515 +LABEL485: + sconst "[" + sload 7 + sload 13 + sconst "" + sconst "]" + join_string 5 + iload 16 + iconst 13 + iconst 13 + sload 12 + sconst ":" + join_string 2 + sload 8 + sload 14 + sconst "" + join_string 3 + iload 8 + iload 9 + iconst 10616888 + iload 1 + iconst 3 + iconst 14 + iload 6 + iconst 0 + iconst 103 + iload 3 + iload 4 + invoke 4483 + istore 7 + jump LABEL548 +LABEL515: + iload 10 ; The id of the messageNode of the message being built + sconst "" + sconst "addTimestamp" + runelite_callback + pop_int ; pop message id + sconst "[" + sload 7 + sload 13 + sconst "" + sconst "]" + join_string 6 ; + 1 for timestamp + iconst -1 + iconst 0 + iconst 0 + sload 7 + sload 16 + sconst "" + sconst " " + sload 12 + sconst ":" + join_string 6 + sload 8 + sload 14 + sconst "" + join_string 3 + iload 8 + iload 9 + iconst 10616888 + iload 1 + iconst 3 + iconst 14 + iload 6 + iconst 0 + iconst 103 + iload 3 + iload 4 + invoke 4483 + istore 7 +LABEL548: + jump LABEL582 +LABEL549: + iconst -1 + invoke 4302 + istore 16 + sstore 16 + sconst "[" + sload 7 + sload 13 + sconst "" + sconst "]" + join_string 5 + iload 16 + iconst 13 + iconst 13 + sload 12 + sconst ":" + join_string 2 + sload 8 + sload 14 + sconst "" + join_string 3 + iload 8 + iload 9 + iconst 10616888 + iload 1 + iconst 3 + iconst 14 + iload 6 + iconst 0 + iconst 103 + iload 3 + iload 4 + invoke 4483 + istore 7 +LABEL582: + jump LABEL612 +LABEL583: + sconst "[" + sload 7 + sload 13 + sconst "" + sconst "]" + join_string 5 + iconst -1 + iconst 0 + iconst 0 + sload 12 + sconst ":" + join_string 2 + sload 8 + sload 14 + sconst "" + join_string 3 + iload 8 + iload 9 + iconst 10616888 + iload 1 + iconst 3 + iconst 14 + iload 6 + iconst 0 + iconst 103 + iload 3 + iload 4 + invoke 4483 + istore 7 +LABEL612: + jump LABEL942 +LABEL613: + 3800 + iconst 1 + if_icmpeq LABEL617 + jump LABEL736 +LABEL617: + 3850 + iconst 1 + if_icmpeq LABEL621 + jump LABEL736 +LABEL621: + sload 12 + removetags + 3860 + istore 17 + iload 17 + iconst -1 + if_icmpne LABEL629 + jump LABEL702 +LABEL629: + iload 17 + 3857 + invoke 4302 + istore 16 + sstore 16 + iload 16 + iconst -1 + if_icmpne LABEL638 + jump LABEL668 +LABEL638: + sconst "[" + sload 7 + sload 13 + sconst "" + sconst "]" + join_string 5 + iload 16 + iconst 13 + iconst 13 + sload 12 + sconst ":" + join_string 2 + sload 8 + sload 14 + sconst "" + join_string 3 + iload 8 + iload 9 + iconst 10616888 + iload 1 + iconst 3 + iconst 14 + iload 6 + iconst 0 + iconst 103 + iload 3 + iload 4 + invoke 4483 + istore 7 + jump LABEL701 +LABEL668: + sconst "[" + sload 7 + sload 13 + sconst "" + sconst "]" + join_string 5 + iconst -1 + iconst 0 + iconst 0 + sload 7 + sload 16 + sconst "" + sconst " " + sload 12 + sconst ":" + join_string 6 + sload 8 + sload 14 + sconst "" + join_string 3 + iload 8 + iload 9 + iconst 10616888 + iload 1 + iconst 3 + iconst 14 + iload 6 + iconst 0 + iconst 103 + iload 3 + iload 4 + invoke 4483 + istore 7 +LABEL701: + jump LABEL735 +LABEL702: + iconst -1 + invoke 4302 + istore 16 + sstore 16 + sconst "[" + sload 7 + sload 13 + sconst "" + sconst "]" + join_string 5 + iload 16 + iconst 13 + iconst 13 + sload 12 + sconst ":" + join_string 2 + sload 8 + sload 14 + sconst "" + join_string 3 + iload 8 + iload 9 + iconst 10616888 + iload 1 + iconst 3 + iconst 14 + iload 6 + iconst 0 + iconst 103 + iload 3 + iload 4 + invoke 4483 + istore 7 +LABEL735: + jump LABEL765 +LABEL736: + sconst "[" + sload 7 + sload 13 + sconst "" + sconst "]" + join_string 5 + iconst -1 + iconst 0 + iconst 0 + sload 12 + sconst ":" + join_string 2 + sload 8 + sload 14 + sconst "" + join_string 3 + iload 8 + iload 9 + iconst 10616888 + iload 1 + iconst 3 + iconst 14 + iload 6 + iconst 0 + iconst 103 + iload 3 + iload 4 + invoke 4483 + istore 7 +LABEL765: + jump LABEL942 +LABEL766: + iconst 0 + 3851 + iconst 1 + if_icmpeq LABEL771 + jump LABEL796 +LABEL771: + sconst "[" + sload 7 + 3852 + sconst "" + sconst "]" + join_string 5 + iconst -1 + iconst 0 + iconst 0 + sconst "" + sload 14 + iload 8 + iload 9 + iconst 10616888 + iload 1 + iconst 3 + iconst 14 + iload 6 + iconst 0 + iconst 103 + iload 3 + iload 4 + invoke 4483 + istore 7 + jump LABEL815 +LABEL796: + sconst "" + iconst -1 + iconst 0 + iconst 0 + sconst "" + sload 14 + iload 8 + iload 9 + iconst 10616888 + iload 1 + iconst 3 + iconst 14 + iload 6 + iconst 0 + iconst 103 + iload 3 + iload 4 + invoke 4483 + istore 7 +LABEL815: + jump LABEL942 +LABEL816: + 3850 + iconst 1 + if_icmpeq LABEL820 + jump LABEL845 +LABEL820: + sconst "[" + sload 7 + 3852 + sconst "" + sconst "]" + join_string 5 + iconst -1 + iconst 0 + iconst 0 + sconst "" + sload 14 + iload 8 + iload 9 + iconst 10616888 + iload 1 + iconst 3 + iconst 14 + iload 6 + iconst 0 + iconst 103 + iload 3 + iload 4 + invoke 4483 + istore 7 + jump LABEL864 +LABEL845: + sconst "" + iconst -1 + iconst 0 + iconst 0 + sconst "" + sload 14 + iload 8 + iload 9 + iconst 10616888 + iload 1 + iconst 3 + iconst 14 + iload 6 + iconst 0 + iconst 103 + iload 3 + iload 4 + invoke 4483 + istore 7 +LABEL864: + jump LABEL942 +LABEL865: + iload 10 ; The id of the messageNode of the message being built + sconst "" + sconst "addTimestamp" + runelite_callback + pop_int ; pop message id + sload 14 + join_string 2 invoke 2066 - istore 12 - sstore 12 - sstore 11 + istore 13 + sstore 15 + sstore 14 sload 4 sconst "Broadcast:" sconst "" join_string 3 sload 11 - iload 7 + sload 14 + sconst "" + join_string 3 iload 8 - iconst 10616891 + iload 9 + iconst 10616888 iload 1 iconst 3 iconst 14 - iload 5 + iload 6 iconst 0 iconst 103 iload 3 iload 4 invoke 203 - istore 6 - jump LABEL445 -LABEL395: + istore 7 + jump LABEL942 +LABEL892: clientclock - iload 11 + iload 12 sub iconst 500 - if_icmpgt LABEL401 - jump LABEL416 -LABEL401: + if_icmpgt LABEL898 + jump LABEL913 +LABEL898: sconst "jk :P" - iload 7 iload 8 - iconst 10616891 + iload 9 + iconst 10616888 iload 1 iconst 3 iconst 14 - iload 5 + iload 6 iconst 0 iconst 103 iload 3 iload 4 invoke 199 - istore 6 - jump LABEL430 -LABEL416: - sload 11 - iload 7 + istore 7 + jump LABEL927 +LABEL913: + sload 14 iload 8 - iconst 10616891 + iload 9 + iconst 10616888 iload 1 iconst 3 iconst 14 - iload 5 + iload 6 iconst 0 iconst 103 iload 3 iload 4 invoke 199 - istore 6 -LABEL430: - jump LABEL445 -LABEL431: - iload 9 ; The id of the messageNode of the message being built - sconst "" - sconst "addTimestamp" - runelite_callback - pop_int ; pop message id - sload 11 - join_string 2 - iload 7 + istore 7 +LABEL927: + jump LABEL942 +LABEL928: + sload 14 iload 8 - iconst 10616891 + iload 9 + iconst 10616888 iload 1 iconst 3 iconst 14 - iload 5 + iload 6 iconst 0 iconst 103 iload 3 iload 4 invoke 199 - istore 6 -LABEL445: - iload 8 + istore 7 +LABEL942: + iload 9 if_clearops - iload 10 + iload 11 switch - 1: LABEL450 - 2: LABEL450 - 3: LABEL450 - 101: LABEL515 - 6: LABEL450 - 7: LABEL450 - 103: LABEL557 - 104: LABEL557 - 9: LABEL450 - 106: LABEL450 - 14: LABEL599 - 90: LABEL450 - 91: LABEL450 - jump LABEL659 -LABEL450: + 1: LABEL947 + 2: LABEL947 + 3: LABEL947 + 101: LABEL1051 + 6: LABEL947 + 7: LABEL947 + 103: LABEL1094 + 104: LABEL1094 + 9: LABEL947 + 41: LABEL947 + 106: LABEL947 + 44: LABEL947 + 109: LABEL1197 + 110: LABEL1094 + 14: LABEL1137 + 90: LABEL947 + 91: LABEL947 + jump LABEL1240 +LABEL947: sconst "" - sload 9 + sload 12 sconst "" join_string 3 - iload 8 + iload 9 if_setopbase iconst 86 iconst -2147483644 sconst "event_opbase" - sconst "is" - iload 8 + iload 11 + sconst "isi" + iload 9 if_setonop iconst -1 sconst "" - iload 8 + iload 9 if_setonmouserepeat iconst -1 sconst "" - iload 8 + iload 9 if_setonmouseleave sload 0 - sload 9 + sload 12 removetags compare iconst 0 - if_icmpne LABEL477 - jump LABEL514 -LABEL477: - iload 14 + if_icmpne LABEL975 + jump LABEL1050 +LABEL975: + iload 15 iconst 1 - if_icmpeq LABEL481 - jump LABEL486 -LABEL481: + if_icmpeq LABEL979 + jump LABEL984 +LABEL979: iconst 6 sconst "Message" - iload 8 + iload 9 if_setop - jump LABEL494 -LABEL486: + jump LABEL992 +LABEL984: iconst 6 sconst "Add friend" - iload 8 + iload 9 if_setop iconst 7 sconst "Add ignore" - iload 8 + iload 9 if_setop -LABEL494: +LABEL992: iconst 8 sconst "Report" - iload 8 + iload 9 if_setop - iload 10 + iload 11 iconst 9 - if_icmpeq LABEL502 - jump LABEL514 -LABEL502: + if_icmpeq LABEL1000 + jump LABEL1013 +LABEL1000: clan_getchatcount iconst 0 - if_icmpgt LABEL506 - jump LABEL514 -LABEL506: + if_icmpgt LABEL1004 + jump LABEL1012 +LABEL1004: clan_getchatrank clan_getchatminkick - if_icmpge LABEL510 - jump LABEL514 -LABEL510: + if_icmpge LABEL1008 + jump LABEL1012 +LABEL1008: iconst 9 sconst "Kick" - iload 8 + iload 9 if_setop -LABEL514: - jump LABEL671 -LABEL515: +LABEL1012: + jump LABEL1050 +LABEL1013: + iload 11 + iconst 41 + if_icmpeq LABEL1017 + jump LABEL1050 +LABEL1017: + iload 18 + iload 19 + if_icmpge LABEL1021 + jump LABEL1050 +LABEL1021: + iconst 0 + 3851 + iconst 1 + if_icmpeq LABEL1026 + jump LABEL1050 +LABEL1026: + sload 12 + removetags + 3860 + istore 17 + iload 17 + iconst -1 + if_icmpeq LABEL1038 + iload 17 + 3857 + iconst -1 + if_icmple LABEL1038 + jump LABEL1050 +LABEL1038: + iconst 9 + sconst "Kick" + iload 9 + if_setop + iload 18 + iload 20 + if_icmpge LABEL1046 + jump LABEL1050 +LABEL1046: + iconst 10 + sconst "Ban" + iload 9 + if_setop +LABEL1050: + jump LABEL1252 +LABEL1051: sconst "" - sload 9 + sload 12 sconst "" join_string 3 - iload 8 + iload 9 if_setopbase iconst 86 iconst -2147483644 sconst "event_opbase" - sconst "is" - iload 8 + iload 11 + sconst "isi" + iload 9 if_setonop iconst -1 sconst "" - iload 8 + iload 9 if_setonmouserepeat iconst -1 sconst "" - iload 8 + iload 9 if_setonmouseleave iconst 1 sconst "Accept trade" - iload 8 + iload 9 if_setop - iload 14 + iload 15 iconst 1 - if_icmpeq LABEL543 - jump LABEL548 -LABEL543: + if_icmpeq LABEL1080 + jump LABEL1085 +LABEL1080: iconst 6 sconst "Message" - iload 8 + iload 9 if_setop - jump LABEL556 -LABEL548: + jump LABEL1093 +LABEL1085: iconst 6 sconst "Add friend" - iload 8 + iload 9 if_setop iconst 7 sconst "Add ignore" - iload 8 + iload 9 if_setop -LABEL556: - jump LABEL671 -LABEL557: +LABEL1093: + jump LABEL1252 +LABEL1094: sconst "" - sload 9 + sload 12 sconst "" join_string 3 - iload 8 + iload 9 if_setopbase iconst 86 iconst -2147483644 sconst "event_opbase" - sconst "is" - iload 8 + iload 11 + sconst "isi" + iload 9 if_setonop iconst -1 sconst "" - iload 8 + iload 9 if_setonmouserepeat iconst -1 sconst "" - iload 8 + iload 9 if_setonmouseleave iconst 2 sconst "Accept challenge" - iload 8 + iload 9 if_setop - iload 14 + iload 15 iconst 1 - if_icmpeq LABEL585 - jump LABEL590 -LABEL585: + if_icmpeq LABEL1123 + jump LABEL1128 +LABEL1123: iconst 6 sconst "Message" - iload 8 + iload 9 if_setop - jump LABEL598 -LABEL590: + jump LABEL1136 +LABEL1128: iconst 6 sconst "Add friend" - iload 8 + iload 9 if_setop iconst 7 sconst "Add ignore" - iload 8 + iload 9 if_setop -LABEL598: - jump LABEL671 -LABEL599: - sload 12 +LABEL1136: + jump LABEL1252 +LABEL1137: + sload 15 string_length iconst 0 - if_icmpgt LABEL604 - jump LABEL633 -LABEL604: - iload 12 + if_icmpgt LABEL1142 + jump LABEL1171 +LABEL1142: + iload 13 iconst -1 - if_icmpne LABEL608 - jump LABEL633 -LABEL608: + if_icmpne LABEL1146 + jump LABEL1171 +LABEL1146: iconst 6 sconst "Open" - iload 8 + iload 9 if_setop iconst 7 sconst "Check" - iload 8 + iload 9 if_setop iconst 2065 - iload 8 + iload 9 if_getlayer - iload 7 + iload 8 iconst 3158271 sconst "Iii" - iload 8 + iload 9 if_setonmouserepeat iconst 2065 - iload 8 + iload 9 if_getlayer - iload 7 + iload 8 iload 3 sconst "Iii" - iload 8 + iload 9 if_setonmouseleave - jump LABEL641 -LABEL633: + jump LABEL1179 +LABEL1171: iconst -1 sconst "" - iload 8 + iload 9 if_setonmouserepeat iconst -1 sconst "" - iload 8 + iload 9 if_setonmouseleave -LABEL641: +LABEL1179: iconst 9 sconst "Clear history" - iload 8 + iload 9 if_setop sconst "" sconst "Notification" sconst "" join_string 3 - iload 8 + iload 9 if_setopbase iconst 2064 iconst -2147483644 - sload 12 - iload 12 + sload 15 + iload 13 sconst "isi" - iload 8 + iload 9 if_setonop - jump LABEL671 -LABEL659: - iconst -1 - sconst "" - iload 8 + jump LABEL1252 +LABEL1197: + sconst "" + sload 12 + sconst "" + join_string 3 + iload 9 + if_setopbase + iconst 2 + sconst "Form clan" + iload 9 + if_setop + iconst 86 + iconst -2147483644 + sconst "event_opbase" + iload 11 + sconst "isi" + iload 9 if_setonop iconst -1 sconst "" - iload 8 + iload 9 if_setonmouserepeat iconst -1 sconst "" - iload 8 + iload 9 if_setonmouseleave -LABEL671: - iload 5 + iload 15 + iconst 1 + if_icmpeq LABEL1226 + jump LABEL1231 +LABEL1226: + iconst 6 + sconst "Message" + iload 9 + if_setop + jump LABEL1239 +LABEL1231: + iconst 6 + sconst "Add friend" + iload 9 + if_setop + iconst 7 + sconst "Add ignore" + iload 9 + if_setop +LABEL1239: + jump LABEL1252 +LABEL1240: + iconst -1 + sconst "" + iload 9 + if_setonop + iconst -1 + sconst "" + iload 9 + if_setonmouserepeat + iconst -1 + sconst "" + iload 9 + if_setonmouseleave +LABEL1252: iload 6 - sub - istore 5 iload 7 + sub + istore 6 + iload 8 iconst 1 add - istore 7 + istore 8 iconst 105 iconst 73 iconst 579 - iload 7 + iload 8 enum - istore 8 -LABEL685: - iload 9 - chat_getprevuid istore 9 - jump LABEL153 -LABEL689: - iload 7 - istore 15 -LABEL691: +LABEL1266: + iload 10 + chat_getprevuid + istore 10 + jump LABEL222 +LABEL1270: iload 8 + istore 21 +LABEL1272: + iload 9 iconst -1 - if_icmpne LABEL695 - jump LABEL752 -LABEL695: - iload 8 + if_icmpne LABEL1276 + jump LABEL1359 +LABEL1276: + iload 9 if_clearops iconst -1 sconst "" - iload 8 + iload 9 if_setonop iconst -1 sconst "" - iload 8 + iload 9 if_setonmouserepeat iconst -1 sconst "" - iload 8 + iload 9 if_setonmouseleave iconst 0 iconst 0 iconst 0 iconst 0 - iload 8 + iload 9 if_setsize - iconst 10616891 - iload 7 - iconst 2 + iconst 10616888 + iload 8 + iconst 4 multiply cc_find iconst 1 - if_icmpeq LABEL723 - jump LABEL727 -LABEL723: + if_icmpeq LABEL1304 + jump LABEL1308 +LABEL1304: sconst "" cc_settext iconst 1 cc_sethide -LABEL727: - iconst 10616891 - iload 7 - iconst 2 +LABEL1308: + iconst 10616888 + iload 8 + iconst 4 multiply iconst 1 add cc_find iconst 1 - if_icmpeq LABEL737 - jump LABEL741 -LABEL737: + if_icmpeq LABEL1318 + jump LABEL1322 +LABEL1318: sconst "" cc_settext iconst 1 cc_sethide -LABEL741: - iload 7 +LABEL1322: + iconst 10616888 + iload 8 + iconst 4 + multiply + iconst 2 + add + cc_find + iconst 1 + if_icmpeq LABEL1332 + jump LABEL1336 +LABEL1332: + sconst "" + cc_settext + iconst 1 + cc_sethide +LABEL1336: + iconst 10616888 + iload 8 + iconst 4 + multiply + iconst 3 + add + cc_find + iconst 1 + if_icmpeq LABEL1346 + jump LABEL1348 +LABEL1346: + iconst 1 + cc_sethide +LABEL1348: + iload 8 iconst 1 add - istore 7 + istore 8 iconst 105 iconst 73 iconst 579 - iload 7 + iload 8 enum - istore 8 - jump LABEL691 -LABEL752: - iload 5 + istore 9 + jump LABEL1272 +LABEL1359: + iload 6 iconst 2 sub - istore 5 + istore 6 iconst 0 - iload 5 + iload 6 sub - istore 5 - iconst 10616891 + istore 6 + iconst 10616888 if_getheight - istore 16 - iload 5 - iload 16 - if_icmpgt LABEL767 - jump LABEL769 -LABEL767: - iload 5 - istore 16 -LABEL769: - iload 15 - istore 7 -LABEL771: - iload 7 + istore 22 + iload 6 + iload 22 + if_icmpgt LABEL1374 + jump LABEL1376 +LABEL1374: + iload 6 + istore 22 +LABEL1376: + iload 21 + istore 8 +LABEL1378: + iload 8 iconst 0 - if_icmpgt LABEL775 - jump LABEL828 -LABEL775: - iload 7 + if_icmpgt LABEL1382 + jump LABEL1465 +LABEL1382: + iload 8 iconst 1 sub - istore 7 + istore 8 iconst 105 iconst 73 iconst 579 - iload 7 - enum - istore 8 iload 8 + enum + istore 9 + iload 9 if_gety - iload 16 + iload 22 add iconst 2 sub - istore 5 - iload 8 + istore 6 + iload 9 if_getx - iload 5 + iload 6 iconst 0 iconst 0 - iload 8 + iload 9 if_setposition - iconst 10616891 - iload 7 - iconst 2 + iconst 10616888 + iload 8 + iconst 4 multiply cc_find iconst 1 - if_icmpeq LABEL807 - jump LABEL812 -LABEL807: + if_icmpeq LABEL1414 + jump LABEL1419 +LABEL1414: cc_getx - iload 5 + iload 6 iconst 0 iconst 0 cc_setposition -LABEL812: - iconst 10616891 - iload 7 - iconst 2 +LABEL1419: + iconst 10616888 + iload 8 + iconst 4 multiply iconst 1 add cc_find iconst 1 - if_icmpeq LABEL822 - jump LABEL827 -LABEL822: + if_icmpeq LABEL1429 + jump LABEL1434 +LABEL1429: cc_getx - iload 5 + iload 6 iconst 0 iconst 0 cc_setposition -LABEL827: - jump LABEL771 -LABEL828: +LABEL1434: + iconst 10616888 + iload 8 + iconst 4 + multiply + iconst 2 + add + cc_find + iconst 1 + if_icmpeq LABEL1444 + jump LABEL1449 +LABEL1444: + cc_getx + iload 6 iconst 0 - iload 16 - iconst 10616891 + iconst 0 + cc_setposition +LABEL1449: + iconst 10616888 + iload 8 + iconst 4 + multiply + iconst 3 + add + cc_find + iconst 1 + if_icmpeq LABEL1459 + jump LABEL1464 +LABEL1459: + cc_getx + iload 6 + iconst 0 + iconst 0 + cc_setposition +LABEL1464: + jump LABEL1378 +LABEL1465: + iconst 0 + iload 22 + iconst 10616888 if_setscrollsize - iconst 10617392 - iconst 10616891 + iconst 10617389 + iconst 10616888 get_varc_int 7 - iload 16 + iload 22 get_varc_int 8 sub add invoke 72 - iconst 10616891 + iconst 10616888 if_getscrolly - iload 16 + iload 22 set_varc_int 8 set_varc_int 7 return diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.hash b/runelite-client/src/main/scripts/ChatSplitBuilder.hash index c6e0b7405d..d780d97885 100644 --- a/runelite-client/src/main/scripts/ChatSplitBuilder.hash +++ b/runelite-client/src/main/scripts/ChatSplitBuilder.hash @@ -1 +1 @@ -C8549F688E1AEF9A485BFA552D7FEA8E0C9FDFAC006A879883320FFD82F5786B \ No newline at end of file +574EDB2E12BB45156BFCF57D301C12AD82DF34648A95478E666FA97F09065C22 \ 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 892a4f0a05..96519f314c 100644 --- a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm @@ -2,7 +2,7 @@ .int_stack_count 1 .string_stack_count 0 .int_var_count 18 -.string_var_count 4 +.string_var_count 6 iconst 0 istore 1 iconst 2 @@ -187,24 +187,33 @@ LABEL156: istore 15 iconst 0 istore 16 + sconst "" + sstore 4 + sconst "" + sstore 5 + sload 4 + sload 5 + invoke 4485 + sstore 5 + sstore 4 get_varc_int 55 get_varc_int 202 - if_icmpge LABEL176 - jump LABEL299 -LABEL176: + if_icmpge LABEL185 + jump LABEL311 +LABEL185: get_varc_int 55 clientclock iconst 3000 sub - if_icmpgt LABEL182 - jump LABEL299 -LABEL182: + if_icmpgt LABEL191 + jump LABEL311 +LABEL191: iconst 14 chat_gethistorylength iconst 0 - if_icmpgt LABEL187 - jump LABEL299 -LABEL187: + if_icmpgt LABEL196 + jump LABEL311 +LABEL196: iconst 14 iconst 0 chat_gethistory_bytypeandline @@ -216,9 +225,9 @@ LABEL187: istore 12 iload 12 iconst -1 - if_icmpne LABEL200 - jump LABEL299 -LABEL200: + if_icmpne LABEL209 + jump LABEL311 +LABEL209: sload 0 invoke 2066 istore 15 @@ -226,14 +235,17 @@ LABEL200: sstore 0 iload 15 iconst 4 - if_icmpne LABEL212 + if_icmpne LABEL221 reboottimer iconst 0 - if_icmple LABEL212 - jump LABEL299 -LABEL212: + if_icmple LABEL221 + jump LABEL311 +LABEL221: iload 7 + sload 5 sload 0 + sconst "" + join_string 3 iload 9 iload 10 iconst 10682368 @@ -253,14 +265,14 @@ LABEL212: sload 3 string_length iconst 0 - if_icmpgt LABEL235 - jump LABEL264 -LABEL235: + if_icmpgt LABEL247 + jump LABEL276 +LABEL247: iload 15 iconst -1 - if_icmpne LABEL239 - jump LABEL264 -LABEL239: + if_icmpne LABEL251 + jump LABEL276 +LABEL251: iconst 6 sconst "Open" iload 10 @@ -285,8 +297,8 @@ LABEL239: sconst "Iii" iload 10 if_setonmouseleave - jump LABEL272 -LABEL264: + jump LABEL284 +LABEL276: iconst -1 sconst "" iload 10 @@ -295,7 +307,7 @@ LABEL264: sconst "" iload 10 if_setonmouseleave -LABEL272: +LABEL284: iconst 9 sconst "Clear history" iload 10 @@ -323,41 +335,41 @@ LABEL272: iload 9 enum istore 10 -LABEL299: +LABEL311: iload 0 istore 12 iconst 0 istore 17 get_varp 287 iconst 1 - if_icmpeq LABEL307 - jump LABEL496 -LABEL307: + if_icmpeq LABEL319 + jump LABEL534 +LABEL319: get_varc_int 41 iconst 1337 - if_icmpne LABEL314 + if_icmpne LABEL326 get_varbit 4089 iconst 0 - if_icmpeq LABEL314 - jump LABEL496 -LABEL314: + if_icmpeq LABEL326 + jump LABEL534 +LABEL326: iload 12 iconst -1 - if_icmpne LABEL318 - jump LABEL496 -LABEL318: + if_icmpne LABEL330 + jump LABEL534 +LABEL330: iload 10 iconst -1 - if_icmpne LABEL322 - jump LABEL496 -LABEL322: + if_icmpne LABEL334 + jump LABEL534 +LABEL334: iload 7 iload 4 sub iconst 57 - if_icmplt LABEL328 - jump LABEL496 -LABEL328: + if_icmplt LABEL340 + jump LABEL534 +LABEL340: iload 12 chat_gethistory_byuid istore 14 @@ -373,7 +385,7 @@ LABEL328: invoke 91 iconst 1 if_icmpeq CHAT_FILTER ; Jump to our new label instead - jump LABEL492 + jump LABEL530 CHAT_FILTER: sload 0 ; Load the message iconst 1 ; Gets changed to 0 if message is blocked @@ -385,29 +397,35 @@ CHAT_FILTER: pop_int ; Pop the messageType iconst 1 ; 2nd half of conditional sstore 0 ; Override the message with our filtered message - if_icmpeq LABEL344 ; Check if we are building this message - jump LABEL492 -LABEL344: + if_icmpeq LABEL356 ; Check if we are building this message + jump LABEL530 +LABEL356: iload 17 switch - 3: LABEL347 - 6: LABEL368 - 7: LABEL347 - jump LABEL389 -LABEL347: + 3: LABEL359 + 5: LABEL411 + 6: LABEL385 + 7: LABEL359 + jump LABEL446 +LABEL359: iload 7 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 + sload 4 sconst "From " sload 1 sconst ":" sconst "privateChatSplitFrom" runelite_callback - join_string 4 ; Add the timestamp to the message + sconst "" + join_string 6 ; Add the timestamp to the message + sload 4 sload 0 + sconst "" + join_string 3 iload 9 iload 10 iconst 10682368 @@ -422,21 +440,26 @@ LABEL347: invoke 203 add istore 7 - jump LABEL424 -LABEL368: + jump LABEL462 +LABEL385: iload 7 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 + sload 4 sconst "To " sload 1 sconst ":" sconst "privateChatSplitTo" runelite_callback - join_string 4 ; Add the timestamp to the message + sconst "" + join_string 6 ; Add the timestamp to the message + sload 4 sload 0 + sconst "" + join_string 3 iload 9 iload 10 iconst 10682368 @@ -451,16 +474,18 @@ LABEL368: invoke 203 add istore 7 - jump LABEL424 -LABEL389: + jump LABEL462 +LABEL411: iload 7 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 - sload 0 ; Load the log in/out message - join_string 2 ; Add the timestamp to the message + sload 4 ; Load the log in/out message + sload 0 + sconst "" + join_string 4 iload 9 iload 10 iconst 10682368 @@ -475,16 +500,11 @@ LABEL389: invoke 199 add istore 7 - iload 17 - iconst 5 - if_icmpeq LABEL409 - jump LABEL424 -LABEL409: get_varbit 1627 iconst 0 - if_icmpeq LABEL413 - jump LABEL424 -LABEL413: + if_icmpeq LABEL434 + jump LABEL445 +LABEL434: iload 13 iconst 500 add @@ -496,31 +516,50 @@ LABEL413: sconst "1" iconst 10616832 if_setontimer -LABEL424: +LABEL445: + jump LABEL462 +LABEL446: + iload 7 + sload 0 + iload 9 + iload 10 + iconst 10682368 + iload 8 + iload 1 + iconst 13 + iload 7 + iload 2 + iload 3 + iconst 65535 + iconst 1 + invoke 199 + add + istore 7 +LABEL462: iload 10 if_clearops iload 17 iconst 3 - if_icmpeq LABEL436 + if_icmpeq LABEL474 iload 17 iconst 6 - if_icmpeq LABEL436 + if_icmpeq LABEL474 iload 17 iconst 7 - if_icmpeq LABEL436 - jump LABEL470 -LABEL436: + if_icmpeq LABEL474 + jump LABEL508 +LABEL474: iload 14 iconst 1 - if_icmpeq LABEL440 - jump LABEL445 -LABEL440: + if_icmpeq LABEL478 + jump LABEL483 +LABEL478: iconst 8 sconst "Message" iload 10 if_setop - jump LABEL453 -LABEL445: + jump LABEL491 +LABEL483: iconst 8 sconst "Add friend" iload 10 @@ -529,7 +568,7 @@ LABEL445: sconst "Add ignore" iload 10 if_setop -LABEL453: +LABEL491: iconst 10 sconst "Report" iload 10 @@ -546,13 +585,13 @@ LABEL453: sconst "is" iload 10 if_setonop - jump LABEL474 -LABEL470: + jump LABEL512 +LABEL508: iconst -1 sconst "" iload 10 if_setonop -LABEL474: +LABEL512: iconst -1 sconst "" iload 10 @@ -571,17 +610,17 @@ LABEL474: iload 9 enum istore 10 -LABEL492: +LABEL530: iload 12 chat_getprevuid istore 12 - jump LABEL314 -LABEL496: + jump LABEL326 +LABEL534: iload 10 iconst -1 - if_icmpne LABEL500 - jump LABEL557 -LABEL500: + if_icmpne LABEL538 + jump LABEL621 +LABEL538: iload 10 if_clearops iconst -1 @@ -604,34 +643,64 @@ LABEL500: if_setsize iconst 10682368 iload 9 - iconst 2 + iconst 4 multiply cc_find iconst 1 - if_icmpeq LABEL528 - jump LABEL532 -LABEL528: + if_icmpeq LABEL566 + jump LABEL570 +LABEL566: sconst "" cc_settext iconst 1 cc_sethide -LABEL532: +LABEL570: iconst 10682368 iload 9 - iconst 2 + iconst 4 multiply iconst 1 add cc_find iconst 1 - if_icmpeq LABEL542 - jump LABEL546 -LABEL542: + if_icmpeq LABEL580 + jump LABEL584 +LABEL580: sconst "" cc_settext iconst 1 cc_sethide -LABEL546: +LABEL584: + iconst 10682368 + iload 9 + iconst 4 + multiply + iconst 2 + add + cc_find + iconst 1 + if_icmpeq LABEL594 + jump LABEL598 +LABEL594: + sconst "" + cc_settext + iconst 1 + cc_sethide +LABEL598: + iconst 10682368 + iload 9 + iconst 4 + multiply + iconst 3 + add + cc_find + iconst 1 + if_icmpeq LABEL608 + jump LABEL610 +LABEL608: + iconst 1 + cc_sethide +LABEL610: iload 9 iconst 1 add @@ -642,6 +711,6 @@ LABEL546: iload 9 enum istore 10 - jump LABEL496 -LABEL557: + jump LABEL534 +LABEL621: return diff --git a/runelite-client/src/main/scripts/ChatboxInput.hash b/runelite-client/src/main/scripts/ChatboxInput.hash index b1540d80f2..068042f3ab 100644 --- a/runelite-client/src/main/scripts/ChatboxInput.hash +++ b/runelite-client/src/main/scripts/ChatboxInput.hash @@ -1 +1 @@ -7D172258726F2B866D2EFFB0F2E401D0551A377DCA7F72CCD8839AC88B3EA6A2 \ No newline at end of file +F7D45F13B835E5F5B889D4ECF3A4A61829794BAB447B7FFE676B19659238DAA9 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatboxInput.rs2asm b/runelite-client/src/main/scripts/ChatboxInput.rs2asm index 98567e8f1c..f2321db0ac 100644 --- a/runelite-client/src/main/scripts/ChatboxInput.rs2asm +++ b/runelite-client/src/main/scripts/ChatboxInput.rs2asm @@ -40,12 +40,26 @@ LABEL16: join_string 5 mes LABEL23: - jump LABEL27 + jump LABEL39 LABEL24: + iload 0 + iconst 3 + if_icmpeq LABEL31 + iload 0 + iconst 4 + if_icmpeq LABEL31 + jump LABEL36 +LABEL31: + sload 0 + iload 0 + iconst 0 + 5010 + jump LABEL39 +LABEL36: sload 0 iload 0 chat_sendpublic -LABEL27: +LABEL39: clientclock set_varc_int 61 return diff --git a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash index a030722f69..13638f4e91 100644 --- a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash +++ b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash @@ -1 +1 @@ -7AA081A68C6157F9B74DDB6B04F00B1691113941EED8996A4DEABF643F45EA25 \ No newline at end of file +F62AC1D5CB6A0C94DFCAEB8E4DC62E3513D0A757CADFDE2B1FF4418AF18AE841 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm index c523d51759..7656454e47 100644 --- a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm @@ -21,16 +21,16 @@ LABEL10: istore 0 sstore 0 iconst 1 - iconst 10616890 + iconst 10616887 if_settextshadow jump LABEL23 LABEL20: iconst 0 - iconst 10616890 + iconst 10616887 if_settextshadow LABEL23: iload 0 - iconst 10616890 + iconst 10616887 if_setcolour get_varc_string 335 string_length @@ -118,13 +118,13 @@ LABEL95: iconst 30 iconst 0 iconst 0 - iconst 10616871 + iconst 10616868 if_setsize iconst 0 iconst 0 iconst 0 iconst 2 - iconst 10616871 + iconst 10616868 if_setposition jump LABEL124 LABEL112: @@ -132,17 +132,17 @@ LABEL112: iconst 30 iconst 0 iconst 1 - iconst 10616871 + iconst 10616868 if_setsize iconst 0 iconst 0 iconst 0 iconst 2 - iconst 10616871 + iconst 10616868 if_setposition LABEL124: iload 3 - iconst 10616890 + iconst 10616887 if_getwidth if_icmpgt LABEL129 jump LABEL135 @@ -150,29 +150,29 @@ LABEL129: iconst 2 iconst 2 iconst 0 - iconst 10616890 + iconst 10616887 if_settextalign jump LABEL140 LABEL135: iconst 0 iconst 2 iconst 0 - iconst 10616890 + iconst 10616887 if_settextalign LABEL140: - iconst 10616890 + iconst 10616887 if_clearops iconst -1 sconst "" - iconst 10616890 + iconst 10616887 if_setonmouserepeat iconst -1 sconst "" - iconst 10616890 + iconst 10616887 if_setonmouseleave iconst -1 sconst "" - iconst 10616890 + iconst 10616887 if_setonop jump LABEL205 LABEL155: @@ -199,39 +199,39 @@ LABEL172: iconst 1 iconst 2 iconst 0 - iconst 10616890 + iconst 10616887 if_settextalign iconst 10 sconst "Configure" - iconst 10616890 + iconst 10616887 if_setop sconst "" sconst "Display name" sconst "" join_string 3 - iconst 10616890 + iconst 10616887 if_setopbase iconst 45 iconst -2147483645 iload 1 sconst "Ii" - iconst 10616890 + iconst 10616887 if_setonmouserepeat iconst 45 iconst -2147483645 iload 0 sconst "Ii" - iconst 10616890 + iconst 10616887 if_setonmouseleave iconst 489 iconst -2147483644 iconst 1024 sconst "ii" - iconst 10616890 + iconst 10616887 if_setonop LABEL205: sload 2 - iconst 10616890 + iconst 10616887 if_settext sconst "setChatboxInput" runelite_callback @@ -239,6 +239,6 @@ LABEL205: iconst 16 iconst 1 iconst 0 - iconst 10616890 + iconst 10616887 if_setsize return diff --git a/runelite-client/src/main/scripts/CommandScript.hash b/runelite-client/src/main/scripts/CommandScript.hash index 83ad002c3b..2aac5e8d08 100644 --- a/runelite-client/src/main/scripts/CommandScript.hash +++ b/runelite-client/src/main/scripts/CommandScript.hash @@ -1 +1 @@ -49F71301DDB45F2010BA8EFCA9D32D08C2CEF0A5F4F441A1CC1F1FE2CCFD7C36 \ No newline at end of file +2FE66C1A3B63EEF10142A955C927054613F59A34C4A929C8AC79DBE0F1B06C30 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/CommandScript.rs2asm b/runelite-client/src/main/scripts/CommandScript.rs2asm index 8616a625be..010bb90d02 100644 --- a/runelite-client/src/main/scripts/CommandScript.rs2asm +++ b/runelite-client/src/main/scripts/CommandScript.rs2asm @@ -1,13 +1,13 @@ .id 73 .int_stack_count 2 .string_stack_count 0 -.int_var_count 5 +.int_var_count 8 .string_var_count 0 - iconst 10616888 + iconst 10616885 if_gethide iconst 1 if_icmpeq LABEL9 - iconst 10616889 + iconst 10616886 if_gethide iconst 1 if_icmpeq LABEL9 @@ -32,193 +32,465 @@ LABEL20: istore 2 iconst 0 istore 3 - iconst 0 - istore 4 - invoke 1972 - iconst 1 - if_icmpeq LABEL31 - iconst 0 ; Modified to enable clanchat input - sconst "friendsChatInput" - runelite_callback - iconst 1 - if_icmpeq LABEL31 ; Compare to 1 - jump LABEL37 -LABEL31: - get_varc_int 41 - iconst 4 - if_icmpeq LABEL35 - jump LABEL37 -LABEL35: - iconst 1 - istore 4 -LABEL37: staffmodlevel iconst 0 - if_icmpgt LABEL41 - jump LABEL43 -LABEL41: + if_icmpgt LABEL29 + jump LABEL60 +LABEL29: iconst 1 istore 3 -LABEL43: - iload 3 - iconst 1 - if_icmpeq LABEL47 - jump LABEL58 -LABEL47: sconst "`" iload 1 string_indexof_char iconst -1 - if_icmpne LABEL53 - jump LABEL58 -LABEL53: + if_icmpne LABEL37 + jump LABEL42 +LABEL37: iload 2 iconst 0 - if_icmpeq LABEL57 - jump LABEL58 -LABEL57: + if_icmpeq LABEL41 + jump LABEL42 +LABEL41: return -LABEL58: - iload 0 - iconst 84 - if_icmpeq LABEL62 - jump LABEL194 -LABEL62: - invoke 1984 - iload 2 - iconst 0 - if_icmpgt LABEL67 - jump LABEL193 -LABEL67: - get_varc_string 335 - sconst "/" - iconst 0 - string_indexof_string - iconst 0 - if_icmpeq LABEL77 - iload 4 - iconst 1 - if_icmpeq LABEL77 - jump LABEL112 -LABEL77: - clan_getchatcount - iconst 0 - if_icmpgt LABEL81 - jump LABEL108 -LABEL81: - iload 2 - iconst 1 - if_icmple LABEL85 - jump LABEL90 -LABEL85: - iload 4 - iconst 0 - if_icmpeq LABEL89 - jump LABEL90 -LABEL89: - return -LABEL90: - get_varbit 4394 - iconst 1 - if_icmpeq LABEL94 - jump LABEL96 -LABEL94: - clan_leavechat - jump LABEL107 -LABEL96: - iload 4 - iconst 1 - if_icmpeq LABEL100 - jump LABEL104 -LABEL100: - sconst "/" - get_varc_string 335 - append - set_varc_string 335 -LABEL104: - get_varc_string 335 - iconst 2 - invoke 96 -LABEL107: - jump LABEL111 -LABEL108: - get_varc_string 335 - iconst 0 - invoke 96 -LABEL111: - jump LABEL189 -LABEL112: +LABEL42: + sconst ":" + iload 1 + string_indexof_char + iconst -1 + if_icmpne LABEL48 + jump LABEL60 +LABEL48: get_varc_string 335 sconst "::" iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL119 - jump LABEL186 -LABEL119: + if_icmpeq LABEL55 + jump LABEL60 +LABEL55: iload 2 iconst 2 - if_icmpgt LABEL123 - jump LABEL182 -LABEL123: + if_icmpeq LABEL59 + jump LABEL60 +LABEL59: + return +LABEL60: + iconst 0 + istore 4 + iconst -1 + istore 5 + iconst 0 + istore 6 + iconst -1 + istore 7 + iload 0 + iconst 84 + if_icmpeq LABEL72 + jump LABEL421 +LABEL72: + invoke 1984 + iload 2 + iconst 0 + if_icmpgt LABEL77 + jump LABEL420 +LABEL77: + iload 3 + iconst 1 + if_icmpeq LABEL81 + jump LABEL148 +LABEL81: + sconst "give" + iload 2 + invoke 4481 + iconst 1 + if_icmpeq LABEL87 + jump LABEL91 +LABEL87: + get_varc_string 335 + string_length + istore 2 + jump LABEL148 +LABEL91: + sconst "set" + iload 2 + invoke 4481 + iconst 1 + if_icmpeq LABEL97 + jump LABEL101 +LABEL97: + get_varc_string 335 + string_length + istore 2 + jump LABEL148 +LABEL101: + sconst "get" + iload 2 + invoke 4481 + iconst 1 + if_icmpeq LABEL107 + jump LABEL111 +LABEL107: + get_varc_string 335 + string_length + istore 2 + jump LABEL148 +LABEL111: + sconst "tele" + iload 2 + invoke 4481 + iconst 1 + if_icmpeq LABEL117 + jump LABEL121 +LABEL117: + get_varc_string 335 + string_length + istore 2 + jump LABEL148 +LABEL121: + sconst "~" + iload 2 + invoke 4481 + iconst 1 + if_icmpeq LABEL127 + jump LABEL131 +LABEL127: + get_varc_string 335 + string_length + istore 2 + jump LABEL148 +LABEL131: + get_varc_string 335 + sconst "::" + iconst 0 + string_indexof_string + istore 7 + iload 7 + iconst 0 + if_icmpgt LABEL140 + jump LABEL148 +LABEL140: + get_varc_string 335 + iload 7 + iload 2 + substring + set_varc_string 335 + get_varc_string 335 + string_length + istore 2 +LABEL148: + get_varc_string 335 + sconst "::" + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL155 + jump LABEL158 +LABEL155: + iconst 1 + istore 4 + jump LABEL171 +LABEL158: + get_varc_int 41 + iconst 5 + if_icmpeq LABEL162 + jump LABEL165 +LABEL162: + iconst 41 + istore 5 + jump LABEL171 +LABEL165: + get_varc_int 41 + iconst 4 + if_icmpeq LABEL169 + jump LABEL171 +LABEL169: + iconst 9 + istore 5 +LABEL171: + get_varc_string 335 + sconst "///" + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL185 + get_varc_string 335 + lowercase + sconst "/g " + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL185 + jump LABEL190 +LABEL185: + iconst 3 + iconst 44 + istore 5 + istore 6 + jump LABEL226 +LABEL190: + get_varc_string 335 + sconst "//" + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL197 + jump LABEL202 +LABEL197: + iconst 2 + iconst 41 + istore 5 + istore 6 + jump LABEL226 +LABEL202: + get_varc_string 335 + lowercase + sconst "/c " + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL210 + jump LABEL215 +LABEL210: + iconst 3 + iconst 41 + istore 5 + istore 6 + jump LABEL226 +LABEL215: + get_varc_string 335 + sconst "/" + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL222 + jump LABEL226 +LABEL222: + iconst 1 + iconst 9 + istore 5 + istore 6 +LABEL226: + iload 5 + iconst 44 + if_icmpeq LABEL230 + jump LABEL260 +LABEL230: + 3800 + iconst 1 + if_icmpeq LABEL234 + jump LABEL257 +LABEL234: + 3850 + iconst 1 + if_icmpeq LABEL238 + jump LABEL257 +LABEL238: + iload 2 + iload 6 + if_icmple LABEL242 + jump LABEL243 +LABEL242: + return +LABEL243: + 3803 + iconst 1 + if_icmpeq LABEL247 + jump LABEL254 +LABEL247: + get_varc_string 335 + iload 6 + iload 2 + substring + iconst 4 + invoke 96 + jump LABEL256 +LABEL254: + sconst "Guests are not invited to speak in this clan's channel." + mes +LABEL256: + jump LABEL259 +LABEL257: + sconst "You are not chatting as a guest in a clan channel at the moment." + mes +LABEL259: + jump LABEL416 +LABEL260: + iload 5 + iconst 41 + if_icmpeq LABEL264 + jump LABEL307 +LABEL264: + iconst 0 + 3851 + iconst 1 + if_icmpeq LABEL269 + jump LABEL304 +LABEL269: + get_varbit 931 + iconst 0 + if_icmpeq LABEL273 + jump LABEL301 +LABEL273: + iload 2 + iload 6 + if_icmple LABEL277 + jump LABEL278 +LABEL277: + return +LABEL278: + chat_playername + removetags + 3860 + istore 7 + iload 7 + iconst -1 + if_icmpne LABEL286 + jump LABEL298 +LABEL286: + iload 7 + 3857 + 3854 + if_icmpge LABEL291 + jump LABEL298 +LABEL291: + get_varc_string 335 + iload 6 + iload 2 + substring + iconst 3 + invoke 96 + jump LABEL300 +LABEL298: + sconst "You do not have the required rank to talk in the clan's channel." + mes +LABEL300: + jump LABEL303 +LABEL301: + sconst "You have muted your clan's channel. Unmute it if you wish to talk in it." + mes +LABEL303: + jump LABEL306 +LABEL304: + sconst "You are not chatting in the channel of your own clan at the moment." + mes +LABEL306: + jump LABEL416 +LABEL307: + iload 5 + iconst 9 + if_icmpeq LABEL311 + jump LABEL342 +LABEL311: + clan_getchatcount + iconst 0 + if_icmpgt LABEL315 + jump LABEL338 +LABEL315: + iload 2 + iload 6 + if_icmple LABEL319 + jump LABEL320 +LABEL319: + return +LABEL320: + get_varbit 4394 + iconst 1 + if_icmpeq LABEL324 + jump LABEL326 +LABEL324: + clan_leavechat + jump LABEL337 +LABEL326: + iload 6 + iconst 1 + if_icmplt LABEL330 + jump LABEL334 +LABEL330: + sconst "/" + get_varc_string 335 + append + set_varc_string 335 +LABEL334: + get_varc_string 335 + iconst 2 + invoke 96 +LABEL337: + jump LABEL341 +LABEL338: + get_varc_string 335 + iconst 0 + invoke 96 +LABEL341: + jump LABEL416 +LABEL342: + iload 4 + iconst 1 + if_icmpeq LABEL346 + jump LABEL413 +LABEL346: + iload 2 + iconst 2 + if_icmpgt LABEL350 + jump LABEL409 +LABEL350: get_varc_string 335 sconst "::toggleroof" iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL130 - jump LABEL144 -LABEL130: + if_icmpeq LABEL357 + jump LABEL371 +LABEL357: getremoveroofs iconst 1 - if_icmpeq LABEL134 - jump LABEL139 -LABEL134: + if_icmpeq LABEL361 + jump LABEL366 +LABEL361: iconst 0 setremoveroofs sconst "Roofs will only be removed selectively." mes - jump LABEL143 -LABEL139: + jump LABEL370 +LABEL366: iconst 1 setremoveroofs sconst "Roofs are now all hidden." mes -LABEL143: - jump LABEL181 -LABEL144: +LABEL370: + jump LABEL408 +LABEL371: get_varc_string 335 sconst "::wiki " iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL156 + if_icmpeq LABEL383 get_varc_string 335 sconst "::wiki" compare iconst 0 - if_icmpeq LABEL156 + if_icmpeq LABEL383 sconst "runeliteCommand" ; load callback name runelite_callback ; invoke callback - jump LABEL159 -LABEL156: + jump LABEL386 +LABEL383: get_varc_string 335 invoke 3299 - jump LABEL181 -LABEL159: + jump LABEL408 +LABEL386: get_varc_string 335 sconst "::bank" iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL166 - jump LABEL170 -LABEL166: + if_icmpeq LABEL393 + jump LABEL397 +LABEL393: sconst "Hey, everyone, I just tried to do something very silly!" iconst 0 invoke 96 - jump LABEL181 -LABEL170: + jump LABEL408 +LABEL397: get_varc_string 335 invoke 224 set_varc_string 335 @@ -230,91 +502,91 @@ LABEL170: iload 2 substring docheat -LABEL181: - jump LABEL185 -LABEL182: +LABEL408: + jump LABEL412 +LABEL409: get_varc_string 335 iconst 0 invoke 96 -LABEL185: - jump LABEL189 -LABEL186: +LABEL412: + jump LABEL416 +LABEL413: get_varc_string 335 iconst 0 invoke 96 -LABEL189: +LABEL416: get_varc_string 335 invoke 77 sconst "" set_varc_string 335 -LABEL193: - jump LABEL269 -LABEL194: +LABEL420: + jump LABEL496 +LABEL421: iload 0 iconst 104 - if_icmpeq LABEL198 - jump LABEL204 -LABEL198: + if_icmpeq LABEL425 + jump LABEL431 +LABEL425: iload 3 iconst 1 - if_icmpeq LABEL202 - jump LABEL203 -LABEL202: + if_icmpeq LABEL429 + jump LABEL430 +LABEL429: invoke 75 -LABEL203: - jump LABEL269 -LABEL204: +LABEL430: + jump LABEL496 +LABEL431: iload 0 iconst 105 - if_icmpeq LABEL208 - jump LABEL214 -LABEL208: + if_icmpeq LABEL435 + jump LABEL441 +LABEL435: iload 3 iconst 1 - if_icmpeq LABEL212 - jump LABEL213 -LABEL212: + if_icmpeq LABEL439 + jump LABEL440 +LABEL439: invoke 76 -LABEL213: - jump LABEL269 -LABEL214: +LABEL440: + jump LABEL496 +LABEL441: iload 0 iconst 80 - if_icmpeq LABEL218 - jump LABEL263 -LABEL218: + if_icmpeq LABEL445 + jump LABEL490 +LABEL445: iconst 40697935 iconst 1 cc_find iconst 1 - if_icmpeq LABEL224 - jump LABEL225 -LABEL224: + if_icmpeq LABEL451 + jump LABEL452 +LABEL451: return -LABEL225: +LABEL452: get_varc_string 356 string_length iconst 0 - if_icmpgt LABEL230 - jump LABEL250 -LABEL230: + if_icmpgt LABEL457 + jump LABEL477 +LABEL457: get_varc_string 356 friend_test iconst 1 - if_icmpeq LABEL235 - jump LABEL238 -LABEL235: + if_icmpeq LABEL462 + jump LABEL465 +LABEL462: get_varc_string 356 invoke 107 return -LABEL238: +LABEL465: get_varc_int 60 clientclock - if_icmpgt LABEL242 - jump LABEL243 -LABEL242: + if_icmpgt LABEL469 + jump LABEL470 +LABEL469: return -LABEL243: +LABEL470: clientclock iconst 50 add @@ -322,14 +594,14 @@ LABEL243: sconst "That player was not found on your Friends list." mes return -LABEL250: +LABEL477: get_varc_int 60 clientclock - if_icmpgt LABEL254 - jump LABEL255 -LABEL254: + if_icmpgt LABEL481 + jump LABEL482 +LABEL481: return -LABEL255: +LABEL482: clientclock iconst 50 add @@ -337,8 +609,8 @@ LABEL255: sconst "You haven't received any messages to which you can reply." mes return - jump LABEL269 -LABEL263: + jump LABEL496 +LABEL490: get_varc_string 335 iconst 0 iload 0 @@ -350,9 +622,9 @@ LABEL263: runelite_callback ; if_icmpeq SKIPSETVARC ; skip setting varc with input set_varc_string 335 - jump LABEL269 ; jump over SKIPSETVARC + jump LABEL496 ; jump over SKIPSETVARC SKIPSETVARC: pop_string ; pop message -LABEL269: +LABEL496: invoke 223 return diff --git a/runelite-client/src/main/scripts/FriendsChatSendKick.hash b/runelite-client/src/main/scripts/FriendsChatSendKick.hash index e1fb1db404..af362b7e58 100644 --- a/runelite-client/src/main/scripts/FriendsChatSendKick.hash +++ b/runelite-client/src/main/scripts/FriendsChatSendKick.hash @@ -1 +1 @@ -9B3B448D76D57F6D63C9CDA06E58695F6DEBE91F9EDF2D2C4876E064D1067FD6 \ No newline at end of file +5A68D15CBC52892CD84A0961CC0D5A84B653B4320F0AA3B11E80EE0D2126B584 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm b/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm index 5dc390b9fe..c0b56b46a4 100644 --- a/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm +++ b/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm @@ -12,23 +12,23 @@ jump CONFIRM_KICK ; Jump to our new label instead LABEL4: sconst "You can't kick players from your team during Wilderness Wars." - mes - return + mes + return LABEL7: - sconst "-Attempting to kick player from friends chat..." + sconst "-Attempting to kick player from chat-channel..." iconst 2 invoke 96 sload 0 - clan_kickuser + clan_kickuser jump LABEL73 LABEL73: - return + return CONFIRM_KICK: sload 0 ; Username we are trying to kick iconst 0 ; Modified if we are confirming the kick inside the plugin sconst "confirmFriendsChatKick" - runelite_callback - pop_string ; Pop username + runelite_callback + pop_string ; Pop username iconst 0 ; Compare against zero if_icmpgt LABEL73 ; Early return for chatbox panel confirmation jump LABEL7 diff --git a/runelite-client/src/main/scripts/OpenBankSearchInput.hash b/runelite-client/src/main/scripts/OpenBankSearchInput.hash index 0ce901832b..1e9b3ddc9a 100644 --- a/runelite-client/src/main/scripts/OpenBankSearchInput.hash +++ b/runelite-client/src/main/scripts/OpenBankSearchInput.hash @@ -1 +1 @@ -D503F0A0BDEC3DDA9719AB601F5EF294FBBE2747BA4B13529E61806FC65DDF77 \ No newline at end of file +1DEBBDF2928F79FE6BDEC5FB3BBF52A18A111D16CF7E079F51B349C6F6DB654A \ No newline at end of file diff --git a/runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm b/runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm index 547863277a..c5c4212f0c 100644 --- a/runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm +++ b/runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm @@ -15,7 +15,7 @@ LABEL5: sconst "Show items whose names contain the following text:" sconst "setSearchBankInputText" ; load event name runelite_callback ; invoke callback - iconst 10616876 + iconst 10616873 if_settext sconst "" invoke 222 @@ -26,11 +26,11 @@ LABEL5: iconst -2147483639 sload 0 sconst "izs" - iconst 10616877 + iconst 10616874 if_setonkey iconst 138 sconst "" - iconst 10616877 + iconst 10616874 if_setondialogabort invoke 1972 iconst 1 diff --git a/runelite-client/src/main/scripts/PrivateMessage.hash b/runelite-client/src/main/scripts/PrivateMessage.hash index 2153464d80..40e5d70cc6 100644 --- a/runelite-client/src/main/scripts/PrivateMessage.hash +++ b/runelite-client/src/main/scripts/PrivateMessage.hash @@ -1 +1 @@ -12B91B740FE760F73A23EF34E1D4F53EA00F829EF7FC33E648F6FF5EA17417A0 \ No newline at end of file +559DA005256EF939AA48F2B0B2B8C5D05168D50D378253DF81B0B68C20331A95 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/PrivateMessage.rs2asm b/runelite-client/src/main/scripts/PrivateMessage.rs2asm index 79ca64e02c..ee8c024fa3 100644 --- a/runelite-client/src/main/scripts/PrivateMessage.rs2asm +++ b/runelite-client/src/main/scripts/PrivateMessage.rs2asm @@ -25,7 +25,7 @@ LABEL10: iload 1 iconst 0 if_icmpgt LABEL21 - jump LABEL187 + jump LABEL255 LABEL21: get_varc_int 5 switch @@ -36,18 +36,22 @@ LABEL21: 5: LABEL26 6: LABEL47 7: LABEL110 - 8: LABEL114 - 9: LABEL120 - 10: LABEL123 - 11: LABEL179 - 12: LABEL139 - 13: LABEL157 - 15: LABEL120 - 16: LABEL184 - jump LABEL186 + 8: LABEL116 + 9: LABEL124 + 10: LABEL191 + 11: LABEL247 + 12: LABEL207 + 13: LABEL225 + 15: LABEL124 + 16: LABEL252 + 18: LABEL247 + 19: LABEL110 + 20: LABEL124 + 21: LABEL124 + jump LABEL254 LABEL24: return - jump LABEL186 + jump LABEL254 LABEL26: ignore_count iconst 0 @@ -75,7 +79,7 @@ LABEL44: get_varc_string 359 ignore_del LABEL46: - jump LABEL186 + jump LABEL254 LABEL47: friend_count iconst 0 @@ -159,77 +163,149 @@ LABEL107: clientclock set_varc_int 61 LABEL109: - jump LABEL186 + jump LABEL254 LABEL110: get_varc_string 359 invoke 212 resume_countdialog - jump LABEL186 -LABEL114: + iconst 0 + set_varc_int 5 + jump LABEL254 +LABEL116: get_varc_string 359 removetags set_varc_string 361 get_varc_string 359 resume_namedialog + iconst 0 + set_varc_int 5 + jump LABEL254 +LABEL124: + get_varc_int 5 + iconst 20 + if_icmpeq LABEL128 + jump LABEL132 +LABEL128: + get_varc_string 359 + removetags + invoke 4394 jump LABEL186 -LABEL120: +LABEL132: + get_varc_int 5 + iconst 21 + if_icmpeq LABEL136 + jump LABEL186 +LABEL136: + get_varc_string 359 + sconst "jagex" + sconst " " + invoke 4191 + set_varc_string 359 + get_varc_string 359 + sconst "jaqex" + sconst " " + invoke 4191 + set_varc_string 359 + get_varc_string 359 + sconst "jagx" + sconst " " + invoke 4191 + set_varc_string 359 + get_varc_string 359 + sconst "jgex" + sconst " " + invoke 4191 + set_varc_string 359 + get_varc_string 359 + sconst "jgx" + sconst " " + invoke 4191 + set_varc_string 359 + get_varc_string 359 + sconst "admin" + sconst " " + invoke 4191 + set_varc_string 359 + get_varc_string 359 + sconst "staff" + sconst " " + invoke 4191 + set_varc_string 359 + get_varc_string 359 + sconst "-" + sconst " " + invoke 4191 + set_varc_string 359 + get_varc_string 359 + sconst "_" + sconst " " + invoke 4191 + set_varc_string 359 + get_varc_string 359 + sconst " " + sconst " " + invoke 4191 + set_varc_string 359 +LABEL186: get_varc_string 359 resume_stringdialog - jump LABEL186 -LABEL123: + iconst 0 + set_varc_int 5 + jump LABEL254 +LABEL191: get_varbit 8119 iconst 0 - if_icmpeq LABEL127 - jump LABEL133 -LABEL127: + if_icmpeq LABEL195 + jump LABEL201 +LABEL195: iconst 1 iconst 1 invoke 299 sconst "You must set a name before you can chat." mes return -LABEL133: +LABEL201: get_varc_string 359 removetags set_varc_string 362 get_varc_string 359 clan_joinchat - jump LABEL186 -LABEL139: + jump LABEL254 +LABEL207: iload 1 iconst 10 - if_icmpgt LABEL143 - jump LABEL149 -LABEL143: + if_icmpgt LABEL211 + jump LABEL217 +LABEL211: get_varc_string 359 iconst 0 iconst 9 substring sstore 0 - jump LABEL151 -LABEL149: + jump LABEL219 +LABEL217: get_varc_string 359 sstore 0 -LABEL151: +LABEL219: sload 0 lowercase chat_setmessagefilter invoke 553 invoke 84 - jump LABEL186 -LABEL157: + jump LABEL254 +LABEL225: get_varbit 8119 iconst 0 - if_icmpeq LABEL161 - jump LABEL167 -LABEL161: + if_icmpeq LABEL229 + jump LABEL235 +LABEL229: iconst 1 iconst 1 invoke 299 sconst "You must set a name before you can chat." mes return -LABEL167: +LABEL235: get_varc_string 359 iconst 0 set_varc_int 62 @@ -239,35 +315,37 @@ LABEL167: iconst -2147483645 iconst 1 sconst "I1" - iconst 10616845 + iconst 10616843 if_setontimer - jump LABEL186 -LABEL179: + jump LABEL254 +LABEL247: iconst 0 iconst 1 invoke 299 return - jump LABEL186 -LABEL184: + jump LABEL254 +LABEL252: get_varc_string 359 invoke 2061 -LABEL186: - jump LABEL193 -LABEL187: +LABEL254: + jump LABEL261 +LABEL255: get_varc_int 5 switch - 16: LABEL192 - 7: LABEL190 - 8: LABEL190 - 9: LABEL190 - 15: LABEL190 - jump LABEL193 -LABEL190: + 16: LABEL260 + 20: LABEL258 + 21: LABEL258 + 7: LABEL258 + 8: LABEL258 + 9: LABEL258 + 15: LABEL258 + jump LABEL261 +LABEL258: return - jump LABEL193 -LABEL192: + jump LABEL261 +LABEL260: return -LABEL193: +LABEL261: iconst 1 iconst 1 invoke 299 diff --git a/runelite-client/src/main/scripts/ResetChatboxInput.hash b/runelite-client/src/main/scripts/ResetChatboxInput.hash index 6f2b789612..88a7f5569b 100644 --- a/runelite-client/src/main/scripts/ResetChatboxInput.hash +++ b/runelite-client/src/main/scripts/ResetChatboxInput.hash @@ -1 +1 @@ -A9577B60999F586BCC424D2312B2D4A5D033DB0A3228719B9BA1DFD9742B92E7 \ No newline at end of file +FDFF71BAC7D5E10C1E88F445D60100552D0C5B14A66F8648FFEC39573ECFBE8E \ 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 899616d7fa..1455a92161 100644 --- a/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm +++ b/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm @@ -6,10 +6,10 @@ sconst "resetChatboxInput" runelite_callback iconst 1 - iconst 10616872 + iconst 10616869 if_sethide iconst 0 - iconst 10616888 + iconst 10616885 if_sethide invoke 923 iconst 0 @@ -42,206 +42,228 @@ LABEL27: LABEL31: invoke 2581 LABEL32: + get_varc_int 5 + switch + 19: LABEL35 + 20: LABEL41 + 21: LABEL41 + 7: LABEL35 + 8: LABEL38 + 9: LABEL41 + 15: LABEL41 + jump LABEL43 +LABEL35: + sconst "0" + resume_countdialog + jump LABEL43 +LABEL38: + sconst "" + resume_namedialog + jump LABEL43 +LABEL41: + sconst "" + resume_stringdialog +LABEL43: iconst 0 set_varc_int 5 iload 0 iconst 1 - if_icmpeq LABEL38 - jump LABEL40 -LABEL38: + if_icmpeq LABEL49 + jump LABEL51 +LABEL49: sconst "" set_varc_string 359 -LABEL40: +LABEL51: iconst 0 iconst -8 iconst 1 iconst 1 - iconst 10616876 + iconst 10616873 if_setposition iconst 0 iconst 40 iconst 1 iconst 0 - iconst 10616876 + iconst 10616873 if_setsize iconst 0 iconst 22 iconst 1 iconst 1 - iconst 10616877 + iconst 10616874 if_setposition iconst 0 iconst 20 iconst 1 iconst 0 - iconst 10616877 + iconst 10616874 if_setsize iconst 0 - iconst 10616876 + iconst 10616873 if_sethide iconst 0 - iconst 10616877 + iconst 10616874 if_sethide iconst 1 - iconst 10616881 + iconst 10616878 if_sethide iconst 1 - iconst 10616887 + iconst 10616884 if_sethide iconst 0 iconst 0 - iconst 10616885 + iconst 10616882 if_setscrollpos - iconst 10616885 + iconst 10616882 cc_deleteall - iconst 10616886 + iconst 10616883 cc_deleteall iconst 0 iconst -8 iconst 1 iconst 1 - iconst 10616876 + iconst 10616873 if_setposition iconst 0 iconst 40 iconst 1 iconst 0 - iconst 10616876 + iconst 10616873 if_setsize iconst 1 iconst 1 iconst 0 - iconst 10616876 + iconst 10616873 if_settextalign iconst 496 - iconst 10616876 + iconst 10616873 if_settextfont iconst 496 - iconst 10616877 + iconst 10616874 if_settextfont iconst 128 - iconst 10616877 + iconst 10616874 if_setcolour iconst -1 sconst "" - iconst 10616877 + iconst 10616874 if_setonmouseover iconst -1 sconst "" - iconst 10616877 + iconst 10616874 if_setonmouseleave sconst "" - iconst 10616877 + iconst 10616874 if_settext iconst 0 iconst 22 iconst 1 iconst 1 - iconst 10616877 + iconst 10616874 if_setposition iconst -1 sconst "" - iconst 10616872 + iconst 10616869 if_setonclick iconst -1 sconst "" - iconst 10616877 + iconst 10616874 if_setonclick iconst -1 sconst "" - iconst 10616877 + iconst 10616874 if_setonkey iconst 1 - iconst 10616874 + iconst 10616871 if_sethide iconst -1 sconst "" - iconst 10616872 + iconst 10616869 if_setonclick iconst -1 sconst "" - iconst 10616872 + iconst 10616869 if_setontimer - iconst 10616872 + iconst 10616869 cc_deleteall - iconst 10616878 + iconst 10616875 cc_deleteall - iconst 10616879 + iconst 10616876 cc_deleteall - iconst 10616880 + iconst 10616877 cc_deleteall iconst 1 - iconst 10616878 + iconst 10616875 if_sethide iconst 1 - iconst 10616879 + iconst 10616876 if_sethide iconst 1 - iconst 10616880 + iconst 10616877 if_sethide iconst -1 sconst "" - iconst 10616878 + iconst 10616875 if_setonmouserepeat iconst -1 sconst "" - iconst 10616879 + iconst 10616876 if_setonmouserepeat iconst -1 sconst "" - iconst 10616880 + iconst 10616877 if_setonmouserepeat iconst -1 sconst "" - iconst 10616878 + iconst 10616875 if_setonmouseleave iconst -1 sconst "" - iconst 10616879 + iconst 10616876 if_setonmouseleave iconst -1 sconst "" - iconst 10616880 + iconst 10616877 if_setonmouseleave iconst -1 sconst "" - iconst 10616878 + iconst 10616875 if_setontimer iconst -1 sconst "" - iconst 10616879 + iconst 10616876 if_setontimer iconst -1 sconst "" - iconst 10616880 + iconst 10616877 if_setontimer iconst -1 sconst "" - iconst 10616878 + iconst 10616875 if_setonclick iconst -1 sconst "" - iconst 10616879 + iconst 10616876 if_setonclick iconst -1 sconst "" - iconst 10616880 + iconst 10616877 if_setonclick get_varc_int 41 iconst 1337 - if_icmpeq LABEL219 - jump LABEL223 -LABEL219: + if_icmpeq LABEL230 + jump LABEL234 +LABEL230: invoke 2526 pop_int clientclock set_varc_int 384 -LABEL223: +LABEL234: invoke 1972 iconst 1 - if_icmpeq LABEL227 - jump LABEL228 -LABEL227: + if_icmpeq LABEL238 + jump LABEL239 +LABEL238: invoke 2581 -LABEL228: +LABEL239: return diff --git a/runelite-client/src/main/scripts/ToplevelChatboxBackground.hash b/runelite-client/src/main/scripts/ToplevelChatboxBackground.hash index f5ddb51c2a..f3f2393a6d 100644 --- a/runelite-client/src/main/scripts/ToplevelChatboxBackground.hash +++ b/runelite-client/src/main/scripts/ToplevelChatboxBackground.hash @@ -1 +1 @@ -8567736DBA2A2558DBD5883204C10FF794768C18DB4D85FE44C0959EB7F40885 \ No newline at end of file +1CEB4F2F85A8FECA9D9CB80DCAF0CB6A1FB3670607C6CDE80363BC40E95CA1E3 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm b/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm index aae32a2576..c2c74f11c5 100644 --- a/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm +++ b/runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm @@ -45,7 +45,7 @@ LABEL26: invoke 183 LABEL31: iload 0 - iconst 10616869 + iconst 10616866 if_sethide get_varbit 6374 iconst 1 @@ -61,13 +61,13 @@ LABEL42: iconst 0 iconst 2 iconst 0 - iconst 10616891 + iconst 10616888 if_setposition iconst -1 iconst 0 iconst 0 iconst 0 - iconst 10617392 + iconst 10617389 if_setposition jump LABEL67 LABEL55: @@ -75,18 +75,18 @@ LABEL55: iconst 0 iconst 0 iconst 0 - iconst 10616891 + iconst 10616888 if_setposition iconst 0 iconst 0 iconst 2 iconst 0 - iconst 10617392 + iconst 10617389 if_setposition LABEL67: - iconst 10616870 + iconst 10616867 cc_deleteall - iconst 10616889 + iconst 10616886 cc_deleteall iconst 0 istore 1 @@ -105,13 +105,13 @@ LABEL81: iconst 2155 get_varc_int 223 sconst "i" - iconst 10616870 + iconst 10616867 if_setontimer jump LABEL93 LABEL89: iconst -1 sconst "" - iconst 10616870 + iconst 10616867 if_setontimer LABEL93: invoke 921 @@ -120,14 +120,14 @@ LABEL93: jump LABEL163 LABEL97: iconst 1 - iconst 10616870 + iconst 10616867 if_setnoclickthrough iload 1 iconst 0 if_icmpeq LABEL104 jump LABEL142 LABEL104: - iconst 10616870 + iconst 10616867 iconst 5 iconst 0 cc_create @@ -147,7 +147,7 @@ LABEL104: cc_settiling iconst 0 cc_settrans - iconst 10616889 + iconst 10616886 iconst 3 iconst 0 cc_create @@ -166,7 +166,7 @@ LABEL104: iconst 1 cc_setfill LABEL142: - iconst 10617392 + iconst 10617389 iconst 792 iconst 789 iconst 790 @@ -203,15 +203,15 @@ LABEL163: jump LABEL177 LABEL173: iconst 1 - iconst 10616870 + iconst 10616867 if_setnoclickthrough jump LABEL183 LABEL177: iconst 0 - iconst 10616870 + iconst 10616867 if_setnoclickthrough iconst 1 - iconst 10616870 + iconst 10616867 2006 LABEL183: iconst 0 @@ -231,7 +231,7 @@ LABEL193: if_icmplt LABEL197 jump LABEL272 LABEL197: - iconst 10616870 + iconst 10616867 iconst 3 iload 4 cc_create @@ -251,13 +251,13 @@ LABEL197: cc_setfill iconst 254 cc_settrans - iconst 10616889 + iconst 10616886 iconst 3 iload 4 iconst 2 multiply cc_create - iconst 10616889 + iconst 10616886 iconst 3 iload 4 iconst 2 @@ -311,7 +311,7 @@ LABEL272: runelite_callback jump LABEL339 LABEL273: - iconst 10616870 + iconst 10616867 iconst 3 iload 4 cc_create @@ -331,13 +331,13 @@ LABEL273: cc_setfill iconst 225 cc_settrans - iconst 10616889 + iconst 10616886 iconst 3 iload 4 iconst 2 multiply cc_create - iconst 10616889 + iconst 10616886 iconst 3 iload 4 iconst 2 @@ -378,7 +378,7 @@ LABEL273: iconst 130 cc_settrans 1 LABEL339: - iconst 10617392 + iconst 10617389 iconst 1190 iconst 1187 iconst 1188