diff --git a/runelite-api/src/main/java/net/runelite/api/ScriptID.java b/runelite-api/src/main/java/net/runelite/api/ScriptID.java index fe53b50113..099ebc1537 100644 --- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java +++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java @@ -40,12 +40,15 @@ public final class ScriptID /** * Sends a chat message * */ - @ScriptArguments(integer = 1, string = 1) - public static final int CHATBOX_INPUT = 96; + @ScriptArguments(integer = 4, string = 1) + public static final int CHAT_SEND = 5517; /** * Rebuilds the chatbox and the pmbox diff --git a/runelite-client/src/main/java/net/runelite/client/chat/CommandManager.java b/runelite-client/src/main/java/net/runelite/client/chat/CommandManager.java index e8fb4dcedb..67f287d580 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/CommandManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/CommandManager.java @@ -127,7 +127,8 @@ public class CommandManager int intStackCount = client.getIntStackSize(); final String typedText = stringStack[stringStackCount - 1]; - final int chatType = intStack[intStackCount - 1]; + final int chatType = intStack[intStackCount - 2]; + final int clanTarget = intStack[intStackCount - 1]; ChatboxInput chatboxInput = new ChatboxInput(typedText, chatType) { @@ -142,7 +143,7 @@ public class CommandManager } resumed = true; - clientThread.invoke(() -> sendChatboxInput(chatType, typedText)); + clientThread.invoke(() -> sendChatboxInput(typedText, chatType, clanTarget)); } }; boolean stop = false; @@ -198,12 +199,12 @@ public class CommandManager } } - private void sendChatboxInput(int chatType, String input) + private void sendChatboxInput(String input, int chatType, int clanTarget) { sending = true; try { - client.runScript(ScriptID.CHATBOX_INPUT, chatType, input); + client.runScript(ScriptID.CHAT_SEND, input, chatType, clanTarget, 0, -1); } finally { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java index 6a8d060b9c..5e9628f726 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java @@ -57,8 +57,6 @@ import net.runelite.client.util.ColorUtil; public class KeyRemappingPlugin extends Plugin { private static final String PRESS_ENTER_TO_CHAT = "Press Enter to Chat..."; - private static final String SCRIPT_EVENT_SET_CHATBOX_INPUT = "setChatboxInput"; - private static final String SCRIPT_EVENT_BLOCK_CHAT_INPUT = "blockChatInput"; @Inject private Client client; @@ -160,14 +158,14 @@ public class KeyRemappingPlugin extends Plugin { switch (scriptCallbackEvent.getEventName()) { - case SCRIPT_EVENT_SET_CHATBOX_INPUT: + case "setChatboxInput": Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT); if (chatboxInput != null && !typing) { setChatboxWidgetInput(chatboxInput, PRESS_ENTER_TO_CHAT); } break; - case SCRIPT_EVENT_BLOCK_CHAT_INPUT: + case "blockChatInput": if (!typing) { int[] intStack = client.getIntStack(); diff --git a/runelite-client/src/main/scripts/BankMainBuild.hash b/runelite-client/src/main/scripts/BankMainBuild.hash new file mode 100644 index 0000000000..967a7ae1ee --- /dev/null +++ b/runelite-client/src/main/scripts/BankMainBuild.hash @@ -0,0 +1 @@ +BEE152DE7559AA8A3BDBEEBAF06D800806DCC8A8936F86B18480CE4200010BF5 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/BankSearchLayout.rs2asm b/runelite-client/src/main/scripts/BankMainBuild.rs2asm similarity index 99% rename from runelite-client/src/main/scripts/BankSearchLayout.rs2asm rename to runelite-client/src/main/scripts/BankMainBuild.rs2asm index ea13a99a47..4a44362203 100644 --- a/runelite-client/src/main/scripts/BankSearchLayout.rs2asm +++ b/runelite-client/src/main/scripts/BankMainBuild.rs2asm @@ -1,4 +1,4 @@ -.id 277 ; [proc,bankmain_build] +.id 277 .int_stack_count 17 .string_stack_count 0 .int_var_count 36 @@ -265,9 +265,9 @@ LABEL225: iload 3 iload 2 invoke 231 - iconst 816 + iconst 1200 istore 20 - iconst 816 + iconst 1200 iconst 9 iconst 3 multiply @@ -341,7 +341,7 @@ LABEL253: jump LABEL750 LABEL297: iload 20 - iconst 816 + iconst 1200 if_icmplt LABEL301 jump LABEL326 LABEL301: @@ -398,7 +398,7 @@ LABEL326: if_icmple LABEL348 jump LABEL352 LABEL348: - iconst 816 + iconst 1200 iconst 1 sub istore 30 @@ -868,7 +868,7 @@ LABEL758: istore 35 LABEL770: iload 20 - iconst 816 + iconst 1200 if_icmplt LABEL774 jump LABEL854 LABEL774: diff --git a/runelite-client/src/main/scripts/BankSearchLayout.hash b/runelite-client/src/main/scripts/BankSearchLayout.hash deleted file mode 100644 index 0c32c3a219..0000000000 --- a/runelite-client/src/main/scripts/BankSearchLayout.hash +++ /dev/null @@ -1 +0,0 @@ -8F6EC040714CB55346C243DA8126FC74122F8300D808E5616CCC37FC767B38DF \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatBuilder.hash b/runelite-client/src/main/scripts/ChatBuilder.hash index be46c05dc2..169c51e68a 100644 --- a/runelite-client/src/main/scripts/ChatBuilder.hash +++ b/runelite-client/src/main/scripts/ChatBuilder.hash @@ -1 +1 @@ -09B4102BE45BA918A3B5D24F9DC1BF92925B15BEC9FAA67638AFB26DF13D8F88 \ No newline at end of file +7D5A3CB415DC8A5BA0477F0587693A394E13C7144DCA3E2F9AEEE559A40210E2 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatBuilder.rs2asm b/runelite-client/src/main/scripts/ChatBuilder.rs2asm index 661deae39a..89e852e785 100644 --- a/runelite-client/src/main/scripts/ChatBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatBuilder.rs2asm @@ -2,7 +2,7 @@ .int_stack_count 1 .string_stack_count 0 .int_var_count 24 -.string_var_count 19 +.string_var_count 23 iconst 10616888 if_getwidth istore 1 @@ -47,11 +47,17 @@ LABEL14: sstore 10 sconst "" sstore 11 + sconst "" + sstore 12 + sconst "" + sstore 13 + sconst "" + sstore 14 invoke 921 iconst 1 - if_icmpeq LABEL46 - jump LABEL107 -LABEL46: + if_icmpeq LABEL52 + jump LABEL131 +LABEL52: iconst 16777215 iconst 1 iconst 1 @@ -112,8 +118,26 @@ LABEL46: sconst "col" invoke 3739 sstore 11 - jump LABEL155 -LABEL107: + iconst 3746 + iconst 1230 + struct_param + sconst "col" + invoke 3739 + sstore 12 + iconst 3748 + iconst 1230 + struct_param + sconst "col" + invoke 3739 + sstore 13 + iconst 3750 + iconst 1230 + struct_param + sconst "col" + invoke 3739 + sstore 14 + jump LABEL197 +LABEL131: iconst 2896 iconst 1230 struct_param @@ -162,28 +186,52 @@ LABEL107: sconst "col" invoke 3739 sstore 11 -LABEL155: - iload 3 + iconst 3745 + iconst 1230 + struct_param sconst "col" invoke 3739 sstore 12 + iconst 3747 + iconst 1230 + struct_param + sconst "col" + invoke 3739 + sstore 13 + iconst 3749 + iconst 1230 + struct_param + sconst "col" + invoke 3739 + sstore 14 +LABEL197: + iload 3 + sconst "col" + invoke 3739 + sstore 15 sload 4 sload 5 sload 6 - sload 12 + sload 15 sload 7 sload 8 sload 9 sload 10 sload 11 + sload 12 + sload 13 + sload 14 iload 5 invoke 4484 + sstore 14 + sstore 13 + sstore 12 sstore 11 sstore 10 sstore 9 sstore 8 sstore 7 - sstore 12 + sstore 15 sstore 6 sstore 5 sstore 4 @@ -201,18 +249,18 @@ LABEL155: istore 9 get_varc_int 41 iconst 0 - if_icmpeq LABEL198 + if_icmpeq LABEL246 get_varc_int 41 iconst 2 - if_icmpeq LABEL198 - jump LABEL254 -LABEL198: + if_icmpeq LABEL246 + jump LABEL302 +LABEL246: chat_getmessagefilter string_length iconst 0 - if_icmpgt LABEL203 - jump LABEL254 -LABEL203: + if_icmpgt LABEL251 + jump LABEL302 +LABEL251: sload 4 sconst "Public chat filtering:" sconst "" @@ -264,7 +312,7 @@ LABEL203: iload 8 enum istore 9 -LABEL254: +LABEL302: iload 0 istore 10 iconst 0 @@ -272,13 +320,13 @@ LABEL254: iconst -1 istore 12 sconst "" - sstore 13 - sconst "" - sstore 14 - sconst "" - sstore 15 - sconst "" sstore 16 + sconst "" + sstore 17 + sconst "" + sstore 18 + sconst "" + sstore 19 iconst -1 istore 13 iconst 0 @@ -286,7 +334,7 @@ LABEL254: iconst 0 istore 15 sconst "" - sstore 17 + sstore 20 iconst -1 istore 16 iconst -1 @@ -300,68 +348,70 @@ LABEL254: iconst 0 activeclansettings_find_affined iconst 1 - if_icmpeq LABEL291 - jump LABEL311 -LABEL291: + if_icmpeq LABEL339 + jump LABEL359 +LABEL339: iconst 0 activeclanchannel_find_affined iconst 1 - if_icmpeq LABEL296 - jump LABEL311 -LABEL296: + if_icmpeq LABEL344 + jump LABEL359 +LABEL344: sload 0 activeclanchannel_getuserslot istore 17 iload 17 iconst -1 - if_icmpne LABEL303 - jump LABEL306 -LABEL303: + if_icmpne LABEL351 + jump LABEL354 +LABEL351: iload 17 activeclanchannel_getuserrank istore 18 -LABEL306: +LABEL354: activeclanchannel_getrankkick iconst 2956 invoke 4456 istore 20 istore 19 -LABEL311: +LABEL359: sconst "" - sstore 18 + sstore 21 iconst 0 istore 21 -LABEL315: + sconst "" + sstore 22 +LABEL365: iload 10 iconst -1 - if_icmpne LABEL319 - jump LABEL1598 -LABEL319: + if_icmpne LABEL369 + jump LABEL1725 +LABEL369: iload 9 iconst -1 - if_icmpne LABEL323 - jump LABEL1598 -LABEL323: + if_icmpne LABEL373 + jump LABEL1725 +LABEL373: iload 10 - chat_gethistoryex_byuid + 5031 istore 21 - sstore 18 ; timestamp + sstore 21 ; timestamp istore 15 - sstore 15 - sstore 14 - sstore 13 + sstore 18 + sstore 17 + sstore 16 istore 12 istore 11 iload 11 - sload 13 + sload 16 iload 15 - sload 15 + sload 18 invoke 193 iconst 1 if_icmpeq CHAT_FILTER - jump LABEL1594 + jump LABEL1721 CHAT_FILTER: - sload 15 ; Load the message + sload 18 ; Load the message iconst 1 ; Gets changed to 0 if message is blocked iload 11 ; Load the messageType iload 10 ; Load the id of the messageNode @@ -370,64 +420,64 @@ CHAT_FILTER: pop_int ; Pop the id of the messageNode pop_int ; Pop the messageType iconst 1 ; 2nd half of conditional - sstore 15 ; Override the message with our filtered message - if_icmpeq LABEL341 ; Check if we are building this message - jump LABEL1594 ; continue to next message, skipping this -LABEL341: + sstore 18 ; Override the message with our filtered message + if_icmpeq LABEL391 ; Check if we are building this message + jump LABEL1721 ; continue to next message, skipping this +LABEL391: iload 11 - sload 13 + sload 16 + sload 21 sload 18 - sload 15 invoke 4742 - sload 15 + sload 18 iload 12 iload 2 sload 0 iload 15 invoke 90 iconst 1 - if_icmpeq LABEL355 - jump LABEL1594 -LABEL355: + if_icmpeq LABEL405 + jump LABEL1721 +LABEL405: iload 10 ; message uid - sload 18 ; message timestamp + sload 21 ; message timestamp sconst "chatMessageBuilding" runelite_callback pop_int ; pop uid - sstore 18 ; message timestamp + sstore 21 ; message timestamp iload 11 switch - 1: LABEL358 - 2: LABEL358 - 3: LABEL404 - 101: LABEL428 - 5: LABEL448 - 6: LABEL483 - 7: LABEL404 - 103: LABEL507 - 104: LABEL507 - 9: LABEL547 - 41: LABEL615 - 43: LABEL939 - 107: LABEL1130 - 44: LABEL778 - 109: LABEL527 - 110: LABEL507 - 46: LABEL1048 - 14: LABEL1101 - 111: LABEL575 - 112: LABEL595 - 90: LABEL381 - 91: LABEL381 - jump LABEL1168 -LABEL358: - sload 18 - sload 13 + 1: LABEL408 + 2: LABEL408 + 3: LABEL454 + 101: LABEL478 + 5: LABEL498 + 6: LABEL533 + 7: LABEL454 + 103: LABEL557 + 104: LABEL557 + 9: LABEL597 + 41: LABEL665 + 43: LABEL1040 + 107: LABEL1257 + 44: LABEL879 + 109: LABEL577 + 110: LABEL557 + 46: LABEL1175 + 14: LABEL1228 + 111: LABEL625 + 112: LABEL645 + 90: LABEL431 + 91: LABEL431 + jump LABEL1295 +LABEL408: + sload 21 + sload 16 sconst ":" join_string 2 invoke 4742 sload 4 - sload 15 + sload 18 sconst "" join_string 3 iload 8 @@ -443,15 +493,15 @@ LABEL358: iload 4 invoke 203 istore 7 - jump LABEL1184 -LABEL381: - sload 18 - sload 13 + jump LABEL1311 +LABEL431: + sload 21 + sload 16 sconst ":" join_string 2 invoke 4742 sload 6 - sload 15 + sload 18 sconst "" join_string 3 iload 8 @@ -467,18 +517,18 @@ LABEL381: iload 4 invoke 203 istore 7 - jump LABEL1184 -LABEL404: - sload 18 + jump LABEL1311 +LABEL454: + sload 21 sconst "From " - sload 13 + sload 16 sconst ":" join_string 3 sconst "privChatUsername" runelite_callback invoke 4742 sload 5 - sload 15 + sload 18 sconst "" join_string 3 iload 8 @@ -494,11 +544,11 @@ LABEL404: iload 4 invoke 203 istore 7 - jump LABEL1184 -LABEL428: - sload 18 + jump LABEL1311 +LABEL478: + sload 21 sload 9 - sload 15 + sload 18 sconst "" join_string 3 invoke 4742 @@ -515,11 +565,11 @@ LABEL428: iload 4 invoke 199 istore 7 - jump LABEL1184 -LABEL448: - sload 18 + jump LABEL1311 +LABEL498: + sload 21 sload 5 - sload 15 + sload 18 sconst "" join_string 3 invoke 4742 @@ -538,9 +588,9 @@ LABEL448: istore 7 get_varbit 1627 iconst 0 - if_icmpeq LABEL471 - jump LABEL482 -LABEL471: + if_icmpeq LABEL521 + jump LABEL532 +LABEL521: iload 12 iconst 500 add @@ -552,19 +602,19 @@ LABEL471: sconst "1" iconst 10616832 if_setontimer -LABEL482: - jump LABEL1184 -LABEL483: - sload 18 +LABEL532: + jump LABEL1311 +LABEL533: + sload 21 sconst "To " - sload 13 + sload 16 sconst ":" join_string 3 sconst "privChatUsername" runelite_callback invoke 4742 sload 5 - sload 15 + sload 18 sconst "" join_string 3 iload 8 @@ -580,11 +630,11 @@ LABEL483: iload 4 invoke 203 istore 7 - jump LABEL1184 -LABEL507: - sload 18 + jump LABEL1311 +LABEL557: + sload 21 sload 10 - sload 15 + sload 18 sconst "" join_string 3 invoke 4742 @@ -601,11 +651,11 @@ LABEL507: iload 4 invoke 199 istore 7 - jump LABEL1184 -LABEL527: - sload 18 + jump LABEL1311 +LABEL577: + sload 21 sconst "" - sload 15 + sload 18 sconst "" join_string 3 invoke 4742 @@ -622,20 +672,20 @@ LABEL527: iload 4 invoke 199 istore 7 - jump LABEL1184 -LABEL547: - sload 18 + jump LABEL1311 +LABEL597: + sload 21 sconst "[" sload 3 - sload 14 + sload 17 sconst "" sconst "] " - sload 13 + sload 16 sconst ":" join_string 7 invoke 4742 sload 7 - sload 15 + sload 18 sconst "" join_string 3 iload 8 @@ -651,11 +701,11 @@ LABEL547: iload 4 invoke 203 istore 7 - jump LABEL1184 -LABEL575: - sload 18 + jump LABEL1311 +LABEL625: + sload 21 sconst "" - sload 15 + sload 18 sconst "" join_string 3 invoke 4742 @@ -672,11 +722,11 @@ LABEL575: iload 4 invoke 199 istore 7 - jump LABEL1184 -LABEL595: - sload 18 + jump LABEL1311 +LABEL645: + sload 21 sconst "" - sload 15 + sload 18 sconst "" join_string 3 invoke 4742 @@ -693,92 +743,110 @@ LABEL595: iload 4 invoke 199 istore 7 - jump LABEL1184 -LABEL615: + jump LABEL1311 +LABEL665: + iconst 1 + activeclansettings_find_affined + iconst 1 + if_icmpeq LABEL670 + jump LABEL716 +LABEL670: + iconst 1 + activeclanchannel_find_affined + iconst 1 + if_icmpeq LABEL675 + jump LABEL716 +LABEL675: + sload 18 + invoke 5501 + iconst 1 + if_icmpeq LABEL680 + jump LABEL716 +LABEL680: + sload 18 + invoke 632 + sstore 18 + sstore 22 + sload 21 + sconst "[" + sload 2 + sload 17 + sconst "" + sconst "]" + join_string 5 + invoke 4742 + iconst -1 + iconst 0 + iconst 0 + sload 16 + sconst ":" + join_string 2 + sload 12 + sload 18 + sconst "" + join_string 3 + iload 8 + iload 9 + iconst 10616888 + iload 1 + iconst 3 + iconst 14 + iload 6 + iconst 0 + iconst 103 + iload 3 + iload 4 + invoke 4483 + istore 7 + jump LABEL878 +LABEL716: iconst 0 activeclansettings_find_affined iconst 1 - if_icmpeq LABEL620 - jump LABEL746 -LABEL620: + if_icmpeq LABEL721 + jump LABEL847 +LABEL721: iconst 0 activeclanchannel_find_affined iconst 1 - if_icmpeq LABEL625 - jump LABEL746 -LABEL625: - sload 13 + if_icmpeq LABEL726 + jump LABEL847 +LABEL726: + sload 16 removetags activeclanchannel_getuserslot istore 17 iload 17 iconst -1 - if_icmpne LABEL633 - jump LABEL710 -LABEL633: + if_icmpne LABEL734 + jump LABEL811 +LABEL734: iload 17 activeclanchannel_getuserrank invoke 4302 istore 16 - sstore 17 + sstore 20 iload 16 iconst -1 - if_icmpne LABEL642 - jump LABEL674 -LABEL642: - sload 18 + if_icmpne LABEL743 + jump LABEL775 +LABEL743: + sload 21 sconst "[" sload 2 - sload 14 - sconst "" - sconst "]" - join_string 5 - invoke 4742 - iload 16 - iconst 13 - iconst 13 - sload 13 - sconst ":" - join_string 2 - sload 8 - sload 15 - sconst "" - join_string 3 - iload 8 - iload 9 - iconst 10616888 - iload 1 - iconst 3 - iconst 14 - iload 6 - iconst 0 - iconst 103 - iload 3 - iload 4 - invoke 4483 - istore 7 - jump LABEL709 -LABEL674: - sload 18 - sconst "[" - sload 2 - sload 14 - sconst "" - sconst "]" - join_string 5 - invoke 4742 - iconst -1 - iconst 0 - iconst 0 - sload 2 sload 17 sconst "" - sconst " " - sload 13 + sconst "]" + join_string 5 + invoke 4742 + iload 16 + iconst 13 + iconst 13 + sload 16 sconst ":" - join_string 6 + join_string 2 sload 8 - sload 15 + sload 18 sconst "" join_string 3 iload 8 @@ -794,17 +862,54 @@ LABEL674: iload 4 invoke 4483 istore 7 -LABEL709: - jump LABEL745 -LABEL710: + jump LABEL810 +LABEL775: + sload 21 + sconst "[" + sload 2 + sload 17 + sconst "" + sconst "]" + join_string 5 + invoke 4742 + iconst -1 + iconst 0 + iconst 0 + sload 2 + sload 20 + sconst "" + sconst " " + sload 16 + sconst ":" + join_string 6 + sload 8 + sload 18 + sconst "" + join_string 3 + iload 8 + iload 9 + iconst 10616888 + iload 1 + iconst 3 + iconst 14 + iload 6 + iconst 0 + iconst 103 + iload 3 + iload 4 + invoke 4483 + istore 7 +LABEL810: + jump LABEL846 +LABEL811: iconst -1 invoke 4302 istore 16 - sstore 17 - sload 18 + sstore 20 + sload 21 sconst "[" sload 2 - sload 14 + sload 17 sconst "" sconst "]" join_string 5 @@ -812,11 +917,11 @@ LABEL710: iload 16 iconst 13 iconst 13 - sload 13 + sload 16 sconst ":" join_string 2 sload 8 - sload 15 + sload 18 sconst "" join_string 3 iload 8 @@ -832,13 +937,13 @@ LABEL710: iload 4 invoke 4483 istore 7 -LABEL745: - jump LABEL777 -LABEL746: - sload 18 +LABEL846: + jump LABEL878 +LABEL847: + sload 21 sconst "[" sload 2 - sload 14 + sload 17 sconst "" sconst "]" join_string 5 @@ -846,11 +951,11 @@ LABEL746: iconst -1 iconst 0 iconst 0 - sload 13 + sload 16 sconst ":" join_string 2 sload 8 - sload 15 + sload 18 sconst "" join_string 3 iload 8 @@ -866,91 +971,54 @@ LABEL746: iload 4 invoke 4483 istore 7 -LABEL777: - jump LABEL1184 -LABEL778: +LABEL878: + jump LABEL1311 +LABEL879: activeclansettings_find_listened iconst 1 - if_icmpeq LABEL782 - jump LABEL907 -LABEL782: + if_icmpeq LABEL883 + jump LABEL1008 +LABEL883: activeclanchannel_find_listened iconst 1 - if_icmpeq LABEL786 - jump LABEL907 -LABEL786: - sload 13 + if_icmpeq LABEL887 + jump LABEL1008 +LABEL887: + sload 16 removetags activeclanchannel_getuserslot istore 17 iload 17 iconst -1 - if_icmpne LABEL794 - jump LABEL871 -LABEL794: + if_icmpne LABEL895 + jump LABEL972 +LABEL895: iload 17 activeclanchannel_getuserrank invoke 4302 istore 16 - sstore 17 + sstore 20 iload 16 iconst -1 - if_icmpne LABEL803 - jump LABEL835 -LABEL803: - sload 18 + if_icmpne LABEL904 + jump LABEL936 +LABEL904: + sload 21 sconst "[" sload 2 - sload 14 - sconst "" - sconst "]" - join_string 5 - invoke 4742 - iload 16 - iconst 13 - iconst 13 - sload 13 - sconst ":" - join_string 2 - sload 11 - sload 15 - sconst "" - join_string 3 - iload 8 - iload 9 - iconst 10616888 - iload 1 - iconst 3 - iconst 14 - iload 6 - iconst 0 - iconst 103 - iload 3 - iload 4 - invoke 4483 - istore 7 - jump LABEL870 -LABEL835: - sload 18 - sconst "[" - sload 2 - sload 14 - sconst "" - sconst "]" - join_string 5 - invoke 4742 - iconst -1 - iconst 0 - iconst 0 - sload 2 sload 17 sconst "" - sconst " " - sload 13 + sconst "]" + join_string 5 + invoke 4742 + iload 16 + iconst 13 + iconst 13 + sload 16 sconst ":" - join_string 6 + join_string 2 sload 11 - sload 15 + sload 18 sconst "" join_string 3 iload 8 @@ -966,17 +1034,54 @@ LABEL835: iload 4 invoke 4483 istore 7 -LABEL870: - jump LABEL906 -LABEL871: + jump LABEL971 +LABEL936: + sload 21 + sconst "[" + sload 2 + sload 17 + sconst "" + sconst "]" + join_string 5 + invoke 4742 + iconst -1 + iconst 0 + iconst 0 + sload 2 + sload 20 + sconst "" + sconst " " + sload 16 + sconst ":" + join_string 6 + sload 11 + sload 18 + sconst "" + join_string 3 + iload 8 + iload 9 + iconst 10616888 + iload 1 + iconst 3 + iconst 14 + iload 6 + iconst 0 + iconst 103 + iload 3 + iload 4 + invoke 4483 + istore 7 +LABEL971: + jump LABEL1007 +LABEL972: iconst -1 invoke 4302 istore 16 - sstore 17 - sload 18 + sstore 20 + sload 21 sconst "[" sload 2 - sload 14 + sload 17 sconst "" sconst "]" join_string 5 @@ -984,11 +1089,11 @@ LABEL871: iload 16 iconst 13 iconst 13 - sload 13 + sload 16 sconst ":" join_string 2 sload 11 - sload 15 + sload 18 sconst "" join_string 3 iload 8 @@ -1004,13 +1109,13 @@ LABEL871: iload 4 invoke 4483 istore 7 -LABEL906: - jump LABEL938 -LABEL907: - sload 18 +LABEL1007: + jump LABEL1039 +LABEL1008: + sload 21 sconst "[" sload 2 - sload 14 + sload 17 sconst "" sconst "]" join_string 5 @@ -1018,11 +1123,11 @@ LABEL907: iconst -1 iconst 0 iconst 0 - sload 13 + sload 16 sconst ":" join_string 2 sload 11 - sload 15 + sload 18 sconst "" join_string 3 iload 8 @@ -1038,26 +1143,33 @@ LABEL907: iload 4 invoke 4483 istore 7 -LABEL938: - jump LABEL1184 -LABEL939: - sload 15 +LABEL1039: + jump LABEL1311 +LABEL1040: + sload 18 invoke 5309 iconst 1 - if_icmpeq LABEL944 - jump LABEL994 -LABEL944: - sload 15 + if_icmpeq LABEL1045 + jump LABEL1108 +LABEL1045: + sload 18 invoke 632 - sstore 15 - sstore 13 + sstore 18 + sstore 16 + sload 18 + sconst "" + sconst "" + sload 14 + append + invoke 3302 + sstore 18 iconst 1 activeclansettings_find_affined iconst 1 - if_icmpeq LABEL953 - jump LABEL976 -LABEL953: - sload 18 + if_icmpeq LABEL1061 + jump LABEL1087 +LABEL1061: + sload 21 sconst "[" sload 2 activeclansettings_getclanname @@ -1065,7 +1177,10 @@ LABEL953: sconst "]" join_string 5 invoke 4742 - sload 15 + sload 14 + sload 18 + sconst "" + join_string 3 iload 8 iload 9 iconst 10616888 @@ -1079,12 +1194,15 @@ LABEL953: iload 4 invoke 203 istore 7 - jump LABEL993 -LABEL976: - sload 18 + jump LABEL1107 +LABEL1087: + sload 21 sconst "" invoke 4742 - sload 15 + sload 14 + sload 18 + sconst "" + join_string 3 iload 8 iload 9 iconst 10616888 @@ -1098,16 +1216,23 @@ LABEL976: iload 4 invoke 203 istore 7 -LABEL993: - jump LABEL1047 -LABEL994: +LABEL1107: + jump LABEL1174 +LABEL1108: + sload 18 + sconst "" + sconst "" + sload 13 + append + invoke 3302 + sstore 18 iconst 0 activeclanchannel_find_affined iconst 1 - if_icmpeq LABEL999 - jump LABEL1026 -LABEL999: - sload 18 + if_icmpeq LABEL1120 + jump LABEL1150 +LABEL1120: + sload 21 sconst "[" sload 2 activeclanchannel_getclanname @@ -1119,7 +1244,10 @@ LABEL999: iconst 0 iconst 0 sconst "" - sload 15 + sload 13 + sload 18 + sconst "" + join_string 3 iload 8 iload 9 iconst 10616888 @@ -1133,16 +1261,19 @@ LABEL999: iload 4 invoke 4483 istore 7 - jump LABEL1047 -LABEL1026: - sload 18 + jump LABEL1174 +LABEL1150: + sload 21 sconst "" invoke 4742 iconst -1 iconst 0 iconst 0 sconst "" - sload 15 + sload 13 + sload 18 + sconst "" + join_string 3 iload 8 iload 9 iconst 10616888 @@ -1156,15 +1287,15 @@ LABEL1026: iload 4 invoke 4483 istore 7 -LABEL1047: - jump LABEL1184 -LABEL1048: +LABEL1174: + jump LABEL1311 +LABEL1175: activeclanchannel_find_listened iconst 1 - if_icmpeq LABEL1052 - jump LABEL1079 -LABEL1052: - sload 18 + if_icmpeq LABEL1179 + jump LABEL1206 +LABEL1179: + sload 21 sconst "[" sload 2 activeclanchannel_getclanname @@ -1176,7 +1307,7 @@ LABEL1052: iconst 0 iconst 0 sconst "" - sload 15 + sload 18 iload 8 iload 9 iconst 10616888 @@ -1190,16 +1321,16 @@ LABEL1052: iload 4 invoke 4483 istore 7 - jump LABEL1100 -LABEL1079: - sload 18 + jump LABEL1227 +LABEL1206: + sload 21 sconst "" invoke 4742 iconst -1 iconst 0 iconst 0 sconst "" - sload 15 + sload 18 iload 8 iload 9 iconst 10616888 @@ -1213,22 +1344,22 @@ LABEL1079: iload 4 invoke 4483 istore 7 -LABEL1100: - jump LABEL1184 -LABEL1101: - sload 15 +LABEL1227: + jump LABEL1311 +LABEL1228: + sload 18 invoke 2066 istore 13 - sstore 16 - sstore 15 - sload 18 + sstore 19 + sstore 18 + sload 21 sload 1 sconst "Broadcast:" sconst "" join_string 3 invoke 4742 - sload 12 sload 15 + sload 18 sconst "" join_string 3 iload 8 @@ -1244,15 +1375,15 @@ LABEL1101: iload 4 invoke 203 istore 7 - jump LABEL1184 -LABEL1130: + jump LABEL1311 +LABEL1257: clientclock iload 12 sub iconst 500 - if_icmpgt LABEL1136 - jump LABEL1151 -LABEL1136: + if_icmpgt LABEL1263 + jump LABEL1278 +LABEL1263: sconst "jk :P" iload 8 iload 9 @@ -1267,10 +1398,10 @@ LABEL1136: iload 4 invoke 199 istore 7 - jump LABEL1167 -LABEL1151: + jump LABEL1294 +LABEL1278: + sload 21 sload 18 - sload 15 invoke 4742 iload 8 iload 9 @@ -1285,11 +1416,11 @@ LABEL1151: iload 4 invoke 199 istore 7 -LABEL1167: - jump LABEL1184 -LABEL1168: +LABEL1294: + jump LABEL1311 +LABEL1295: + sload 21 sload 18 - sload 15 invoke 4742 iload 8 iload 9 @@ -1304,34 +1435,34 @@ LABEL1168: iload 4 invoke 199 istore 7 -LABEL1184: +LABEL1311: iload 9 if_clearops iload 11 switch - 1: LABEL1189 - 2: LABEL1189 - 3: LABEL1189 - 101: LABEL1293 - 6: LABEL1189 - 7: LABEL1189 - 103: LABEL1336 - 104: LABEL1336 - 9: LABEL1189 - 41: LABEL1189 - 106: LABEL1189 - 44: LABEL1189 - 109: LABEL1439 - 110: LABEL1336 - 14: LABEL1379 - 111: LABEL1482 - 112: LABEL1525 - 90: LABEL1189 - 91: LABEL1189 - jump LABEL1568 -LABEL1189: + 1: LABEL1316 + 2: LABEL1316 + 3: LABEL1316 + 101: LABEL1420 + 6: LABEL1316 + 7: LABEL1316 + 103: LABEL1463 + 104: LABEL1463 + 9: LABEL1316 + 41: LABEL1316 + 106: LABEL1316 + 44: LABEL1316 + 109: LABEL1566 + 110: LABEL1463 + 14: LABEL1506 + 111: LABEL1609 + 112: LABEL1652 + 90: LABEL1316 + 91: LABEL1316 + jump LABEL1695 +LABEL1316: sconst "" - sload 13 + sload 16 sconst "" join_string 3 iload 9 @@ -1352,24 +1483,24 @@ LABEL1189: iload 9 if_setonmouseleave sload 0 - sload 13 + sload 16 removetags compare iconst 0 - if_icmpne LABEL1217 - jump LABEL1292 -LABEL1217: + if_icmpne LABEL1344 + jump LABEL1419 +LABEL1344: iload 15 iconst 1 - if_icmpeq LABEL1221 - jump LABEL1226 -LABEL1221: + if_icmpeq LABEL1348 + jump LABEL1353 +LABEL1348: iconst 6 sconst "Message" iload 9 if_setop - jump LABEL1234 -LABEL1226: + jump LABEL1361 +LABEL1353: iconst 6 sconst "Add friend" iload 9 @@ -1378,80 +1509,80 @@ LABEL1226: sconst "Add ignore" iload 9 if_setop -LABEL1234: +LABEL1361: iconst 8 sconst "Report" iload 9 if_setop iload 11 iconst 9 - if_icmpeq LABEL1242 - jump LABEL1255 -LABEL1242: + if_icmpeq LABEL1369 + jump LABEL1382 +LABEL1369: clan_getchatcount iconst 0 - if_icmpgt LABEL1246 - jump LABEL1254 -LABEL1246: + if_icmpgt LABEL1373 + jump LABEL1381 +LABEL1373: clan_getchatrank clan_getchatminkick - if_icmpge LABEL1250 - jump LABEL1254 -LABEL1250: + if_icmpge LABEL1377 + jump LABEL1381 +LABEL1377: iconst 9 sconst "Kick" iload 9 if_setop -LABEL1254: - jump LABEL1292 -LABEL1255: +LABEL1381: + jump LABEL1419 +LABEL1382: iload 11 iconst 41 - if_icmpeq LABEL1259 - jump LABEL1292 -LABEL1259: + if_icmpeq LABEL1386 + jump LABEL1419 +LABEL1386: iload 18 iload 19 - if_icmpge LABEL1263 - jump LABEL1292 -LABEL1263: + if_icmpge LABEL1390 + jump LABEL1419 +LABEL1390: iconst 0 activeclanchannel_find_affined iconst 1 - if_icmpeq LABEL1268 - jump LABEL1292 -LABEL1268: - sload 13 + if_icmpeq LABEL1395 + jump LABEL1419 +LABEL1395: + sload 16 removetags activeclanchannel_getuserslot istore 17 iload 17 iconst -1 - if_icmpeq LABEL1280 + if_icmpeq LABEL1407 iload 17 activeclanchannel_getuserrank iconst -1 - if_icmple LABEL1280 - jump LABEL1292 -LABEL1280: + if_icmple LABEL1407 + jump LABEL1419 +LABEL1407: iconst 9 sconst "Kick" iload 9 if_setop iload 18 iload 20 - if_icmpge LABEL1288 - jump LABEL1292 -LABEL1288: + if_icmpge LABEL1415 + jump LABEL1419 +LABEL1415: iconst 10 sconst "Ban" iload 9 if_setop -LABEL1292: - jump LABEL1580 -LABEL1293: +LABEL1419: + jump LABEL1707 +LABEL1420: sconst "" - sload 13 + sload 16 sconst "" join_string 3 iload 9 @@ -1477,15 +1608,15 @@ LABEL1293: if_setop iload 15 iconst 1 - if_icmpeq LABEL1322 - jump LABEL1327 -LABEL1322: + if_icmpeq LABEL1449 + jump LABEL1454 +LABEL1449: iconst 6 sconst "Message" iload 9 if_setop - jump LABEL1335 -LABEL1327: + jump LABEL1462 +LABEL1454: iconst 6 sconst "Add friend" iload 9 @@ -1494,11 +1625,11 @@ LABEL1327: sconst "Add ignore" iload 9 if_setop -LABEL1335: - jump LABEL1580 -LABEL1336: +LABEL1462: + jump LABEL1707 +LABEL1463: sconst "" - sload 13 + sload 16 sconst "" join_string 3 iload 9 @@ -1524,15 +1655,15 @@ LABEL1336: if_setop iload 15 iconst 1 - if_icmpeq LABEL1365 - jump LABEL1370 -LABEL1365: + if_icmpeq LABEL1492 + jump LABEL1497 +LABEL1492: iconst 6 sconst "Message" iload 9 if_setop - jump LABEL1378 -LABEL1370: + jump LABEL1505 +LABEL1497: iconst 6 sconst "Add friend" iload 9 @@ -1541,20 +1672,20 @@ LABEL1370: sconst "Add ignore" iload 9 if_setop -LABEL1378: - jump LABEL1580 -LABEL1379: - sload 16 +LABEL1505: + jump LABEL1707 +LABEL1506: + sload 19 string_length iconst 0 - if_icmpgt LABEL1384 - jump LABEL1413 -LABEL1384: + if_icmpgt LABEL1511 + jump LABEL1540 +LABEL1511: iload 13 iconst -1 - if_icmpne LABEL1388 - jump LABEL1413 -LABEL1388: + if_icmpne LABEL1515 + jump LABEL1540 +LABEL1515: iconst 6 sconst "Open" iload 9 @@ -1579,8 +1710,8 @@ LABEL1388: sconst "Iii" iload 9 if_setonmouseleave - jump LABEL1421 -LABEL1413: + jump LABEL1548 +LABEL1540: iconst -1 sconst "" iload 9 @@ -1589,7 +1720,7 @@ LABEL1413: sconst "" iload 9 if_setonmouseleave -LABEL1421: +LABEL1548: iconst 9 sconst "Clear history" iload 9 @@ -1602,15 +1733,15 @@ LABEL1421: if_setopbase iconst 2064 iconst -2147483644 - sload 16 + sload 19 iload 13 sconst "isi" iload 9 if_setonop - jump LABEL1580 -LABEL1439: + jump LABEL1707 +LABEL1566: sconst "" - sload 13 + sload 16 sconst "" join_string 3 iload 9 @@ -1636,15 +1767,15 @@ LABEL1439: if_setonmouseleave iload 15 iconst 1 - if_icmpeq LABEL1468 - jump LABEL1473 -LABEL1468: + if_icmpeq LABEL1595 + jump LABEL1600 +LABEL1595: iconst 6 sconst "Message" iload 9 if_setop - jump LABEL1481 -LABEL1473: + jump LABEL1608 +LABEL1600: iconst 6 sconst "Add friend" iload 9 @@ -1653,11 +1784,11 @@ LABEL1473: sconst "Add ignore" iload 9 if_setop -LABEL1481: - jump LABEL1580 -LABEL1482: +LABEL1608: + jump LABEL1707 +LABEL1609: sconst "" - sload 13 + sload 16 sconst "" join_string 3 iload 9 @@ -1683,15 +1814,15 @@ LABEL1482: if_setonmouseleave iload 15 iconst 1 - if_icmpeq LABEL1511 - jump LABEL1516 -LABEL1511: + if_icmpeq LABEL1638 + jump LABEL1643 +LABEL1638: iconst 6 sconst "Message" iload 9 if_setop - jump LABEL1524 -LABEL1516: + jump LABEL1651 +LABEL1643: iconst 6 sconst "Add friend" iload 9 @@ -1700,11 +1831,11 @@ LABEL1516: sconst "Add ignore" iload 9 if_setop -LABEL1524: - jump LABEL1580 -LABEL1525: +LABEL1651: + jump LABEL1707 +LABEL1652: sconst "" - sload 13 + sload 16 sconst "" join_string 3 iload 9 @@ -1730,15 +1861,15 @@ LABEL1525: if_setonmouseleave iload 15 iconst 1 - if_icmpeq LABEL1554 - jump LABEL1559 -LABEL1554: + if_icmpeq LABEL1681 + jump LABEL1686 +LABEL1681: iconst 6 sconst "Message" iload 9 if_setop - jump LABEL1567 -LABEL1559: + jump LABEL1694 +LABEL1686: iconst 6 sconst "Add friend" iload 9 @@ -1747,9 +1878,9 @@ LABEL1559: sconst "Add ignore" iload 9 if_setop -LABEL1567: - jump LABEL1580 -LABEL1568: +LABEL1694: + jump LABEL1707 +LABEL1695: iconst -1 sconst "" iload 9 @@ -1762,7 +1893,7 @@ LABEL1568: sconst "" iload 9 if_setonmouseleave -LABEL1580: +LABEL1707: iload 6 iload 7 sub @@ -1777,20 +1908,20 @@ LABEL1580: iload 8 enum istore 9 -LABEL1594: +LABEL1721: iload 10 chat_getprevuid istore 10 - jump LABEL315 -LABEL1598: + jump LABEL365 +LABEL1725: iload 8 istore 22 -LABEL1600: +LABEL1727: iload 9 iconst -1 - if_icmpne LABEL1604 - jump LABEL1687 -LABEL1604: + if_icmpne LABEL1731 + jump LABEL1814 +LABEL1731: iload 9 if_clearops iconst -1 @@ -1817,14 +1948,14 @@ LABEL1604: multiply cc_find iconst 1 - if_icmpeq LABEL1632 - jump LABEL1636 -LABEL1632: + if_icmpeq LABEL1759 + jump LABEL1763 +LABEL1759: sconst "" cc_settext iconst 1 cc_sethide -LABEL1636: +LABEL1763: iconst 10616888 iload 8 iconst 4 @@ -1833,14 +1964,14 @@ LABEL1636: add cc_find iconst 1 - if_icmpeq LABEL1646 - jump LABEL1650 -LABEL1646: + if_icmpeq LABEL1773 + jump LABEL1777 +LABEL1773: sconst "" cc_settext iconst 1 cc_sethide -LABEL1650: +LABEL1777: iconst 10616888 iload 8 iconst 4 @@ -1849,14 +1980,14 @@ LABEL1650: add cc_find iconst 1 - if_icmpeq LABEL1660 - jump LABEL1664 -LABEL1660: + if_icmpeq LABEL1787 + jump LABEL1791 +LABEL1787: sconst "" cc_settext iconst 1 cc_sethide -LABEL1664: +LABEL1791: iconst 10616888 iload 8 iconst 4 @@ -1865,12 +1996,12 @@ LABEL1664: add cc_find iconst 1 - if_icmpeq LABEL1674 - jump LABEL1676 -LABEL1674: + if_icmpeq LABEL1801 + jump LABEL1803 +LABEL1801: iconst 1 cc_sethide -LABEL1676: +LABEL1803: iload 8 iconst 1 add @@ -1881,8 +2012,8 @@ LABEL1676: iload 8 enum istore 9 - jump LABEL1600 -LABEL1687: + jump LABEL1727 +LABEL1814: iload 6 iconst 2 sub @@ -1896,20 +2027,20 @@ LABEL1687: istore 23 iload 6 iload 23 - if_icmpgt LABEL1702 - jump LABEL1704 -LABEL1702: + if_icmpgt LABEL1829 + jump LABEL1831 +LABEL1829: iload 6 istore 23 -LABEL1704: +LABEL1831: iload 22 istore 8 -LABEL1706: +LABEL1833: iload 8 iconst 0 - if_icmpgt LABEL1710 - jump LABEL1793 -LABEL1710: + if_icmpgt LABEL1837 + jump LABEL1920 +LABEL1837: iload 8 iconst 1 sub @@ -1940,15 +2071,15 @@ LABEL1710: multiply cc_find iconst 1 - if_icmpeq LABEL1742 - jump LABEL1747 -LABEL1742: + if_icmpeq LABEL1869 + jump LABEL1874 +LABEL1869: cc_getx iload 6 iconst 0 iconst 0 cc_setposition -LABEL1747: +LABEL1874: iconst 10616888 iload 8 iconst 4 @@ -1957,15 +2088,15 @@ LABEL1747: add cc_find iconst 1 - if_icmpeq LABEL1757 - jump LABEL1762 -LABEL1757: + if_icmpeq LABEL1884 + jump LABEL1889 +LABEL1884: cc_getx iload 6 iconst 0 iconst 0 cc_setposition -LABEL1762: +LABEL1889: iconst 10616888 iload 8 iconst 4 @@ -1974,15 +2105,15 @@ LABEL1762: add cc_find iconst 1 - if_icmpeq LABEL1772 - jump LABEL1777 -LABEL1772: + if_icmpeq LABEL1899 + jump LABEL1904 +LABEL1899: cc_getx iload 6 iconst 0 iconst 0 cc_setposition -LABEL1777: +LABEL1904: iconst 10616888 iload 8 iconst 4 @@ -1991,17 +2122,17 @@ LABEL1777: add cc_find iconst 1 - if_icmpeq LABEL1787 - jump LABEL1792 -LABEL1787: + if_icmpeq LABEL1914 + jump LABEL1919 +LABEL1914: cc_getx iload 6 iconst 0 iconst 0 cc_setposition -LABEL1792: - jump LABEL1706 -LABEL1793: +LABEL1919: + jump LABEL1833 +LABEL1920: iconst 0 iload 23 iconst 10616888 diff --git a/runelite-client/src/main/scripts/ChatSend.hash b/runelite-client/src/main/scripts/ChatSend.hash new file mode 100644 index 0000000000..402d756ff5 --- /dev/null +++ b/runelite-client/src/main/scripts/ChatSend.hash @@ -0,0 +1 @@ +BF6EEA4353A596E6389BC0CCDB654CC28D11E809F92A59C0301557F6185690CD \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatSend.rs2asm b/runelite-client/src/main/scripts/ChatSend.rs2asm new file mode 100644 index 0000000000..5e79e5baa8 --- /dev/null +++ b/runelite-client/src/main/scripts/ChatSend.rs2asm @@ -0,0 +1,159 @@ +.id 5517 +.int_stack_count 4 +.string_stack_count 1 +.int_var_count 4 +.string_var_count 2 + get_varbit 4394 + iconst 1 + if_icmpeq LABEL4 + jump LABEL23 +LABEL4: + iload 0 + iconst 1 + if_icmpeq LABEL8 + jump LABEL16 +LABEL8: + chat_playername + sconst ": " + sconst "" + sload 0 + sconst "" + join_string 5 + mes + jump LABEL23 +LABEL16: + chat_playername + sconst ": " + sconst "" + sload 0 + sconst "" + join_string 5 + mes +LABEL23: + iload 3 + iconst -1 + if_icmpne LABEL27 + jump LABEL33 +LABEL27: + iload 3 + iconst 4 + if_icmple LABEL31 + jump LABEL33 +LABEL31: + iload 3 + set_varc_int 945 +LABEL33: + iload 2 + iconst 1 + if_icmpeq LABEL37 + jump LABEL75 +LABEL37: + get_varc_int 945 + switch + 1: LABEL40 + 2: LABEL61 + 3: LABEL66 + 4: LABEL71 + jump LABEL75 +LABEL40: + iconst 2 + istore 0 + sload 0 + string_length + iconst 0 + if_icmpgt LABEL47 + jump LABEL60 +LABEL47: + sload 0 + iconst 0 + iconst 1 + substring + sconst "/" + compare + iconst 1 + if_icmpeq LABEL56 + jump LABEL60 +LABEL56: + sconst "/" + sload 0 + append + sstore 0 +LABEL60: + jump LABEL75 +LABEL61: + iconst 3 + iconst 0 + istore 1 + istore 0 + jump LABEL75 +LABEL66: + iconst 4 + iconst 0 + istore 1 + istore 0 + jump LABEL75 +LABEL71: + iconst 3 + iconst 1 + istore 1 + istore 0 +LABEL75: + sload 0 ; load input + iload 0 ; load chat type + iload 1 ; load clan target + sconst "chatboxInput" ; event name + runelite_callback ; invoke callback + pop_int ; pop clan target + pop_int ; pop chat type + string_length ; get string length of chat message + iconst 0 ; load 0 + if_icmpne CONTINUE ; if length is not 0, continue + return +CONTINUE: + sconst "" + sstore 1 + iload 0 + iconst 2 + if_icmpeq LABEL87 + iload 0 + iconst 3 + if_icmpeq LABEL87 + iload 0 + iconst 4 + if_icmpeq LABEL87 + jump LABEL109 +LABEL87: + sload 0 + invoke 5501 + iconst 1 + if_icmpeq LABEL92 + jump LABEL96 +LABEL92: + sload 0 + invoke 632 + sstore 0 + sstore 1 +LABEL96: + iload 1 + iconst 1 + if_icmpeq LABEL100 + jump LABEL104 +LABEL100: + sconst "|" + sload 0 + append + sstore 0 +LABEL104: + sload 0 + iload 0 + iload 1 + chat_sendclan + jump LABEL112 +LABEL109: + sload 0 + iload 0 + chat_sendpublic +LABEL112: + clientclock + set_varc_int 61 + return diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm index 0cdc0e3730..53a08ad34f 100644 --- a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm @@ -381,7 +381,7 @@ LABEL344: jump LABEL566 LABEL350: iload 12 - chat_gethistoryex_byuid + 5031 istore 15 sstore 2 ; timestamp istore 14 @@ -413,11 +413,11 @@ CHAT_FILTER: jump LABEL562 LABEL368: iload 12 ; message uid - sload 2 ; message timestamp + sload 2 ; message timestamp sconst "chatMessageBuilding" runelite_callback - pop_int - sstore 2 ; message timestamp + pop_int + sstore 2 ; message timestamp iload 18 switch 3: LABEL371 diff --git a/runelite-client/src/main/scripts/ChatboxInput.hash b/runelite-client/src/main/scripts/ChatboxInput.hash deleted file mode 100644 index 068042f3ab..0000000000 --- a/runelite-client/src/main/scripts/ChatboxInput.hash +++ /dev/null @@ -1 +0,0 @@ -F7D45F13B835E5F5B889D4ECF3A4A61829794BAB447B7FFE676B19659238DAA9 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatboxInput.rs2asm b/runelite-client/src/main/scripts/ChatboxInput.rs2asm deleted file mode 100644 index 293cb8d4ad..0000000000 --- a/runelite-client/src/main/scripts/ChatboxInput.rs2asm +++ /dev/null @@ -1,65 +0,0 @@ -.id 96 -.int_stack_count 1 -.string_stack_count 1 -.int_var_count 1 -.string_var_count 1 - sload 0 ; load input - iload 0 ; load chat type - 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 CONTINUE ; if length is not 0, continue - return -CONTINUE: - get_varbit 4394 - iconst 1 - if_icmpeq LABEL4 - jump LABEL24 -LABEL4: - iload 0 - iconst 1 - if_icmpeq LABEL8 - jump LABEL16 -LABEL8: - chat_playername - sconst ": " - sconst "" - sload 0 - sconst "" - join_string 5 - mes - jump LABEL23 -LABEL16: - chat_playername - sconst ": " - sconst "" - sload 0 - sconst "" - join_string 5 - mes -LABEL23: - jump LABEL39 -LABEL24: - iload 0 - iconst 3 - if_icmpeq LABEL31 - iload 0 - iconst 4 - if_icmpeq LABEL31 - jump LABEL36 -LABEL31: - sload 0 - iload 0 - iconst 0 - chat_sendclan - jump LABEL39 -LABEL36: - sload 0 - iload 0 - chat_sendpublic -LABEL39: - clientclock - set_varc_int 61 - return diff --git a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash index 13638f4e91..5bce54b6ad 100644 --- a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash +++ b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash @@ -1 +1 @@ -F62AC1D5CB6A0C94DFCAEB8E4DC62E3513D0A757CADFDE2B1FF4418AF18AE841 \ No newline at end of file +E4001956B7EAAB914D97C392358D20A95B1EFD929278D8CBC380C7354418D345 \ 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 7656454e47..f5174ac072 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 LABEL155 + jump LABEL184 LABEL42: invoke 3160 iconst 1 @@ -69,16 +69,56 @@ LABEL51: join_string 2 sstore 2 LABEL59: + get_varc_int 945 + switch + 1: LABEL62 + 2: LABEL67 + 3: LABEL72 + 4: LABEL77 + jump LABEL88 +LABEL62: + sload 2 + sconst " (channel)" + append + sstore 2 + jump LABEL88 +LABEL67: + sload 2 + sconst " (clan)" + append + sstore 2 + jump LABEL88 +LABEL72: + sload 2 + sconst " (guest clan)" + append + sstore 2 + jump LABEL88 +LABEL77: + invoke 5262 + iconst 1 + if_icmpeq LABEL81 + jump LABEL86 +LABEL81: + sload 2 + sconst " (group)" + append + sstore 2 + jump LABEL88 +LABEL86: + iconst 0 + set_varc_int 945 +LABEL88: iload 4 iconst 1 - if_icmpeq LABEL63 - jump LABEL67 -LABEL63: + if_icmpeq LABEL92 + jump LABEL96 +LABEL92: sload 2 sconst "" append sstore 2 -LABEL67: +LABEL96: sload 2 sconst ": " sload 0 @@ -89,9 +129,9 @@ LABEL67: sstore 2 iload 2 iconst 80 - if_icmplt LABEL79 - jump LABEL86 -LABEL79: + if_icmplt LABEL108 + jump LABEL115 +LABEL108: sload 2 sload 0 sconst "*" @@ -99,7 +139,7 @@ LABEL79: join_string 3 append sstore 2 -LABEL86: +LABEL115: sload 2 iconst 2147483647 iconst 495 @@ -107,9 +147,9 @@ LABEL86: istore 3 iload 4 iconst 1 - if_icmpeq LABEL95 - jump LABEL112 -LABEL95: + if_icmpeq LABEL124 + jump LABEL141 +LABEL124: iconst 60 iconst 5 iload 3 @@ -126,8 +166,8 @@ LABEL95: iconst 2 iconst 10616868 if_setposition - jump LABEL124 -LABEL112: + jump LABEL153 +LABEL141: iconst 0 iconst 30 iconst 0 @@ -140,26 +180,26 @@ LABEL112: iconst 2 iconst 10616868 if_setposition -LABEL124: +LABEL153: iload 3 iconst 10616887 if_getwidth - if_icmpgt LABEL129 - jump LABEL135 -LABEL129: + if_icmpgt LABEL158 + jump LABEL164 +LABEL158: iconst 2 iconst 2 iconst 0 iconst 10616887 if_settextalign - jump LABEL140 -LABEL135: + jump LABEL169 +LABEL164: iconst 0 iconst 2 iconst 0 iconst 10616887 if_settextalign -LABEL140: +LABEL169: iconst 10616887 if_clearops iconst -1 @@ -174,19 +214,19 @@ LABEL140: sconst "" iconst 10616887 if_setonop - jump LABEL205 -LABEL155: + jump LABEL234 +LABEL184: invoke 3160 iconst 1 - if_icmpeq LABEL159 - jump LABEL164 -LABEL159: + if_icmpeq LABEL188 + jump LABEL193 +LABEL188: sconst "" sconst " You must set a name before you can chat." join_string 2 sstore 2 - jump LABEL172 -LABEL164: + jump LABEL201 +LABEL193: iconst 105 iconst 115 iconst 1894 @@ -195,7 +235,7 @@ LABEL164: sconst " You must set a name before you can chat." join_string 2 sstore 2 -LABEL172: +LABEL201: iconst 1 iconst 2 iconst 0 @@ -229,7 +269,7 @@ LABEL172: sconst "ii" iconst 10616887 if_setonop -LABEL205: +LABEL234: 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 ff5e4cfbf5..47fe097eda 100644 --- a/runelite-client/src/main/scripts/CommandScript.hash +++ b/runelite-client/src/main/scripts/CommandScript.hash @@ -1 +1 @@ -9D5F23C8B25B79FF2B23F6AE449EDF74645E808B67ECF0E389B626966E86B1BD \ No newline at end of file +725BA34A3D0891309D6CC3A6E7AD9AEAB331BC08E1E312606E846C607F820519 \ 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 ed0caf568d..e29269053e 100644 --- a/runelite-client/src/main/scripts/CommandScript.rs2asm +++ b/runelite-client/src/main/scripts/CommandScript.rs2asm @@ -1,7 +1,7 @@ .id 73 .int_stack_count 2 .string_stack_count 0 -.int_var_count 8 +.int_var_count 10 .string_var_count 0 iconst 10616885 if_gethide @@ -83,82 +83,86 @@ LABEL60: istore 6 iconst -1 istore 7 + iconst 0 + istore 8 + iconst -1 + istore 9 iload 0 iconst 84 - if_icmpeq LABEL72 - jump LABEL421 -LABEL72: + if_icmpeq LABEL76 + jump LABEL740 +LABEL76: invoke 1984 iload 2 iconst 0 - if_icmpgt LABEL77 - jump LABEL420 -LABEL77: + if_icmpgt LABEL81 + jump LABEL739 +LABEL81: iload 3 iconst 1 - if_icmpeq LABEL81 - jump LABEL148 -LABEL81: + if_icmpeq LABEL85 + jump LABEL152 +LABEL85: sconst "give" iload 2 invoke 4481 iconst 1 - if_icmpeq LABEL87 - jump LABEL91 -LABEL87: + if_icmpeq LABEL91 + jump LABEL95 +LABEL91: get_varc_string 335 string_length istore 2 - jump LABEL148 -LABEL91: + jump LABEL152 +LABEL95: sconst "set" iload 2 invoke 4481 iconst 1 - if_icmpeq LABEL97 - jump LABEL101 -LABEL97: + if_icmpeq LABEL101 + jump LABEL105 +LABEL101: get_varc_string 335 string_length istore 2 - jump LABEL148 -LABEL101: + jump LABEL152 +LABEL105: sconst "get" iload 2 invoke 4481 iconst 1 - if_icmpeq LABEL107 - jump LABEL111 -LABEL107: + if_icmpeq LABEL111 + jump LABEL115 +LABEL111: get_varc_string 335 string_length istore 2 - jump LABEL148 -LABEL111: + jump LABEL152 +LABEL115: sconst "tele" iload 2 invoke 4481 iconst 1 - if_icmpeq LABEL117 - jump LABEL121 -LABEL117: + if_icmpeq LABEL121 + jump LABEL125 +LABEL121: get_varc_string 335 string_length istore 2 - jump LABEL148 -LABEL121: + jump LABEL152 +LABEL125: sconst "~" iload 2 invoke 4481 iconst 1 - if_icmpeq LABEL127 - jump LABEL131 -LABEL127: + if_icmpeq LABEL131 + jump LABEL135 +LABEL131: get_varc_string 335 string_length istore 2 - jump LABEL148 -LABEL131: + jump LABEL152 +LABEL135: get_varc_string 335 sconst "::" iconst 0 @@ -166,9 +170,9 @@ LABEL131: istore 7 iload 7 iconst 0 - if_icmpgt LABEL140 - jump LABEL148 -LABEL140: + if_icmpgt LABEL144 + jump LABEL152 +LABEL144: get_varc_string 335 iload 7 iload 2 @@ -177,330 +181,682 @@ LABEL140: get_varc_string 335 string_length istore 2 -LABEL148: +LABEL152: get_varc_string 335 sconst "::" iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL155 - jump LABEL158 -LABEL155: + if_icmpeq LABEL159 + jump LABEL162 +LABEL159: iconst 1 istore 4 - jump LABEL171 -LABEL158: + jump LABEL175 +LABEL162: get_varc_int 41 iconst 5 - if_icmpeq LABEL162 - jump LABEL165 -LABEL162: + if_icmpeq LABEL166 + jump LABEL169 +LABEL166: iconst 41 istore 5 - jump LABEL171 -LABEL165: + jump LABEL175 +LABEL169: get_varc_int 41 iconst 4 - if_icmpeq LABEL169 - jump LABEL171 -LABEL169: + if_icmpeq LABEL173 + jump LABEL175 +LABEL173: iconst 9 istore 5 -LABEL171: +LABEL175: + get_varc_string 335 + sconst "////" + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL182 + jump LABEL210 +LABEL182: + invoke 5262 + iconst 1 + if_icmpeq LABEL186 + jump LABEL210 +LABEL186: + iconst 4 + iconst 41 + iconst 1 + istore 8 + istore 5 + istore 6 + get_varc_string 335 + sconst "////@" + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL199 + jump LABEL203 +LABEL199: + iconst 4 + istore 9 + iconst 5 + istore 6 +LABEL203: + get_varbit 13120 + iconst 1 + if_icmpeq LABEL207 + jump LABEL209 +LABEL207: + iconst 4 + istore 9 +LABEL209: + jump LABEL458 +LABEL210: get_varc_string 335 sconst "///" iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL185 + if_icmpeq LABEL231 get_varc_string 335 lowercase sconst "/g " iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL185 - jump LABEL190 -LABEL185: + if_icmpeq LABEL231 + get_varc_string 335 + lowercase + sconst "/@g " + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL231 + jump LABEL260 +LABEL231: iconst 3 iconst 44 istore 5 istore 6 - jump LABEL226 -LABEL190: + get_varc_string 335 + sconst "///@" + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL249 + get_varc_string 335 + lowercase + sconst "/@g " + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL249 + jump LABEL253 +LABEL249: + iconst 3 + istore 9 + iconst 4 + istore 6 +LABEL253: + get_varbit 13120 + iconst 1 + if_icmpeq LABEL257 + jump LABEL259 +LABEL257: + iconst 3 + istore 9 +LABEL259: + jump LABEL458 +LABEL260: get_varc_string 335 sconst "//" iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL197 - jump LABEL202 -LABEL197: + if_icmpeq LABEL267 + jump LABEL289 +LABEL267: iconst 2 iconst 41 istore 5 istore 6 - jump LABEL226 -LABEL202: + get_varc_string 335 + sconst "//@" + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL278 + jump LABEL282 +LABEL278: + iconst 2 + istore 9 + iconst 3 + istore 6 +LABEL282: + get_varbit 13120 + iconst 1 + if_icmpeq LABEL286 + jump LABEL288 +LABEL286: + iconst 2 + istore 9 +LABEL288: + jump LABEL458 +LABEL289: get_varc_string 335 lowercase sconst "/c " iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL210 - jump LABEL215 -LABEL210: + if_icmpeq LABEL304 + get_varc_string 335 + lowercase + sconst "/@c " + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL304 + jump LABEL326 +LABEL304: iconst 3 iconst 41 istore 5 istore 6 - jump LABEL226 -LABEL215: + get_varc_string 335 + sconst "/@c " + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL315 + jump LABEL319 +LABEL315: + iconst 2 + istore 9 + iconst 4 + istore 6 +LABEL319: + get_varbit 13120 + iconst 1 + if_icmpeq LABEL323 + jump LABEL325 +LABEL323: + iconst 2 + istore 9 +LABEL325: + jump LABEL458 +LABEL326: + invoke 5262 + iconst 1 + if_icmpeq LABEL330 + jump LABEL369 +LABEL330: + get_varc_string 335 + lowercase + sconst "/i " + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL345 + get_varc_string 335 + lowercase + sconst "/@i " + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL345 + jump LABEL369 +LABEL345: + iconst 3 + iconst 41 + iconst 1 + istore 8 + istore 5 + istore 6 + get_varc_string 335 + sconst "/@i " + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL358 + jump LABEL362 +LABEL358: + iconst 4 + istore 9 + iconst 4 + istore 6 +LABEL362: + get_varbit 13120 + iconst 1 + if_icmpeq LABEL366 + jump LABEL368 +LABEL366: + iconst 4 + istore 9 +LABEL368: + jump LABEL458 +LABEL369: + get_varc_string 335 + lowercase + sconst "/f " + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL383 + get_varc_string 335 + sconst "/@f " + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL383 + jump LABEL405 +LABEL383: + iconst 3 + iconst 9 + istore 5 + istore 6 + get_varc_string 335 + sconst "/@f " + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL394 + jump LABEL398 +LABEL394: + iconst 1 + istore 9 + iconst 4 + istore 6 +LABEL398: + get_varbit 13120 + iconst 1 + if_icmpeq LABEL402 + jump LABEL404 +LABEL402: + iconst 1 + istore 9 +LABEL404: + jump LABEL458 +LABEL405: + get_varc_string 335 + lowercase + sconst "/p " + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL419 + get_varc_string 335 + sconst "/@p " + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL419 + jump LABEL441 +LABEL419: + iconst 3 + iconst 2 + istore 5 + istore 6 + get_varc_string 335 + sconst "/@p " + iconst 0 + string_indexof_string + iconst 0 + if_icmpeq LABEL430 + jump LABEL434 +LABEL430: + iconst 0 + istore 9 + iconst 4 + istore 6 +LABEL434: + get_varbit 13120 + iconst 1 + if_icmpeq LABEL438 + jump LABEL440 +LABEL438: + iconst 0 + istore 9 +LABEL440: + jump LABEL458 +LABEL441: get_varc_string 335 sconst "/" iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL222 - jump LABEL226 -LABEL222: + if_icmpeq LABEL448 + jump LABEL458 +LABEL448: iconst 1 iconst 9 istore 5 istore 6 -LABEL226: - iload 6 ; prefix length - iload 5 ; chat type - sconst "preChatSendpublic" - runelite_callback - istore 5 ; chat type - istore 6 ; prefix length - get_varc_string 335 ; load input string - string_length ; get length - iconst 0 ; load 0 - if_icmpeq LABEL420 ; if (%varcstring355 == 0) jump to script223 call + get_varbit 13120 + iconst 1 + if_icmpeq LABEL456 + jump LABEL458 +LABEL456: + iconst 1 + istore 9 +LABEL458: iload 5 iconst 44 - if_icmpeq LABEL230 - jump LABEL260 -LABEL230: + if_icmpeq LABEL462 + jump LABEL495 +LABEL462: activeclansettings_find_listened iconst 1 - if_icmpeq LABEL234 - jump LABEL257 -LABEL234: + if_icmpeq LABEL466 + jump LABEL492 +LABEL466: activeclanchannel_find_listened iconst 1 - if_icmpeq LABEL238 - jump LABEL257 -LABEL238: + if_icmpeq LABEL470 + jump LABEL492 +LABEL470: iload 2 iload 6 - if_icmple LABEL242 - jump LABEL243 -LABEL242: + if_icmple LABEL474 + jump LABEL475 +LABEL474: return -LABEL243: +LABEL475: activeclansettings_getallowunaffined iconst 1 - if_icmpeq LABEL247 - jump LABEL254 -LABEL247: + if_icmpeq LABEL479 + jump LABEL489 +LABEL479: get_varc_string 335 iload 6 iload 2 substring iconst 4 - invoke 96 - jump LABEL256 -LABEL254: + iconst 0 + iconst 0 + iload 9 + invoke 5517 + jump LABEL491 +LABEL489: sconst "Guests are not invited to speak in this clan's channel." mes -LABEL256: - jump LABEL259 -LABEL257: +LABEL491: + jump LABEL494 +LABEL492: sconst "You are not chatting as a guest in a clan channel at the moment." mes -LABEL259: - jump LABEL416 -LABEL260: +LABEL494: + jump LABEL735 +LABEL495: iload 5 iconst 41 - if_icmpeq LABEL264 - jump LABEL307 -LABEL264: + if_icmpeq LABEL499 + jump LABEL580 +LABEL499: + iload 8 + iconst 0 + if_icmpeq LABEL503 + jump LABEL546 +LABEL503: iconst 0 activeclanchannel_find_affined iconst 1 - if_icmpeq LABEL269 - jump LABEL304 -LABEL269: + if_icmpeq LABEL508 + jump LABEL546 +LABEL508: get_varbit 931 iconst 0 - if_icmpeq LABEL273 - jump LABEL301 -LABEL273: + if_icmpeq LABEL512 + jump LABEL543 +LABEL512: iload 2 iload 6 - if_icmple LABEL277 - jump LABEL278 -LABEL277: + if_icmple LABEL516 + jump LABEL517 +LABEL516: return -LABEL278: +LABEL517: chat_playername removetags activeclanchannel_getuserslot istore 7 iload 7 iconst -1 - if_icmpne LABEL286 - jump LABEL298 -LABEL286: + if_icmpne LABEL525 + jump LABEL540 +LABEL525: iload 7 activeclanchannel_getuserrank activeclanchannel_getranktalk - if_icmpge LABEL291 - jump LABEL298 -LABEL291: + if_icmpge LABEL530 + jump LABEL540 +LABEL530: get_varc_string 335 iload 6 iload 2 substring iconst 3 - invoke 96 - jump LABEL300 -LABEL298: + iconst 0 + iconst 0 + iload 9 + invoke 5517 + jump LABEL542 +LABEL540: sconst "You do not have the required rank to talk in the clan's channel." mes -LABEL300: - jump LABEL303 -LABEL301: +LABEL542: + jump LABEL545 +LABEL543: sconst "You have muted your clan's channel. Unmute it if you wish to talk in it." mes -LABEL303: - jump LABEL306 -LABEL304: - sconst "You are not chatting in the channel of your own clan at the moment." - mes -LABEL306: - jump LABEL416 -LABEL307: - iload 5 - iconst 9 - if_icmpeq LABEL311 - jump LABEL342 -LABEL311: - clan_getchatcount - iconst 0 - if_icmpgt LABEL315 - jump LABEL338 -LABEL315: +LABEL545: + jump LABEL579 +LABEL546: + iload 8 + iconst 1 + if_icmpeq LABEL550 + jump LABEL570 +LABEL550: + iconst 1 + activeclanchannel_find_affined + iconst 1 + if_icmpeq LABEL555 + jump LABEL570 +LABEL555: iload 2 iload 6 - if_icmple LABEL319 - jump LABEL320 -LABEL319: + if_icmple LABEL559 + jump LABEL560 +LABEL559: return -LABEL320: +LABEL560: + get_varc_string 335 + iload 6 + iload 2 + substring + iconst 3 + iconst 1 + iconst 0 + iload 9 + invoke 5517 + jump LABEL579 +LABEL570: + iload 8 + iconst 1 + if_icmpeq LABEL574 + jump LABEL577 +LABEL574: + sconst "You are not chatting in the channel of your Iron Group at the moment." + mes + jump LABEL579 +LABEL577: + sconst "You are not chatting in the channel of your own clan at the moment." + mes +LABEL579: + jump LABEL735 +LABEL580: + iload 5 + iconst 9 + if_icmpeq LABEL584 + jump LABEL633 +LABEL584: + clan_getchatcount + iconst 0 + if_icmpgt LABEL588 + jump LABEL626 +LABEL588: + iload 2 + iload 6 + if_icmple LABEL592 + jump LABEL593 +LABEL592: + return +LABEL593: get_varbit 4394 iconst 1 - if_icmpeq LABEL324 - jump LABEL326 -LABEL324: + if_icmpeq LABEL597 + jump LABEL599 +LABEL597: clan_leavechat - jump LABEL337 -LABEL326: + jump LABEL625 +LABEL599: iload 6 iconst 1 - if_icmplt LABEL330 - jump LABEL334 -LABEL330: + if_icmplt LABEL603 + jump LABEL608 +LABEL603: sconst "/" get_varc_string 335 append set_varc_string 335 -LABEL334: + jump LABEL619 +LABEL608: + iload 6 + iconst 3 + if_icmpge LABEL612 + jump LABEL619 +LABEL612: + sconst "/" + get_varc_string 335 + iload 6 + iload 2 + substring + append + set_varc_string 335 +LABEL619: get_varc_string 335 iconst 2 - invoke 96 -LABEL337: - jump LABEL341 -LABEL338: + iconst -1 + iconst 0 + iload 9 + invoke 5517 +LABEL625: + jump LABEL632 +LABEL626: get_varc_string 335 iconst 0 - invoke 96 -LABEL341: - jump LABEL416 -LABEL342: + iconst -1 + iconst 0 + iconst -1 + invoke 5517 +LABEL632: + jump LABEL735 +LABEL633: + iload 5 + iconst 2 + if_icmpeq LABEL637 + jump LABEL652 +LABEL637: + iload 2 + iload 6 + if_icmple LABEL641 + jump LABEL642 +LABEL641: + return +LABEL642: + get_varc_string 335 + iload 6 + iload 2 + substring + iconst 0 + iconst -1 + iconst 0 + iload 9 + invoke 5517 + jump LABEL735 +LABEL652: iload 4 iconst 1 - if_icmpeq LABEL346 - jump LABEL413 -LABEL346: + if_icmpeq LABEL656 + jump LABEL729 +LABEL656: iload 2 iconst 2 - if_icmpgt LABEL350 - jump LABEL409 -LABEL350: + if_icmpgt LABEL660 + jump LABEL722 +LABEL660: get_varc_string 335 sconst "::toggleroof" iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL357 - jump LABEL371 -LABEL357: + if_icmpeq LABEL667 + jump LABEL681 +LABEL667: getremoveroofs iconst 1 - if_icmpeq LABEL361 - jump LABEL366 -LABEL361: + if_icmpeq LABEL671 + jump LABEL676 +LABEL671: iconst 0 setremoveroofs sconst "Roofs will only be removed selectively." mes - jump LABEL370 -LABEL366: + jump LABEL680 +LABEL676: iconst 1 setremoveroofs sconst "Roofs are now all hidden." mes -LABEL370: - jump LABEL408 -LABEL371: +LABEL680: + jump LABEL721 +LABEL681: get_varc_string 335 sconst "::wiki " iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL383 + if_icmpeq LABEL693 get_varc_string 335 sconst "::wiki" compare iconst 0 - if_icmpeq LABEL383 + if_icmpeq LABEL693 sconst "runeliteCommand" ; load callback name runelite_callback ; invoke callback - jump LABEL386 -LABEL383: + jump LABEL696 +LABEL693: get_varc_string 335 invoke 3299 - jump LABEL408 -LABEL386: + jump LABEL721 +LABEL696: get_varc_string 335 sconst "::bank" iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL393 - jump LABEL397 -LABEL393: + if_icmpeq LABEL703 + jump LABEL710 +LABEL703: sconst "Hey, everyone, I just tried to do something very silly!" iconst 0 - invoke 96 - jump LABEL408 -LABEL397: + iconst -1 + iconst 0 + iconst -1 + invoke 5517 + jump LABEL721 +LABEL710: get_varc_string 335 invoke 224 set_varc_string 335 @@ -512,91 +868,97 @@ LABEL397: iload 2 substring docheat -LABEL408: - jump LABEL412 -LABEL409: +LABEL721: + jump LABEL728 +LABEL722: get_varc_string 335 iconst 0 - invoke 96 -LABEL412: - jump LABEL416 -LABEL413: + iconst -1 + iconst 0 + iconst -1 + invoke 5517 +LABEL728: + jump LABEL735 +LABEL729: get_varc_string 335 iconst 0 - invoke 96 -LABEL416: + iconst -1 + iconst 1 + iload 9 + invoke 5517 +LABEL735: get_varc_string 335 invoke 77 sconst "" set_varc_string 335 -LABEL420: - jump LABEL496 -LABEL421: +LABEL739: + jump LABEL815 +LABEL740: iload 0 iconst 104 - if_icmpeq LABEL425 - jump LABEL431 -LABEL425: + if_icmpeq LABEL744 + jump LABEL750 +LABEL744: iload 3 iconst 1 - if_icmpeq LABEL429 - jump LABEL430 -LABEL429: + if_icmpeq LABEL748 + jump LABEL749 +LABEL748: invoke 75 -LABEL430: - jump LABEL496 -LABEL431: +LABEL749: + jump LABEL815 +LABEL750: iload 0 iconst 105 - if_icmpeq LABEL435 - jump LABEL441 -LABEL435: + if_icmpeq LABEL754 + jump LABEL760 +LABEL754: iload 3 iconst 1 - if_icmpeq LABEL439 - jump LABEL440 -LABEL439: + if_icmpeq LABEL758 + jump LABEL759 +LABEL758: invoke 76 -LABEL440: - jump LABEL496 -LABEL441: +LABEL759: + jump LABEL815 +LABEL760: iload 0 iconst 80 - if_icmpeq LABEL445 - jump LABEL490 -LABEL445: + if_icmpeq LABEL764 + jump LABEL809 +LABEL764: iconst 40697936 iconst 1 cc_find iconst 1 - if_icmpeq LABEL451 - jump LABEL452 -LABEL451: + if_icmpeq LABEL770 + jump LABEL771 +LABEL770: return -LABEL452: +LABEL771: get_varc_string 356 string_length iconst 0 - if_icmpgt LABEL457 - jump LABEL477 -LABEL457: + if_icmpgt LABEL776 + jump LABEL796 +LABEL776: get_varc_string 356 friend_test iconst 1 - if_icmpeq LABEL462 - jump LABEL465 -LABEL462: + if_icmpeq LABEL781 + jump LABEL784 +LABEL781: get_varc_string 356 invoke 107 return -LABEL465: +LABEL784: get_varc_int 60 clientclock - if_icmpgt LABEL469 - jump LABEL470 -LABEL469: + if_icmpgt LABEL788 + jump LABEL789 +LABEL788: return -LABEL470: +LABEL789: clientclock iconst 50 add @@ -604,14 +966,14 @@ LABEL470: sconst "That player was not found on your Friends list." mes return -LABEL477: +LABEL796: get_varc_int 60 clientclock - if_icmpgt LABEL481 - jump LABEL482 -LABEL481: + if_icmpgt LABEL800 + jump LABEL801 +LABEL800: return -LABEL482: +LABEL801: clientclock iconst 50 add @@ -619,8 +981,8 @@ LABEL482: sconst "You haven't received any messages to which you can reply." mes return - jump LABEL496 -LABEL490: + jump LABEL815 +LABEL809: get_varc_string 335 iconst 0 iload 0 @@ -632,9 +994,9 @@ LABEL490: runelite_callback ; if_icmpeq SKIPSETVARC ; skip setting varc with input set_varc_string 335 - jump LABEL496 ; jump over SKIPSETVARC + jump LABEL815 ; jump over SKIPSETVARC SKIPSETVARC: pop_string ; pop message -LABEL496: +LABEL815: invoke 223 return diff --git a/runelite-client/src/main/scripts/FriendsChatSendKick.hash b/runelite-client/src/main/scripts/FriendsChatSendKick.hash index af362b7e58..d365cbedb2 100644 --- a/runelite-client/src/main/scripts/FriendsChatSendKick.hash +++ b/runelite-client/src/main/scripts/FriendsChatSendKick.hash @@ -1 +1 @@ -5A68D15CBC52892CD84A0961CC0D5A84B653B4320F0AA3B11E80EE0D2126B584 \ No newline at end of file +2B0FFE1ECCE5F46FFA036D3BD2CEC46530410E5DE7B2F688A2C22D75706A7089 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm b/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm index cffc56f643..8575db9804 100644 --- a/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm +++ b/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm @@ -18,7 +18,10 @@ LABEL4: LABEL7: sconst "-Attempting to kick player from chat-channel..." iconst 2 - invoke 96 + iconst -1 + iconst 0 + iconst -1 + invoke 5517 sload 0 clan_kickuser RETURN: