From 01e64bc856b92fb553c5d94c28688a00e44eabf4 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Wed, 29 Jan 2020 11:39:21 +0000 Subject: [PATCH 1/7] Update 188 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 09c033aa89..b8a8c8e2f7 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ true true - 187 + 188 From c879917a08e88857ff2e312247f6630b3e3ae67d Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 29 Jan 2020 11:32:52 +0000 Subject: [PATCH 2/7] Update Item IDs to 2020-01-29-rev182 --- runelite-api/src/main/java/net/runelite/api/ItemID.java | 4 ++++ runelite-api/src/main/java/net/runelite/api/NullItemID.java | 1 + 2 files changed, 5 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java index c8eef7401a..dab946101f 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -11392,5 +11392,9 @@ public final class ItemID public static final int OPENED_COAL_BAG = 24480; public static final int OPENED_GEM_BAG = 24481; public static final int OPEN_SEED_BOX = 24482; + public static final int PHOENIX_24483 = 24483; + public static final int PHOENIX_24484 = 24484; + public static final int PHOENIX_24485 = 24485; + public static final int PHOENIX_24486 = 24486; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java index 0b4a9ee880..9f9e38d14a 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -12880,5 +12880,6 @@ public final class NullItemID public static final int NULL_24474 = 24474; public static final int NULL_24476 = 24476; public static final int NULL_24477 = 24477; + public static final int NULL_24487 = 24487; /* This file is automatically generated. Do not edit. */ } From 318406384f530744a66bdf4ecbeb87d5ad1a5cf7 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 29 Jan 2020 11:32:52 +0000 Subject: [PATCH 3/7] Update Item variations to 2020-01-29-rev182 --- runelite-client/src/main/resources/item_variations.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index 0a9609c18f..5a210b0c24 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -8692,6 +8692,13 @@ 20691, 21990 ], + "phoenix": [ + 20693, + 24483, + 24484, + 24485, + 24486 + ], "rejuvenation potion": [ 20697, 20699, From 51d1420fa9b1aa57feb17ff1cf6615f4c731025f Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 29 Jan 2020 11:32:53 +0000 Subject: [PATCH 4/7] Update NPC IDs to 2020-01-29-rev182 --- .../src/main/java/net/runelite/api/NpcID.java | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) 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 03ad0096cb..5c567f0c3e 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -235,12 +235,12 @@ public final class NpcID public static final int BUTTERFLY_238 = 238; public static final int KING_BLACK_DRAGON = 239; public static final int BLACK_DEMON = 240; - public static final int BABY_DRAGON = 241; - public static final int BABY_DRAGON_242 = 242; - public static final int BABY_DRAGON_243 = 243; - public static final int BABY_DRAGON_244 = 244; - public static final int BABY_DRAGON_245 = 245; - public static final int BABY_DRAGON_246 = 246; + public static final int BABY_BLUE_DRAGON = 241; + public static final int BABY_BLUE_DRAGON_242 = 242; + public static final int BABY_BLUE_DRAGON_243 = 243; + public static final int BABY_RED_DRAGON_244 = 244; + public static final int BABY_RED_DRAGON_245 = 245; + public static final int BABY_RED_DRAGON_246 = 246; public static final int RED_DRAGON = 247; public static final int RED_DRAGON_248 = 248; public static final int RED_DRAGON_249 = 249; @@ -1767,8 +1767,8 @@ public final class NpcID public static final int SIR_AMIK_VARZE = 1867; public static final int SIR_AMIK_VARZE_1869 = 1869; public static final int EVIL_CHICKEN = 1870; - public static final int BABY_DRAGON_1871 = 1871; - public static final int BABY_DRAGON_1872 = 1872; + public static final int BABY_BLACK_DRAGON = 1871; + public static final int BABY_BLACK_DRAGON_1872 = 1872; public static final int KKLIK = 1873; public static final int ICE_TROLL_RUNT = 1874; public static final int ICE_TROLL_MALE = 1875; @@ -2884,6 +2884,14 @@ public final class NpcID public static final int GOBLIN_3074 = 3074; public static final int GOBLIN_3075 = 3075; public static final int GOBLIN_3076 = 3076; + public static final int PHOENIX = 3077; + public static final int PHOENIX_3078 = 3078; + public static final int PHOENIX_3079 = 3079; + public static final int PHOENIX_3080 = 3080; + public static final int PHOENIX_3081 = 3081; + public static final int PHOENIX_3082 = 3082; + public static final int PHOENIX_3083 = 3083; + public static final int PHOENIX_3084 = 3084; public static final int PORTAL_3086 = 3086; public static final int PORTAL_3088 = 3088; public static final int BANKER_3089 = 3089; @@ -4864,7 +4872,7 @@ public final class NpcID public static final int CAPTAIN_LAWGOF = 5191; public static final int GOBLIN_5192 = 5192; public static final int GOBLIN_5193 = 5193; - public static final int BABY_DRAGON_5194 = 5194; + public static final int BABY_GREEN_DRAGON = 5194; public static final int GOBLIN_5195 = 5195; public static final int GOBLIN_5196 = 5196; public static final int GOBLIN_5197 = 5197; @@ -5501,8 +5509,8 @@ public final class NpcID public static final int SUMMONED_SOUL_5869 = 5869; public static final int KEY_MASTER = 5870; public static final int KING_ARTHUR_5871 = 5871; - public static final int BABY_DRAGON_5872 = 5872; - public static final int BABY_DRAGON_5873 = 5873; + public static final int BABY_GREEN_DRAGON_5872 = 5872; + public static final int BABY_GREEN_DRAGON_5873 = 5873; public static final int BLACK_DEMON_5874 = 5874; public static final int BLACK_DEMON_5875 = 5875; public static final int BLACK_DEMON_5876 = 5876; @@ -6677,7 +6685,7 @@ public final class NpcID public static final int RIFT_GUARDIAN_7365 = 7365; public static final int RIFT_GUARDIAN_7366 = 7366; public static final int RIFT_GUARDIAN_7367 = 7367; - public static final int PHOENIX = 7368; + public static final int PHOENIX_7368 = 7368; public static final int WESLEY = 7369; public static final int PHOENIX_7370 = 7370; public static final int PYROMANCER = 7371; @@ -7175,7 +7183,7 @@ public final class NpcID public static final int ERDAN = 7952; public static final int PRIMULA = 7953; public static final int MYSTERIOUS_ADVENTURER = 7954; - public static final int BABY_DRAGON_7955 = 7955; + public static final int BABY_BLACK_DRAGON_7955 = 7955; public static final int CAPTAIN_TOCK = 7956; public static final int CAPTAIN_TOCK_7957 = 7957; public static final int CAPTAIN_TOCK_7958 = 7958; From 240261cbb5c95e81add0fc5d186d17ae94af6ff6 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Wed, 29 Jan 2020 11:33:00 +0000 Subject: [PATCH 5/7] Update Scripts to 2020-01-29-rev182 Updated script does not assemble CommandScript.rs2asm --- .../src/main/scripts/CommandScript.hash | 2 +- .../src/main/scripts/CommandScript.rs2asm | 145 +++++++++--------- 2 files changed, 76 insertions(+), 71 deletions(-) diff --git a/runelite-client/src/main/scripts/CommandScript.hash b/runelite-client/src/main/scripts/CommandScript.hash index aba3b74962..77827000bf 100644 --- a/runelite-client/src/main/scripts/CommandScript.hash +++ b/runelite-client/src/main/scripts/CommandScript.hash @@ -1 +1 @@ -1E915795AFAA25E3ABE595EEAC55423C3E5E9E5CE2582AD1A5AAEC91647CC124 \ No newline at end of file +E8860FBA051B1F98771592610F056C95C509C403A16522D4D7C31AF8EA21E6D3 \ 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 bba4e32f51..87efb971c6 100644 --- a/runelite-client/src/main/scripts/CommandScript.rs2asm +++ b/runelite-client/src/main/scripts/CommandScript.rs2asm @@ -82,13 +82,13 @@ LABEL58: iload 0 iconst 84 if_icmpeq LABEL62 - jump LABEL189 + jump LABEL194 LABEL62: invoke 1984 iload 2 iconst 0 if_icmpgt LABEL67 - jump LABEL188 + jump LABEL193 LABEL67: get_varc_string 335 sconst "/" @@ -146,7 +146,7 @@ LABEL108: iconst 0 invoke 96 LABEL111: - jump LABEL184 + jump LABEL189 LABEL112: get_varc_string 335 sconst "::" @@ -154,12 +154,12 @@ LABEL112: string_indexof_string iconst 0 if_icmpeq LABEL119 - jump LABEL181 + jump LABEL186 LABEL119: iload 2 iconst 2 if_icmpgt LABEL123 - jump LABEL177 + jump LABEL182 LABEL123: get_varc_string 335 sconst "::toggleroof" @@ -185,35 +185,40 @@ LABEL139: sconst "Roofs are now all hidden." mes LABEL143: - jump LABEL176 + jump LABEL181 LABEL144: get_varc_string 335 - sconst "::wiki" + sconst "::wiki " iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL151 + if_icmpeq LABEL156 + get_varc_string 335 + sconst "::wiki" + compare + iconst 0 + if_icmpeq LABEL156 sconst "runeliteCommand" ; load callback name runelite_callback ; invoke callback - jump LABEL154 -LABEL151: + jump LABEL159 +LABEL156: get_varc_string 335 invoke 3299 - jump LABEL176 -LABEL154: + jump LABEL181 +LABEL159: get_varc_string 335 sconst "::bank" iconst 0 string_indexof_string iconst 0 - if_icmpeq LABEL161 - jump LABEL165 -LABEL161: + if_icmpeq LABEL166 + jump LABEL170 +LABEL166: sconst "Hey, everyone, I just tried to do something very silly!" iconst 0 invoke 96 - jump LABEL176 -LABEL165: + jump LABEL181 +LABEL170: get_varc_string 335 invoke 224 set_varc_string 335 @@ -225,82 +230,82 @@ LABEL165: iload 2 substring docheat -LABEL176: - jump LABEL180 -LABEL177: - get_varc_string 335 - iconst 0 - invoke 96 -LABEL180: - jump LABEL184 LABEL181: + jump LABEL185 +LABEL182: get_varc_string 335 iconst 0 invoke 96 -LABEL184: +LABEL185: + jump LABEL189 +LABEL186: + get_varc_string 335 + iconst 0 + invoke 96 +LABEL189: get_varc_string 335 invoke 77 sconst "" set_varc_string 335 -LABEL188: - jump LABEL257 -LABEL189: +LABEL193: + jump LABEL262 +LABEL194: iload 0 iconst 104 - if_icmpeq LABEL193 - jump LABEL199 -LABEL193: + if_icmpeq LABEL198 + jump LABEL204 +LABEL198: iload 3 iconst 1 - if_icmpeq LABEL197 - jump LABEL198 -LABEL197: + if_icmpeq LABEL202 + jump LABEL203 +LABEL202: invoke 75 -LABEL198: - jump LABEL257 -LABEL199: +LABEL203: + jump LABEL262 +LABEL204: iload 0 iconst 105 - if_icmpeq LABEL203 - jump LABEL209 -LABEL203: + if_icmpeq LABEL208 + jump LABEL214 +LABEL208: iload 3 iconst 1 - if_icmpeq LABEL207 - jump LABEL208 -LABEL207: + if_icmpeq LABEL212 + jump LABEL213 +LABEL212: invoke 76 -LABEL208: - jump LABEL257 -LABEL209: +LABEL213: + jump LABEL262 +LABEL214: iload 0 iconst 80 - if_icmpeq LABEL213 - jump LABEL251 -LABEL213: + if_icmpeq LABEL218 + jump LABEL256 +LABEL218: get_varc_string 356 string_length iconst 0 - if_icmpgt LABEL218 - jump LABEL238 -LABEL218: + if_icmpgt LABEL223 + jump LABEL243 +LABEL223: get_varc_string 356 friend_test iconst 1 - if_icmpeq LABEL223 - jump LABEL226 -LABEL223: + if_icmpeq LABEL228 + jump LABEL231 +LABEL228: get_varc_string 356 invoke 107 return -LABEL226: +LABEL231: get_varc_int 60 clientclock - if_icmpgt LABEL230 - jump LABEL231 -LABEL230: + if_icmpgt LABEL235 + jump LABEL236 +LABEL235: return -LABEL231: +LABEL236: clientclock iconst 50 add @@ -308,14 +313,14 @@ LABEL231: sconst "That player was not found on your Friends list." mes return -LABEL238: +LABEL243: get_varc_int 60 clientclock - if_icmpgt LABEL242 - jump LABEL243 -LABEL242: + if_icmpgt LABEL247 + jump LABEL248 +LABEL247: return -LABEL243: +LABEL248: clientclock iconst 50 add @@ -323,8 +328,8 @@ LABEL243: sconst "You haven't received any messages to which you can reply." mes return - jump LABEL257 -LABEL251: + jump LABEL262 +LABEL256: get_varc_string 335 iconst 0 iload 0 @@ -336,9 +341,9 @@ LABEL251: runelite_callback ; if_icmpeq SKIPSETVARC ; skip setting varc with input set_varc_string 335 - jump LABEL257 ; jump over SKIPSETVARC + jump LABEL262 ; jump over SKIPSETVARC SKIPSETVARC: pop_string ; pop message -LABEL257: +LABEL262: invoke 223 return From 615027b6d2ad76487e4257c3143c1787dc158b4d Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Wed, 29 Jan 2020 12:37:57 +0000 Subject: [PATCH 6/7] Release 1.6.5 --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- http-api/pom.xml | 2 +- http-service/pom.xml | 2 +- pom.xml | 4 ++-- protocol-api/pom.xml | 2 +- protocol/pom.xml | 2 +- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index a5e268a9b2..baff44929a 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.5-SNAPSHOT + 1.6.5 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index d4535e7553..eef86c20f4 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.5-SNAPSHOT + 1.6.5 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 5c9b0a8b3d..26378d916f 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.5-SNAPSHOT + 1.6.5 cache diff --git a/http-api/pom.xml b/http-api/pom.xml index c097cdc2f3..ed1372d703 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.5-SNAPSHOT + 1.6.5 Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index 1680b9c597..e542fdd5e2 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.5-SNAPSHOT + 1.6.5 Web Service diff --git a/pom.xml b/pom.xml index b8a8c8e2f7..1385863370 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.5-SNAPSHOT + 1.6.5 pom RuneLite @@ -59,7 +59,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - HEAD + runelite-parent-1.6.5 diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml index c16ec20441..81754a5131 100644 --- a/protocol-api/pom.xml +++ b/protocol-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.5-SNAPSHOT + 1.6.5 protocol-api diff --git a/protocol/pom.xml b/protocol/pom.xml index 7048bbb8ba..57bf0c7181 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.5-SNAPSHOT + 1.6.5 protocol diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 330b38132d..ee7afdf703 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.5-SNAPSHOT + 1.6.5 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 32df99d1df..9a0040155e 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.5-SNAPSHOT + 1.6.5 client diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 1915fd8edd..b7e060f963 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.5-SNAPSHOT + 1.6.5 script-assembler-plugin From 38c6478c401485897c21896218f22007d4ca9247 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Wed, 29 Jan 2020 12:38:05 +0000 Subject: [PATCH 7/7] Bump for 1.6.6-SNAPSHOT --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- http-api/pom.xml | 2 +- http-service/pom.xml | 2 +- pom.xml | 4 ++-- protocol-api/pom.xml | 2 +- protocol/pom.xml | 2 +- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index baff44929a..fa4cf3dc73 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.5 + 1.6.6-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index eef86c20f4..2312226b8d 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.5 + 1.6.6-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 26378d916f..01b80224af 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.5 + 1.6.6-SNAPSHOT cache diff --git a/http-api/pom.xml b/http-api/pom.xml index ed1372d703..15e99bfcfa 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.5 + 1.6.6-SNAPSHOT Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index e542fdd5e2..cdaf89b09d 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.5 + 1.6.6-SNAPSHOT Web Service diff --git a/pom.xml b/pom.xml index 1385863370..fafd15de44 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.6.5 + 1.6.6-SNAPSHOT pom RuneLite @@ -59,7 +59,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - runelite-parent-1.6.5 + HEAD diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml index 81754a5131..a9b3409ba5 100644 --- a/protocol-api/pom.xml +++ b/protocol-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.5 + 1.6.6-SNAPSHOT protocol-api diff --git a/protocol/pom.xml b/protocol/pom.xml index 57bf0c7181..ac83929c03 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.5 + 1.6.6-SNAPSHOT protocol diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index ee7afdf703..771f6b1665 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.5 + 1.6.6-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 9a0040155e..c7e38492ff 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.5 + 1.6.6-SNAPSHOT client diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index b7e060f963..231e04a190 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.6.5 + 1.6.6-SNAPSHOT script-assembler-plugin