diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java index 55183e9dff..1a274d664c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java @@ -342,8 +342,7 @@ public class FriendNotesPlugin extends Plugin switch (event.getEventName()) { - case "friend_cc_settext": - case "ignore_cc_settext": + case "friendsChatSetText": String[] stringStack = client.getStringStack(); int stringStackSize = client.getStringStackSize(); final String rsn = stringStack[stringStackSize - 1]; @@ -354,8 +353,7 @@ public class FriendNotesPlugin extends Plugin stringStack[stringStackSize - 1] = rsn + " "; } break; - case "friend_cc_setposition": - case "ignore_cc_setposition": + case "friendsChatSetPosition": if (currentlyLayouting == null || getFriendNote(currentlyLayouting) == null) { return; diff --git a/runelite-client/src/main/scripts/ChatboxInput.rs2asm b/runelite-client/src/main/scripts/ChatboxInput.rs2asm index 8dc98f75cc..293cb8d4ad 100644 --- a/runelite-client/src/main/scripts/ChatboxInput.rs2asm +++ b/runelite-client/src/main/scripts/ChatboxInput.rs2asm @@ -10,9 +10,9 @@ 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 + if_icmpne CONTINUE ; if length is not 0, continue return -LABEL100: +CONTINUE: get_varbit 4394 iconst 1 if_icmpeq LABEL4 diff --git a/runelite-client/src/main/scripts/FriendUpdate.rs2asm b/runelite-client/src/main/scripts/FriendUpdate.rs2asm index f2c0c75634..d9a5ac3180 100644 --- a/runelite-client/src/main/scripts/FriendUpdate.rs2asm +++ b/runelite-client/src/main/scripts/FriendUpdate.rs2asm @@ -3,10 +3,10 @@ .string_stack_count 0 .int_var_count 16 .string_var_count 2 -; callback "friend_cc_settext" +; callback "friendsChatSetText" ; Fired just before the client pops the name off the stack ; Modified by the friendnotes plugin to show the icon -; callback "friend_cc_setposition" +; callback "friendsChatSetPosition" ; Fired just before the client sets the position of "friend changed their name" icon ; Modified by the friendnotes plugin to offset the name changed icon iload 1 @@ -300,7 +300,7 @@ LABEL234: add istore 10 sload 0 - sconst "friend_cc_settext" + sconst "friendsChatSetText" runelite_callback cc_settext iconst 0 @@ -382,7 +382,7 @@ LABEL293: add iconst 0 iconst 0 - sconst "friend_cc_setposition" + sconst "friendsChatSetPosition" runelite_callback cc_setposition 1 iconst 1093 diff --git a/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm b/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm index c0b56b46a4..cffc56f643 100644 --- a/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm +++ b/runelite-client/src/main/scripts/FriendsChatSendKick.rs2asm @@ -10,6 +10,7 @@ iconst 1 if_icmpeq LABEL4 jump CONFIRM_KICK ; Jump to our new label instead + jump LABEL7 LABEL4: sconst "You can't kick players from your team during Wilderness Wars." mes @@ -20,8 +21,7 @@ LABEL7: invoke 96 sload 0 clan_kickuser - jump LABEL73 -LABEL73: +RETURN: return CONFIRM_KICK: sload 0 ; Username we are trying to kick @@ -30,5 +30,5 @@ CONFIRM_KICK: runelite_callback pop_string ; Pop username iconst 0 ; Compare against zero - if_icmpgt LABEL73 ; Early return for chatbox panel confirmation + if_icmpgt RETURN ; Early return for chatbox panel confirmation jump LABEL7 diff --git a/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm b/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm index ddb5ed62f7..b6ad617f29 100644 --- a/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm +++ b/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm @@ -3,10 +3,10 @@ .string_stack_count 0 .int_var_count 13 .string_var_count 2 -; callback "ignore_cc_settext" +; callback "friendsChatSetText" ; Fired just before the client pops the name off the stack ; Modified by the friendnotes plugin to show the icon -; callback "ignore_cc_setposition" +; callback "friendsChatSetPosition" ; Fired just before the client sets the position of "ignored person changed their name" icon ; Modified by the friendnotes plugin to offset the name changed icon iload 1 @@ -157,7 +157,7 @@ LABEL117: add istore 8 sload 0 - sconst "ignore_cc_settext" + sconst "friendsChatSetText" runelite_callback cc_settext iconst 0 @@ -216,7 +216,7 @@ LABEL117: add iconst 0 iconst 0 - sconst "ignore_cc_setposition" + sconst "friendsChatSetPosition" runelite_callback cc_setposition 1 iconst 1093 diff --git a/runelite-client/src/main/scripts/LayoutResizableStones.rs2asm b/runelite-client/src/main/scripts/LayoutResizableStones.rs2asm index f3cb81e957..e9368bc8d8 100644 --- a/runelite-client/src/main/scripts/LayoutResizableStones.rs2asm +++ b/runelite-client/src/main/scripts/LayoutResizableStones.rs2asm @@ -43,7 +43,8 @@ LABEL9: sconst "forceStackStones" ; push event name runelite_callback ; invoke callback iconst 0 ; if 0 is returned, continue normal layout - if_icmpeq LABEL49 + if_icmpne LABEL29 + jump LABEL49 LABEL29: iconst 0 iload 3 diff --git a/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm b/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm index 8fa0ed58a8..e72a736b69 100644 --- a/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm +++ b/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm @@ -9,12 +9,12 @@ iconst 0 ; load active boolean sconst "getSearchingTagTab" ; push event name runelite_callback ; invoke callback - if_icmpne LABEL2 + if_icmpne RELAYOUT ; Let layout continue if current bank tab is 0 get_varbit 4150 iconst 0 - if_icmpeq LABEL2 + if_icmpeq RELAYOUT ; Reset the current bank tab to 0 otherwise iconst 0 @@ -24,7 +24,7 @@ sconst "debug" runelite_callback -LABEL2: +RELAYOUT: iload 0 iload 1 iload 2