From a8603063bd7da6562853e4b0fb6c30dc334d2dbb Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 26 May 2021 10:53:10 +0000 Subject: [PATCH 1/3] Update Object IDs to 2021-05-26-rev196 --- runelite-api/src/main/java/net/runelite/api/NullObjectID.java | 2 -- runelite-api/src/main/java/net/runelite/api/ObjectID.java | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java index c321869be7..60d1378467 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -20303,8 +20303,6 @@ public final class NullObjectID public static final int NULL_41599 = 41599; public static final int NULL_41608 = 41608; public static final int NULL_41609 = 41609; - public static final int NULL_41610 = 41610; - public static final int NULL_41611 = 41611; public static final int NULL_41612 = 41612; public static final int NULL_41614 = 41614; public static final int NULL_41616 = 41616; diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java index 328cfcedfa..0f0ab95c07 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -21293,6 +21293,8 @@ public final class ObjectID public static final int BOXES_41605 = 41605; public static final int SIGNPOST_41606 = 41606; public static final int TABLE_41607 = 41607; + public static final int BUSH_41610 = 41610; + public static final int BUSH_41611 = 41611; public static final int RED_BARRIER_41613 = 41613; public static final int POSTER_41615 = 41615; public static final int PORTAL_41617 = 41617; From a954cb81a9859bf0f8aff510275cabf8537099d9 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 26 May 2021 10:53:10 +0000 Subject: [PATCH 2/3] Update NPC IDs to 2021-05-26-rev196 --- runelite-api/src/main/java/net/runelite/api/NpcID.java | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index d323c2c3d5..044ecfcd5e 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -9094,5 +9094,6 @@ public final class NpcID public static final int GARDENER_JAY_JR_10757 = 10757; public static final int GARDENER_JAY_JR_10758 = 10758; public static final int CLERK_10759 = 10759; + public static final int STRAY_DOG_10760 = 10760; /* This file is automatically generated. Do not edit. */ } From 62f1ba6f6e3b2f1828fef816d4d234ad2c11cecb Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 26 May 2021 10:53:13 +0000 Subject: [PATCH 3/3] Update Scripts to 2021-05-26-rev196 --- .../src/main/scripts/PrivateMessage.hash | 2 +- .../src/main/scripts/PrivateMessage.rs2asm | 120 ++++++++++-------- 2 files changed, 66 insertions(+), 56 deletions(-) diff --git a/runelite-client/src/main/scripts/PrivateMessage.hash b/runelite-client/src/main/scripts/PrivateMessage.hash index 40e5d70cc6..c9c8d6ff7f 100644 --- a/runelite-client/src/main/scripts/PrivateMessage.hash +++ b/runelite-client/src/main/scripts/PrivateMessage.hash @@ -1 +1 @@ -559DA005256EF939AA48F2B0B2B8C5D05168D50D378253DF81B0B68C20331A95 \ No newline at end of file +D6803CE58C6976B2799C6410F4F3E806D1EFD5A8263DCAE9C5BF54A4426BFFD1 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/PrivateMessage.rs2asm b/runelite-client/src/main/scripts/PrivateMessage.rs2asm index ee8c024fa3..a6ef72d6f4 100644 --- a/runelite-client/src/main/scripts/PrivateMessage.rs2asm +++ b/runelite-client/src/main/scripts/PrivateMessage.rs2asm @@ -25,7 +25,7 @@ LABEL10: iload 1 iconst 0 if_icmpgt LABEL21 - jump LABEL255 + jump LABEL265 LABEL21: get_varc_int 5 switch @@ -38,20 +38,20 @@ LABEL21: 7: LABEL110 8: LABEL116 9: LABEL124 - 10: LABEL191 - 11: LABEL247 - 12: LABEL207 - 13: LABEL225 + 10: LABEL201 + 11: LABEL257 + 12: LABEL217 + 13: LABEL235 15: LABEL124 - 16: LABEL252 - 18: LABEL247 + 16: LABEL262 + 18: LABEL257 19: LABEL110 20: LABEL124 21: LABEL124 - jump LABEL254 + jump LABEL264 LABEL24: return - jump LABEL254 + jump LABEL264 LABEL26: ignore_count iconst 0 @@ -79,7 +79,7 @@ LABEL44: get_varc_string 359 ignore_del LABEL46: - jump LABEL254 + jump LABEL264 LABEL47: friend_count iconst 0 @@ -163,14 +163,14 @@ LABEL107: clientclock set_varc_int 61 LABEL109: - jump LABEL254 + jump LABEL264 LABEL110: get_varc_string 359 invoke 212 resume_countdialog iconst 0 set_varc_int 5 - jump LABEL254 + jump LABEL264 LABEL116: get_varc_string 359 removetags @@ -179,7 +179,7 @@ LABEL116: resume_namedialog iconst 0 set_varc_int 5 - jump LABEL254 + jump LABEL264 LABEL124: get_varc_int 5 iconst 20 @@ -189,12 +189,12 @@ LABEL128: get_varc_string 359 removetags invoke 4394 - jump LABEL186 + jump LABEL196 LABEL132: get_varc_int 5 iconst 21 if_icmpeq LABEL136 - jump LABEL186 + jump LABEL196 LABEL136: get_varc_string 359 sconst "jagex" @@ -232,6 +232,16 @@ LABEL136: invoke 4191 set_varc_string 359 get_varc_string 359 + sconst "mod " + sconst " " + invoke 4191 + set_varc_string 359 + get_varc_string 359 + sconst "m0d " + sconst " " + invoke 4191 + set_varc_string 359 + get_varc_string 359 sconst "-" sconst " " invoke 4191 @@ -246,66 +256,66 @@ LABEL136: sconst " " invoke 4191 set_varc_string 359 -LABEL186: +LABEL196: get_varc_string 359 resume_stringdialog iconst 0 set_varc_int 5 - jump LABEL254 -LABEL191: + jump LABEL264 +LABEL201: get_varbit 8119 iconst 0 - if_icmpeq LABEL195 - jump LABEL201 -LABEL195: + if_icmpeq LABEL205 + jump LABEL211 +LABEL205: iconst 1 iconst 1 invoke 299 sconst "You must set a name before you can chat." mes return -LABEL201: +LABEL211: get_varc_string 359 removetags set_varc_string 362 get_varc_string 359 clan_joinchat - jump LABEL254 -LABEL207: + jump LABEL264 +LABEL217: iload 1 iconst 10 - if_icmpgt LABEL211 - jump LABEL217 -LABEL211: + if_icmpgt LABEL221 + jump LABEL227 +LABEL221: get_varc_string 359 iconst 0 iconst 9 substring sstore 0 - jump LABEL219 -LABEL217: + jump LABEL229 +LABEL227: get_varc_string 359 sstore 0 -LABEL219: +LABEL229: sload 0 lowercase chat_setmessagefilter invoke 553 invoke 84 - jump LABEL254 -LABEL225: + jump LABEL264 +LABEL235: get_varbit 8119 iconst 0 - if_icmpeq LABEL229 - jump LABEL235 -LABEL229: + if_icmpeq LABEL239 + jump LABEL245 +LABEL239: iconst 1 iconst 1 invoke 299 sconst "You must set a name before you can chat." mes return -LABEL235: +LABEL245: get_varc_string 359 iconst 0 set_varc_int 62 @@ -317,35 +327,35 @@ LABEL235: sconst "I1" iconst 10616843 if_setontimer - jump LABEL254 -LABEL247: + jump LABEL264 +LABEL257: iconst 0 iconst 1 invoke 299 return - jump LABEL254 -LABEL252: + jump LABEL264 +LABEL262: get_varc_string 359 invoke 2061 -LABEL254: - jump LABEL261 -LABEL255: +LABEL264: + jump LABEL271 +LABEL265: get_varc_int 5 switch - 16: LABEL260 - 20: LABEL258 - 21: LABEL258 - 7: LABEL258 - 8: LABEL258 - 9: LABEL258 - 15: LABEL258 - jump LABEL261 -LABEL258: + 16: LABEL270 + 20: LABEL268 + 21: LABEL268 + 7: LABEL268 + 8: LABEL268 + 9: LABEL268 + 15: LABEL268 + jump LABEL271 +LABEL268: return - jump LABEL261 -LABEL260: + jump LABEL271 +LABEL270: return -LABEL261: +LABEL271: iconst 1 iconst 1 invoke 299