diff --git a/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java b/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java index 3d123ecc2b..3e886b68cb 100644 --- a/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java +++ b/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java @@ -34,7 +34,8 @@ public class GrandExchangeTrade private boolean cancel; private boolean login; private int itemId; - private int quantity; + private int qty; + private int dqty; private int total; private int spent; private int offer; 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 8753b38264..99464639bc 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -4659,9 +4659,9 @@ public final class ItemID public static final int DUSTY_SCROLL = 7629; public static final int CRATE = 7630; public static final int TEMPLE_LIBRARY_KEY = 7632; - public static final int ANCIENT_BOOK = 7633; - public static final int BATTERED_TOME = 7634; - public static final int LEATHER_BOOK = 7635; + public static final int THE_SLEEPING_SEVEN = 7633; + public static final int HISTORIES_OF_THE_HALLOWLAND = 7634; + public static final int MODERN_DAY_MORYTANIA = 7635; public static final int ROD_DUST = 7636; public static final int SILVTHRILL_ROD = 7637; public static final int SILVTHRILL_ROD_7638 = 7638; @@ -4675,7 +4675,7 @@ public final class ItemID public static final int ROD_OF_IVANDIS_3 = 7646; public static final int ROD_OF_IVANDIS_2 = 7647; public static final int ROD_OF_IVANDIS_1 = 7648; - public static final int ROD_CLAY_MOULD = 7649; + public static final int ROD_MOULD = 7649; public static final int SILVER_DUST = 7650; public static final int GUTHIX_BALANCE_UNF = 7652; public static final int GUTHIX_BALANCE_UNF_7654 = 7654; @@ -5976,7 +5976,7 @@ public final class ItemID public static final int MESSAGE_9649 = 9649; public static final int BLOOD_TITHE_POUCH = 9650; public static final int LARGE_ORNATE_KEY = 9651; - public static final int HAEMALCHEMY = 9652; + public static final int HAEMALCHEMY_VOLUME_1 = 9652; public static final int SEALED_MESSAGE = 9653; public static final int DOOR_KEY_9654 = 9654; public static final int LADDER_TOP = 9655; @@ -9156,7 +9156,7 @@ public final class ItemID public static final int ANKOU_MASK = 20095; public static final int ANKOU_TOP = 20098; public static final int ANKOU_GLOVES = 20101; - public static final int ANKOU_LEGGINGS = 20104; + public static final int ANKOUS_LEGGINGS = 20104; public static final int ANKOU_SOCKS = 20107; public static final int BOWL_WIG = 20110; public static final int ARCEUUS_HOOD = 20113; @@ -11482,5 +11482,94 @@ public final class ItemID public static final int TWISTED_ANCESTRAL_ROBE_TOP = 24666; public static final int TWISTED_ANCESTRAL_ROBE_BOTTOM = 24668; public static final int TWISTED_ANCESTRAL_COLOUR_KIT = 24670; + public static final int HAEMALCHEMY_VOLUME_2 = 24672; + public static final int VYRE_NOBLE_TOP_UNSCENTED = 24673; + public static final int VYRE_NOBLE_LEGS_UNSCENTED = 24674; + public static final int VYRE_NOBLE_SHOES_UNSCENTED = 24675; + public static final int VYRE_NOBLE_TOP = 24676; + public static final int VYRE_NOBLE_LEGS = 24678; + public static final int VYRE_NOBLE_SHOES = 24680; + public static final int OLD_NOTE = 24682; + public static final int TATTY_NOTE_24684 = 24684; + public static final int JOURNAL_PAGE = 24686; + public static final int ANCIENT_ARMOUR = 24688; + public static final int TOME_OF_EXPERIENCE_24690 = 24690; + public static final int BLISTERWOOD_LOGS = 24691; + public static final int RUBY_SICKLE_B = 24693; + public static final int ENCHANTED_RUBY_SICKLE_B = 24695; + public static final int BLISTERWOOD_SICKLE = 24697; + public static final int BLISTERWOOD_FLAIL = 24699; + public static final int DARK_SQUIRREL = 24701; + public static final int VYRE = 24702; + public static final int COIN_POUCH_24703 = 24703; + public static final int DAEYALT_ESSENCE = 24704; + public static final int DAEYALT_SHARD = 24706; + public static final int VAMPYRE = 24708; + public static final int HALLOWED_CRYSTAL_SHARD = 24709; + public static final int HALLOWED_MARK = 24711; + public static final int HALLOWED_TOKEN = 24719; + public static final int HALLOWED_GRAPPLE = 24721; + public static final int HALLOWED_FOCUS = 24723; + public static final int HALLOWED_SYMBOL = 24725; + public static final int HALLOWED_HAMMER = 24727; + public static final int DARK_DYE = 24729; + public static final int HALLOWED_RING = 24731; + public static final int DARK_ACORN = 24733; + public static final int RING_OF_ENDURANCE_UNCHARGED = 24735; + public static final int RING_OF_ENDURANCE = 24736; + public static final int STRANGE_OLD_LOCKPICK = 24738; + public static final int STRANGE_OLD_LOCKPICK_FULL = 24740; + public static final int GRACEFUL_HOOD_24743 = 24743; + public static final int GRACEFUL_HOOD_24745 = 24745; + public static final int GRACEFUL_CAPE_24746 = 24746; + public static final int GRACEFUL_CAPE_24748 = 24748; + public static final int GRACEFUL_TOP_24749 = 24749; + public static final int GRACEFUL_TOP_24751 = 24751; + public static final int GRACEFUL_LEGS_24752 = 24752; + public static final int GRACEFUL_LEGS_24754 = 24754; + public static final int GRACEFUL_GLOVES_24755 = 24755; + public static final int GRACEFUL_GLOVES_24757 = 24757; + public static final int GRACEFUL_BOOTS_24758 = 24758; + public static final int GRACEFUL_BOOTS_24760 = 24760; + public static final int STRANGE_HALLOWED_TOME = 24761; + public static final int MYSTERIOUS_PAGE = 24763; + public static final int MYSTERIOUS_PAGE_24765 = 24765; + public static final int MYSTERIOUS_PAGE_24767 = 24767; + public static final int MYSTERIOUS_PAGE_24769 = 24769; + public static final int MYSTERIOUS_PAGE_24771 = 24771; + public static final int CLUE_SCROLL_ELITE_24773 = 24773; + public static final int BLOOD_PINT = 24774; + public static final int BLOOD_SHARD = 24777; + public static final int AMULET_OF_BLOOD_FURY = 24780; + public static final int RAW_MYSTERY_MEAT = 24782; + public static final int COOKED_MYSTERY_MEAT = 24785; + public static final int PAT_OF_NOT_GARLIC_BUTTER = 24788; + public static final int LONG_ROPE = 24790; + public static final int SEVERED_LEG_24792 = 24792; + public static final int VYRE_NOBLE_BLAZER = 24794; + public static final int VYRE_NOBLE_COAT_TAILS = 24796; + public static final int VYRE_NOBLE_VEST = 24798; + public static final int VYRE_NOBLE_PANTS = 24800; + public static final int VYRE_NOBLE_CORSET = 24802; + public static final int VYRE_NOBLE_SKIRT = 24804; + public static final int VYRE_NOBLE_DRESS_TOP = 24806; + public static final int VYRE_NOBLE_DRESS_BOTTOM = 24808; + public static final int VYRE_NOBLE_BLAZER_24810 = 24810; + public static final int VYRE_NOBLE_COAT_TAILS_24812 = 24812; + public static final int VYRE_NOBLE_VEST_24814 = 24814; + public static final int VYRE_NOBLE_PANTS_24816 = 24816; + public static final int VYRE_NOBLE_CORSET_24818 = 24818; + public static final int VYRE_NOBLE_SKIRT_24820 = 24820; + public static final int VYRE_NOBLE_DRESS_TOP_24822 = 24822; + public static final int VYRE_NOBLE_DRESS_BOTTOM_24824 = 24824; + public static final int VYRE_NOBLE_BLAZER_24826 = 24826; + public static final int VYRE_NOBLE_COAT_TAILS_24828 = 24828; + public static final int VYRE_NOBLE_VEST_24830 = 24830; + public static final int VYRE_NOBLE_PANTS_24832 = 24832; + public static final int VYRE_NOBLE_CORSET_24834 = 24834; + public static final int VYRE_NOBLE_SKIRT_24836 = 24836; + public static final int VYRE_NOBLE_DRESS_TOP_24838 = 24838; + public static final int VYRE_NOBLE_DRESS_BOTTOM_24840 = 24840; + public static final int A_TASTE_OF_HOPE = 24842; /* This file is automatically generated. Do not edit. */ } 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 d516dec046..4bf81dfd41 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -997,10 +997,6 @@ public final class NpcID public static final int SLEEPWALKER_1030 = 1030; public static final int SLEEPWALKER_1031 = 1031; public static final int SLEEPWALKER_1032 = 1032; - public static final int SLEEPWALKER_1033 = 1033; - public static final int SLEEPWALKER_1034 = 1034; - public static final int SLEEPWALKER_1035 = 1035; - public static final int SLEEPWALKER_1036 = 1036; public static final int SNAKE = 1037; public static final int MONKEY_1038 = 1038; public static final int ALBINO_BAT = 1039; @@ -3272,8 +3268,6 @@ public final class NpcID public static final int MONK_OF_ZAMORAK_3484 = 3484; public static final int MONK_OF_ZAMORAK_3485 = 3485; public static final int MONK_OF_ZAMORAK_3486 = 3486; - public static final int DREZEL = 3488; - public static final int DREZEL_3489 = 3489; public static final int JORRAL = 3490; public static final int MELINA = 3491; public static final int MELINA_3492 = 3492; @@ -3554,7 +3548,7 @@ public final class NpcID public static final int VYREWATCH_3771 = 3771; public static final int OLD_MAN_RAL = 3772; public static final int AEONISIG_RAISPHER = 3774; - public static final int SAFALAAN = 3775; + public static final int SAFALAAN_HALLOW = 3775; public static final int SARIUS_GUILE = 3776; public static final int ELEMENTAL_BALANCE_3777 = 3777; public static final int SARIUS_GUILE_3778 = 3778; @@ -3588,16 +3582,16 @@ public final class NpcID public static final int MEIYERDITCH_CITIZEN_3806 = 3806; public static final int MEIYERDITCH_CITIZEN_3807 = 3807; public static final int MEIYERDITCH_CITIZEN_3808 = 3808; - public static final int A_MEIYERDITCH_CHILD = 3809; - public static final int A_MEIYERDITCH_CHILD_3810 = 3810; - public static final int A_MEIYERDITCH_CHILD_3811 = 3811; - public static final int A_MEIYERDITCH_CHILD_3812 = 3812; - public static final int A_MEIYERDITCH_CHILD_3813 = 3813; - public static final int A_MEIYERDITCH_CHILD_3814 = 3814; - public static final int A_MEIYERDITCH_CHILD_3815 = 3815; - public static final int A_MEIYERDITCH_CHILD_3816 = 3816; - public static final int A_MEIYERDITCH_CHILD_3817 = 3817; - public static final int A_MEIYERDITCH_CHILD_3818 = 3818; + public static final int CHILD_3809 = 3809; + public static final int CHILD_3810 = 3810; + public static final int CHILD_3811 = 3811; + public static final int CHILD_3812 = 3812; + public static final int CHILD_3813 = 3813; + public static final int CHILD_3814 = 3814; + public static final int CHILD_3815 = 3815; + public static final int CHILD_3816 = 3816; + public static final int CHILD_3817 = 3817; + public static final int CHILD_3818 = 3818; public static final int MEIYERDITCH_MINER = 3819; public static final int MEIYERDITCH_MINER_3820 = 3820; public static final int MEIYERDITCH_MINER_3821 = 3821; @@ -4729,10 +4723,7 @@ public final class NpcID public static final int SANFEW = 5044; public static final int KAQEMEEX = 5045; public static final int CYREG_PADDLEHORN = 5046; - public static final int CURPILE_FYOD = 5047; public static final int VELIAF_HURTZ_5048 = 5048; - public static final int SANI_PILIU = 5049; - public static final int HAROLD_EVANS = 5050; public static final int RADIGAD_PONFIT = 5051; public static final int POLMAFI_FERDYGRIS = 5052; public static final int IVAN_STROM_5053 = 5053; @@ -4740,9 +4731,6 @@ public final class NpcID public static final int STRANGER_5055 = 5055; public static final int VANSTROM_KLAUSE_5056 = 5056; public static final int MIST_5057 = 5057; - public static final int VANSTROM_KLAUSE_5058 = 5058; - public static final int VANSTROM_KLAUSE_5059 = 5059; - public static final int VANSTROM_KLAUSE_5060 = 5060; public static final int SEA_SLUG_5061 = 5061; public static final int KENNITH = 5062; public static final int KENNITH_5063 = 5063; @@ -7423,10 +7411,10 @@ public final class NpcID public static final int MERCENARY_8213 = 8213; public static final int MERCENARY_8214 = 8214; public static final int MERCENARY_8215 = 8215; - public static final int SAFALAAN_8216 = 8216; - public static final int SAFALAAN_8217 = 8217; - public static final int SAFALAAN_8218 = 8218; - public static final int SAFALAAN_8219 = 8219; + public static final int SAFALAAN_HALLOW_8216 = 8216; + public static final int SAFALAAN_HALLOW_8217 = 8217; + public static final int SAFALAAN_HALLOW_8218 = 8218; + public static final int SAFALAAN_HALLOW_8219 = 8219; public static final int VERTIDA_SEFALATIS = 8220; public static final int VERTIDA_SEFALATIS_8221 = 8221; public static final int VERTIDA_SEFALATIS_8222 = 8222; @@ -7476,29 +7464,12 @@ public final class NpcID public static final int YENRAB = 8269; public static final int LAHSRAM = 8270; public static final int ERODOEHT = 8271; - public static final int CARL = 8272; public static final int LECTOR_GURA = 8273; public static final int SISTER_SEVI = 8274; public static final int SISTER_TOEN = 8275; public static final int SISTER_YRAM = 8276; - public static final int KROY = 8279; - public static final int DAMIEN_LEUCURTE = 8280; - public static final int LORD_CROMBWICK = 8281; - public static final int PAINTED_ONE = 8282; - public static final int KURT = 8283; - public static final int DON = 8284; - public static final int DEBRA = 8285; - public static final int TANYA_8286 = 8286; public static final int LADY_CROMBWICK = 8287; public static final int NEMISHKA = 8288; - public static final int CHRISTOPHER = 8289; - public static final int CHILD_8290 = 8290; - public static final int CHILD_8291 = 8291; - public static final int CHILD_8292 = 8292; - public static final int CHILD_8293 = 8293; - public static final int CHILD_8294 = 8294; - public static final int CHILD_8295 = 8295; - public static final int CHILD_8296 = 8296; public static final int SWAMP_CRAB = 8297; public static final int SWAMP_CRAB_8298 = 8298; public static final int SWAMPY_LOG = 8299; @@ -8516,5 +8487,268 @@ public final class NpcID public static final int FLYING_VESPINA = 9512; public static final int ENRAGED_TEKTINY_9513 = 9513; public static final int FLYING_VESPINA_9514 = 9514; + public static final int VELIAF_HURTZ_9521 = 9521; + public static final int VELIAF_HURTZ_9522 = 9522; + public static final int VELIAF_HURTZ_9523 = 9523; + public static final int VELIAF_HURTZ_9524 = 9524; + public static final int VELIAF_HURTZ_9525 = 9525; + public static final int VELIAF_HURTZ_9526 = 9526; + public static final int VELIAF_HURTZ_9527 = 9527; + public static final int VELIAF_HURTZ_9528 = 9528; + public static final int VELIAF_HURTZ_9529 = 9529; + public static final int IVAN_STROM_9530 = 9530; + public static final int IVAN_STROM_9531 = 9531; + public static final int IVAN_STROM_9532 = 9532; + public static final int IVAN_STROM_9533 = 9533; + public static final int IVAN_STROM_9534 = 9534; + public static final int IVAN_STROM_9535 = 9535; + public static final int IVAN_STROM_9536 = 9536; + public static final int SAFALAAN_HALLOW_9537 = 9537; + public static final int SAFALAAN_HALLOW_9538 = 9538; + public static final int SAFALAAN_HALLOW_9539 = 9539; + public static final int SAFALAAN_HALLOW_9540 = 9540; + public static final int SAFALAAN_HALLOW_9541 = 9541; + public static final int SAFALAAN_HALLOW_9542 = 9542; + public static final int KAEL_FORSHAW_9543 = 9543; + public static final int KAEL_FORSHAW_9544 = 9544; + public static final int KAEL_FORSHAW_9545 = 9545; + public static final int KAEL_FORSHAW_9546 = 9546; + public static final int VERTIDA_SEFALATIS_9547 = 9547; + public static final int VERTIDA_SEFALATIS_9548 = 9548; + public static final int VERTIDA_SEFALATIS_9549 = 9549; + public static final int VERTIDA_SEFALATIS_9550 = 9550; + public static final int RADIGAD_PONFIT_9551 = 9551; + public static final int RADIGAD_PONFIT_9552 = 9552; + public static final int RADIGAD_PONFIT_9553 = 9553; + public static final int POLMAFI_FERDYGRIS_9554 = 9554; + public static final int POLMAFI_FERDYGRIS_9555 = 9555; + public static final int POLMAFI_FERDYGRIS_9556 = 9556; + public static final int CARL = 9557; + public static final int CARL_9558 = 9558; + public static final int KROY = 9559; + public static final int KROY_9560 = 9560; + public static final int DAMIEN_LEUCURTE = 9561; + public static final int DAMIEN_LEUCURTE_9562 = 9562; + public static final int DAMIEN_LEUCURTE_9563 = 9563; + public static final int DAMIEN_LEUCURTE_9564 = 9564; + public static final int LORD_CROMBWICK = 9565; + public static final int VANSTROM_KLAUSE_9566 = 9566; + public static final int VANSTROM_KLAUSE_9567 = 9567; + public static final int VANSTROM_KLAUSE_9568 = 9568; + public static final int VANSTROM_KLAUSE_9569 = 9569; + public static final int VANSTROM_KLAUSE_9570 = 9570; + public static final int VANSTROM_KLAUSE_9571 = 9571; + public static final int MIST_9572 = 9572; + public static final int ACIDIC_BLOODVELD = 9573; + public static final int VANESCULA_DRAKAN_9574 = 9574; + public static final int VANESCULA_DRAKAN_9575 = 9575; + public static final int VANESCULA_DRAKAN_9576 = 9576; + public static final int VANESCULA_DRAKAN_9577 = 9577; + public static final int LORD_ALEXEI_JOVKAI = 9578; + public static final int LOWERNIEL_DRAKAN = 9579; + public static final int WEREWOLF_9580 = 9580; + public static final int WEREWOLF_9581 = 9581; + public static final int WEREWOLF_9582 = 9582; + public static final int PRISONER = 9583; + public static final int PRISONER_9584 = 9584; + public static final int PRISONER_9585 = 9585; + public static final int VAMPYRE_JUVINATE_9586 = 9586; + public static final int VAMPYRE_JUVINATE_9587 = 9587; + public static final int DESMODUS_LASIURUS = 9588; + public static final int MORDAN_NIKAZSI = 9589; + public static final int VYREWATCH_9590 = 9590; + public static final int VYREWATCH_9591 = 9591; + public static final int PRISONER_9592 = 9592; + public static final int PRISONER_9593 = 9593; + public static final int MARIA_GADDERANKS = 9594; + public static final int MARIA_GADDERANKS_9595 = 9595; + public static final int RON_GADDERANKS = 9596; + public static final int RON_GADDERANKS_9597 = 9597; + public static final int SARIUS_GUILE_9598 = 9598; + public static final int VYREWATCH_SENTINEL = 9599; + public static final int VYREWATCH_SENTINEL_9600 = 9600; + public static final int VYREWATCH_SENTINEL_9601 = 9601; + public static final int VYREWATCH_SENTINEL_9602 = 9602; + public static final int VYREWATCH_SENTINEL_9603 = 9603; + public static final int VYREWATCH_SENTINEL_9604 = 9604; + public static final int VYREWATCH_9605 = 9605; + public static final int VYREWATCH_9606 = 9606; + public static final int VYREWATCH_9607 = 9607; + public static final int VYREWATCH_9608 = 9608; + public static final int SEAGULL_9609 = 9609; + public static final int MUTATED_BLOODVELD_9610 = 9610; + public static final int MUTATED_BLOODVELD_9611 = 9611; + public static final int NAIL_BEAST_9612 = 9612; + public static final int NAIL_BEAST_9613 = 9613; + public static final int VAMPYRE_JUVINATE_9614 = 9614; + public static final int VAMPYRE_JUVINATE_9615 = 9615; + public static final int VAMPYRE_JUVINATE_9616 = 9616; + public static final int VAMPYRE_JUVINATE_9617 = 9617; + public static final int CURPILE_FYOD = 9619; + public static final int VELIAF_HURTZ_9621 = 9621; + public static final int SANI_PILIU = 9622; + public static final int SANI_PILIU_9623 = 9623; + public static final int HAROLD_EVANS = 9624; + public static final int HAROLD_EVANS_9625 = 9625; + public static final int RADIGAD_PONFIT_9627 = 9627; + public static final int POLMAFI_FERDYGRIS_9629 = 9629; + public static final int IVAN_STROM_9631 = 9631; + public static final int VANSTROM_KLAUSE_9632 = 9632; + public static final int VELIAF_HURTZ_9633 = 9633; + public static final int WISKIT_9634 = 9634; + public static final int GADDERANKS_9635 = 9635; + public static final int DREZEL = 9636; + public static final int DARK_SQUIRREL = 9637; + public static final int DARK_SQUIRREL_9638 = 9638; + public static final int MYSTERIOUS_STRANGER_9639 = 9639; + public static final int MYSTERIOUS_STRANGER_9640 = 9640; + public static final int BAT_9641 = 9641; + public static final int BAT_9642 = 9642; + public static final int SPIDER_9643 = 9643; + public static final int SPIDER_9644 = 9644; + public static final int FISH_9645 = 9645; + public static final int FISH_9646 = 9646; + public static final int KNIGHT_OF_THE_OWL = 9648; + public static final int KNIGHT_OF_THE_UNICORN = 9650; + public static final int KNIGHT_OF_THE_WOLF = 9652; + public static final int KNIGHT_OF_THE_LION = 9654; + public static final int ARCHPRIEST_OF_THE_UNICORN = 9656; + public static final int DARKMEYER_SLAVE = 9657; + public static final int DARKMEYER_SLAVE_9658 = 9658; + public static final int MAD_MELVIN96 = 9659; + public static final int R2T2PNSH0TY = 9660; + public static final int JYN = 9661; + public static final int C4SSI4N = 9662; + public static final int FISHRUNNER82 = 9663; + public static final int WEAST_SIDE49 = 9664; + public static final int C0LECT0R890 = 9665; + public static final int GIANT_SQUIRREL_9666 = 9666; + public static final int OWL = 9667; + public static final int OWL_9668 = 9668; + public static final int NORANNA_TYTANIN = 9675; + public static final int NORANNA_TYTANIN_9676 = 9676; + public static final int SLAVE_9677 = 9677; + public static final int SLAVE_9678 = 9678; + public static final int SLAVE_9679 = 9679; + public static final int SLAVE_9680 = 9680; + public static final int SLAVE_9681 = 9681; + public static final int SLAVE_9682 = 9682; + public static final int VAMPYRE_JUVINATE_9683 = 9683; + public static final int VAMPYRE_JUVINATE_9684 = 9684; + public static final int VALENTIN_RASPUTIN = 9685; + public static final int VON_VAN_VON = 9686; + public static final int VLAD_BECHSTEIN = 9687; + public static final int DRACONIS_SANGUINE = 9688; + public static final int MORT_NIGHTSHADE = 9689; + public static final int VAMPYRUS_DIAEMUS = 9690; + public static final int CARNIVUS_BELAMORTA = 9691; + public static final int VORMAR_VAKAN = 9692; + public static final int MISDRIEVUS_SHADUM = 9693; + public static final int VLAD_DIAEMUS = 9694; + public static final int NOCTILLION_LUGOSI = 9695; + public static final int ALEK_CONSTANTINE = 9696; + public static final int GRIGOR_RASPUTIN = 9697; + public static final int HAEMAS_LAMESCUS = 9698; + public static final int REMUS_KANINUS = 9699; + public static final int VALLESSIA_DRACYULA = 9700; + public static final int VIOLETTA_SANGUINE = 9701; + public static final int DIPHYLLA_BECHSTEIN = 9702; + public static final int EPISCULA_HELSING = 9703; + public static final int VAMPYRESSA_VAN_VON = 9704; + public static final int VALLESSIA_VON_PITT = 9705; + public static final int VONNETTA_VARNIS = 9706; + public static final int NATALIDAE_SHADUM = 9707; + public static final int MORTINA_DAUBENTON = 9708; + public static final int LASENNA_RASPUTIN = 9709; + public static final int CANINELLE_DRAYNAR = 9710; + public static final int VALENTINA_DIAEMUS = 9711; + public static final int NAKASA_JOVKAI = 9712; + public static final int CRIMSONETTE_VAN_MARR = 9713; + public static final int PIPISTRELLE_DRAYNAR = 9714; + public static final int LADY_NADEZHDA_SHADUM = 9715; + public static final int LORD_MISCHA_MYRMEL = 9716; + public static final int LORD_ALEXEI_JOVKAI_9717 = 9717; + public static final int BANKER_9718 = 9718; + public static final int BANKER_9719 = 9719; + public static final int GRINKA_KRAST = 9720; + public static final int DRASDAN_RANOR = 9721; + public static final int DESPOINA_CALLIDRA = 9722; + public static final int LENYIG_KARNA = 9723; + public static final int VARRIAN_SOBAK = 9724; + public static final int SLAVE_9725 = 9725; + public static final int SLAVE_9726 = 9726; + public static final int VAMPYRE_JUVINATE_9727 = 9727; + public static final int VAMPYRE_JUVINATE_9728 = 9728; + public static final int VAMPYRE_JUVINATE_9729 = 9729; + public static final int VAMPYRE_JUVINATE_9730 = 9730; + public static final int VAMPYRE_JUVENILE_9731 = 9731; + public static final int VAMPYRE_JUVENILE_9732 = 9732; + public static final int VAMPYRE_JUVENILE_9733 = 9733; + public static final int VAMPYRE_JUVENILE_9734 = 9734; + public static final int VYREWATCH_9735 = 9735; + public static final int VYREWATCH_9736 = 9736; + public static final int VYREWATCH_9737 = 9737; + public static final int VYREWATCH_9738 = 9738; + public static final int VYREWATCH_9739 = 9739; + public static final int VYREWATCH_9740 = 9740; + public static final int VYREWATCH_9741 = 9741; + public static final int VYREWATCH_9742 = 9742; + public static final int WEREWOLF_9743 = 9743; + public static final int WEREWOLF_9744 = 9744; + public static final int WEREWOLF_9745 = 9745; + public static final int AUCTIONEER = 9746; + public static final int FRANK_9749 = 9749; + public static final int SPECTATOR = 9750; + public static final int SPECTATOR_9751 = 9751; + public static final int SPECTATOR_9752 = 9752; + public static final int SPECTATOR_9753 = 9753; + public static final int SPECTATOR_9754 = 9754; + public static final int SPECTATOR_9755 = 9755; + public static final int VYREWATCH_SENTINEL_9756 = 9756; + public static final int VYREWATCH_SENTINEL_9757 = 9757; + public static final int VYREWATCH_SENTINEL_9758 = 9758; + public static final int VYREWATCH_SENTINEL_9759 = 9759; + public static final int VYREWATCH_SENTINEL_9760 = 9760; + public static final int VYREWATCH_SENTINEL_9761 = 9761; + public static final int VYREWATCH_SENTINEL_9762 = 9762; + public static final int VYREWATCH_SENTINEL_9763 = 9763; + public static final int YENRAB_9764 = 9764; + public static final int LAHSRAM_9765 = 9765; + public static final int ERODOEHT_9766 = 9766; + public static final int CARL_9767 = 9767; + public static final int ROY = 9768; + public static final int LECTOR_GURA_9769 = 9769; + public static final int SISTER_SEVI_9770 = 9770; + public static final int SISTER_TOEN_9771 = 9771; + public static final int SISTER_YRAM_9772 = 9772; + public static final int KROY_9773 = 9773; + public static final int DAMIEN_LEUCURTE_9774 = 9774; + public static final int LORD_CROMBWICK_9775 = 9775; + public static final int PAINTED_ONE = 9776; + public static final int PAINTED_ONE_9777 = 9777; + public static final int KURT = 9778; + public static final int DON = 9779; + public static final int DEBRA = 9780; + public static final int TANYA_9781 = 9781; + public static final int KURT_9782 = 9782; + public static final int DON_9783 = 9783; + public static final int DEBRA_9784 = 9784; + public static final int TANYA_9785 = 9785; + public static final int CHILD_9786 = 9786; + public static final int CHILD_9787 = 9787; + public static final int CHILD_9788 = 9788; + public static final int CHILD_9789 = 9789; + public static final int CHILD_9790 = 9790; + public static final int CHILD_9791 = 9791; + public static final int CHILD_9792 = 9792; + public static final int CHILD_9793 = 9793; + public static final int CHILD_9794 = 9794; + public static final int CHILD_9795 = 9795; + public static final int CHILD_9796 = 9796; + public static final int CHILD_9797 = 9797; + public static final int CHILD_9798 = 9798; + public static final int CHILD_9799 = 9799; + public static final int SLEEPWALKER_9801 = 9801; + public static final int SLEEPWALKER_9802 = 9802; /* 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 4272c68378..f0a839be16 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -12981,5 +12981,88 @@ public final class NullItemID public static final int NULL_24667 = 24667; public static final int NULL_24669 = 24669; public static final int NULL_24671 = 24671; + public static final int NULL_24677 = 24677; + public static final int NULL_24679 = 24679; + public static final int NULL_24681 = 24681; + public static final int NULL_24683 = 24683; + public static final int NULL_24685 = 24685; + public static final int NULL_24687 = 24687; + public static final int NULL_24689 = 24689; + public static final int NULL_24692 = 24692; + public static final int NULL_24694 = 24694; + public static final int NULL_24696 = 24696; + public static final int NULL_24698 = 24698; + public static final int NULL_24700 = 24700; + public static final int NULL_24705 = 24705; + public static final int NULL_24707 = 24707; + public static final int NULL_24710 = 24710; + public static final int NULL_24712 = 24712; + public static final int NULL_24713 = 24713; + public static final int NULL_24714 = 24714; + public static final int NULL_24715 = 24715; + public static final int NULL_24716 = 24716; + public static final int NULL_24717 = 24717; + public static final int NULL_24718 = 24718; + public static final int NULL_24720 = 24720; + public static final int NULL_24722 = 24722; + public static final int NULL_24724 = 24724; + public static final int NULL_24726 = 24726; + public static final int NULL_24728 = 24728; + public static final int NULL_24730 = 24730; + public static final int NULL_24732 = 24732; + public static final int NULL_24734 = 24734; + public static final int NULL_24737 = 24737; + public static final int NULL_24739 = 24739; + public static final int NULL_24741 = 24741; + public static final int NULL_24742 = 24742; + public static final int NULL_24744 = 24744; + public static final int NULL_24747 = 24747; + public static final int NULL_24750 = 24750; + public static final int NULL_24753 = 24753; + public static final int NULL_24756 = 24756; + public static final int NULL_24759 = 24759; + public static final int NULL_24762 = 24762; + public static final int NULL_24764 = 24764; + public static final int NULL_24766 = 24766; + public static final int NULL_24768 = 24768; + public static final int NULL_24770 = 24770; + public static final int NULL_24772 = 24772; + public static final int NULL_24775 = 24775; + public static final int NULL_24776 = 24776; + public static final int NULL_24778 = 24778; + public static final int NULL_24779 = 24779; + public static final int NULL_24781 = 24781; + public static final int NULL_24783 = 24783; + public static final int NULL_24784 = 24784; + public static final int NULL_24786 = 24786; + public static final int NULL_24787 = 24787; + public static final int NULL_24789 = 24789; + public static final int NULL_24791 = 24791; + public static final int NULL_24793 = 24793; + public static final int NULL_24795 = 24795; + public static final int NULL_24797 = 24797; + public static final int NULL_24799 = 24799; + public static final int NULL_24801 = 24801; + public static final int NULL_24803 = 24803; + public static final int NULL_24805 = 24805; + public static final int NULL_24807 = 24807; + public static final int NULL_24809 = 24809; + public static final int NULL_24811 = 24811; + public static final int NULL_24813 = 24813; + public static final int NULL_24815 = 24815; + public static final int NULL_24817 = 24817; + public static final int NULL_24819 = 24819; + public static final int NULL_24821 = 24821; + public static final int NULL_24823 = 24823; + public static final int NULL_24825 = 24825; + public static final int NULL_24827 = 24827; + public static final int NULL_24829 = 24829; + public static final int NULL_24831 = 24831; + public static final int NULL_24833 = 24833; + public static final int NULL_24835 = 24835; + public static final int NULL_24837 = 24837; + public static final int NULL_24839 = 24839; + public static final int NULL_24841 = 24841; + public static final int NULL_24843 = 24843; /* 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 12e20de7a5..8ddb727a2f 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -15620,7 +15620,6 @@ public final class NullObjectID public static final int NULL_32982 = 32982; public static final int NULL_32983 = 32983; public static final int NULL_32984 = 32984; - public static final int NULL_32988 = 32988; public static final int NULL_32989 = 32989; public static final int NULL_32997 = 32997; public static final int NULL_32998 = 32998; @@ -18337,5 +18336,1131 @@ public final class NullObjectID public static final int NULL_37962 = 37962; public static final int NULL_37976 = 37976; public static final int NULL_37977 = 37977; + public static final int NULL_38020 = 38020; + public static final int NULL_38021 = 38021; + public static final int NULL_38022 = 38022; + public static final int NULL_38023 = 38023; + public static final int NULL_38024 = 38024; + public static final int NULL_38025 = 38025; + public static final int NULL_38026 = 38026; + public static final int NULL_38027 = 38027; + public static final int NULL_38028 = 38028; + public static final int NULL_38033 = 38033; + public static final int NULL_38045 = 38045; + public static final int NULL_38046 = 38046; + public static final int NULL_38047 = 38047; + public static final int NULL_38048 = 38048; + public static final int NULL_38057 = 38057; + public static final int NULL_38058 = 38058; + public static final int NULL_38059 = 38059; + public static final int NULL_38060 = 38060; + public static final int NULL_38061 = 38061; + public static final int NULL_38063 = 38063; + public static final int NULL_38064 = 38064; + public static final int NULL_38065 = 38065; + public static final int NULL_38066 = 38066; + public static final int NULL_38067 = 38067; + public static final int NULL_38068 = 38068; + public static final int NULL_38074 = 38074; + public static final int NULL_38075 = 38075; + public static final int NULL_38076 = 38076; + public static final int NULL_38077 = 38077; + public static final int NULL_38078 = 38078; + public static final int NULL_38079 = 38079; + public static final int NULL_38080 = 38080; + public static final int NULL_38081 = 38081; + public static final int NULL_38082 = 38082; + public static final int NULL_38084 = 38084; + public static final int NULL_38085 = 38085; + public static final int NULL_38086 = 38086; + public static final int NULL_38087 = 38087; + public static final int NULL_38090 = 38090; + public static final int NULL_38098 = 38098; + public static final int NULL_38099 = 38099; + public static final int NULL_38100 = 38100; + public static final int NULL_38101 = 38101; + public static final int NULL_38102 = 38102; + public static final int NULL_38103 = 38103; + public static final int NULL_38104 = 38104; + public static final int NULL_38105 = 38105; + public static final int NULL_38106 = 38106; + public static final int NULL_38107 = 38107; + public static final int NULL_38108 = 38108; + public static final int NULL_38109 = 38109; + public static final int NULL_38110 = 38110; + public static final int NULL_38111 = 38111; + public static final int NULL_38112 = 38112; + public static final int NULL_38113 = 38113; + public static final int NULL_38114 = 38114; + public static final int NULL_38115 = 38115; + public static final int NULL_38116 = 38116; + public static final int NULL_38117 = 38117; + public static final int NULL_38118 = 38118; + public static final int NULL_38119 = 38119; + public static final int NULL_38120 = 38120; + public static final int NULL_38121 = 38121; + public static final int NULL_38122 = 38122; + public static final int NULL_38123 = 38123; + public static final int NULL_38124 = 38124; + public static final int NULL_38125 = 38125; + public static final int NULL_38126 = 38126; + public static final int NULL_38127 = 38127; + public static final int NULL_38128 = 38128; + public static final int NULL_38129 = 38129; + public static final int NULL_38130 = 38130; + public static final int NULL_38131 = 38131; + public static final int NULL_38132 = 38132; + public static final int NULL_38133 = 38133; + public static final int NULL_38134 = 38134; + public static final int NULL_38135 = 38135; + public static final int NULL_38136 = 38136; + public static final int NULL_38137 = 38137; + public static final int NULL_38138 = 38138; + public static final int NULL_38139 = 38139; + public static final int NULL_38140 = 38140; + public static final int NULL_38141 = 38141; + public static final int NULL_38142 = 38142; + public static final int NULL_38143 = 38143; + public static final int NULL_38144 = 38144; + public static final int NULL_38145 = 38145; + public static final int NULL_38146 = 38146; + public static final int NULL_38147 = 38147; + public static final int NULL_38148 = 38148; + public static final int NULL_38149 = 38149; + public static final int NULL_38150 = 38150; + public static final int NULL_38151 = 38151; + public static final int NULL_38152 = 38152; + public static final int NULL_38153 = 38153; + public static final int NULL_38154 = 38154; + public static final int NULL_38155 = 38155; + public static final int NULL_38156 = 38156; + public static final int NULL_38157 = 38157; + public static final int NULL_38158 = 38158; + public static final int NULL_38159 = 38159; + public static final int NULL_38160 = 38160; + public static final int NULL_38161 = 38161; + public static final int NULL_38162 = 38162; + public static final int NULL_38163 = 38163; + public static final int NULL_38164 = 38164; + public static final int NULL_38165 = 38165; + public static final int NULL_38166 = 38166; + public static final int NULL_38167 = 38167; + public static final int NULL_38168 = 38168; + public static final int NULL_38169 = 38169; + public static final int NULL_38170 = 38170; + public static final int NULL_38171 = 38171; + public static final int NULL_38172 = 38172; + public static final int NULL_38173 = 38173; + public static final int NULL_38174 = 38174; + public static final int NULL_38175 = 38175; + public static final int NULL_38176 = 38176; + public static final int NULL_38177 = 38177; + public static final int NULL_38178 = 38178; + public static final int NULL_38179 = 38179; + public static final int NULL_38180 = 38180; + public static final int NULL_38181 = 38181; + public static final int NULL_38182 = 38182; + public static final int NULL_38183 = 38183; + public static final int NULL_38184 = 38184; + public static final int NULL_38185 = 38185; + public static final int NULL_38186 = 38186; + public static final int NULL_38187 = 38187; + public static final int NULL_38188 = 38188; + public static final int NULL_38189 = 38189; + public static final int NULL_38190 = 38190; + public static final int NULL_38191 = 38191; + public static final int NULL_38192 = 38192; + public static final int NULL_38193 = 38193; + public static final int NULL_38194 = 38194; + public static final int NULL_38195 = 38195; + public static final int NULL_38196 = 38196; + public static final int NULL_38197 = 38197; + public static final int NULL_38198 = 38198; + public static final int NULL_38199 = 38199; + public static final int NULL_38200 = 38200; + public static final int NULL_38201 = 38201; + public static final int NULL_38202 = 38202; + public static final int NULL_38203 = 38203; + public static final int NULL_38204 = 38204; + public static final int NULL_38205 = 38205; + public static final int NULL_38206 = 38206; + public static final int NULL_38207 = 38207; + public static final int NULL_38208 = 38208; + public static final int NULL_38209 = 38209; + public static final int NULL_38210 = 38210; + public static final int NULL_38211 = 38211; + public static final int NULL_38212 = 38212; + public static final int NULL_38213 = 38213; + public static final int NULL_38214 = 38214; + public static final int NULL_38215 = 38215; + public static final int NULL_38216 = 38216; + public static final int NULL_38217 = 38217; + public static final int NULL_38218 = 38218; + public static final int NULL_38219 = 38219; + public static final int NULL_38220 = 38220; + public static final int NULL_38221 = 38221; + public static final int NULL_38222 = 38222; + public static final int NULL_38223 = 38223; + public static final int NULL_38224 = 38224; + public static final int NULL_38225 = 38225; + public static final int NULL_38226 = 38226; + public static final int NULL_38227 = 38227; + public static final int NULL_38228 = 38228; + public static final int NULL_38229 = 38229; + public static final int NULL_38230 = 38230; + public static final int NULL_38231 = 38231; + public static final int NULL_38232 = 38232; + public static final int NULL_38233 = 38233; + public static final int NULL_38234 = 38234; + public static final int NULL_38235 = 38235; + public static final int NULL_38236 = 38236; + public static final int NULL_38237 = 38237; + public static final int NULL_38238 = 38238; + public static final int NULL_38239 = 38239; + public static final int NULL_38240 = 38240; + public static final int NULL_38241 = 38241; + public static final int NULL_38242 = 38242; + public static final int NULL_38243 = 38243; + public static final int NULL_38244 = 38244; + public static final int NULL_38245 = 38245; + public static final int NULL_38246 = 38246; + public static final int NULL_38247 = 38247; + public static final int NULL_38248 = 38248; + public static final int NULL_38249 = 38249; + public static final int NULL_38250 = 38250; + public static final int NULL_38251 = 38251; + public static final int NULL_38252 = 38252; + public static final int NULL_38253 = 38253; + public static final int NULL_38254 = 38254; + public static final int NULL_38255 = 38255; + public static final int NULL_38256 = 38256; + public static final int NULL_38257 = 38257; + public static final int NULL_38258 = 38258; + public static final int NULL_38259 = 38259; + public static final int NULL_38260 = 38260; + public static final int NULL_38261 = 38261; + public static final int NULL_38262 = 38262; + public static final int NULL_38263 = 38263; + public static final int NULL_38264 = 38264; + public static final int NULL_38265 = 38265; + public static final int NULL_38266 = 38266; + public static final int NULL_38267 = 38267; + public static final int NULL_38268 = 38268; + public static final int NULL_38269 = 38269; + public static final int NULL_38270 = 38270; + public static final int NULL_38271 = 38271; + public static final int NULL_38272 = 38272; + public static final int NULL_38273 = 38273; + public static final int NULL_38274 = 38274; + public static final int NULL_38275 = 38275; + public static final int NULL_38276 = 38276; + public static final int NULL_38277 = 38277; + public static final int NULL_38278 = 38278; + public static final int NULL_38279 = 38279; + public static final int NULL_38280 = 38280; + public static final int NULL_38281 = 38281; + public static final int NULL_38282 = 38282; + public static final int NULL_38283 = 38283; + public static final int NULL_38284 = 38284; + public static final int NULL_38285 = 38285; + public static final int NULL_38286 = 38286; + public static final int NULL_38287 = 38287; + public static final int NULL_38288 = 38288; + public static final int NULL_38289 = 38289; + public static final int NULL_38290 = 38290; + public static final int NULL_38291 = 38291; + public static final int NULL_38292 = 38292; + public static final int NULL_38293 = 38293; + public static final int NULL_38294 = 38294; + public static final int NULL_38295 = 38295; + public static final int NULL_38296 = 38296; + public static final int NULL_38297 = 38297; + public static final int NULL_38298 = 38298; + public static final int NULL_38299 = 38299; + public static final int NULL_38300 = 38300; + public static final int NULL_38301 = 38301; + public static final int NULL_38302 = 38302; + public static final int NULL_38303 = 38303; + public static final int NULL_38304 = 38304; + public static final int NULL_38305 = 38305; + public static final int NULL_38306 = 38306; + public static final int NULL_38307 = 38307; + public static final int NULL_38308 = 38308; + public static final int NULL_38309 = 38309; + public static final int NULL_38310 = 38310; + public static final int NULL_38311 = 38311; + public static final int NULL_38312 = 38312; + public static final int NULL_38313 = 38313; + public static final int NULL_38314 = 38314; + public static final int NULL_38315 = 38315; + public static final int NULL_38316 = 38316; + public static final int NULL_38317 = 38317; + public static final int NULL_38318 = 38318; + public static final int NULL_38319 = 38319; + public static final int NULL_38320 = 38320; + public static final int NULL_38321 = 38321; + public static final int NULL_38322 = 38322; + public static final int NULL_38323 = 38323; + public static final int NULL_38324 = 38324; + public static final int NULL_38325 = 38325; + public static final int NULL_38326 = 38326; + public static final int NULL_38327 = 38327; + public static final int NULL_38328 = 38328; + public static final int NULL_38329 = 38329; + public static final int NULL_38330 = 38330; + public static final int NULL_38331 = 38331; + public static final int NULL_38332 = 38332; + public static final int NULL_38333 = 38333; + public static final int NULL_38334 = 38334; + public static final int NULL_38335 = 38335; + public static final int NULL_38336 = 38336; + public static final int NULL_38337 = 38337; + public static final int NULL_38338 = 38338; + public static final int NULL_38339 = 38339; + public static final int NULL_38340 = 38340; + public static final int NULL_38341 = 38341; + public static final int NULL_38342 = 38342; + public static final int NULL_38343 = 38343; + public static final int NULL_38344 = 38344; + public static final int NULL_38345 = 38345; + public static final int NULL_38346 = 38346; + public static final int NULL_38347 = 38347; + public static final int NULL_38348 = 38348; + public static final int NULL_38349 = 38349; + public static final int NULL_38350 = 38350; + public static final int NULL_38351 = 38351; + public static final int NULL_38352 = 38352; + public static final int NULL_38353 = 38353; + public static final int NULL_38354 = 38354; + public static final int NULL_38355 = 38355; + public static final int NULL_38356 = 38356; + public static final int NULL_38357 = 38357; + public static final int NULL_38358 = 38358; + public static final int NULL_38359 = 38359; + public static final int NULL_38360 = 38360; + public static final int NULL_38361 = 38361; + public static final int NULL_38362 = 38362; + public static final int NULL_38363 = 38363; + public static final int NULL_38364 = 38364; + public static final int NULL_38365 = 38365; + public static final int NULL_38366 = 38366; + public static final int NULL_38367 = 38367; + public static final int NULL_38368 = 38368; + public static final int NULL_38369 = 38369; + public static final int NULL_38370 = 38370; + public static final int NULL_38371 = 38371; + public static final int NULL_38372 = 38372; + public static final int NULL_38373 = 38373; + public static final int NULL_38374 = 38374; + public static final int NULL_38375 = 38375; + public static final int NULL_38376 = 38376; + public static final int NULL_38377 = 38377; + public static final int NULL_38378 = 38378; + public static final int NULL_38379 = 38379; + public static final int NULL_38380 = 38380; + public static final int NULL_38382 = 38382; + public static final int NULL_38383 = 38383; + public static final int NULL_38384 = 38384; + public static final int NULL_38385 = 38385; + public static final int NULL_38386 = 38386; + public static final int NULL_38387 = 38387; + public static final int NULL_38388 = 38388; + public static final int NULL_38389 = 38389; + public static final int NULL_38390 = 38390; + public static final int NULL_38391 = 38391; + public static final int NULL_38392 = 38392; + public static final int NULL_38393 = 38393; + public static final int NULL_38394 = 38394; + public static final int NULL_38395 = 38395; + public static final int NULL_38396 = 38396; + public static final int NULL_38397 = 38397; + public static final int NULL_38398 = 38398; + public static final int NULL_38399 = 38399; + public static final int NULL_38400 = 38400; + public static final int NULL_38401 = 38401; + public static final int NULL_38402 = 38402; + public static final int NULL_38403 = 38403; + public static final int NULL_38404 = 38404; + public static final int NULL_38405 = 38405; + public static final int NULL_38406 = 38406; + public static final int NULL_38407 = 38407; + public static final int NULL_38408 = 38408; + public static final int NULL_38496 = 38496; + public static final int NULL_38497 = 38497; + public static final int NULL_38498 = 38498; + public static final int NULL_38499 = 38499; + public static final int NULL_38500 = 38500; + public static final int NULL_38501 = 38501; + public static final int NULL_38502 = 38502; + public static final int NULL_38503 = 38503; + public static final int NULL_38504 = 38504; + public static final int NULL_38505 = 38505; + public static final int NULL_38506 = 38506; + public static final int NULL_38507 = 38507; + public static final int NULL_38508 = 38508; + public static final int NULL_38509 = 38509; + public static final int NULL_38510 = 38510; + public static final int NULL_38511 = 38511; + public static final int NULL_38520 = 38520; + public static final int NULL_38549 = 38549; + public static final int NULL_38550 = 38550; + public static final int NULL_38557 = 38557; + public static final int NULL_38563 = 38563; + public static final int NULL_38564 = 38564; + public static final int NULL_38565 = 38565; + public static final int NULL_38575 = 38575; + public static final int NULL_38576 = 38576; + public static final int NULL_38577 = 38577; + public static final int NULL_38578 = 38578; + public static final int NULL_38579 = 38579; + public static final int NULL_38580 = 38580; + public static final int NULL_38581 = 38581; + public static final int NULL_38582 = 38582; + public static final int NULL_38583 = 38583; + public static final int NULL_38584 = 38584; + public static final int NULL_38585 = 38585; + public static final int NULL_38586 = 38586; + public static final int NULL_38587 = 38587; + public static final int NULL_38588 = 38588; + public static final int NULL_38589 = 38589; + public static final int NULL_38591 = 38591; + public static final int NULL_38592 = 38592; + public static final int NULL_38593 = 38593; + public static final int NULL_38594 = 38594; + public static final int NULL_38595 = 38595; + public static final int NULL_38597 = 38597; + public static final int NULL_38598 = 38598; + public static final int NULL_38599 = 38599; + public static final int NULL_38600 = 38600; + public static final int NULL_38613 = 38613; + public static final int NULL_38614 = 38614; + public static final int NULL_38615 = 38615; + public static final int NULL_38620 = 38620; + public static final int NULL_38621 = 38621; + public static final int NULL_38622 = 38622; + public static final int NULL_38623 = 38623; + public static final int NULL_38624 = 38624; + public static final int NULL_38625 = 38625; + public static final int NULL_38626 = 38626; + public static final int NULL_38627 = 38627; + public static final int NULL_38628 = 38628; + public static final int NULL_38629 = 38629; + public static final int NULL_38630 = 38630; + public static final int NULL_38631 = 38631; + public static final int NULL_38632 = 38632; + public static final int NULL_38633 = 38633; + public static final int NULL_38634 = 38634; + public static final int NULL_38635 = 38635; + public static final int NULL_38636 = 38636; + public static final int NULL_38637 = 38637; + public static final int NULL_38638 = 38638; + public static final int NULL_38639 = 38639; + public static final int NULL_38640 = 38640; + public static final int NULL_38641 = 38641; + public static final int NULL_38642 = 38642; + public static final int NULL_38643 = 38643; + public static final int NULL_38644 = 38644; + public static final int NULL_38645 = 38645; + public static final int NULL_38646 = 38646; + public static final int NULL_38647 = 38647; + public static final int NULL_38648 = 38648; + public static final int NULL_38649 = 38649; + public static final int NULL_38650 = 38650; + public static final int NULL_38651 = 38651; + public static final int NULL_38652 = 38652; + public static final int NULL_38653 = 38653; + public static final int NULL_38654 = 38654; + public static final int NULL_38655 = 38655; + public static final int NULL_38656 = 38656; + public static final int NULL_38657 = 38657; + public static final int NULL_38658 = 38658; + public static final int NULL_38659 = 38659; + public static final int NULL_38660 = 38660; + public static final int NULL_38661 = 38661; + public static final int NULL_38662 = 38662; + public static final int NULL_38663 = 38663; + public static final int NULL_38664 = 38664; + public static final int NULL_38665 = 38665; + public static final int NULL_38666 = 38666; + public static final int NULL_38667 = 38667; + public static final int NULL_38668 = 38668; + public static final int NULL_38669 = 38669; + public static final int NULL_38670 = 38670; + public static final int NULL_38671 = 38671; + public static final int NULL_38672 = 38672; + public static final int NULL_38673 = 38673; + public static final int NULL_38674 = 38674; + public static final int NULL_38675 = 38675; + public static final int NULL_38676 = 38676; + public static final int NULL_38677 = 38677; + public static final int NULL_38678 = 38678; + public static final int NULL_38679 = 38679; + public static final int NULL_38680 = 38680; + public static final int NULL_38681 = 38681; + public static final int NULL_38682 = 38682; + public static final int NULL_38683 = 38683; + public static final int NULL_38684 = 38684; + public static final int NULL_38685 = 38685; + public static final int NULL_38686 = 38686; + public static final int NULL_38687 = 38687; + public static final int NULL_38688 = 38688; + public static final int NULL_38689 = 38689; + public static final int NULL_38690 = 38690; + public static final int NULL_38691 = 38691; + public static final int NULL_38692 = 38692; + public static final int NULL_38693 = 38693; + public static final int NULL_38698 = 38698; + public static final int NULL_38699 = 38699; + public static final int NULL_38700 = 38700; + public static final int NULL_38701 = 38701; + public static final int NULL_38702 = 38702; + public static final int NULL_38703 = 38703; + public static final int NULL_38704 = 38704; + public static final int NULL_38705 = 38705; + public static final int NULL_38706 = 38706; + public static final int NULL_38707 = 38707; + public static final int NULL_38708 = 38708; + public static final int NULL_38709 = 38709; + public static final int NULL_38710 = 38710; + public static final int NULL_38711 = 38711; + public static final int NULL_38712 = 38712; + public static final int NULL_38713 = 38713; + public static final int NULL_38717 = 38717; + public static final int NULL_38723 = 38723; + public static final int NULL_38724 = 38724; + public static final int NULL_38729 = 38729; + public static final int NULL_38730 = 38730; + public static final int NULL_38731 = 38731; + public static final int NULL_38732 = 38732; + public static final int NULL_38733 = 38733; + public static final int NULL_38734 = 38734; + public static final int NULL_38735 = 38735; + public static final int NULL_38736 = 38736; + public static final int NULL_38737 = 38737; + public static final int NULL_38738 = 38738; + public static final int NULL_38739 = 38739; + public static final int NULL_38740 = 38740; + public static final int NULL_38741 = 38741; + public static final int NULL_38742 = 38742; + public static final int NULL_38743 = 38743; + public static final int NULL_38744 = 38744; + public static final int NULL_38745 = 38745; + public static final int NULL_38746 = 38746; + public static final int NULL_38747 = 38747; + public static final int NULL_38748 = 38748; + public static final int NULL_38749 = 38749; + public static final int NULL_38750 = 38750; + public static final int NULL_38751 = 38751; + public static final int NULL_38752 = 38752; + public static final int NULL_38753 = 38753; + public static final int NULL_38754 = 38754; + public static final int NULL_38755 = 38755; + public static final int NULL_38756 = 38756; + public static final int NULL_38757 = 38757; + public static final int NULL_38758 = 38758; + public static final int NULL_38759 = 38759; + public static final int NULL_38760 = 38760; + public static final int NULL_38761 = 38761; + public static final int NULL_38762 = 38762; + public static final int NULL_38765 = 38765; + public static final int NULL_38766 = 38766; + public static final int NULL_38767 = 38767; + public static final int NULL_38768 = 38768; + public static final int NULL_38769 = 38769; + public static final int NULL_38770 = 38770; + public static final int NULL_38771 = 38771; + public static final int NULL_38772 = 38772; + public static final int NULL_38773 = 38773; + public static final int NULL_38774 = 38774; + public static final int NULL_38775 = 38775; + public static final int NULL_38776 = 38776; + public static final int NULL_38777 = 38777; + public static final int NULL_38778 = 38778; + public static final int NULL_38779 = 38779; + public static final int NULL_38780 = 38780; + public static final int NULL_38781 = 38781; + public static final int NULL_38782 = 38782; + public static final int NULL_38783 = 38783; + public static final int NULL_38784 = 38784; + public static final int NULL_38785 = 38785; + public static final int NULL_38786 = 38786; + public static final int NULL_38787 = 38787; + public static final int NULL_38788 = 38788; + public static final int NULL_38789 = 38789; + public static final int NULL_38795 = 38795; + public static final int NULL_38796 = 38796; + public static final int NULL_38812 = 38812; + public static final int NULL_38813 = 38813; + public static final int NULL_38814 = 38814; + public static final int NULL_38815 = 38815; + public static final int NULL_38816 = 38816; + public static final int NULL_38817 = 38817; + public static final int NULL_38818 = 38818; + public static final int NULL_38819 = 38819; + public static final int NULL_38820 = 38820; + public static final int NULL_38821 = 38821; + public static final int NULL_38842 = 38842; + public static final int NULL_38843 = 38843; + public static final int NULL_38844 = 38844; + public static final int NULL_38845 = 38845; + public static final int NULL_38846 = 38846; + public static final int NULL_38848 = 38848; + public static final int NULL_38853 = 38853; + public static final int NULL_38854 = 38854; + public static final int NULL_38855 = 38855; + public static final int NULL_38856 = 38856; + public static final int NULL_38857 = 38857; + public static final int NULL_38858 = 38858; + public static final int NULL_38859 = 38859; + public static final int NULL_38860 = 38860; + public static final int NULL_38861 = 38861; + public static final int NULL_38862 = 38862; + public static final int NULL_38863 = 38863; + public static final int NULL_38864 = 38864; + public static final int NULL_38865 = 38865; + public static final int NULL_38866 = 38866; + public static final int NULL_38867 = 38867; + public static final int NULL_38868 = 38868; + public static final int NULL_38869 = 38869; + public static final int NULL_38870 = 38870; + public static final int NULL_38871 = 38871; + public static final int NULL_38872 = 38872; + public static final int NULL_38873 = 38873; + public static final int NULL_38874 = 38874; + public static final int NULL_38875 = 38875; + public static final int NULL_38876 = 38876; + public static final int NULL_38877 = 38877; + public static final int NULL_38878 = 38878; + public static final int NULL_38879 = 38879; + public static final int NULL_38880 = 38880; + public static final int NULL_38881 = 38881; + public static final int NULL_38882 = 38882; + public static final int NULL_38883 = 38883; + public static final int NULL_38884 = 38884; + public static final int NULL_38885 = 38885; + public static final int NULL_38886 = 38886; + public static final int NULL_38887 = 38887; + public static final int NULL_38888 = 38888; + public static final int NULL_38889 = 38889; + public static final int NULL_38890 = 38890; + public static final int NULL_38891 = 38891; + public static final int NULL_38892 = 38892; + public static final int NULL_38893 = 38893; + public static final int NULL_38894 = 38894; + public static final int NULL_38895 = 38895; + public static final int NULL_38896 = 38896; + public static final int NULL_38897 = 38897; + public static final int NULL_38898 = 38898; + public static final int NULL_38899 = 38899; + public static final int NULL_38900 = 38900; + public static final int NULL_38901 = 38901; + public static final int NULL_38902 = 38902; + public static final int NULL_38903 = 38903; + public static final int NULL_38904 = 38904; + public static final int NULL_38905 = 38905; + public static final int NULL_38906 = 38906; + public static final int NULL_38907 = 38907; + public static final int NULL_38908 = 38908; + public static final int NULL_38909 = 38909; + public static final int NULL_38910 = 38910; + public static final int NULL_38911 = 38911; + public static final int NULL_38912 = 38912; + public static final int NULL_38913 = 38913; + public static final int NULL_38914 = 38914; + public static final int NULL_38915 = 38915; + public static final int NULL_38916 = 38916; + public static final int NULL_38917 = 38917; + public static final int NULL_38918 = 38918; + public static final int NULL_38919 = 38919; + public static final int NULL_38920 = 38920; + public static final int NULL_38921 = 38921; + public static final int NULL_38922 = 38922; + public static final int NULL_38923 = 38923; + public static final int NULL_38924 = 38924; + public static final int NULL_38925 = 38925; + public static final int NULL_38926 = 38926; + public static final int NULL_38927 = 38927; + public static final int NULL_38928 = 38928; + public static final int NULL_38929 = 38929; + public static final int NULL_38930 = 38930; + public static final int NULL_38931 = 38931; + public static final int NULL_38932 = 38932; + public static final int NULL_38933 = 38933; + public static final int NULL_38934 = 38934; + public static final int NULL_38935 = 38935; + public static final int NULL_38936 = 38936; + public static final int NULL_38937 = 38937; + public static final int NULL_38938 = 38938; + public static final int NULL_38939 = 38939; + public static final int NULL_38940 = 38940; + public static final int NULL_38941 = 38941; + public static final int NULL_38942 = 38942; + public static final int NULL_38943 = 38943; + public static final int NULL_38944 = 38944; + public static final int NULL_38945 = 38945; + public static final int NULL_38946 = 38946; + public static final int NULL_38947 = 38947; + public static final int NULL_38948 = 38948; + public static final int NULL_38949 = 38949; + public static final int NULL_38950 = 38950; + public static final int NULL_38951 = 38951; + public static final int NULL_38952 = 38952; + public static final int NULL_38953 = 38953; + public static final int NULL_38954 = 38954; + public static final int NULL_38955 = 38955; + public static final int NULL_38956 = 38956; + public static final int NULL_38957 = 38957; + public static final int NULL_38958 = 38958; + public static final int NULL_38959 = 38959; + public static final int NULL_38960 = 38960; + public static final int NULL_38961 = 38961; + public static final int NULL_38962 = 38962; + public static final int NULL_38963 = 38963; + public static final int NULL_38964 = 38964; + public static final int NULL_38965 = 38965; + public static final int NULL_38966 = 38966; + public static final int NULL_38967 = 38967; + public static final int NULL_38968 = 38968; + public static final int NULL_38969 = 38969; + public static final int NULL_38970 = 38970; + public static final int NULL_38971 = 38971; + public static final int NULL_38972 = 38972; + public static final int NULL_38973 = 38973; + public static final int NULL_38974 = 38974; + public static final int NULL_38975 = 38975; + public static final int NULL_38976 = 38976; + public static final int NULL_38977 = 38977; + public static final int NULL_38978 = 38978; + public static final int NULL_38979 = 38979; + public static final int NULL_38980 = 38980; + public static final int NULL_38981 = 38981; + public static final int NULL_38982 = 38982; + public static final int NULL_38983 = 38983; + public static final int NULL_38988 = 38988; + public static final int NULL_38989 = 38989; + public static final int NULL_38990 = 38990; + public static final int NULL_38991 = 38991; + public static final int NULL_38992 = 38992; + public static final int NULL_38993 = 38993; + public static final int NULL_38994 = 38994; + public static final int NULL_38995 = 38995; + public static final int NULL_38996 = 38996; + public static final int NULL_38997 = 38997; + public static final int NULL_38998 = 38998; + public static final int NULL_38999 = 38999; + public static final int NULL_39000 = 39000; + public static final int NULL_39001 = 39001; + public static final int NULL_39002 = 39002; + public static final int NULL_39003 = 39003; + public static final int NULL_39004 = 39004; + public static final int NULL_39005 = 39005; + public static final int NULL_39006 = 39006; + public static final int NULL_39007 = 39007; + public static final int NULL_39008 = 39008; + public static final int NULL_39009 = 39009; + public static final int NULL_39010 = 39010; + public static final int NULL_39011 = 39011; + public static final int NULL_39012 = 39012; + public static final int NULL_39013 = 39013; + public static final int NULL_39014 = 39014; + public static final int NULL_39015 = 39015; + public static final int NULL_39016 = 39016; + public static final int NULL_39017 = 39017; + public static final int NULL_39018 = 39018; + public static final int NULL_39019 = 39019; + public static final int NULL_39020 = 39020; + public static final int NULL_39021 = 39021; + public static final int NULL_39022 = 39022; + public static final int NULL_39023 = 39023; + public static final int NULL_39024 = 39024; + public static final int NULL_39025 = 39025; + public static final int NULL_39026 = 39026; + public static final int NULL_39027 = 39027; + public static final int NULL_39028 = 39028; + public static final int NULL_39029 = 39029; + public static final int NULL_39030 = 39030; + public static final int NULL_39031 = 39031; + public static final int NULL_39032 = 39032; + public static final int NULL_39033 = 39033; + public static final int NULL_39034 = 39034; + public static final int NULL_39035 = 39035; + public static final int NULL_39036 = 39036; + public static final int NULL_39037 = 39037; + public static final int NULL_39038 = 39038; + public static final int NULL_39039 = 39039; + public static final int NULL_39040 = 39040; + public static final int NULL_39041 = 39041; + public static final int NULL_39042 = 39042; + public static final int NULL_39043 = 39043; + public static final int NULL_39044 = 39044; + public static final int NULL_39045 = 39045; + public static final int NULL_39046 = 39046; + public static final int NULL_39047 = 39047; + public static final int NULL_39048 = 39048; + public static final int NULL_39049 = 39049; + public static final int NULL_39050 = 39050; + public static final int NULL_39051 = 39051; + public static final int NULL_39052 = 39052; + public static final int NULL_39053 = 39053; + public static final int NULL_39054 = 39054; + public static final int NULL_39055 = 39055; + public static final int NULL_39056 = 39056; + public static final int NULL_39057 = 39057; + public static final int NULL_39058 = 39058; + public static final int NULL_39059 = 39059; + public static final int NULL_39060 = 39060; + public static final int NULL_39061 = 39061; + public static final int NULL_39062 = 39062; + public static final int NULL_39063 = 39063; + public static final int NULL_39077 = 39077; + public static final int NULL_39078 = 39078; + public static final int NULL_39079 = 39079; + public static final int NULL_39080 = 39080; + public static final int NULL_39081 = 39081; + public static final int NULL_39082 = 39082; + public static final int NULL_39083 = 39083; + public static final int NULL_39084 = 39084; + public static final int NULL_39085 = 39085; + public static final int NULL_39086 = 39086; + public static final int NULL_39087 = 39087; + public static final int NULL_39088 = 39088; + public static final int NULL_39089 = 39089; + public static final int NULL_39090 = 39090; + public static final int NULL_39091 = 39091; + public static final int NULL_39096 = 39096; + public static final int NULL_39097 = 39097; + public static final int NULL_39098 = 39098; + public static final int NULL_39099 = 39099; + public static final int NULL_39100 = 39100; + public static final int NULL_39101 = 39101; + public static final int NULL_39102 = 39102; + public static final int NULL_39103 = 39103; + public static final int NULL_39104 = 39104; + public static final int NULL_39105 = 39105; + public static final int NULL_39106 = 39106; + public static final int NULL_39107 = 39107; + public static final int NULL_39108 = 39108; + public static final int NULL_39109 = 39109; + public static final int NULL_39110 = 39110; + public static final int NULL_39111 = 39111; + public static final int NULL_39112 = 39112; + public static final int NULL_39113 = 39113; + public static final int NULL_39114 = 39114; + public static final int NULL_39115 = 39115; + public static final int NULL_39116 = 39116; + public static final int NULL_39119 = 39119; + public static final int NULL_39120 = 39120; + public static final int NULL_39121 = 39121; + public static final int NULL_39122 = 39122; + public static final int NULL_39123 = 39123; + public static final int NULL_39124 = 39124; + public static final int NULL_39125 = 39125; + public static final int NULL_39126 = 39126; + public static final int NULL_39127 = 39127; + public static final int NULL_39128 = 39128; + public static final int NULL_39129 = 39129; + public static final int NULL_39130 = 39130; + public static final int NULL_39131 = 39131; + public static final int NULL_39132 = 39132; + public static final int NULL_39133 = 39133; + public static final int NULL_39134 = 39134; + public static final int NULL_39135 = 39135; + public static final int NULL_39146 = 39146; + public static final int NULL_39147 = 39147; + public static final int NULL_39148 = 39148; + public static final int NULL_39149 = 39149; + public static final int NULL_39150 = 39150; + public static final int NULL_39151 = 39151; + public static final int NULL_39153 = 39153; + public static final int NULL_39171 = 39171; + public static final int NULL_39174 = 39174; + public static final int NULL_39175 = 39175; + public static final int NULL_39176 = 39176; + public static final int NULL_39177 = 39177; + public static final int NULL_39178 = 39178; + public static final int NULL_39179 = 39179; + public static final int NULL_39180 = 39180; + public static final int NULL_39181 = 39181; + public static final int NULL_39182 = 39182; + public static final int NULL_39183 = 39183; + public static final int NULL_39184 = 39184; + public static final int NULL_39185 = 39185; + public static final int NULL_39186 = 39186; + public static final int NULL_39187 = 39187; + public static final int NULL_39188 = 39188; + public static final int NULL_39189 = 39189; + public static final int NULL_39190 = 39190; + public static final int NULL_39191 = 39191; + public static final int NULL_39192 = 39192; + public static final int NULL_39193 = 39193; + public static final int NULL_39194 = 39194; + public static final int NULL_39195 = 39195; + public static final int NULL_39196 = 39196; + public static final int NULL_39197 = 39197; + public static final int NULL_39198 = 39198; + public static final int NULL_39199 = 39199; + public static final int NULL_39200 = 39200; + public static final int NULL_39201 = 39201; + public static final int NULL_39202 = 39202; + public static final int NULL_39203 = 39203; + public static final int NULL_39204 = 39204; + public static final int NULL_39205 = 39205; + public static final int NULL_39206 = 39206; + public static final int NULL_39207 = 39207; + public static final int NULL_39208 = 39208; + public static final int NULL_39209 = 39209; + public static final int NULL_39210 = 39210; + public static final int NULL_39211 = 39211; + public static final int NULL_39212 = 39212; + public static final int NULL_39213 = 39213; + public static final int NULL_39214 = 39214; + public static final int NULL_39215 = 39215; + public static final int NULL_39216 = 39216; + public static final int NULL_39217 = 39217; + public static final int NULL_39218 = 39218; + public static final int NULL_39219 = 39219; + public static final int NULL_39220 = 39220; + public static final int NULL_39221 = 39221; + public static final int NULL_39222 = 39222; + public static final int NULL_39223 = 39223; + public static final int NULL_39224 = 39224; + public static final int NULL_39225 = 39225; + public static final int NULL_39226 = 39226; + public static final int NULL_39227 = 39227; + public static final int NULL_39228 = 39228; + public static final int NULL_39229 = 39229; + public static final int NULL_39230 = 39230; + public static final int NULL_39231 = 39231; + public static final int NULL_39232 = 39232; + public static final int NULL_39233 = 39233; + public static final int NULL_39235 = 39235; + public static final int NULL_39236 = 39236; + public static final int NULL_39237 = 39237; + public static final int NULL_39243 = 39243; + public static final int NULL_39244 = 39244; + public static final int NULL_39245 = 39245; + public static final int NULL_39246 = 39246; + public static final int NULL_39247 = 39247; + public static final int NULL_39248 = 39248; + public static final int NULL_39249 = 39249; + public static final int NULL_39250 = 39250; + public static final int NULL_39252 = 39252; + public static final int NULL_39254 = 39254; + public static final int NULL_39255 = 39255; + public static final int NULL_39256 = 39256; + public static final int NULL_39257 = 39257; + public static final int NULL_39258 = 39258; + public static final int NULL_39259 = 39259; + public static final int NULL_39260 = 39260; + public static final int NULL_39261 = 39261; + public static final int NULL_39262 = 39262; + public static final int NULL_39263 = 39263; + public static final int NULL_39264 = 39264; + public static final int NULL_39265 = 39265; + public static final int NULL_39266 = 39266; + public static final int NULL_39267 = 39267; + public static final int NULL_39268 = 39268; + public static final int NULL_39269 = 39269; + public static final int NULL_39270 = 39270; + public static final int NULL_39271 = 39271; + public static final int NULL_39272 = 39272; + public static final int NULL_39273 = 39273; + public static final int NULL_39274 = 39274; + public static final int NULL_39275 = 39275; + public static final int NULL_39276 = 39276; + public static final int NULL_39277 = 39277; + public static final int NULL_39278 = 39278; + public static final int NULL_39279 = 39279; + public static final int NULL_39280 = 39280; + public static final int NULL_39281 = 39281; + public static final int NULL_39282 = 39282; + public static final int NULL_39283 = 39283; + public static final int NULL_39284 = 39284; + public static final int NULL_39285 = 39285; + public static final int NULL_39286 = 39286; + public static final int NULL_39287 = 39287; + public static final int NULL_39288 = 39288; + public static final int NULL_39289 = 39289; + public static final int NULL_39290 = 39290; + public static final int NULL_39291 = 39291; + public static final int NULL_39292 = 39292; + public static final int NULL_39293 = 39293; + public static final int NULL_39294 = 39294; + public static final int NULL_39295 = 39295; + public static final int NULL_39296 = 39296; + public static final int NULL_39297 = 39297; + public static final int NULL_39298 = 39298; + public static final int NULL_39299 = 39299; + public static final int NULL_39300 = 39300; + public static final int NULL_39303 = 39303; + public static final int NULL_39304 = 39304; + public static final int NULL_39309 = 39309; + public static final int NULL_39310 = 39310; + public static final int NULL_39313 = 39313; + public static final int NULL_39314 = 39314; + public static final int NULL_39315 = 39315; + public static final int NULL_39316 = 39316; + public static final int NULL_39317 = 39317; + public static final int NULL_39318 = 39318; + public static final int NULL_39319 = 39319; + public static final int NULL_39320 = 39320; + public static final int NULL_39321 = 39321; + public static final int NULL_39322 = 39322; + public static final int NULL_39323 = 39323; + public static final int NULL_39324 = 39324; + public static final int NULL_39325 = 39325; + public static final int NULL_39326 = 39326; + public static final int NULL_39327 = 39327; + public static final int NULL_39328 = 39328; + public static final int NULL_39329 = 39329; + public static final int NULL_39330 = 39330; + public static final int NULL_39331 = 39331; + public static final int NULL_39332 = 39332; + public static final int NULL_39333 = 39333; + public static final int NULL_39334 = 39334; + public static final int NULL_39335 = 39335; + public static final int NULL_39336 = 39336; + public static final int NULL_39337 = 39337; + public static final int NULL_39338 = 39338; + public static final int NULL_39339 = 39339; + public static final int NULL_39340 = 39340; + public static final int NULL_39341 = 39341; + public static final int NULL_39342 = 39342; + public static final int NULL_39343 = 39343; + public static final int NULL_39344 = 39344; + public static final int NULL_39345 = 39345; + public static final int NULL_39346 = 39346; + public static final int NULL_39347 = 39347; + public static final int NULL_39348 = 39348; + public static final int NULL_39349 = 39349; + public static final int NULL_39350 = 39350; + public static final int NULL_39351 = 39351; + public static final int NULL_39352 = 39352; + public static final int NULL_39353 = 39353; + public static final int NULL_39354 = 39354; + public static final int NULL_39355 = 39355; + public static final int NULL_39356 = 39356; + public static final int NULL_39357 = 39357; + public static final int NULL_39358 = 39358; + public static final int NULL_39359 = 39359; + public static final int NULL_39360 = 39360; + public static final int NULL_39361 = 39361; + public static final int NULL_39362 = 39362; + public static final int NULL_39363 = 39363; + public static final int NULL_39364 = 39364; + public static final int NULL_39365 = 39365; + public static final int NULL_39366 = 39366; + public static final int NULL_39367 = 39367; + public static final int NULL_39368 = 39368; + public static final int NULL_39369 = 39369; + public static final int NULL_39370 = 39370; + public static final int NULL_39371 = 39371; + public static final int NULL_39374 = 39374; + public static final int NULL_39375 = 39375; + public static final int NULL_39376 = 39376; + public static final int NULL_39377 = 39377; + public static final int NULL_39378 = 39378; + public static final int NULL_39379 = 39379; + public static final int NULL_39380 = 39380; + public static final int NULL_39381 = 39381; + public static final int NULL_39382 = 39382; + public static final int NULL_39383 = 39383; + public static final int NULL_39384 = 39384; + public static final int NULL_39385 = 39385; + public static final int NULL_39386 = 39386; + public static final int NULL_39387 = 39387; + public static final int NULL_39397 = 39397; + public static final int NULL_39398 = 39398; + public static final int NULL_39399 = 39399; + public static final int NULL_39400 = 39400; + public static final int NULL_39401 = 39401; + public static final int NULL_39403 = 39403; + public static final int NULL_39405 = 39405; + public static final int NULL_39410 = 39410; + public static final int NULL_39411 = 39411; + public static final int NULL_39412 = 39412; + public static final int NULL_39413 = 39413; + public static final int NULL_39414 = 39414; + public static final int NULL_39415 = 39415; + public static final int NULL_39416 = 39416; + public static final int NULL_39417 = 39417; + public static final int NULL_39418 = 39418; + public static final int NULL_39419 = 39419; + public static final int NULL_39420 = 39420; + public static final int NULL_39421 = 39421; + public static final int NULL_39422 = 39422; + public static final int NULL_39423 = 39423; + public static final int NULL_39424 = 39424; + public static final int NULL_39425 = 39425; + public static final int NULL_39426 = 39426; + public static final int NULL_39427 = 39427; + public static final int NULL_39428 = 39428; + public static final int NULL_39429 = 39429; + public static final int NULL_39430 = 39430; + public static final int NULL_39431 = 39431; + public static final int NULL_39432 = 39432; + public static final int NULL_39433 = 39433; + public static final int NULL_39434 = 39434; + public static final int NULL_39435 = 39435; + public static final int NULL_39436 = 39436; + public static final int NULL_39437 = 39437; + public static final int NULL_39438 = 39438; + public static final int NULL_39439 = 39439; + public static final int NULL_39440 = 39440; + public static final int NULL_39454 = 39454; + public static final int NULL_39455 = 39455; + public static final int NULL_39456 = 39456; + public static final int NULL_39457 = 39457; + public static final int NULL_39466 = 39466; + public static final int NULL_39467 = 39467; + public static final int NULL_39468 = 39468; + public static final int NULL_39469 = 39469; + public static final int NULL_39470 = 39470; + public static final int NULL_39471 = 39471; + public static final int NULL_39472 = 39472; + public static final int NULL_39473 = 39473; + public static final int NULL_39474 = 39474; + public static final int NULL_39475 = 39475; + public static final int NULL_39476 = 39476; + public static final int NULL_39477 = 39477; + public static final int NULL_39478 = 39478; + public static final int NULL_39479 = 39479; + public static final int NULL_39480 = 39480; + public static final int NULL_39486 = 39486; + public static final int NULL_39493 = 39493; + public static final int NULL_39496 = 39496; + public static final int NULL_39497 = 39497; + public static final int NULL_39498 = 39498; + public static final int NULL_39499 = 39499; + public static final int NULL_39511 = 39511; + public static final int NULL_39515 = 39515; + public static final int NULL_39516 = 39516; + public static final int NULL_39517 = 39517; + public static final int NULL_39518 = 39518; + public static final int NULL_39519 = 39519; + public static final int NULL_39520 = 39520; + public static final int NULL_39521 = 39521; + public static final int NULL_39522 = 39522; + public static final int NULL_39523 = 39523; + public static final int NULL_39524 = 39524; + public static final int NULL_39525 = 39525; + public static final int NULL_39526 = 39526; + public static final int NULL_39527 = 39527; + public static final int NULL_39528 = 39528; + public static final int NULL_39529 = 39529; + public static final int NULL_39530 = 39530; + public static final int NULL_39531 = 39531; + public static final int NULL_39532 = 39532; + public static final int NULL_39533 = 39533; + public static final int NULL_39534 = 39534; + public static final int NULL_39535 = 39535; + public static final int NULL_39536 = 39536; + public static final int NULL_39537 = 39537; + public static final int NULL_39538 = 39538; + public static final int NULL_39539 = 39539; + public static final int NULL_39540 = 39540; + public static final int NULL_39541 = 39541; + public static final int NULL_39542 = 39542; + public static final int NULL_39543 = 39543; /* 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 a1861aaed0..cca1352370 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -1921,8 +1921,8 @@ public final class ObjectID public static final int FUNGI_ON_LOG = 3509; public static final int ROTTING_BRANCH = 3510; public static final int BUDDING_BRANCH = 3511; - public static final int A_SMALL_BUSH = 3512; - public static final int A_GOLDEN_PEAR_BUSH = 3513; + public static final int SMALL_BUSH = 3512; + public static final int GOLDEN_PEAR_BUSH = 3513; public static final int ROTTING_TREE = 3514; public static final int GROTTO = 3516; public static final int GROTTO_TREE = 3517; @@ -7158,7 +7158,7 @@ public final class ObjectID public static final int TABLE_12734 = 12734; public static final int CLOSED_CHEST_12735 = 12735; public static final int OPEN_CHEST_12736 = 12736; - public static final int BROKEN_DOWN_WALL = 12737; + public static final int BROKEN_WALL_12737 = 12737; public static final int RUBBLE_12739 = 12739; public static final int RUBBLE_12740 = 12740; public static final int FALLEN_WALL = 12741; @@ -7200,7 +7200,7 @@ public final class ObjectID public static final int BANK_BOOTH_12799 = 12799; public static final int BANK_BOOTH_12800 = 12800; public static final int BANK_BOOTH_12801 = 12801; - public static final int TOMB_12802 = 12802; + public static final int COFFIN_12802 = 12802; public static final int BARREL_12804 = 12804; public static final int BROKEN_FURNACE = 12806; public static final int REPAIRED_FURNACE = 12807; @@ -7216,7 +7216,7 @@ public final class ObjectID public static final int EXIT_PATH = 12820; public static final int PILE_OF_BRICKS_12844 = 12844; public static final int TABLE_12855 = 12855; - public static final int STORE_DOOR = 12856; + public static final int DOOR_12856 = 12856; public static final int BAR_PUMPS_12857 = 12857; public static final int TRAPDOOR_12872 = 12872; public static final int BOOKCASE_12873 = 12873; @@ -7923,8 +7923,8 @@ public final class ObjectID public static final int RIPPLES = 13842; public static final int SWAMP_TREE = 13843; public static final int SWAMP_TREE_13844 = 13844; - public static final int SWAMP_TREE_13845 = 13845; - public static final int VINE_HANGING_FROM_BRANCH = 13846; + public static final int SWAMP_TREE_BRANCH = 13845; + public static final int SWAMP_TREE_BRANCH_13846 = 13846; public static final int SWAMP_TREE_13847 = 13847; public static final int SWAMP_TREE_13848 = 13848; public static final int SWAMP_TREE_13849 = 13849; @@ -17356,6 +17356,7 @@ public final class ObjectID public static final int VYRE_WELL_32985 = 32985; public static final int TATTY_TOY = 32986; public static final int SCOREBOARD_32987 = 32987; + public static final int SCOREBOARD_32988 = 32988; public static final int MONUMENTAL_CHEST = 32990; public static final int MONUMENTAL_CHEST_32991 = 32991; public static final int MONUMENTAL_CHEST_32992 = 32992; @@ -19629,5 +19630,443 @@ public final class ObjectID public static final int TREE_37974 = 37974; public static final int TREE_37975 = 37975; public static final int MASSIVE_STORAGE_UNIT = 37978; + public static final int BARREL_37979 = 37979; + public static final int BARREL_37980 = 37980; + public static final int STAIRS_37981 = 37981; + public static final int LAB_TABLE_37982 = 37982; + public static final int LAB_TABLE_37983 = 37983; + public static final int BROKEN_TABLE_37984 = 37984; + public static final int SKELETON_37985 = 37985; + public static final int CLOSED_CHEST_37986 = 37986; + public static final int OPEN_CHEST_37987 = 37987; + public static final int CLOSED_CHEST_37988 = 37988; + public static final int BLISTERWOOD_TREE = 37989; + public static final int STRANGE_POOL = 37990; + public static final int ACID_POOL_37991 = 37991; + public static final int GATE_37992 = 37992; + public static final int GATE_37993 = 37993; + public static final int MAGICAL_FIRE_37994 = 37994; + public static final int MAGICAL_FIRE_37995 = 37995; + public static final int MAGICAL_FIRE_37996 = 37996; + public static final int VALVE_37997 = 37997; + public static final int VALVE_37998 = 37998; + public static final int SHELVES_37999 = 37999; + public static final int ENERGY_BARRIER_38000 = 38000; + public static final int ENERGY_BARRIER_38001 = 38001; + public static final int ENERGY_BARRIER_38002 = 38002; + public static final int ENERGY_BARRIER_38003 = 38003; + public static final int SWAMP_TREE_BRANCH_38004 = 38004; + public static final int SWAMP_TREE_BRANCH_38005 = 38005; + public static final int PATH_38006 = 38006; + public static final int PATH_38007 = 38007; + public static final int PATH_38008 = 38008; + public static final int PATH_38009 = 38009; + public static final int PATH_38010 = 38010; + public static final int PATH_38011 = 38011; + public static final int CELL_DOOR_38012 = 38012; + public static final int CELL_DOOR_38013 = 38013; + public static final int CELL_DOOR_38014 = 38014; + public static final int BLOOD_ORB = 38015; + public static final int CAVE_38016 = 38016; + public static final int BOOKSHELF_38017 = 38017; + public static final int BOOKSHELF_38018 = 38018; + public static final int BOOKSHELF_38019 = 38019; + public static final int CAGE_38029 = 38029; + public static final int CAGE_38030 = 38030; + public static final int CAGE_38031 = 38031; + public static final int CAGE_38032 = 38032; + public static final int RESTRAINING_TABLE = 38034; + public static final int RESTRAINT_TABLE = 38035; + public static final int EQUIPMENT_TABLE = 38036; + public static final int BROKEN_EQUIPMENT_TABLE = 38037; + public static final int BROKEN_RANGE = 38038; + public static final int COFFIN_38039 = 38039; + public static final int COFFIN_38040 = 38040; + public static final int RAISED_COFFIN = 38041; + public static final int GRAVESTONE_38042 = 38042; + public static final int GRAVESTONE_38043 = 38043; + public static final int MYSTERIOUS_RUINS_38044 = 38044; + public static final int GRAVE_38049 = 38049; + public static final int GRAVESTONE_38050 = 38050; + public static final int GRAVESTONE_38051 = 38051; + public static final int GRAVESTONE_38052 = 38052; + public static final int GRAVESTONE_38053 = 38053; + public static final int GRAVESTONE_38054 = 38054; + public static final int GRAVESTONE_38055 = 38055; + public static final int GRAVESTONE_38056 = 38056; + public static final int MAUSOLEUM_DOOR = 38062; + public static final int MAUSOLEUM_DOOR_38069 = 38069; + public static final int MAUSOLEUM_DOOR_38070 = 38070; + public static final int MAUSOLEUM_DOOR_38071 = 38071; + public static final int MAUSOLEUM_DOOR_38072 = 38072; + public static final int COFFIN_38073 = 38073; + public static final int PLANT_38083 = 38083; + public static final int PLANT_38088 = 38088; + public static final int BOAT_38089 = 38089; + public static final int SKELETON_38091 = 38091; + public static final int MUD_MOUND = 38092; + public static final int CAVE_ENTRANCE_38093 = 38093; + public static final int CAVE_ENTRANCE_38094 = 38094; + public static final int CRATE_38095 = 38095; + public static final int CRATE_38096 = 38096; + public static final int LADDER_38097 = 38097; + public static final int FISH_38381 = 38381; + public static final int WIZARD_STATUE = 38409; + public static final int WIZARD_STATUE_38410 = 38410; + public static final int WIZARD_STATUE_38411 = 38411; + public static final int WIZARD_STATUE_38412 = 38412; + public static final int WIZARD_STATUE_38413 = 38413; + public static final int WIZARD_STATUE_38414 = 38414; + public static final int WIZARD_STATUE_38415 = 38415; + public static final int WIZARD_STATUE_38416 = 38416; + public static final int WIZARD_STATUE_38417 = 38417; + public static final int WIZARD_STATUE_38418 = 38418; + public static final int WIZARD_STATUE_38419 = 38419; + public static final int WIZARD_STATUE_38420 = 38420; + public static final int WIZARD_STATUE_38421 = 38421; + public static final int WIZARD_STATUE_38422 = 38422; + public static final int WIZARD_STATUE_38423 = 38423; + public static final int WIZARD_STATUE_38424 = 38424; + public static final int WIZARD_STATUE_38425 = 38425; + public static final int FIRE_38426 = 38426; + public static final int FIRE_38427 = 38427; + public static final int KNIGHT_STATUE = 38428; + public static final int KNIGHT_STATUE_38429 = 38429; + public static final int KNIGHT_STATUE_38430 = 38430; + public static final int KNIGHT_STATUE_38431 = 38431; + public static final int KNIGHT_STATUE_38432 = 38432; + public static final int KNIGHT_STATUE_38433 = 38433; + public static final int KNIGHT_STATUE_38434 = 38434; + public static final int KNIGHT_STATUE_38435 = 38435; + public static final int KNIGHT_STATUE_38436 = 38436; + public static final int KNIGHT_STATUE_38437 = 38437; + public static final int KNIGHT_STATUE_38438 = 38438; + public static final int KNIGHT_STATUE_38439 = 38439; + public static final int KNIGHT_STATUE_38440 = 38440; + public static final int KNIGHT_STATUE_38441 = 38441; + public static final int KNIGHT_STATUE_38442 = 38442; + public static final int KNIGHT_STATUE_38443 = 38443; + public static final int CROSSBOWMAN_STATUE = 38444; + public static final int CROSSBOWMAN_STATUE_38445 = 38445; + public static final int CROSSBOWMAN_STATUE_38446 = 38446; + public static final int STRANGE_TILE = 38447; + public static final int STRANGE_TILE_38448 = 38448; + public static final int PRIEST_STATUE = 38449; + public static final int PRIEST_STATUE_38450 = 38450; + public static final int MAGICAL_OBELISK = 38451; + public static final int STAIRS_38452 = 38452; + public static final int STAIRS_38453 = 38453; + public static final int STAIRS_38454 = 38454; + public static final int PLATFORM_38455 = 38455; + public static final int PLATFORM_38456 = 38456; + public static final int PLATFORM_38457 = 38457; + public static final int PLATFORM_38458 = 38458; + public static final int PLATFORM_38459 = 38459; + public static final int GATE_38460 = 38460; + public static final int STAIRS_38461 = 38461; + public static final int STAIRS_38462 = 38462; + public static final int STAIRS_38463 = 38463; + public static final int STAIRS_38464 = 38464; + public static final int STAIRS_38465 = 38465; + public static final int STAIRS_38466 = 38466; + public static final int STAIRS_38467 = 38467; + public static final int STAIRS_38468 = 38468; + public static final int STAIRS_38469 = 38469; + public static final int PLATFORM_38470 = 38470; + public static final int STAIRS_38471 = 38471; + public static final int STAIRS_38472 = 38472; + public static final int STAIRS_38473 = 38473; + public static final int STAIRS_38474 = 38474; + public static final int STAIRS_38475 = 38475; + public static final int STAIRS_38476 = 38476; + public static final int PLATFORM_38477 = 38477; + public static final int STAIRS_38478 = 38478; + public static final int SKELETON_38479 = 38479; + public static final int URN_38480 = 38480; + public static final int URN_38481 = 38481; + public static final int URN_38482 = 38482; + public static final int URN_38483 = 38483; + public static final int URN_38484 = 38484; + public static final int URN_38485 = 38485; + public static final int URN_38486 = 38486; + public static final int URN_38487 = 38487; + public static final int URN_38488 = 38488; + public static final int URN_38489 = 38489; + public static final int URN_38490 = 38490; + public static final int URN_38491 = 38491; + public static final int METAL_STAND = 38492; + public static final int METAL_STAND_38493 = 38493; + public static final int GILDED_STAND = 38494; + public static final int GILDED_STAND_38495 = 38495; + public static final int TORCH_38512 = 38512; + public static final int TORCH_38513 = 38513; + public static final int TORCH_38514 = 38514; + public static final int ANCIENT_BOOKS = 38515; + public static final int ANCIENT_BOOKS_38516 = 38516; + public static final int ANCIENT_BOOKS_38517 = 38517; + public static final int ANCIENT_BOOKS_38518 = 38518; + public static final int STONE_CHEST_38519 = 38519; + public static final int ICYENE_STATUE = 38521; + public static final int ICYENE_STATUE_38522 = 38522; + public static final int LION_STATUE = 38523; + public static final int LION_STATUE_38524 = 38524; + public static final int LION_STATUE_38525 = 38525; + public static final int LION_STATUE_38526 = 38526; + public static final int LION_STATUE_38527 = 38527; + public static final int LION_STATUE_38528 = 38528; + public static final int LION_STATUE_38529 = 38529; + public static final int WOLF_STATUE = 38530; + public static final int WOLF_STATUE_38531 = 38531; + public static final int WOLF_STATUE_38532 = 38532; + public static final int WOLF_STATUE_38533 = 38533; + public static final int WOLF_STATUE_38534 = 38534; + public static final int WOLF_STATUE_38535 = 38535; + public static final int WOLF_STATUE_38536 = 38536; + public static final int UNICORN_STATUE = 38537; + public static final int UNICORN_STATUE_38538 = 38538; + public static final int UNICORN_STATUE_38539 = 38539; + public static final int UNICORN_STATUE_38540 = 38540; + public static final int OWL_STATUE = 38541; + public static final int OWL_STATUE_38542 = 38542; + public static final int OWL_STATUE_38543 = 38543; + public static final int OWL_STATUE_38544 = 38544; + public static final int JUSTICIAR_STATUE = 38545; + public static final int JUSTICIAR_STATUE_38546 = 38546; + public static final int JUSTICIAR_STATUE_38547 = 38547; + public static final int JUSTICIAR_STATUE_38548 = 38548; + public static final int RUBBLE_38551 = 38551; + public static final int RUBBLE_38552 = 38552; + public static final int RUBBLE_38553 = 38553; + public static final int RUBBLE_38554 = 38554; + public static final int TORCH_38555 = 38555; + public static final int STATUE_38556 = 38556; + public static final int RUBBLE_38558 = 38558; + public static final int RUBBLE_38559 = 38559; + public static final int RUBBLE_38560 = 38560; + public static final int RUBBLE_38561 = 38561; + public static final int TORCH_38562 = 38562; + public static final int RUBBLE_38566 = 38566; + public static final int RUBBLE_38567 = 38567; + public static final int RUBBLE_38568 = 38568; + public static final int RUBBLE_38569 = 38569; + public static final int RUBBLE_38570 = 38570; + public static final int RUBBLE_38571 = 38571; + public static final int RUBBLE_38572 = 38572; + public static final int RUBBLE_38573 = 38573; + public static final int MAUSOLEUM_DOOR_38574 = 38574; + public static final int BROKEN_STATUE = 38590; + public static final int STAIRS_38596 = 38596; + public static final int STAIRS_38601 = 38601; + public static final int STAIRS_38602 = 38602; + public static final int STAIRS_38603 = 38603; + public static final int STAIRS_38604 = 38604; + public static final int STAIRS_38605 = 38605; + public static final int STAIRS_38606 = 38606; + public static final int STAIRS_38607 = 38607; + public static final int STAIRS_38608 = 38608; + public static final int STAIRS_38609 = 38609; + public static final int STAIRS_38610 = 38610; + public static final int STAIRS_38611 = 38611; + public static final int STAIRS_38612 = 38612; + public static final int STATUE_38616 = 38616; + public static final int STATUE_38617 = 38617; + public static final int STATUE_38618 = 38618; + public static final int STATUE_38619 = 38619; + public static final int STAIRS_38694 = 38694; + public static final int STAIRS_38695 = 38695; + public static final int STAIRS_38696 = 38696; + public static final int STAIRS_38697 = 38697; + public static final int STATUE_38714 = 38714; + public static final int STATUE_38715 = 38715; + public static final int STATUE_38716 = 38716; + public static final int URN_38718 = 38718; + public static final int URN_38719 = 38719; + public static final int URN_38720 = 38720; + public static final int COFFIN_38721 = 38721; + public static final int COFFIN_38722 = 38722; + public static final int RUBBLE_38725 = 38725; + public static final int RUBBLE_38726 = 38726; + public static final int RUBBLE_38727 = 38727; + public static final int RUBBLE_38728 = 38728; + public static final int STAIRS_38763 = 38763; + public static final int STAIRS_38764 = 38764; + public static final int NOTICEBOARD_38790 = 38790; + public static final int PILLAR_38791 = 38791; + public static final int PILLAR_38792 = 38792; + public static final int PILLAR_38793 = 38793; + public static final int PILLAR_38794 = 38794; + public static final int SARADOMIN_BRAZIER = 38797; + public static final int SARADOMIN_BRAZIER_38798 = 38798; + public static final int SARADOMIN_BRAZIER_38799 = 38799; + public static final int SARADOMIN_BRAZIER_38800 = 38800; + public static final int SARADOMIN_BRAZIER_38801 = 38801; + public static final int SARADOMIN_BRAZIER_38802 = 38802; + public static final int HOLY_BARRIER_38803 = 38803; + public static final int HOLY_BARRIER_38804 = 38804; + public static final int HOLY_BARRIER_38805 = 38805; + public static final int BROKEN_BRIDGE_38806 = 38806; + public static final int BROKEN_BRIDGE_38807 = 38807; + public static final int BRIDGE_38808 = 38808; + public static final int BROKEN_BRIDGE_38809 = 38809; + public static final int BROKEN_BRIDGE_38810 = 38810; + public static final int BRIDGE_38811 = 38811; + public static final int TILE_38822 = 38822; + public static final int TILE_38823 = 38823; + public static final int TILE_38824 = 38824; + public static final int TILE_38825 = 38825; + public static final int TILE_38826 = 38826; + public static final int PORTAL_FRAME_38827 = 38827; + public static final int PORTAL_FRAME_38828 = 38828; + public static final int PORTAL_38829 = 38829; + public static final int COFFIN_38830 = 38830; + public static final int COFFIN_38831 = 38831; + public static final int COFFIN_38832 = 38832; + public static final int COFFIN_38833 = 38833; + public static final int COFFIN_38834 = 38834; + public static final int COFFIN_38835 = 38835; + public static final int COFFIN_38836 = 38836; + public static final int COFFIN_38837 = 38837; + public static final int COFFIN_38838 = 38838; + public static final int COFFIN_38839 = 38839; + public static final int HOLY_BARRIER_38840 = 38840; + public static final int HOLY_BARRIER_38841 = 38841; + public static final int STAIRS_38849 = 38849; + public static final int STAIRS_38850 = 38850; + public static final int STAIRS_38851 = 38851; + public static final int STAIRS_38852 = 38852; + public static final int STAIRS_38984 = 38984; + public static final int STAIRS_38985 = 38985; + public static final int STAIRS_38986 = 38986; + public static final int STAIRS_38987 = 38987; + public static final int BOX_39064 = 39064; + public static final int TABLE_39065 = 39065; + public static final int TABLE_39066 = 39066; + public static final int TABLE_39067 = 39067; + public static final int STAIRS_39068 = 39068; + public static final int STAIRS_39069 = 39069; + public static final int STATUE_39070 = 39070; + public static final int STATUE_39071 = 39071; + public static final int STATUE_39072 = 39072; + public static final int CHEST_39073 = 39073; + public static final int BIG_CHEST_39074 = 39074; + public static final int URN_39075 = 39075; + public static final int COFFIN_39076 = 39076; + public static final int STAIRCASE_39092 = 39092; + public static final int STAIRCASE_39093 = 39093; + public static final int DAEYALT_ESSENCE = 39094; + public static final int DAEYALT_ESSENCE_39095 = 39095; + public static final int MINE_CART_39117 = 39117; + public static final int PLINTH_39118 = 39118; + public static final int BOX_39136 = 39136; + public static final int TABLE_39137 = 39137; + public static final int TABLE_39138 = 39138; + public static final int TABLE_39139 = 39139; + public static final int STAIRS_39140 = 39140; + public static final int STAIRS_39141 = 39141; + public static final int STATUE_39142 = 39142; + public static final int STATUE_39143 = 39143; + public static final int CHEST_39144 = 39144; + public static final int BIG_CHEST_39145 = 39145; + public static final int LAMP_39152 = 39152; + public static final int BLOOD_TITHE = 39154; + public static final int BLOOD_TITHE_39155 = 39155; + public static final int BLOOD_TITHE_39156 = 39156; + public static final int BLOOD_TITHE_39157 = 39157; + public static final int BLOOD_TITHE_39158 = 39158; + public static final int BLOOD_TITHE_39159 = 39159; + public static final int CORPSE_CART = 39160; + public static final int CORPSE_CART_39161 = 39161; + public static final int FOUNTAIN_39162 = 39162; + public static final int SLAVE_39163 = 39163; + public static final int CAGED_PRISONER = 39164; + public static final int CAGED_PRISONER_39165 = 39165; + public static final int WALL_39166 = 39166; + public static final int WALL_39167 = 39167; + public static final int WALL_39168 = 39168; + public static final int WALL_39169 = 39169; + public static final int CRACKED_WALL = 39170; + public static final int WALL_39172 = 39172; + public static final int WALL_39173 = 39173; + public static final int STATUE_39234 = 39234; + public static final int BANK_BOOTH_39238 = 39238; + public static final int BANK_DEPOSIT_BOX_39239 = 39239; + public static final int CHEST_39240 = 39240; + public static final int FURNACE_39241 = 39241; + public static final int ANVIL_39242 = 39242; + public static final int LARGE_DOOR_39251 = 39251; + public static final int LARGE_DOOR_39253 = 39253; + public static final int SHELVES_39301 = 39301; + public static final int SHELVES_39302 = 39302; + public static final int ROOT_39305 = 39305; + public static final int ROOT_39306 = 39306; + public static final int ROOT_39307 = 39307; + public static final int ROOT_39308 = 39308; + public static final int BENCH_39311 = 39311; + public static final int CASTLE_GATES = 39312; + public static final int DOOR_39372 = 39372; + public static final int DOOR_39373 = 39373; + public static final int COFFIN_39388 = 39388; + public static final int TRUNK_39389 = 39389; + public static final int CHAIR_39390 = 39390; + public static final int RANGE_39391 = 39391; + public static final int CUPBOARD_39392 = 39392; + public static final int SINK_39393 = 39393; + public static final int SHOP_COUNTER_39394 = 39394; + public static final int POTTERS_WHEEL_39395 = 39395; + public static final int POTTERY_OVEN_39396 = 39396; + public static final int CELL_DOOR_39402 = 39402; + public static final int BED_39404 = 39404; + public static final int DOOR_39406 = 39406; + public static final int DOOR_39407 = 39407; + public static final int DOOR_39408 = 39408; + public static final int DOOR_39409 = 39409; + public static final int BAR_39441 = 39441; + public static final int BAR_39442 = 39442; + public static final int BAR_39443 = 39443; + public static final int BAR_39444 = 39444; + public static final int BAR_39445 = 39445; + public static final int BAR_39446 = 39446; + public static final int BAR_39447 = 39447; + public static final int BAR_39448 = 39448; + public static final int BAR_39449 = 39449; + public static final int STOOL_39450 = 39450; + public static final int TABLE_39451 = 39451; + public static final int TABLE_39452 = 39452; + public static final int HAT_STAND_39453 = 39453; + public static final int RANGE_39458 = 39458; + public static final int SINK_39459 = 39459; + public static final int COFFIN_39460 = 39460; + public static final int COFFIN_39461 = 39461; + public static final int SEWING_MACHINE_39462 = 39462; + public static final int TABLE_39463 = 39463; + public static final int TABLE_39464 = 39464; + public static final int TABLE_39465 = 39465; + public static final int DOOR_39481 = 39481; + public static final int DOOR_39482 = 39482; + public static final int SOFA_39483 = 39483; + public static final int TABLE_39484 = 39484; + public static final int TABLE_39485 = 39485; + public static final int COFFIN_39487 = 39487; + public static final int WARDROBE_39488 = 39488; + public static final int SINK_39489 = 39489; + public static final int RANGE_39490 = 39490; + public static final int STAIRCASE_39491 = 39491; + public static final int STAIRCASE_39492 = 39492; + public static final int CHAIR_39494 = 39494; + public static final int PLANTER = 39495; + public static final int LADDER_39500 = 39500; + public static final int STAIRCASE_39501 = 39501; + public static final int CHEST_39502 = 39502; + public static final int STAIRS_39503 = 39503; + public static final int LADDER_39504 = 39504; + public static final int TRAPDOOR_39505 = 39505; + public static final int STAIRS_39506 = 39506; + public static final int DOOR_39507 = 39507; + public static final int DOOR_39508 = 39508; + public static final int DOOR_39509 = 39509; + public static final int GATE_39510 = 39510; + public static final int GATE_39512 = 39512; + public static final int GATE_39513 = 39513; + public static final int CHAIR_39514 = 39514; /* 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 a63e140249..71235e2c54 100644 --- a/runelite-api/src/main/java/net/runelite/api/Quest.java +++ b/runelite-api/src/main/java/net/runelite/api/Quest.java @@ -49,7 +49,7 @@ public enum Quest RUNE_MYSTERIES(314, "Rune Mysteries"), SHEEP_SHEARER(315, "Sheep Shearer"), SHIELD_OF_ARRAV(316, "Shield of Arrav"), - VAMPIRE_SLAYER(317, "Vampire Slayer"), + VAMPYRE_SLAYER(1278, "Vampyre Slayer"), WITCHS_POTION(318, "Witch's Potion"), X_MARKS_THE_SPOT(550, "X Marks the Spot"), @@ -177,6 +177,7 @@ public enum Quest THE_FORSAKEN_TOWER(543, "The Forsaken Tower"), SONG_OF_THE_ELVES(603, "Song of the Elves"), THE_FREMENNIK_EXILES(718, "The Fremennik Exiles"), + SINS_OF_THE_FATHER(1276, "Sins of the Father"), //Miniquests ENTER_THE_ABYSS(319, "Enter the Abyss"), diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java index 361e54b593..1ca654bb5b 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java @@ -121,6 +121,12 @@ public class ItemManager put(GRACEFUL_LEGS_21072, GRACEFUL_LEGS_21070). put(GRACEFUL_GLOVES_21075, GRACEFUL_GLOVES_21073). put(GRACEFUL_BOOTS_21078, GRACEFUL_BOOTS_21076). + put(GRACEFUL_HOOD_24745, GRACEFUL_HOOD_24743). + put(GRACEFUL_CAPE_24748, GRACEFUL_CAPE_24746). + put(GRACEFUL_TOP_24751, GRACEFUL_TOP_24749). + put(GRACEFUL_LEGS_24754, GRACEFUL_LEGS_24752). + put(GRACEFUL_GLOVES_24757, GRACEFUL_GLOVES_24755). + put(GRACEFUL_BOOTS_24760, GRACEFUL_BOOTS_24758). put(MAX_CAPE_13342, MAX_CAPE). 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 3f4d1dacbd..4c111184ab 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 @@ -112,7 +112,7 @@ public enum ItemMapping ITEM_ANGUISH_ORNAMENT_KIT(ANGUISH_ORNAMENT_KIT, NECKLACE_OF_ANGUISH_OR), ITEM_OCCULT_NECKLACE(OCCULT_NECKLACE, OCCULT_NECKLACE_OR), ITEM_OCCULT_ORNAMENT_KIT(OCCULT_ORNAMENT_KIT, OCCULT_NECKLACE_OR), - ITEM_AMULET_OF_FURY(AMULET_OF_FURY, AMULET_OF_FURY_OR), + ITEM_AMULET_OF_FURY(AMULET_OF_FURY, AMULET_OF_FURY_OR, AMULET_OF_BLOOD_FURY), ITEM_FURY_ORNAMENT_KIT(FURY_ORNAMENT_KIT, AMULET_OF_FURY_OR), ITEM_TORMENTED_BRACELET(TORMENTED_BRACELET, TORMENTED_BRACELET_OR), ITEM_TORMENTED_ORNAMENT_KIT(TORMENTED_ORNAMENT_KIT, TORMENTED_BRACELET_OR), diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index 866089dd10..8fbe9eda47 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -1355,7 +1355,8 @@ 23816, 23817, 24253, - 24493 + 24493, + 24773 ], "radimus notes": [ 714, @@ -6568,11 +6569,16 @@ 9647, 9648 ], + "haemalchemy volume": [ + 9652, + 24672 + ], "tome of experience": [ 9656, 9657, 9658, - 22415 + 22415, + 24690 ], "useless key": [ 9662, @@ -7175,6 +7181,10 @@ 10828, 23591 ], + "severed leg": [ + 10857, + 24792 + ], "hard hat": [ 10862, 10883 @@ -7702,7 +7712,9 @@ 13667, 13668, 21061, - 21063 + 21063, + 24743, + 24745 ], "graceful cape": [ 11852, @@ -7720,7 +7732,9 @@ 13669, 13670, 21064, - 21066 + 21066, + 24746, + 24748 ], "graceful top": [ 11854, @@ -7738,7 +7752,9 @@ 13671, 13672, 21067, - 21069 + 21069, + 24749, + 24751 ], "graceful legs": [ 11856, @@ -7756,7 +7772,9 @@ 13673, 13674, 21070, - 21072 + 21072, + 24752, + 24754 ], "graceful gloves": [ 11858, @@ -7774,7 +7792,9 @@ 13675, 13676, 21073, - 21075 + 21075, + 24755, + 24757 ], "graceful boots": [ 11860, @@ -7792,7 +7812,9 @@ 13677, 13678, 21076, - 21078 + 21078, + 24758, + 24760 ], "slayer helmet": [ 11864, @@ -9323,7 +9345,8 @@ 22535, 22536, 22537, - 22538 + 22538, + 24703 ], "viggoras chainmace": [ 22542, @@ -9423,6 +9446,10 @@ 22999, 23002 ], + "tatty note": [ + 23007, + 24684 + ], "treasure scroll": [ 23067, 23068, @@ -9770,5 +9797,72 @@ 24661, 24662, 24663 + ], + "vyre noble top": [ + 24673, + 24676 + ], + "vyre noble legs": [ + 24674, + 24678 + ], + "vyre noble shoes": [ + 24675, + 24680 + ], + "ring of endurance": [ + 24735, + 24736 + ], + "strange old lockpick": [ + 24738, + 24740 + ], + "mysterious page": [ + 24763, + 24765, + 24767, + 24769, + 24771 + ], + "vyre noble blazer": [ + 24794, + 24810, + 24826 + ], + "vyre noble coat tails": [ + 24796, + 24812, + 24828 + ], + "vyre noble vest": [ + 24798, + 24814, + 24830 + ], + "vyre noble pants": [ + 24800, + 24816, + 24832 + ], + "vyre noble corset": [ + 24802, + 24818, + 24834 + ], + "vyre noble skirt": [ + 24804, + 24820, + 24836 + ], + "vyre noble dress top": [ + 24806, + 24822, + 24838 + ], + "vyre noble dress bottom": [ + 24808, + 24824, + 24840 ] } diff --git a/runelite-client/src/main/scripts/FriendUpdate.hash b/runelite-client/src/main/scripts/FriendUpdate.hash index 78f935d1bb..6027e16dfd 100644 --- a/runelite-client/src/main/scripts/FriendUpdate.hash +++ b/runelite-client/src/main/scripts/FriendUpdate.hash @@ -1 +1 @@ -6DC2945220E60445B7857ECFB97908E0B28FF0E96E533BB8DC8293DC68A986C2 \ No newline at end of file +1493BFAD37FCE6E5EFDCF0C8C9000C1BEFD6954857F520D141CB7963BCAD9D29 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/FriendUpdate.rs2asm b/runelite-client/src/main/scripts/FriendUpdate.rs2asm index 69cb250b31..f2c0c75634 100644 --- a/runelite-client/src/main/scripts/FriendUpdate.rs2asm +++ b/runelite-client/src/main/scripts/FriendUpdate.rs2asm @@ -117,7 +117,7 @@ LABEL101: iconst 1 iload 0 if_sethide - jump LABEL468 + jump LABEL484 LABEL105: iload 15 iconst -1 @@ -147,21 +147,39 @@ LABEL126: iconst 1 iload 0 if_sethide - jump LABEL468 + jump LABEL484 LABEL130: + iload 15 + iconst 0 + if_icmpeq LABEL134 + jump LABEL146 +LABEL134: + sconst "You may add friends by using the button below, or by " + sconst "right-clicking" + sconst "long pressing" + invoke 1971 + sconst " on a message from them and selecting to add them as a friend." + join_string 3 + iload 7 + if_settext + iconst 1 + iload 0 + if_sethide + jump LABEL484 +LABEL146: invoke 1972 istore 14 iload 14 iconst 1 - if_icmpeq LABEL136 - jump LABEL141 -LABEL136: + if_icmpeq LABEL152 + jump LABEL157 +LABEL152: iconst 8 iconst 5 iload 13 scale istore 13 -LABEL141: +LABEL157: sconst "" iload 7 if_settext @@ -171,71 +189,71 @@ LABEL141: 3628 get_varc_int 183 switch - 1: LABEL151 - 2: LABEL154 - 3: LABEL159 - 4: LABEL174 - 5: LABEL194 - 8: LABEL164 - 9: LABEL169 - jump LABEL213 -LABEL151: + 1: LABEL167 + 2: LABEL170 + 3: LABEL175 + 4: LABEL190 + 5: LABEL210 + 8: LABEL180 + 9: LABEL185 + jump LABEL229 +LABEL167: iconst 0 3629 - jump LABEL213 -LABEL154: + jump LABEL229 +LABEL170: iconst 1 3633 iconst 1 3630 - jump LABEL213 -LABEL159: + jump LABEL229 +LABEL175: iconst 1 3633 iconst 0 3630 - jump LABEL213 -LABEL164: + jump LABEL229 +LABEL180: iconst 1 3633 iconst 1 3632 - jump LABEL213 -LABEL169: - iconst 1 - 3633 - iconst 0 - 3632 - jump LABEL213 -LABEL174: - iconst 1 - 3633 - iconst 1 - 3636 - iconst 1 - 3631 - get_varc_int 205 - switch - 3: LABEL185 - 8: LABEL188 - 9: LABEL191 - iconst 1 - 3630 - jump LABEL193 + jump LABEL229 LABEL185: + iconst 1 + 3633 + iconst 0 + 3632 + jump LABEL229 +LABEL190: + iconst 1 + 3633 + iconst 1 + 3636 + iconst 1 + 3631 + get_varc_int 205 + switch + 3: LABEL201 + 8: LABEL204 + 9: LABEL207 + iconst 1 + 3630 + jump LABEL209 +LABEL201: iconst 0 3630 - jump LABEL193 -LABEL188: + jump LABEL209 +LABEL204: iconst 1 3632 - jump LABEL193 -LABEL191: + jump LABEL209 +LABEL207: iconst 0 3632 -LABEL193: - jump LABEL213 -LABEL194: +LABEL209: + jump LABEL229 +LABEL210: iconst 1 3633 iconst 1 @@ -244,33 +262,33 @@ LABEL194: 3631 get_varc_int 205 switch - 3: LABEL205 - 8: LABEL208 - 9: LABEL211 + 3: LABEL221 + 8: LABEL224 + 9: LABEL227 iconst 1 3630 - jump LABEL213 -LABEL205: + jump LABEL229 +LABEL221: iconst 0 3630 - jump LABEL213 -LABEL208: + jump LABEL229 +LABEL224: iconst 1 3632 - jump LABEL213 -LABEL211: + jump LABEL229 +LABEL227: iconst 0 3632 -LABEL213: +LABEL229: 3639 -LABEL214: +LABEL230: iload 9 iload 15 - if_icmplt LABEL218 - jump LABEL460 -LABEL218: + if_icmplt LABEL234 + jump LABEL476 +LABEL234: iload 9 - friend_getname + friend_getname sstore 1 sstore 0 iload 5 @@ -283,7 +301,7 @@ LABEL218: istore 10 sload 0 sconst "friend_cc_settext" - runelite_callback + runelite_callback cc_settext iconst 0 iload 13 @@ -315,24 +333,24 @@ LABEL218: istore 11 iload 11 iconst 0 - if_icmpne LABEL264 - jump LABEL271 -LABEL264: + if_icmpne LABEL280 + jump LABEL287 +LABEL280: iconst 1 sconst "Message" cc_setop iconst 2 sconst "" cc_setop - jump LABEL277 -LABEL271: + jump LABEL293 +LABEL287: iconst 1 sconst "" cc_setop iconst 2 sconst "Message" cc_setop -LABEL277: +LABEL293: iconst 3 sconst "Delete" cc_setop @@ -365,7 +383,7 @@ LABEL277: iconst 0 iconst 0 sconst "friend_cc_setposition" - runelite_callback + runelite_callback cc_setposition 1 iconst 1093 cc_setgraphic 1 @@ -374,14 +392,14 @@ LABEL277: sload 1 string_length iconst 0 - if_icmpgt LABEL318 - jump LABEL367 -LABEL318: + if_icmpgt LABEL334 + jump LABEL383 +LABEL334: iload 14 iconst 1 - if_icmpeq LABEL322 - jump LABEL336 -LABEL322: + if_icmpeq LABEL338 + jump LABEL352 +LABEL338: iconst 10 sconst "Reveal previous name" cc_setop @@ -395,8 +413,8 @@ LABEL322: sload 0 sconst "isIiiss" cc_setonop - jump LABEL364 -LABEL336: + jump LABEL380 +LABEL352: sconst "Previous name:" sconst "
" sload 1 @@ -425,11 +443,11 @@ LABEL336: sconst "null" sconst "isIiiss" cc_setonop -LABEL364: +LABEL380: iconst 0 cc_sethide 1 - jump LABEL383 -LABEL367: + jump LABEL399 +LABEL383: iconst 40 iload 8 sconst "I" @@ -446,7 +464,7 @@ LABEL367: sconst "null" sconst "isIiiss" cc_setonop -LABEL383: +LABEL399: iload 5 iconst 4 iload 10 @@ -475,20 +493,20 @@ LABEL383: cc_settextshadow iload 11 iconst 0 - if_icmpeq LABEL413 - jump LABEL418 -LABEL413: + if_icmpeq LABEL429 + jump LABEL434 +LABEL429: sconst "Offline" cc_settext iconst 16711680 cc_setcolour - jump LABEL451 -LABEL418: + jump LABEL467 +LABEL434: iload 11 map_world - if_icmpeq LABEL422 - jump LABEL430 -LABEL422: + if_icmpeq LABEL438 + jump LABEL446 +LABEL438: sconst "World " iload 11 tostring @@ -496,13 +514,13 @@ LABEL422: cc_settext iconst 901389 cc_setcolour - jump LABEL451 -LABEL430: + jump LABEL467 +LABEL446: iload 11 iconst 5000 - if_icmpgt LABEL434 - jump LABEL443 -LABEL434: + if_icmpgt LABEL450 + jump LABEL459 +LABEL450: sconst "" sconst "Classic " iload 11 @@ -511,18 +529,18 @@ LABEL434: tostring join_string 3 cc_settext - jump LABEL449 -LABEL443: + jump LABEL465 +LABEL459: sconst "" sconst "World " iload 11 tostring join_string 3 cc_settext -LABEL449: +LABEL465: iconst 16776960 cc_setcolour -LABEL451: +LABEL467: iload 9 iconst 1 add @@ -531,24 +549,24 @@ LABEL451: add istore 12 istore 9 - jump LABEL214 -LABEL460: + jump LABEL230 +LABEL476: iload 15 iconst 1 - if_icmpge LABEL464 - jump LABEL468 -LABEL464: + if_icmpge LABEL480 + jump LABEL484 +LABEL480: iload 12 iconst 5 add istore 12 -LABEL468: +LABEL484: iload 12 iload 5 if_getheight - if_icmpgt LABEL473 - jump LABEL482 -LABEL473: + if_icmpgt LABEL489 + jump LABEL498 +LABEL489: iconst 0 iload 12 iload 5 @@ -557,8 +575,8 @@ LABEL473: iload 5 get_varc_int 9 invoke 72 - jump LABEL490 -LABEL482: + jump LABEL506 +LABEL498: iconst 0 iconst 0 iload 5 @@ -567,5 +585,5 @@ LABEL482: iload 5 iconst 0 invoke 72 -LABEL490: +LABEL506: return diff --git a/runelite-client/src/main/scripts/IgnoreUpdate.hash b/runelite-client/src/main/scripts/IgnoreUpdate.hash index b10226b2e6..0ec5f1229d 100644 --- a/runelite-client/src/main/scripts/IgnoreUpdate.hash +++ b/runelite-client/src/main/scripts/IgnoreUpdate.hash @@ -1 +1 @@ -256A38E234D9D44532175F4C98AA923327EE050E23D122573426D94FBF15936E \ No newline at end of file +8FAD64F66E1F60651E501B731C7B3D97D0453A04EFDDBC9D820890263C00BD4B \ No newline at end of file diff --git a/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm b/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm index a99a72a2f1..ddb5ed62f7 100644 --- a/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm +++ b/runelite-client/src/main/scripts/IgnoreUpdate.rs2asm @@ -79,21 +79,39 @@ LABEL63: iconst 1 iload 0 if_sethide - jump LABEL263 + jump LABEL279 LABEL67: + iload 12 + iconst 0 + if_icmpeq LABEL71 + jump LABEL83 +LABEL71: + sconst "You may ignore users by using the button below, or by " + sconst "right-clicking" + sconst "long pressing" + invoke 1971 + sconst " on a message from them and selecting to add them to your ignore list." + join_string 3 + iload 5 + if_settext + iconst 1 + iload 0 + if_sethide + jump LABEL279 +LABEL83: invoke 1972 istore 11 iload 11 iconst 1 - if_icmpeq LABEL73 - jump LABEL78 -LABEL73: + if_icmpeq LABEL89 + jump LABEL94 +LABEL89: iconst 8 iconst 5 iload 10 scale istore 10 -LABEL78: +LABEL94: sconst "" iload 5 if_settext @@ -103,31 +121,31 @@ LABEL78: 3640 get_varc_int 184 switch - 1: LABEL88 - 2: LABEL91 - 3: LABEL94 - jump LABEL96 -LABEL88: + 1: LABEL104 + 2: LABEL107 + 3: LABEL110 + jump LABEL112 +LABEL104: iconst 0 3641 - jump LABEL96 -LABEL91: + jump LABEL112 +LABEL107: iconst 1 3642 - jump LABEL96 -LABEL94: + jump LABEL112 +LABEL110: iconst 0 3642 -LABEL96: +LABEL112: 3643 -LABEL97: +LABEL113: iload 7 iload 12 - if_icmplt LABEL101 - jump LABEL255 -LABEL101: + if_icmplt LABEL117 + jump LABEL271 +LABEL117: iload 7 - ignore_getname + ignore_getname sstore 1 sstore 0 iload 3 @@ -140,7 +158,7 @@ LABEL101: istore 8 sload 0 sconst "ignore_cc_settext" - runelite_callback + runelite_callback cc_settext iconst 0 iload 10 @@ -199,7 +217,7 @@ LABEL101: iconst 0 iconst 0 sconst "ignore_cc_setposition" - runelite_callback + runelite_callback cc_setposition 1 iconst 1093 cc_setgraphic 1 @@ -208,14 +226,14 @@ LABEL101: sload 1 string_length iconst 0 - if_icmpgt LABEL181 - jump LABEL230 -LABEL181: + if_icmpgt LABEL197 + jump LABEL246 +LABEL197: iload 11 iconst 1 - if_icmpeq LABEL185 - jump LABEL199 -LABEL185: + if_icmpeq LABEL201 + jump LABEL215 +LABEL201: iconst 10 sconst "Reveal previous name" cc_setop @@ -229,8 +247,8 @@ LABEL185: sload 0 sconst "isIiiss" cc_setonop - jump LABEL227 -LABEL199: + jump LABEL243 +LABEL215: sconst "Previous name:" sconst "
" sload 1 @@ -259,11 +277,11 @@ LABEL199: sconst "null" sconst "isIiiss" cc_setonop -LABEL227: +LABEL243: iconst 0 cc_sethide 1 - jump LABEL246 -LABEL230: + jump LABEL262 +LABEL246: iconst 40 iload 6 sconst "I" @@ -280,7 +298,7 @@ LABEL230: sconst "null" sconst "isIiiss" cc_setonop -LABEL246: +LABEL262: iload 7 iconst 1 add @@ -289,24 +307,24 @@ LABEL246: add istore 9 istore 7 - jump LABEL97 -LABEL255: + jump LABEL113 +LABEL271: iload 12 iconst 1 - if_icmpge LABEL259 - jump LABEL263 -LABEL259: + if_icmpge LABEL275 + jump LABEL279 +LABEL275: iload 9 iconst 5 add istore 9 -LABEL263: +LABEL279: iload 9 iload 3 if_getheight - if_icmpgt LABEL268 - jump LABEL278 -LABEL268: + if_icmpgt LABEL284 + jump LABEL294 +LABEL284: iconst 0 iload 9 iload 3 @@ -316,8 +334,8 @@ LABEL268: iload 3 if_getscrolly invoke 72 - jump LABEL286 -LABEL278: + jump LABEL302 +LABEL294: iconst 0 iconst 0 iload 3 @@ -326,5 +344,5 @@ LABEL278: iload 3 iconst 0 invoke 72 -LABEL286: +LABEL302: return