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 954e2a13bc..43bf4ffe46 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -2849,7 +2849,7 @@ public final class ItemID public static final int PILE_OF_SALT = 4689; public static final int SPHINXS_TOKEN = 4691; public static final int GOLD_LEAF = 4692; - public static final int FULL_BUCKET_4693 = 4693; + public static final int BUCKET_OF_SALTWATER = 4693; public static final int STEAM_RUNE = 4694; public static final int MIST_RUNE = 4695; public static final int DUST_RUNE = 4696; @@ -5696,10 +5696,14 @@ public final class ItemID public static final int STONE_STATUETTE = 9038; public static final int GOLD_SEAL = 9040; public static final int STONE_SEAL = 9042; - public static final int PHARAOHS_SCEPTRE_3 = 9044; - public static final int PHARAOHS_SCEPTRE_2 = 9046; - public static final int PHARAOHS_SCEPTRE_1 = 9048; - public static final int PHARAOHS_SCEPTRE = 9050; + public static final int PHARAOHS_SCEPTRE = 9044; + public static final int PHARAOHS_SCEPTRE_9045 = 9045; + public static final int PHARAOHS_SCEPTRE_9046 = 9046; + public static final int PHARAOHS_SCEPTRE_9047 = 9047; + public static final int PHARAOHS_SCEPTRE_9048 = 9048; + public static final int PHARAOHS_SCEPTRE_9049 = 9049; + public static final int PHARAOHS_SCEPTRE_9050 = 9050; + public static final int PHARAOHS_SCEPTRE_9051 = 9051; public static final int LOCUST_MEAT = 9052; public static final int RED_GOBLIN_MAIL = 9054; public static final int BLACK_GOBLIN_MAIL = 9055; @@ -8091,11 +8095,11 @@ public final class ItemID public static final int CHOMPY_CHICK = 13071; public static final int ELITE_VOID_TOP = 13072; public static final int ELITE_VOID_ROBE = 13073; - public static final int PHARAOHS_SCEPTRE_8 = 13074; - public static final int PHARAOHS_SCEPTRE_7 = 13075; - public static final int PHARAOHS_SCEPTRE_6 = 13076; - public static final int PHARAOHS_SCEPTRE_5 = 13077; - public static final int PHARAOHS_SCEPTRE_4 = 13078; + public static final int PHARAOHS_SCEPTRE_13074 = 13074; + public static final int PHARAOHS_SCEPTRE_13075 = 13075; + public static final int PHARAOHS_SCEPTRE_13076 = 13076; + public static final int PHARAOHS_SCEPTRE_13077 = 13077; + public static final int PHARAOHS_SCEPTRE_13078 = 13078; public static final int ENCHANTED_LYRE5 = 13079; public static final int NEW_CRYSTAL_HALBERD_FULL_I = 13080; public static final int CRYSTAL_HALBERD_FULL_I = 13081; @@ -8591,6 +8595,7 @@ public final class ItemID public static final int CABBAGE_CAPE = 13679; public static final int CABBAGE_RUNE = 13680; public static final int CRUCIFEROUS_CODEX = 13681; + public static final int PHARAOHS_SCEPTRE_16176 = 16176; public static final int USELESS_KEY_16684 = 16684; public static final int NEW_CRYSTAL_BOW_16888 = 16888; public static final int NEW_CRYSTAL_BOW_I_16889 = 16889; @@ -9707,6 +9712,8 @@ public final class ItemID public static final int WILDERNESS_CAPE_21437 = 21437; public static final int WILDERNESS_CAPE_21438 = 21438; public static final int CHAMPIONS_CAPE = 21439; + public static final int PHARAOHS_SCEPTRE_21445 = 21445; + public static final int PHARAOHS_SCEPTRE_21446 = 21446; public static final int TEAK_SEEDLING = 21469; public static final int MAHOGANY_SEEDLING = 21471; public static final int TEAK_SEEDLING_W = 21473; @@ -12604,5 +12611,54 @@ public final class ItemID public static final int TARNISHED_LOCKET = 26910; public static final int LOST_BAG = 26912; public static final int AMULET_OF_THE_EYE = 26914; + public static final int SPECIAL_HOT_SAUCE = 26916; + public static final int SPECIAL_SUPER_HOT_KEBAB = 26917; + public static final int SECRET_REPORT = 26918; + public static final int BIG_BUCKET = 26919; + public static final int BIG_BUCKET_OF_CAMEL_MILK = 26920; + public static final int BIG_BUCKET_OF_FROZEN_CAMEL_MILK = 26921; + public static final int MAGICAL_CLEANING_POTION_26924 = 26924; + public static final int COOLER = 26925; + public static final int EASTER_EGG_26926 = 26926; + public static final int MELTED_EASTER_EGG = 26927; + public static final int ICE_CREAM_EASTER_EGG = 26928; + public static final int BLUNT_SCIMITARS = 26929; + public static final int WASHING_LINE = 26930; + public static final int TANNING_WHEEL = 26931; + public static final int VAT_DIRTY = 26932; + public static final int VAT_CLEANED = 26933; + public static final int WOODEN_POLE = 26934; + public static final int CHURNING_MACHINE = 26935; + public static final int FROZEN_CHURNING_MACHINE = 26936; + public static final int EASTER_HAT = 26937; + public static final int CRATE_RING = 26939; + public static final int POLYELEMENTAL_GUARDIAN_STONE = 26941; + public static final int MESSAGE_26942 = 26942; + public static final int CLUE_SCROLL_ELITE_26943 = 26943; + public static final int CLUE_SCROLL_ELITE_26944 = 26944; + public static final int PHARAOHS_SCEPTRE_UNCHARGED = 26945; + public static final int PHARAOHS_SCEPTRE_26948 = 26948; + public static final int PHARAOHS_SCEPTRE_26950 = 26950; + public static final int SCARAB_MOULD = 26952; + public static final int SCARAB_EMBLEM = 26953; + public static final int STONE_TABLET_26954 = 26954; + public static final int CHEST_26955 = 26955; + public static final int SCARAB_EMBLEM_26956 = 26956; + public static final int HUMAN_EMBLEM = 26957; + public static final int BABOON_EMBLEM = 26958; + public static final int CROCODILE_EMBLEM = 26959; + public static final int RUSTY_KEY = 26960; + public static final int LILY_OF_THE_ELID = 26961; + public static final int CURE_CRATE = 26962; + public static final int ODD_SPECTACLES = 26963; + public static final int BOTTLE_OF_TONIC = 26965; + public static final int CIRCLET_OF_WATER_UNCHARGED = 26967; + public static final int CIRCLET_OF_WATER = 26969; + public static final int CABBAGE_26971 = 26971; + public static final int CABBAGE_26973 = 26973; + public static final int CABBAGE_26975 = 26975; + public static final int CABBAGE_26977 = 26977; + public static final int CABBAGE_26979 = 26979; + public static final int LION_HELM = 26981; /* This file is automatically generated. Do not edit. */ } \ No newline at end of file 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 6e12c89f91..3f6c6632f6 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -3077,7 +3077,7 @@ public final class NpcID public static final int HOBGOBLIN_3289 = 3289; public static final int FROG_3290 = 3290; public static final int POSTIE_PETE = 3291; - public static final int ALKHARID_WARRIOR = 3292; + public static final int AL_KHARID_WARRIOR = 3292; public static final int PALADIN_3293 = 3293; public static final int PALADIN_3294 = 3294; public static final int HERO = 3295; @@ -3649,11 +3649,9 @@ public final class NpcID public static final int SOPHANEM_GUARD_3882 = 3882; public static final int SOPHANEM_GUARD_3883 = 3883; public static final int SOPHANEM_GUARD_3884 = 3884; - public static final int MENAPHITE_GUARD = 3885; - public static final int COENUS = 3886; public static final int BANKER_3887 = 3887; public static final int BANKER_3888 = 3888; - public static final int STONE_MASON = 3889; + public static final int STONEMASON_3889 = 3889; public static final int NATHIFA = 3890; public static final int URBI = 3891; public static final int JAMILA = 3892; @@ -3936,25 +3934,17 @@ public final class NpcID public static final int GOLRIE_4183 = 4183; public static final int CROCODILE = 4184; public static final int JACKAL = 4185; - public static final int LOCUST = 4186; public static final int ODDSKULL = 4187; - public static final int PLAGUE_FROG = 4188; - public static final int PLAGUE_COW = 4189; - public static final int PLAGUE_COW_4190 = 4190; - public static final int PLAGUE_COW_4191 = 4191; public static final int SCARAB_SWARM_4192 = 4192; public static final int WANDERER = 4193; public static final int WANDERER_4194 = 4194; - public static final int HET = 4195; - public static final int APMEKEN = 4196; - public static final int SCABARAS = 4197; - public static final int CRONDIS = 4198; + public static final int APPARITION = 4195; + public static final int APPARITION_4196 = 4196; + public static final int APPARITION_4197 = 4197; + public static final int APPARITION_4198 = 4198; public static final int ICTHLARIN = 4199; - public static final int SLAVE = 4200; - public static final int SLAVE_4201 = 4201; public static final int EMBALMER = 4202; public static final int CARPENTER = 4203; - public static final int RAETUL = 4204; public static final int SIAMUN = 4205; public static final int HIGH_PRIEST_4206 = 4206; public static final int PRIEST_4207 = 4207; @@ -4016,15 +4006,11 @@ public final class NpcID public static final int MAN_4271 = 4271; public static final int MAN_4272 = 4272; public static final int LEELA = 4274; - public static final int JOE_4275 = 4275; public static final int JAIL_GUARD = 4276; public static final int JAIL_GUARD_4277 = 4277; public static final int JAIL_GUARD_4278 = 4278; public static final int JAIL_GUARD_4279 = 4279; public static final int NED = 4280; - public static final int LADY_KELI = 4281; - public static final int PRINCE_ALI = 4282; - public static final int PRINCE_ALI_4283 = 4283; public static final int AGGIE = 4284; public static final int HASSAN = 4285; public static final int OSMAN_4286 = 4286; @@ -4941,10 +4927,6 @@ public final class NpcID public static final int MONKEY_ZOMBIE_5282 = 5282; public static final int MONKEY_ZOMBIE_5283 = 5283; public static final int BONZARA = 5284; - public static final int EMBALMER_5288 = 5288; - public static final int CARPENTER_5289 = 5289; - public static final int LINEN_WORKER = 5290; - public static final int PRIEST_5291 = 5291; public static final int ELF_WARRIOR = 5293; public static final int ELF_WARRIOR_5294 = 5294; public static final int ELF_ARCHER = 5295; @@ -7808,7 +7790,7 @@ public final class NpcID public static final int ILFEEN_8769 = 8769; public static final int ELVEN_SCOUT_8770 = 8770; public static final int MOURNER = 8771; - public static final int SLAVE_8772 = 8772; + public static final int SLAVE = 8772; public static final int SLAVE_8773 = 8773; public static final int SLAVE_8774 = 8774; public static final int SEREN = 8775; @@ -9665,5 +9647,146 @@ public final class NpcID public static final int ABYSSAL_WALKER_11454 = 11454; public static final int THE_GREAT_GUARDIAN_11455 = 11455; public static final int THE_GREAT_GUARDIAN_11456 = 11456; + public static final int SUSPICIOUS_CRATE = 11462; + public static final int SUSPICIOUS_CRATE_11463 = 11463; + public static final int PHOEBE_KAY = 11464; + public static final int XI_PLZPETDOGZ_XIX = 11465; + public static final int XI_PLZPETDOGZ_XIX_11466 = 11466; + public static final int CAMARST_11467 = 11467; + public static final int EASTER_BUNNY = 11468; + public static final int EASTER_BUNNY_11470 = 11470; + public static final int TARIK_11473 = 11473; + public static final int MAISA_11474 = 11474; + public static final int MAISA_11475 = 11475; + public static final int MAISA_11476 = 11476; + public static final int MAISA_11477 = 11477; + public static final int SPIRIT = 11478; + public static final int MEHHAR = 11479; + public static final int HIGH_PRIEST_OF_SCABARAS = 11480; + public static final int HIGH_PRIEST_OF_SCABARAS_11481 = 11481; + public static final int CHAMPION_OF_SCABARAS = 11482; + public static final int CHAMPION_OF_SCABARAS_11483 = 11483; + public static final int SCARAB_SWARM_11484 = 11484; + public static final int SHADOW_RIFT = 11485; + public static final int OSMAN_11486 = 11486; + public static final int OSMAN_11487 = 11487; + public static final int SELIM = 11489; + public static final int MENAPHITE_AKH = 11490; + public static final int MENAPHITE_AKH_11491 = 11491; + public static final int MENAPHITE_AKH_11492 = 11492; + public static final int MENAPHITE_AKH_11493 = 11493; + public static final int MENAPHITE_SHADOW = 11494; + public static final int MENAPHITE_AKH_11495 = 11495; + public static final int MENAPHITE_AKH_11496 = 11496; + public static final int MENAPHITE_AKH_11497 = 11497; + public static final int MENAPHITE_AKH_11498 = 11498; + public static final int COENUS = 11499; + public static final int JABARI = 11500; + public static final int PHARAOH_KEMESIS = 11501; + public static final int HIGH_PRIEST_11502 = 11502; + public static final int PRIEST_11503 = 11503; + public static final int MENAPHITE_GUARD = 11504; + public static final int MENAPHITE_GUARD_11505 = 11505; + public static final int MENAPHITE_GUARD_11506 = 11506; + public static final int MENAPHITE_GUARD_11507 = 11507; + public static final int SCARAB_MAGE_11508 = 11508; + public static final int SCARAB_SWARM_11509 = 11509; + public static final int SCARAB_MAGE_11510 = 11510; + public static final int SCARAB_MAGE_11511 = 11511; + public static final int CROCODILE_11513 = 11513; + public static final int ROGER = 11514; + public static final int MENAPHITE_GUARD_11515 = 11515; + public static final int MENAPHITE_GUARD_11516 = 11516; + public static final int MENAPHITE_GUARD_11517 = 11517; + public static final int MENAPHITE_GUARD_11518 = 11518; + public static final int MENAPHITE_GUARD_11519 = 11519; + public static final int MENAPHITE_GUARD_11520 = 11520; + public static final int MENAPHITE_GUARD_11521 = 11521; + public static final int MENAPHITE_GUARD_11522 = 11522; + public static final int MENAPHITE_GUARD_11523 = 11523; + public static final int MENAPHITE_GUARD_11524 = 11524; + public static final int MENAPHITE_GUARD_11525 = 11525; + public static final int MENAPHITE_GUARD_11526 = 11526; + public static final int MENAPHITE_GUARD_11527 = 11527; + public static final int HEAD_MENAPHITE_GUARD = 11528; + public static final int HEAD_MENAPHITE_GUARD_11529 = 11529; + public static final int HEAD_MENAPHITE_GUARD_11530 = 11530; + public static final int HEAD_MENAPHITE_GUARD_11531 = 11531; + public static final int HEAD_MENAPHITE_GUARD_11532 = 11532; + public static final int CITIZEN = 11533; + public static final int CITIZEN_11534 = 11534; + public static final int CITIZEN_11535 = 11535; + public static final int CITIZEN_11536 = 11536; + public static final int CITIZEN_11537 = 11537; + public static final int CITIZEN_11538 = 11538; + public static final int CITIZEN_11539 = 11539; + public static final int CITIZEN_11540 = 11540; + public static final int CITIZEN_11541 = 11541; + public static final int CITIZEN_11542 = 11542; + public static final int CITIZEN_11543 = 11543; + public static final int CITIZEN_11544 = 11544; + public static final int CITIZEN_11545 = 11545; + public static final int CITIZEN_11546 = 11546; + public static final int CITIZEN_11547 = 11547; + public static final int CITIZEN_11548 = 11548; + public static final int CITIZEN_11549 = 11549; + public static final int CITIZEN_11550 = 11550; + public static final int CITIZEN_11551 = 11551; + public static final int CITIZEN_11552 = 11552; + public static final int CITIZEN_11553 = 11553; + public static final int CITIZEN_11554 = 11554; + public static final int CITIZEN_11555 = 11555; + public static final int CITIZEN_11556 = 11556; + public static final int CITIZEN_11557 = 11557; + public static final int CITIZEN_11558 = 11558; + public static final int SCABARAS = 11560; + public static final int SELIM_11561 = 11561; + public static final int JEX_11562 = 11562; + public static final int JEX_11563 = 11563; + public static final int MAISA_11564 = 11564; + public static final int OSMAN_11565 = 11565; + public static final int OSMAN_11566 = 11566; + public static final int SCARAB_SWARM_11569 = 11569; + public static final int MENAPHITE_GUARD_11570 = 11570; + public static final int MENAPHITE_GUARD_11571 = 11571; + public static final int MENAPHITE_GUARD_11572 = 11572; + public static final int MENAPHITE_GUARD_11573 = 11573; + public static final int MENAPHITE_GUARD_11574 = 11574; + public static final int MENAPHITE_GUARD_11575 = 11575; + public static final int COENUS_11576 = 11576; + public static final int JOE_11577 = 11577; + public static final int LADY_KELI = 11578; + public static final int PRINCE_ALI = 11579; + public static final int PRINCE_ALI_11580 = 11580; + public static final int CROCODILE_11581 = 11581; + public static final int CROCODILE_11582 = 11582; + public static final int JACKAL_11583 = 11583; + public static final int LOCUST = 11584; + public static final int LOCUST_11585 = 11585; + public static final int PLAGUE_FROG = 11586; + public static final int PLAGUE_COW = 11587; + public static final int PLAGUE_COW_11588 = 11588; + public static final int PLAGUE_COW_11589 = 11589; + public static final int WANDERER_11590 = 11590; + public static final int AMASCUT = 11591; + public static final int WORKER = 11592; + public static final int WORKER_11593 = 11593; + public static final int WORKER_11594 = 11594; + public static final int WORKER_11595 = 11595; + public static final int EMBALMER_11596 = 11596; + public static final int CARPENTER_11597 = 11597; + public static final int RAETUL = 11598; + public static final int RAETUL_11599 = 11599; + public static final int RAETUL_11600 = 11600; + public static final int SIAMUN_11601 = 11601; + public static final int HIGH_PRIEST_11602 = 11602; + public static final int HIGH_PRIEST_11603 = 11603; + public static final int HIGH_PRIEST_11604 = 11604; + public static final int HIGH_PRIEST_11605 = 11605; + public static final int PRIEST_11606 = 11606; + public static final int PRIEST_11607 = 11607; + public static final int POSSESSED_PRIEST_11608 = 11608; + public static final int PRIEST_11609 = 11609; + public static final int PRIEST_11610 = 11610; /* 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 35eb01c8be..32cf3307b1 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -3233,10 +3233,6 @@ public final class NullItemID public static final int NULL_9039 = 9039; public static final int NULL_9041 = 9041; public static final int NULL_9043 = 9043; - public static final int NULL_9045 = 9045; - public static final int NULL_9047 = 9047; - public static final int NULL_9049 = 9049; - public static final int NULL_9051 = 9051; public static final int NULL_9053 = 9053; public static final int NULL_9060 = 9060; public static final int NULL_9061 = 9061; @@ -7470,7 +7466,6 @@ public final class NullItemID public static final int NULL_16173 = 16173; public static final int NULL_16174 = 16174; public static final int NULL_16175 = 16175; - public static final int NULL_16176 = 16176; public static final int NULL_16177 = 16177; public static final int NULL_16178 = 16178; public static final int NULL_16179 = 16179; @@ -11551,8 +11546,6 @@ public final class NullItemID public static final int NULL_21442 = 21442; public static final int NULL_21443 = 21443; public static final int NULL_21444 = 21444; - public static final int NULL_21445 = 21445; - public static final int NULL_21446 = 21446; public static final int NULL_21447 = 21447; public static final int NULL_21448 = 21448; public static final int NULL_21449 = 21449; @@ -14101,5 +14094,24 @@ public final class NullItemID public static final int NULL_26911 = 26911; public static final int NULL_26913 = 26913; public static final int NULL_26915 = 26915; + public static final int NULL_26922 = 26922; + public static final int NULL_26923 = 26923; + public static final int NULL_26938 = 26938; + public static final int NULL_26940 = 26940; + public static final int NULL_26946 = 26946; + public static final int NULL_26947 = 26947; + public static final int NULL_26949 = 26949; + public static final int NULL_26951 = 26951; + public static final int NULL_26964 = 26964; + public static final int NULL_26966 = 26966; + public static final int NULL_26968 = 26968; + public static final int NULL_26970 = 26970; + public static final int NULL_26972 = 26972; + public static final int NULL_26974 = 26974; + public static final int NULL_26976 = 26976; + public static final int NULL_26978 = 26978; + public static final int NULL_26980 = 26980; + public static final int NULL_26982 = 26982; + public static final int NULL_26983 = 26983; /* 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 061dbb4252..7dd4520230 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java @@ -234,6 +234,8 @@ public final class NullNpcID public static final int NULL_3828 = 3828; public static final int NULL_3854 = 3854; public static final int NULL_3857 = 3857; + public static final int NULL_3885 = 3885; + public static final int NULL_3886 = 3886; public static final int NULL_3926 = 3926; public static final int NULL_3927 = 3927; public static final int NULL_3983 = 3983; @@ -248,6 +250,14 @@ public final class NullNpcID public static final int NULL_4009 = 4009; public static final int NULL_4013 = 4013; public static final int NULL_4113 = 4113; + public static final int NULL_4186 = 4186; + public static final int NULL_4188 = 4188; + public static final int NULL_4189 = 4189; + public static final int NULL_4190 = 4190; + public static final int NULL_4191 = 4191; + public static final int NULL_4200 = 4200; + public static final int NULL_4201 = 4201; + public static final int NULL_4204 = 4204; public static final int NULL_4211 = 4211; public static final int NULL_4254 = 4254; public static final int NULL_4258 = 4258; @@ -257,6 +267,10 @@ public final class NullNpcID public static final int NULL_4262 = 4262; public static final int NULL_4267 = 4267; public static final int NULL_4273 = 4273; + public static final int NULL_4275 = 4275; + public static final int NULL_4281 = 4281; + public static final int NULL_4282 = 4282; + public static final int NULL_4283 = 4283; public static final int NULL_4297 = 4297; public static final int NULL_4300 = 4300; public static final int NULL_4338 = 4338; @@ -345,6 +359,10 @@ public final class NullNpcID public static final int NULL_5285 = 5285; public static final int NULL_5286 = 5286; public static final int NULL_5287 = 5287; + public static final int NULL_5288 = 5288; + public static final int NULL_5289 = 5289; + public static final int NULL_5290 = 5290; + public static final int NULL_5291 = 5291; public static final int NULL_5292 = 5292; public static final int NULL_5298 = 5298; public static final int NULL_5301 = 5301; @@ -1780,5 +1798,52 @@ public final class NullNpcID public static final int NULL_11459 = 11459; public static final int NULL_11460 = 11460; public static final int NULL_11461 = 11461; + public static final int NULL_11469 = 11469; + public static final int NULL_11471 = 11471; + public static final int NULL_11472 = 11472; + public static final int NULL_11488 = 11488; + public static final int NULL_11512 = 11512; + public static final int NULL_11559 = 11559; + public static final int NULL_11567 = 11567; + public static final int NULL_11568 = 11568; + public static final int NULL_11611 = 11611; + public static final int NULL_11612 = 11612; + public static final int NULL_11613 = 11613; + public static final int NULL_11614 = 11614; + public static final int NULL_11615 = 11615; + public static final int NULL_11616 = 11616; + public static final int NULL_11617 = 11617; + public static final int NULL_11618 = 11618; + public static final int NULL_11619 = 11619; + public static final int NULL_11620 = 11620; + public static final int NULL_11621 = 11621; + public static final int NULL_11622 = 11622; + public static final int NULL_11623 = 11623; + public static final int NULL_11624 = 11624; + public static final int NULL_11625 = 11625; + public static final int NULL_11626 = 11626; + public static final int NULL_11627 = 11627; + public static final int NULL_11628 = 11628; + public static final int NULL_11629 = 11629; + public static final int NULL_11630 = 11630; + public static final int NULL_11631 = 11631; + public static final int NULL_11632 = 11632; + public static final int NULL_11633 = 11633; + public static final int NULL_11634 = 11634; + public static final int NULL_11635 = 11635; + public static final int NULL_11636 = 11636; + public static final int NULL_11637 = 11637; + public static final int NULL_11638 = 11638; + public static final int NULL_11639 = 11639; + public static final int NULL_11640 = 11640; + public static final int NULL_11641 = 11641; + public static final int NULL_11642 = 11642; + public static final int NULL_11643 = 11643; + public static final int NULL_11644 = 11644; + public static final int NULL_11645 = 11645; + public static final int NULL_11646 = 11646; + public static final int NULL_11647 = 11647; + public static final int NULL_11648 = 11648; + public static final int NULL_11649 = 11649; /* This file is automatically generated. Do not edit. */ } 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 2ba2045f64..d33578c0a6 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -1279,6 +1279,8 @@ public final class NullObjectID public static final int NULL_2843 = 2843; public static final int NULL_2855 = 2855; public static final int NULL_2870 = 2870; + public static final int NULL_2882 = 2882; + public static final int NULL_2883 = 2883; public static final int NULL_2898 = 2898; public static final int NULL_2899 = 2899; public static final int NULL_2914 = 2914; @@ -3118,6 +3120,7 @@ public final class NullObjectID public static final int NULL_6566 = 6566; public static final int NULL_6576 = 6576; public static final int NULL_6577 = 6577; + public static final int NULL_6579 = 6579; public static final int NULL_6580 = 6580; public static final int NULL_6582 = 6582; public static final int NULL_6583 = 6583; @@ -3147,11 +3150,17 @@ public final class NullObjectID public static final int NULL_6619 = 6619; public static final int NULL_6621 = 6621; public static final int NULL_6628 = 6628; + public static final int NULL_6630 = 6630; public static final int NULL_6631 = 6631; public static final int NULL_6634 = 6634; public static final int NULL_6636 = 6636; public static final int NULL_6638 = 6638; public static final int NULL_6640 = 6640; + public static final int NULL_6643 = 6643; + public static final int NULL_6650 = 6650; + public static final int NULL_6651 = 6651; + public static final int NULL_6652 = 6652; + public static final int NULL_6653 = 6653; public static final int NULL_6654 = 6654; public static final int NULL_6664 = 6664; public static final int NULL_6668 = 6668; @@ -9160,6 +9169,7 @@ public final class NullObjectID public static final int NULL_20276 = 20276; public static final int NULL_20282 = 20282; public static final int NULL_20283 = 20283; + public static final int NULL_20288 = 20288; public static final int NULL_20289 = 20289; public static final int NULL_20290 = 20290; public static final int NULL_20291 = 20291; @@ -9195,10 +9205,12 @@ public final class NullObjectID public static final int NULL_20337 = 20337; public static final int NULL_20338 = 20338; public static final int NULL_20339 = 20339; + public static final int NULL_20345 = 20345; public static final int NULL_20355 = 20355; public static final int NULL_20361 = 20361; public static final int NULL_20363 = 20363; public static final int NULL_20366 = 20366; + public static final int NULL_20378 = 20378; public static final int NULL_20380 = 20380; public static final int NULL_20381 = 20381; public static final int NULL_20382 = 20382; @@ -9207,6 +9219,7 @@ public final class NullObjectID public static final int NULL_20385 = 20385; public static final int NULL_20389 = 20389; public static final int NULL_20390 = 20390; + public static final int NULL_20391 = 20391; public static final int NULL_20392 = 20392; public static final int NULL_20393 = 20393; public static final int NULL_20394 = 20394; @@ -21626,5 +21639,519 @@ public final class NullObjectID public static final int NULL_43846 = 43846; public static final int NULL_43847 = 43847; public static final int NULL_43848 = 43848; + public static final int NULL_43850 = 43850; + public static final int NULL_43855 = 43855; + public static final int NULL_43866 = 43866; + public static final int NULL_43871 = 43871; + public static final int NULL_43872 = 43872; + public static final int NULL_43874 = 43874; + public static final int NULL_43875 = 43875; + public static final int NULL_43880 = 43880; + public static final int NULL_43881 = 43881; + public static final int NULL_43885 = 43885; + public static final int NULL_43896 = 43896; + public static final int NULL_43897 = 43897; + public static final int NULL_43904 = 43904; + public static final int NULL_43905 = 43905; + public static final int NULL_43906 = 43906; + public static final int NULL_43907 = 43907; + public static final int NULL_43908 = 43908; + public static final int NULL_43909 = 43909; + public static final int NULL_43910 = 43910; + public static final int NULL_43911 = 43911; + public static final int NULL_43912 = 43912; + public static final int NULL_43913 = 43913; + public static final int NULL_43914 = 43914; + public static final int NULL_43915 = 43915; + public static final int NULL_43916 = 43916; + public static final int NULL_43917 = 43917; + public static final int NULL_43918 = 43918; + public static final int NULL_43928 = 43928; + public static final int NULL_43929 = 43929; + public static final int NULL_43930 = 43930; + public static final int NULL_43931 = 43931; + public static final int NULL_43932 = 43932; + public static final int NULL_43933 = 43933; + public static final int NULL_43934 = 43934; + public static final int NULL_43942 = 43942; + public static final int NULL_43943 = 43943; + public static final int NULL_43944 = 43944; + public static final int NULL_43945 = 43945; + public static final int NULL_43946 = 43946; + public static final int NULL_43947 = 43947; + public static final int NULL_43998 = 43998; + public static final int NULL_43999 = 43999; + public static final int NULL_44000 = 44000; + public static final int NULL_44001 = 44001; + public static final int NULL_44002 = 44002; + public static final int NULL_44005 = 44005; + public static final int NULL_44006 = 44006; + public static final int NULL_44007 = 44007; + public static final int NULL_44011 = 44011; + public static final int NULL_44012 = 44012; + public static final int NULL_44016 = 44016; + public static final int NULL_44017 = 44017; + public static final int NULL_44018 = 44018; + public static final int NULL_44037 = 44037; + public static final int NULL_44039 = 44039; + public static final int NULL_44041 = 44041; + public static final int NULL_44045 = 44045; + public static final int NULL_44055 = 44055; + public static final int NULL_44056 = 44056; + public static final int NULL_44066 = 44066; + public static final int NULL_44067 = 44067; + public static final int NULL_44083 = 44083; + public static final int NULL_44084 = 44084; + public static final int NULL_44085 = 44085; + public static final int NULL_44086 = 44086; + public static final int NULL_44087 = 44087; + public static final int NULL_44088 = 44088; + public static final int NULL_44089 = 44089; + public static final int NULL_44090 = 44090; + public static final int NULL_44091 = 44091; + public static final int NULL_44092 = 44092; + public static final int NULL_44093 = 44093; + public static final int NULL_44094 = 44094; + public static final int NULL_44095 = 44095; + public static final int NULL_44096 = 44096; + public static final int NULL_44097 = 44097; + public static final int NULL_44098 = 44098; + public static final int NULL_44099 = 44099; + public static final int NULL_44100 = 44100; + public static final int NULL_44101 = 44101; + public static final int NULL_44102 = 44102; + public static final int NULL_44103 = 44103; + public static final int NULL_44104 = 44104; + public static final int NULL_44105 = 44105; + public static final int NULL_44106 = 44106; + public static final int NULL_44107 = 44107; + public static final int NULL_44108 = 44108; + public static final int NULL_44109 = 44109; + public static final int NULL_44110 = 44110; + public static final int NULL_44112 = 44112; + public static final int NULL_44114 = 44114; + public static final int NULL_44115 = 44115; + public static final int NULL_44116 = 44116; + public static final int NULL_44117 = 44117; + public static final int NULL_44118 = 44118; + public static final int NULL_44119 = 44119; + public static final int NULL_44120 = 44120; + public static final int NULL_44121 = 44121; + public static final int NULL_44122 = 44122; + public static final int NULL_44123 = 44123; + public static final int NULL_44124 = 44124; + public static final int NULL_44125 = 44125; + public static final int NULL_44138 = 44138; + public static final int NULL_44139 = 44139; + public static final int NULL_44140 = 44140; + public static final int NULL_44141 = 44141; + public static final int NULL_44142 = 44142; + public static final int NULL_44149 = 44149; + public static final int NULL_44150 = 44150; + public static final int NULL_44151 = 44151; + public static final int NULL_44152 = 44152; + public static final int NULL_44153 = 44153; + public static final int NULL_44154 = 44154; + public static final int NULL_44155 = 44155; + public static final int NULL_44156 = 44156; + public static final int NULL_44157 = 44157; + public static final int NULL_44158 = 44158; + public static final int NULL_44159 = 44159; + public static final int NULL_44160 = 44160; + public static final int NULL_44161 = 44161; + public static final int NULL_44162 = 44162; + public static final int NULL_44163 = 44163; + public static final int NULL_44164 = 44164; + public static final int NULL_44165 = 44165; + public static final int NULL_44166 = 44166; + public static final int NULL_44167 = 44167; + public static final int NULL_44168 = 44168; + public static final int NULL_44169 = 44169; + public static final int NULL_44170 = 44170; + public static final int NULL_44171 = 44171; + public static final int NULL_44172 = 44172; + public static final int NULL_44173 = 44173; + public static final int NULL_44174 = 44174; + public static final int NULL_44175 = 44175; + public static final int NULL_44176 = 44176; + public static final int NULL_44177 = 44177; + public static final int NULL_44178 = 44178; + public static final int NULL_44179 = 44179; + public static final int NULL_44180 = 44180; + public static final int NULL_44181 = 44181; + public static final int NULL_44182 = 44182; + public static final int NULL_44183 = 44183; + public static final int NULL_44184 = 44184; + public static final int NULL_44185 = 44185; + public static final int NULL_44186 = 44186; + public static final int NULL_44187 = 44187; + public static final int NULL_44188 = 44188; + public static final int NULL_44189 = 44189; + public static final int NULL_44190 = 44190; + public static final int NULL_44191 = 44191; + public static final int NULL_44192 = 44192; + public static final int NULL_44193 = 44193; + public static final int NULL_44194 = 44194; + public static final int NULL_44195 = 44195; + public static final int NULL_44196 = 44196; + public static final int NULL_44197 = 44197; + public static final int NULL_44198 = 44198; + public static final int NULL_44199 = 44199; + public static final int NULL_44200 = 44200; + public static final int NULL_44201 = 44201; + public static final int NULL_44202 = 44202; + public static final int NULL_44203 = 44203; + public static final int NULL_44212 = 44212; + public static final int NULL_44213 = 44213; + public static final int NULL_44214 = 44214; + public static final int NULL_44215 = 44215; + public static final int NULL_44219 = 44219; + public static final int NULL_44220 = 44220; + public static final int NULL_44221 = 44221; + public static final int NULL_44222 = 44222; + public static final int NULL_44229 = 44229; + public static final int NULL_44230 = 44230; + public static final int NULL_44231 = 44231; + public static final int NULL_44232 = 44232; + public static final int NULL_44233 = 44233; + public static final int NULL_44234 = 44234; + public static final int NULL_44235 = 44235; + public static final int NULL_44236 = 44236; + public static final int NULL_44237 = 44237; + public static final int NULL_44238 = 44238; + public static final int NULL_44239 = 44239; + public static final int NULL_44240 = 44240; + public static final int NULL_44241 = 44241; + public static final int NULL_44242 = 44242; + public static final int NULL_44243 = 44243; + public static final int NULL_44244 = 44244; + public static final int NULL_44245 = 44245; + public static final int NULL_44246 = 44246; + public static final int NULL_44247 = 44247; + public static final int NULL_44248 = 44248; + public static final int NULL_44249 = 44249; + public static final int NULL_44250 = 44250; + public static final int NULL_44251 = 44251; + public static final int NULL_44252 = 44252; + public static final int NULL_44253 = 44253; + public static final int NULL_44254 = 44254; + public static final int NULL_44255 = 44255; + public static final int NULL_44256 = 44256; + public static final int NULL_44257 = 44257; + public static final int NULL_44258 = 44258; + public static final int NULL_44259 = 44259; + public static final int NULL_44263 = 44263; + public static final int NULL_44264 = 44264; + public static final int NULL_44265 = 44265; + public static final int NULL_44266 = 44266; + public static final int NULL_44267 = 44267; + public static final int NULL_44268 = 44268; + public static final int NULL_44269 = 44269; + public static final int NULL_44270 = 44270; + public static final int NULL_44271 = 44271; + public static final int NULL_44272 = 44272; + public static final int NULL_44273 = 44273; + public static final int NULL_44274 = 44274; + public static final int NULL_44275 = 44275; + public static final int NULL_44283 = 44283; + public static final int NULL_44284 = 44284; + public static final int NULL_44285 = 44285; + public static final int NULL_44286 = 44286; + public static final int NULL_44297 = 44297; + public static final int NULL_44298 = 44298; + public static final int NULL_44299 = 44299; + public static final int NULL_44300 = 44300; + public static final int NULL_44301 = 44301; + public static final int NULL_44302 = 44302; + public static final int NULL_44303 = 44303; + public static final int NULL_44304 = 44304; + public static final int NULL_44305 = 44305; + public static final int NULL_44306 = 44306; + public static final int NULL_44307 = 44307; + public static final int NULL_44308 = 44308; + public static final int NULL_44309 = 44309; + public static final int NULL_44310 = 44310; + public static final int NULL_44311 = 44311; + public static final int NULL_44312 = 44312; + public static final int NULL_44313 = 44313; + public static final int NULL_44314 = 44314; + public static final int NULL_44315 = 44315; + public static final int NULL_44316 = 44316; + public static final int NULL_44317 = 44317; + public static final int NULL_44318 = 44318; + public static final int NULL_44319 = 44319; + public static final int NULL_44320 = 44320; + public static final int NULL_44321 = 44321; + public static final int NULL_44322 = 44322; + public static final int NULL_44323 = 44323; + public static final int NULL_44324 = 44324; + public static final int NULL_44325 = 44325; + public static final int NULL_44326 = 44326; + public static final int NULL_44327 = 44327; + public static final int NULL_44328 = 44328; + public static final int NULL_44329 = 44329; + public static final int NULL_44330 = 44330; + public static final int NULL_44331 = 44331; + public static final int NULL_44332 = 44332; + public static final int NULL_44333 = 44333; + public static final int NULL_44334 = 44334; + public static final int NULL_44335 = 44335; + public static final int NULL_44336 = 44336; + public static final int NULL_44337 = 44337; + public static final int NULL_44338 = 44338; + public static final int NULL_44339 = 44339; + public static final int NULL_44340 = 44340; + public static final int NULL_44341 = 44341; + public static final int NULL_44342 = 44342; + public static final int NULL_44343 = 44343; + public static final int NULL_44344 = 44344; + public static final int NULL_44345 = 44345; + public static final int NULL_44346 = 44346; + public static final int NULL_44347 = 44347; + public static final int NULL_44348 = 44348; + public static final int NULL_44349 = 44349; + public static final int NULL_44350 = 44350; + public static final int NULL_44351 = 44351; + public static final int NULL_44352 = 44352; + public static final int NULL_44353 = 44353; + public static final int NULL_44354 = 44354; + public static final int NULL_44355 = 44355; + public static final int NULL_44356 = 44356; + public static final int NULL_44357 = 44357; + public static final int NULL_44358 = 44358; + public static final int NULL_44359 = 44359; + public static final int NULL_44360 = 44360; + public static final int NULL_44361 = 44361; + public static final int NULL_44362 = 44362; + public static final int NULL_44363 = 44363; + public static final int NULL_44364 = 44364; + public static final int NULL_44365 = 44365; + public static final int NULL_44366 = 44366; + public static final int NULL_44367 = 44367; + public static final int NULL_44368 = 44368; + public static final int NULL_44369 = 44369; + public static final int NULL_44370 = 44370; + public static final int NULL_44371 = 44371; + public static final int NULL_44372 = 44372; + public static final int NULL_44373 = 44373; + public static final int NULL_44374 = 44374; + public static final int NULL_44375 = 44375; + public static final int NULL_44376 = 44376; + public static final int NULL_44377 = 44377; + public static final int NULL_44378 = 44378; + public static final int NULL_44379 = 44379; + public static final int NULL_44380 = 44380; + public static final int NULL_44381 = 44381; + public static final int NULL_44382 = 44382; + public static final int NULL_44383 = 44383; + public static final int NULL_44384 = 44384; + public static final int NULL_44385 = 44385; + public static final int NULL_44386 = 44386; + public static final int NULL_44387 = 44387; + public static final int NULL_44388 = 44388; + public static final int NULL_44389 = 44389; + public static final int NULL_44390 = 44390; + public static final int NULL_44391 = 44391; + public static final int NULL_44392 = 44392; + public static final int NULL_44393 = 44393; + public static final int NULL_44394 = 44394; + public static final int NULL_44395 = 44395; + public static final int NULL_44396 = 44396; + public static final int NULL_44397 = 44397; + public static final int NULL_44398 = 44398; + public static final int NULL_44399 = 44399; + public static final int NULL_44400 = 44400; + public static final int NULL_44401 = 44401; + public static final int NULL_44402 = 44402; + public static final int NULL_44403 = 44403; + public static final int NULL_44404 = 44404; + public static final int NULL_44405 = 44405; + public static final int NULL_44406 = 44406; + public static final int NULL_44407 = 44407; + public static final int NULL_44408 = 44408; + public static final int NULL_44409 = 44409; + public static final int NULL_44410 = 44410; + public static final int NULL_44411 = 44411; + public static final int NULL_44412 = 44412; + public static final int NULL_44413 = 44413; + public static final int NULL_44414 = 44414; + public static final int NULL_44415 = 44415; + public static final int NULL_44416 = 44416; + public static final int NULL_44417 = 44417; + public static final int NULL_44418 = 44418; + public static final int NULL_44419 = 44419; + public static final int NULL_44420 = 44420; + public static final int NULL_44421 = 44421; + public static final int NULL_44422 = 44422; + public static final int NULL_44423 = 44423; + public static final int NULL_44424 = 44424; + public static final int NULL_44425 = 44425; + public static final int NULL_44426 = 44426; + public static final int NULL_44427 = 44427; + public static final int NULL_44428 = 44428; + public static final int NULL_44429 = 44429; + public static final int NULL_44430 = 44430; + public static final int NULL_44431 = 44431; + public static final int NULL_44432 = 44432; + public static final int NULL_44433 = 44433; + public static final int NULL_44434 = 44434; + public static final int NULL_44435 = 44435; + public static final int NULL_44436 = 44436; + public static final int NULL_44437 = 44437; + public static final int NULL_44438 = 44438; + public static final int NULL_44439 = 44439; + public static final int NULL_44440 = 44440; + public static final int NULL_44441 = 44441; + public static final int NULL_44442 = 44442; + public static final int NULL_44443 = 44443; + public static final int NULL_44444 = 44444; + public static final int NULL_44445 = 44445; + public static final int NULL_44446 = 44446; + public static final int NULL_44447 = 44447; + public static final int NULL_44448 = 44448; + public static final int NULL_44449 = 44449; + public static final int NULL_44450 = 44450; + public static final int NULL_44451 = 44451; + public static final int NULL_44452 = 44452; + public static final int NULL_44453 = 44453; + public static final int NULL_44454 = 44454; + public static final int NULL_44455 = 44455; + public static final int NULL_44456 = 44456; + public static final int NULL_44457 = 44457; + public static final int NULL_44458 = 44458; + public static final int NULL_44459 = 44459; + public static final int NULL_44460 = 44460; + public static final int NULL_44461 = 44461; + public static final int NULL_44462 = 44462; + public static final int NULL_44463 = 44463; + public static final int NULL_44464 = 44464; + public static final int NULL_44465 = 44465; + public static final int NULL_44466 = 44466; + public static final int NULL_44467 = 44467; + public static final int NULL_44468 = 44468; + public static final int NULL_44469 = 44469; + public static final int NULL_44470 = 44470; + public static final int NULL_44471 = 44471; + public static final int NULL_44472 = 44472; + public static final int NULL_44473 = 44473; + public static final int NULL_44474 = 44474; + public static final int NULL_44475 = 44475; + public static final int NULL_44476 = 44476; + public static final int NULL_44477 = 44477; + public static final int NULL_44478 = 44478; + public static final int NULL_44479 = 44479; + public static final int NULL_44480 = 44480; + public static final int NULL_44481 = 44481; + public static final int NULL_44482 = 44482; + public static final int NULL_44483 = 44483; + public static final int NULL_44484 = 44484; + public static final int NULL_44485 = 44485; + public static final int NULL_44486 = 44486; + public static final int NULL_44487 = 44487; + public static final int NULL_44488 = 44488; + public static final int NULL_44489 = 44489; + public static final int NULL_44490 = 44490; + public static final int NULL_44491 = 44491; + public static final int NULL_44492 = 44492; + public static final int NULL_44493 = 44493; + public static final int NULL_44494 = 44494; + public static final int NULL_44495 = 44495; + public static final int NULL_44496 = 44496; + public static final int NULL_44497 = 44497; + public static final int NULL_44498 = 44498; + public static final int NULL_44499 = 44499; + public static final int NULL_44500 = 44500; + public static final int NULL_44501 = 44501; + public static final int NULL_44502 = 44502; + public static final int NULL_44503 = 44503; + public static final int NULL_44504 = 44504; + public static final int NULL_44505 = 44505; + public static final int NULL_44506 = 44506; + public static final int NULL_44507 = 44507; + public static final int NULL_44508 = 44508; + public static final int NULL_44509 = 44509; + public static final int NULL_44510 = 44510; + public static final int NULL_44511 = 44511; + public static final int NULL_44512 = 44512; + public static final int NULL_44513 = 44513; + public static final int NULL_44514 = 44514; + public static final int NULL_44515 = 44515; + public static final int NULL_44516 = 44516; + public static final int NULL_44517 = 44517; + public static final int NULL_44518 = 44518; + public static final int NULL_44519 = 44519; + public static final int NULL_44520 = 44520; + public static final int NULL_44521 = 44521; + public static final int NULL_44522 = 44522; + public static final int NULL_44523 = 44523; + public static final int NULL_44524 = 44524; + public static final int NULL_44525 = 44525; + public static final int NULL_44526 = 44526; + public static final int NULL_44527 = 44527; + public static final int NULL_44528 = 44528; + public static final int NULL_44529 = 44529; + public static final int NULL_44530 = 44530; + public static final int NULL_44531 = 44531; + public static final int NULL_44532 = 44532; + public static final int NULL_44533 = 44533; + public static final int NULL_44534 = 44534; + public static final int NULL_44535 = 44535; + public static final int NULL_44536 = 44536; + public static final int NULL_44537 = 44537; + public static final int NULL_44538 = 44538; + public static final int NULL_44539 = 44539; + public static final int NULL_44540 = 44540; + public static final int NULL_44541 = 44541; + public static final int NULL_44542 = 44542; + public static final int NULL_44543 = 44543; + public static final int NULL_44544 = 44544; + public static final int NULL_44545 = 44545; + public static final int NULL_44546 = 44546; + public static final int NULL_44549 = 44549; + public static final int NULL_44550 = 44550; + public static final int NULL_44554 = 44554; + public static final int NULL_44555 = 44555; + public static final int NULL_44556 = 44556; + public static final int NULL_44557 = 44557; + public static final int NULL_44558 = 44558; + public static final int NULL_44559 = 44559; + public static final int NULL_44560 = 44560; + public static final int NULL_44561 = 44561; + public static final int NULL_44562 = 44562; + public static final int NULL_44563 = 44563; + public static final int NULL_44564 = 44564; + public static final int NULL_44565 = 44565; + public static final int NULL_44566 = 44566; + public static final int NULL_44567 = 44567; + public static final int NULL_44568 = 44568; + public static final int NULL_44569 = 44569; + public static final int NULL_44570 = 44570; + public static final int NULL_44571 = 44571; + public static final int NULL_44572 = 44572; + public static final int NULL_44573 = 44573; + public static final int NULL_44574 = 44574; + public static final int NULL_44575 = 44575; + public static final int NULL_44576 = 44576; + public static final int NULL_44577 = 44577; + public static final int NULL_44578 = 44578; + public static final int NULL_44579 = 44579; + public static final int NULL_44580 = 44580; + public static final int NULL_44581 = 44581; + public static final int NULL_44582 = 44582; + public static final int NULL_44583 = 44583; + public static final int NULL_44587 = 44587; + public static final int NULL_44588 = 44588; + public static final int NULL_44589 = 44589; + public static final int NULL_44590 = 44590; + public static final int NULL_44591 = 44591; + public static final int NULL_44592 = 44592; + public static final int NULL_44593 = 44593; + public static final int NULL_44594 = 44594; + public static final int NULL_44595 = 44595; + public static final int NULL_44596 = 44596; + public static final int NULL_44597 = 44597; + public static final int NULL_44598 = 44598; + public static final int NULL_44599 = 44599; + public static final int NULL_44600 = 44600; /* 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 865e37b59a..dd159ed98d 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -1608,9 +1608,7 @@ public final class ObjectID public static final int SPARKLING_POOL = 2878; public static final int SPARKLING_POOL_2879 = 2879; public static final int MYSTIC_PORTAL = 2880; - public static final int PRISON_DOOR_2881 = 2881; - public static final int GATE_2882 = 2882; - public static final int GATE_2883 = 2883; + public static final int PRISON_GATE = 2881; public static final int LADDER_2884 = 2884; public static final int CUPBOARD_2885 = 2885; public static final int OPEN_CUPBOARD_2886 = 2886; @@ -3466,11 +3464,10 @@ public final class ObjectID public static final int MARKET_STALL_6573 = 6573; public static final int TEA_STALL_6574 = 6574; public static final int CART_6575 = 6575; - public static final int BANANA_TREE_6578 = 6578; - public static final int BANANA_TREE_6579 = 6579; + public static final int TREE_6578 = 6578; public static final int TENT_FLAP_6581 = 6581; public static final int WATER_6605 = 6605; - public static final int CENTRE_PIECE = 6606; + public static final int SUNTRAP = 6606; public static final int MIRROR_6607 = 6607; public static final int MIRROR_6608 = 6608; public static final int MIRROR_6609 = 6609; @@ -3489,24 +3486,19 @@ public final class ObjectID public static final int DOOR_6626 = 6626; public static final int DOOR_6627 = 6627; public static final int WALL_CRUSHER = 6629; - public static final int SARCOPHAGUS_6630 = 6630; public static final int PIT = 6632; public static final int PIT_6633 = 6633; public static final int CANOPIC_JAR = 6635; public static final int CANOPIC_JAR_6637 = 6637; public static final int CANOPIC_JAR_6639 = 6639; public static final int CANOPIC_JAR_6641 = 6641; - public static final int DOORWAY_6643 = 6643; + public static final int WALL_6642 = 6642; public static final int CEREMONIAL_TABLE = 6644; public static final int LADDER_6645 = 6645; public static final int CLOSED_CHEST_6646 = 6646; public static final int OPEN_CHEST_6647 = 6647; public static final int STAIRCASE_6648 = 6648; public static final int STAIRCASE_6649 = 6649; - public static final int BRIDGE_6650 = 6650; - public static final int BRIDGE_6651 = 6651; - public static final int BRIDGE_6652 = 6652; - public static final int BRIDGE_6653 = 6653; public static final int BROKEN_LOGS = 6655; public static final int CLOTH_6656 = 6656; public static final int INCONSPICUOUS_BUSH_EASY = 6657; @@ -11117,9 +11109,9 @@ public final class ObjectID public static final int EGG_HOPPER = 20264; public static final int EGG_HOPPER_20265 = 20265; public static final int EGG_HOPPER_20266 = 20266; - public static final int FLOOR_20271 = 20271; - public static final int ODD_MARKINGS_20272 = 20272; - public static final int SPEARTRAP = 20273; + public static final int TRAP_20271 = 20271; + public static final int TRAP_20272 = 20272; + public static final int TRAP_20273 = 20273; public static final int TRAPDOOR_20274 = 20274; public static final int LADDER_20275 = 20275; public static final int LADDER_20277 = 20277; @@ -11131,7 +11123,6 @@ public final class ObjectID public static final int LADDER_20285 = 20285; public static final int LADDER_20286 = 20286; public static final int LADDER_20287 = 20287; - public static final int KALEEFS_BODY = 20288; public static final int CORPSE_20297 = 20297; public static final int CORPSE_20298 = 20298; public static final int CORPSE_20299 = 20299; @@ -11145,7 +11136,7 @@ public final class ObjectID public static final int BANK_BOOTH_20328 = 20328; public static final int BANK_TABLE_20329 = 20329; public static final int BANK_TABLE_20330 = 20330; - public static final int DAGGER_STALL = 20331; + public static final int MARKET_STALL_20331 = 20331; public static final int CRAFT_STALL = 20332; public static final int FLOOR_20335 = 20335; public static final int TRAPDOOR_20340 = 20340; @@ -11153,7 +11144,6 @@ public final class ObjectID public static final int CART_20342 = 20342; public static final int CART_20343 = 20343; public static final int SILK_STALL_20344 = 20344; - public static final int BAKERY_STALL_20345 = 20345; public static final int GEM_STALL_20346 = 20346; public static final int FUR_STALL_20347 = 20347; public static final int SPICE_STALL_20348 = 20348; @@ -11182,12 +11172,10 @@ public final class ObjectID public static final int POTTERS_WHEEL_20375 = 20375; public static final int CLOTHES_20376 = 20376; public static final int ALTAR_20377 = 20377; - public static final int ALTAR_20378 = 20378; public static final int ALTAR_20379 = 20379; public static final int BED_20386 = 20386; public static final int BED_20387 = 20387; public static final int CLOTH_COVERED_TABLE = 20388; - public static final int GATE_20391 = 20391; public static final int BUFFERS_20402 = 20402; public static final int ORE_VEIN = 20407; public static final int ORE_VEIN_20408 = 20408; @@ -11669,7 +11657,7 @@ public final class ObjectID public static final int URN_21277 = 21277; public static final int URN_21278 = 21278; public static final int URN_21279 = 21279; - public static final int SPEARTRAP_21280 = 21280; + public static final int SPEARTRAP = 21280; public static final int COMPOST_BIN_21281 = 21281; public static final int COMPOST_BIN_21282 = 21282; public static final int COMPOST_BIN_21283 = 21283; @@ -16711,8 +16699,8 @@ public final class ObjectID public static final int OBELISK_31554 = 31554; public static final int CAVERN_31555 = 31555; public static final int CAVERN_31556 = 31556; - public static final int OPENING_31557 = 31557; - public static final int OPENING_31558 = 31558; + public static final int TRAPDOOR_31557 = 31557; + public static final int STAIRS_31558 = 31558; public static final int PILLAR_31561 = 31561; public static final int BUSH_31571 = 31571; public static final int LOG_STORAGE = 31572; @@ -20629,8 +20617,8 @@ public final class ObjectID public static final int MAGICAL_PUMPKIN = 40383; public static final int MAGICAL_PUMPKIN_40384 = 40384; public static final int MAGICAL_PUMPKIN_40385 = 40385; - public static final int CAVERN_40386 = 40386; - public static final int OPENING_40387 = 40387; + public static final int CREVICE_40386 = 40386; + public static final int BLOCKED_OPENING = 40387; public static final int STAIRS_40388 = 40388; public static final int OPENING_40389 = 40389; public static final int STAIRS_40390 = 40390; @@ -22208,5 +22196,242 @@ public final class ObjectID public static final int BLOOD_RIFT = 43824; public static final int BLOOD_RIFT_43825 = 43825; public static final int PLANT_43827 = 43827; + public static final int BARRIER_43849 = 43849; + public static final int CRATE_43851 = 43851; + public static final int DIRTY_GROUND = 43852; + public static final int DIRTY_GROUND_43853 = 43853; + public static final int DIRTY_GROUND_43854 = 43854; + public static final int PILE_OF_JUNK = 43856; + public static final int PILE_OF_JUNK_43857 = 43857; + public static final int PILE_OF_JUNK_43858 = 43858; + public static final int PILE_OF_JUNK_43859 = 43859; + public static final int PILE_OF_JUNK_43860 = 43860; + public static final int PILE_OF_JUNK_43861 = 43861; + public static final int FROZEN_CHURNING_MACHINE = 43862; + public static final int FROZEN_CHURNING_MACHINE_43863 = 43863; + public static final int FROZEN_CHURNING_MACHINE_43864 = 43864; + public static final int FROZEN_CHURNING_MACHINE_43865 = 43865; + public static final int RUBBLE_43867 = 43867; + public static final int STAIRS_43868 = 43868; + public static final int SCIMITAR = 43869; + public static final int SHIELD_43870 = 43870; + public static final int CAVE_43873 = 43873; + public static final int NOTHING_43876 = 43876; + public static final int NOTHING_43877 = 43877; + public static final int INCONSPICUOUS_HOLE_HARD_43878 = 43878; + public static final int STASH_HARD_43879 = 43879; + public static final int ROCKS_43882 = 43882; + public static final int ROCKS_43883 = 43883; + public static final int SPADE_43884 = 43884; + public static final int SPADE_43886 = 43886; + public static final int TENT_43887 = 43887; + public static final int TENT_43888 = 43888; + public static final int CAMPING_EQUIPMENT_43889 = 43889; + public static final int CAMPING_EQUIPMENT_43890 = 43890; + public static final int FURNACE_43891 = 43891; + public static final int FURNACE_43892 = 43892; + public static final int FURNACE_43893 = 43893; + public static final int FURNACE_43894 = 43894; + public static final int FURNACE_43895 = 43895; + public static final int PILLAR_43898 = 43898; + public static final int PILLAR_43899 = 43899; + public static final int PILLAR_43900 = 43900; + public static final int PILLAR_43901 = 43901; + public static final int WELL_43902 = 43902; + public static final int WELL_43903 = 43903; + public static final int URN_43919 = 43919; + public static final int URN_43920 = 43920; + public static final int URN_43921 = 43921; + public static final int URN_43922 = 43922; + public static final int URN_43923 = 43923; + public static final int URN_43924 = 43924; + public static final int URN_43925 = 43925; + public static final int URN_43926 = 43926; + public static final int SARCOPHAGUS_43927 = 43927; + public static final int SKELETON_43935 = 43935; + public static final int SKELETON_43936 = 43936; + public static final int SKELETON_43937 = 43937; + public static final int STATUE_43938 = 43938; + public static final int STATUE_43939 = 43939; + public static final int STATUE_43940 = 43940; + public static final int STATUE_43941 = 43941; + public static final int TOMB_WALL = 43948; + public static final int TOMB_WALL_43949 = 43949; + public static final int TOMB_WALL_43950 = 43950; + public static final int TOMB_WALL_43951 = 43951; + public static final int ENTRY = 43952; + public static final int ENTRY_43953 = 43953; + public static final int ENTRY_43954 = 43954; + public static final int STAIRS_43955 = 43955; + public static final int STAIRS_43956 = 43956; + public static final int STAIRS_43957 = 43957; + public static final int STAIRS_43958 = 43958; + public static final int STAIRS_43959 = 43959; + public static final int DOOR_43960 = 43960; + public static final int DOOR_43961 = 43961; + public static final int DOOR_43962 = 43962; + public static final int DOOR_43963 = 43963; + public static final int DOOR_43964 = 43964; + public static final int DOOR_43965 = 43965; + public static final int DOOR_43966 = 43966; + public static final int LEVER_43967 = 43967; + public static final int LEVER_43968 = 43968; + public static final int LEVER_43969 = 43969; + public static final int LEVER_43970 = 43970; + public static final int PLAQUE_43971 = 43971; + public static final int PLAQUE_43972 = 43972; + public static final int PLAQUE_43973 = 43973; + public static final int PLAQUE_43974 = 43974; + public static final int PLAQUE_43975 = 43975; + public static final int PLAQUE_43976 = 43976; + public static final int PLAQUE_43977 = 43977; + public static final int PLAQUE_43978 = 43978; + public static final int URN_43979 = 43979; + public static final int URN_43980 = 43980; + public static final int URN_43981 = 43981; + public static final int ALTAR_43982 = 43982; + public static final int ALTAR_43983 = 43983; + public static final int LILY = 43984; + public static final int LILY_43985 = 43985; + public static final int LILY_43986 = 43986; + public static final int LILY_43987 = 43987; + public static final int STEPPING_STONE_43988 = 43988; + public static final int STEPPING_STONE_43989 = 43989; + public static final int STEPPING_STONE_43990 = 43990; + public static final int CHEMISTRY_TABLE_43991 = 43991; + public static final int CHEMISTRY_TABLE_43992 = 43992; + public static final int PILLAR_43993 = 43993; + public static final int PILLAR_43994 = 43994; + public static final int PILLAR_43995 = 43995; + public static final int PILLAR_43996 = 43996; + public static final int PILLAR_43997 = 43997; + public static final int RUBBLE_44003 = 44003; + public static final int RUBBLE_44004 = 44004; + public static final int BLOCKED_ENTRY_44008 = 44008; + public static final int BLOCKED_ENTRY_44009 = 44009; + public static final int ENTRY_44010 = 44010; + public static final int FLOWER_44013 = 44013; + public static final int FLOWER_44014 = 44014; + public static final int FLOWER_44015 = 44015; + public static final int TABLE_44019 = 44019; + public static final int CUSHION = 44020; + public static final int FIRE_44021 = 44021; + public static final int FIRE_44022 = 44022; + public static final int FIRE_44023 = 44023; + public static final int FIRE_44024 = 44024; + public static final int FIRE_44025 = 44025; + public static final int FIRE_44026 = 44026; + public static final int FIRE_44027 = 44027; + public static final int FIRE_44028 = 44028; + public static final int KHARIDIAN_CACTUS_HEALTHY_44029 = 44029; + public static final int KHARIDIAN_CACTUS_DRY_44030 = 44030; + public static final int BAKERY_STALL_44031 = 44031; + public static final int LADDER_44032 = 44032; + public static final int ALTAR_44033 = 44033; + public static final int ALTAR_44034 = 44034; + public static final int RAILING_44035 = 44035; + public static final int GATE_44036 = 44036; + public static final int GATE_44038 = 44038; + public static final int GATE_44040 = 44040; + public static final int GATE_44042 = 44042; + public static final int GATE_44043 = 44043; + public static final int LADDER_44044 = 44044; + public static final int BODY = 44046; + public static final int BODY_44047 = 44047; + public static final int STALAGMITES_44048 = 44048; + public static final int GATE_44049 = 44049; + public static final int GATE_44050 = 44050; + public static final int GATE_44051 = 44051; + public static final int GATE_44052 = 44052; + public static final int GATE_44053 = 44053; + public static final int CUPBOARD_44054 = 44054; + public static final int SARCOPHAGUS_44057 = 44057; + public static final int SARCOPHAGUS_44058 = 44058; + public static final int DOOR_44059 = 44059; + public static final int DOOR_44060 = 44060; + public static final int DOOR_44061 = 44061; + public static final int DOOR_44062 = 44062; + public static final int LADDER_44063 = 44063; + public static final int HOLE_44064 = 44064; + public static final int DOOR_44065 = 44065; + public static final int CACTUS_44068 = 44068; + public static final int CACTUS_44069 = 44069; + public static final int CACTUS_44070 = 44070; + public static final int CACTUS_44071 = 44071; + public static final int CACTUS_44072 = 44072; + public static final int CACTUS_44073 = 44073; + public static final int CACTUS_44074 = 44074; + public static final int CACTUS_44075 = 44075; + public static final int CACTUS_44076 = 44076; + public static final int CACTUS_44077 = 44077; + public static final int CACTUS_44078 = 44078; + public static final int CACTUS_44079 = 44079; + public static final int CACTUS_44080 = 44080; + public static final int CACTUS_44081 = 44081; + public static final int CACTUS_44082 = 44082; + public static final int STEPS_44111 = 44111; + public static final int STEPS_44113 = 44113; + public static final int GRASS_44126 = 44126; + public static final int GRASS_44127 = 44127; + public static final int SWAMPY_TREE = 44128; + public static final int RITUAL_PILLAR = 44129; + public static final int RITUAL_PILLAR_44130 = 44130; + public static final int RITUAL_PILLAR_44131 = 44131; + public static final int RITUAL_PILLAR_44132 = 44132; + public static final int BULLRUSH = 44133; + public static final int BULLRUSH_44134 = 44134; + public static final int BULLRUSH_44135 = 44135; + public static final int BULLRUSH_44136 = 44136; + public static final int BULLRUSH_44137 = 44137; + public static final int BUSH_44143 = 44143; + public static final int BUSH_44144 = 44144; + public static final int BUSH_44145 = 44145; + public static final int BUSH_44146 = 44146; + public static final int BUSH_44147 = 44147; + public static final int BUSH_44148 = 44148; + public static final int PILLAR_44204 = 44204; + public static final int PILLAR_44205 = 44205; + public static final int RUBBLE_44206 = 44206; + public static final int PILLAR_44207 = 44207; + public static final int PILLAR_44208 = 44208; + public static final int PILLAR_44209 = 44209; + public static final int PILLAR_44210 = 44210; + public static final int STONE_PILE_44211 = 44211; + public static final int TROPICAL_TREE_44216 = 44216; + public static final int TROPICAL_TREE_44217 = 44217; + public static final int TROPICAL_TREE_44218 = 44218; + public static final int PLANT_44223 = 44223; + public static final int PLANT_44224 = 44224; + public static final int PLANT_44225 = 44225; + public static final int PLANT_44226 = 44226; + public static final int BUSH_44227 = 44227; + public static final int BUSH_44228 = 44228; + public static final int SKELETON_44260 = 44260; + public static final int SKELETON_44261 = 44261; + public static final int SKELETON_44262 = 44262; + public static final int CRATES_44276 = 44276; + public static final int CRATE_44277 = 44277; + public static final int LITTLE_TENT_44278 = 44278; + public static final int TENT_44279 = 44279; + public static final int TENT_44280 = 44280; + public static final int TENT_44281 = 44281; + public static final int TENT_44282 = 44282; + public static final int RUG_44287 = 44287; + public static final int ROLLED_UP_RUG_44288 = 44288; + public static final int TANNING_LINE_44289 = 44289; + public static final int CUSHION_44290 = 44290; + public static final int CUSHION_44291 = 44291; + public static final int CUSHION_44292 = 44292; + public static final int TABLE_44293 = 44293; + public static final int BROKEN_TABLE_44294 = 44294; + public static final int TABLE_44295 = 44295; + public static final int OBELISK_44296 = 44296; + public static final int TEST = 44547; + public static final int RUBBLE_44551 = 44551; + public static final int RUBBLE_44552 = 44552; + public static final int TORCH_44553 = 44553; + public static final int LION_GUARD = 44584; + public static final int WARP = 44585; + public static final int WARP_44586 = 44586; /* This file is automatically generated. Do not edit. */ } 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 e32c60ef0f..7a7240f682 100644 --- a/runelite-api/src/main/java/net/runelite/api/Quest.java +++ b/runelite-api/src/main/java/net/runelite/api/Quest.java @@ -198,6 +198,7 @@ public enum Quest THE_FROZEN_DOOR(3768, "The Frozen Door"), HOPESPEARS_WILL(4136, "Hopespear's Will"), TEMPLE_OF_THE_EYE(4273, "Temple of the Eye"), + BENEATH_CURSED_SANDS(4287, "Beneath Cursed Sands"), ; @Getter diff --git a/runelite-api/src/main/java/net/runelite/api/ScriptID.java b/runelite-api/src/main/java/net/runelite/api/ScriptID.java index 9130cbb270..e567ceeaaa 100644 --- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java +++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java @@ -387,25 +387,6 @@ public final class ScriptID @ScriptArguments(integer = 4) public static final int WIKI_ICON_UPDATE = 3306; - /** - * Builds a line in the chatbox when there is no username: prefix, such as - * a game or system message - */ - @ScriptArguments(integer = 11, string = 1) - public static final int CHATBOX_BUILD_LINE_WITHOUT_USER = 199; - - /** - * Builds a line in the chatbox when there is a username: prefix - */ - @ScriptArguments(integer = 11, string = 2) - public static final int CHATBOX_BUILD_LINE_WITH_USER = 203; - - /** - * Builds a line in the chatbox when it from a clan - */ - @ScriptArguments(integer = 14, string = 3) - public static final int CHATBOX_BUILD_LINE_WITH_CLAN = 4483; - /** * Drag callback for the camera zoom slider in the options side panel. */ @@ -435,18 +416,6 @@ public final class ScriptID @ScriptArguments(integer = 1) public static final int NOTIFICATION_DELAY = 3347; - /** - * Check if a quest should be filtered from the quest list - * - */ - @ScriptArguments(integer = 4) - public static final int QUEST_FILTER = 3238; - @ScriptArguments(integer = 7) public static final int GROUP_IRONMAN_STORAGE_BUILD = 5269; diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java b/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java index c375cbf12e..da88317f56 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java @@ -250,15 +250,6 @@ public enum ItemMapping BLACK_MASK_I_25276, BLACK_MASK_1_I_25275, BLACK_MASK_2_I_25274, BLACK_MASK_3_I_25273, BLACK_MASK_4_I_25272, BLACK_MASK_5_I_25271, BLACK_MASK_6_I_25270, BLACK_MASK_7_I_25269, BLACK_MASK_8_I_25268, BLACK_MASK_9_I_25267, BLACK_MASK_10_I_25266, TZTOK_SLAYER_HELMET, TZTOK_SLAYER_HELMET_I, TZTOK_SLAYER_HELMET_I_25902, VAMPYRIC_SLAYER_HELMET, VAMPYRIC_SLAYER_HELMET_I, VAMPYRIC_SLAYER_HELMET_I_25908, TZKAL_SLAYER_HELMET, TZKAL_SLAYER_HELMET_I, TZKAL_SLAYER_HELMET_I_25914), - // Pharaoh's Sceptres - ITEM_PHARAOHS_SCEPTRE_1(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_1), - ITEM_PHARAOHS_SCEPTRE_2(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_2), - ITEM_PHARAOHS_SCEPTRE_4(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_4), - ITEM_PHARAOHS_SCEPTRE_5(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_5), - ITEM_PHARAOHS_SCEPTRE_6(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_6), - ITEM_PHARAOHS_SCEPTRE_7(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_7), - ITEM_PHARAOHS_SCEPTRE_8(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_8), - // Revertible items ITEM_HYDRA_LEATHER(HYDRA_LEATHER, FEROCIOUS_GLOVES), ITEM_HYDRA_TAIL(HYDRA_TAIL, BONECRUSHER_NECKLACE), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java index de4bb16b82..1cf60144c2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java @@ -82,7 +82,7 @@ public class BankPlugin extends Plugin private static final String SEED_VAULT_TITLE = "Seed Vault"; private static final String NUMBER_REGEX = "[0-9]+(\\.[0-9]+)?[kmb]?"; - private static final Pattern VALUE_SEARCH_PATTERN = Pattern.compile("^(?ge|ha|alch)?" + + private static final Pattern VALUE_SEARCH_PATTERN = Pattern.compile("^(?qty|ge|ha|alch)?" + " *(((?[<>=]|>=|<=) *(?" + NUMBER_REGEX + "))|" + "((?" + NUMBER_REGEX + ") *- *(?" + NUMBER_REGEX + ")))$", Pattern.CASE_INSENSITIVE); @@ -413,13 +413,26 @@ public class BankPlugin extends Plugin final int qty = itemQuantities.count(itemId); final long gePrice = (long) itemManager.getItemPrice(itemId) * qty; final long haPrice = (long) itemComposition.getHaPrice() * qty; + final boolean isPlaceholder = itemComposition.getPlaceholderTemplateId() != -1; long value = Math.max(gePrice, haPrice); final String mode = matcher.group("mode"); if (mode != null) { - value = mode.toLowerCase().equals("ge") ? gePrice : haPrice; + switch (mode.toLowerCase()) + { + case "qty": + value = isPlaceholder ? 0 : qty; + break; + case "ge": + value = gePrice; + break; + case "ha": + case "alch": + value = haPrice; + break; + } } final String op = matcher.group("op"); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java index 778289a605..e918593416 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java @@ -107,7 +107,7 @@ import org.apache.commons.text.WordUtils; public class ChatCommandsPlugin extends Plugin { private static final Pattern KILLCOUNT_PATTERN = Pattern.compile("Your (?:completion count for |subdued |completed )?(.+?) (?:(?:kill|harvest|lap|completion) )?(?:count )?is: (\\d+)"); - private static final String TEAM_SIZES = "(?\\d+(?:\\+|-\\d+)? players|Solo)"; + private static final String TEAM_SIZES = "(?\\d+(?:\\+|-\\d+)? players?|Solo)"; private static final Pattern RAIDS_PB_PATTERN = Pattern.compile("Congratulations - your raid is complete!
Team size: " + TEAM_SIZES + " Duration: (?[0-9:]+(?:\\.[0-9]+)?) \\(new personal best\\)"); private static final Pattern RAIDS_DURATION_PATTERN = Pattern.compile("Congratulations - your raid is complete!
Team size: " + TEAM_SIZES + " Duration: [0-9:.]+ Personal best: (?[0-9:]+(?:\\.[0-9]+)?)"); private static final Pattern KILL_DURATION_PATTERN = Pattern.compile("(?i)(?:(?:Fight |Lap |Challenge |Corrupted challenge )?duration:|Subdued in|(?[0-9:.]+\\. Personal best: (?:)?(?[0-9:]+(?:\\.[0-9]+)?)"); @@ -115,7 +115,7 @@ public class ChatCommandsPlugin extends Plugin private static final Pattern DUEL_ARENA_WINS_PATTERN = Pattern.compile("You (were defeated|won)! You have(?: now)? won ([\\d,]+|one) duels?"); private static final Pattern DUEL_ARENA_LOSSES_PATTERN = Pattern.compile("You have(?: now)? lost ([\\d,]+|one) duels?"); private static final Pattern ADVENTURE_LOG_TITLE_PATTERN = Pattern.compile("The Exploits of (.+)"); - private static final Pattern ADVENTURE_LOG_PB_PATTERN = Pattern.compile("Fastest (?:kill|run)(?: - \\(Team size: " + TEAM_SIZES + "\\))?: (?