diff --git a/runelite-client/src/main/scripts/ChatSend.hash b/runelite-client/src/main/scripts/ChatSend.hash index 1e7ae9ee97..eafdef4142 100644 --- a/runelite-client/src/main/scripts/ChatSend.hash +++ b/runelite-client/src/main/scripts/ChatSend.hash @@ -1 +1 @@ -95E7960E289ECA35DEADD35BC5A34AEBAA1C9F367AC42A71A5F3EFCCA0600D10 \ No newline at end of file +9DD950503D89B0A449488A4642B4810F076835EAEDB21AAB69544B359A35CD8A \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatSend.rs2asm b/runelite-client/src/main/scripts/ChatSend.rs2asm index e4e8725cbf..9461bf176b 100644 --- a/runelite-client/src/main/scripts/ChatSend.rs2asm +++ b/runelite-client/src/main/scripts/ChatSend.rs2asm @@ -6,7 +6,7 @@ get_varbit 4394 iconst 1 if_icmpeq LABEL4 - jump LABEL23 + jump LABEL24 LABEL4: iload 0 iconst 1 @@ -30,41 +30,43 @@ LABEL16: join_string 5 mes LABEL23: + return +LABEL24: invoke 5262 iconst 0 - if_icmpeq LABEL27 - jump LABEL33 -LABEL27: + if_icmpeq LABEL28 + jump LABEL34 +LABEL28: iload 3 iconst 4 - if_icmpeq LABEL31 - jump LABEL33 -LABEL31: + if_icmpeq LABEL32 + jump LABEL34 +LABEL32: get_varc_int 945 istore 3 -LABEL33: +LABEL34: iload 3 iconst -1 - if_icmpne LABEL37 - jump LABEL70 -LABEL37: + if_icmpne LABEL38 + jump LABEL71 +LABEL38: iload 3 iconst 4 - if_icmple LABEL41 - jump LABEL70 -LABEL41: + if_icmple LABEL42 + jump LABEL71 +LABEL42: iload 3 get_varc_int 945 - if_icmpne LABEL45 - jump LABEL70 -LABEL45: + if_icmpne LABEL46 + jump LABEL71 +LABEL46: iload 3 set_varc_int 945 iload 3 iconst 0 - if_icmpne LABEL51 - jump LABEL61 -LABEL51: + if_icmpne LABEL52 + jump LABEL62 +LABEL52: sconst "Your chatbox mode is now set to " iconst 105 iconst 115 @@ -74,8 +76,8 @@ LABEL51: sconst " chat, to reset your mode type /@p" join_string 3 mes - jump LABEL70 -LABEL61: + jump LABEL71 +LABEL62: sconst "Your chatbox mode has been reset to " iconst 105 iconst 115 @@ -85,28 +87,28 @@ LABEL61: sconst " chat." join_string 3 mes -LABEL70: +LABEL71: iload 2 iconst 1 - if_icmpeq LABEL74 - jump LABEL112 -LABEL74: + if_icmpeq LABEL75 + jump LABEL113 +LABEL75: get_varc_int 945 switch - 1: LABEL77 - 2: LABEL98 - 3: LABEL103 - 4: LABEL108 - jump LABEL112 -LABEL77: + 1: LABEL78 + 2: LABEL99 + 3: LABEL104 + 4: LABEL109 + jump LABEL113 +LABEL78: iconst 2 istore 0 sload 0 string_length iconst 0 - if_icmpgt LABEL84 - jump LABEL97 -LABEL84: + if_icmpgt LABEL85 + jump LABEL98 +LABEL85: sload 0 iconst 0 iconst 1 @@ -114,33 +116,33 @@ LABEL84: sconst "/" compare iconst 0 ; - if_icmpne LABEL93 - jump LABEL97 -LABEL93: + if_icmpne LABEL94 + jump LABEL98 +LABEL94: sconst "/" sload 0 append sstore 0 -LABEL97: - jump LABEL112 LABEL98: + jump LABEL113 +LABEL99: iconst 3 iconst 0 istore 1 istore 0 - jump LABEL112 -LABEL103: + jump LABEL113 +LABEL104: iconst 4 iconst 0 istore 1 istore 0 - jump LABEL112 -LABEL108: + jump LABEL113 +LABEL109: iconst 3 iconst 1 istore 1 istore 0 -LABEL112: +LABEL113: sload 0 ; load input iload 0 ; load chat type iload 1 ; load clan target @@ -157,31 +159,31 @@ CONTINUE: sstore 1 iload 0 iconst 2 - if_icmpeq LABEL124 + if_icmpeq LABEL125 iload 0 iconst 3 - if_icmpeq LABEL124 + if_icmpeq LABEL125 iload 0 iconst 4 - if_icmpeq LABEL124 - jump LABEL164 -LABEL124: + if_icmpeq LABEL125 + jump LABEL175 +LABEL125: sload 0 invoke 5501 iconst 1 - if_icmpeq LABEL129 - jump LABEL133 -LABEL129: + if_icmpeq LABEL130 + jump LABEL134 +LABEL130: sload 0 invoke 632 sstore 0 sstore 1 -LABEL133: +LABEL134: iload 1 iconst 1 - if_icmpeq LABEL137 - jump LABEL153 -LABEL137: + if_icmpeq LABEL138 + jump LABEL164 +LABEL138: sload 0 iconst 0 iconst 1 @@ -198,20 +200,17 @@ LABEL137: sload 0 append sstore 0 -LABEL153: sload 0 string_length - iconst 0 - if_icmple LABEL158 - jump LABEL159 -LABEL158: - return + iconst 80 + if_icmpgt LABEL159 + jump LABEL164 LABEL159: sload 0 - iload 0 - iload 1 - chat_sendclan - jump LABEL173 + iconst 0 + iconst 80 + substring + sstore 0 LABEL164: sload 0 string_length @@ -221,10 +220,24 @@ LABEL164: LABEL169: return LABEL170: + sload 0 + iload 0 + iload 1 + chat_sendclan + jump LABEL184 +LABEL175: + sload 0 + string_length + iconst 0 + if_icmple LABEL180 + jump LABEL181 +LABEL180: + return +LABEL181: sload 0 iload 0 chat_sendpublic -LABEL173: +LABEL184: clientclock set_varc_int 61 return diff --git a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash index 5bce54b6ad..eb47ec489b 100644 --- a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash +++ b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash @@ -1 +1 @@ -E4001956B7EAAB914D97C392358D20A95B1EFD929278D8CBC380C7354418D345 \ No newline at end of file +7D493EF06AAA3BE49BCCB9E0A5F4EC5A4EDC5280D4965D3C0140CC691F8946F4 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm index f5174ac072..499f375092 100644 --- a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm @@ -47,7 +47,7 @@ LABEL23: get_varbit 8119 iconst 1 if_icmpeq LABEL42 - jump LABEL184 + jump LABEL201 LABEL42: invoke 3160 iconst 1 @@ -127,11 +127,17 @@ LABEL96: join_string 4 append sstore 2 + get_varc_string 335 + invoke 1353 + iconst 1 + if_icmpeq LABEL109 + jump LABEL121 +LABEL109: iload 2 - iconst 80 - if_icmplt LABEL108 - jump LABEL115 -LABEL108: + iconst 79 + if_icmplt LABEL113 + jump LABEL120 +LABEL113: sload 2 sload 0 sconst "*" @@ -139,7 +145,22 @@ LABEL108: join_string 3 append sstore 2 -LABEL115: +LABEL120: + jump LABEL132 +LABEL121: + iload 2 + iconst 80 + if_icmplt LABEL125 + jump LABEL132 +LABEL125: + sload 2 + sload 0 + sconst "*" + sconst "" + join_string 3 + append + sstore 2 +LABEL132: sload 2 iconst 2147483647 iconst 495 @@ -147,9 +168,9 @@ LABEL115: istore 3 iload 4 iconst 1 - if_icmpeq LABEL124 - jump LABEL141 -LABEL124: + if_icmpeq LABEL141 + jump LABEL158 +LABEL141: iconst 60 iconst 5 iload 3 @@ -166,8 +187,8 @@ LABEL124: iconst 2 iconst 10616868 if_setposition - jump LABEL153 -LABEL141: + jump LABEL170 +LABEL158: iconst 0 iconst 30 iconst 0 @@ -180,26 +201,26 @@ LABEL141: iconst 2 iconst 10616868 if_setposition -LABEL153: +LABEL170: iload 3 iconst 10616887 if_getwidth - if_icmpgt LABEL158 - jump LABEL164 -LABEL158: + if_icmpgt LABEL175 + jump LABEL181 +LABEL175: iconst 2 iconst 2 iconst 0 iconst 10616887 if_settextalign - jump LABEL169 -LABEL164: + jump LABEL186 +LABEL181: iconst 0 iconst 2 iconst 0 iconst 10616887 if_settextalign -LABEL169: +LABEL186: iconst 10616887 if_clearops iconst -1 @@ -214,19 +235,19 @@ LABEL169: sconst "" iconst 10616887 if_setonop - jump LABEL234 -LABEL184: + jump LABEL251 +LABEL201: invoke 3160 iconst 1 - if_icmpeq LABEL188 - jump LABEL193 -LABEL188: + if_icmpeq LABEL205 + jump LABEL210 +LABEL205: sconst "" sconst " You must set a name before you can chat." join_string 2 sstore 2 - jump LABEL201 -LABEL193: + jump LABEL218 +LABEL210: iconst 105 iconst 115 iconst 1894 @@ -235,7 +256,7 @@ LABEL193: sconst " You must set a name before you can chat." join_string 2 sstore 2 -LABEL201: +LABEL218: iconst 1 iconst 2 iconst 0 @@ -269,7 +290,7 @@ LABEL201: sconst "ii" iconst 10616887 if_setonop -LABEL234: +LABEL251: sload 2 iconst 10616887 if_settext diff --git a/runelite-client/src/main/scripts/CommandScript.hash b/runelite-client/src/main/scripts/CommandScript.hash index b6795bca51..7a201bd5cb 100644 --- a/runelite-client/src/main/scripts/CommandScript.hash +++ b/runelite-client/src/main/scripts/CommandScript.hash @@ -1 +1 @@ -7A4628DC7933B4340CEC5F1B3C75ED1857FEDB5E683829499A07E5C364F633FA \ No newline at end of file +9B38CB6BF195C49B10D856C5F571AFDEC7BBEF96A4E3532F5B23E9341066144C \ No newline at end of file diff --git a/runelite-client/src/main/scripts/CommandScript.rs2asm b/runelite-client/src/main/scripts/CommandScript.rs2asm index 1e345c3c41..e56d68fcec 100644 --- a/runelite-client/src/main/scripts/CommandScript.rs2asm +++ b/runelite-client/src/main/scripts/CommandScript.rs2asm @@ -90,13 +90,13 @@ LABEL60: iload 0 iconst 84 if_icmpeq LABEL76 - jump LABEL829 + jump LABEL822 LABEL76: invoke 1984 iload 2 iconst 0 if_icmpgt LABEL81 - jump LABEL828 + jump LABEL821 LABEL81: iload 3 iconst 1 @@ -699,44 +699,39 @@ LABEL587: sconst "You are not chatting as a guest in a clan channel at the moment." mes LABEL589: - jump LABEL824 + jump LABEL817 LABEL590: iload 5 iconst 41 if_icmpeq LABEL594 - jump LABEL665 + jump LABEL658 LABEL594: iload 8 iconst 0 if_icmpeq LABEL598 - jump LABEL636 + jump LABEL629 LABEL598: iconst 0 activeclanchannel_find_affined iconst 1 if_icmpeq LABEL603 - jump LABEL636 + jump LABEL629 LABEL603: - get_varbit 931 - iconst 0 - if_icmpeq LABEL607 - jump LABEL633 -LABEL607: chat_playername removetags activeclanchannel_getuserslot istore 7 iload 7 iconst -1 - if_icmpne LABEL615 - jump LABEL630 -LABEL615: + if_icmpne LABEL611 + jump LABEL626 +LABEL611: iload 7 activeclanchannel_getuserrank activeclanchannel_getranktalk - if_icmpge LABEL620 - jump LABEL630 -LABEL620: + if_icmpge LABEL616 + jump LABEL626 +LABEL616: get_varc_string 335 iload 6 iload 2 @@ -746,29 +741,24 @@ LABEL620: iconst 0 iload 9 invoke 5517 - jump LABEL632 -LABEL630: + jump LABEL628 +LABEL626: sconst "You do not have the required rank to talk in the clan's channel." mes -LABEL632: - jump LABEL635 -LABEL633: - sconst "You have muted your clan's channel. Unmute it if you wish to talk in it." - mes -LABEL635: - jump LABEL664 -LABEL636: +LABEL628: + jump LABEL657 +LABEL629: iload 8 iconst 1 - if_icmpeq LABEL640 - jump LABEL655 -LABEL640: + if_icmpeq LABEL633 + jump LABEL648 +LABEL633: iconst 1 activeclanchannel_find_affined iconst 1 - if_icmpeq LABEL645 - jump LABEL655 -LABEL645: + if_icmpeq LABEL638 + jump LABEL648 +LABEL638: get_varc_string 335 iload 6 iload 2 @@ -778,56 +768,56 @@ LABEL645: iconst 0 iload 9 invoke 5517 - jump LABEL664 -LABEL655: + jump LABEL657 +LABEL648: iload 8 iconst 1 - if_icmpeq LABEL659 - jump LABEL662 -LABEL659: + if_icmpeq LABEL652 + jump LABEL655 +LABEL652: sconst "You are not chatting in the channel of your Iron Group at the moment." mes - jump LABEL664 -LABEL662: - sconst "You are not chatting in the channel of your own Iron Group at the moment." + jump LABEL657 +LABEL655: + sconst "You are not chatting in the channel of your Clan at the moment." mes -LABEL664: - jump LABEL824 -LABEL665: +LABEL657: + jump LABEL817 +LABEL658: iload 5 iconst 9 - if_icmpeq LABEL669 - jump LABEL713 -LABEL669: + if_icmpeq LABEL662 + jump LABEL706 +LABEL662: clan_getchatcount iconst 0 - if_icmpgt LABEL673 - jump LABEL706 -LABEL673: + if_icmpgt LABEL666 + jump LABEL699 +LABEL666: get_varbit 4394 iconst 1 - if_icmpeq LABEL677 - jump LABEL679 -LABEL677: + if_icmpeq LABEL670 + jump LABEL672 +LABEL670: clan_leavechat - jump LABEL705 -LABEL679: + jump LABEL698 +LABEL672: iload 6 iconst 1 - if_icmplt LABEL683 - jump LABEL688 -LABEL683: + if_icmplt LABEL676 + jump LABEL681 +LABEL676: sconst "/" get_varc_string 335 append set_varc_string 335 - jump LABEL699 -LABEL688: + jump LABEL692 +LABEL681: iload 6 iconst 3 - if_icmpge LABEL692 - jump LABEL699 -LABEL692: + if_icmpge LABEL685 + jump LABEL692 +LABEL685: sconst "/" get_varc_string 335 iload 6 @@ -835,30 +825,30 @@ LABEL692: substring append set_varc_string 335 -LABEL699: +LABEL692: get_varc_string 335 iconst 2 iconst -1 iconst 0 iload 9 invoke 5517 -LABEL705: - jump LABEL712 -LABEL706: +LABEL698: + jump LABEL705 +LABEL699: get_varc_string 335 iconst 0 iconst -1 iconst 0 iconst -1 invoke 5517 -LABEL712: - jump LABEL824 -LABEL713: +LABEL705: + jump LABEL817 +LABEL706: iload 5 iconst 2 - if_icmpeq LABEL717 - jump LABEL727 -LABEL717: + if_icmpeq LABEL710 + jump LABEL720 +LABEL710: get_varc_string 335 iload 6 iload 2 @@ -868,98 +858,98 @@ LABEL717: iconst 0 iload 9 invoke 5517 - jump LABEL824 -LABEL727: + jump LABEL817 +LABEL720: iload 4 iconst 1 - if_icmpeq LABEL731 - jump LABEL818 -LABEL731: + if_icmpeq LABEL724 + jump LABEL811 +LABEL724: iload 2 iconst 2 - if_icmpgt LABEL735 - jump LABEL811 -LABEL735: + if_icmpgt LABEL728 + jump LABEL804 +LABEL728: get_varc_string 335 sconst "::toggleroof" iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL742 - jump LABEL770 -LABEL742: + if_icmpeq LABEL735 + jump LABEL763 +LABEL735: getremoveroofs iconst 1 - if_icmpeq LABEL746 - jump LABEL758 -LABEL746: + if_icmpeq LABEL739 + jump LABEL751 +LABEL739: iconst 0 setremoveroofs get_varbit 12378 iconst 0 - if_icmpeq LABEL752 - jump LABEL755 -LABEL752: + if_icmpeq LABEL745 + jump LABEL748 +LABEL745: sconst "Roofs will only be removed selectively." mes - jump LABEL757 -LABEL755: + jump LABEL750 +LABEL748: sconst "Roofs will only be removed selectively. This setting will not be saved." mes -LABEL757: - jump LABEL769 -LABEL758: +LABEL750: + jump LABEL762 +LABEL751: iconst 1 setremoveroofs get_varbit 12378 iconst 1 - if_icmpeq LABEL764 - jump LABEL767 -LABEL764: + if_icmpeq LABEL757 + jump LABEL760 +LABEL757: sconst "Roofs are now all hidden." mes - jump LABEL769 -LABEL767: + jump LABEL762 +LABEL760: sconst "Roofs are now all hidden. This setting will not be saved." mes -LABEL769: - jump LABEL810 -LABEL770: +LABEL762: + jump LABEL803 +LABEL763: get_varc_string 335 sconst "::wiki " iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL782 + if_icmpeq LABEL775 get_varc_string 335 sconst "::wiki" compare iconst 0 - if_icmpeq LABEL782 + if_icmpeq LABEL775 sconst "runeliteCommand" ; load callback name runelite_callback ; invoke callback - jump LABEL785 -LABEL782: + jump LABEL778 +LABEL775: get_varc_string 335 invoke 3299 - jump LABEL810 -LABEL785: + jump LABEL803 +LABEL778: get_varc_string 335 sconst "::bank" iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL792 - jump LABEL799 -LABEL792: + if_icmpeq LABEL785 + jump LABEL792 +LABEL785: sconst "Hey, everyone, I just tried to do something very silly!" iconst 0 iconst -1 iconst 0 iconst -1 invoke 5517 - jump LABEL810 -LABEL799: + jump LABEL803 +LABEL792: get_varc_string 335 invoke 224 set_varc_string 335 @@ -971,97 +961,97 @@ LABEL799: iload 2 substring docheat +LABEL803: + jump LABEL810 +LABEL804: + get_varc_string 335 + iconst 0 + iconst -1 + iconst 0 + iconst -1 + invoke 5517 LABEL810: jump LABEL817 LABEL811: - get_varc_string 335 - iconst 0 - iconst -1 - iconst 0 - iconst -1 - invoke 5517 -LABEL817: - jump LABEL824 -LABEL818: get_varc_string 335 iconst 0 iconst -1 iconst 1 iload 9 invoke 5517 -LABEL824: +LABEL817: get_varc_string 335 invoke 77 sconst "" set_varc_string 335 -LABEL828: - jump LABEL904 -LABEL829: +LABEL821: + jump LABEL897 +LABEL822: iload 0 iconst 104 - if_icmpeq LABEL833 - jump LABEL839 -LABEL833: + if_icmpeq LABEL826 + jump LABEL832 +LABEL826: iload 3 iconst 1 - if_icmpeq LABEL837 - jump LABEL838 -LABEL837: + if_icmpeq LABEL830 + jump LABEL831 +LABEL830: invoke 75 -LABEL838: - jump LABEL904 -LABEL839: +LABEL831: + jump LABEL897 +LABEL832: iload 0 iconst 105 - if_icmpeq LABEL843 - jump LABEL849 -LABEL843: + if_icmpeq LABEL836 + jump LABEL842 +LABEL836: iload 3 iconst 1 - if_icmpeq LABEL847 - jump LABEL848 -LABEL847: + if_icmpeq LABEL840 + jump LABEL841 +LABEL840: invoke 76 -LABEL848: - jump LABEL904 -LABEL849: +LABEL841: + jump LABEL897 +LABEL842: iload 0 iconst 80 - if_icmpeq LABEL853 - jump LABEL898 -LABEL853: + if_icmpeq LABEL846 + jump LABEL891 +LABEL846: iconst 40697936 iconst 1 cc_find iconst 1 - if_icmpeq LABEL859 - jump LABEL860 -LABEL859: + if_icmpeq LABEL852 + jump LABEL853 +LABEL852: return -LABEL860: +LABEL853: get_varc_string 356 string_length iconst 0 - if_icmpgt LABEL865 - jump LABEL885 -LABEL865: + if_icmpgt LABEL858 + jump LABEL878 +LABEL858: get_varc_string 356 friend_test iconst 1 - if_icmpeq LABEL870 - jump LABEL873 -LABEL870: + if_icmpeq LABEL863 + jump LABEL866 +LABEL863: get_varc_string 356 invoke 107 return -LABEL873: +LABEL866: get_varc_int 60 clientclock - if_icmpgt LABEL877 - jump LABEL878 -LABEL877: + if_icmpgt LABEL870 + jump LABEL871 +LABEL870: return -LABEL878: +LABEL871: clientclock iconst 50 add @@ -1069,14 +1059,14 @@ LABEL878: sconst "That player was not found on your Friends list." mes return -LABEL885: +LABEL878: get_varc_int 60 clientclock - if_icmpgt LABEL889 - jump LABEL890 -LABEL889: + if_icmpgt LABEL882 + jump LABEL883 +LABEL882: return -LABEL890: +LABEL883: clientclock iconst 50 add @@ -1084,8 +1074,8 @@ LABEL890: sconst "You haven't received any messages to which you can reply." mes return - jump LABEL904 -LABEL898: + jump LABEL897 +LABEL891: get_varc_string 335 iconst 0 iload 0 @@ -1097,9 +1087,9 @@ LABEL898: runelite_callback ; if_icmpeq SKIPSETVARC ; skip setting varc with input set_varc_string 335 - jump LABEL904 ; jump over SKIPSETVARC + jump LABEL897 ; jump over SKIPSETVARC SKIPSETVARC: pop_string ; pop message -LABEL904: +LABEL897: invoke 223 return