diff --git a/cache/src/test/resources/net/runelite/cache/script/assembler/681.rs2asm b/cache/src/test/resources/net/runelite/cache/script/assembler/681.rs2asm index b70b4c7eee..a5f4222fdb 100644 --- a/cache/src/test/resources/net/runelite/cache/script/assembler/681.rs2asm +++ b/cache/src/test/resources/net/runelite/cache/script/assembler/681.rs2asm @@ -3,28 +3,28 @@ .string_stack_count 0 .int_var_count 2 .string_var_count 1 - get_varc 5 - load_int 14 + get_varc_int 5 + iconst 14 if_icmpeq LABEL4 jump LABEL7 LABEL4: - load_int 1 - put_varc 66 + iconst 1 + set_varc_int 66 return LABEL7: - load_int -1 + iconst -1 istore 0 - load_string "" + sconst "" sstore 0 - get_varc_string 22 + get_varc_string_old 22 string_length istore 1 iload 1 - load_int 0 + iconst 0 if_icmpgt LABEL18 jump LABEL193 LABEL18: - get_varc 5 + get_varc_int 5 switch 1: LABEL21 2: LABEL44 @@ -46,90 +46,90 @@ LABEL21: return jump LABEL192 LABEL23: - get_ignorecount - load_int 0 + ignore_count + iconst 0 if_icmplt LABEL27 jump LABEL30 LABEL27: - load_string "Unable to update ignore list - system busy." - send_game_message + sconst "Unable to update ignore list - system busy." + mes jump LABEL43 LABEL30: - get_varc 5 - load_int 4 + get_varc_int 5 + iconst 4 if_icmpeq LABEL34 jump LABEL37 LABEL34: - get_varc_string 22 - add_ignore + get_varc_string_old 22 + ignore_add jump LABEL43 LABEL37: - get_varc 5 - load_int 5 + get_varc_int 5 + iconst 5 if_icmpeq LABEL41 jump LABEL43 LABEL41: - get_varc_string 22 - remove_ignore + get_varc_string_old 22 + ignore_del LABEL43: jump LABEL192 LABEL44: - get_friendcount - load_int 0 + friend_count + iconst 0 if_icmplt LABEL48 jump LABEL51 LABEL48: - load_string "Unable to complete action - system busy." - send_game_message + sconst "Unable to complete action - system busy." + mes jump LABEL109 LABEL51: - get_varc 5 - load_int 2 + get_varc_int 5 + iconst 2 if_icmpeq LABEL55 jump LABEL58 LABEL55: - get_varc_string 22 - add_friend + get_varc_string_old 22 + friend_add jump LABEL109 LABEL58: - get_varc 5 - load_int 3 + get_varc_int 5 + iconst 3 if_icmpeq LABEL62 jump LABEL65 LABEL62: - get_varc_string 22 - remove_friend + get_varc_string_old 22 + friend_del jump LABEL109 LABEL65: - get_varc 5 - load_int 6 + get_varc_int 5 + iconst 6 if_icmpeq LABEL69 jump LABEL109 LABEL69: - get_varc 203 - load_int 0 + get_varc_int 203 + iconst 0 if_icmpeq LABEL76 - get_varc 203 - load_int -1 + get_varc_int 203 + iconst -1 if_icmpeq LABEL76 jump LABEL82 LABEL76: - load_int 1 - load_int 1 + iconst 1 + iconst 1 invoke 299 - load_string "You must set a name before you can chat." - send_game_message + sconst "You must set a name before you can chat." + mes return LABEL82: - 5005 - load_int 2 + chat_getfilter_private + iconst 2 if_icmpeq LABEL86 jump LABEL97 LABEL86: - 5000 - load_int 1 - 5016 - chatfilter_update + chat_getfilter_public + iconst 1 + chat_getfilter_trade + chat_setfilter invoke 178 invoke 553 istore 0 @@ -139,123 +139,123 @@ LABEL86: invoke 89 LABEL97: get_varbit 4394 - load_int 1 + iconst 1 if_icmpeq LABEL101 jump LABEL104 LABEL101: - get_varc_string 23 - remove_friend + get_varc_string_old 23 + friend_del jump LABEL107 LABEL104: - get_varc_string 23 - get_varc_string 22 - privmsg + get_varc_string_old 23 + get_varc_string_old 22 + chat_sendprivate LABEL107: - get_gamecycle - put_varc 61 + clientclock + set_varc_int 61 LABEL109: jump LABEL192 LABEL110: - get_varc_string 22 + get_varc_string_old 22 invoke 212 - numeric_input + resume_countdialog jump LABEL192 LABEL114: - get_varc_string 22 - string_remove_html - put_varc_string 128 - get_varc_string 22 - string_input_1 + get_varc_string_old 22 + removetags + set_varc_string_old 128 + get_varc_string_old 22 + resume_namedialog jump LABEL192 LABEL120: - get_varc_string 22 - string_input_2 + get_varc_string_old 22 + resume_stringdialog jump LABEL192 LABEL123: - get_varc 203 - load_int 0 + get_varc_int 203 + iconst 0 if_icmpeq LABEL130 - get_varc 203 - load_int -1 + get_varc_int 203 + iconst -1 if_icmpeq LABEL130 jump LABEL136 LABEL130: - load_int 1 - load_int 1 + iconst 1 + iconst 1 invoke 299 - load_string "You must set a name before you can chat." - send_game_message + sconst "You must set a name before you can chat." + mes return LABEL136: - get_varc_string 22 - string_remove_html - put_varc_string 129 - get_varc_string 22 - join_clanchat + get_varc_string_old 22 + removetags + set_varc_string_old 129 + get_varc_string_old 22 + clan_joinchat jump LABEL192 LABEL142: iload 1 - load_int 10 + iconst 10 if_icmpgt LABEL146 jump LABEL152 LABEL146: - get_varc_string 22 - load_int 0 - load_int 9 - string_substring + get_varc_string_old 22 + iconst 0 + iconst 9 + substring sstore 0 jump LABEL154 LABEL152: - get_varc_string 22 + get_varc_string_old 22 sstore 0 LABEL154: sload 0 - tolowercase - 5021 + lowercase + chat_setmessagefilter invoke 553 invoke 84 jump LABEL192 LABEL160: - get_varc 203 - load_int 0 + get_varc_int 203 + iconst 0 if_icmpeq LABEL167 - get_varc 203 - load_int -1 + get_varc_int 203 + iconst -1 if_icmpeq LABEL167 jump LABEL173 LABEL167: - load_int 1 - load_int 1 + iconst 1 + iconst 1 invoke 299 - load_string "You must set a name before you can chat." - send_game_message + sconst "You must set a name before you can chat." + mes return LABEL173: - get_varc_string 22 - load_int 0 - put_varc 62 - put_varc_string 28 + get_varc_string_old 22 + iconst 0 + set_varc_int 62 + set_varc_string_old 28 invoke 95 - load_int 552 - load_int -2147483645 - load_int 1 - load_string "I1" - load_int 10616843 - widget_put_render_listener_widget + iconst 552 + iconst -2147483645 + iconst 1 + sconst "I1" + iconst 10616843 + if_setontimer jump LABEL192 LABEL185: - load_int 0 - load_int 1 + iconst 0 + iconst 1 invoke 299 return jump LABEL192 LABEL190: - get_varc_string 22 + get_varc_string_old 22 invoke 2061 LABEL192: jump LABEL199 LABEL193: - get_varc 5 + get_varc_int 5 switch 16: LABEL198 7: LABEL196 @@ -269,7 +269,7 @@ LABEL196: LABEL198: return LABEL199: - load_int 1 - load_int 1 + iconst 1 + iconst 1 invoke 299 return diff --git a/cache/src/test/resources/net/runelite/cache/script/assembler/91.rs2asm b/cache/src/test/resources/net/runelite/cache/script/assembler/91.rs2asm index 901c7169ad..25a749a77b 100644 --- a/cache/src/test/resources/net/runelite/cache/script/assembler/91.rs2asm +++ b/cache/src/test/resources/net/runelite/cache/script/assembler/91.rs2asm @@ -12,111 +12,111 @@ jump LABEL84 LABEL3: iload 1 - get_varc 175 + get_varc_int 175 if_icmplt LABEL7 jump LABEL9 LABEL7: - load_int 0 + iconst 0 return LABEL9: sload 0 - string_remove_html - is_ignore - load_int 1 + removetags + ignore_test + iconst 1 if_icmpeq LABEL15 jump LABEL17 LABEL15: - load_int 0 + iconst 0 return LABEL17: - load_int 1 + iconst 1 return jump LABEL84 LABEL20: iload 1 - get_varc 175 + get_varc_int 175 if_icmplt LABEL24 jump LABEL26 LABEL24: - load_int 0 + iconst 0 return LABEL26: sload 0 - string_remove_html - is_ignore - load_int 1 + removetags + ignore_test + iconst 1 if_icmpeq LABEL32 jump LABEL34 LABEL32: - load_int 0 + iconst 0 return LABEL34: - 5005 - load_int 0 + chat_getfilter_private + iconst 0 if_icmpeq LABEL38 jump LABEL40 LABEL38: - load_int 1 + iconst 1 return LABEL40: - 5005 - load_int 1 + chat_getfilter_private + iconst 1 if_icmpeq LABEL44 jump LABEL51 LABEL44: sload 0 - is_friend - load_int 1 + friend_test + iconst 1 if_icmpeq LABEL49 jump LABEL51 LABEL49: - load_int 1 + iconst 1 return LABEL51: - load_int 0 + iconst 0 return jump LABEL84 LABEL54: iload 1 - get_varc 175 + get_varc_int 175 if_icmplt LABEL58 jump LABEL60 LABEL58: - load_int 0 + iconst 0 return LABEL60: iload 0 - load_int 5 + iconst 5 if_icmpeq LABEL64 jump LABEL76 LABEL64: get_varbit 1627 - load_int 0 + iconst 0 if_icmpeq LABEL68 jump LABEL76 LABEL68: - get_gamecycle + clientclock iload 1 - isub - load_int 500 + sub + iconst 500 if_icmpge LABEL74 jump LABEL76 LABEL74: - load_int 0 + iconst 0 return LABEL76: - 5005 - load_int 2 + chat_getfilter_private + iconst 2 if_icmpne LABEL80 jump LABEL82 LABEL80: - load_int 1 + iconst 1 return LABEL82: - load_int 0 + iconst 0 return LABEL84: - load_int 0 + iconst 0 return - load_int -1 + iconst -1 return diff --git a/cache/src/test/resources/net/runelite/cache/script/assembler/Unicode.rs2asm b/cache/src/test/resources/net/runelite/cache/script/assembler/Unicode.rs2asm index 7ca51cc723..a1fc0a62e1 100644 --- a/cache/src/test/resources/net/runelite/cache/script/assembler/Unicode.rs2asm +++ b/cache/src/test/resources/net/runelite/cache/script/assembler/Unicode.rs2asm @@ -3,5 +3,5 @@ .string_stack_count 0 .int_var_count 0 .string_var_count 0 - load_string ": " + sconst ": " return diff --git a/runelite-client/src/main/scripts/BankSearchFilter.rs2asm b/runelite-client/src/main/scripts/BankSearchFilter.rs2asm index 741c551317..fd3f415b5d 100644 --- a/runelite-client/src/main/scripts/BankSearchFilter.rs2asm +++ b/runelite-client/src/main/scripts/BankSearchFilter.rs2asm @@ -3,68 +3,68 @@ .string_stack_count 0 .int_var_count 1 .string_var_count 2 - load_string "" + sconst "" sstore 0 - load_string "" + sconst "" sstore 1 invoke 514 - load_int 1 + iconst 1 if_icmpeq LABEL8 jump LABEL34 LABEL8: - 049 359 ; Skip truncating of varcstr 22 by not calling 280 - tolowercase ; instead get the var directly and lowercase it + get_varc_string 359 ; Skip truncating of varcstr 22 by not calling 280 + lowercase ; instead get the var directly and lowercase it sstore 1 sload 1 - string_length - load_int 0 + string_length + iconst 0 if_icmpgt LABEL15 jump LABEL34 LABEL15: iload 0 - load_int -1 + iconst -1 if_icmpne LABEL19 jump LABEL23 LABEL19: iload 0 - get_item_name - tolowercase + oc_name + lowercase sstore 0 -LABEL1337: ; check if the bank tags plugin is active - load_int 1 ; true - load_int 0 ; load active boolean - load_string "bankTagsActive" ; push event name - runelite_callback ; invoke callback +LABEL1337:; check if the bank tags plugin is active + iconst 1 ; true + iconst 0 ; load active boolean + sconst "bankTagsActive" ; push event name + runelite_callback ; invoke callback if_icmpeq LABEL1338 ; if the plugin is active then jump to the label that decides if the ; item should be shown jump LABEL23 ; if the plugin is not active then jump to the normal label -LABEL1338: ; let the bank tag plugin decide if the item should be shown - load_int 0 ; load return value +LABEL1338:; let the bank tag plugin decide if the item should be shown + iconst 0 ; load return value iload 0 ; load item id sload 0 ; load item name sload 1 ; load search string - load_string "bankSearchFilter" ; push event name - runelite_callback ; invoke callback - pop_int ; pop item id - pop_string ; pop search string - pop_string ; pop item name - return ; return value + sconst "bankSearchFilter" ; push event name + runelite_callback ; invoke callback + pop_int ; pop item id + pop_string ; pop search string + pop_string ; pop item name + return ; return value LABEL23: sload 0 sload 1 - load_int 0 - string_indexof_from - load_int -1 + iconst 0 + string_indexof_string + iconst -1 if_icmpne LABEL30 jump LABEL32 LABEL30: - load_int 1 - return + iconst 1 + return LABEL32: - load_int 0 - return + iconst 0 + return LABEL34: - load_int 1 - return - load_int -1 - return + iconst 1 + return + iconst -1 + return diff --git a/runelite-client/src/main/scripts/BankSearchLayout.rs2asm b/runelite-client/src/main/scripts/BankSearchLayout.rs2asm index bf50394dad..47dad19197 100644 --- a/runelite-client/src/main/scripts/BankSearchLayout.rs2asm +++ b/runelite-client/src/main/scripts/BankSearchLayout.rs2asm @@ -4,165 +4,165 @@ .int_var_count 31 .string_var_count 1 get_varbit 5102 - load_int 1 + iconst 1 if_icmpeq LABEL4 jump LABEL8 LABEL4: - load_int 0 + iconst 0 iload 10 - widget_put_hidden_widget + if_sethide jump LABEL13 LABEL8: - load_int 1 + iconst 1 iload 10 - widget_put_hidden_widget + if_sethide iload 12 invoke 41 LABEL13: get_varbit 5364 - load_int 1 + iconst 1 if_icmpeq LABEL17 jump LABEL24 LABEL17: - load_int 37 - load_int 37 - load_int 1 - load_int 0 + iconst 37 + iconst 37 + iconst 1 + iconst 0 iload 5 - widget_put_size_widget + if_setsize jump LABEL30 LABEL24: - load_int 0 - load_int 37 - load_int 1 - load_int 0 + iconst 0 + iconst 37 + iconst 1 + iconst 0 iload 5 - widget_put_size_widget + if_setsize LABEL30: - load_int 1 + iconst 1 iload 11 - widget_put_hidden_widget + if_sethide iload 11 - widget_unset_children - load_int 0 + cc_deleteall + iconst 0 istore 13 get_varbit 4170 - load_int 3 + iconst 3 if_icmpeq LABEL41 jump LABEL74 LABEL41: get_varbit 4171 - load_int 0 + iconst 0 if_icmpgt LABEL69 get_varbit 4172 - load_int 0 + iconst 0 if_icmpgt LABEL69 get_varbit 4173 - load_int 0 + iconst 0 if_icmpgt LABEL69 get_varbit 4174 - load_int 0 + iconst 0 if_icmpgt LABEL69 get_varbit 4175 - load_int 0 + iconst 0 if_icmpgt LABEL69 get_varbit 4176 - load_int 0 + iconst 0 if_icmpgt LABEL69 get_varbit 4177 - load_int 0 + iconst 0 if_icmpgt LABEL69 get_varbit 4178 - load_int 0 + iconst 0 if_icmpgt LABEL69 get_varbit 4179 - load_int 0 + iconst 0 if_icmpgt LABEL69 jump LABEL72 LABEL69: - load_int 0 + iconst 0 istore 13 jump LABEL74 LABEL72: - load_int 1 + iconst 1 istore 13 LABEL74: - load_int 0 + iconst 0 istore 14 iload 13 - load_int 1 + iconst 1 if_icmpeq LABEL80 jump LABEL110 LABEL80: - load_int 1 + iconst 1 iload 9 - widget_put_hidden_widget - load_int 11 + if_sethide + iconst 11 istore 14 - load_int 0 - load_int 26 - load_int 1 - load_int 1 + iconst 0 + iconst 26 + iconst 1 + iconst 1 iload 1 - widget_put_size_widget - load_int 460 - load_int 39 - load_int 0 - load_int 1 + if_setsize + iconst 460 + iconst 39 + iconst 0 + iconst 1 iload 3 - widget_put_size_widget - load_int 16 - load_int 39 - load_int 0 - load_int 1 + if_setsize + iconst 16 + iconst 39 + iconst 0 + iconst 1 iload 4 - widget_put_size_widget - load_int 30 - load_int 48 - load_int 2 - load_int 0 + if_setsize + iconst 30 + iconst 48 + iconst 2 + iconst 0 iload 2 - widget_put_position_widget + if_setposition jump LABEL137 LABEL110: - load_int 0 + iconst 0 iload 9 - widget_put_hidden_widget - load_int 0 - load_int 0 - load_int 1 - load_int 1 + if_sethide + iconst 0 + iconst 0 + iconst 1 + iconst 1 iload 1 - widget_put_size_widget - load_int 460 - load_int 81 - load_int 0 - load_int 1 + if_setsize + iconst 460 + iconst 81 + iconst 0 + iconst 1 iload 3 - widget_put_size_widget - load_int 16 - load_int 81 - load_int 0 - load_int 1 + if_setsize + iconst 16 + iconst 81 + iconst 0 + iconst 1 iload 4 - widget_put_size_widget - load_int 12 - load_int 42 - load_int 2 - load_int 0 + if_setsize + iconst 12 + iconst 42 + iconst 2 + iconst 0 iload 2 - widget_put_position_widget + if_setposition LABEL137: iload 4 iload 3 invoke 231 - load_int 816 + iconst 816 istore 15 - load_int 816 - load_int 9 - load_int 3 - imul - iadd + iconst 816 + iconst 9 + iconst 3 + multiply + add istore 16 LABEL148: iload 15 @@ -172,133 +172,133 @@ LABEL148: LABEL152: iload 3 iload 15 - widget_load_child - load_int 1 + cc_find + iconst 1 if_icmpeq LABEL158 jump LABEL160 LABEL158: - load_int 1 - widget_put_hidden + iconst 1 + cc_sethide LABEL160: iload 15 - load_int 1 - iadd + iconst 1 + add istore 15 jump LABEL148 LABEL165: - load_int 0 + iconst 0 istore 15 - load_int 8 - load_int 1 - isub + iconst 8 + iconst 1 + sub istore 17 iload 3 - widget_get_width_widget - load_int 51 - isub - load_int 35 - isub + if_getwidth + iconst 51 + sub + iconst 35 + sub istore 18 iload 18 - load_int 8 - load_int 36 - imul - isub + iconst 8 + iconst 36 + multiply + sub iload 17 - idiv + div istore 19 - load_int -1 + iconst -1 istore 20 - load_int 0 + iconst 0 istore 21 - load_int 0 + iconst 0 istore 22 - load_int 0 + iconst 0 istore 23 - load_int 0 + iconst 0 istore 24 - load_int -1 + iconst -1 istore 25 - load_int 0 + iconst 0 istore 26 - load_string "" + sconst "" sstore 0 get_varbit 4150 - load_int 0 + iconst 0 if_icmple LABEL209 get_varbit 4150 - load_int 9 + iconst 9 if_icmpgt LABEL209 jump LABEL658 LABEL209: iload 15 - load_int 816 + iconst 816 if_icmplt LABEL213 jump LABEL238 LABEL213: iload 3 iload 15 - widget_load_child - load_int 1 + cc_find + iconst 1 if_icmpeq LABEL219 jump LABEL221 LABEL219: - load_int 1 - widget_put_hidden + iconst 1 + cc_sethide LABEL221: - load_int 95 + iconst 95 iload 15 - get_itemcontainer_itemid - load_int -1 + inv_getobj + iconst -1 if_icmpne LABEL227 jump LABEL233 LABEL227: iload 24 - load_int 1 - iadd + iconst 1 + add iload 15 istore 25 istore 24 LABEL233: iload 15 - load_int 1 - iadd + iconst 1 + add istore 15 jump LABEL209 LABEL238: get_varbit 4171 get_varbit 4172 - iadd + add get_varbit 4173 - iadd + add get_varbit 4174 - iadd + add get_varbit 4175 - iadd + add get_varbit 4176 - iadd + add get_varbit 4177 - iadd + add get_varbit 4178 - iadd + add get_varbit 4179 - iadd + add istore 26 iload 26 - load_int 0 + iconst 0 if_icmple LABEL260 jump LABEL264 LABEL260: - load_int 816 - load_int 1 - isub + iconst 816 + iconst 1 + sub istore 25 LABEL264: iload 26 iload 25 - load_int 1 - iadd - load_int 0 + iconst 1 + add + iconst 0 iload 3 iload 4 iload 10 @@ -313,16 +313,16 @@ LABEL264: istore 23 iload 22 iload 21 - iadd + add istore 22 - load_int 0 + iconst 0 istore 15 get_varbit 4171 - load_int 0 + iconst 0 if_icmpgt LABEL291 jump LABEL321 LABEL291: - load_int 1 + iconst 1 iload 3 iload 23 invoke 510 @@ -330,8 +330,8 @@ LABEL291: iload 15 iload 15 get_varbit 4171 - iadd - load_int 1 + add + iconst 1 iload 3 iload 4 iload 10 @@ -346,19 +346,19 @@ LABEL291: istore 23 iload 22 iload 21 - iadd + add istore 22 iload 15 get_varbit 4171 - iadd + add istore 15 LABEL321: get_varbit 4172 - load_int 0 + iconst 0 if_icmpgt LABEL325 jump LABEL355 LABEL325: - load_int 2 + iconst 2 iload 3 iload 23 invoke 510 @@ -366,8 +366,8 @@ LABEL325: iload 15 iload 15 get_varbit 4172 - iadd - load_int 2 + add + iconst 2 iload 3 iload 4 iload 10 @@ -382,19 +382,19 @@ LABEL325: istore 23 iload 22 iload 21 - iadd + add istore 22 iload 15 get_varbit 4172 - iadd + add istore 15 LABEL355: get_varbit 4173 - load_int 0 + iconst 0 if_icmpgt LABEL359 jump LABEL389 LABEL359: - load_int 3 + iconst 3 iload 3 iload 23 invoke 510 @@ -402,8 +402,8 @@ LABEL359: iload 15 iload 15 get_varbit 4173 - iadd - load_int 3 + add + iconst 3 iload 3 iload 4 iload 10 @@ -418,19 +418,19 @@ LABEL359: istore 23 iload 22 iload 21 - iadd + add istore 22 iload 15 get_varbit 4173 - iadd + add istore 15 LABEL389: get_varbit 4174 - load_int 0 + iconst 0 if_icmpgt LABEL393 jump LABEL423 LABEL393: - load_int 4 + iconst 4 iload 3 iload 23 invoke 510 @@ -438,8 +438,8 @@ LABEL393: iload 15 iload 15 get_varbit 4174 - iadd - load_int 4 + add + iconst 4 iload 3 iload 4 iload 10 @@ -454,19 +454,19 @@ LABEL393: istore 23 iload 22 iload 21 - iadd + add istore 22 iload 15 get_varbit 4174 - iadd + add istore 15 LABEL423: get_varbit 4175 - load_int 0 + iconst 0 if_icmpgt LABEL427 jump LABEL457 LABEL427: - load_int 5 + iconst 5 iload 3 iload 23 invoke 510 @@ -474,8 +474,8 @@ LABEL427: iload 15 iload 15 get_varbit 4175 - iadd - load_int 5 + add + iconst 5 iload 3 iload 4 iload 10 @@ -490,19 +490,19 @@ LABEL427: istore 23 iload 22 iload 21 - iadd + add istore 22 iload 15 get_varbit 4175 - iadd + add istore 15 LABEL457: get_varbit 4176 - load_int 0 + iconst 0 if_icmpgt LABEL461 jump LABEL491 LABEL461: - load_int 6 + iconst 6 iload 3 iload 23 invoke 510 @@ -510,8 +510,8 @@ LABEL461: iload 15 iload 15 get_varbit 4176 - iadd - load_int 6 + add + iconst 6 iload 3 iload 4 iload 10 @@ -526,19 +526,19 @@ LABEL461: istore 23 iload 22 iload 21 - iadd + add istore 22 iload 15 get_varbit 4176 - iadd + add istore 15 LABEL491: get_varbit 4177 - load_int 0 + iconst 0 if_icmpgt LABEL495 jump LABEL525 LABEL495: - load_int 7 + iconst 7 iload 3 iload 23 invoke 510 @@ -546,8 +546,8 @@ LABEL495: iload 15 iload 15 get_varbit 4177 - iadd - load_int 7 + add + iconst 7 iload 3 iload 4 iload 10 @@ -562,19 +562,19 @@ LABEL495: istore 23 iload 22 iload 21 - iadd + add istore 22 iload 15 get_varbit 4177 - iadd + add istore 15 LABEL525: get_varbit 4178 - load_int 0 + iconst 0 if_icmpgt LABEL529 jump LABEL559 LABEL529: - load_int 8 + iconst 8 iload 3 iload 23 invoke 510 @@ -582,8 +582,8 @@ LABEL529: iload 15 iload 15 get_varbit 4178 - iadd - load_int 8 + add + iconst 8 iload 3 iload 4 iload 10 @@ -598,19 +598,19 @@ LABEL529: istore 23 iload 22 iload 21 - iadd + add istore 22 iload 15 get_varbit 4178 - iadd + add istore 15 LABEL559: get_varbit 4179 - load_int 0 + iconst 0 if_icmpgt LABEL563 jump LABEL593 LABEL563: - load_int 9 + iconst 9 iload 3 iload 23 invoke 510 @@ -618,8 +618,8 @@ LABEL563: iload 15 iload 15 get_varbit 4179 - iadd - load_int 9 + add + iconst 9 iload 3 iload 4 iload 10 @@ -634,78 +634,78 @@ LABEL563: istore 23 iload 22 iload 21 - iadd + add istore 22 iload 15 get_varbit 4179 - iadd + add istore 15 LABEL593: invoke 514 - load_int 1 + iconst 1 if_icmpeq LABEL597 jump LABEL638 LABEL597: - 049 359 ; Skip truncating of varcstr 22 by not calling 280 - tolowercase ; instead get the var directly and lowercase it + get_varc_string 359 ; Skip truncating of varcstr 22 by not calling 280 + lowercase ; instead get the var directly and lowercase it sstore 0 sload 0 string_length - load_int 0 + iconst 0 if_icmpgt LABEL604 jump LABEL623 LABEL604: - load_string "Showing items: " - load_string "" + sconst "Showing items: " + sconst "" sload 0 - load_string "" - string_append 4 + sconst "" + join_string 4 iload 6 - widget_put_text_widget - get_varc 5 - load_int 11 + if_settext + get_varc_int 5 + iconst 11 if_icmpeq LABEL615 jump LABEL622 LABEL615: - load_string "Show items whose names contain the following text: (" + sconst "Show items whose names contain the following text: (" iload 22 - int_to_string - load_string " found)" - string_append 3 + tostring + sconst " found)" + join_string 3 iload 21 ; load number of matches - load_string "setSearchBankInputTextFound" ; load event name + sconst "setSearchBankInputTextFound" ; load event name runelite_callback ; invoke callback pop_int ; pop number of matches - load_int 10616876 - widget_put_text_widget + iconst 10616876 + if_settext LABEL622: jump LABEL637 LABEL623: - load_string "Showing items: " - load_string "" - load_string "*" - load_string "" - string_append 4 + sconst "Showing items: " + sconst "" + sconst "*" + sconst "" + join_string 4 iload 6 - widget_put_text_widget - get_varc 5 - load_int 11 + if_settext + get_varc_int 5 + iconst 11 if_icmpeq LABEL634 jump LABEL637 LABEL634: - load_string "Show items whose names contain the following text:" - load_string "setSearchBankInputText" ; load event name + sconst "Show items whose names contain the following text:" + sconst "setSearchBankInputText" ; load event name runelite_callback ; invoke callback - load_int 10616876 - widget_put_text_widget + iconst 10616876 + if_settext LABEL637: jump LABEL641 LABEL638: - load_string "The Bank of Gielinor" - load_string "setBankTitle" ; - runelite_callback ; + sconst "The Bank of Gielinor" + sconst "setBankTitle" ; + runelite_callback ; iload 6 - widget_put_text_widget + if_settext LABEL641: iload 0 iload 1 @@ -726,51 +726,51 @@ LABEL641: return LABEL658: invoke 514 - load_int 1 + iconst 1 if_icmpeq LABEL662 jump LABEL665 LABEL662: - load_int 1 - load_int 1 + iconst 1 + iconst 1 invoke 299 LABEL665: - load_int -1 + iconst -1 istore 27 - load_int -1 + iconst -1 istore 28 get_varbit 4150 invoke 513 istore 28 istore 27 - load_int 0 + iconst 0 istore 29 - load_int 0 + iconst 0 istore 30 LABEL677: iload 15 - load_int 816 + iconst 816 if_icmplt LABEL681 jump LABEL761 LABEL681: iload 3 iload 15 - widget_load_child - load_int 1 + cc_find + iconst 1 if_icmpeq LABEL687 jump LABEL756 LABEL687: - load_int 95 + iconst 95 iload 15 - get_itemcontainer_itemid + inv_getobj istore 20 iload 20 - load_int -1 + iconst -1 if_icmpne LABEL695 jump LABEL699 LABEL695: iload 24 - load_int 1 - iadd + iconst 1 + add istore 24 LABEL699: iload 15 @@ -783,12 +783,12 @@ LABEL703: if_icmplt LABEL707 jump LABEL754 LABEL707: - load_int 0 - widget_put_hidden + iconst 0 + cc_sethide iload 20 - load_int 95 + iconst 95 iload 15 - get_itemcontainer_stacksize + inv_getnum iload 3 iload 4 iload 10 @@ -796,23 +796,23 @@ LABEL707: iload 12 invoke 278 iload 30 - load_int 36 - imul + iconst 36 + multiply istore 23 - load_int 51 + iconst 51 iload 29 - load_int 36 + iconst 36 iload 19 - iadd - imul - iadd + add + multiply + add iload 23 - load_int 0 - load_int 0 - widget_put_position + iconst 0 + iconst 0 + cc_setposition iload 23 - load_int 32 - iadd + iconst 32 + add istore 23 iload 29 iload 17 @@ -820,55 +820,55 @@ LABEL707: jump LABEL747 LABEL742: iload 29 - load_int 1 - iadd + iconst 1 + add istore 29 jump LABEL753 LABEL747: - load_int 0 + iconst 0 iload 30 - load_int 1 - iadd + iconst 1 + add istore 30 istore 29 LABEL753: jump LABEL756 LABEL754: - load_int 1 - widget_put_hidden + iconst 1 + cc_sethide LABEL756: iload 15 - load_int 1 - iadd + iconst 1 + add istore 15 jump LABEL677 LABEL761: get_varbit 4170 - load_int 2 + iconst 2 if_icmpeq LABEL765 jump LABEL775 LABEL765: - load_string "Tab " - load_int 105 - load_int 115 - load_int 207 + sconst "Tab " + iconst 105 + iconst 115 + iconst 207 get_varbit 4150 - get_enum_value - string_append 2 - load_string "setBankTitle" ; - runelite_callback ; + enum + join_string 2 + sconst "setBankTitle" ; + runelite_callback ; iload 6 - widget_put_text_widget + if_settext jump LABEL781 LABEL775: - load_string "Tab " + sconst "Tab " get_varbit 4150 - int_to_string - string_append 2 - load_string "setBankTitle" ; - runelite_callback ; + tostring + join_string 2 + sconst "setBankTitle" ; + runelite_callback ; iload 6 - widget_put_text_widget + if_settext LABEL781: iload 0 iload 1 diff --git a/runelite-client/src/main/scripts/ChatBuilder.rs2asm b/runelite-client/src/main/scripts/ChatBuilder.rs2asm index 2e0b41bec1..ccc78a7195 100644 --- a/runelite-client/src/main/scripts/ChatBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatBuilder.rs2asm @@ -3,175 +3,175 @@ .string_stack_count 0 .int_var_count 15 .string_var_count 13 - load_int 10616890 - widget_get_width_widget + iconst 10616890 + if_getwidth istore 1 - get_localplayer_name - string_remove_html + chat_playername + removetags sstore 0 - load_int 0 + iconst 0 istore 2 - get_varc 41 - load_int 3 + get_varc_int 41 + iconst 3 if_icmpeq LABEL12 jump LABEL14 LABEL12: - load_int 1 + iconst 1 istore 2 LABEL14: - load_int 0 + iconst 0 istore 3 - load_int 0 + iconst 0 istore 4 - load_string "" + sconst "" sstore 1 - load_string "" + sconst "" sstore 2 - load_string "" + sconst "" sstore 3 - load_string "" + sconst "" sstore 4 - load_string "" + sconst "" sstore 5 - load_string "" + sconst "" sstore 6 - load_string "" + sconst "" sstore 7 - load_string "" + sconst "" sstore 8 invoke 921 - load_int 1 + iconst 1 if_icmpeq LABEL38 jump LABEL58 LABEL38: - load_int 16777215 - load_int 1 + iconst 16777215 + iconst 1 istore 4 istore 3 - load_string "" - load_string "" - load_string "" - load_string "" + sconst "" + sconst "" + sconst "" + sconst "" sstore 4 sstore 3 sstore 2 sstore 1 - load_string "" - load_string "" - load_string "" - load_string "" + sconst "" + sconst "" + sconst "" + sconst "" sstore 8 sstore 7 sstore 6 sstore 5 LABEL58: - load_int 0 + iconst 0 istore 5 - load_int 0 + iconst 0 istore 6 - load_int 0 + iconst 0 istore 7 - load_int 105 - load_int 73 - load_int 579 + iconst 105 + iconst 73 + iconst 579 iload 7 - get_enum_value + enum istore 8 - get_varc 41 - load_int 0 + get_varc_int 41 + iconst 0 if_icmpeq LABEL77 - get_varc 41 - load_int 2 + get_varc_int 41 + iconst 2 if_icmpeq LABEL77 jump LABEL133 LABEL77: - 5022 + chat_getmessagefilter string_length - load_int 0 + iconst 0 if_icmpgt LABEL82 jump LABEL133 LABEL82: sload 1 - load_string "Public chat filtering:" - load_string "" - load_string " " - load_string "" - 5022 - appendtags - tolowercase - load_string "" - string_append 7 + sconst "Public chat filtering:" + sconst "" + sconst " " + sconst "" + chat_getmessagefilter + escape + lowercase + sconst "" + join_string 7 iload 7 iload 8 - load_int 10616890 + iconst 10616890 iload 1 - load_int 3 - load_int 14 + iconst 3 + iconst 14 iload 5 - load_int 0 - load_int 103 + iconst 0 + iconst 103 iload 3 iload 4 invoke 199 istore 6 iload 8 - widget_put_actions_null_widget - load_int -1 - load_string "" + if_clearops + iconst -1 + sconst "" iload 8 - widget_put_option_click_listener_widget - load_int -1 - load_string "" + if_setonop + iconst -1 + sconst "" iload 8 - widget_put_mouse_hover_listener_widget - load_int -1 - load_string "" + if_setonmouserepeat + iconst -1 + sconst "" iload 8 - widget_put_mouse_exit_listener_widget + if_setonmouseleave iload 5 iload 6 - isub + sub istore 5 iload 7 - load_int 1 - iadd + iconst 1 + add istore 7 - load_int 105 - load_int 73 - load_int 579 + iconst 105 + iconst 73 + iconst 579 iload 7 - get_enum_value + enum istore 8 LABEL133: iload 0 istore 9 - load_int 0 + iconst 0 istore 10 - load_int -1 + iconst -1 istore 11 - load_string "" + sconst "" sstore 9 - load_string "" + sconst "" sstore 10 - load_string "" + sconst "" sstore 11 - load_string "" + sconst "" sstore 12 - load_int 0 + iconst 0 istore 12 LABEL149: iload 9 - load_int -1 + iconst -1 if_icmpne LABEL153 jump LABEL645 LABEL153: iload 8 - load_int -1 + iconst -1 if_icmpne LABEL157 jump LABEL645 LABEL157: iload 9 - get_chat_message + chat_gethistory_byuid istore 12 sstore 11 sstore 10 @@ -182,7 +182,7 @@ LABEL157: sload 9 iload 12 invoke 193 - load_int 1 + iconst 1 if_icmpeq LABEL172 jump LABEL641 LABEL172: @@ -194,7 +194,7 @@ LABEL172: sload 0 iload 12 invoke 90 - load_int 1 + iconst 1 if_icmpeq LABEL183 jump LABEL641 LABEL183: @@ -217,26 +217,26 @@ LABEL183: jump LABEL426 LABEL186: iload 9 ; The id of the messageNode of the message being built - load_string "" - load_string "addTimestamp" - runelite_callback - pop_int + sconst "" + sconst "addTimestamp" + runelite_callback + pop_int sload 9 - load_string ":" - string_append 3 ; We need to append an extra string since we added the timestamp + sconst ":" + join_string 3 ; We need to append an extra string since we added the timestamp sload 1 sload 11 - load_string "" - string_append 3 + sconst "" + join_string 3 iload 7 iload 8 - load_int 10616890 + iconst 10616890 iload 1 - load_int 3 - load_int 14 + iconst 3 + iconst 14 iload 5 - load_int 0 - load_int 103 + iconst 0 + iconst 103 iload 3 iload 4 invoke 203 @@ -244,26 +244,26 @@ LABEL186: jump LABEL440 LABEL207: iload 9 ; The id of the messageNode of the message being built - load_string "" - load_string "addTimestamp" - runelite_callback - pop_int + sconst "" + sconst "addTimestamp" + runelite_callback + pop_int sload 9 - load_string ":" - string_append 3 ; We need to append an extra string since we added the timestamp + sconst ":" + join_string 3 ; We need to append an extra string since we added the timestamp sload 3 sload 11 - load_string "" - string_append 3 + sconst "" + join_string 3 iload 7 iload 8 - load_int 10616890 + iconst 10616890 iload 1 - load_int 3 - load_int 14 + iconst 3 + iconst 14 iload 5 - load_int 0 - load_int 103 + iconst 0 + iconst 103 iload 3 iload 4 invoke 203 @@ -271,29 +271,29 @@ LABEL207: jump LABEL440 LABEL228: iload 9 ; The id of the messageNode of the message being built - load_string "" - load_string "addTimestamp" - runelite_callback - pop_int - load_string "From " + sconst "" + sconst "addTimestamp" + runelite_callback + pop_int + sconst "From " sload 9 - load_string ":" - load_string "privateChatFrom" - runelite_callback - string_append 4 ; We need to append an extra string since we added the timestamp + sconst ":" + sconst "privateChatFrom" + runelite_callback + join_string 4 ; We need to append an extra string since we added the timestamp sload 2 sload 11 - load_string "" - string_append 3 + sconst "" + join_string 3 iload 7 iload 8 - load_int 10616890 + iconst 10616890 iload 1 - load_int 3 - load_int 14 + iconst 3 + iconst 14 iload 5 - load_int 0 - load_int 103 + iconst 0 + iconst 103 iload 3 iload 4 invoke 203 @@ -301,23 +301,23 @@ LABEL228: jump LABEL440 LABEL250: iload 9 ; The id of the messageNode of the message being built - load_string "" - load_string "addTimestamp" - runelite_callback - pop_int + sconst "" + sconst "addTimestamp" + runelite_callback + pop_int sload 7 sload 11 - load_string "" - string_append 4 ; We need to append an extra string since we added the timestamp + sconst "" + join_string 4 ; We need to append an extra string since we added the timestamp iload 7 iload 8 - load_int 10616890 + iconst 10616890 iload 1 - load_int 3 - load_int 14 + iconst 3 + iconst 14 iload 5 - load_int 0 - load_int 103 + iconst 0 + iconst 103 iload 3 iload 4 invoke 199 @@ -325,70 +325,70 @@ LABEL250: jump LABEL440 LABEL268: iload 9 ; The id of the messageNode of the message being built - load_string "" - load_string "addTimestamp" - runelite_callback - pop_int + sconst "" + sconst "addTimestamp" + runelite_callback + pop_int sload 2 sload 11 - load_string "" - string_append 4 ; We need to append an extra string since we added the timestamp + sconst "" + join_string 4 ; We need to append an extra string since we added the timestamp iload 7 iload 8 - load_int 10616890 + iconst 10616890 iload 1 - load_int 3 - load_int 14 + iconst 3 + iconst 14 iload 5 - load_int 0 - load_int 103 + iconst 0 + iconst 103 iload 3 iload 4 invoke 199 istore 6 get_varbit 1627 - load_int 0 + iconst 0 if_icmpeq LABEL289 jump LABEL300 LABEL289: iload 11 - load_int 500 - iadd - load_int 1 - iadd - put_varc 65 - load_int 664 - load_int 0 - load_string "1" - load_int 10616832 - widget_put_render_listener_widget + iconst 500 + add + iconst 1 + add + set_varc_int 65 + iconst 664 + iconst 0 + sconst "1" + iconst 10616832 + if_setontimer LABEL300: jump LABEL440 LABEL301: iload 9 ; The id of the messageNode of the message being built - load_string "" - load_string "addTimestamp" - runelite_callback - pop_int - load_string "To " + sconst "" + sconst "addTimestamp" + runelite_callback + pop_int + sconst "To " sload 9 - load_string ":" - load_string "privateChatTo" - runelite_callback - string_append 4 ; We need to append an extra string since we added the timestamp + sconst ":" + sconst "privateChatTo" + runelite_callback + join_string 4 ; We need to append an extra string since we added the timestamp sload 2 sload 11 - load_string "" - string_append 3 + sconst "" + join_string 3 iload 7 iload 8 - load_int 10616890 + iconst 10616890 iload 1 - load_int 3 - load_int 14 + iconst 3 + iconst 14 iload 5 - load_int 0 - load_int 103 + iconst 0 + iconst 103 iload 3 iload 4 invoke 203 @@ -396,23 +396,23 @@ LABEL301: jump LABEL440 LABEL323: iload 9 ; The id of the messageNode of the message being built - load_string "" - load_string "addTimestamp" - runelite_callback - pop_int + sconst "" + sconst "addTimestamp" + runelite_callback + pop_int sload 8 sload 11 - load_string "" - string_append 4 ; We need to append an extra string since we added the timestamp + sconst "" + join_string 4 ; We need to append an extra string since we added the timestamp iload 7 iload 8 - load_int 10616890 + iconst 10616890 iload 1 - load_int 3 - load_int 14 + iconst 3 + iconst 14 iload 5 - load_int 0 - load_int 103 + iconst 0 + iconst 103 iload 3 iload 4 invoke 199 @@ -420,31 +420,31 @@ LABEL323: jump LABEL440 LABEL341: iload 9 ; The id of the messageNode of the message being built - load_string "" - load_string "addTimestamp" - runelite_callback - pop_int - load_string "[" + sconst "" + sconst "addTimestamp" + runelite_callback + pop_int + sconst "[" sload 5 sload 10 - load_string "" - load_string "] " + sconst "" + sconst "] " sload 9 - load_string ":" - string_append 8 ; We need to append an extra string since we added the timestamp + sconst ":" + join_string 8 ; We need to append an extra string since we added the timestamp sload 6 sload 11 - load_string "" - string_append 3 + sconst "" + join_string 3 iload 7 iload 8 - load_int 10616890 + iconst 10616890 iload 1 - load_int 3 - load_int 14 + iconst 3 + iconst 14 iload 5 - load_int 0 - load_int 103 + iconst 0 + iconst 103 iload 3 iload 4 invoke 203 @@ -456,42 +456,42 @@ LABEL367: sstore 12 sstore 11 sload 4 - load_string "Broadcast:" - load_string "" - string_append 3 + sconst "Broadcast:" + sconst "" + join_string 3 sload 11 iload 7 iload 8 - load_int 10616890 + iconst 10616890 iload 1 - load_int 3 - load_int 14 + iconst 3 + iconst 14 iload 5 - load_int 0 - load_int 103 + iconst 0 + iconst 103 iload 3 iload 4 invoke 203 istore 6 jump LABEL440 LABEL390: - get_gamecycle + clientclock iload 11 - isub - load_int 500 + sub + iconst 500 if_icmpgt LABEL396 jump LABEL411 LABEL396: - load_string "jk :P" + sconst "jk :P" iload 7 iload 8 - load_int 10616890 + iconst 10616890 iload 1 - load_int 3 - load_int 14 + iconst 3 + iconst 14 iload 5 - load_int 0 - load_int 103 + iconst 0 + iconst 103 iload 3 iload 4 invoke 199 @@ -501,13 +501,13 @@ LABEL411: sload 11 iload 7 iload 8 - load_int 10616890 + iconst 10616890 iload 1 - load_int 3 - load_int 14 + iconst 3 + iconst 14 iload 5 - load_int 0 - load_int 103 + iconst 0 + iconst 103 iload 3 iload 4 invoke 199 @@ -518,20 +518,20 @@ LABEL426: sload 11 iload 7 iload 8 - load_int 10616890 + iconst 10616890 iload 1 - load_int 3 - load_int 14 + iconst 3 + iconst 14 iload 5 - load_int 0 - load_int 103 + iconst 0 + iconst 103 iload 3 iload 4 invoke 199 istore 6 LABEL440: iload 8 - widget_put_actions_null_widget + if_clearops iload 10 switch 1: LABEL445 @@ -549,221 +549,221 @@ LABEL440: 91: LABEL445 jump LABEL615 LABEL445: - load_string "" + sconst "" sload 9 - load_string "" - string_append 3 + sconst "" + join_string 3 iload 8 - widget_put_name_widget - load_int 86 - load_int -2147483644 - load_string "event_opbase" - load_string "is" + if_setopbase + iconst 86 + iconst -2147483644 + sconst "event_opbase" + sconst "is" iload 8 - widget_put_option_click_listener_widget - load_int -1 - load_string "" + if_setonop + iconst -1 + sconst "" iload 8 - widget_put_mouse_hover_listener_widget - load_int -1 - load_string "" + if_setonmouserepeat + iconst -1 + sconst "" iload 8 - widget_put_mouse_exit_listener_widget + if_setonmouseleave sload 0 sload 9 - string_remove_html - string_compare - load_int 0 + removetags + compare + iconst 0 if_icmpne LABEL472 jump LABEL509 LABEL472: iload 12 - load_int 1 + iconst 1 if_icmpeq LABEL476 jump LABEL481 LABEL476: - load_int 6 - load_string "Message" + iconst 6 + sconst "Message" iload 8 - widget_put_action_widget + if_setop jump LABEL489 LABEL481: - load_int 6 - load_string "Add friend" + iconst 6 + sconst "Add friend" iload 8 - widget_put_action_widget - load_int 7 - load_string "Add ignore" + if_setop + iconst 7 + sconst "Add ignore" iload 8 - widget_put_action_widget + if_setop LABEL489: - load_int 8 - load_string "Report" + iconst 8 + sconst "Report" iload 8 - widget_put_action_widget + if_setop iload 10 - load_int 9 + iconst 9 if_icmpeq LABEL497 jump LABEL509 LABEL497: - get_clanchatcount - load_int 0 + clan_getchatcount + iconst 0 if_icmpgt LABEL501 jump LABEL509 LABEL501: - get_clanchat_rank - clanchat_kick_rank + clan_getchatrank + clan_getchatminkick if_icmpge LABEL505 jump LABEL509 LABEL505: - load_int 9 - load_string "Kick" + iconst 9 + sconst "Kick" iload 8 - widget_put_action_widget + if_setop LABEL509: jump LABEL627 LABEL510: - load_string "" + sconst "" sload 9 - load_string "" - string_append 3 + sconst "" + join_string 3 iload 8 - widget_put_name_widget - load_int 86 - load_int -2147483644 - load_string "event_opbase" - load_string "is" + if_setopbase + iconst 86 + iconst -2147483644 + sconst "event_opbase" + sconst "is" iload 8 - widget_put_option_click_listener_widget - load_int -1 - load_string "" + if_setonop + iconst -1 + sconst "" iload 8 - widget_put_mouse_hover_listener_widget - load_int -1 - load_string "" + if_setonmouserepeat + iconst -1 + sconst "" iload 8 - widget_put_mouse_exit_listener_widget - load_int 1 - load_string "Accept trade" + if_setonmouseleave + iconst 1 + sconst "Accept trade" iload 8 - widget_put_action_widget + if_setop jump LABEL627 LABEL535: - load_string "" + sconst "" sload 9 - load_string "" - string_append 3 + sconst "" + join_string 3 iload 8 - widget_put_name_widget - load_int 86 - load_int -2147483644 - load_string "event_opbase" - load_string "is" + if_setopbase + iconst 86 + iconst -2147483644 + sconst "event_opbase" + sconst "is" iload 8 - widget_put_option_click_listener_widget - load_int -1 - load_string "" + if_setonop + iconst -1 + sconst "" iload 8 - widget_put_mouse_hover_listener_widget - load_int -1 - load_string "" + if_setonmouserepeat + iconst -1 + sconst "" iload 8 - widget_put_mouse_exit_listener_widget - load_int 2 - load_string "Accept challenge" + if_setonmouseleave + iconst 2 + sconst "Accept challenge" iload 8 - widget_put_action_widget + if_setop jump LABEL627 LABEL560: sload 12 string_length - load_int 0 + iconst 0 if_icmpgt LABEL565 jump LABEL590 LABEL565: - load_int 6 - load_string "Open" + iconst 6 + sconst "Open" iload 8 - widget_put_action_widget - load_int 7 - load_string "Check" + if_setop + iconst 7 + sconst "Check" iload 8 - widget_put_action_widget - load_int 2065 + if_setop + iconst 2065 iload 8 - widget_get_parentid_widget + if_getlayer iload 7 - load_int 3158271 - load_string "Iii" + iconst 3158271 + sconst "Iii" iload 8 - widget_put_mouse_hover_listener_widget - load_int 2065 + if_setonmouserepeat + iconst 2065 iload 8 - widget_get_parentid_widget + if_getlayer iload 7 iload 3 - load_string "Iii" + sconst "Iii" iload 8 - widget_put_mouse_exit_listener_widget + if_setonmouseleave jump LABEL598 LABEL590: - load_int -1 - load_string "" + iconst -1 + sconst "" iload 8 - widget_put_mouse_hover_listener_widget - load_int -1 - load_string "" + if_setonmouserepeat + iconst -1 + sconst "" iload 8 - widget_put_mouse_exit_listener_widget + if_setonmouseleave LABEL598: - load_int 9 - load_string "Clear history" + iconst 9 + sconst "Clear history" iload 8 - widget_put_action_widget - load_string "" - load_string "Notification" - load_string "" - string_append 3 + if_setop + sconst "" + sconst "Notification" + sconst "" + join_string 3 iload 8 - widget_put_name_widget - load_int 2064 - load_int -2147483644 + if_setopbase + iconst 2064 + iconst -2147483644 sload 12 - load_string "is" + sconst "is" iload 8 - widget_put_option_click_listener_widget + if_setonop jump LABEL627 LABEL615: - load_int -1 - load_string "" + iconst -1 + sconst "" iload 8 - widget_put_option_click_listener_widget - load_int -1 - load_string "" + if_setonop + iconst -1 + sconst "" iload 8 - widget_put_mouse_hover_listener_widget - load_int -1 - load_string "" + if_setonmouserepeat + iconst -1 + sconst "" iload 8 - widget_put_mouse_exit_listener_widget + if_setonmouseleave LABEL627: iload 5 iload 6 - isub + sub istore 5 iload 7 - load_int 1 - iadd + iconst 1 + add istore 7 - load_int 105 - load_int 73 - load_int 579 + iconst 105 + iconst 73 + iconst 579 iload 7 - get_enum_value + enum istore 8 LABEL641: iload 9 - get_messagenode_next_id + chat_getprevuid istore 9 jump LABEL149 LABEL645: @@ -771,82 +771,82 @@ LABEL645: istore 13 LABEL647: iload 8 - load_int -1 + iconst -1 if_icmpne LABEL651 jump LABEL708 LABEL651: iload 8 - widget_put_actions_null_widget - load_int -1 - load_string "" + if_clearops + iconst -1 + sconst "" iload 8 - widget_put_option_click_listener_widget - load_int -1 - load_string "" + if_setonop + iconst -1 + sconst "" iload 8 - widget_put_mouse_hover_listener_widget - load_int -1 - load_string "" + if_setonmouserepeat + iconst -1 + sconst "" iload 8 - widget_put_mouse_exit_listener_widget - load_int 0 - load_int 0 - load_int 0 - load_int 0 + if_setonmouseleave + iconst 0 + iconst 0 + iconst 0 + iconst 0 iload 8 - widget_put_size_widget - load_int 10616890 + if_setsize + iconst 10616890 iload 7 - load_int 2 - imul - widget_load_child - load_int 1 + iconst 2 + multiply + cc_find + iconst 1 if_icmpeq LABEL679 jump LABEL683 LABEL679: - load_string "" - widget_put_text - load_int 1 - widget_put_hidden + sconst "" + cc_settext + iconst 1 + cc_sethide LABEL683: - load_int 10616890 + iconst 10616890 iload 7 - load_int 2 - imul - load_int 1 - iadd - widget_load_child - load_int 1 + iconst 2 + multiply + iconst 1 + add + cc_find + iconst 1 if_icmpeq LABEL693 jump LABEL697 LABEL693: - load_string "" - widget_put_text - load_int 1 - widget_put_hidden + sconst "" + cc_settext + iconst 1 + cc_sethide LABEL697: iload 7 - load_int 1 - iadd + iconst 1 + add istore 7 - load_int 105 - load_int 73 - load_int 579 + iconst 105 + iconst 73 + iconst 579 iload 7 - get_enum_value + enum istore 8 jump LABEL647 LABEL708: iload 5 - load_int 2 - isub + iconst 2 + sub istore 5 - load_int 0 + iconst 0 iload 5 - isub + sub istore 5 - load_int 10616890 - widget_get_height_widget + iconst 10616890 + if_getheight istore 14 iload 5 iload 14 @@ -860,83 +860,83 @@ LABEL725: istore 7 LABEL727: iload 7 - load_int 0 + iconst 0 if_icmpgt LABEL731 jump LABEL784 LABEL731: iload 7 - load_int 1 - isub + iconst 1 + sub istore 7 - load_int 105 - load_int 73 - load_int 579 + iconst 105 + iconst 73 + iconst 579 iload 7 - get_enum_value + enum istore 8 iload 8 - widget_get_relativey_widget + if_gety iload 14 - iadd - load_int 2 - isub + add + iconst 2 + sub istore 5 iload 8 - widget_get_relativex_widget + if_getx iload 5 - load_int 0 - load_int 0 + iconst 0 + iconst 0 iload 8 - widget_put_position_widget - load_int 10616890 + if_setposition + iconst 10616890 iload 7 - load_int 2 - imul - widget_load_child - load_int 1 + iconst 2 + multiply + cc_find + iconst 1 if_icmpeq LABEL763 jump LABEL768 LABEL763: - widget_get_relativex + cc_getx iload 5 - load_int 0 - load_int 0 - widget_put_position + iconst 0 + iconst 0 + cc_setposition LABEL768: - load_int 10616890 + iconst 10616890 iload 7 - load_int 2 - imul - load_int 1 - iadd - widget_load_child - load_int 1 + iconst 2 + multiply + iconst 1 + add + cc_find + iconst 1 if_icmpeq LABEL778 jump LABEL783 LABEL778: - widget_get_relativex + cc_getx iload 5 - load_int 0 - load_int 0 - widget_put_position + iconst 0 + iconst 0 + cc_setposition LABEL783: jump LABEL727 LABEL784: - load_int 0 + iconst 0 iload 14 - load_int 10616890 - widget_put_scrollwidthheight_widget - load_int 10617391 - load_int 10616890 - get_varc 7 + iconst 10616890 + if_setscrollsize + iconst 10617391 + iconst 10616890 + get_varc_int 7 iload 14 - get_varc 8 - isub - iadd + get_varc_int 8 + sub + add invoke 72 - load_int 10616890 - widget_get_scrolly_widget + iconst 10616890 + if_getscrolly iload 14 - put_varc 8 - put_varc 7 + set_varc_int 8 + set_varc_int 7 return diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm index 39fa1e7b3c..8c48e849dd 100644 --- a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm @@ -3,207 +3,207 @@ .string_stack_count 0 .int_var_count 16 .string_var_count 4 - load_int 0 + iconst 0 istore 1 - load_int 2 + iconst 2 istore 2 - load_int 103 + iconst 103 istore 3 - load_int 4 + iconst 4 istore 4 - load_int 23 + iconst 23 istore 5 invoke 900 istore 6 - load_int 103 - load_int 105 - load_int 1136 + iconst 103 + iconst 105 + iconst 1136 iload 6 - get_enum_value - load_int 0 + enum + iconst 0 if_icmpgt LABEL20 jump LABEL58 LABEL20: iload 6 - load_int 1745 + iconst 1745 if_icmpeq LABEL24 jump LABEL36 LABEL24: - load_int 0 - load_int 102 - load_int 103 - load_int 105 - load_int 1960 + iconst 0 + iconst 102 + iconst 103 + iconst 105 + iconst 1960 iload 6 - get_enum_value - load_int 30 + enum + iconst 30 istore 5 istore 1 istore 3 istore 2 LABEL36: - get_varc 41 - load_int -1 + get_varc_int 41 + iconst -1 if_icmpeq LABEL40 jump LABEL49 LABEL40: invoke 922 - load_int 1 + iconst 1 if_icmpeq LABEL44 jump LABEL49 LABEL44: iload 4 iload 5 - iadd + add istore 4 jump LABEL58 LABEL49: iload 4 - load_int 73 - load_int 73 + iconst 73 + iconst 73 iload 6 - load_int 10551325 - get_enum_value - widget_get_height_widget - iadd + iconst 10551325 + enum + if_getheight + add istore 4 LABEL58: iload 4 istore 7 - load_int 10682368 - widget_get_width_widget + iconst 10682368 + if_getwidth istore 8 - load_int 0 + iconst 0 istore 9 - load_int 105 - load_int 73 - load_int 580 + iconst 105 + iconst 73 + iconst 580 iload 9 - get_enum_value + enum istore 10 - load_int 0 + iconst 0 istore 11 - load_string "" + sconst "" sstore 0 - get_system_update_timer - load_int 0 + reboottimer + iconst 0 if_icmpgt LABEL79 jump LABEL156 LABEL79: - get_system_update_timer - load_int 50 - idiv - load_int 60 - modulo + reboottimer + iconst 50 + div + iconst 60 + mod istore 11 iload 11 - load_int 10 + iconst 10 if_icmplt LABEL89 jump LABEL100 LABEL89: - load_string "System update in: " - get_system_update_timer - load_int 3000 - idiv - int_to_string - load_string ":0" + sconst "System update in: " + reboottimer + iconst 3000 + div + tostring + sconst ":0" iload 11 - int_to_string - string_append 4 + tostring + join_string 4 sstore 0 jump LABEL110 LABEL100: - load_string "System update in: " - get_system_update_timer - load_int 3000 - idiv - int_to_string - load_string ":" + sconst "System update in: " + reboottimer + iconst 3000 + div + tostring + sconst ":" iload 11 - int_to_string - string_append 4 + tostring + join_string 4 sstore 0 LABEL110: iload 7 sload 0 iload 9 iload 10 - load_int 10682368 + iconst 10682368 iload 8 iload 1 - load_int 13 + iconst 13 iload 7 iload 2 iload 3 - load_int 16776960 - load_int 1 + iconst 16776960 + iconst 1 invoke 199 - iadd + add istore 7 iload 10 - widget_put_actions_null_widget - load_int -1 - load_string "" + if_clearops + iconst -1 + sconst "" iload 10 - widget_put_option_click_listener_widget - load_int -1 - load_string "" + if_setonop + iconst -1 + sconst "" iload 10 - widget_put_mouse_hover_listener_widget - load_int -1 - load_string "" + if_setonmouserepeat + iconst -1 + sconst "" iload 10 - widget_put_mouse_exit_listener_widget - load_int 0 - load_int 0 - load_int 0 - load_int 0 + if_setonmouseleave + iconst 0 + iconst 0 + iconst 0 + iconst 0 iload 10 - widget_put_size_widget + if_setsize iload 9 - load_int 1 - iadd + iconst 1 + add istore 9 - load_int 105 - load_int 73 - load_int 580 + iconst 105 + iconst 73 + iconst 580 iload 9 - get_enum_value + enum istore 10 LABEL156: - load_int -1 + iconst -1 istore 12 - load_int -1 + iconst -1 istore 13 - load_string "" + sconst "" sstore 1 - load_int 0 + iconst 0 istore 14 - load_string "" + sconst "" sstore 2 - load_string "" + sconst "" sstore 3 - get_varc 55 - get_varc 202 + get_varc_int 55 + get_varc_int 202 if_icmpge LABEL172 jump LABEL282 LABEL172: - get_varc 55 - get_gamecycle - load_int 3000 - isub + get_varc_int 55 + clientclock + iconst 3000 + sub if_icmpgt LABEL178 jump LABEL282 LABEL178: - load_int 14 - get_chatlinebuffer_length - load_int 0 + iconst 14 + chat_gethistorylength + iconst 0 if_icmpgt LABEL183 jump LABEL282 LABEL183: - load_int 14 - load_int 0 - get_chat_message_type + iconst 14 + iconst 0 + chat_gethistory_bytypeandline istore 14 sstore 0 sstore 2 @@ -211,7 +211,7 @@ LABEL183: istore 13 istore 12 iload 12 - load_int -1 + iconst -1 if_icmpne LABEL196 jump LABEL282 LABEL196: @@ -223,124 +223,124 @@ LABEL196: sload 0 iload 9 iload 10 - load_int 10682368 + iconst 10682368 iload 8 iload 1 - load_int 13 + iconst 13 iload 7 iload 2 iload 3 - load_int 16776960 - load_int 1 + iconst 16776960 + iconst 1 invoke 199 - iadd + add istore 7 iload 10 - widget_put_actions_null_widget + if_clearops sload 3 string_length - load_int 0 + iconst 0 if_icmpgt LABEL223 jump LABEL248 LABEL223: - load_int 6 - load_string "Open" + iconst 6 + sconst "Open" iload 10 - widget_put_action_widget - load_int 7 - load_string "Check" + if_setop + iconst 7 + sconst "Check" iload 10 - widget_put_action_widget - load_int 2065 + if_setop + iconst 2065 iload 10 - widget_get_parentid_widget + if_getlayer iload 9 - load_int 16777215 - load_string "Iii" + iconst 16777215 + sconst "Iii" iload 10 - widget_put_mouse_hover_listener_widget - load_int 2065 + if_setonmouserepeat + iconst 2065 iload 10 - widget_get_parentid_widget + if_getlayer iload 9 - load_int 16776960 - load_string "Iii" + iconst 16776960 + sconst "Iii" iload 10 - widget_put_mouse_exit_listener_widget + if_setonmouseleave jump LABEL256 LABEL248: - load_int -1 - load_string "" + iconst -1 + sconst "" iload 10 - widget_put_mouse_hover_listener_widget - load_int -1 - load_string "" + if_setonmouserepeat + iconst -1 + sconst "" iload 10 - widget_put_mouse_exit_listener_widget + if_setonmouseleave LABEL256: - load_int 9 - load_string "Clear history" + iconst 9 + sconst "Clear history" iload 10 - widget_put_action_widget - load_string "" - load_string "Notification" - load_string "" - string_append 3 + if_setop + sconst "" + sconst "Notification" + sconst "" + join_string 3 iload 10 - widget_put_name_widget - load_int 2064 - load_int -2147483644 + if_setopbase + iconst 2064 + iconst -2147483644 sload 3 - load_string "is" + sconst "is" iload 10 - widget_put_option_click_listener_widget + if_setonop iload 9 - load_int 1 - iadd + iconst 1 + add istore 9 - load_int 105 - load_int 73 - load_int 580 + iconst 105 + iconst 73 + iconst 580 iload 9 - get_enum_value + enum istore 10 LABEL282: iload 0 istore 12 - load_int 0 + iconst 0 istore 15 get_varp 287 - load_int 1 + iconst 1 if_icmpeq LABEL290 jump LABEL479 LABEL290: - get_varc 41 - load_int -1 + get_varc_int 41 + iconst -1 if_icmpne LABEL297 get_varbit 4089 - load_int 0 + iconst 0 if_icmpeq LABEL297 jump LABEL479 LABEL297: iload 12 - load_int -1 + iconst -1 if_icmpne LABEL301 jump LABEL479 LABEL301: iload 10 - load_int -1 + iconst -1 if_icmpne LABEL305 jump LABEL479 LABEL305: iload 7 iload 4 - isub - load_int 57 + sub + iconst 57 if_icmplt LABEL311 jump LABEL479 LABEL311: iload 12 - get_chat_message + chat_gethistory_byuid istore 14 sstore 0 sstore 2 @@ -352,7 +352,7 @@ LABEL311: iload 13 iload 14 invoke 91 - load_int 1 + iconst 1 if_icmpeq LABEL327 jump LABEL475 LABEL327: @@ -364,50 +364,50 @@ LABEL327: jump LABEL372 LABEL330: iload 7 - load_string "From " + sconst "From " sload 1 - load_string ":" - load_string "privateChatSplitFrom" - runelite_callback - string_append 3 + sconst ":" + sconst "privateChatSplitFrom" + runelite_callback + join_string 3 sload 0 iload 9 iload 10 - load_int 10682368 + iconst 10682368 iload 8 iload 1 - load_int 13 + iconst 13 iload 7 iload 2 iload 3 - load_int 65535 - load_int 1 + iconst 65535 + iconst 1 invoke 203 - iadd + add istore 7 jump LABEL407 LABEL351: iload 7 - load_string "To " + sconst "To " sload 1 - load_string ":" - load_string "privateChatSplitTo" - runelite_callback - string_append 3 + sconst ":" + sconst "privateChatSplitTo" + runelite_callback + join_string 3 sload 0 iload 9 iload 10 - load_int 10682368 + iconst 10682368 iload 8 iload 1 - load_int 13 + iconst 13 iload 7 iload 2 iload 3 - load_int 65535 - load_int 1 + iconst 65535 + iconst 1 invoke 203 - iadd + add istore 7 jump LABEL407 LABEL372: @@ -415,184 +415,184 @@ LABEL372: sload 0 iload 9 iload 10 - load_int 10682368 + iconst 10682368 iload 8 iload 1 - load_int 13 + iconst 13 iload 7 iload 2 iload 3 - load_int 65535 - load_int 1 + iconst 65535 + iconst 1 invoke 199 - iadd + add istore 7 iload 15 - load_int 5 + iconst 5 if_icmpeq LABEL392 jump LABEL407 LABEL392: get_varbit 1627 - load_int 0 + iconst 0 if_icmpeq LABEL396 jump LABEL407 LABEL396: iload 13 - load_int 500 - iadd - load_int 1 - iadd - put_varc 65 - load_int 664 - load_int 0 - load_string "1" - load_int 10616832 - widget_put_render_listener_widget + iconst 500 + add + iconst 1 + add + set_varc_int 65 + iconst 664 + iconst 0 + sconst "1" + iconst 10616832 + if_setontimer LABEL407: iload 10 - widget_put_actions_null_widget + if_clearops iload 15 - load_int 3 + iconst 3 if_icmpeq LABEL419 iload 15 - load_int 6 + iconst 6 if_icmpeq LABEL419 iload 15 - load_int 7 + iconst 7 if_icmpeq LABEL419 jump LABEL453 LABEL419: iload 14 - load_int 1 + iconst 1 if_icmpeq LABEL423 jump LABEL428 LABEL423: - load_int 8 - load_string "Message" + iconst 8 + sconst "Message" iload 10 - widget_put_action_widget + if_setop jump LABEL436 LABEL428: - load_int 8 - load_string "Add friend" + iconst 8 + sconst "Add friend" iload 10 - widget_put_action_widget - load_int 9 - load_string "Add ignore" + if_setop + iconst 9 + sconst "Add ignore" iload 10 - widget_put_action_widget + if_setop LABEL436: - load_int 10 - load_string "Report" + iconst 10 + sconst "Report" iload 10 - widget_put_action_widget - load_string "" + if_setop + sconst "" sload 1 - load_string "" - string_append 3 + sconst "" + join_string 3 iload 10 - widget_put_name_widget - load_int 88 - load_int -2147483644 - load_string "event_opbase" - load_string "is" + if_setopbase + iconst 88 + iconst -2147483644 + sconst "event_opbase" + sconst "is" iload 10 - widget_put_option_click_listener_widget + if_setonop jump LABEL457 LABEL453: - load_int -1 - load_string "" + iconst -1 + sconst "" iload 10 - widget_put_option_click_listener_widget + if_setonop LABEL457: - load_int -1 - load_string "" + iconst -1 + sconst "" iload 10 - widget_put_mouse_hover_listener_widget - load_int -1 - load_string "" + if_setonmouserepeat + iconst -1 + sconst "" iload 10 - widget_put_mouse_exit_listener_widget + if_setonmouseleave iload 9 - load_int 1 - iadd + iconst 1 + add istore 9 - load_int 105 - load_int 73 - load_int 580 + iconst 105 + iconst 73 + iconst 580 iload 9 - get_enum_value + enum istore 10 LABEL475: iload 12 - get_messagenode_next_id + chat_getprevuid istore 12 jump LABEL297 LABEL479: iload 10 - load_int -1 + iconst -1 if_icmpne LABEL483 jump LABEL540 LABEL483: iload 10 - widget_put_actions_null_widget - load_int -1 - load_string "" + if_clearops + iconst -1 + sconst "" iload 10 - widget_put_option_click_listener_widget - load_int -1 - load_string "" + if_setonop + iconst -1 + sconst "" iload 10 - widget_put_mouse_hover_listener_widget - load_int -1 - load_string "" + if_setonmouserepeat + iconst -1 + sconst "" iload 10 - widget_put_mouse_exit_listener_widget - load_int 0 - load_int 0 - load_int 0 - load_int 0 + if_setonmouseleave + iconst 0 + iconst 0 + iconst 0 + iconst 0 iload 10 - widget_put_size_widget - load_int 10682368 + if_setsize + iconst 10682368 iload 9 - load_int 2 - imul - widget_load_child - load_int 1 + iconst 2 + multiply + cc_find + iconst 1 if_icmpeq LABEL511 jump LABEL515 LABEL511: - load_string "" - widget_put_text - load_int 1 - widget_put_hidden + sconst "" + cc_settext + iconst 1 + cc_sethide LABEL515: - load_int 10682368 + iconst 10682368 iload 9 - load_int 2 - imul - load_int 1 - iadd - widget_load_child - load_int 1 + iconst 2 + multiply + iconst 1 + add + cc_find + iconst 1 if_icmpeq LABEL525 jump LABEL529 LABEL525: - load_string "" - widget_put_text - load_int 1 - widget_put_hidden + sconst "" + cc_settext + iconst 1 + cc_sethide LABEL529: iload 9 - load_int 1 - iadd + iconst 1 + add istore 9 - load_int 105 - load_int 73 - load_int 580 + iconst 105 + iconst 73 + iconst 580 iload 9 - get_enum_value + enum istore 10 jump LABEL479 LABEL540: diff --git a/runelite-client/src/main/scripts/ChatboxInput.rs2asm b/runelite-client/src/main/scripts/ChatboxInput.rs2asm index a9f0cf7f57..98567e8f1c 100644 --- a/runelite-client/src/main/scripts/ChatboxInput.rs2asm +++ b/runelite-client/src/main/scripts/ChatboxInput.rs2asm @@ -5,47 +5,47 @@ .string_var_count 1 sload 0 ; load input iload 0 ; load chat type - load_string "chatboxInput" ; event name - runelite_callback ; invoke callback - pop_int ; pop chat type - string_length ; get string length of chat message - load_int 0 ; load 0 + sconst "chatboxInput" ; event name + runelite_callback ; invoke callback + pop_int ; pop chat type + string_length ; get string length of chat message + iconst 0 ; load 0 if_icmpne LABEL100 ; if length is not 0, continue - return + return LABEL100: get_varbit 4394 - load_int 1 + iconst 1 if_icmpeq LABEL4 jump LABEL24 LABEL4: iload 0 - load_int 1 + iconst 1 if_icmpeq LABEL8 jump LABEL16 LABEL8: - get_localplayer_name - load_string ": " - load_string "" + chat_playername + sconst ": " + sconst "" sload 0 - load_string "" - string_append 5 - send_game_message + sconst "" + join_string 5 + mes jump LABEL23 LABEL16: - get_localplayer_name - load_string ": " - load_string "" + chat_playername + sconst ": " + sconst "" sload 0 - load_string "" - string_append 5 - send_game_message + sconst "" + join_string 5 + mes LABEL23: jump LABEL27 LABEL24: sload 0 iload 0 - chatbox_input + chat_sendpublic LABEL27: - get_gamecycle - put_varc 61 - return + clientclock + set_varc_int 61 + return diff --git a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm index 63c13e7aee..7d608c5d0c 100644 --- a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm @@ -3,166 +3,166 @@ .string_stack_count 0 .int_var_count 4 .string_var_count 3 - load_string "" + sconst "" sstore 0 - load_int 0 + iconst 0 istore 0 - load_int 6250335 + iconst 6250335 istore 1 invoke 921 - load_int 1 + iconst 1 if_icmpeq LABEL10 jump LABEL20 LABEL10: - load_string "" - load_int 16777215 - load_int 12566463 + sconst "" + iconst 16777215 + iconst 12566463 istore 1 istore 0 sstore 0 - load_int 1 - load_int 10616889 - widget_put_text_shadowed_widget + iconst 1 + iconst 10616889 + if_settextshadow jump LABEL23 LABEL20: - load_int 0 - load_int 10616889 - widget_put_text_shadowed_widget + iconst 0 + iconst 10616889 + if_settextshadow LABEL23: iload 0 - load_int 10616889 - widget_put_textcolor_widget - 049 335 + iconst 10616889 + if_setcolour + get_varc_string 335 string_length istore 2 - 049 335 - appendtags + get_varc_string 335 + escape sstore 1 - load_string "" + sconst "" sstore 2 - load_int 0 + iconst 0 istore 3 get_varbit 8119 - load_int 1 + iconst 1 if_icmpeq LABEL40 jump LABEL99 LABEL40: - load_int 105 - load_int 115 - load_int 1894 + iconst 105 + iconst 115 + iconst 1894 get_varbit 1777 - get_enum_value - get_localplayer_name - load_string ": " + enum + chat_playername + sconst ": " sload 0 sload 1 - load_string "" - string_append 6 + sconst "" + join_string 6 sstore 2 iload 2 - load_int 80 + iconst 80 if_icmplt LABEL56 jump LABEL63 LABEL56: sload 2 sload 0 - load_string "*" - load_string "" - string_append 3 - concat_string + sconst "*" + sconst "" + join_string 3 + append sstore 2 LABEL63: sload 2 - load_int 2147483647 - load_int 495 - get_max_line_width + iconst 2147483647 + iconst 495 + parawidth istore 3 iload 3 - load_int 10616889 - widget_get_width_widget + iconst 10616889 + if_getwidth if_icmpgt LABEL73 jump LABEL79 LABEL73: - load_int 2 - load_int 2 - load_int 0 - load_int 10616889 - widget_put_text_alignment_widget + iconst 2 + iconst 2 + iconst 0 + iconst 10616889 + if_settextalign jump LABEL84 LABEL79: - load_int 0 - load_int 2 - load_int 0 - load_int 10616889 - widget_put_text_alignment_widget + iconst 0 + iconst 2 + iconst 0 + iconst 10616889 + if_settextalign LABEL84: - load_int 10616889 - widget_put_actions_null_widget - load_int -1 - load_string "" - load_int 10616889 - widget_put_mouse_hover_listener_widget - load_int -1 - load_string "" - load_int 10616889 - widget_put_mouse_exit_listener_widget - load_int -1 - load_string "" - load_int 10616889 - widget_put_option_click_listener_widget + iconst 10616889 + if_clearops + iconst -1 + sconst "" + iconst 10616889 + if_setonmouserepeat + iconst -1 + sconst "" + iconst 10616889 + if_setonmouseleave + iconst -1 + sconst "" + iconst 10616889 + if_setonop jump LABEL140 LABEL99: - load_int 105 - load_int 115 - load_int 1894 + iconst 105 + iconst 115 + iconst 1894 get_varbit 1777 - get_enum_value - load_string " You must set a name before you can chat." - string_append 2 + enum + sconst " You must set a name before you can chat." + join_string 2 sstore 2 - load_int 1 - load_int 2 - load_int 0 - load_int 10616889 - widget_put_text_alignment_widget - load_int 10 - load_string "Configure" - load_int 10616889 - widget_put_action_widget - load_string "" - load_string "Display name" - load_string "" - string_append 3 - load_int 10616889 - widget_put_name_widget - load_int 45 - load_int -2147483645 + iconst 1 + iconst 2 + iconst 0 + iconst 10616889 + if_settextalign + iconst 10 + sconst "Configure" + iconst 10616889 + if_setop + sconst "" + sconst "Display name" + sconst "" + join_string 3 + iconst 10616889 + if_setopbase + iconst 45 + iconst -2147483645 iload 1 - load_string "Ii" - load_int 10616889 - widget_put_mouse_hover_listener_widget - load_int 45 - load_int -2147483645 + sconst "Ii" + iconst 10616889 + if_setonmouserepeat + iconst 45 + iconst -2147483645 iload 0 - load_string "Ii" - load_int 10616889 - widget_put_mouse_exit_listener_widget - load_int 489 - load_int -2147483644 - load_int 1024 - load_string "ii" - load_int 10616889 - widget_put_option_click_listener_widget + sconst "Ii" + iconst 10616889 + if_setonmouseleave + iconst 489 + iconst -2147483644 + iconst 1024 + sconst "ii" + iconst 10616889 + if_setonop LABEL140: sload 2 - load_int 10616889 - widget_put_text_widget - load_string "setChatboxInput" + iconst 10616889 + if_settext + sconst "setChatboxInput" runelite_callback - load_int 3 - load_int 16 - load_int 1 - load_int 0 - load_int 10616889 - widget_put_size_widget + iconst 3 + iconst 16 + iconst 1 + iconst 0 + iconst 10616889 + if_setsize return diff --git a/runelite-client/src/main/scripts/CommandScript.rs2asm b/runelite-client/src/main/scripts/CommandScript.rs2asm index eba8db6af1..0926703d6b 100644 --- a/runelite-client/src/main/scripts/CommandScript.rs2asm +++ b/runelite-client/src/main/scripts/CommandScript.rs2asm @@ -3,238 +3,238 @@ .string_stack_count 0 .int_var_count 5 .string_var_count 0 - load_int 10616887 - widget_get_hidden_widget - load_int 1 + iconst 10616887 + if_gethide + iconst 1 if_icmpeq LABEL9 - load_int 10616888 - widget_get_hidden_widget - load_int 1 + iconst 10616888 + if_gethide + iconst 1 if_icmpeq LABEL9 jump LABEL10 LABEL9: return LABEL10: get_varbit 8119 - load_int 0 + iconst 0 if_icmpeq LABEL19 - load_int -1 - load_int 162 + iconst -1 + iconst 162 invoke 1701 - load_int 0 + iconst 0 if_icmpeq LABEL19 jump LABEL20 LABEL19: return LABEL20: - 049 335 + get_varc_string 335 string_length istore 2 - load_int 0 + iconst 0 istore 3 - load_int 0 + iconst 0 istore 4 invoke 1972 - load_int 1 + iconst 1 if_icmpeq LABEL31 jump LABEL37 LABEL31: - get_varc 41 - load_int 4 + get_varc_int 41 + iconst 4 if_icmpeq LABEL35 jump LABEL37 LABEL35: - load_int 1 + iconst 1 istore 4 LABEL37: - get_rights - load_int 0 + staffmodlevel + iconst 0 if_icmpgt LABEL41 jump LABEL43 LABEL41: - load_int 1 + iconst 1 istore 3 LABEL43: iload 3 - load_int 1 + iconst 1 if_icmpeq LABEL47 jump LABEL58 LABEL47: - load_string "`" + sconst "`" iload 1 - string_indexof - load_int -1 + string_indexof_char + iconst -1 if_icmpne LABEL53 jump LABEL58 LABEL53: iload 2 - load_int 0 + iconst 0 if_icmpeq LABEL57 jump LABEL58 LABEL57: return LABEL58: iload 0 - load_int 84 + iconst 84 if_icmpeq LABEL62 jump LABEL179 LABEL62: invoke 1984 iload 2 - load_int 0 + iconst 0 if_icmpgt LABEL67 jump LABEL178 LABEL67: - 049 335 - load_string "/" - load_int 0 - string_indexof_from - load_int 0 + get_varc_string 335 + sconst "/" + iconst 0 + string_indexof_string + iconst 0 if_icmpeq LABEL77 iload 4 - load_int 1 + iconst 1 if_icmpeq LABEL77 jump LABEL112 LABEL77: - get_clanchatcount - load_int 0 + clan_getchatcount + iconst 0 if_icmpgt LABEL81 jump LABEL108 LABEL81: iload 2 - load_int 1 + iconst 1 if_icmple LABEL85 jump LABEL90 LABEL85: iload 4 - load_int 0 + iconst 0 if_icmpeq LABEL89 jump LABEL90 LABEL89: return LABEL90: get_varbit 4394 - load_int 1 + iconst 1 if_icmpeq LABEL94 jump LABEL96 LABEL94: - part_clanchat + clan_leavechat jump LABEL107 LABEL96: iload 4 - load_int 1 + iconst 1 if_icmpeq LABEL100 jump LABEL104 LABEL100: - load_string "/" - 049 335 - concat_string - 050 335 + sconst "/" + get_varc_string 335 + append + set_varc_string 335 LABEL104: - 049 335 - load_int 2 + get_varc_string 335 + iconst 2 invoke 96 LABEL107: jump LABEL111 LABEL108: - 049 335 - load_int 0 + get_varc_string 335 + iconst 0 invoke 96 LABEL111: jump LABEL174 LABEL112: - 049 335 - load_string "::" - load_int 0 - string_indexof_from - load_int 0 + get_varc_string 335 + sconst "::" + iconst 0 + string_indexof_string + iconst 0 if_icmpeq LABEL119 jump LABEL171 LABEL119: iload 2 - load_int 2 + iconst 2 if_icmpgt LABEL123 jump LABEL167 LABEL123: - 049 335 - load_string "::toggleroof" - load_int 0 - string_indexof_from - load_int 0 + get_varc_string 335 + sconst "::toggleroof" + iconst 0 + string_indexof_string + iconst 0 if_icmpeq LABEL130 jump LABEL144 LABEL130: - get_hideroofs - load_int 1 + getremoveroofs + iconst 1 if_icmpeq LABEL134 jump LABEL139 LABEL134: - load_int 0 - set_hideroofs - load_string "Roofs will only be removed selectively." - send_game_message + iconst 0 + setremoveroofs + sconst "Roofs will only be removed selectively." + mes jump LABEL143 LABEL139: - load_int 1 - set_hideroofs - load_string "Roofs are now all hidden." - send_game_message + iconst 1 + setremoveroofs + sconst "Roofs are now all hidden." + mes LABEL143: jump LABEL166 LABEL144: - 049 335 - load_string "::bank" - load_int 0 - string_indexof_from - load_int 0 + get_varc_string 335 + sconst "::bank" + iconst 0 + string_indexof_string + iconst 0 if_icmpeq LABEL151 - load_string "runeliteCommand" ; load callback name + sconst "runeliteCommand" ; load callback name runelite_callback ; invoke callback jump LABEL155 LABEL151: - load_string "Hey, everyone, I just tried to do something very silly!" - load_int 0 + sconst "Hey, everyone, I just tried to do something very silly!" + iconst 0 invoke 96 jump LABEL166 LABEL155: - 049 335 + get_varc_string 335 invoke 224 - 050 335 - 049 335 + set_varc_string 335 + get_varc_string 335 string_length istore 2 - 049 335 - load_int 2 + get_varc_string 335 + iconst 2 iload 2 - string_substring - run_command + substring + docheat LABEL166: jump LABEL170 LABEL167: - 049 335 - load_int 0 + get_varc_string 335 + iconst 0 invoke 96 LABEL170: jump LABEL174 LABEL171: - 049 335 - load_int 0 + get_varc_string 335 + iconst 0 invoke 96 LABEL174: - 049 335 + get_varc_string 335 invoke 77 - load_string "" - 050 335 + sconst "" + set_varc_string 335 LABEL178: jump LABEL247 LABEL179: iload 0 - load_int 104 + iconst 104 if_icmpeq LABEL183 jump LABEL189 LABEL183: iload 3 - load_int 1 + iconst 1 if_icmpeq LABEL187 jump LABEL188 LABEL187: @@ -243,12 +243,12 @@ LABEL188: jump LABEL247 LABEL189: iload 0 - load_int 105 + iconst 105 if_icmpeq LABEL193 jump LABEL199 LABEL193: iload 3 - load_int 1 + iconst 1 if_icmpeq LABEL197 jump LABEL198 LABEL197: @@ -257,68 +257,68 @@ LABEL198: jump LABEL247 LABEL199: iload 0 - load_int 80 + iconst 80 if_icmpeq LABEL203 jump LABEL241 LABEL203: - 049 356 + get_varc_string 356 string_length - load_int 0 + iconst 0 if_icmpgt LABEL208 jump LABEL228 LABEL208: - 049 356 - is_friend - load_int 1 + get_varc_string 356 + friend_test + iconst 1 if_icmpeq LABEL213 jump LABEL216 LABEL213: - 049 356 + get_varc_string 356 invoke 107 return LABEL216: - get_varc 60 - get_gamecycle + get_varc_int 60 + clientclock if_icmpgt LABEL220 jump LABEL221 LABEL220: return LABEL221: - get_gamecycle - load_int 50 - iadd - put_varc 60 - load_string "That player was not found on your Friends list." - send_game_message + clientclock + iconst 50 + add + set_varc_int 60 + sconst "That player was not found on your Friends list." + mes return LABEL228: - get_varc 60 - get_gamecycle + get_varc_int 60 + clientclock if_icmpgt LABEL232 jump LABEL233 LABEL232: return LABEL233: - get_gamecycle - load_int 50 - iadd - put_varc 60 - load_string "You haven't received any messages to which you can reply." - send_game_message + clientclock + iconst 50 + add + set_varc_int 60 + sconst "You haven't received any messages to which you can reply." + mes return jump LABEL247 LABEL241: - 049 335 - load_int 0 + get_varc_string 335 + iconst 0 iload 0 iload 1 invoke 74 - load_int 1 ; check if we're ignoring input - load_int 0 ; - load_string "blockChatInput" ; + iconst 1 ; check if we're ignoring input + iconst 0 ; + sconst "blockChatInput" ; runelite_callback ; if_icmpeq LABEL247 ; don't add to input varcstr - 050 335 + set_varc_string 335 LABEL247: invoke 223 return diff --git a/runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm b/runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm index aa38d28de9..547863277a 100644 --- a/runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm +++ b/runelite-client/src/main/scripts/OpenBankSearchInput.rs2asm @@ -3,42 +3,42 @@ .string_stack_count 0 .int_var_count 0 .string_var_count 1 - get_varc 11 - load_int 1 + get_varc_int 11 + iconst 1 if_icmpeq LABEL4 jump LABEL5 LABEL4: - close_window + if_close LABEL5: - load_int 11 + iconst 11 invoke 677 - load_string "Show items whose names contain the following text:" - load_string "setSearchBankInputText" ; load event name + sconst "Show items whose names contain the following text:" + sconst "setSearchBankInputText" ; load event name runelite_callback ; invoke callback - load_int 10616876 - widget_put_text_widget - load_string "" + iconst 10616876 + if_settext + sconst "" invoke 222 - load_string "" + sconst "" sstore 0 - load_int 112 - load_int -2147483640 - load_int -2147483639 + iconst 112 + iconst -2147483640 + iconst -2147483639 sload 0 - load_string "izs" - load_int 10616877 - widget_put_key_listener_widget - load_int 138 - load_string "" - load_int 10616877 - widget_put_dialog_abort_listener_widget + sconst "izs" + iconst 10616877 + if_setonkey + iconst 138 + sconst "" + iconst 10616877 + if_setondialogabort invoke 1972 - load_int 1 + iconst 1 if_icmpeq LABEL29 jump LABEL32 LABEL29: - load_int 0 - load_int 80 + iconst 0 + iconst 80 invoke 1983 LABEL32: return diff --git a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm index bb6da79dd8..afb820ff0f 100644 --- a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm +++ b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm @@ -3,253 +3,253 @@ .string_stack_count 0 .int_var_count 21 .string_var_count 0 - load_int 73 - load_int 73 + iconst 73 + iconst 73 iload 1 - load_int 10551298 - get_enum_value + iconst 10551298 + enum istore 2 - load_int 73 - load_int 73 + iconst 73 + iconst 73 iload 1 - load_int 10551306 - get_enum_value + iconst 10551306 + enum istore 3 - load_int 73 - load_int 73 + iconst 73 + iconst 73 iload 1 - load_int 10551301 - get_enum_value + iconst 10551301 + enum istore 4 - load_int 73 - load_int 73 + iconst 73 + iconst 73 iload 1 - load_int 10551308 - get_enum_value + iconst 10551308 + enum istore 5 - load_int 103 - load_int 105 - load_int 1960 + iconst 103 + iconst 105 + iconst 1960 iload 1 - get_enum_value + enum istore 6 - load_int 103 - load_int 105 - load_int 1961 + iconst 103 + iconst 105 + iconst 1961 iload 1 - get_enum_value + enum istore 7 - load_int 103 - load_int 105 - load_int 1135 + iconst 103 + iconst 105 + iconst 1135 iload 1 - get_enum_value + enum istore 8 - load_int 103 - load_int 105 - load_int 1136 + iconst 103 + iconst 105 + iconst 1136 iload 1 - get_enum_value + enum istore 9 - load_int 0 + iconst 0 istore 10 - load_int 0 + iconst 0 istore 11 - load_int 0 + iconst 0 istore 12 - load_int 0 + iconst 0 istore 13 - load_int 0 + iconst 0 istore 14 - load_int 0 + iconst 0 istore 15 iload 0 - widget_get_width_widget + if_getwidth istore 16 iload 0 - widget_get_height_widget + if_getheight istore 17 iload 1 - load_int 1745 + iconst 1745 if_icmpeq LABEL70 jump LABEL84 LABEL70: - load_int 0 + iconst 0 iload 16 - load_int 39387148 - widget_get_width_widget - isub + iconst 39387148 + if_getwidth + sub invoke 1045 istore 14 - load_int 0 + iconst 0 iload 17 - load_int 39387148 - widget_get_height_widget - isub + iconst 39387148 + if_getheight + sub invoke 1045 istore 15 LABEL84: get_varbit 4606 - load_int 0 + iconst 0 if_icmpne LABEL88 jump LABEL253 LABEL88: get_varbit 4606 - load_int 2 + iconst 2 if_icmpeq LABEL92 jump LABEL101 LABEL92: - load_int 512 - load_int 220 - 6200 - load_int 0 - load_int 0 - load_int 0 - load_int 0 - 6202 + iconst 512 + iconst 220 + viewport_setfov + iconst 0 + iconst 0 + iconst 0 + iconst 0 + viewport_clampfov jump LABEL106 LABEL101: - load_int 512 - load_int 512 - load_int 512 - load_int 512 - 6202 + iconst 512 + iconst 512 + iconst 512 + iconst 512 + viewport_clampfov LABEL106: - load_int 50 - set_camera_focal_point_height + iconst 50 + cam_setfollowheight iload 2 - load_int -1 + iconst -1 if_icmpne LABEL112 jump LABEL252 LABEL112: iload 3 - load_int -1 + iconst -1 if_icmpne LABEL116 jump LABEL252 LABEL116: - get_viewport_size + viewport_geteffectivesize istore 11 istore 10 - load_int 0 + iconst 0 iload 16 iload 10 - isub + sub invoke 1045 - load_int 0 + iconst 0 iload 17 iload 11 - isub + sub invoke 1045 istore 13 istore 12 iload 10 iload 11 - load_int 0 - load_int 0 + iconst 0 + iconst 0 iload 2 - widget_put_size_widget + if_setsize iload 10 - load_int 0 + iconst 0 iload 14 iload 12 - isub + sub invoke 1045 - isub + sub iload 11 - load_int 0 + iconst 0 iload 15 iload 13 - isub + sub invoke 1045 - isub - load_int 0 - load_int 0 + sub + iconst 0 + iconst 0 iload 3 - widget_put_size_widget + if_setsize iload 4 - load_int -1 + iconst -1 if_icmpne LABEL159 jump LABEL242 LABEL159: iload 5 - load_int -1 + iconst -1 if_icmpne LABEL163 jump LABEL242 LABEL163: iload 12 iload 14 - isub - load_int 2 - idiv + sub + iconst 2 + div iload 13 iload 15 - isub - load_int 2 - idiv + sub + iconst 2 + div istore 13 istore 12 - load_int 0 + iconst 0 iload 6 iload 12 - isub + sub invoke 1045 - load_int 0 + iconst 0 iload 8 iload 12 - isub + sub invoke 1045 istore 8 istore 6 - load_int 0 + iconst 0 iload 7 iload 13 - isub + sub invoke 1045 - load_int 0 + iconst 0 iload 9 iload 13 - isub + sub invoke 1045 istore 9 istore 7 iload 6 iload 7 - load_int 0 - load_int 0 + iconst 0 + iconst 0 iload 4 - widget_put_position_widget + if_setposition iload 6 iload 7 - load_int 0 - load_int 0 + iconst 0 + iconst 0 iload 5 - widget_put_position_widget + if_setposition iload 6 iload 8 - iadd + add iload 7 iload 9 - iadd - load_int 1 - load_int 1 + add + iconst 1 + iconst 1 iload 4 - widget_put_size_widget + if_setsize iload 6 iload 8 - iadd + add iload 7 iload 9 - iadd - load_int 1 - load_int 1 + add + iconst 1 + iconst 1 iload 5 - widget_put_size_widget + if_setsize iload 1 - load_int 73 - load_int 73 + iconst 73 + iconst 73 iload 1 - load_int 10551307 - get_enum_value + iconst 10551307 + enum iload 5 iload 8 iload 9 @@ -257,137 +257,137 @@ LABEL163: jump LABEL252 LABEL242: iload 1 - load_int 73 - load_int 73 + iconst 73 + iconst 73 iload 1 - load_int 10551307 - get_enum_value + iconst 10551307 + enum iload 3 - load_int 0 - load_int 0 + iconst 0 + iconst 0 invoke 910 LABEL252: jump LABEL369 LABEL253: - load_int 0 - load_int 0 - load_int 0 - load_int 0 - 6202 - get_varc 73 - load_int 128 - load_string "outerZoomLimit" - runelite_callback + iconst 0 + iconst 0 + iconst 0 + iconst 0 + viewport_clampfov + get_varc_int 73 + iconst 128 + sconst "outerZoomLimit" + runelite_callback if_icmpge LABEL262 jump LABEL278 LABEL262: - get_varc 73 - load_int 896 - load_string "innerZoomLimit" + get_varc_int 73 + iconst 896 + sconst "innerZoomLimit" runelite_callback if_icmple LABEL266 jump LABEL278 LABEL266: - get_varc 74 - load_int 128 - load_string "outerZoomLimit" - runelite_callback + get_varc_int 74 + iconst 128 + sconst "outerZoomLimit" + runelite_callback if_icmpge LABEL270 jump LABEL278 LABEL270: - get_varc 74 - load_int 896 - load_string "innerZoomLimit" + get_varc_int 74 + iconst 896 + sconst "innerZoomLimit" runelite_callback if_icmple LABEL274 jump LABEL278 LABEL274: - get_varc 73 - get_varc 74 + get_varc_int 73 + get_varc_int 74 invoke 42 jump LABEL281 LABEL278: - load_int 512 - load_int 512 + iconst 512 + iconst 512 invoke 42 LABEL281: - get_viewport_size + viewport_geteffectivesize istore 11 istore 10 iload 2 - load_int -1 + iconst -1 if_icmpne LABEL288 jump LABEL369 LABEL288: iload 3 - load_int -1 + iconst -1 if_icmpne LABEL292 jump LABEL369 LABEL292: iload 10 iload 11 - load_int 0 - load_int 0 + iconst 0 + iconst 0 iload 2 - widget_put_size_widget + if_setsize iload 10 iload 14 - isub + sub iload 11 iload 15 - isub - load_int 0 - load_int 0 + sub + iconst 0 + iconst 0 iload 3 - widget_put_size_widget + if_setsize iload 4 - load_int -1 + iconst -1 if_icmpne LABEL312 jump LABEL359 LABEL312: iload 5 - load_int -1 + iconst -1 if_icmpne LABEL316 jump LABEL359 LABEL316: iload 6 iload 7 - load_int 0 - load_int 0 + iconst 0 + iconst 0 iload 4 - widget_put_position_widget + if_setposition iload 6 iload 7 - load_int 0 - load_int 0 + iconst 0 + iconst 0 iload 5 - widget_put_position_widget + if_setposition iload 6 iload 8 - iadd + add iload 7 iload 9 - iadd - load_int 1 - load_int 1 + add + iconst 1 + iconst 1 iload 4 - widget_put_size_widget + if_setsize iload 6 iload 8 - iadd + add iload 7 iload 9 - iadd - load_int 1 - load_int 1 + add + iconst 1 + iconst 1 iload 5 - widget_put_size_widget + if_setsize iload 1 - load_int 73 - load_int 73 + iconst 73 + iconst 73 iload 1 - load_int 10551307 - get_enum_value + iconst 10551307 + enum iload 5 iload 8 iload 9 @@ -395,191 +395,191 @@ LABEL316: jump LABEL369 LABEL359: iload 1 - load_int 73 - load_int 73 + iconst 73 + iconst 73 iload 1 - load_int 10551307 - get_enum_value + iconst 10551307 + enum iload 3 - load_int 0 - load_int 0 + iconst 0 + iconst 0 invoke 910 LABEL369: - load_int 73 - load_int 73 + iconst 73 + iconst 73 iload 1 - load_int 10551309 - get_enum_value + iconst 10551309 + enum istore 18 iload 18 - load_int -1 + iconst -1 if_icmpne LABEL379 jump LABEL423 LABEL379: invoke 1972 - load_int 0 + iconst 0 if_icmpeq LABEL383 jump LABEL417 LABEL383: iload 18 - widget_get_index_widget - load_int 1 + if_hassub + iconst 1 if_icmpeq LABEL388 jump LABEL417 LABEL388: - get_varc 173 - load_int -2 + get_varc_int 173 + iconst -2 if_icmpeq LABEL392 jump LABEL399 LABEL392: - load_int 512 - load_int 0 - load_int 0 - load_int 1 + iconst 512 + iconst 0 + iconst 0 + iconst 1 iload 18 - widget_put_size_widget + if_setsize jump LABEL416 LABEL399: - get_varc 173 - load_int -3 + get_varc_int 173 + iconst -3 if_icmpeq LABEL403 jump LABEL410 LABEL403: - load_int 0 - load_int 0 - load_int 1 - load_int 1 + iconst 0 + iconst 0 + iconst 1 + iconst 1 iload 18 - widget_put_size_widget + if_setsize jump LABEL416 LABEL410: - load_int 512 - load_int 334 - load_int 0 - load_int 0 + iconst 512 + iconst 334 + iconst 0 + iconst 0 iload 18 - widget_put_size_widget + if_setsize LABEL416: jump LABEL423 LABEL417: - load_int 512 - load_int 334 - load_int 0 - load_int 0 + iconst 512 + iconst 334 + iconst 0 + iconst 0 iload 18 - widget_put_size_widget + if_setsize LABEL423: - load_int 73 - load_int 73 + iconst 73 + iconst 73 iload 1 - load_int 10551311 - get_enum_value + iconst 10551311 + enum istore 18 - load_int 0 + iconst 0 istore 19 - load_int 0 + iconst 0 istore 20 iload 18 - load_int -1 + iconst -1 if_icmpne LABEL437 jump LABEL481 LABEL437: - load_int 73 - load_int 73 + iconst 73 + iconst 73 iload 1 - load_int 10551303 - get_enum_value - widget_get_index_widget - load_int 1 + iconst 10551303 + enum + if_hassub + iconst 1 if_icmpeq LABEL446 jump LABEL455 LABEL446: get_varbit 4692 - load_int 0 + iconst 0 if_icmpne LABEL450 jump LABEL453 LABEL450: - load_int 0 + iconst 0 istore 20 jump LABEL455 LABEL453: - load_int 38 + iconst 38 istore 20 LABEL455: invoke 1972 - load_int 1 + iconst 1 if_icmpeq LABEL459 jump LABEL473 LABEL459: get_varbit 6254 - load_int 0 + iconst 0 if_icmpeq LABEL463 jump LABEL468 LABEL463: - load_int 182 - load_int 4 - iadd + iconst 182 + iconst 4 + add istore 19 jump LABEL472 LABEL468: - load_int 120 - load_int 4 - iadd + iconst 120 + iconst 4 + add istore 19 LABEL472: jump LABEL475 LABEL473: - load_int 0 + iconst 0 istore 19 LABEL475: iload 19 iload 20 - load_int 2 - load_int 0 + iconst 2 + iconst 0 iload 18 - widget_put_position_widget + if_setposition LABEL481: - load_int 73 - load_int 73 + iconst 73 + iconst 73 iload 1 - load_int 10551303 - get_enum_value + iconst 10551303 + enum istore 18 - load_int 0 + iconst 0 istore 19 iload 18 - load_int -1 + iconst -1 if_icmpne LABEL493 jump LABEL515 LABEL493: invoke 1972 - load_int 1 + iconst 1 if_icmpeq LABEL497 jump LABEL507 LABEL497: get_varbit 6254 - load_int 0 + iconst 0 if_icmpeq LABEL501 jump LABEL504 LABEL501: - load_int 182 + iconst 182 istore 19 jump LABEL506 LABEL504: - load_int 120 + iconst 120 istore 19 LABEL506: jump LABEL509 LABEL507: - load_int 0 + iconst 0 istore 19 LABEL509: iload 19 - load_int 0 - load_int 1 - load_int 1 + iconst 0 + iconst 1 + iconst 1 iload 18 - widget_put_size_widget + if_setsize LABEL515: iload 0 iload 1 diff --git a/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm b/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm index 35bc2c04d4..a9aa9f62ad 100644 --- a/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm +++ b/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm @@ -6,77 +6,77 @@ ; locals ; 2 bar size get_varbit 4606 - load_int 0 + iconst 0 if_icmpne LABEL4 jump LABEL5 LABEL4: return LABEL5: - load_int 512 + iconst 512 istore 3 - load_int 512 + iconst 512 istore 4 iload 1 - widget_get_width_widget + if_getwidth iload 0 - widget_get_width_widget - isub + if_getwidth + sub istore 5 - load_int 0 + iconst 0 iload 2 invoke 1045 istore 2 iload 1 - widget_get_width_widget + if_getwidth iload 0 - widget_get_width_widget - isub + if_getwidth + sub iload 2 invoke 1046 istore 2 - load_int 896 - load_string "innerZoomLimit" + iconst 896 + sconst "innerZoomLimit" runelite_callback - load_int 128 - load_string "outerZoomLimit" - runelite_callback - isub + iconst 128 + sconst "outerZoomLimit" + runelite_callback + sub istore 6 ; resizable delta - load_int 896 - load_string "innerZoomLimit" + iconst 896 + sconst "innerZoomLimit" runelite_callback - load_int 128 - load_string "outerZoomLimit" - runelite_callback - isub + iconst 128 + sconst "outerZoomLimit" + runelite_callback + sub istore 7 ; fixed delta iload 2 iload 6 - imul + multiply iload 5 - idiv + div iload 6 - load_string "zoomLinToExp" - runelite_callback - pop_int - load_int 128 - load_string "outerZoomLimit" - runelite_callback - iadd + sconst "zoomLinToExp" + runelite_callback + pop_int + iconst 128 + sconst "outerZoomLimit" + runelite_callback + add istore 3 iload 2 iload 7 - imul + multiply iload 5 - idiv + div iload 7 - load_string "zoomLinToExp" - runelite_callback - pop_int - load_int 128 - load_string "outerZoomLimit" - runelite_callback - iadd + sconst "zoomLinToExp" + runelite_callback + pop_int + iconst 128 + sconst "outerZoomLimit" + runelite_callback + add istore 4 iload 4 iload 3 diff --git a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm index ae8b33dd98..3abf21a570 100644 --- a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm +++ b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm @@ -7,77 +7,77 @@ ; 0 resizableZoomRange ; 1 fixedZoomRange ; 2 bar size - load_int 896 - load_string "innerZoomLimit" + iconst 896 + sconst "innerZoomLimit" runelite_callback - load_int 128 - load_string "outerZoomLimit" - runelite_callback - isub + iconst 128 + sconst "outerZoomLimit" + runelite_callback + sub istore 0 - load_int 896 - load_string "innerZoomLimit" + iconst 896 + sconst "innerZoomLimit" runelite_callback - load_int 128 - load_string "outerZoomLimit" - runelite_callback - isub + iconst 128 + sconst "outerZoomLimit" + runelite_callback + sub istore 1 - load_int 17104910 - widget_get_width_widget - load_int 17104911 - widget_get_width_widget - isub + iconst 17104910 + if_getwidth + iconst 17104911 + if_getwidth + sub istore 2 - load_int 0 + iconst 0 istore 3 - load_int 0 + iconst 0 istore 4 - get_viewport_size + viewport_geteffectivesize istore 4 istore 3 - load_int 0 + iconst 0 istore 5 iload 3 - load_int 334 + iconst 334 if_icmpgt LABEL27 jump LABEL36 LABEL27: - get_varc 74 - load_int 128 - load_string "outerZoomLimit" - runelite_callback - isub + get_varc_int 74 + iconst 128 + sconst "outerZoomLimit" + runelite_callback + sub iload 0 - load_string "zoomExpToLin" + sconst "zoomExpToLin" runelite_callback pop_int iload 2 - imul + multiply iload 0 - idiv + div istore 5 jump LABEL44 LABEL36: - get_varc 73 - load_int 128 - load_string "outerZoomLimit" - runelite_callback - isub + get_varc_int 73 + iconst 128 + sconst "outerZoomLimit" + runelite_callback + sub iload 0 - load_string "zoomExpToLin" + sconst "zoomExpToLin" runelite_callback pop_int iload 2 - imul + multiply iload 1 - idiv + div istore 5 LABEL44: iload 5 - load_int 0 - load_int 0 - load_int 0 - load_int 17104911 - widget_put_position_widget + iconst 0 + iconst 0 + iconst 0 + iconst 17104911 + if_setposition return diff --git a/runelite-client/src/main/scripts/PrivateMessage.rs2asm b/runelite-client/src/main/scripts/PrivateMessage.rs2asm index c15cbc9dee..3d9d8901f6 100644 --- a/runelite-client/src/main/scripts/PrivateMessage.rs2asm +++ b/runelite-client/src/main/scripts/PrivateMessage.rs2asm @@ -3,28 +3,28 @@ .string_stack_count 0 .int_var_count 2 .string_var_count 1 - get_varc 5 - load_int 14 + get_varc_int 5 + iconst 14 if_icmpeq LABEL4 jump LABEL7 LABEL4: - load_int 1 - put_varc 66 + iconst 1 + set_varc_int 66 return LABEL7: - load_int -1 + iconst -1 istore 0 - load_string "" + sconst "" sstore 0 - 049 359 + get_varc_string 359 string_length istore 1 iload 1 - load_int 0 + iconst 0 if_icmpgt LABEL18 jump LABEL184 LABEL18: - get_varc 5 + get_varc_int 5 switch 1: LABEL21 2: LABEL44 @@ -46,87 +46,87 @@ LABEL21: return jump LABEL183 LABEL23: - get_ignorecount - load_int 0 + ignore_count + iconst 0 if_icmplt LABEL27 jump LABEL30 LABEL27: - load_string "Unable to update ignore list - system busy." - send_game_message + sconst "Unable to update ignore list - system busy." + mes jump LABEL43 LABEL30: - get_varc 5 - load_int 4 + get_varc_int 5 + iconst 4 if_icmpeq LABEL34 jump LABEL37 LABEL34: - 049 359 - add_ignore + get_varc_string 359 + ignore_add jump LABEL43 LABEL37: - get_varc 5 - load_int 5 + get_varc_int 5 + iconst 5 if_icmpeq LABEL41 jump LABEL43 LABEL41: - 049 359 - remove_ignore + get_varc_string 359 + ignore_del LABEL43: jump LABEL183 LABEL44: - get_friendcount - load_int 0 + friend_count + iconst 0 if_icmplt LABEL48 jump LABEL51 LABEL48: - load_string "Unable to complete action - system busy." - send_game_message + sconst "Unable to complete action - system busy." + mes jump LABEL106 LABEL51: - get_varc 5 - load_int 2 + get_varc_int 5 + iconst 2 if_icmpeq LABEL55 jump LABEL58 LABEL55: - 049 359 - add_friend + get_varc_string 359 + friend_add jump LABEL106 LABEL58: - get_varc 5 - load_int 3 + get_varc_int 5 + iconst 3 if_icmpeq LABEL62 jump LABEL65 LABEL62: - 049 359 - remove_friend + get_varc_string 359 + friend_del jump LABEL106 LABEL65: - get_varc 5 - load_int 6 + get_varc_int 5 + iconst 6 if_icmpeq LABEL69 jump LABEL106 LABEL69: get_varbit 8119 - load_int 0 + iconst 0 if_icmpeq LABEL73 jump LABEL79 LABEL73: - load_int 1 - load_int 1 + iconst 1 + iconst 1 invoke 299 - load_string "You must set a name before you can chat." - send_game_message + sconst "You must set a name before you can chat." + mes return LABEL79: - 5005 - load_int 2 + chat_getfilter_private + iconst 2 if_icmpeq LABEL83 jump LABEL94 LABEL83: - 5000 - load_int 1 - 5016 - chatfilter_update + chat_getfilter_public + iconst 1 + chat_getfilter_trade + chat_setfilter invoke 178 invoke 553 istore 0 @@ -136,122 +136,122 @@ LABEL83: invoke 89 LABEL94: get_varbit 4394 - load_int 1 + iconst 1 if_icmpeq LABEL98 jump LABEL101 LABEL98: - 049 360 - remove_friend + get_varc_string 360 + friend_del jump LABEL104 LABEL101: - 049 360 - 049 359 - load_string "privateMessage" ; load event name - load_int 0 ; whether or not to skip + get_varc_string 360 + get_varc_string 359 + sconst "privateMessage" ; load event name + iconst 0 ; whether or not to skip runelite_callback ; invoke callback - load_int 1 + iconst 1 if_icmpeq LABEL104 ; if skipped, do not message - privmsg + chat_sendprivate LABEL104: - get_gamecycle - put_varc 61 + clientclock + set_varc_int 61 LABEL106: jump LABEL183 LABEL107: - 049 359 + get_varc_string 359 invoke 212 - numeric_input + resume_countdialog jump LABEL183 LABEL111: - 049 359 - string_remove_html - 050 361 - 049 359 - string_input_1 + get_varc_string 359 + removetags + set_varc_string 361 + get_varc_string 359 + resume_namedialog jump LABEL183 LABEL117: - 049 359 - string_input_2 + get_varc_string 359 + resume_stringdialog jump LABEL183 LABEL120: get_varbit 8119 - load_int 0 + iconst 0 if_icmpeq LABEL124 jump LABEL130 LABEL124: - load_int 1 - load_int 1 + iconst 1 + iconst 1 invoke 299 - load_string "You must set a name before you can chat." - send_game_message + sconst "You must set a name before you can chat." + mes return LABEL130: - 049 359 - string_remove_html - 050 362 - 049 359 - join_clanchat + get_varc_string 359 + removetags + set_varc_string 362 + get_varc_string 359 + clan_joinchat jump LABEL183 LABEL136: iload 1 - load_int 10 + iconst 10 if_icmpgt LABEL140 jump LABEL146 LABEL140: - 049 359 - load_int 0 - load_int 9 - string_substring + get_varc_string 359 + iconst 0 + iconst 9 + substring sstore 0 jump LABEL148 LABEL146: - 049 359 + get_varc_string 359 sstore 0 LABEL148: sload 0 - tolowercase - 5021 + lowercase + chat_setmessagefilter invoke 553 invoke 84 jump LABEL183 LABEL154: get_varbit 8119 - load_int 0 + iconst 0 if_icmpeq LABEL158 jump LABEL164 LABEL158: - load_int 1 - load_int 1 + iconst 1 + iconst 1 invoke 299 - load_string "You must set a name before you can chat." - send_game_message + sconst "You must set a name before you can chat." + mes return LABEL164: - 049 359 - load_int 0 - put_varc 62 - 050 358 + get_varc_string 359 + iconst 0 + set_varc_int 62 + set_varc_string 358 invoke 95 - load_int 552 - load_int -2147483645 - load_int 1 - load_string "I1" - load_int 10616845 - widget_put_render_listener_widget + iconst 552 + iconst -2147483645 + iconst 1 + sconst "I1" + iconst 10616845 + if_setontimer jump LABEL183 LABEL176: - load_int 0 - load_int 1 + iconst 0 + iconst 1 invoke 299 return jump LABEL183 LABEL181: - 049 359 + get_varc_string 359 invoke 2061 LABEL183: jump LABEL190 LABEL184: - get_varc 5 + get_varc_int 5 switch 16: LABEL189 7: LABEL187 @@ -265,7 +265,7 @@ LABEL187: LABEL189: return LABEL190: - load_int 1 - load_int 1 + iconst 1 + iconst 1 invoke 299 return diff --git a/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm b/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm index 605608f9bd..4aeb36de78 100644 --- a/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm +++ b/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm @@ -3,19 +3,19 @@ .string_stack_count 0 .int_var_count 3 .string_var_count 0 - load_string "resetChatboxInput" + sconst "resetChatboxInput" runelite_callback - load_int 1 - load_int 10616872 - widget_put_hidden_widget - load_int 0 - load_int 10616887 - widget_put_hidden_widget + iconst 1 + iconst 10616872 + if_sethide + iconst 0 + iconst 10616887 + if_sethide invoke 923 - load_int 0 + iconst 0 istore 2 iload 1 - load_int 1 + iconst 1 if_icmpeq LABEL13 jump LABEL27 LABEL13: @@ -26,144 +26,144 @@ LABEL13: iload 2 invoke 89 invoke 223 - load_int 1 + iconst 1 invoke 927 invoke 1972 - load_int 1 + iconst 1 if_icmpeq LABEL26 jump LABEL27 LABEL26: invoke 1984 LABEL27: invoke 1972 - load_int 1 + iconst 1 if_icmpeq LABEL31 jump LABEL32 LABEL31: invoke 2581 LABEL32: - load_int 0 - put_varc 5 + iconst 0 + set_varc_int 5 iload 0 - load_int 1 + iconst 1 if_icmpeq LABEL38 jump LABEL40 LABEL38: - load_string "" - 050 359 + sconst "" + set_varc_string 359 LABEL40: - load_int 0 - load_int -8 - load_int 1 - load_int 1 - load_int 10616876 - widget_put_position_widget - load_int 0 - load_int 40 - load_int 1 - load_int 0 - load_int 10616876 - widget_put_size_widget - load_int 0 - load_int 22 - load_int 1 - load_int 1 - load_int 10616877 - widget_put_position_widget - load_int 0 - load_int 20 - load_int 1 - load_int 0 - load_int 10616877 - widget_put_size_widget - load_int 0 - load_int 10616876 - widget_put_hidden_widget - load_int 0 - load_int 10616877 - widget_put_hidden_widget - load_int 1 - load_int 10616881 - widget_put_hidden_widget - load_int 10616885 - widget_unset_children - load_int 10616886 - widget_unset_children - load_int -1 - load_string "" - load_int 10616872 - widget_put_mouse_press_listener_widget - load_int -1 - load_string "" - load_int 10616872 - widget_put_render_listener_widget - load_int 10616872 - widget_unset_children - load_int 10616878 - widget_unset_children - load_int 10616879 - widget_unset_children - load_int 10616880 - widget_unset_children - load_int 1 - load_int 10616878 - widget_put_hidden_widget - load_int 1 - load_int 10616879 - widget_put_hidden_widget - load_int 1 - load_int 10616880 - widget_put_hidden_widget - load_int -1 - load_string "" - load_int 10616878 - widget_put_mouse_hover_listener_widget - load_int -1 - load_string "" - load_int 10616879 - widget_put_mouse_hover_listener_widget - load_int -1 - load_string "" - load_int 10616880 - widget_put_mouse_hover_listener_widget - load_int -1 - load_string "" - load_int 10616878 - widget_put_mouse_exit_listener_widget - load_int -1 - load_string "" - load_int 10616879 - widget_put_mouse_exit_listener_widget - load_int -1 - load_string "" - load_int 10616880 - widget_put_mouse_exit_listener_widget - load_int -1 - load_string "" - load_int 10616878 - widget_put_render_listener_widget - load_int -1 - load_string "" - load_int 10616879 - widget_put_render_listener_widget - load_int -1 - load_string "" - load_int 10616880 - widget_put_render_listener_widget - load_int -1 - load_string "" - load_int 10616878 - widget_put_mouse_press_listener_widget - load_int -1 - load_string "" - load_int 10616879 - widget_put_mouse_press_listener_widget - load_int -1 - load_string "" - load_int 10616880 - widget_put_mouse_press_listener_widget - get_varc 41 - load_int -1 + iconst 0 + iconst -8 + iconst 1 + iconst 1 + iconst 10616876 + if_setposition + iconst 0 + iconst 40 + iconst 1 + iconst 0 + iconst 10616876 + if_setsize + iconst 0 + iconst 22 + iconst 1 + iconst 1 + iconst 10616877 + if_setposition + iconst 0 + iconst 20 + iconst 1 + iconst 0 + iconst 10616877 + if_setsize + iconst 0 + iconst 10616876 + if_sethide + iconst 0 + iconst 10616877 + if_sethide + iconst 1 + iconst 10616881 + if_sethide + iconst 10616885 + cc_deleteall + iconst 10616886 + cc_deleteall + iconst -1 + sconst "" + iconst 10616872 + if_setonclick + iconst -1 + sconst "" + iconst 10616872 + if_setontimer + iconst 10616872 + cc_deleteall + iconst 10616878 + cc_deleteall + iconst 10616879 + cc_deleteall + iconst 10616880 + cc_deleteall + iconst 1 + iconst 10616878 + if_sethide + iconst 1 + iconst 10616879 + if_sethide + iconst 1 + iconst 10616880 + if_sethide + iconst -1 + sconst "" + iconst 10616878 + if_setonmouserepeat + iconst -1 + sconst "" + iconst 10616879 + if_setonmouserepeat + iconst -1 + sconst "" + iconst 10616880 + if_setonmouserepeat + iconst -1 + sconst "" + iconst 10616878 + if_setonmouseleave + iconst -1 + sconst "" + iconst 10616879 + if_setonmouseleave + iconst -1 + sconst "" + iconst 10616880 + if_setonmouseleave + iconst -1 + sconst "" + iconst 10616878 + if_setontimer + iconst -1 + sconst "" + iconst 10616879 + if_setontimer + iconst -1 + sconst "" + iconst 10616880 + if_setontimer + iconst -1 + sconst "" + iconst 10616878 + if_setonclick + iconst -1 + sconst "" + iconst 10616879 + if_setonclick + iconst -1 + sconst "" + iconst 10616880 + if_setonclick + get_varc_int 41 + iconst -1 if_icmpeq LABEL154 jump LABEL156 LABEL154: @@ -171,7 +171,7 @@ LABEL154: pop_int LABEL156: invoke 1972 - load_int 1 + iconst 1 if_icmpeq LABEL160 jump LABEL161 LABEL160: diff --git a/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm b/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm index 9ca40fbbf2..665eb44242 100644 --- a/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm +++ b/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm @@ -3,43 +3,43 @@ .string_stack_count 0 .int_var_count 4 .string_var_count 0 - load_int 1 - load_int 0 - load_string "scrollWheelZoom" + iconst 1 + iconst 0 + sconst "scrollWheelZoom" runelite_callback if_icmpeq LABEL18 - load_int 0 + iconst 0 iload 0 - load_int 25 - imul - isub + iconst 25 + multiply + sub istore 1 - load_int 512 + iconst 512 istore 2 - load_int 512 + iconst 512 istore 3 get_varbit 6357 - load_int 0 + iconst 0 if_icmpeq LABEL14 jump LABEL33 LABEL14: get_varbit 4606 - load_int 0 + iconst 0 if_icmpne LABEL18 jump LABEL19 LABEL18: return LABEL19: - 6205 + viewport_getfov istore 2 istore 3 iload 3 iload 1 - iadd + add istore 3 iload 2 iload 1 - iadd + add istore 2 iload 3 iload 2 diff --git a/runelite-client/src/main/scripts/SendPrivateMessage.rs2asm b/runelite-client/src/main/scripts/SendPrivateMessage.rs2asm index 3e1e3a8d47..1803820d2d 100644 --- a/runelite-client/src/main/scripts/SendPrivateMessage.rs2asm +++ b/runelite-client/src/main/scripts/SendPrivateMessage.rs2asm @@ -30,5 +30,5 @@ ; Send a private message sload 0 sload 1 - privmsg - return + chat_sendprivate + return diff --git a/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm b/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm index c3e1f8261b..a9529b3efb 100644 --- a/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm +++ b/runelite-client/src/main/scripts/SkillTabBuilder.rs2asm @@ -3,112 +3,112 @@ .string_stack_count 1 .int_var_count 11 .string_var_count 4 - load_int 83 - load_int 49 - load_int 1497 + iconst 83 + iconst 49 + iconst 1497 iload 0 - get_enum_value + enum istore 3 iload 0 - get_boostedskilllevels - int_to_string - widget_put_text + stat + tostring + cc_settext iload 0 - get_realskilllevels + stat_base istore 4 iload 0 ; load the skill id from arguments iload 4 ; load the current real skill level - load_string "skillTabBaseLevel" ; push event name + sconst "skillTabBaseLevel" ; push event name runelite_callback ; invoke callback istore 4 ; store the (possibly) edited real skill level iload 4 - int_to_string - widget_put_text 1 + tostring + cc_settext 1 iload 0 - get_skillexperiences + stat_xp istore 5 - load_string "," + sconst "," sstore 1 sload 0 - load_string " XP:" - string_append 2 + sconst " XP:" + join_string 2 sstore 2 iload 5 sload 1 invoke 46 sstore 3 - load_int 0 + iconst 0 istore 6 get_varbit 4181 - load_int 0 + iconst 0 if_icmpeq LABEL35 jump LABEL66 LABEL35: iload 4 - load_int 99 - load_string "skillTabMaxLevel" ; push event name + iconst 99 + sconst "skillTabMaxLevel" ; push event name runelite_callback ; invoke callback if_icmplt LABEL39 jump LABEL65 LABEL39: - load_int 105 - load_int 105 - load_int 256 + iconst 105 + iconst 105 + iconst 256 iload 4 - load_int 1 - iadd - get_enum_value + iconst 1 + add + enum istore 6 sload 2 - load_string "|Next level at:|Remaining XP:" - concat_string + sconst "|Next level at:|Remaining XP:" + append sstore 2 sload 3 - load_string "|" + sconst "|" iload 6 sload 1 invoke 46 - load_string "|" + sconst "|" iload 6 iload 5 - isub + sub sload 1 invoke 46 - string_append 4 - concat_string + join_string 4 + append sstore 3 LABEL65: jump LABEL84 LABEL66: sload 2 - load_string "|Next level at:" - concat_string + sconst "|Next level at:" + append sstore 2 sload 3 - load_string "|" - load_int 105 - load_int 105 - load_int 256 + sconst "|" + iconst 105 + iconst 105 + iconst 256 iload 4 - load_int 1 - iadd - get_enum_value + iconst 1 + add + enum sload 1 invoke 46 - string_append 2 - concat_string + join_string 2 + append sstore 3 LABEL84: - load_int 0 + iconst 0 istore 7 - load_int 0 + iconst 0 istore 8 - load_int 0 + iconst 0 istore 9 - load_int 0 + iconst 0 istore 10 invoke 1138 - load_int 1 + iconst 1 if_icmpeq LABEL96 jump LABEL278 LABEL96: @@ -116,13 +116,13 @@ LABEL96: invoke 1936 istore 7 iload 7 - load_int -1 + iconst -1 if_icmpne LABEL103 jump LABEL133 LABEL103: iload 7 - load_int 10 - idiv + iconst 10 + div istore 7 iload 7 iload 5 @@ -130,35 +130,35 @@ LABEL103: jump LABEL133 LABEL111: sload 2 - load_string "|" - load_string "" - load_string "XP to regain:" - load_string "" - string_append 4 - concat_string + sconst "|" + sconst "" + sconst "XP to regain:" + sconst "" + join_string 4 + append sstore 2 sload 3 - load_string "|" - load_string "" + sconst "|" + sconst "" iload 7 iload 5 - isub + sub sload 1 invoke 46 - load_string "" - string_append 4 - concat_string + sconst "" + join_string 4 + append sstore 3 - load_int 1 + iconst 1 istore 8 LABEL133: iload 8 - load_int 0 + iconst 0 if_icmpeq LABEL137 jump LABEL278 LABEL137: get_varp 1588 - load_int 0 + iconst 0 if_icmpgt LABEL141 jump LABEL278 LABEL141: @@ -171,279 +171,279 @@ LABEL141: 6: LABEL144 jump LABEL278 LABEL144: - load_int 20 + iconst 20 invoke 2031 istore 10 iload 10 - load_int 0 + iconst 0 if_icmpgt LABEL151 jump LABEL170 LABEL151: sload 2 - load_string "|" - load_string "" - load_string "XP permitted:" - load_string "" - string_append 4 - concat_string + sconst "|" + sconst "" + sconst "XP permitted:" + sconst "" + join_string 4 + append sstore 2 sload 3 - load_string "|" - load_string "" + sconst "|" + sconst "" iload 10 sload 1 invoke 46 - load_string "" - string_append 4 - concat_string + sconst "" + join_string 4 + append sstore 3 jump LABEL188 LABEL170: - load_int 1 + iconst 1 istore 9 sload 2 - load_string "|" - load_string "" - load_string "XP permitted:" - load_string "" - string_append 4 - concat_string + sconst "|" + sconst "" + sconst "XP permitted:" + sconst "" + join_string 4 + append sstore 2 sload 3 - load_string "|" - load_string "" - load_string "NONE" - load_string "" - string_append 4 - concat_string + sconst "|" + sconst "" + sconst "NONE" + sconst "" + join_string 4 + append sstore 3 LABEL188: jump LABEL278 LABEL189: - load_int 30 + iconst 30 invoke 2031 istore 10 iload 10 - load_int 0 + iconst 0 if_icmpgt LABEL196 jump LABEL215 LABEL196: sload 2 - load_string "|" - load_string "" - load_string "XP permitted:" - load_string "" - string_append 4 - concat_string + sconst "|" + sconst "" + sconst "XP permitted:" + sconst "" + join_string 4 + append sstore 2 sload 3 - load_string "|" - load_string "" + sconst "|" + sconst "" iload 10 sload 1 invoke 46 - load_string "" - string_append 4 - concat_string + sconst "" + join_string 4 + append sstore 3 jump LABEL233 LABEL215: - load_int 1 + iconst 1 istore 9 sload 2 - load_string "|" - load_string "" - load_string "XP permitted:" - load_string "" - string_append 4 - concat_string + sconst "|" + sconst "" + sconst "XP permitted:" + sconst "" + join_string 4 + append sstore 2 sload 3 - load_string "|" - load_string "" - load_string "NONE" - load_string "" - string_append 4 - concat_string + sconst "|" + sconst "" + sconst "NONE" + sconst "" + join_string 4 + append sstore 3 LABEL233: jump LABEL278 LABEL234: - load_int 40 + iconst 40 invoke 2031 istore 10 iload 10 - load_int 0 + iconst 0 if_icmpgt LABEL241 jump LABEL260 LABEL241: sload 2 - load_string "|" - load_string "" - load_string "XP permitted:" - load_string "" - string_append 4 - concat_string + sconst "|" + sconst "" + sconst "XP permitted:" + sconst "" + join_string 4 + append sstore 2 sload 3 - load_string "|" - load_string "" + sconst "|" + sconst "" iload 10 sload 1 invoke 46 - load_string "" - string_append 4 - concat_string + sconst "" + join_string 4 + append sstore 3 jump LABEL278 LABEL260: - load_int 1 + iconst 1 istore 9 sload 2 - load_string "|" - load_string "" - load_string "XP permitted:" - load_string "" - string_append 4 - concat_string + sconst "|" + sconst "" + sconst "XP permitted:" + sconst "" + join_string 4 + append sstore 2 sload 3 - load_string "|" - load_string "" - load_string "NONE" - load_string "" - string_append 4 - concat_string + sconst "|" + sconst "" + sconst "NONE" + sconst "" + join_string 4 + append sstore 3 LABEL278: iload 1 - load_int 5 - widget_load_child 1 - load_int 1 + iconst 5 + cc_find 1 + iconst 1 if_icmpeq LABEL284 jump LABEL294 LABEL284: iload 9 - load_int 1 + iconst 1 if_icmpeq LABEL288 jump LABEL291 LABEL288: - load_int 0 - widget_put_hidden 1 + iconst 0 + cc_sethide 1 jump LABEL293 LABEL291: - load_int 1 - widget_put_hidden 1 + iconst 1 + cc_sethide 1 LABEL293: jump LABEL321 LABEL294: iload 1 - load_int 5 - load_int 5 - widget_create_child 1 - load_int 6 - load_int 0 - load_int 0 - load_int 1 - widget_put_position 1 - load_int 19 - load_int 19 - load_int 0 - load_int 0 - widget_put_size 1 - load_int 940 - widget_put_spriteid 1 - load_int 65793 - widget_put_sprite2 1 + iconst 5 + iconst 5 + cc_create 1 + iconst 6 + iconst 0 + iconst 0 + iconst 1 + cc_setposition 1 + iconst 19 + iconst 19 + iconst 0 + iconst 0 + cc_setsize 1 + iconst 940 + cc_setgraphic 1 + iconst 65793 + cc_setgraphicshadow 1 iload 9 - load_int 1 + iconst 1 if_icmpeq LABEL316 jump LABEL319 LABEL316: - load_int 0 - widget_put_hidden 1 + iconst 0 + cc_sethide 1 jump LABEL321 LABEL319: - load_int 1 - widget_put_hidden 1 + iconst 1 + cc_sethide 1 LABEL321: iload 3 - load_int 1 + iconst 1 if_icmpeq LABEL325 jump LABEL344 LABEL325: - get_ismembers - load_int 0 + map_members + iconst 0 if_icmpeq LABEL329 jump LABEL344 LABEL329: - get_varc 103 - load_int 0 + get_varc_int 103 + iconst 0 if_icmpeq LABEL333 jump LABEL344 LABEL333: - load_string "" + sconst "" sload 0 - load_string ":" - load_string "" - string_append 4 + sconst ":" + sconst "" + join_string 4 sstore 2 - load_string "" - load_string "Members Only" - load_string "" - string_append 3 + sconst "" + sconst "Members Only" + sconst "" + join_string 3 sstore 3 LABEL344: invoke 1972 - load_int 1 + iconst 1 if_icmpeq LABEL348 jump LABEL375 LABEL348: - load_int 2367 - load_int -2147483644 - load_int -2147483645 - load_int -1 + iconst 2367 + iconst -2147483644 + iconst -2147483645 + iconst -1 iload 2 sload 2 sload 3 - load_int 495 - load_string "iIiIssf" + iconst 495 + sconst "iIiIssf" iload 1 - widget_put_option_click_listener_widget - get_varc 218 + if_setonop + get_varc_int 218 iload 1 if_icmpeq LABEL363 jump LABEL374 LABEL363: - get_varc 217 - load_int -1 + get_varc_int 217 + iconst -1 if_icmpeq LABEL367 jump LABEL374 LABEL367: iload 1 - load_int -1 + iconst -1 iload 2 sload 2 sload 3 - load_int 495 + iconst 495 invoke 2344 LABEL374: jump LABEL390 LABEL375: - load_int 992 - load_int -2147483645 - load_int -1 + iconst 992 + iconst -2147483645 + iconst -1 iload 2 sload 2 sload 3 - load_int 495 - load_int 25 - load_int 5 - idiv - load_string "IiIssfi" + iconst 495 + iconst 25 + iconst 5 + div + sconst "IiIssfi" iload 1 - widget_put_mouse_hover_listener_widget - load_int 0 - put_varc 2 + if_setonmouserepeat + iconst 0 + set_varc_int 2 LABEL390: return diff --git a/runelite-client/src/main/scripts/SkillTabTotalLevel.rs2asm b/runelite-client/src/main/scripts/SkillTabTotalLevel.rs2asm index 2d1142dc7a..2f623396d6 100644 --- a/runelite-client/src/main/scripts/SkillTabTotalLevel.rs2asm +++ b/runelite-client/src/main/scripts/SkillTabTotalLevel.rs2asm @@ -5,105 +5,105 @@ .string_var_count 2 invoke 1007 istore 2 - load_string "Total level:" - load_string "
" + sconst "Total level:" + sconst "
" iload 2 - int_to_string - string_append 3 + tostring + join_string 3 iload 0 - load_string "skillTabTotalLevel" ; push event name + sconst "skillTabTotalLevel" ; push event name runelite_callback ; invoke callback - widget_put_text_widget + if_settext iload 0 - widget_put_actions_null_widget - load_string "" + if_clearops + sconst "" sstore 0 - load_string "" + sconst "" sstore 1 - get_ismembers - load_int 1 + map_members + iconst 1 if_icmpeq LABEL22 - get_varc 103 - load_int 1 + get_varc_int 103 + iconst 1 if_icmpeq LABEL22 jump LABEL28 LABEL22: - load_string "Total XP:" + sconst "Total XP:" sstore 0 invoke 1008 invoke 1009 sstore 1 jump LABEL37 LABEL28: - load_string "Total XP:|Free Total Level:" + sconst "Total XP:|Free Total Level:" sstore 0 invoke 1008 invoke 1009 - load_string "|" + sconst "|" invoke 1320 - int_to_string - string_append 3 + tostring + join_string 3 sstore 1 LABEL37: invoke 1972 - load_int 1 + iconst 1 if_icmpeq LABEL41 jump LABEL72 LABEL41: - load_int 1 - load_string "Toggle Total XP" + iconst 1 + sconst "Toggle Total XP" iload 0 - widget_put_action_widget - load_int 2367 - load_int -2147483644 - load_int -2147483645 - load_int -1 + if_setop + iconst 2367 + iconst -2147483644 + iconst -2147483645 + iconst -1 iload 1 sload 0 sload 1 - load_int 495 - load_string "iIiIssf" + iconst 495 + sconst "iIiIssf" iload 0 - widget_put_option_click_listener_widget - get_varc 218 + if_setonop + get_varc_int 218 iload 0 if_icmpeq LABEL60 jump LABEL71 LABEL60: - get_varc 217 - load_int -1 + get_varc_int 217 + iconst -1 if_icmpeq LABEL64 jump LABEL71 LABEL64: iload 0 - load_int -1 + iconst -1 iload 1 sload 0 sload 1 - load_int 495 + iconst 495 invoke 2344 LABEL71: jump LABEL92 LABEL72: - load_int 992 - load_int -2147483645 - load_int -1 + iconst 992 + iconst -2147483645 + iconst -1 iload 1 sload 0 sload 1 - load_int 495 - load_int 25 - load_int 5 - idiv - load_string "IiIssfi" + iconst 495 + iconst 25 + iconst 5 + div + sconst "IiIssfi" iload 0 - widget_put_mouse_hover_listener_widget - load_int 40 + if_setonmouserepeat + iconst 40 iload 1 - load_string "I" + sconst "I" iload 0 - widget_put_mouse_exit_listener_widget - load_int 0 - put_varc 2 + if_setonmouseleave + iconst 0 + set_varc_int 2 LABEL92: return diff --git a/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm b/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm index 4b739a959c..a9fd094407 100644 --- a/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm +++ b/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm @@ -5,24 +5,24 @@ .string_var_count 0 ; Check if we should allow server to relayout bank - load_int 1 ; true - load_int 0 ; load active boolean - load_string "getSearchingTagTab" ; push event name - runelite_callback ; invoke callback + iconst 1 ; true + iconst 0 ; load active boolean + sconst "getSearchingTagTab" ; push event name + runelite_callback ; invoke callback if_icmpne LABEL2 ; Let layout continue if current bank tab is 0 get_varbit 4150 - load_int 0 + iconst 0 if_icmpeq LABEL2 ; Reset the current bank tab to 0 otherwise - load_int 0 + iconst 0 set_varbit 4150 - load_string "Server attempted to reset bank tab." - load_string "debug" - runelite_callback + sconst "Server attempted to reset bank tab." + sconst "debug" + runelite_callback LABEL2: iload 0 @@ -39,4 +39,4 @@ LABEL2: iload 11 iload 12 invoke 277 - return + return diff --git a/runelite-client/src/main/scripts/ZoomHandler.rs2asm b/runelite-client/src/main/scripts/ZoomHandler.rs2asm index b19086168e..5ff5fa6fe6 100644 --- a/runelite-client/src/main/scripts/ZoomHandler.rs2asm +++ b/runelite-client/src/main/scripts/ZoomHandler.rs2asm @@ -4,88 +4,88 @@ .int_var_count 6 .string_var_count 0 get_varbit 4606 - load_int 0 + iconst 0 if_icmpne LABEL4 jump LABEL5 LABEL4: return LABEL5: - load_int 896 - load_string "innerZoomLimit" + iconst 896 + sconst "innerZoomLimit" runelite_callback iload 0 invoke 1046 istore 0 - load_int 128 - load_string "outerZoomLimit" - runelite_callback + iconst 128 + sconst "outerZoomLimit" + runelite_callback iload 0 invoke 1045 istore 0 - load_int 896 - load_string "innerZoomLimit" + iconst 896 + sconst "innerZoomLimit" runelite_callback iload 1 invoke 1046 istore 1 - load_int 128 - load_string "outerZoomLimit" - runelite_callback + iconst 128 + sconst "outerZoomLimit" + runelite_callback iload 1 invoke 1045 istore 1 iload 0 iload 1 - 6200 - load_int 0 + viewport_setfov + iconst 0 istore 2 - load_int 0 + iconst 0 istore 3 - get_viewport_size + viewport_geteffectivesize istore 3 istore 2 iload 3 - load_int 334 - isub + iconst 334 + sub istore 4 iload 4 - load_int 0 + iconst 0 if_icmplt LABEL39 jump LABEL42 LABEL39: - load_int 0 + iconst 0 istore 4 jump LABEL48 LABEL42: iload 4 - load_int 100 + iconst 100 if_icmpgt LABEL46 jump LABEL48 LABEL46: - load_int 100 + iconst 100 istore 4 LABEL48: iload 0 iload 1 iload 0 - isub + sub iload 4 - imul - load_int 100 - idiv - iadd + multiply + iconst 100 + div + add istore 5 - load_int 25 - load_int 25 + iconst 25 + iconst 25 iload 5 - imul - load_int 256 - idiv - iadd - set_camera_focal_point_height + multiply + iconst 256 + div + add + cam_setfollowheight iload 0 iload 1 - put_varc 74 - put_varc 73 + set_varc_int 74 + set_varc_int 73 invoke 1049 return diff --git a/runelite-client/src/main/scripts/null.rs2asm b/runelite-client/src/main/scripts/null.rs2asm index 81afec5354..6c402affd9 100644 --- a/runelite-client/src/main/scripts/null.rs2asm +++ b/runelite-client/src/main/scripts/null.rs2asm @@ -34,4 +34,4 @@ .int_var_count 0 .string_var_count 0 -return +return