diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.hash b/runelite-client/src/main/scripts/ChatSplitBuilder.hash index c2a17a7084..f44294153a 100644 --- a/runelite-client/src/main/scripts/ChatSplitBuilder.hash +++ b/runelite-client/src/main/scripts/ChatSplitBuilder.hash @@ -1 +1 @@ -F4D54D6A71A806F01FA6B823A3E75524B857E2F556E0AE55FEA0A4ABFEB603C9 \ No newline at end of file +7D996BC73BC98D9BDE8FCDC0A866021F1F217F370B35C30C5B4B0FFECD9135C0 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm index a443acbb19..f3ae3b3796 100644 --- a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm @@ -62,7 +62,7 @@ LABEL49: iconst 73 iconst 73 iload 6 - iconst 10551334 + iconst 10551390 enum if_getheight add @@ -353,7 +353,7 @@ LABEL319: get_varp 287 iconst 1 if_icmpeq LABEL329 - jump LABEL554 + jump LABEL566 LABEL329: get_varc_int 41 iconst 1337 @@ -361,24 +361,24 @@ LABEL329: get_varbit 4089 iconst 0 if_icmpeq LABEL336 - jump LABEL554 + jump LABEL566 LABEL336: iload 12 iconst -1 if_icmpne LABEL340 - jump LABEL554 + jump LABEL566 LABEL340: iload 10 iconst -1 if_icmpne LABEL344 - jump LABEL554 + jump LABEL566 LABEL344: iload 7 iload 4 sub iconst 57 if_icmplt LABEL350 - jump LABEL554 + jump LABEL566 LABEL350: iload 12 5031 @@ -397,7 +397,7 @@ LABEL350: invoke 91 iconst 1 if_icmpeq CHAT_FILTER ; Jump to our new label instead - jump LABEL550 + jump LABEL562 CHAT_FILTER: sload 0 ; Load the message iconst 1 ; Gets changed to 0 if message is blocked @@ -410,7 +410,7 @@ CHAT_FILTER: iconst 1 ; 2nd half of conditional sstore 0 ; Override the message with our filtered message if_icmpeq LABEL368 ; Check if we are building this message - jump LABEL550 + jump LABEL562 LABEL368: iload 12 ; message uid sconst "chatMessageBuilding" @@ -419,13 +419,17 @@ LABEL368: iload 18 switch 3: LABEL371 - 5: LABEL427 - 6: LABEL399 + 5: LABEL435 + 6: LABEL403 7: LABEL371 - jump LABEL464 + jump LABEL476 LABEL371: iload 7 + sload 5 sload 2 + append + sconst "" + append sload 5 sconst "splitPrivChatUsernameColor" runelite_callback @@ -453,10 +457,14 @@ LABEL371: invoke 203 add istore 7 - jump LABEL482 -LABEL399: + jump LABEL494 +LABEL403: iload 7 + sload 5 sload 2 + append + sconst "" + append sload 5 sconst "splitPrivChatUsernameColor" runelite_callback @@ -484,10 +492,14 @@ LABEL399: invoke 203 add istore 7 - jump LABEL482 -LABEL427: + jump LABEL494 +LABEL435: iload 7 + sload 5 sload 2 + append + sconst "" + append sload 5 sload 0 sconst "" @@ -509,9 +521,9 @@ LABEL427: istore 7 iload 19 iconst 0 - if_icmpeq LABEL452 - jump LABEL463 -LABEL452: + if_icmpeq LABEL464 + jump LABEL475 +LABEL464: iload 13 iconst 500 add @@ -523,9 +535,9 @@ LABEL452: sconst "1" iconst 10616832 if_setontimer -LABEL463: - jump LABEL482 -LABEL464: +LABEL475: + jump LABEL494 +LABEL476: iload 7 sload 2 sload 0 @@ -544,31 +556,31 @@ LABEL464: invoke 199 add istore 7 -LABEL482: +LABEL494: iload 10 if_clearops iload 18 iconst 3 - if_icmpeq LABEL494 + if_icmpeq LABEL506 iload 18 iconst 6 - if_icmpeq LABEL494 + if_icmpeq LABEL506 iload 18 iconst 7 - if_icmpeq LABEL494 - jump LABEL528 -LABEL494: + if_icmpeq LABEL506 + jump LABEL540 +LABEL506: iload 14 iconst 1 - if_icmpeq LABEL498 - jump LABEL503 -LABEL498: + if_icmpeq LABEL510 + jump LABEL515 +LABEL510: iconst 8 sconst "Message" iload 10 if_setop - jump LABEL511 -LABEL503: + jump LABEL523 +LABEL515: iconst 8 sconst "Add friend" iload 10 @@ -577,7 +589,7 @@ LABEL503: sconst "Add ignore" iload 10 if_setop -LABEL511: +LABEL523: iconst 10 sconst "Report" iload 10 @@ -594,13 +606,13 @@ LABEL511: sconst "is" iload 10 if_setonop - jump LABEL532 -LABEL528: + jump LABEL544 +LABEL540: iconst -1 sconst "" iload 10 if_setonop -LABEL532: +LABEL544: iconst -1 sconst "" iload 10 @@ -619,17 +631,17 @@ LABEL532: iload 9 enum istore 10 -LABEL550: +LABEL562: iload 12 chat_getprevuid istore 12 jump LABEL336 -LABEL554: +LABEL566: iload 10 iconst -1 - if_icmpne LABEL558 - jump LABEL641 -LABEL558: + if_icmpne LABEL570 + jump LABEL653 +LABEL570: iload 10 if_clearops iconst -1 @@ -656,14 +668,14 @@ LABEL558: multiply cc_find iconst 1 - if_icmpeq LABEL586 - jump LABEL590 -LABEL586: + if_icmpeq LABEL598 + jump LABEL602 +LABEL598: sconst "" cc_settext iconst 1 cc_sethide -LABEL590: +LABEL602: iconst 10682368 iload 9 iconst 4 @@ -672,14 +684,14 @@ LABEL590: add cc_find iconst 1 - if_icmpeq LABEL600 - jump LABEL604 -LABEL600: + if_icmpeq LABEL612 + jump LABEL616 +LABEL612: sconst "" cc_settext iconst 1 cc_sethide -LABEL604: +LABEL616: iconst 10682368 iload 9 iconst 4 @@ -688,14 +700,14 @@ LABEL604: add cc_find iconst 1 - if_icmpeq LABEL614 - jump LABEL618 -LABEL614: + if_icmpeq LABEL626 + jump LABEL630 +LABEL626: sconst "" cc_settext iconst 1 cc_sethide -LABEL618: +LABEL630: iconst 10682368 iload 9 iconst 4 @@ -704,12 +716,12 @@ LABEL618: add cc_find iconst 1 - if_icmpeq LABEL628 - jump LABEL630 -LABEL628: + if_icmpeq LABEL640 + jump LABEL642 +LABEL640: iconst 1 cc_sethide -LABEL630: +LABEL642: iload 9 iconst 1 add @@ -720,6 +732,6 @@ LABEL630: iload 9 enum istore 10 - jump LABEL554 -LABEL641: + jump LABEL566 +LABEL653: return diff --git a/runelite-client/src/main/scripts/LayoutResizableStones.hash b/runelite-client/src/main/scripts/LayoutResizableStones.hash index 82811973a9..31a96308cd 100644 --- a/runelite-client/src/main/scripts/LayoutResizableStones.hash +++ b/runelite-client/src/main/scripts/LayoutResizableStones.hash @@ -1 +1 @@ -877DB1B5A5AC999371A3E16052E79A613DD060A217FCEF6CB3D5611D42D780AC \ No newline at end of file +B5F4C856AEC94322FC7E2981920A8982FE331A300DD36FA0872840B7FA5A4C01 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/LayoutResizableStones.rs2asm b/runelite-client/src/main/scripts/LayoutResizableStones.rs2asm index b9c8560f76..770fbd8fce 100644 --- a/runelite-client/src/main/scripts/LayoutResizableStones.rs2asm +++ b/runelite-client/src/main/scripts/LayoutResizableStones.rs2asm @@ -20,11 +20,11 @@ 1131: LABEL9 jump LABEL244 LABEL9: - iconst 10747945 + iconst 10747996 if_getwidth iconst 33 sub - iconst 10747945 + iconst 10747996 if_getheight istore 3 istore 2 @@ -33,7 +33,7 @@ LABEL9: iconst 73 iconst 73 iload 1 - iconst 10551334 + iconst 10551390 enum if_getwidth sub @@ -48,7 +48,7 @@ LABEL9: LABEL29: iconst 0 iload 3 - iconst 10747960 + iconst 10747997 if_getheight add iconst 2 @@ -56,14 +56,14 @@ LABEL29: iconst 73 iconst 73 iload 1 - iconst 10747977 + iconst 10747998 enum if_setposition iconst 0 iload 3 iconst 2 iconst 2 - iconst 10747960 + iconst 10747997 if_setposition jump LABEL65 LABEL49: @@ -74,14 +74,14 @@ LABEL49: iconst 73 iconst 73 iload 1 - iconst 10747977 + iconst 10747998 enum if_setposition iload 2 iconst 0 iconst 2 iconst 2 - iconst 10747960 + iconst 10747997 if_setposition LABEL65: get_varbit 4084 @@ -93,7 +93,7 @@ LABEL69: iconst 73 iconst 73 iload 1 - iconst 10551330 + iconst 10551325 enum 2122 jump LABEL96 @@ -107,7 +107,7 @@ LABEL81: iconst 73 iconst 73 iload 1 - iconst 10551330 + iconst 10551325 enum 2122 jump LABEL96 @@ -116,7 +116,7 @@ LABEL89: iconst 73 iconst 73 iload 1 - iconst 10551330 + iconst 10551325 enum 2122 LABEL96: @@ -129,7 +129,7 @@ LABEL96: LABEL102: get_varbit 12986 invoke 633 - iconst 10747930 + iconst 10747925 if_sethide LABEL106: jump LABEL244 @@ -143,7 +143,7 @@ LABEL111: iconst 73 iconst 73 iload 1 - iconst 10551330 + iconst 10551325 enum 2122 jump LABEL138 @@ -157,7 +157,7 @@ LABEL123: iconst 73 iconst 73 iload 1 - iconst 10551330 + iconst 10551325 enum 2122 jump LABEL138 @@ -166,7 +166,7 @@ LABEL131: iconst 73 iconst 73 iload 1 - iconst 10551330 + iconst 10551325 enum 2122 LABEL138: @@ -179,7 +179,7 @@ LABEL138: LABEL144: get_varbit 12986 invoke 633 - iconst 10551322 + iconst 10551317 if_sethide LABEL148: jump LABEL244 @@ -193,7 +193,7 @@ LABEL153: iconst 73 iconst 73 iload 1 - iconst 10551330 + iconst 10551325 enum 2122 jump LABEL168 @@ -202,7 +202,7 @@ LABEL161: iconst 73 iconst 73 iload 1 - iconst 10551330 + iconst 10551325 enum 2122 LABEL168: @@ -217,15 +217,15 @@ LABEL169: jump LABEL180 LABEL176: iconst 1 - iconst 39387175 + iconst 39387174 if_sethide jump LABEL235 LABEL180: iconst 0 - iconst 39387175 + iconst 39387174 if_sethide iconst 1 - iconst 39387175 + iconst 39387174 2308 get_varbit 6255 switch @@ -235,38 +235,38 @@ LABEL180: jump LABEL213 LABEL189: iconst 1718 - iconst 39387177 + iconst 39387176 if_setgraphic iconst 1 sconst "Toggle single-tap mode" - iconst 39387175 + iconst 39387174 if_setop jump LABEL220 LABEL197: iconst 1717 - iconst 39387177 + iconst 39387176 if_setgraphic iconst 1 sconst "Toggle tap-to-drop mode" - iconst 39387175 + iconst 39387174 if_setop jump LABEL220 LABEL205: iconst 1716 - iconst 39387177 + iconst 39387176 if_setgraphic iconst 1 sconst "Show Keyboard" - iconst 39387175 + iconst 39387174 if_setop jump LABEL220 LABEL213: iconst 1715 - iconst 39387177 + iconst 39387176 if_setgraphic iconst 1 sconst "" - iconst 39387175 + iconst 39387174 if_setop LABEL220: get_varbit 6255 @@ -280,18 +280,18 @@ LABEL224: jump LABEL232 LABEL228: iconst 155 - iconst 39387177 + iconst 39387176 if_settrans jump LABEL235 LABEL232: iconst 0 - iconst 39387177 + iconst 39387176 if_settrans LABEL235: invoke 2581 get_varbit 6254 invoke 633 - iconst 39387166 + iconst 39387165 if_sethide invoke 2526 pop_int diff --git a/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash b/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash index 13847a16fe..7be7e6e664 100644 --- a/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash +++ b/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash @@ -1 +1 @@ -90BE2B2F4CE3D5C7C00D2ECF6D552D9A285FD08DC47DDA93E5BFE86529B01E6E \ No newline at end of file +DE7A8C35396859C56E56307E45F4C3DC35EBA1FAAEBE871FAEC01E47C479AF43 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm index 1b0029a5de..31535593c8 100644 --- a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm +++ b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm @@ -6,25 +6,25 @@ iconst 73 iconst 73 iload 1 - iconst 10551298 + iconst 10551386 enum istore 2 iconst 73 iconst 73 iload 1 - iconst 10551313 + iconst 10551388 enum istore 3 iconst 73 iconst 73 iload 1 - iconst 10551305 + iconst 10551303 enum istore 4 iconst 73 iconst 73 iload 1 - iconst 10551315 + iconst 10551311 enum istore 5 iconst 103 @@ -279,7 +279,7 @@ LABEL189: iconst 73 iconst 73 iload 1 - iconst 10551314 + iconst 10551310 enum iload 5 iload 8 @@ -291,7 +291,7 @@ LABEL268: iconst 73 iconst 73 iload 1 - iconst 10551314 + iconst 10551310 enum iload 3 iconst 0 @@ -417,7 +417,7 @@ LABEL342: iconst 73 iconst 73 iload 1 - iconst 10551314 + iconst 10551310 enum iload 5 iload 8 @@ -429,7 +429,7 @@ LABEL385: iconst 73 iconst 73 iload 1 - iconst 10551314 + iconst 10551310 enum iload 3 iconst 0 @@ -439,7 +439,7 @@ LABEL395: iconst 73 iconst 73 iload 1 - iconst 10551316 + iconst 10551312 enum istore 18 iload 18 @@ -503,7 +503,7 @@ LABEL449: iconst 73 iconst 73 iload 1 - iconst 10551318 + iconst 10551314 enum istore 18 iconst 0 @@ -518,7 +518,7 @@ LABEL463: iconst 73 iconst 73 iload 1 - iconst 10551307 + iconst 10551305 enum if_hassub iconst 1 @@ -578,7 +578,7 @@ LABEL511: iconst 73 iconst 73 iload 1 - iconst 10551307 + iconst 10551305 enum istore 18 iconst 0 @@ -617,7 +617,11 @@ LABEL539: iload 18 if_setsize LABEL545: - iload 0 + iconst 73 + iconst 73 + iload 1 + iconst 10551329 + enum iload 1 invoke 920 return