From dee3bd34a5feb3fd7a1bf82923a507e7d13787ff Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Wed, 16 Jun 2021 09:59:48 +0000 Subject: [PATCH 01/11] Update 197 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b75e0d3b67..e831d07230 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ true - 196.2 + 197 From 7e0e54c20d59bc64accb8329e78b9aaa2cdcdd3c Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 15 Jun 2021 07:00:33 -0600 Subject: [PATCH 02/11] Update Item IDs to 2021-6-16 --- .../main/java/net/runelite/api/ItemID.java | 60 +++++++++++++++++++ .../java/net/runelite/api/NullItemID.java | 19 ++++++ 2 files changed, 79 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 2abbf88e21..d52c4d21a5 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -11895,5 +11895,65 @@ public final class ItemID public static final int LIL_SOT = 25751; public static final int LIL_XARP = 25752; public static final int ANTIQUE_LAMP_25753 = 25753; + public static final int ANTIPOISON_1 = 25754; + public static final int ANTIPOISON_2 = 25755; + public static final int ANTIPOISON_3 = 25756; + public static final int ANTIPOISON_4 = 25757; + public static final int ANTIPOISON_POTION_1 = 25758; + public static final int ANTIPOISON_POTION_2 = 25759; + public static final int ANTIPOISON_POTION_3 = 25760; + public static final int ANTIPOISON_POTION_4 = 25761; + public static final int ANTIPOISON_1_25762 = 25762; + public static final int ANTIPOISON_2_25763 = 25763; + public static final int ANTIPOISON_3_25764 = 25764; + public static final int ANTIPOISON_4_25765 = 25765; + public static final int FIENDISH_ASHES = 25766; + public static final int VILE_ASHES = 25769; + public static final int MALICIOUS_ASHES = 25772; + public static final int ABYSSAL_ASHES = 25775; + public static final int INFERNAL_ASHES = 25778; + public static final int ASH_SANCTIFIER = 25781; + public static final int CLUE_SCROLL_MEDIUM_25783 = 25783; + public static final int CLUE_SCROLL_MEDIUM_25784 = 25784; + public static final int CHALLENGE_SCROLL_MEDIUM_25785 = 25785; + public static final int CLUE_SCROLL_ELITE_25786 = 25786; + public static final int CLUE_SCROLL_ELITE_25787 = 25787; + public static final int CLUE_SCROLL_EASY_25788 = 25788; + public static final int CLUE_SCROLL_EASY_25789 = 25789; + public static final int CLUE_SCROLL_HARD_25790 = 25790; + public static final int CLUE_SCROLL_HARD_25791 = 25791; + public static final int CLUE_SCROLL_HARD_25792 = 25792; + public static final int RECEIPT_25793 = 25793; + public static final int BONE = 25794; + public static final int ROSE = 25795; + public static final int DELIVERY_CONFIRMATION = 25796; + public static final int ORDER_FORM = 25797; + public static final int DEMONIC_INCANTATIONS = 25798; + public static final int BLOODY_KNIFE = 25799; + public static final int CULTIST_ROBE = 25800; + public static final int KOUREND_MAP = 25801; + public static final int ROSES_DIARY = 25802; + public static final int BLUISH_KEY = 25803; + public static final int COLD_KEY = 25804; + public static final int ROSES_NOTE = 25805; + public static final int ROSES_NOTE_25806 = 25806; + public static final int ROSES_NOTE_25807 = 25807; + public static final int ROSES_NOTE_25808 = 25808; + public static final int LIZARDMAN_EGG = 25809; + public static final int DAMP_KEY = 25810; + public static final int BROKEN_REDIRECTOR = 25811; + public static final int SULPHUR_POTION = 25812; + public static final int SHIELDING_POTION = 25813; + public static final int DECLARATION = 25814; + public static final int DARK_NULLIFIER = 25815; + public static final int SHAYZIEN_JOURNAL = 25816; + public static final int ROYAL_ACCORD_OF_TWILL_25817 = 25817; + public static final int BOOK_OF_THE_DEAD = 25818; + public static final int ANTIQUE_LAMP_25820 = 25820; + public static final int PROTEST_BANNER = 25822; + public static final int RESEARCH_NOTES_25824 = 25824; + public static final int LIZARDKICKER = 25826; + public static final int OLD_NOTE_25829 = 25829; + public static final int SHAYZIA_MILITARY_ORDERS = 25831; /* 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 85b6276e94..eaef98cc70 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -13648,5 +13648,24 @@ public final class NullItemID public static final int NULL_25743 = 25743; public static final int NULL_25745 = 25745; public static final int NULL_25747 = 25747; + public static final int NULL_25767 = 25767; + public static final int NULL_25768 = 25768; + public static final int NULL_25770 = 25770; + public static final int NULL_25771 = 25771; + public static final int NULL_25773 = 25773; + public static final int NULL_25774 = 25774; + public static final int NULL_25776 = 25776; + public static final int NULL_25777 = 25777; + public static final int NULL_25779 = 25779; + public static final int NULL_25780 = 25780; + public static final int NULL_25782 = 25782; + public static final int NULL_25819 = 25819; + public static final int NULL_25821 = 25821; + public static final int NULL_25823 = 25823; + public static final int NULL_25825 = 25825; + public static final int NULL_25827 = 25827; + public static final int NULL_25828 = 25828; + public static final int NULL_25830 = 25830; + public static final int NULL_25832 = 25832; /* This file is automatically generated. Do not edit. */ } From 692fc3b12a023c89bb7a7f0d56257a9e1709ca71 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 15 Jun 2021 07:00:33 -0600 Subject: [PATCH 03/11] Update Item variations to 2021-6-16 --- .../src/main/resources/item_variations.json | 55 +++++++++++++++++-- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index e87ad1fcb6..028e980914 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -140,7 +140,15 @@ 175, 177, 179, - 2446 + 2446, + 25754, + 25755, + 25756, + 25757, + 25762, + 25763, + 25764, + 25765 ], "superantipoison": [ 181, @@ -1360,7 +1368,16 @@ 24493, 24773, 25498, - 25499 + 25499, + 25783, + 25784, + 25786, + 25787, + 25788, + 25789, + 25790, + 25791, + 25792 ], "radimus notes": [ 714, @@ -2930,7 +2947,8 @@ 19907, 19909, 23132, - 23134 + 23134, + 25785 ], "ogre bellows": [ 2871, @@ -3746,7 +3764,8 @@ 21642, 23072, 23082, - 25753 + 25753, + 25820 ], "herb tea mix": [ 4464, @@ -3856,6 +3875,10 @@ 4601, 4602 ], + "receipt": [ + 4603, + 25793 + ], "snake basket": [ 4606, 4607 @@ -6665,6 +6688,10 @@ 10340, 20577 ], + "research notes": [ + 10492, + 25824 + ], "avas accumulator": [ 10499, 23609 @@ -8749,6 +8776,10 @@ 21752, 25193 ], + "royal accord of twill": [ + 21758, + 25817 + ], "imbued saradomin max cape": [ 21776, 24232, @@ -9538,6 +9569,10 @@ 24675, 24680 ], + "old note": [ + 24682, + 25829 + ], "ring of endurance": [ 24735, 24736, @@ -9807,5 +9842,17 @@ "sanguine scythe of vitur": [ 25739, 25741 + ], + "antipoison potion": [ + 25758, + 25759, + 25760, + 25761 + ], + "roses note": [ + 25805, + 25806, + 25807, + 25808 ] } \ No newline at end of file From 6c087640cf9625edeef80552a80f8bff3b3630f0 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 15 Jun 2021 07:00:33 -0600 Subject: [PATCH 04/11] Update Object IDs to 2021-6-16 --- .../java/net/runelite/api/NullObjectID.java | 357 ++++++++++++++- .../main/java/net/runelite/api/ObjectID.java | 408 +++++++++++++++++- 2 files changed, 749 insertions(+), 16 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 0b5216794c..2dbda498c3 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -4250,7 +4250,12 @@ public final class NullObjectID public static final int NULL_10071 = 10071; public static final int NULL_10072 = 10072; public static final int NULL_10073 = 10073; + public static final int NULL_10084 = 10084; + public static final int NULL_10085 = 10085; + public static final int NULL_10086 = 10086; public static final int NULL_10092 = 10092; + public static final int NULL_10093 = 10093; + public static final int NULL_10094 = 10094; public static final int NULL_10095 = 10095; public static final int NULL_10096 = 10096; public static final int NULL_10104 = 10104; @@ -13334,7 +13339,6 @@ public final class NullObjectID public static final int NULL_27877 = 27877; public static final int NULL_27881 = 27881; public static final int NULL_27885 = 27885; - public static final int NULL_27887 = 27887; public static final int NULL_27889 = 27889; public static final int NULL_27890 = 27890; public static final int NULL_27891 = 27891; @@ -14916,6 +14920,7 @@ public final class NullObjectID public static final int NULL_31700 = 31700; public static final int NULL_31701 = 31701; public static final int NULL_31702 = 31702; + public static final int NULL_31710 = 31710; public static final int NULL_31720 = 31720; public static final int NULL_31724 = 31724; public static final int NULL_31727 = 31727; @@ -20365,5 +20370,355 @@ public final class NullObjectID public static final int NULL_41751 = 41751; public static final int NULL_41752 = 41752; public static final int NULL_41753 = 41753; + public static final int NULL_41758 = 41758; + public static final int NULL_41765 = 41765; + public static final int NULL_41766 = 41766; + public static final int NULL_41771 = 41771; + public static final int NULL_41784 = 41784; + public static final int NULL_41785 = 41785; + public static final int NULL_41794 = 41794; + public static final int NULL_41797 = 41797; + public static final int NULL_41798 = 41798; + public static final int NULL_41809 = 41809; + public static final int NULL_41819 = 41819; + public static final int NULL_41820 = 41820; + public static final int NULL_41825 = 41825; + public static final int NULL_41859 = 41859; + public static final int NULL_41860 = 41860; + public static final int NULL_41882 = 41882; + public static final int NULL_41885 = 41885; + public static final int NULL_41886 = 41886; + public static final int NULL_41887 = 41887; + public static final int NULL_41888 = 41888; + public static final int NULL_41889 = 41889; + public static final int NULL_41890 = 41890; + public static final int NULL_41891 = 41891; + public static final int NULL_41895 = 41895; + public static final int NULL_41905 = 41905; + public static final int NULL_41906 = 41906; + public static final int NULL_41907 = 41907; + public static final int NULL_41908 = 41908; + public static final int NULL_41909 = 41909; + public static final int NULL_41910 = 41910; + public static final int NULL_41911 = 41911; + public static final int NULL_41912 = 41912; + public static final int NULL_41913 = 41913; + public static final int NULL_41914 = 41914; + public static final int NULL_41919 = 41919; + public static final int NULL_41920 = 41920; + public static final int NULL_41921 = 41921; + public static final int NULL_41926 = 41926; + public static final int NULL_41958 = 41958; + public static final int NULL_41959 = 41959; + public static final int NULL_41960 = 41960; + public static final int NULL_41961 = 41961; + public static final int NULL_41962 = 41962; + public static final int NULL_41963 = 41963; + public static final int NULL_41964 = 41964; + public static final int NULL_41965 = 41965; + public static final int NULL_41966 = 41966; + public static final int NULL_41967 = 41967; + public static final int NULL_41968 = 41968; + public static final int NULL_41969 = 41969; + public static final int NULL_41970 = 41970; + public static final int NULL_41971 = 41971; + public static final int NULL_41972 = 41972; + public static final int NULL_41981 = 41981; + public static final int NULL_41982 = 41982; + public static final int NULL_41983 = 41983; + public static final int NULL_41984 = 41984; + public static final int NULL_41985 = 41985; + public static final int NULL_41986 = 41986; + public static final int NULL_41987 = 41987; + public static final int NULL_41988 = 41988; + public static final int NULL_41989 = 41989; + public static final int NULL_41990 = 41990; + public static final int NULL_41991 = 41991; + public static final int NULL_41992 = 41992; + public static final int NULL_41993 = 41993; + public static final int NULL_41994 = 41994; + public static final int NULL_41995 = 41995; + public static final int NULL_41996 = 41996; + public static final int NULL_41997 = 41997; + public static final int NULL_41998 = 41998; + public static final int NULL_41999 = 41999; + public static final int NULL_42000 = 42000; + public static final int NULL_42001 = 42001; + public static final int NULL_42002 = 42002; + public static final int NULL_42003 = 42003; + public static final int NULL_42004 = 42004; + public static final int NULL_42005 = 42005; + public static final int NULL_42006 = 42006; + public static final int NULL_42007 = 42007; + public static final int NULL_42008 = 42008; + public static final int NULL_42010 = 42010; + public static final int NULL_42011 = 42011; + public static final int NULL_42012 = 42012; + public static final int NULL_42013 = 42013; + public static final int NULL_42014 = 42014; + public static final int NULL_42015 = 42015; + public static final int NULL_42016 = 42016; + public static final int NULL_42017 = 42017; + public static final int NULL_42018 = 42018; + public static final int NULL_42019 = 42019; + public static final int NULL_42020 = 42020; + public static final int NULL_42021 = 42021; + public static final int NULL_42022 = 42022; + public static final int NULL_42023 = 42023; + public static final int NULL_42024 = 42024; + public static final int NULL_42025 = 42025; + public static final int NULL_42026 = 42026; + public static final int NULL_42027 = 42027; + public static final int NULL_42028 = 42028; + public static final int NULL_42029 = 42029; + public static final int NULL_42030 = 42030; + public static final int NULL_42031 = 42031; + public static final int NULL_42032 = 42032; + public static final int NULL_42033 = 42033; + public static final int NULL_42034 = 42034; + public static final int NULL_42035 = 42035; + public static final int NULL_42036 = 42036; + public static final int NULL_42037 = 42037; + public static final int NULL_42038 = 42038; + public static final int NULL_42039 = 42039; + public static final int NULL_42040 = 42040; + public static final int NULL_42041 = 42041; + public static final int NULL_42045 = 42045; + public static final int NULL_42046 = 42046; + public static final int NULL_42047 = 42047; + public static final int NULL_42048 = 42048; + public static final int NULL_42049 = 42049; + public static final int NULL_42055 = 42055; + public static final int NULL_42056 = 42056; + public static final int NULL_42057 = 42057; + public static final int NULL_42058 = 42058; + public static final int NULL_42059 = 42059; + public static final int NULL_42060 = 42060; + public static final int NULL_42061 = 42061; + public static final int NULL_42062 = 42062; + public static final int NULL_42063 = 42063; + public static final int NULL_42064 = 42064; + public static final int NULL_42065 = 42065; + public static final int NULL_42069 = 42069; + public static final int NULL_42075 = 42075; + public static final int NULL_42076 = 42076; + public static final int NULL_42077 = 42077; + public static final int NULL_42078 = 42078; + public static final int NULL_42079 = 42079; + public static final int NULL_42089 = 42089; + public static final int NULL_42090 = 42090; + public static final int NULL_42094 = 42094; + public static final int NULL_42096 = 42096; + public static final int NULL_42097 = 42097; + public static final int NULL_42098 = 42098; + public static final int NULL_42099 = 42099; + public static final int NULL_42100 = 42100; + public static final int NULL_42101 = 42101; + public static final int NULL_42102 = 42102; + public static final int NULL_42105 = 42105; + public static final int NULL_42106 = 42106; + public static final int NULL_42107 = 42107; + public static final int NULL_42108 = 42108; + public static final int NULL_42109 = 42109; + public static final int NULL_42110 = 42110; + public static final int NULL_42111 = 42111; + public static final int NULL_42112 = 42112; + public static final int NULL_42113 = 42113; + public static final int NULL_42114 = 42114; + public static final int NULL_42115 = 42115; + public static final int NULL_42152 = 42152; + public static final int NULL_42181 = 42181; + public static final int NULL_42182 = 42182; + public static final int NULL_42187 = 42187; + public static final int NULL_42188 = 42188; + public static final int NULL_42189 = 42189; + public static final int NULL_42190 = 42190; + public static final int NULL_42191 = 42191; + public static final int NULL_42192 = 42192; + public static final int NULL_42197 = 42197; + public static final int NULL_42198 = 42198; + public static final int NULL_42210 = 42210; + public static final int NULL_42222 = 42222; + public static final int NULL_42223 = 42223; + public static final int NULL_42224 = 42224; + public static final int NULL_42225 = 42225; + public static final int NULL_42226 = 42226; + public static final int NULL_42227 = 42227; + public static final int NULL_42228 = 42228; + public static final int NULL_42229 = 42229; + public static final int NULL_42230 = 42230; + public static final int NULL_42231 = 42231; + public static final int NULL_42232 = 42232; + public static final int NULL_42233 = 42233; + public static final int NULL_42234 = 42234; + public static final int NULL_42235 = 42235; + public static final int NULL_42236 = 42236; + public static final int NULL_42237 = 42237; + public static final int NULL_42238 = 42238; + public static final int NULL_42239 = 42239; + public static final int NULL_42240 = 42240; + public static final int NULL_42241 = 42241; + public static final int NULL_42244 = 42244; + public static final int NULL_42245 = 42245; + public static final int NULL_42251 = 42251; + public static final int NULL_42252 = 42252; + public static final int NULL_42253 = 42253; + public static final int NULL_42254 = 42254; + public static final int NULL_42255 = 42255; + public static final int NULL_42256 = 42256; + public static final int NULL_42257 = 42257; + public static final int NULL_42258 = 42258; + public static final int NULL_42259 = 42259; + public static final int NULL_42260 = 42260; + public static final int NULL_42261 = 42261; + public static final int NULL_42262 = 42262; + public static final int NULL_42263 = 42263; + public static final int NULL_42264 = 42264; + public static final int NULL_42265 = 42265; + public static final int NULL_42266 = 42266; + public static final int NULL_42267 = 42267; + public static final int NULL_42268 = 42268; + public static final int NULL_42269 = 42269; + public static final int NULL_42270 = 42270; + public static final int NULL_42271 = 42271; + public static final int NULL_42272 = 42272; + public static final int NULL_42273 = 42273; + public static final int NULL_42274 = 42274; + public static final int NULL_42275 = 42275; + public static final int NULL_42276 = 42276; + public static final int NULL_42277 = 42277; + public static final int NULL_42278 = 42278; + public static final int NULL_42279 = 42279; + public static final int NULL_42280 = 42280; + public static final int NULL_42281 = 42281; + public static final int NULL_42282 = 42282; + public static final int NULL_42283 = 42283; + public static final int NULL_42284 = 42284; + public static final int NULL_42285 = 42285; + public static final int NULL_42286 = 42286; + public static final int NULL_42287 = 42287; + public static final int NULL_42288 = 42288; + public static final int NULL_42289 = 42289; + public static final int NULL_42290 = 42290; + public static final int NULL_42291 = 42291; + public static final int NULL_42292 = 42292; + public static final int NULL_42293 = 42293; + public static final int NULL_42294 = 42294; + public static final int NULL_42306 = 42306; + public static final int NULL_42307 = 42307; + public static final int NULL_42308 = 42308; + public static final int NULL_42309 = 42309; + public static final int NULL_42316 = 42316; + public static final int NULL_42317 = 42317; + public static final int NULL_42318 = 42318; + public static final int NULL_42319 = 42319; + public static final int NULL_42320 = 42320; + public static final int NULL_42321 = 42321; + public static final int NULL_42322 = 42322; + public static final int NULL_42323 = 42323; + public static final int NULL_42324 = 42324; + public static final int NULL_42325 = 42325; + public static final int NULL_42326 = 42326; + public static final int NULL_42327 = 42327; + public static final int NULL_42328 = 42328; + public static final int NULL_42330 = 42330; + public static final int NULL_42331 = 42331; + public static final int NULL_42332 = 42332; + public static final int NULL_42333 = 42333; + public static final int NULL_42334 = 42334; + public static final int NULL_42335 = 42335; + public static final int NULL_42336 = 42336; + public static final int NULL_42337 = 42337; + public static final int NULL_42338 = 42338; + public static final int NULL_42339 = 42339; + public static final int NULL_42340 = 42340; + public static final int NULL_42341 = 42341; + public static final int NULL_42346 = 42346; + public static final int NULL_42347 = 42347; + public static final int NULL_42348 = 42348; + public static final int NULL_42349 = 42349; + public static final int NULL_42351 = 42351; + public static final int NULL_42352 = 42352; + public static final int NULL_42353 = 42353; + public static final int NULL_42354 = 42354; + public static final int NULL_42355 = 42355; + public static final int NULL_42356 = 42356; + public static final int NULL_42357 = 42357; + public static final int NULL_42358 = 42358; + public static final int NULL_42359 = 42359; + public static final int NULL_42360 = 42360; + public static final int NULL_42361 = 42361; + public static final int NULL_42362 = 42362; + public static final int NULL_42363 = 42363; + public static final int NULL_42364 = 42364; + public static final int NULL_42411 = 42411; + public static final int NULL_42412 = 42412; + public static final int NULL_42413 = 42413; + public static final int NULL_42416 = 42416; + public static final int NULL_42417 = 42417; + public static final int NULL_42418 = 42418; + public static final int NULL_42419 = 42419; + public static final int NULL_42420 = 42420; + public static final int NULL_42421 = 42421; + public static final int NULL_42422 = 42422; + public static final int NULL_42423 = 42423; + public static final int NULL_42429 = 42429; + public static final int NULL_42430 = 42430; + public static final int NULL_42431 = 42431; + public static final int NULL_42432 = 42432; + public static final int NULL_42433 = 42433; + public static final int NULL_42434 = 42434; + public static final int NULL_42435 = 42435; + public static final int NULL_42436 = 42436; + public static final int NULL_42437 = 42437; + public static final int NULL_42438 = 42438; + public static final int NULL_42439 = 42439; + public static final int NULL_42440 = 42440; + public static final int NULL_42441 = 42441; + public static final int NULL_42442 = 42442; + public static final int NULL_42443 = 42443; + public static final int NULL_42444 = 42444; + public static final int NULL_42445 = 42445; + public static final int NULL_42446 = 42446; + public static final int NULL_42447 = 42447; + public static final int NULL_42448 = 42448; + public static final int NULL_42449 = 42449; + public static final int NULL_42450 = 42450; + public static final int NULL_42451 = 42451; + public static final int NULL_42452 = 42452; + public static final int NULL_42453 = 42453; + public static final int NULL_42454 = 42454; + public static final int NULL_42455 = 42455; + public static final int NULL_42456 = 42456; + public static final int NULL_42457 = 42457; + public static final int NULL_42458 = 42458; + public static final int NULL_42459 = 42459; + public static final int NULL_42460 = 42460; + public static final int NULL_42461 = 42461; + public static final int NULL_42462 = 42462; + public static final int NULL_42463 = 42463; + public static final int NULL_42464 = 42464; + public static final int NULL_42465 = 42465; + public static final int NULL_42466 = 42466; + public static final int NULL_42467 = 42467; + public static final int NULL_42468 = 42468; + public static final int NULL_42469 = 42469; + public static final int NULL_42470 = 42470; + public static final int NULL_42471 = 42471; + public static final int NULL_42472 = 42472; + public static final int NULL_42473 = 42473; + public static final int NULL_42474 = 42474; + public static final int NULL_42475 = 42475; + public static final int NULL_42476 = 42476; + public static final int NULL_42477 = 42477; + public static final int NULL_42478 = 42478; + public static final int NULL_42479 = 42479; + public static final int NULL_42480 = 42480; + public static final int NULL_42481 = 42481; + public static final int NULL_42482 = 42482; + public static final int NULL_42483 = 42483; + public static final int NULL_42484 = 42484; + public static final int NULL_42485 = 42485; + public static final int NULL_42486 = 42486; /* This file is automatically generated. Do not edit. */ } 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 1c1506cd36..c2a2de3e8d 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -5839,16 +5839,11 @@ public final class ObjectID public static final int ROCKS_10081 = 10081; public static final int FURNACE_10082 = 10082; public static final int BANK_BOOTH_10083 = 10083; - public static final int ARCEUUS_STATUE = 10084; - public static final int HOSIDIUS_STATUE = 10085; - public static final int LOVAKENGJ_STATUE = 10086; public static final int OMINOUS_FISHING_SPOT = 10087; public static final int OMINOUS_FISHING_SPOT_10088 = 10088; public static final int OMINOUS_FISHING_SPOT_10089 = 10089; public static final int SIGNPOST_10090 = 10090; public static final int AQUARIUM = 10091; - public static final int PISCARILIUS_STATUE = 10093; - public static final int SHAYZIEN_STATUE = 10094; public static final int BLINDWEED_PATCH = 10097; public static final int BLINDWEED_PATCH_10098 = 10098; public static final int BLINDWEED_PATCH_10099 = 10099; @@ -14247,7 +14242,7 @@ public final class ObjectID public static final int STAIRS_27202 = 27202; public static final int STAIRS_27203 = 27203; public static final int STAIRS_27204 = 27204; - public static final int CRATE_27205 = 27205; + public static final int MEDPACK_BOX = 27205; public static final int TABLE_27209 = 27209; public static final int TABLE_27210 = 27210; public static final int LECTERN_27214 = 27214; @@ -14534,13 +14529,14 @@ public final class ObjectID public static final int STAIRS_27854 = 27854; public static final int STAIRS_27855 = 27855; public static final int STAIRS_27856 = 27856; - public static final int BRIGHT_CRYSTAL = 27878; + public static final int ARCANE_CRYSTAL = 27878; public static final int DARK_CRYSTAL = 27879; public static final int BLOOD_CRYSTAL = 27880; - public static final int BRIGHT_CRYSTAL_27882 = 27882; + public static final int ARCANE_CRYSTAL_27882 = 27882; public static final int DARK_CRYSTAL_27883 = 27883; public static final int BLOOD_CRYSTAL_27884 = 27884; - public static final int BRIGHT_CRYSTAL_27886 = 27886; + public static final int ARCANE_CRYSTAL_27886 = 27886; + public static final int DARK_CRYSTAL_27887 = 27887; public static final int BLOOD_CRYSTAL_27888 = 27888; public static final int BLOOD_ALTAR = 27978; public static final int DARK_ALTAR = 27979; @@ -15019,7 +15015,7 @@ public final class ObjectID public static final int WHEELY_TABLE = 28526; public static final int VELVET_STOOL = 28527; public static final int VELVET_STOOL_28528 = 28528; - public static final int VELVET_CHAIR = 28529; + public static final int CHAIR_28529 = 28529; public static final int WOODEN_CHAIR = 28530; public static final int VELVET_ROUND_CHAIR = 28531; public static final int WARDROBE_28532 = 28532; @@ -15851,7 +15847,7 @@ public final class ObjectID public static final int CRYSTAL_BOMB = 29766; public static final int NOXIOUS_TENDRILS = 29767; public static final int SPIRIT_TENDRILS = 29768; - public static final int STORAGE_UNIT = 29769; + public static final int TINY_STORAGE_UNIT = 29769; public static final int SMALL_STORAGE_UNIT = 29770; public static final int OLD_TOOLS = 29771; public static final int GOURD_TREE = 29772; @@ -15973,7 +15969,7 @@ public final class ObjectID public static final int OFFICIAL_ORDER_OF_CONSTRUCTION = 30101; public static final int CHRONICLES_OF_XERIC = 30102; public static final int ROYAL_WEDDING_INVITATION = 30103; - public static final int STORAGE_UNIT_30107 = 30107; + public static final int STORAGE_UNIT = 30107; public static final int ROWBOAT_30108 = 30108; public static final int ROWBOAT_30109 = 30109; public static final int LARGE_DOOR_30110 = 30110; @@ -16782,7 +16778,6 @@ public final class ObjectID public static final int MANHOLE_31707 = 31707; public static final int LADDER_31708 = 31708; public static final int DOORWAY_31709 = 31709; - public static final int CHEST_31710 = 31710; public static final int CHEST_31711 = 31711; public static final int FISH_STALL_31712 = 31712; public static final int THRONE_31713 = 31713; @@ -16904,7 +16899,7 @@ public final class ObjectID public static final int CANDLE_STAND_31890 = 31890; public static final int OLD_PASSAGEWAY = 31891; public static final int OLD_PASSAGEWAY_31892 = 31892; - public static final int VELVET_CHAIR_31898 = 31898; + public static final int VELVET_CHAIR = 31898; public static final int BOOKCASE_31899 = 31899; public static final int GOBLIN_CROWD_31900 = 31900; public static final int GOBLIN_CROWD_31901 = 31901; @@ -17689,7 +17684,7 @@ public final class ObjectID public static final int CRATE_33565 = 33565; public static final int DEAD_BODY = 33567; public static final int THANA = 33568; - public static final int BRIGHT_CRYSTAL_33569 = 33569; + public static final int BRIGHT_CRYSTAL = 33569; public static final int DOOR_33570 = 33570; public static final int DOOR_33571 = 33571; public static final int DOOR_33572 = 33572; @@ -21374,5 +21369,388 @@ public final class ObjectID public static final int ACID_POOL_41747 = 41747; public static final int TILE_41748 = 41748; public static final int TILE_41749 = 41749; + public static final int IRON_PICKAXE = 41754; + public static final int SILK_STALL_41755 = 41755; + public static final int GEM_STALL_41756 = 41756; + public static final int SILVER_STALL_41757 = 41757; + public static final int TELESCOPE_41759 = 41759; + public static final int CHEST_41760 = 41760; + public static final int CHEST_41761 = 41761; + public static final int CHEST_41762 = 41762; + public static final int CRATE_41763 = 41763; + public static final int CRATE_41764 = 41764; + public static final int SHELVES_41767 = 41767; + public static final int SHELVES_41768 = 41768; + public static final int SHELVES_41769 = 41769; + public static final int SHELVES_41770 = 41770; + public static final int SHELVES_41772 = 41772; + public static final int SHELVES_41773 = 41773; + public static final int TABLE_41774 = 41774; + public static final int TABLE_41775 = 41775; + public static final int TABLE_41776 = 41776; + public static final int TABLE_41777 = 41777; + public static final int ROSES_41778 = 41778; + public static final int ROSES_41779 = 41779; + public static final int CABINET_41780 = 41780; + public static final int CABINET_41781 = 41781; + public static final int CABINET_41782 = 41782; + public static final int CABINET_41783 = 41783; + public static final int BATHTUB_41786 = 41786; + public static final int BATHTUB_41787 = 41787; + public static final int DESK_41788 = 41788; + public static final int DESK_41789 = 41789; + public static final int DRESSER_41790 = 41790; + public static final int DRESSER_41791 = 41791; + public static final int WARDROBE_41792 = 41792; + public static final int WARDROBE_41793 = 41793; + public static final int DRAWERS_41795 = 41795; + public static final int DRAWERS_41796 = 41796; + public static final int BED_41799 = 41799; + public static final int BED_41800 = 41800; + public static final int CELL_DOOR_41801 = 41801; + public static final int TABLE_41802 = 41802; + public static final int TABLE_41803 = 41803; + public static final int SKELETON_41804 = 41804; + public static final int SKELETON_41805 = 41805; + public static final int STAIRCASE_41806 = 41806; + public static final int PORTAL_41807 = 41807; + public static final int PORTAL_41808 = 41808; + public static final int DISPLAY_CASE_41810 = 41810; + public static final int DISPLAY_CASE_41811 = 41811; + public static final int DISPLAY_CASE_41812 = 41812; + public static final int DISPLAY_CASE_41813 = 41813; + public static final int VINES_41814 = 41814; + public static final int VINES_41815 = 41815; + public static final int VINES_41816 = 41816; + public static final int VINES_41817 = 41817; + public static final int VINES_41818 = 41818; + public static final int PANEL = 41821; + public static final int PANEL_41822 = 41822; + public static final int PANEL_41823 = 41823; + public static final int PANEL_41824 = 41824; + public static final int STONE_PILE_41826 = 41826; + public static final int STONE_PILE_41827 = 41827; + public static final int PANEL_41828 = 41828; + public static final int PANEL_41829 = 41829; + public static final int PANEL_41830 = 41830; + public static final int PANEL_41831 = 41831; + public static final int PANEL_41832 = 41832; + public static final int PANEL_41833 = 41833; + public static final int PANEL_41834 = 41834; + public static final int PANEL_41835 = 41835; + public static final int PILLAR_41836 = 41836; + public static final int PILLAR_41837 = 41837; + public static final int PILLAR_41838 = 41838; + public static final int WALL_41839 = 41839; + public static final int WALL_41840 = 41840; + public static final int ARCEUUS_STATUE = 41841; + public static final int ARCEUUS_STATUE_41842 = 41842; + public static final int HOSIDIUS_STATUE = 41843; + public static final int HOSIDIUS_STATUE_41844 = 41844; + public static final int LOVAKENGJ_STATUE = 41845; + public static final int LOVAKENGJ_STATUE_41846 = 41846; + public static final int PISCARILIUS_STATUE = 41847; + public static final int PISCARILIUS_STATUE_41848 = 41848; + public static final int SHAYZIEN_STATUE = 41849; + public static final int SHAYZIEN_STATUE_41850 = 41850; + public static final int CRATES_41851 = 41851; + public static final int CRATES_41852 = 41852; + public static final int LADDER_41853 = 41853; + public static final int LADDER_41854 = 41854; + public static final int BOXES_41855 = 41855; + public static final int CRATE_41856 = 41856; + public static final int CRATES_41857 = 41857; + public static final int BOOKCASE_41858 = 41858; + public static final int GATE_41861 = 41861; + public static final int GATE_41862 = 41862; + public static final int GATE_41863 = 41863; + public static final int WOMAN_41864 = 41864; + public static final int ROSE = 41865; + public static final int BED_41866 = 41866; + public static final int GRAVE_41867 = 41867; + public static final int BUSH_41868 = 41868; + public static final int DOOR_41869 = 41869; + public static final int DOOR_41870 = 41870; + public static final int DOORWAY_41871 = 41871; + public static final int DOORWAY_41872 = 41872; + public static final int LIZARDMAN_EGGS_41873 = 41873; + public static final int LIZARDMAN_EGGS_41874 = 41874; + public static final int LIZARDMAN_EGGS_41875 = 41875; + public static final int LIZARDMAN_EGGS_41876 = 41876; + public static final int GATE_41877 = 41877; + public static final int GATE_41878 = 41878; + public static final int TABLE_41879 = 41879; + public static final int TABLE_41880 = 41880; + public static final int MARK_OF_DARKNESS = 41881; + public static final int HANGING_HAND_41883 = 41883; + public static final int HANGING_HAND_41884 = 41884; + public static final int TABLE_41892 = 41892; + public static final int TABLE_41893 = 41893; + public static final int TABLE_41894 = 41894; + public static final int GIANT_VIAL_41896 = 41896; + public static final int GIANT_VIAL_41897 = 41897; + public static final int SHELF_41898 = 41898; + public static final int SHELF_41899 = 41899; + public static final int SHELF_41900 = 41900; + public static final int SHELF_41901 = 41901; + public static final int GATE_41902 = 41902; + public static final int GATE_41903 = 41903; + public static final int GATE_41904 = 41904; + public static final int TRAPDOOR_41915 = 41915; + public static final int LADDER_41916 = 41916; + public static final int LADDER_41917 = 41917; + public static final int LADDER_41918 = 41918; + public static final int STAIRCASE_41922 = 41922; + public static final int STAIRCASE_41923 = 41923; + public static final int LADDER_41924 = 41924; + public static final int LADDER_41925 = 41925; + public static final int GATE_41927 = 41927; + public static final int WINE_BARREL_41928 = 41928; + public static final int WINE_BARREL_41929 = 41929; + public static final int LADDER_41930 = 41930; + public static final int CHEST_41931 = 41931; + public static final int CHEST_41932 = 41932; + public static final int PROTESTER = 41933; + public static final int PROTESTER_41934 = 41934; + public static final int PROTESTER_41935 = 41935; + public static final int PROTESTER_41936 = 41936; + public static final int PROTESTER_41937 = 41937; + public static final int PROTESTER_41938 = 41938; + public static final int PROTESTER_41939 = 41939; + public static final int PROTESTER_41940 = 41940; + public static final int PROTESTER_41941 = 41941; + public static final int PROTESTER_41942 = 41942; + public static final int PROTESTER_41943 = 41943; + public static final int PROTESTER_41944 = 41944; + public static final int PROTESTER_41945 = 41945; + public static final int PROTESTER_41946 = 41946; + public static final int PROTESTER_41947 = 41947; + public static final int PROTESTER_41948 = 41948; + public static final int PROTESTER_41949 = 41949; + public static final int RUINED_STALL = 41950; + public static final int RUINED_STALL_41951 = 41951; + public static final int DAMAGED_TABLE = 41952; + public static final int DAMAGED_TABLE_41953 = 41953; + public static final int STOOL_41954 = 41954; + public static final int BROKEN_SPINNING_WHEEL_41955 = 41955; + public static final int BROKEN_CART_41956 = 41956; + public static final int BROKEN_CART_41957 = 41957; + public static final int PROTEST_BANNERS = 41973; + public static final int PROTEST_BANNERS_41974 = 41974; + public static final int PROTEST_BANNERS_41975 = 41975; + public static final int PROTEST_POSTER = 41976; + public static final int PROTEST_POSTER_41977 = 41977; + public static final int PROTEST_POSTER_41978 = 41978; + public static final int PROTEST_POSTER_41979 = 41979; + public static final int PROTEST_POSTER_41980 = 41980; + public static final int HANDHOLDS_42009 = 42009; + public static final int LADDER_42042 = 42042; + public static final int LADDER_42043 = 42043; + public static final int TENT_42044 = 42044; + public static final int BANNER_42050 = 42050; + public static final int BANNER_42051 = 42051; + public static final int BANNER_42052 = 42052; + public static final int BANNER_42053 = 42053; + public static final int BANNER_42054 = 42054; + public static final int CRATE_42066 = 42066; + public static final int CRATE_42067 = 42067; + public static final int CRATES_42068 = 42068; + public static final int CRATES_42070 = 42070; + public static final int CRATES_42071 = 42071; + public static final int BARREL_42072 = 42072; + public static final int BARREL_42073 = 42073; + public static final int BARREL_42074 = 42074; + public static final int TABLE_42080 = 42080; + public static final int TABLE_42081 = 42081; + public static final int TABLE_42082 = 42082; + public static final int TABLE_42083 = 42083; + public static final int WOODEN_CART_42084 = 42084; + public static final int TREBUCHET_42085 = 42085; + public static final int SHELVES_42086 = 42086; + public static final int SHELVES_42087 = 42087; + public static final int BARREL_42088 = 42088; + public static final int WOODEN_BARRICADE = 42091; + public static final int STOOL_42092 = 42092; + public static final int CAULDRON_42093 = 42093; + public static final int CAVE_42095 = 42095; + public static final int BROKEN_ALTAR = 42103; + public static final int SLEEPING_BAG_42104 = 42104; + public static final int DOOR_42116 = 42116; + public static final int DOOR_42117 = 42117; + public static final int DOOR_42118 = 42118; + public static final int DOOR_42119 = 42119; + public static final int DOOR_42120 = 42120; + public static final int DOOR_42121 = 42121; + public static final int DOOR_42122 = 42122; + public static final int DOOR_42123 = 42123; + public static final int DOOR_42124 = 42124; + public static final int DOOR_42125 = 42125; + public static final int DOOR_42126 = 42126; + public static final int DOOR_42127 = 42127; + public static final int DOOR_42128 = 42128; + public static final int DOOR_42129 = 42129; + public static final int DOOR_42130 = 42130; + public static final int DOOR_42131 = 42131; + public static final int LANTERN_42132 = 42132; + public static final int LANTERN_42133 = 42133; + public static final int LANTERN_42134 = 42134; + public static final int LANTERN_42135 = 42135; + public static final int LANTERN_42136 = 42136; + public static final int LANTERN_42137 = 42137; + public static final int LANTERN_42138 = 42138; + public static final int LANTERN_42139 = 42139; + public static final int CHAIR_42140 = 42140; + public static final int SHELF_OF_THREAD = 42141; + public static final int FABRIC_RACK = 42142; + public static final int FABRIC_RACK_42143 = 42143; + public static final int FABRIC_42144 = 42144; + public static final int FABRIC_42145 = 42145; + public static final int HANGING_FLAG = 42146; + public static final int HANGING_FLAG_42147 = 42147; + public static final int TABLE_42148 = 42148; + public static final int CLOTHES_STAND = 42149; + public static final int CLOTH_42150 = 42150; + public static final int BOW_CASE_42151 = 42151; + public static final int SWORD_CASE_42153 = 42153; + public static final int SHELVES_42154 = 42154; + public static final int SHELVES_42155 = 42155; + public static final int SHELVES_42156 = 42156; + public static final int SHELVES_42157 = 42157; + public static final int CHEST_42158 = 42158; + public static final int FIREPLACE_42159 = 42159; + public static final int CAT_SHRINE = 42160; + public static final int CHEST_42161 = 42161; + public static final int FOUNTAIN_42162 = 42162; + public static final int ALTAR_42163 = 42163; + public static final int CEREMONIAL_PILLOW = 42164; + public static final int CEREMONIAL_PILLOW_42165 = 42165; + public static final int CEREMONIAL_PILLOW_STACK = 42166; + public static final int CEREMONIAL_PILLAR = 42167; + public static final int CEREMONIAL_PILLAR_42168 = 42168; + public static final int CEREMONIAL_PILLAR_42169 = 42169; + public static final int CEREMONIAL_PILLAR_42170 = 42170; + public static final int CEREMONIAL_PILLAR_42171 = 42171; + public static final int CEREMONIAL_PILLAR_42172 = 42172; + public static final int CEREMONIAL_PILLAR_42173 = 42173; + public static final int CEREMONIAL_PILLAR_42174 = 42174; + public static final int CEREMONIAL_PILLAR_42175 = 42175; + public static final int CEREMONIAL_PILLAR_42176 = 42176; + public static final int CEREMONIAL_PILLAR_42177 = 42177; + public static final int SHAYZIEN_STATUE_42178 = 42178; + public static final int CEREMONIAL_PILLAR_42179 = 42179; + public static final int CEREMONIAL_PILLAR_42180 = 42180; + public static final int TOMBSTONE_42183 = 42183; + public static final int BUNK_BED_42184 = 42184; + public static final int TABLE_42185 = 42185; + public static final int TABLE_42186 = 42186; + public static final int STAIRCASE_42193 = 42193; + public static final int STAIRCASE_42194 = 42194; + public static final int STAIRCASE_42195 = 42195; + public static final int STAIRCASE_42196 = 42196; + public static final int BENCH_42199 = 42199; + public static final int POSTER_42200 = 42200; + public static final int POSTER_42201 = 42201; + public static final int POSTER_42202 = 42202; + public static final int BATHTUB_42203 = 42203; + public static final int CAT_42204 = 42204; + public static final int SINK_42205 = 42205; + public static final int BLACKBOARD_42206 = 42206; + public static final int LADDER_42207 = 42207; + public static final int LADDER_42208 = 42208; + public static final int LADDER_42209 = 42209; + public static final int MONKEYBARS_42211 = 42211; + public static final int TIGHTROPE_42212 = 42212; + public static final int BAR_42213 = 42213; + public static final int TIGHTROPE_42214 = 42214; + public static final int TIGHTROPE_42215 = 42215; + public static final int GAP_42216 = 42216; + public static final int BEAM = 42217; + public static final int EDGE_42218 = 42218; + public static final int EDGE_42219 = 42219; + public static final int BEAM_42220 = 42220; + public static final int ZIPLINE = 42221; + public static final int HAY_BALE_42242 = 42242; + public static final int HAY_BALES_42243 = 42243; + public static final int BARREL_42246 = 42246; + public static final int CAVE_42247 = 42247; + public static final int CAVE_42248 = 42248; + public static final int STRANGE_PASSAGE_42249 = 42249; + public static final int STRANGE_WALL_42250 = 42250; + public static final int VINE_LADDER_42295 = 42295; + public static final int VINE_LADDER_42296 = 42296; + public static final int VINE_LADDER_42297 = 42297; + public static final int BONES_42298 = 42298; + public static final int BONES_42299 = 42299; + public static final int BONES_42300 = 42300; + public static final int BONES_42301 = 42301; + public static final int BONES_42302 = 42302; + public static final int BONES_42303 = 42303; + public static final int BONES_42304 = 42304; + public static final int BONES_42305 = 42305; + public static final int LIGHT_42310 = 42310; + public static final int FALLEN_SOLDIER_42311 = 42311; + public static final int FALLEN_SOLDIER_42312 = 42312; + public static final int FALLEN_SOLDIER_42313 = 42313; + public static final int FALLEN_SOLDIER_42314 = 42314; + public static final int FALLEN_SOLDIER_42315 = 42315; + public static final int LADDER_42329 = 42329; + public static final int KOUREND_SIGIL_42342 = 42342; + public static final int STATUE_42343 = 42343; + public static final int DEATHS_DOMAIN_42344 = 42344; + public static final int DEATHS_DOMAIN_42345 = 42345; + public static final int VINE_42350 = 42350; + public static final int BOULDERS_42365 = 42365; + public static final int BOULDERS_42366 = 42366; + public static final int BOULDERS_42367 = 42367; + public static final int BOULDERS_42368 = 42368; + public static final int BOULDERS_42369 = 42369; + public static final int BOULDERS_42370 = 42370; + public static final int ROCK_42371 = 42371; + public static final int ROCK_42372 = 42372; + public static final int ROCK_42373 = 42373; + public static final int ROCK_42374 = 42374; + public static final int ROCK_42375 = 42375; + public static final int ROCK_42376 = 42376; + public static final int PINE = 42377; + public static final int PINE_42378 = 42378; + public static final int PINE_42379 = 42379; + public static final int PINE_42380 = 42380; + public static final int PINE_42381 = 42381; + public static final int PINE_42382 = 42382; + public static final int PINE_42383 = 42383; + public static final int PINE_42384 = 42384; + public static final int ROOTS_42385 = 42385; + public static final int ROOTS_42386 = 42386; + public static final int ROOTS_42387 = 42387; + public static final int PINE_42388 = 42388; + public static final int PINE_42389 = 42389; + public static final int TREE_42390 = 42390; + public static final int YEW_42391 = 42391; + public static final int TREE_STUMP_42392 = 42392; + public static final int TREE_42393 = 42393; + public static final int TREE_STUMP_42394 = 42394; + public static final int OAK_42395 = 42395; + public static final int TREE_STUMP_42396 = 42396; + public static final int BUSH_42397 = 42397; + public static final int PLANT_42398 = 42398; + public static final int PLANT_42399 = 42399; + public static final int PLANT_42400 = 42400; + public static final int PLANT_42401 = 42401; + public static final int PLANT_42402 = 42402; + public static final int PLANT_42403 = 42403; + public static final int PLANT_42404 = 42404; + public static final int PLANT_42405 = 42405; + public static final int HOLLOW_LOG_42406 = 42406; + public static final int HOLLOW_LOG_42407 = 42407; + public static final int FOREST_MUSHROOMS = 42408; + public static final int TOADSTOOL = 42409; + public static final int TOADSTOOLS = 42410; + public static final int FLOWERS_42414 = 42414; + public static final int FLOWERS_42415 = 42415; + public static final int BAR_42424 = 42424; + public static final int BAR_42425 = 42425; + public static final int BAR_42426 = 42426; + public static final int YEW_42427 = 42427; + public static final int GRANDFATHER_CLOCK_42428 = 42428; /* This file is automatically generated. Do not edit. */ } From 82496d2306578d352e157cc40dd47112f9004e42 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 15 Jun 2021 07:00:33 -0600 Subject: [PATCH 05/11] Update NPC IDs to 2021-6-16 --- .../src/main/java/net/runelite/api/NpcID.java | 312 +++++++++++++++--- .../main/java/net/runelite/api/NullNpcID.java | 63 ++++ 2 files changed, 324 insertions(+), 51 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 b5d7e119a5..50c8f2e3ea 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -387,10 +387,10 @@ public final class NpcID public static final int ROD_FISHING_SPOT = 394; public static final int CAT = 395; public static final int JON = 396; - public static final int TOWN_GUARD = 397; - public static final int TOWN_GUARD_398 = 398; - public static final int TOWN_GUARD_399 = 399; - public static final int TOWN_GUARD_400 = 400; + public static final int GUARD = 397; + public static final int GUARD_398 = 398; + public static final int GUARD_399 = 399; + public static final int GUARD_400 = 400; public static final int TURAEL = 401; public static final int MAZCHNA = 402; public static final int VANNAKA = 403; @@ -959,7 +959,7 @@ public final class NpcID public static final int SIGMUND_992 = 992; public static final int SIGMUND_993 = 993; public static final int SIGMUND_994 = 994; - public static final int GUARD = 995; + public static final int GUARD_995 = 995; public static final int NARDOK = 996; public static final int DARTOG = 997; public static final int GUARD_998 = 998; @@ -1312,7 +1312,7 @@ public final class NpcID public static final int MOUNTAIN_GOAT_1387 = 1387; public static final int BALD_HEADED_EAGLE = 1388; public static final int BERNALD = 1389; - public static final int ELLAMARIA = 1390; + public static final int QUEEN_ELLAMARIA = 1390; public static final int TROLLEY = 1391; public static final int TROLLEY_1392 = 1392; public static final int TROLLEY_1393 = 1393; @@ -3149,7 +3149,7 @@ public final class NpcID public static final int SKELETON_CHAMPION = 3358; public static final int ZOMBIES_CHAMPION = 3359; public static final int LEON_DCOUR = 3360; - public static final int KOUREND_GUARD = 3361; + public static final int GUARD_3361 = 3361; public static final int LITARA = 3362; public static final int STANKERS = 3364; public static final int ANGEL = 3369; @@ -3695,7 +3695,7 @@ public final class NpcID public static final int SWENSEN_THE_NAVIGATOR = 3925; public static final int GUARD_3928 = 3928; public static final int GUARD_3929 = 3929; - public static final int TOWN_GUARD_3930 = 3930; + public static final int TOWN_GUARD = 3930; public static final int TOWN_GUARD_3931 = 3931; public static final int THORA_THE_BARKEEP = 3932; public static final int YRSA_3933 = 3933; @@ -6207,9 +6207,9 @@ public final class NpcID public static final int BANKER_6862 = 6862; public static final int BANKER_6863 = 6863; public static final int BANKER_6864 = 6864; - public static final int CAPTAIN_SALARA = 6865; - public static final int CAPTAIN_BABACUS = 6866; - public static final int CAPTAIN_KILIAN = 6867; + public static final int GENERAL_SALARA = 6865; + public static final int GENERAL_BABACUS = 6866; + public static final int GENERAL_KILIAN = 6867; public static final int SOLDIER_6868 = 6868; public static final int SOLDIER_6869 = 6869; public static final int SOLDIER_6870 = 6870; @@ -6223,8 +6223,8 @@ public final class NpcID public static final int SOLDIER_6878 = 6878; public static final int SOLDIER_6879 = 6879; public static final int SOLDIER_6880 = 6880; - public static final int SOLDIER_6881 = 6881; - public static final int DRILL_INSTRUCTOR = 6882; + public static final int RANGER_6881 = 6881; + public static final int DRILL_SERGEANT = 6882; public static final int SOLDIER_6883 = 6883; public static final int SOLDIER_6884 = 6884; public static final int SOLDIER_6885 = 6885; @@ -6288,7 +6288,6 @@ public final class NpcID public static final int HORACE = 6943; public static final int VANNAH = 6944; public static final int LOGAVA = 6945; - public static final int PANDUR_HOSIDIUS = 6946; public static final int FARMER_6947 = 6947; public static final int FARMER_6948 = 6948; public static final int FARMER_6949 = 6949; @@ -6358,8 +6357,6 @@ public final class NpcID public static final int DOBWINKLE = 7013; public static final int ALEXANDER = 7014; public static final int CHARLIE_BROWN = 7015; - public static final int KOUREND_GUARD_7016 = 7016; - public static final int KOUREND_HEAD_GUARD = 7017; public static final int REANIMATED_GOBLIN = 7018; public static final int REANIMATED_MONKEY = 7019; public static final int REANIMATED_IMP = 7020; @@ -6520,7 +6517,7 @@ public final class NpcID public static final int CAPTAIN_SHORACKS = 7178; public static final int FISHING_SPOT_7199 = 7199; public static final int FISHING_SPOT_7200 = 7200; - public static final int QUARTERMASTER_BRIGET = 7201; + public static final int BRIGET = 7201; public static final int KENELME = 7202; public static final int THYRIA = 7203; public static final int FILAMINA = 7204; @@ -6760,7 +6757,7 @@ public final class NpcID public static final int FISHING_SPOT_7469 = 7469; public static final int FISHING_SPOT_7470 = 7470; public static final int CAPTAIN_MAGORO = 7471; - public static final int ARCHER_7472 = 7472; + public static final int RANGER_7472 = 7472; public static final int DUCK_7473 = 7473; public static final int REGINALD = 7474; public static final int ROY_JR = 7475; @@ -6873,7 +6870,6 @@ public final class NpcID public static final int SKELETAL_MYSTIC_7606 = 7606; public static final int IMEROMINIA = 7607; public static final int PAGIDA = 7608; - public static final int ISTORIA = 7609; public static final int LOGIOS = 7610; public static final int MELETI = 7611; public static final int KRATO = 7612; @@ -7118,8 +7114,6 @@ public final class NpcID public static final int MIDNIGHT_7893 = 7893; public static final int SAND_SNAKE_HARD = 7894; public static final int SAND_SNAKE = 7895; - public static final int LORD_KANDUR_HOSIDIUS = 7896; - public static final int ELENA_HOSIDIUS = 7897; public static final int ARTUR_HOSIDIUS = 7898; public static final int ARTUR_HOSIDIUS_7899 = 7899; public static final int BUTLER_JARVIS = 7900; @@ -7146,7 +7140,6 @@ public final class NpcID public static final int WOMAN_7921 = 7921; public static final int WOMAN_7922 = 7922; public static final int POOR_LOOKING_WOMAN_7923 = 7923; - public static final int COUNCILLOR_ANDREWS = 7924; public static final int REVENANT_GOBLIN = 7931; public static final int REVENANT_PYREFIEND = 7932; public static final int REVENANT_HOBGOBLIN = 7933; @@ -7200,7 +7193,6 @@ public final class NpcID public static final int ELDER_CHAOS_DRUID_7995 = 7995; public static final int CORRUPT_LIZARDMAN_HARD = 7996; public static final int CORRUPT_LIZARDMAN = 7997; - public static final int LORD_SHIRO_SHAYZIEN = 7998; public static final int PHILEAS_RIMOR = 7999; public static final int CORRUPT_LIZARDMAN_8000 = 8000; public static final int CRUNCHY = 8001; @@ -7376,11 +7368,6 @@ public final class NpcID public static final int AMELIA = 8180; public static final int JONATHAN = 8181; public static final int NATURAL_HISTORIAN_8182 = 8182; - public static final int MARTIN_HOLT = 8183; - public static final int PROTESTER = 8184; - public static final int PROTESTER_8185 = 8185; - public static final int PROTESTER_8186 = 8186; - public static final int PROTESTER_8187 = 8187; public static final int BOULDER_8188 = 8188; public static final int GRAVE_DIGGER = 8189; public static final int JAMES = 8193; @@ -7607,16 +7594,12 @@ public final class NpcID public static final int IKKLE_HYDRA_8494 = 8494; public static final int IKKLE_HYDRA_8495 = 8495; public static final int DWARF_8496 = 8496; - public static final int LADY_VULCANA_LOVAKENGJ = 8497; - public static final int COUNCILLOR_UNKAR = 8498; - public static final int JORRA = 8499; public static final int OLD_DWARF = 8500; public static final int MORI = 8501; public static final int MORI_8502 = 8502; public static final int SURVIVAL_EXPERT = 8503; public static final int LORD_TROBIN_ARCEUUS = 8504; public static final int LORD_TROBIN_ARCEUUS_8505 = 8505; - public static final int ASTEROS_ARCEUUS = 8506; public static final int TOWER_MAGE_8507 = 8507; public static final int TOWER_MAGE_8508 = 8508; public static final int TOWER_MAGE_8509 = 8509; @@ -7650,7 +7633,6 @@ public final class NpcID public static final int ELISE = 8538; public static final int ARC_TEST_01 = 8539; public static final int ARC_TEST_02 = 8540; - public static final int COMMANDER_FULLORE = 8541; public static final int ROYAL_GUARD = 8542; public static final int ROYAL_GUARD_8543 = 8543; public static final int UNDOR = 8544; @@ -7675,21 +7657,20 @@ public final class NpcID public static final int LIZARDMAN_8563 = 8563; public static final int LIZARDMAN_BRUTE_8564 = 8564; public static final int LIZARDMAN_SHAMAN_8565 = 8565; - public static final int SHAYZIEN_BOWMEN = 8566; - public static final int SHAYZIEN_SOLDIER = 8567; - public static final int SHAYZIEN_SOLDIER_8568 = 8568; - public static final int SHAYZIEN_DOYEN = 8569; - public static final int SHAYZIEN_DOYEN_8570 = 8570; + public static final int RANGER_8566 = 8566; + public static final int SOLDIER_8567 = 8567; + public static final int SOLDIER_8568 = 8568; + public static final int DOYEN = 8569; + public static final int DOYEN_8570 = 8570; public static final int NURSE_EMMA_GENTSY = 8571; public static final int WOUNDED_SOLDIER_8572 = 8572; public static final int WOUNDED_SOLDIER_8573 = 8573; public static final int WOUNDED_SOLDIER_8574 = 8574; - public static final int SHAYZIEN_SOLDIER_8575 = 8575; + public static final int SOLDIER_8575 = 8575; public static final int LOVAKENGJ_ENGINEER = 8576; public static final int GENERAL_VIR = 8577; public static final int SWAMP_FROG = 8578; public static final int SHAYZIEN_INFILTRATOR = 8579; - public static final int KAHT_BALAM = 8580; public static final int KETSAL_KUK = 8581; public static final int EKANS_CHAN = 8582; public static final int HESPORI = 8583; @@ -7707,9 +7688,9 @@ public final class NpcID public static final int FELFIZ_YARYUS = 8595; public static final int KEITH = 8596; public static final int ORNATE_COMBAT_DUMMY = 8598; - public static final int SHAYZIEN_SOLDIER_8599 = 8599; - public static final int SHAYZIEN_SERGEANT = 8600; - public static final int SHAYZIEN_ARCHER = 8601; + public static final int SOLDIER_8599 = 8599; + public static final int SERGEANT_8600 = 8600; + public static final int RANGER_8601 = 8601; public static final int KAALKETJOR = 8602; public static final int KAALMEJSAN = 8603; public static final int KAALXILDAR = 8604; @@ -8880,7 +8861,7 @@ public final class NpcID public static final int MARY_10502 = 10502; public static final int MARY_10503 = 10503; public static final int MARY_10504 = 10504; - public static final int SHAYZIEN_SERGEANT_10505 = 10505; + public static final int SERGEANT_10505 = 10505; public static final int HEADLESS_BEAST_10506 = 10506; public static final int ORNATE_UNDEAD_COMBAT_DUMMY = 10507; public static final int ORNATE_WILDERNESS_COMBAT_DUMMY = 10508; @@ -9049,9 +9030,6 @@ public final class NpcID public static final int MURPHY_10707 = 10707; public static final int ENORMOUS_TENTACLE_10708 = 10708; public static final int ENORMOUS_TENTACLE_10709 = 10709; - public static final int GHOSTLY_THRALL = 10714; - public static final int SKELETAL_THRALL = 10715; - public static final int ZOMBIE_THRALL = 10716; public static final int SKELETON_10717 = 10717; public static final int SKELETON_10718 = 10718; public static final int SKELETON_10719 = 10719; @@ -9060,13 +9038,11 @@ public final class NpcID public static final int ICE_SPIDER_10722 = 10722; public static final int VEOS_10723 = 10723; public static final int VEOS_10724 = 10724; - public static final int SHAYZIEN_SERGEANT_10725 = 10725; + public static final int SERGEANT_10725 = 10725; public static final int VEOS_10726 = 10726; public static final int VEOS_10727 = 10727; public static final int WOMAN_10728 = 10728; - public static final int KOUREND_GUARD_10729 = 10729; - public static final int KOUREND_HEAD_GUARD_10730 = 10730; - public static final int ARCHER_10731 = 10731; + public static final int RANGER_10731 = 10731; public static final int ZAMORAKIAN_RECRUITER = 10732; public static final int MEREDITH = 10733; public static final int BANKER_10734 = 10734; @@ -9205,5 +9181,239 @@ public final class NpcID public static final int MYSTERIOUS_STRANGER_10875 = 10875; public static final int MYSTERIOUS_STRANGER_10876 = 10876; public static final int MYSTERIOUS_STRANGER_10877 = 10877; + public static final int LESSER_GHOSTLY_THRALL = 10878; + public static final int SUPERIOR_GHOSTLY_THRALL = 10879; + public static final int GREATER_GHOSTLY_THRALL = 10880; + public static final int LESSER_SKELETAL_THRALL = 10881; + public static final int SUPERIOR_SKELETAL_THRALL = 10882; + public static final int GREATER_SKELETAL_THRALL = 10883; + public static final int LESSER_ZOMBIFIED_THRALL = 10884; + public static final int SUPERIOR_ZOMBIFIED_THRALL = 10885; + public static final int GREATER_ZOMBIFIED_THRALL = 10886; + public static final int TOWN_CRIER_10887 = 10887; + public static final int BAT_10888 = 10888; + public static final int ASTEROS_ARCEUUS = 10889; + public static final int MARTIN_HOLT = 10890; + public static final int MARTIN_HOLT_10891 = 10891; + public static final int MARTIN_HOLT_10892 = 10892; + public static final int MARTIN_HOLT_10893 = 10893; + public static final int MARTIN_HOLT_10894 = 10894; + public static final int MARTIN_HOLT_10895 = 10895; + public static final int PROTEST_LEADER = 10896; + public static final int PROTESTER = 10897; + public static final int PROTESTER_10898 = 10898; + public static final int PROTESTER_10899 = 10899; + public static final int PROTESTER_10900 = 10900; + public static final int PROTESTER_10901 = 10901; + public static final int PROTESTER_10902 = 10902; + public static final int PROTESTER_10903 = 10903; + public static final int PROTESTER_10904 = 10904; + public static final int PROTESTER_10905 = 10905; + public static final int PROTESTER_10906 = 10906; + public static final int PROTESTER_10907 = 10907; + public static final int PROTESTER_10908 = 10908; + public static final int GUARD_10909 = 10909; + public static final int GUARD_10910 = 10910; + public static final int GUARD_10911 = 10911; + public static final int GUARD_10912 = 10912; + public static final int GUARD_10913 = 10913; + public static final int GUARD_10914 = 10914; + public static final int GUARD_10915 = 10915; + public static final int GUARD_10916 = 10916; + public static final int GUARD_10917 = 10917; + public static final int GUARD_10918 = 10918; + public static final int GUARD_10919 = 10919; + public static final int GUARD_10920 = 10920; + public static final int GUARD_10921 = 10921; + public static final int COMMANDER_FULLORE = 10922; + public static final int COMMANDER_FULLORE_10923 = 10923; + public static final int ROYAL_GUARD_10924 = 10924; + public static final int ROYAL_GUARD_10925 = 10925; + public static final int COUNCILLOR_ANDREWS = 10926; + public static final int DAVID_ANDREWS = 10927; + public static final int TOMAS_LAWRY_10928 = 10928; + public static final int TOMAS_LAWRY_10929 = 10929; + public static final int CAPTAIN_GINEA_10931 = 10931; + public static final int CABIN_BOY_HERBERT = 10932; + public static final int CABIN_BOY_HERBERT_10933 = 10933; + public static final int CABIN_BOY_HERBERT_10934 = 10934; + public static final int SOPHIA_HUGHES_10935 = 10935; + public static final int JUDGE_OF_YAMA = 10936; + public static final int MYSTERIOUS_VOICE_10937 = 10937; + public static final int JUDGE_OF_YAMA_10938 = 10938; + public static final int FIRE_WAVE = 10939; + public static final int ASSASSIN_10940 = 10940; + public static final int ASSASSIN_10941 = 10941; + public static final int ASSASSIN_10942 = 10942; + public static final int COUNCILLOR_ORSON = 10943; + public static final int COUNCILLOR_ORSON_10944 = 10944; + public static final int MAN_10945 = 10945; + public static final int COUNCILLOR_ORSON_10946 = 10946; + public static final int LIZARDMAN_BRUTE_10947 = 10947; + public static final int LIZARDMAN_10948 = 10948; + public static final int VEOS_10949 = 10949; + public static final int MYSTERIOUS_VOICE_10950 = 10950; + public static final int XAMPHUR = 10951; + public static final int MYSTERIOUS_VOICE_10952 = 10952; + public static final int XAMPHUR_10953 = 10953; + public static final int XAMPHUR_10954 = 10954; + public static final int XAMPHUR_10955 = 10955; + public static final int XAMPHUR_10956 = 10956; + public static final int PHANTOM_HAND = 10957; + public static final int PHANTOM_HAND_10958 = 10958; + public static final int KUBEC_UNKAR = 10959; + public static final int COUNCILLOR_UNKAR = 10960; + public static final int LORD_TROBIN_ARCEUUS_10961 = 10961; + public static final int LORD_TROBIN_ARCEUUS_10962 = 10962; + public static final int LORD_SHIRO_SHAYZIEN = 10963; + public static final int LORD_SHIRO_SHAYZIEN_10964 = 10964; + public static final int LORD_SHIRO_SHAYZIEN_10965 = 10965; + public static final int LORD_KANDUR_HOSIDIUS = 10966; + public static final int KING_KANDUR_HOSIDIUS = 10967; + public static final int KING_KANDUR_HOSIDIUS_10968 = 10968; + public static final int KING_KANDUR_HOSIDIUS_10969 = 10969; + public static final int LORD_KANDUR_HOSIDIUS_10970 = 10970; + public static final int LORD_KANDUR_HOSIDIUS_10971 = 10971; + public static final int LADY_VULCANA_LOVAKENGJ = 10972; + public static final int LADY_VULCANA_LOVAKENGJ_10973 = 10973; + public static final int LADY_SHAUNA_PISCARILIUS_10974 = 10974; + public static final int LADY_SHAUNA_PISCARILIUS_10975 = 10975; + public static final int ARTUR_HOSIDIUS_10976 = 10976; + public static final int KING_ARTUR_HOSIDIUS = 10977; + public static final int ASTEROS_ARCEUUS_10978 = 10978; + public static final int ASTEROS_ARCEUUS_10979 = 10979; + public static final int LORD_PANDUR_HOSIDIUS = 10980; + public static final int PANDUR_HOSIDIUS = 10981; + public static final int ELENA_HOSIDIUS = 10982; + public static final int ELENA_HOSIDIUS_10983 = 10983; + public static final int BARBARIAN_10984 = 10984; + public static final int BARBARIAN_10985 = 10985; + public static final int BARBARIAN_10986 = 10986; + public static final int BARBARIAN_10987 = 10987; + public static final int BARBARIAN_10988 = 10988; + public static final int BARBARIAN_WARLORD = 10989; + public static final int PHILEAS_RIMOR_10991 = 10991; + public static final int CAPTAIN_RACHELLE_10992 = 10992; + public static final int PROTESTER_10993 = 10993; + public static final int PROTESTER_10994 = 10994; + public static final int PROTESTER_10995 = 10995; + public static final int PROTESTER_10996 = 10996; + public static final int PROTESTER_10997 = 10997; + public static final int PROTESTER_10998 = 10998; + public static final int PROTESTER_10999 = 10999; + public static final int PROTESTER_11000 = 11000; + public static final int PROTESTER_11001 = 11001; + public static final int PROTESTER_11002 = 11002; + public static final int PROTESTER_11003 = 11003; + public static final int PROTESTER_11004 = 11004; + public static final int PROTESTER_11005 = 11005; + public static final int PROTESTER_11006 = 11006; + public static final int PROTESTER_11007 = 11007; + public static final int PROTESTER_11008 = 11008; + public static final int PROTESTER_11009 = 11009; + public static final int PROTESTER_11010 = 11010; + public static final int PROTESTER_11011 = 11011; + public static final int QUEEN_ZYANYI_ARKAN = 11012; + public static final int KUALTI = 11013; + public static final int KUALTI_11014 = 11014; + public static final int KUALTI_11015 = 11015; + public static final int KUALTI_11016 = 11016; + public static final int KUALTI_11017 = 11017; + public static final int KUALTI_11018 = 11018; + public static final int KING_ROALD_11019 = 11019; + public static final int SIR_AMIK_VARZE_11020 = 11020; + public static final int SIR_TIFFY_CASHIEN_11021 = 11021; + public static final int KING_LATHAS_11022 = 11022; + public static final int KING_THOROS_11023 = 11023; + public static final int DUKE_HORACIO_11024 = 11024; + public static final int QUEEN_ELLAMARIA_11025 = 11025; + public static final int SEAGULL_11026 = 11026; + public static final int SPIDER_11027 = 11027; + public static final int ICE_CHUNKS = 11028; + public static final int ICE_CHUNKS_11029 = 11029; + public static final int ICE_CHUNKS_11030 = 11030; + public static final int ICE_CHUNKS_11031 = 11031; + public static final int MAN_11032 = 11032; + public static final int LORD_KANDUR_HOSIDIUS_11033 = 11033; + public static final int ELENA_HOSIDIUS_11034 = 11034; + public static final int LADY_VULCANA_LOVAKENGJ_11035 = 11035; + public static final int COUNCILLOR_UNKAR_11036 = 11036; + public static final int JORRA = 11037; + public static final int LORD_SHIRO_SHAYZIEN_11038 = 11038; + public static final int KAHT_BALAM = 11039; + public static final int BLAIR = 11040; + public static final int DARYL = 11041; + public static final int ROBYN = 11042; + public static final int OSWALD = 11043; + public static final int SHERYL = 11044; + public static final int FARMER_11045 = 11045; + public static final int SOLIDER = 11046; + public static final int SOLDIER_11047 = 11047; + public static final int DRUNKEN_SOLDIER = 11048; + public static final int SOLDIER_11049 = 11049; + public static final int FATHER_EYSSERIC = 11050; + public static final int MIA = 11051; + public static final int ELIJAH = 11052; + public static final int WOMAN_11053 = 11053; + public static final int WOMAN_11054 = 11054; + public static final int KASTON = 11055; + public static final int OLD_MAN_11056 = 11056; + public static final int MAN_11057 = 11057; + public static final int MAN_11058 = 11058; + public static final int COMMISSIONER_ANWAR = 11059; + public static final int CAPTAIN_BRUCE = 11060; + public static final int SERGEANT_RICARDO = 11061; + public static final int JESSIE = 11062; + public static final int BANDIT_11063 = 11063; + public static final int BANDIT_11064 = 11064; + public static final int BANDIT_11065 = 11065; + public static final int BOAR = 11066; + public static final int BOAR_11067 = 11067; + public static final int LYNX = 11068; + public static final int LYNX_11069 = 11069; + public static final int LYNX_11070 = 11070; + public static final int LYNX_TAMER = 11071; + public static final int SOLDIER_11072 = 11072; + public static final int SERGEANT_11073 = 11073; + public static final int SOLDIER_11074 = 11074; + public static final int SERGEANT_11075 = 11075; + public static final int SOLDIER_11076 = 11076; + public static final int SERGEANT_11077 = 11077; + public static final int SOLDIER_11078 = 11078; + public static final int SERGEANT_11079 = 11079; + public static final int SOLDIER_11080 = 11080; + public static final int SERGEANT_11081 = 11081; + public static final int SOLDIER_11082 = 11082; + public static final int SERGEANT_11083 = 11083; + public static final int SOLDIER_11084 = 11084; + public static final int SERGEANT_11085 = 11085; + public static final int SOLDIER_11086 = 11086; + public static final int SERGEANT_11087 = 11087; + public static final int NECROMANCER_11088 = 11088; + public static final int RANGER_11089 = 11089; + public static final int FAROLT = 11090; + public static final int PANDUR_HOSIDIUS_11091 = 11091; + public static final int GUARD_11092 = 11092; + public static final int HEAD_GUARD = 11093; + public static final int GUARD_11094 = 11094; + public static final int HEAD_GUARD_11095 = 11095; + public static final int GUARD_11096 = 11096; + public static final int HEAD_GUARD_11097 = 11097; + public static final int GUARD_11098 = 11098; + public static final int HEAD_GUARD_11099 = 11099; + public static final int GUARD_11100 = 11100; + public static final int HEAD_GUARD_11101 = 11101; + public static final int GUARD_11102 = 11102; + public static final int HEAD_GUARD_11103 = 11103; + public static final int GUARD_11104 = 11104; + public static final int HEAD_GUARD_11105 = 11105; + public static final int GUARD_11106 = 11106; + public static final int HEAD_GUARD_11107 = 11107; + public static final int DARK_WARRIOR_11109 = 11109; + public static final int DARK_WARRIOR_11110 = 11110; + public static final int DARK_WARRIOR_11111 = 11111; + public static final int ISTORIA = 11112; + public static final int ISTORIA_11113 = 11113; + public static final int COUNCILLOR_ANDREWS_11152 = 11152; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java index 891544f8be..3568e7a309 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java @@ -646,6 +646,9 @@ public final class NullNpcID public static final int NULL_6820 = 6820; public static final int NULL_6821 = 6821; public static final int NULL_6822 = 6822; + public static final int NULL_6946 = 6946; + public static final int NULL_7016 = 7016; + public static final int NULL_7017 = 7017; public static final int NULL_7070 = 7070; public static final int NULL_7175 = 7175; public static final int NULL_7177 = 7177; @@ -722,6 +725,7 @@ public final class NullNpcID public static final int NULL_7556 = 7556; public static final int NULL_7557 = 7557; public static final int NULL_7596 = 7596; + public static final int NULL_7609 = 7609; public static final int NULL_7617 = 7617; public static final int NULL_7618 = 7618; public static final int NULL_7619 = 7619; @@ -762,6 +766,9 @@ public final class NullNpcID public static final int NULL_7848 = 7848; public static final int NULL_7856 = 7856; public static final int NULL_7857 = 7857; + public static final int NULL_7896 = 7896; + public static final int NULL_7897 = 7897; + public static final int NULL_7924 = 7924; public static final int NULL_7925 = 7925; public static final int NULL_7926 = 7926; public static final int NULL_7927 = 7927; @@ -782,6 +789,7 @@ public final class NullNpcID public static final int NULL_7980 = 7980; public static final int NULL_7993 = 7993; public static final int NULL_7994 = 7994; + public static final int NULL_7998 = 7998; public static final int NULL_8014 = 8014; public static final int NULL_8015 = 8015; public static final int NULL_8016 = 8016; @@ -791,6 +799,10 @@ public final class NullNpcID public static final int NULL_8109 = 8109; public static final int NULL_8110 = 8110; public static final int NULL_8141 = 8141; + public static final int NULL_8184 = 8184; + public static final int NULL_8185 = 8185; + public static final int NULL_8186 = 8186; + public static final int NULL_8187 = 8187; public static final int NULL_8190 = 8190; public static final int NULL_8191 = 8191; public static final int NULL_8192 = 8192; @@ -874,7 +886,12 @@ public final class NullNpcID public static final int NULL_8488 = 8488; public static final int NULL_8489 = 8489; public static final int NULL_8490 = 8490; + public static final int NULL_8497 = 8497; + public static final int NULL_8498 = 8498; + public static final int NULL_8499 = 8499; + public static final int NULL_8506 = 8506; public static final int NULL_8516 = 8516; + public static final int NULL_8580 = 8580; public static final int NULL_8597 = 8597; public static final int NULL_8624 = 8624; public static final int NULL_8625 = 8625; @@ -1648,6 +1665,11 @@ public final class NullNpcID public static final int NULL_10711 = 10711; public static final int NULL_10712 = 10712; public static final int NULL_10713 = 10713; + public static final int NULL_10714 = 10714; + public static final int NULL_10715 = 10715; + public static final int NULL_10716 = 10716; + public static final int NULL_10729 = 10729; + public static final int NULL_10730 = 10730; public static final int NULL_10738 = 10738; public static final int NULL_10747 = 10747; public static final int NULL_10790 = 10790; @@ -1656,5 +1678,46 @@ public final class NullNpcID public static final int NULL_10863 = 10863; public static final int NULL_10866 = 10866; public static final int NULL_10869 = 10869; + public static final int NULL_10930 = 10930; + public static final int NULL_10990 = 10990; + public static final int NULL_11108 = 11108; + public static final int NULL_11114 = 11114; + public static final int NULL_11115 = 11115; + public static final int NULL_11116 = 11116; + public static final int NULL_11117 = 11117; + public static final int NULL_11118 = 11118; + public static final int NULL_11119 = 11119; + public static final int NULL_11120 = 11120; + public static final int NULL_11121 = 11121; + public static final int NULL_11122 = 11122; + public static final int NULL_11123 = 11123; + public static final int NULL_11124 = 11124; + public static final int NULL_11125 = 11125; + public static final int NULL_11126 = 11126; + public static final int NULL_11127 = 11127; + public static final int NULL_11128 = 11128; + public static final int NULL_11129 = 11129; + public static final int NULL_11130 = 11130; + public static final int NULL_11131 = 11131; + public static final int NULL_11132 = 11132; + public static final int NULL_11133 = 11133; + public static final int NULL_11134 = 11134; + public static final int NULL_11135 = 11135; + public static final int NULL_11136 = 11136; + public static final int NULL_11137 = 11137; + public static final int NULL_11138 = 11138; + public static final int NULL_11139 = 11139; + public static final int NULL_11140 = 11140; + public static final int NULL_11141 = 11141; + public static final int NULL_11142 = 11142; + public static final int NULL_11143 = 11143; + public static final int NULL_11144 = 11144; + public static final int NULL_11145 = 11145; + public static final int NULL_11146 = 11146; + public static final int NULL_11147 = 11147; + public static final int NULL_11148 = 11148; + public static final int NULL_11149 = 11149; + public static final int NULL_11150 = 11150; + public static final int NULL_11151 = 11151; /* This file is automatically generated. Do not edit. */ } From 5260ccc78c44bf628399fc085ec9f664b55d2284 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 15 Jun 2021 07:00:35 -0600 Subject: [PATCH 06/11] Update Widget IDs to 2021-6-16 --- .../src/main/java/net/runelite/api/widgets/WidgetID.java | 7 +++---- .../src/main/java/net/runelite/api/widgets/WidgetInfo.java | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 5c5b395588..af4a16ea25 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -185,10 +185,9 @@ public class WidgetID static class DialogNPC { - static final int HEAD_MODEL = 1; - static final int NAME = 2; - static final int CONTINUE = 3; - static final int TEXT = 4; + static final int HEAD_MODEL = 6; + static final int NAME = 3; + static final int TEXT = 5; } static class LogoutPanel diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index 4044ef93b0..761b7fab6e 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -338,11 +338,9 @@ public enum WidgetInfo DIALOG_SPRITE_SPRITE(WidgetID.DIALOG_SPRITE_GROUP_ID, WidgetID.DialogSprite.SPRITE), DIALOG_SPRITE_TEXT(WidgetID.DIALOG_SPRITE_GROUP_ID, WidgetID.DialogSprite.TEXT), - DIALOG_NPC(WidgetID.DIALOG_NPC_GROUP_ID, 0), DIALOG_NPC_NAME(WidgetID.DIALOG_NPC_GROUP_ID, WidgetID.DialogNPC.NAME), DIALOG_NPC_TEXT(WidgetID.DIALOG_NPC_GROUP_ID, WidgetID.DialogNPC.TEXT), DIALOG_NPC_HEAD_MODEL(WidgetID.DIALOG_NPC_GROUP_ID, WidgetID.DialogNPC.HEAD_MODEL), - DIALOG_NPC_CONTINUE(WidgetID.DIALOG_NPC_GROUP_ID, WidgetID.DialogNPC.CONTINUE), DIALOG_PLAYER(WidgetID.DIALOG_PLAYER_GROUP_ID, 0), From f1fc3ccb5cff9868ab2aac80aa13cc5ee2a74a6d Mon Sep 17 00:00:00 2001 From: Max Weber Date: Thu, 10 Jun 2021 12:55:14 -0600 Subject: [PATCH 07/11] cache: add 197 opcodes --- .../net/runelite/cache/definitions/ItemDefinition.java | 3 +++ .../net/runelite/cache/definitions/ObjectDefinition.java | 1 + .../runelite/cache/definitions/loaders/ItemLoader.java | 8 ++++++++ .../runelite/cache/definitions/loaders/ObjectLoader.java | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java index 8f67622b24..f918da5a54 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java @@ -33,6 +33,7 @@ public class ItemDefinition public final int id; public String name = "null"; + public String unknown1; public int resizeX = 128; public int resizeY = 128; @@ -86,6 +87,8 @@ public class ItemDefinition public int femaleOffset; public int femaleHeadModel = -1; public int femaleHeadModel2 = -1; + + public int category; public int notedID = -1; public int notedTemplate = -1; diff --git a/cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java index 503da29002..b729023abc 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java @@ -68,6 +68,7 @@ public class ObjectDefinition private int contouredGround = -1; private int supportsItems = -1; private int[] configChangeDest; + private int category; private boolean isRotated = false; private int varpID = -1; private int ambientSoundId = -1; diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java index 6cb6c9bd41..c7286369c3 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java @@ -93,6 +93,10 @@ public class ItemLoader def.yOffset2d -= 65536; } } + else if (opcode == 9) + { + def.unknown1 = stream.readString(); + } else if (opcode == 11) { def.stackable = 1; @@ -193,6 +197,10 @@ public class ItemLoader { def.femaleHeadModel2 = stream.readUnsignedShort(); } + else if (opcode == 94) + { + def.category = stream.readUnsignedShort(); + } else if (opcode == 95) { def.zan2d = stream.readUnsignedShort(); diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java index 0f78b59999..7a9162cd64 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java @@ -194,6 +194,10 @@ public class ObjectLoader def.setRetextureToFind(retextureToFind); def.setTextureToReplace(textureToReplace); } + else if (opcode == 61) + { + def.setCategory(is.readUnsignedShort()); + } else if (opcode == 62) { def.setRotated(true); From da38684cac498dc31676461c362dff073f1a92cc Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Mon, 14 Jun 2021 16:19:14 -0700 Subject: [PATCH 08/11] clues: Update and add clues for 6/16 Shayzien rework --- .../client/plugins/cluescrolls/clues/AnagramClue.java | 5 +++-- .../client/plugins/cluescrolls/clues/CoordinateClue.java | 7 +++++-- .../plugins/cluescrolls/clues/hotcold/HotColdLocation.java | 6 +++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/AnagramClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/AnagramClue.java index 28d848a5b3..c419fd64a1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/AnagramClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/AnagramClue.java @@ -126,7 +126,7 @@ public class AnagramClue extends ClueScroll implements TextClueScroll, NpcClueSc new AnagramClue("O BIRDZ A ZANY EN PC", "Cap'n Izzy No-Beard", new WorldPoint(2807, 3191, 0), "Brimhaven Agility Arena", "How many Banana Trees are there in the plantation?", "33"), new AnagramClue("OK CO", "Cook", new WorldPoint(3207, 3214, 0), "Ground floor of Lumbridge Castle", "How many cannons does Lumbridge Castle have?", "9"), new AnagramClue("OR ZINC FUMES WARD", "Wizard Frumscone", new WorldPoint(2594, 3086, 0), "Downstairs in the Wizards' Guild"), - new AnagramClue("OUR OWN NEEDS", "Nurse Wooned", new WorldPoint(1575, 3590, 0), "Shayzien Infirmary", "How many injured soldiers are in this tent?", "19"), + new AnagramClue("OUR OWN NEEDS", "Nurse Wooned", new WorldPoint(1511, 3619, 0), "Shayzien Infirmary", "How many wounded soldiers are in the camp?", "19"), new AnagramClue("PACINNG A TAIE", "Captain Ginea", new WorldPoint(1561, 3602, 0), "Building east of Shayzien combat ring", "1 soldier can deal with 6 lizardmen. How many soldiers do we need for an army of 678 lizardmen?", "113"), new AnagramClue("PEAK REFLEX", "Flax keeper", new WorldPoint(2744, 3444, 0), "Flax field south of Seers Village", "If I have 1014 flax, and I spin a third of them into bowstring, how many flax do I have left?", "676"), new AnagramClue("PEATY PERT", "Party Pete", new WorldPoint(3047, 3376, 0), "Falador Party Room"), @@ -166,7 +166,8 @@ public class AnagramClue extends ClueScroll implements TextClueScroll, NpcClueSc new AnagramClue("SIR SHARE RED", "Hairdresser", new WorldPoint(2944, 3381, 0), "Western Falador"), new AnagramClue("TAUNT ROOF", "Fortunato", new WorldPoint(3080, 3250, 0), "Draynor Village Market"), new AnagramClue("HICK JET", "Jethick", new WorldPoint(2541, 3305, 0), "West Ardougne", "How many graves are there in the city graveyard?", "38"), - new AnagramClue("RUE GO", "Goreu", new WorldPoint(2335, 3162, 0), "Lletya") + new AnagramClue("RUE GO", "Goreu", new WorldPoint(2335, 3162, 0), "Lletya"), + new AnagramClue("BRUCIE CATNAP", "Captain Bruce", new WorldPoint(1520, 3558, 0), "Graveyard of Heroes") ); private final String text; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java index 09d1026e29..230e18106f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java @@ -111,7 +111,7 @@ public class CoordinateClue extends ClueScroll implements TextClueScroll, Locati .put(new WorldPoint(2363, 3531, 0), new CoordinateClueInfo("North-east of Eagles' Peak (AKQ).")) .put(new WorldPoint(2919, 3535, 0), new CoordinateClueInfo("East of Burthorpe pub.")) .put(new WorldPoint(3548, 3560, 0), new CoordinateClueInfo("Inside Fenkenstrain's Castle.")) - .put(new WorldPoint(1456, 3620, 0), new CoordinateClueInfo("Graveyard west of Shayzien (DJR).")) + .put(new WorldPoint(1476, 3566, 0), new CoordinateClueInfo("Graveyard of Heroes west of Shayzien (DJR).")) .put(new WorldPoint(2735, 3638, 0), new CoordinateClueInfo("East of Rellekka, north-west of Golden Apple Tree (AJR).")) .put(new WorldPoint(2681, 3653, 0), new CoordinateClueInfo("Rellekka, in the garden of the south-east house.")) .put(new WorldPoint(2537, 3881, 0), new CoordinateClueInfo("Miscellania (CIP).")) @@ -147,7 +147,7 @@ public class CoordinateClue extends ClueScroll implements TextClueScroll, Locati .put(new WorldPoint(3305, 3692, 0), new CoordinateClueInfo("Wilderness. West of eastern green dragon.", ZAMORAK_WIZARD)) .put(new WorldPoint(3055, 3696, 0), new CoordinateClueInfo("Wilderness. Bandit Camp.", ZAMORAK_WIZARD)) .put(new WorldPoint(3302, 3696, 0), new CoordinateClueInfo("Wilderness. West of eastern green dragon.", ZAMORAK_WIZARD)) - .put(new WorldPoint(1479, 3696, 0), new CoordinateClueInfo("Lizardman Canyon (DJR).", SARADOMIN_WIZARD)) + .put(new WorldPoint(1479, 3699, 0), new CoordinateClueInfo("Lizardman Canyon (DJR).", SARADOMIN_WIZARD)) .put(new WorldPoint(2712, 3732, 0), new CoordinateClueInfo("North-east of Rellekka (DKS).", SARADOMIN_WIZARD)) .put(new WorldPoint(2970, 3749, 0), new CoordinateClueInfo("Wilderness. Forgotten Cemetery.", ZAMORAK_WIZARD)) .put(new WorldPoint(3094, 3764, 0), new CoordinateClueInfo("Wilderness. Mining site north of Bandit Camp.", ZAMORAK_WIZARD)) @@ -170,6 +170,7 @@ public class CoordinateClue extends ClueScroll implements TextClueScroll, Locati .put(new WorldPoint(2341, 3697, 0), new CoordinateClueInfo("North-east of the Piscatoris Fishing Colony bank.", SARADOMIN_WIZARD)) .put(new WorldPoint(3143, 3774, 0), new CoordinateClueInfo("In level 32 Wilderness, by the black chinchompa hunting area.", ZAMORAK_WIZARD)) .put(new WorldPoint(2992, 3941, 0), new CoordinateClueInfo("Wilderness Agility Course, past the log balance.", ZAMORAK_WIZARD)) + .put(new WorldPoint(1410, 3611, 0), new CoordinateClueInfo("Lake Molch dock west of Shayzien Encampment.", SARADOMIN_WIZARD)) // Elite .put(new WorldPoint(2357, 3151, 0), new CoordinateClueInfo("Lletya.", ARMADYLEAN_OR_BANDOSIAN_GUARD)) .put(new WorldPoint(3587, 3180, 0), new CoordinateClueInfo("Meiyerditch.", ARMADYLEAN_OR_BANDOSIAN_GUARD)) @@ -207,6 +208,7 @@ public class CoordinateClue extends ClueScroll implements TextClueScroll, Locati .put(new WorldPoint(3560, 3987, 0), new CoordinateClueInfo("Lithkren. Digsite pendant teleport if unlocked, otherwise take rowboat from west of Mushroom Meadow Mushtree.", ARMADYLEAN_OR_BANDOSIAN_GUARD)) .put(new WorldPoint(2318, 2954, 0), new CoordinateClueInfo("North-east corner of the Isle of Souls.", ARMADYLEAN_OR_BANDOSIAN_GUARD)) .put(new WorldPoint(2094, 2889, 0), new CoordinateClueInfo("West side of the Isle of Souls.", ARMADYLEAN_OR_BANDOSIAN_GUARD)) + .put(new WorldPoint(1451, 3509, 0), new CoordinateClueInfo("Ruins of Morra.", ARMADYLEAN_OR_BANDOSIAN_GUARD)) // Master .put(new WorldPoint(2178, 3209, 0), new CoordinateClueInfo("South of Iorwerth Camp.", BRASSICAN_MAGE)) .put(new WorldPoint(2155, 3100, 0), new CoordinateClueInfo("South of Port Tyras (BJS if 76 Agility).", BRASSICAN_MAGE)) @@ -234,6 +236,7 @@ public class CoordinateClue extends ClueScroll implements TextClueScroll, Locati .put(new WorldPoint(3188, 3939, 0), new CoordinateClueInfo("Wilderness. Resource Area.", BRASSICAN_MAGE)) .put(new WorldPoint(3304, 3941, 0), new CoordinateClueInfo("Wilderness. East of Rogues' Castle.", ANCIENT_WIZARDS)) .put(new WorldPoint(2994, 3961, 0), new CoordinateClueInfo("Wilderness. Inside Agility Training Area.", BRASSICAN_MAGE)) + .put(new WorldPoint(1770, 3417, 0), new CoordinateClueInfo("Crabclaw Isle", ANCIENT_WIZARDS)) .build(); private final String text; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java index 415c06112b..5b338907a0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java @@ -171,11 +171,11 @@ public enum HotColdLocation ZEAH_LOVAKITE_FURNACE(MASTER, new WorldPoint(1507, 3819, 0), ZEAH, "Next to the lovakite furnace in Lovakengj.", ANCIENT_WIZARDS), ZEAH_LOVAKENGJ_MINE(MASTER, new WorldPoint(1477, 3778, 0), ZEAH, "Next to mithril rock in the Lovakengj mine.", ANCIENT_WIZARDS), ZEAH_SULPHR_MINE(MASTER, new WorldPoint(1428, 3869, 0), ZEAH, "Western entrance in the Lovakengj sulphur mine. Facemask or Slayer Helmet recommended.", BRASSICAN_MAGE), - ZEAH_SHAYZIEN_BANK(MASTER, new WorldPoint(1517, 3603, 0), ZEAH, "South-east of the bank in Shayzien.", ANCIENT_WIZARDS), + ZEAH_SHAYZIEN_BANK(MASTER, new WorldPoint(1498, 3627, 0), ZEAH, "South-east of the bank in Shayzien Encampment.", ANCIENT_WIZARDS), ZEAH_OVERPASS(MASTER, new WorldPoint(1467, 3714, 0), ZEAH, "Overpass between Lovakengj and Shayzien.", BRASSICAN_MAGE), ZEAH_LIZARDMAN(MASTER, new WorldPoint(1490, 3698, 0), ZEAH, "Within Lizardman Canyon, east of the ladder. Requires 5% favour with Shayzien.", ANCIENT_WIZARDS), - ZEAH_COMBAT_RING(MASTER, new WorldPoint(1559, 3582, 0), ZEAH, "Shayzien, south-east of the Combat Ring.", BRASSICAN_MAGE), - ZEAH_SHAYZIEN_BANK_2(MASTER, new WorldPoint(1491, 3623, 0), ZEAH, "North-west of the bank in Shayzien.", ANCIENT_WIZARDS), + ZEAH_COMBAT_RING(MASTER, new WorldPoint(1557, 3624, 0), ZEAH, "Shayzien Encampment, south-east of the Combat Ring.", BRASSICAN_MAGE), + ZEAH_SHAYZIEN_BANK_2(MASTER, new WorldPoint(1490, 3602, 0), ZEAH, "North of the bank in Shayzien.", ANCIENT_WIZARDS), ZEAH_LIBRARY(MASTER, new WorldPoint(1603, 3843, 0), ZEAH, "North-west of the Arceuus Library.", BRASSICAN_MAGE), ZEAH_HOUSECHURCH(MASTER, new WorldPoint(1682, 3792, 0), ZEAH, "By the entrance to the Arceuus church.", ANCIENT_WIZARDS), ZEAH_DARK_ALTAR(MASTER, new WorldPoint(1698, 3881, 0), ZEAH, "West of the Dark Altar.", BRASSICAN_MAGE), From a6c9c0aa43a8f556adf0590bf2b47f1ef63b155a Mon Sep 17 00:00:00 2001 From: Max Weber Date: Tue, 15 Jun 2021 08:25:49 -0600 Subject: [PATCH 09/11] rl-api: update Quest enum to 2021-6-16 --- runelite-api/src/main/java/net/runelite/api/Quest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/Quest.java b/runelite-api/src/main/java/net/runelite/api/Quest.java index 688109214f..b82157be29 100644 --- a/runelite-api/src/main/java/net/runelite/api/Quest.java +++ b/runelite-api/src/main/java/net/runelite/api/Quest.java @@ -30,8 +30,6 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor public enum Quest { - //Free Quests - BELOW_ICE_MOUNTAIN(2874, "Below Ice Mountain"), BLACK_KNIGHTS_FORTRESS(299, "Black Knights' Fortress"), COOKS_ASSISTANT(300, "Cook's Assistant"), THE_CORSAIR_CURSE(301, "The Corsair Curse"), @@ -53,6 +51,7 @@ public enum Quest VAMPYRE_SLAYER(1278, "Vampyre Slayer"), WITCHS_POTION(318, "Witch's Potion"), X_MARKS_THE_SPOT(550, "X Marks the Spot"), + BELOW_ICE_MOUNTAIN(2874, "Below Ice Mountain"), //Members' Quests ANIMAL_MAGNETISM(331, "Animal Magnetism"), @@ -181,11 +180,13 @@ public enum Quest SINS_OF_THE_FATHER(1276, "Sins of the Father"), A_PORCINE_OF_INTEREST(1690, "A Porcine of Interest"), GETTING_AHEAD(752, "Getting Ahead"), + A_KINGDOM_DIVIDED(2971, "A Kingdom Divided"), + A_NIGHT_AT_THE_THEATRE(949, "A Night at the Theatre"), //Miniquests ENTER_THE_ABYSS(319, "Enter the Abyss"), ARCHITECTURAL_ALLIANCE(320, "Architectural Alliance"), - BEAR_YOUR_SOUL(321, "Bear your Soul"), + BEAR_YOUR_SOUL(321, "Bear Your Soul"), ALFRED_GRIMHANDS_BARCRAWL(322, "Alfred Grimhand's Barcrawl"), CURSE_OF_THE_EMPTY_LORD(323, "Curse of the Empty Lord"), ENCHANTED_KEY(324, "Enchanted Key"), From 87d798206aff483109a2025f1aabb389bdb08434 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Wed, 16 Jun 2021 10:27:15 +0000 Subject: [PATCH 10/11] Release 1.7.12 --- 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 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-jshell/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 1a07002ca1..d73deac837 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.12-SNAPSHOT + 1.7.12 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index a7d370bf53..33cb72b376 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.12-SNAPSHOT + 1.7.12 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 82585e2805..bd0a8e6830 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.12-SNAPSHOT + 1.7.12 cache diff --git a/http-api/pom.xml b/http-api/pom.xml index 55920760c7..0f8e951272 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.12-SNAPSHOT + 1.7.12 Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index 3a0cecc90c..126c1006fd 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.12-SNAPSHOT + 1.7.12 Web Service diff --git a/pom.xml b/pom.xml index e831d07230..06365065f9 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.12-SNAPSHOT + 1.7.12 pom RuneLite @@ -61,7 +61,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - HEAD + runelite-parent-1.7.12 diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 9b5530d49c..94bd57a613 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.12-SNAPSHOT + 1.7.12 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 3f5e8a0b67..a49d0a303a 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.12-SNAPSHOT + 1.7.12 client diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml index eebe5807d8..4361280b01 100644 --- a/runelite-jshell/pom.xml +++ b/runelite-jshell/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.7.12-SNAPSHOT + 1.7.12 jshell diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index ad4095c150..4c973aa246 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.12-SNAPSHOT + 1.7.12 script-assembler-plugin From 8f237d333816df8acd9fa4922381e105ea0268a8 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Wed, 16 Jun 2021 10:27:24 +0000 Subject: [PATCH 11/11] Bump for 1.7.13-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 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-jshell/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index d73deac837..5bced8369e 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.12 + 1.7.13-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 33cb72b376..ca284ec1be 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.12 + 1.7.13-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index bd0a8e6830..bee7117b4a 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.12 + 1.7.13-SNAPSHOT cache diff --git a/http-api/pom.xml b/http-api/pom.xml index 0f8e951272..2e2e06e079 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.12 + 1.7.13-SNAPSHOT Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index 126c1006fd..dda68afb9c 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.12 + 1.7.13-SNAPSHOT Web Service diff --git a/pom.xml b/pom.xml index 06365065f9..5c8b63c9b3 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.12 + 1.7.13-SNAPSHOT pom RuneLite @@ -61,7 +61,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - runelite-parent-1.7.12 + HEAD diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 94bd57a613..92126ae6d1 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.12 + 1.7.13-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index a49d0a303a..14883c0f56 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.12 + 1.7.13-SNAPSHOT client diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml index 4361280b01..3cfdcfd48b 100644 --- a/runelite-jshell/pom.xml +++ b/runelite-jshell/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.7.12 + 1.7.13-SNAPSHOT jshell diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 4c973aa246..f525e3d480 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.12 + 1.7.13-SNAPSHOT script-assembler-plugin