Merge remote-tracking branch 'runelite/master'
This commit is contained in:
Owain van Brakel
@@ -64,7 +64,12 @@ public enum InventoryID
|
||||
/**
|
||||
* Theater of Blood reward chest inventory (Raids 2)
|
||||
*/
|
||||
THEATRE_OF_BLOOD_CHEST(612);
|
||||
THEATRE_OF_BLOOD_CHEST(612),
|
||||
|
||||
/**
|
||||
* Seed vault located inside the Farming Guild
|
||||
*/
|
||||
SEED_VAULT(626);
|
||||
|
||||
private final int id;
|
||||
|
||||
|
||||
@@ -10837,5 +10837,69 @@ public final class ItemID
|
||||
public static final int MASK_OF_RANUL = 23522;
|
||||
public static final int JAR_OF_EYES = 23525;
|
||||
public static final int SARACHNIS_CUDGEL = 23528;
|
||||
public static final int COOKED_KARAMBWAN_23533 = 23533;
|
||||
public static final int SUPER_COMBAT_POTION4_23543 = 23543;
|
||||
public static final int SUPER_COMBAT_POTION3_23545 = 23545;
|
||||
public static final int SUPER_COMBAT_POTION2_23547 = 23547;
|
||||
public static final int SUPER_COMBAT_POTION1_23549 = 23549;
|
||||
public static final int RANGING_POTION4_23551 = 23551;
|
||||
public static final int RANGING_POTION3_23553 = 23553;
|
||||
public static final int RANGING_POTION2_23555 = 23555;
|
||||
public static final int RANGING_POTION1_23557 = 23557;
|
||||
public static final int SANFEW_SERUM4_23559 = 23559;
|
||||
public static final int SANFEW_SERUM3_23561 = 23561;
|
||||
public static final int SANFEW_SERUM2_23563 = 23563;
|
||||
public static final int SANFEW_SERUM1_23565 = 23565;
|
||||
public static final int SUPER_RESTORE4_23567 = 23567;
|
||||
public static final int SUPER_RESTORE3_23569 = 23569;
|
||||
public static final int SUPER_RESTORE2_23571 = 23571;
|
||||
public static final int SUPER_RESTORE1_23573 = 23573;
|
||||
public static final int SARADOMIN_BREW4_23575 = 23575;
|
||||
public static final int SARADOMIN_BREW3_23577 = 23577;
|
||||
public static final int SARADOMIN_BREW2_23579 = 23579;
|
||||
public static final int SARADOMIN_BREW1_23581 = 23581;
|
||||
public static final int STAMINA_POTION4_23583 = 23583;
|
||||
public static final int STAMINA_POTION3_23585 = 23585;
|
||||
public static final int STAMINA_POTION2_23587 = 23587;
|
||||
public static final int STAMINA_POTION1_23589 = 23589;
|
||||
public static final int HELM_OF_NEITIZNOT_23591 = 23591;
|
||||
public static final int BARROWS_GLOVES_23593 = 23593;
|
||||
public static final int BERSERKER_RING_23595 = 23595;
|
||||
public static final int DRAGON_DEFENDER_23597 = 23597;
|
||||
public static final int SPIRIT_SHIELD_23599 = 23599;
|
||||
public static final int RUNE_CROSSBOW_23601 = 23601;
|
||||
public static final int IMBUED_GUTHIX_CAPE_23603 = 23603;
|
||||
public static final int IMBUED_ZAMORAK_CAPE_23605 = 23605;
|
||||
public static final int IMBUED_SARADOMIN_CAPE_23607 = 23607;
|
||||
public static final int AVAS_ACCUMULATOR_23609 = 23609;
|
||||
public static final int ARMADYL_CROSSBOW_23611 = 23611;
|
||||
public static final int STAFF_OF_THE_DEAD_23613 = 23613;
|
||||
public static final int VESTAS_LONGSWORD_23615 = 23615;
|
||||
public static final int ZURIELS_STAFF_23617 = 23617;
|
||||
public static final int MORRIGANS_JAVELIN_23619 = 23619;
|
||||
public static final int STATIUSS_WARHAMMER_23620 = 23620;
|
||||
public static final int INFERNAL_CAPE_23622 = 23622;
|
||||
public static final int SEERS_RING_I_23624 = 23624;
|
||||
public static final int KODAI_WAND_23626 = 23626;
|
||||
public static final int GHRAZI_RAPIER_23628 = 23628;
|
||||
public static final int HEAVY_BALLISTA_23630 = 23630;
|
||||
public static final int KARILS_LEATHERTOP_23632 = 23632;
|
||||
public static final int DHAROKS_PLATELEGS_23633 = 23633;
|
||||
public static final int TORAGS_PLATELEGS_23634 = 23634;
|
||||
public static final int VERACS_PLATESKIRT_23635 = 23635;
|
||||
public static final int VERACS_HELM_23636 = 23636;
|
||||
public static final int TORAGS_HELM_23637 = 23637;
|
||||
public static final int GUTHANS_HELM_23638 = 23638;
|
||||
public static final int DHAROKS_HELM_23639 = 23639;
|
||||
public static final int AMULET_OF_FURY_23640 = 23640;
|
||||
public static final int BLESSED_SPIRIT_SHIELD_23642 = 23642;
|
||||
public static final int ETERNAL_BOOTS_23644 = 23644;
|
||||
public static final int BANDOS_TASSETS_23646 = 23646;
|
||||
public static final int DRAGON_JAVELIN_23648 = 23648;
|
||||
public static final int DIAMOND_BOLTS_E_23649 = 23649;
|
||||
public static final int RUNE_POUCH_23650 = 23650;
|
||||
public static final int MAGES_BOOK_23652 = 23652;
|
||||
public static final int AHRIMS_STAFF_23653 = 23653;
|
||||
public static final int OCCULT_NECKLACE_23654 = 23654;
|
||||
/* This file is automatically generated. Do not edit. */
|
||||
}
|
||||
|
||||
@@ -7882,5 +7882,6 @@ public final class NpcID
|
||||
public static final int SARACHNIS = 8713;
|
||||
public static final int SPAWN_OF_SARACHNIS = 8714;
|
||||
public static final int SPAWN_OF_SARACHNIS_8715 = 8715;
|
||||
public static final int JUSTINE = 8721;
|
||||
/* This file is automatically generated. Do not edit. */
|
||||
}
|
||||
|
||||
@@ -12483,5 +12483,65 @@ public final class NullItemID
|
||||
public static final int NULL_23527 = 23527;
|
||||
public static final int NULL_23529 = 23529;
|
||||
public static final int NULL_23530 = 23530;
|
||||
public static final int NULL_23531 = 23531;
|
||||
public static final int NULL_23532 = 23532;
|
||||
public static final int NULL_23534 = 23534;
|
||||
public static final int NULL_23535 = 23535;
|
||||
public static final int NULL_23536 = 23536;
|
||||
public static final int NULL_23537 = 23537;
|
||||
public static final int NULL_23538 = 23538;
|
||||
public static final int NULL_23539 = 23539;
|
||||
public static final int NULL_23540 = 23540;
|
||||
public static final int NULL_23541 = 23541;
|
||||
public static final int NULL_23542 = 23542;
|
||||
public static final int NULL_23544 = 23544;
|
||||
public static final int NULL_23546 = 23546;
|
||||
public static final int NULL_23548 = 23548;
|
||||
public static final int NULL_23550 = 23550;
|
||||
public static final int NULL_23552 = 23552;
|
||||
public static final int NULL_23554 = 23554;
|
||||
public static final int NULL_23556 = 23556;
|
||||
public static final int NULL_23558 = 23558;
|
||||
public static final int NULL_23560 = 23560;
|
||||
public static final int NULL_23562 = 23562;
|
||||
public static final int NULL_23564 = 23564;
|
||||
public static final int NULL_23566 = 23566;
|
||||
public static final int NULL_23568 = 23568;
|
||||
public static final int NULL_23570 = 23570;
|
||||
public static final int NULL_23572 = 23572;
|
||||
public static final int NULL_23574 = 23574;
|
||||
public static final int NULL_23576 = 23576;
|
||||
public static final int NULL_23578 = 23578;
|
||||
public static final int NULL_23580 = 23580;
|
||||
public static final int NULL_23582 = 23582;
|
||||
public static final int NULL_23584 = 23584;
|
||||
public static final int NULL_23586 = 23586;
|
||||
public static final int NULL_23588 = 23588;
|
||||
public static final int NULL_23590 = 23590;
|
||||
public static final int NULL_23592 = 23592;
|
||||
public static final int NULL_23594 = 23594;
|
||||
public static final int NULL_23596 = 23596;
|
||||
public static final int NULL_23598 = 23598;
|
||||
public static final int NULL_23600 = 23600;
|
||||
public static final int NULL_23602 = 23602;
|
||||
public static final int NULL_23604 = 23604;
|
||||
public static final int NULL_23606 = 23606;
|
||||
public static final int NULL_23608 = 23608;
|
||||
public static final int NULL_23610 = 23610;
|
||||
public static final int NULL_23612 = 23612;
|
||||
public static final int NULL_23614 = 23614;
|
||||
public static final int NULL_23616 = 23616;
|
||||
public static final int NULL_23618 = 23618;
|
||||
public static final int NULL_23621 = 23621;
|
||||
public static final int NULL_23623 = 23623;
|
||||
public static final int NULL_23625 = 23625;
|
||||
public static final int NULL_23627 = 23627;
|
||||
public static final int NULL_23629 = 23629;
|
||||
public static final int NULL_23631 = 23631;
|
||||
public static final int NULL_23641 = 23641;
|
||||
public static final int NULL_23643 = 23643;
|
||||
public static final int NULL_23645 = 23645;
|
||||
public static final int NULL_23647 = 23647;
|
||||
public static final int NULL_23651 = 23651;
|
||||
/* This file is automatically generated. Do not edit. */
|
||||
}
|
||||
|
||||
@@ -18654,5 +18654,6 @@ public final class ObjectID
|
||||
public static final int WEB_34897 = 34897;
|
||||
public static final int WEB_34898 = 34898;
|
||||
public static final int SLASHED_WEB_34899 = 34899;
|
||||
public static final int FOG_MARKER = 34905;
|
||||
/* This file is automatically generated. Do not edit. */
|
||||
}
|
||||
|
||||
@@ -152,6 +152,7 @@ public class WidgetID
|
||||
public static final int SEED_BOX_GROUP_ID = 128;
|
||||
public static final int ITEMS_KEPT_ON_DEATH_GROUP_ID = 4;
|
||||
public static final int TRADING_SCREEN = 335;
|
||||
public static final int SEED_VAULT_GROUP_ID = 631;
|
||||
|
||||
static class WorldMap
|
||||
{
|
||||
@@ -1122,4 +1123,9 @@ public class WidgetID
|
||||
static final int BUTTON_9 = 32;
|
||||
static final int BUTTON_0 = 34;
|
||||
}
|
||||
|
||||
static class SeedVault
|
||||
{
|
||||
static final int TITLE_CONTAINER = 2;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -712,14 +712,6 @@ public enum WidgetInfo
|
||||
EQUIPMENT_MAGIC_DAMAGE(WidgetID.EQUIPMENT_PAGE_GROUP_ID, WidgetID.EquipmentWidgetIdentifiers.MAGIC_DAMAGE),
|
||||
EQUIP_YOUR_CHARACTER(WidgetID.EQUIPMENT_PAGE_GROUP_ID, WidgetID.EquipmentWidgetIdentifiers.EQUIP_YOUR_CHARACTER),
|
||||
|
||||
ITEMS_KEPT_ON_DEATH_CONTAINER(WidgetID.KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.KEPT_ITEMS_CONTAINER),
|
||||
ITEMS_LOST_ON_DEATH_CONTAINER(WidgetID.KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.LOST_ITEMS_CONTAINER),
|
||||
ITEMS_KEPT_INFORMATION_CONTAINER(WidgetID.KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.INFORMATION_CONTAINER),
|
||||
ITEMS_KEPT_SAFE_ZONE_CONTAINER(WidgetID.KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.SAFE_ZONE_CONTAINER),
|
||||
ITEMS_KEPT_CUSTOM_TEXT_CONTAINER(WidgetID.KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.CUSTOM_TEXT_CONTAINER),
|
||||
ITEMS_LOST_VALUE(WidgetID.KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.LOST_ITEMS_VALUE),
|
||||
ITEMS_KEPT_MAX(WidgetID.KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.MAX_ITEMS_KEPT_ON_DEATH),
|
||||
|
||||
FIXED_BANK_PIN(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.BANK_PIN),
|
||||
RESIZABLE_BANK_PIN(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.BANK_PIN),
|
||||
RESIZABLE_BOTTOM_LINE_BANK_PIN(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.BANK_PIN),
|
||||
@@ -750,8 +742,17 @@ public enum WidgetInfo
|
||||
XP_DROP_6(WidgetID.EXPERIENCE_DROP_GROUP_ID, WidgetID.ExperienceDrop.DROP_6),
|
||||
XP_DROP_7(WidgetID.EXPERIENCE_DROP_GROUP_ID, WidgetID.ExperienceDrop.DROP_7),
|
||||
|
||||
ITEMS_KEPT_CUSTOM_TEXT_CONTAINER(WidgetID.KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.CUSTOM_TEXT_CONTAINER),
|
||||
ITEMS_KEPT_ON_DEATH_CONTAINER(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.KEPT_ITEMS_CONTAINER),
|
||||
ITEMS_KEPT_ON_DEATH_TEXT(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.KEPT_ITEMS_TEXT),
|
||||
ITEMS_LOST_ON_DEATH_TEXT(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.LOST_ITEMS_TEXT);
|
||||
ITEMS_LOST_ON_DEATH_TEXT(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.LOST_ITEMS_TEXT),
|
||||
ITEMS_LOST_ON_DEATH_CONTAINER(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.LOST_ITEMS_CONTAINER),
|
||||
ITEMS_KEPT_INFORMATION_CONTAINER(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.INFORMATION_CONTAINER),
|
||||
ITEMS_KEPT_SAFE_ZONE_CONTAINER(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.SAFE_ZONE_CONTAINER),
|
||||
ITEMS_LOST_VALUE(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.LOST_ITEMS_VALUE),
|
||||
ITEMS_KEPT_MAX(WidgetID.ITEMS_KEPT_ON_DEATH_GROUP_ID, WidgetID.KeptOnDeath.MAX_ITEMS_KEPT_ON_DEATH),
|
||||
|
||||
SEED_VAULT_TITLE_CONTAINER(WidgetID.SEED_VAULT_GROUP_ID, WidgetID.SeedVault.TITLE_CONTAINER);
|
||||
|
||||
private final int groupId;
|
||||
private final int childId;
|
||||
|
||||
Reference in New Issue
Block a user