From 84a3b3ccb321f3300a22f5a9418fe50d22cfabb1 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 4 Jun 2020 07:47:57 -0600 Subject: [PATCH] Update Scripts to 2020-06-04-c1-rev182 --- .../src/main/scripts/FriendUpdate.hash | 2 +- .../src/main/scripts/FriendUpdate.rs2asm | 246 ++++++++++-------- .../src/main/scripts/IgnoreUpdate.hash | 2 +- .../src/main/scripts/IgnoreUpdate.rs2asm | 110 ++++---- 4 files changed, 198 insertions(+), 162 deletions(-) diff --git a/runelite-client/src/main/scripts/FriendUpdate.hash b/runelite-client/src/main/scripts/FriendUpdate.hash index 78f935d1bb..6027e16dfd 100644 --- a/runelite-client/src/main/scripts/FriendUpdate.hash +++ b/runelite-client/src/main/scripts/FriendUpdate.hash @@ -1 +1 @@ -6DC2945220E60445B7857ECFB97908E0B28FF0E96E533BB8DC8293DC68A986C2 \ No newline at end of file +1493BFAD37FCE6E5EFDCF0C8C9000C1BEFD6954857F520D141CB7963BCAD9D29 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/FriendUpdate.rs2asm b/runelite-client/src/main/scripts/FriendUpdate.rs2asm index 69cb250b31..f2c0c75634 100644 --- a/runelite-client/src/main/scripts/FriendUpdate.rs2asm +++ b/runelite-client/src/main/scripts/FriendUpdate.rs2asm @@ -117,7 +117,7 @@ LABEL101: iconst 1 iload 0 if_sethide - jump LABEL468 + jump LABEL484 LABEL105: iload 15 iconst -1 @@ -147,21 +147,39 @@ LABEL126: iconst 1 iload 0 if_sethide - jump LABEL468 + jump LABEL484 LABEL130: + iload 15 + iconst 0 + if_icmpeq LABEL134 + jump LABEL146 +LABEL134: + sconst "You may add friends by using the button below, or by " + sconst "right-clicking" + sconst "long pressing" + invoke 1971 + sconst " on a message from them and selecting to add them as a friend." + join_string 3 + iload 7 + if_settext + iconst 1 + iload 0 + if_sethide + jump LABEL484 +LABEL146: invoke 1972 istore 14 iload 14 iconst 1 - if_icmpeq LABEL136 - jump LABEL141 -LABEL136: + if_icmpeq LABEL152 + jump LABEL157 +LABEL152: iconst 8 iconst 5 iload 13 scale istore 13 -LABEL141: +LABEL157: sconst "" iload 7 if_settext @@ -171,71 +189,71 @@ LABEL141: 3628 get_varc_int 183 switch - 1: LABEL151 - 2: LABEL154 - 3: LABEL159 - 4: LABEL174 - 5: LABEL194 - 8: LABEL164 - 9: LABEL169 - jump LABEL213 -LABEL151: + 1: LABEL167 + 2: LABEL170 + 3: LABEL175 + 4: LABEL190 + 5: LABEL210 + 8: LABEL180 + 9: LABEL185 + jump LABEL229 +LABEL167: iconst 0 3629 - jump LABEL213 -LABEL154: + jump LABEL229 +LABEL170: iconst 1 3633 iconst 1 3630 - jump LABEL213 -LABEL159: + jump LABEL229 +LABEL175: iconst 1 3633 iconst 0 3630 - jump LABEL213 -LABEL164: + jump LABEL229 +LABEL180: iconst 1 3633 iconst 1 3632 - jump LABEL213 -LABEL169: - iconst 1 - 3633 - iconst 0 - 3632 - jump LABEL213 -LABEL174: - iconst 1 - 3633 - iconst 1 - 3636 - iconst 1 - 3631 - get_varc_int 205 - switch - 3: LABEL185 - 8: LABEL188 - 9: LABEL191 - iconst 1 - 3630 - jump LABEL193 + jump LABEL229 LABEL185: + iconst 1 + 3633 + iconst 0 + 3632 + jump LABEL229 +LABEL190: + iconst 1 + 3633 + iconst 1 + 3636 + iconst 1 + 3631 + get_varc_int 205 + switch + 3: LABEL201 + 8: LABEL204 + 9: LABEL207 + iconst 1 + 3630 + jump LABEL209 +LABEL201: iconst 0 3630 - jump LABEL193 -LABEL188: + jump LABEL209 +LABEL204: iconst 1 3632 - jump LABEL193 -LABEL191: + jump LABEL209 +LABEL207: iconst 0 3632 -LABEL193: - jump LABEL213 -LABEL194: +LABEL209: + jump LABEL229 +LABEL210: iconst 1 3633 iconst 1 @@ -244,33 +262,33 @@ LABEL194: 3631 get_varc_int 205 switch - 3: LABEL205 - 8: LABEL208 - 9: LABEL211 + 3: LABEL221 + 8: LABEL224 + 9: LABEL227 iconst 1 3630 - jump LABEL213 -LABEL205: + jump LABEL229 +LABEL221: iconst 0 3630 - jump LABEL213 -LABEL208: + jump LABEL229 +LABEL224: iconst 1 3632 - jump LABEL213 -LABEL211: + jump LABEL229 +LABEL227: iconst 0 3632 -LABEL213: +LABEL229: 3639 -LABEL214: +LABEL230: iload 9 iload 15 - if_icmplt LABEL218 - jump LABEL460 -LABEL218: + if_icmplt LABEL234 + jump LABEL476 +LABEL234: iload 9 - friend_getname + friend_getname sstore 1 sstore 0 iload 5 @@ -283,7 +301,7 @@ LABEL218: istore 10 sload 0 sconst "friend_cc_settext" - runelite_callback + runelite_callback cc_settext iconst 0 iload 13 @@ -315,24 +333,24 @@ LABEL218: istore 11 iload 11 iconst 0 - if_icmpne LABEL264 - jump LABEL271 -LABEL264: + if_icmpne LABEL280 + jump LABEL287 +LABEL280: iconst 1 sconst "Message" cc_setop iconst 2 sconst "" cc_setop - jump LABEL277 -LABEL271: + jump LABEL293 +LABEL287: iconst 1 sconst "" cc_setop iconst 2 sconst "Message" cc_setop -LABEL277: +LABEL293: iconst 3 sconst "Delete" cc_setop @@ -365,7 +383,7 @@ LABEL277: iconst 0 iconst 0 sconst "friend_cc_setposition" - runelite_callback + runelite_callback cc_setposition 1 iconst 1093 cc_setgraphic 1 @@ -374,14 +392,14 @@ LABEL277: sload 1 string_length iconst 0 - if_icmpgt LABEL318 - jump LABEL367 -LABEL318: + if_icmpgt LABEL334 + jump LABEL383 +LABEL334: iload 14 iconst 1 - if_icmpeq LABEL322 - jump LABEL336 -LABEL322: + if_icmpeq LABEL338 + jump LABEL352 +LABEL338: iconst 10 sconst "Reveal previous name" cc_setop @@ -395,8 +413,8 @@ LABEL322: sload 0 sconst "isIiiss" cc_setonop - jump LABEL364 -LABEL336: + jump LABEL380 +LABEL352: sconst "Previous name:" sconst "
" sload 1 @@ -425,11 +443,11 @@ LABEL336: sconst "null" sconst "isIiiss" cc_setonop -LABEL364: +LABEL380: iconst 0 cc_sethide 1 - jump LABEL383 -LABEL367: + jump LABEL399 +LABEL383: iconst 40 iload 8 sconst "I" @@ -446,7 +464,7 @@ LABEL367: sconst "null" sconst "isIiiss" cc_setonop -LABEL383: +LABEL399: iload 5 iconst 4 iload 10 @@ -475,20 +493,20 @@ LABEL383: cc_settextshadow iload 11 iconst 0 - if_icmpeq LABEL413 - jump LABEL418 -LABEL413: + if_icmpeq LABEL429 + jump LABEL434 +LABEL429: sconst "Offline" cc_settext iconst 16711680 cc_setcolour - jump LABEL451 -LABEL418: + jump LABEL467 +LABEL434: iload 11 map_world - if_icmpeq LABEL422 - jump LABEL430 -LABEL422: + if_icmpeq LABEL438 + jump LABEL446 +LABEL438: sconst "World " iload 11 tostring @@ -496,13 +514,13 @@ LABEL422: cc_settext iconst 901389 cc_setcolour - jump LABEL451 -LABEL430: + jump LABEL467 +LABEL446: iload 11 iconst 5000 - if_icmpgt LABEL434 - jump LABEL443 -LABEL434: + if_icmpgt LABEL450 + jump LABEL459 +LABEL450: sconst "" sconst "Classic " iload 11 @@ -511,18 +529,18 @@ LABEL434: tostring join_string 3 cc_settext - jump LABEL449 -LABEL443: + jump LABEL465 +LABEL459: sconst "" sconst "World " iload 11 tostring join_string 3 cc_settext -LABEL449: +LABEL465: iconst 16776960 cc_setcolour -LABEL451: +LABEL467: iload 9 iconst 1 add @@ -531,24 +549,24 @@ LABEL451: add istore 12 istore 9 - jump LABEL214 -LABEL460: + jump LABEL230 +LABEL476: iload 15 iconst 1 - if_icmpge LABEL464 - jump LABEL468 -LABEL464: + if_icmpge LABEL480 + jump LABEL484 +LABEL480: iload 12 iconst 5 add istore 12 -LABEL468: +LABEL484: iload 12 iload 5 if_getheight - if_icmpgt LABEL473 - jump LABEL482 -LABEL473: + if_icmpgt LABEL489 + jump LABEL498 +LABEL489: iconst 0 iload 12 iload 5 @@ -557,8 +575,8 @@ LABEL473: iload 5 get_varc_int 9 invoke 72 - jump LABEL490 -LABEL482: + jump LABEL506 +LABEL498: iconst 0 iconst 0 iload 5 @@ -567,5 +585,5 @@ LABEL482: iload 5 iconst 0 invoke 72 -LABEL490: +LABEL506: return diff --git a/runelite-client/src/main/scripts/IgnoreUpdate.hash b/runelite-client/src/main/scripts/IgnoreUpdate.hash index b10226b2e6..0ec5f1229d 100644 --- a/runelite-client/src/main/scripts/IgnoreUpdate.hash +++ b/runelite-client/src/main/scripts/IgnoreUpdate.hash @@ -1 +1 @@ -256A38E234D9D44532175F4C98AA923327EE050E23D122573426D94FBF15936E \ No newline at end of file +8FAD64F66E1F60651E501B731C7B3D97D0453A04EFDDBC9D820890263C00BD4B \ No newline at end of file diff --git a/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm b/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm index a99a72a2f1..ddb5ed62f7 100644 --- a/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm +++ b/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm @@ -79,21 +79,39 @@ LABEL63: iconst 1 iload 0 if_sethide - jump LABEL263 + jump LABEL279 LABEL67: + iload 12 + iconst 0 + if_icmpeq LABEL71 + jump LABEL83 +LABEL71: + sconst "You may ignore users by using the button below, or by " + sconst "right-clicking" + sconst "long pressing" + invoke 1971 + sconst " on a message from them and selecting to add them to your ignore list." + join_string 3 + iload 5 + if_settext + iconst 1 + iload 0 + if_sethide + jump LABEL279 +LABEL83: invoke 1972 istore 11 iload 11 iconst 1 - if_icmpeq LABEL73 - jump LABEL78 -LABEL73: + if_icmpeq LABEL89 + jump LABEL94 +LABEL89: iconst 8 iconst 5 iload 10 scale istore 10 -LABEL78: +LABEL94: sconst "" iload 5 if_settext @@ -103,31 +121,31 @@ LABEL78: 3640 get_varc_int 184 switch - 1: LABEL88 - 2: LABEL91 - 3: LABEL94 - jump LABEL96 -LABEL88: + 1: LABEL104 + 2: LABEL107 + 3: LABEL110 + jump LABEL112 +LABEL104: iconst 0 3641 - jump LABEL96 -LABEL91: + jump LABEL112 +LABEL107: iconst 1 3642 - jump LABEL96 -LABEL94: + jump LABEL112 +LABEL110: iconst 0 3642 -LABEL96: +LABEL112: 3643 -LABEL97: +LABEL113: iload 7 iload 12 - if_icmplt LABEL101 - jump LABEL255 -LABEL101: + if_icmplt LABEL117 + jump LABEL271 +LABEL117: iload 7 - ignore_getname + ignore_getname sstore 1 sstore 0 iload 3 @@ -140,7 +158,7 @@ LABEL101: istore 8 sload 0 sconst "ignore_cc_settext" - runelite_callback + runelite_callback cc_settext iconst 0 iload 10 @@ -199,7 +217,7 @@ LABEL101: iconst 0 iconst 0 sconst "ignore_cc_setposition" - runelite_callback + runelite_callback cc_setposition 1 iconst 1093 cc_setgraphic 1 @@ -208,14 +226,14 @@ LABEL101: sload 1 string_length iconst 0 - if_icmpgt LABEL181 - jump LABEL230 -LABEL181: + if_icmpgt LABEL197 + jump LABEL246 +LABEL197: iload 11 iconst 1 - if_icmpeq LABEL185 - jump LABEL199 -LABEL185: + if_icmpeq LABEL201 + jump LABEL215 +LABEL201: iconst 10 sconst "Reveal previous name" cc_setop @@ -229,8 +247,8 @@ LABEL185: sload 0 sconst "isIiiss" cc_setonop - jump LABEL227 -LABEL199: + jump LABEL243 +LABEL215: sconst "Previous name:" sconst "
" sload 1 @@ -259,11 +277,11 @@ LABEL199: sconst "null" sconst "isIiiss" cc_setonop -LABEL227: +LABEL243: iconst 0 cc_sethide 1 - jump LABEL246 -LABEL230: + jump LABEL262 +LABEL246: iconst 40 iload 6 sconst "I" @@ -280,7 +298,7 @@ LABEL230: sconst "null" sconst "isIiiss" cc_setonop -LABEL246: +LABEL262: iload 7 iconst 1 add @@ -289,24 +307,24 @@ LABEL246: add istore 9 istore 7 - jump LABEL97 -LABEL255: + jump LABEL113 +LABEL271: iload 12 iconst 1 - if_icmpge LABEL259 - jump LABEL263 -LABEL259: + if_icmpge LABEL275 + jump LABEL279 +LABEL275: iload 9 iconst 5 add istore 9 -LABEL263: +LABEL279: iload 9 iload 3 if_getheight - if_icmpgt LABEL268 - jump LABEL278 -LABEL268: + if_icmpgt LABEL284 + jump LABEL294 +LABEL284: iconst 0 iload 9 iload 3 @@ -316,8 +334,8 @@ LABEL268: iload 3 if_getscrolly invoke 72 - jump LABEL286 -LABEL278: + jump LABEL302 +LABEL294: iconst 0 iconst 0 iload 3 @@ -326,5 +344,5 @@ LABEL278: iload 3 iconst 0 invoke 72 -LABEL286: +LABEL302: return