ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2661 from open-osrs/upstream-0406

Browse Source
This commit is contained in:
Owain van Brakel
2020-06-04 17:11:06 +02:00
committed by GitHub
parent a3bdca6df7 54cc86135e
commit fef0acc9ff
18 changed files with 2362 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/Dependencies.kt
+2 -2
View File
@@ -25,9 +25,9 @@
object ProjectVersions {
const val launcherVersion = "2.2.0"
const val rlVersion = "1.6.17"
const val rlVersion = "1.6.18"
const val openosrsVersion = "3.3.5"
const val openosrsVersion = "3.3.6"
const val rsversion = 189
const val cacheversion = 165
http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java
+3 -1
View File
@@ -34,9 +34,11 @@ 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;
private int slot;
private WorldType worldType;
}
runelite-api/src/main/java/net/runelite/api/ItemID.java
+95 -6
View File
@@ -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. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+278 -44
View File
@@ -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. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+83
View File
@@ -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. */
}
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+1126 -1
View File
File diff suppressed because it is too large Load Diff
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+446 -7
View File
@@ -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. */
}
runelite-api/src/main/java/net/runelite/api/Quest.java
+2 -1
View File
@@ -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"),
runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
+6
View File
@@ -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).
runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java
+1 -1
View File
@@ -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),
runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java
+4 -1
View File
@@ -450,7 +450,10 @@ public class ExternalPluginManager
for (net.runelite.client.plugins.PluginDependency pluginDependency : pluginDependencies)
{
graph.putEdge(pluginClazz, pluginDependency.value());
if (graph.nodes().contains(pluginDependency.value()))
{
graph.putEdge(pluginClazz, pluginDependency.value());
}
}
}
runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
+4 -1
View File
@@ -386,7 +386,10 @@ public class PluginManager
for (PluginDependency pluginDependency : pluginDependencies)
{
graph.putEdge(pluginClazz, pluginDependency.value());
if (graph.nodes().contains(pluginDependency.value()))
{
graph.putEdge(pluginClazz, pluginDependency.value());
}
}
}
runelite-client/src/main/java/net/runelite/client/util/Graceful.java
+11 -6
View File
@@ -36,31 +36,36 @@ public enum Graceful
HOOD(
GRACEFUL_HOOD_11851, GRACEFUL_HOOD_13579, GRACEFUL_HOOD_13580, GRACEFUL_HOOD_13591, GRACEFUL_HOOD_13592,
GRACEFUL_HOOD_13603, GRACEFUL_HOOD_13604, GRACEFUL_HOOD_13615, GRACEFUL_HOOD_13616, GRACEFUL_HOOD_13627,
GRACEFUL_HOOD_13628, GRACEFUL_HOOD_13667, GRACEFUL_HOOD_13668, GRACEFUL_HOOD_21061, GRACEFUL_HOOD_21063
GRACEFUL_HOOD_13628, GRACEFUL_HOOD_13667, GRACEFUL_HOOD_13668, GRACEFUL_HOOD_21061, GRACEFUL_HOOD_21063,
GRACEFUL_HOOD_24743, GRACEFUL_HOOD_24745
),
TOP(
GRACEFUL_TOP_11855, GRACEFUL_TOP_13583, GRACEFUL_TOP_13584, GRACEFUL_TOP_13595, GRACEFUL_TOP_13596,
GRACEFUL_TOP_13607, GRACEFUL_TOP_13608, GRACEFUL_TOP_13619, GRACEFUL_TOP_13620, GRACEFUL_TOP_13631,
GRACEFUL_TOP_13632, GRACEFUL_TOP_13671, GRACEFUL_TOP_13672, GRACEFUL_TOP_21067, GRACEFUL_TOP_21069
GRACEFUL_TOP_13632, GRACEFUL_TOP_13671, GRACEFUL_TOP_13672, GRACEFUL_TOP_21067, GRACEFUL_TOP_21069,
GRACEFUL_TOP_24749, GRACEFUL_TOP_24751
),
LEGS(
GRACEFUL_LEGS_11857, GRACEFUL_LEGS_13585, GRACEFUL_LEGS_13586, GRACEFUL_LEGS_13597, GRACEFUL_LEGS_13598,
GRACEFUL_LEGS_13609, GRACEFUL_LEGS_13610, GRACEFUL_LEGS_13621, GRACEFUL_LEGS_13622, GRACEFUL_LEGS_13633,
GRACEFUL_LEGS_13634, GRACEFUL_LEGS_13673, GRACEFUL_LEGS_13674, GRACEFUL_LEGS_21070, GRACEFUL_LEGS_21072
GRACEFUL_LEGS_13634, GRACEFUL_LEGS_13673, GRACEFUL_LEGS_13674, GRACEFUL_LEGS_21070, GRACEFUL_LEGS_21072,
GRACEFUL_LEGS_24752, GRACEFUL_LEGS_24754
),
GLOVES(
GRACEFUL_GLOVES_11859, GRACEFUL_GLOVES_13587, GRACEFUL_GLOVES_13588, GRACEFUL_GLOVES_13599, GRACEFUL_GLOVES_13600,
GRACEFUL_GLOVES_13611, GRACEFUL_GLOVES_13612, GRACEFUL_GLOVES_13623, GRACEFUL_GLOVES_13624, GRACEFUL_GLOVES_13635,
GRACEFUL_GLOVES_13636, GRACEFUL_GLOVES_13675, GRACEFUL_GLOVES_13676, GRACEFUL_GLOVES_21073, GRACEFUL_GLOVES_21075
GRACEFUL_GLOVES_13636, GRACEFUL_GLOVES_13675, GRACEFUL_GLOVES_13676, GRACEFUL_GLOVES_21073, GRACEFUL_GLOVES_21075,
GRACEFUL_GLOVES_24755, GRACEFUL_GLOVES_24757
),
BOOTS(
GRACEFUL_BOOTS_11861, GRACEFUL_BOOTS_13589, GRACEFUL_BOOTS_13590, GRACEFUL_BOOTS_13601, GRACEFUL_BOOTS_13602,
GRACEFUL_BOOTS_13613, GRACEFUL_BOOTS_13614, GRACEFUL_BOOTS_13625, GRACEFUL_BOOTS_13626, GRACEFUL_BOOTS_13637,
GRACEFUL_BOOTS_13638, GRACEFUL_BOOTS_13677, GRACEFUL_BOOTS_13678, GRACEFUL_BOOTS_21076, GRACEFUL_BOOTS_21078
GRACEFUL_BOOTS_13638, GRACEFUL_BOOTS_13677, GRACEFUL_BOOTS_13678, GRACEFUL_BOOTS_21076, GRACEFUL_BOOTS_21078,
GRACEFUL_BOOTS_24758, GRACEFUL_BOOTS_24760
),
// Agility skill capes and the non-cosmetic Max capes also count for the Graceful set effect
@@ -68,7 +73,7 @@ public enum Graceful
GRACEFUL_CAPE_11853, GRACEFUL_CAPE_13581, GRACEFUL_CAPE_13582, GRACEFUL_CAPE_13593, GRACEFUL_CAPE_13594,
GRACEFUL_CAPE_13605, GRACEFUL_CAPE_13606, GRACEFUL_CAPE_13617, GRACEFUL_CAPE_13618, GRACEFUL_CAPE_13629,
GRACEFUL_CAPE_13630, GRACEFUL_CAPE_13669, GRACEFUL_CAPE_13670, GRACEFUL_CAPE_21064, GRACEFUL_CAPE_21066,
AGILITY_CAPE, AGILITY_CAPET, MAX_CAPE
GRACEFUL_CAPE_24746, GRACEFUL_CAPE_24748, AGILITY_CAPE, AGILITY_CAPET, MAX_CAPE
);
private final ImmutableSet<Integer> ids;
runelite-client/src/main/resources/item_variations.json
+103 -9
View File
@@ -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
]
}
runelite-client/src/main/scripts/FriendUpdate.hash
+1 -1
View File
@@ -1 +1 @@
6DC2945220E60445B7857ECFB97908E0B28FF0E96E533BB8DC8293DC68A986C2
1493BFAD37FCE6E5EFDCF0C8C9000C1BEFD6954857F520D141CB7963BCAD9D29
runelite-client/src/main/scripts/FriendUpdate.rs2asm
+132 -114
View File
@@ -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 "<br>"
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 "<col=ffff00>"
sconst "Classic "
iload 11
@@ -511,18 +529,18 @@ LABEL434:
tostring
join_string 3
cc_settext
jump LABEL449
LABEL443:
jump LABEL465
LABEL459:
sconst "<col=ffff00>"
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
runelite-client/src/main/scripts/IgnoreUpdate.hash
+1 -1
View File
@@ -1 +1 @@
256A38E234D9D44532175F4C98AA923327EE050E23D122573426D94FBF15936E
8FAD64F66E1F60651E501B731C7B3D97D0453A04EFDDBC9D820890263C00BD4B
runelite-client/src/main/scripts/IgnoreUpdate.rs2asm
+64 -46
View File
@@ -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 "<br>"
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