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

Merge branch 'master' of https://github.com/runelite/runelite into runelite-master

Browse Source
This commit is contained in:
zeruth
2019-06-21 03:32:14 -04:00
parent 711e6c1a82 9620a4fce6
commit 1f5ac7a86a
72 changed files with 2852 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/Client.java
+2 -8
View File
@@ -1503,14 +1503,6 @@ public interface Client extends GameShell
*/
NodeCache getWidgetSpriteCache();
/**
* Overrides health bar sprites with the sprites from the specified override.
* Pass in {@code null} to revert the health bars back to their default.
*
* @param override the health bar override
*/
void setHealthBarOverride(HealthBarOverride override);
/**
* Gets the current server tick count.
*
@@ -1663,4 +1655,6 @@ public interface Client extends GameShell
String getSelectedSpellName();
boolean getIsSpellSelected();
void resetHealthBarCaches();
}
runelite-api/src/main/java/net/runelite/api/Constants.java
+17
View File
@@ -102,4 +102,21 @@ public class Constants
* Used when getting High Alchemy value - multiplied by general store price.
*/
public static final float HIGH_ALCHEMY_CONSTANT = 0.6f;
/**
* Width of a standard item sprite
*/
public static final int ITEM_SPRITE_WIDTH = 36;
/**
* Height of a standard item sprite
*/
public static final int ITEM_SPRITE_HEIGHT = 32;
/**
* High alchemy = shop price * HIGH_ALCHEMY_MULTIPLIER
*
* @see ItemComposition#getPrice
*/
public static final float HIGH_ALCHEMY_MULTIPLIER = .6f;
}
runelite-api/src/main/java/net/runelite/api/HealthBar.java
+2
View File
@@ -30,5 +30,7 @@ public interface HealthBar
Sprite getHealthBarBackSprite();
int getHealthBarFrontSpriteId();
void setPadding(int padding);
}
runelite-api/src/main/java/net/runelite/api/HealthBarOverride.java
-37
View File
@@ -1,37 +0,0 @@
/*
* Copyright (c) 2019, Lotto <https://github.com/devLotto>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.api;
import lombok.Data;
@Data
public class HealthBarOverride
{
public final Sprite frontSprite;
public final Sprite backSprite;
public final Sprite frontSpriteLarge;
public final Sprite backSpriteLarge;
}
runelite-api/src/main/java/net/runelite/api/ItemDefinition.java
+2
View File
@@ -63,6 +63,8 @@ public interface ItemDefinition
* alchemy values, respectively.
*
* @return the general store value of the item
*
* @see Constants#HIGH_ALCHEMY_MULTIPLIER
*/
int getPrice();
runelite-api/src/main/java/net/runelite/api/ItemID.java
+30
View File
@@ -10791,5 +10791,35 @@ public final class ItemID
public static final int TORMENTED_BRACELET_OR = 23444;
public static final int GIANT_EASTER_EGG = 23446;
public static final int BUNNYMAN_MASK = 23448;
public static final int ENCHANTED_LYREI = 23458;
public static final int ATTACKER_ICON_23460 = 23460;
public static final int ATTACKER_ICON_23461 = 23461;
public static final int ATTACKER_ICON_23462 = 23462;
public static final int ATTACKER_ICON_23463 = 23463;
public static final int ATTACKER_ICON_23464 = 23464;
public static final int ATTACKER_ICON_23465 = 23465;
public static final int DEFENDER_ICON_23466 = 23466;
public static final int DEFENDER_ICON_23467 = 23467;
public static final int DEFENDER_ICON_23468 = 23468;
public static final int DEFENDER_ICON_23469 = 23469;
public static final int DEFENDER_ICON_23470 = 23470;
public static final int COLLECTOR_ICON_23471 = 23471;
public static final int COLLECTOR_ICON_23472 = 23472;
public static final int COLLECTOR_ICON_23473 = 23473;
public static final int COLLECTOR_ICON_23474 = 23474;
public static final int COLLECTOR_ICON_23475 = 23475;
public static final int COLLECTOR_ICON_23476 = 23476;
public static final int COLLECTOR_ICON_23477 = 23477;
public static final int HEALER_ICON_23478 = 23478;
public static final int HEALER_ICON_23479 = 23479;
public static final int HEALER_ICON_23480 = 23480;
public static final int HEALER_ICON_23481 = 23481;
public static final int HEALER_ICON_23482 = 23482;
public static final int HEALER_ICON_23483 = 23483;
public static final int HEALER_ICON_23484 = 23484;
public static final int HEALER_ICON_23485 = 23485;
public static final int HEALER_ICON_23486 = 23486;
public static final int WINE_OF_ZAMORAK_23489 = 23489;
public static final int LARRANS_KEY = 23490;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+204 -199
View File
@@ -460,10 +460,9 @@ public final class NpcID
public static final int SKELETAL_WYVERN_468 = 468;
public static final int KILLERWATT = 469;
public static final int KILLERWATT_470 = 470;
public static final int FUNGI = 471;
public static final int FUNGI_472 = 472;
public static final int ZYGOMITE = 473;
public static final int ZYGOMITE_474 = 474;
public static final int DARK_WIZARD = 472;
public static final int INVRIGAR_THE_NECROMANCER = 473;
public static final int DARK_WIZARD_474 = 474;
public static final int HOLE_IN_THE_WALL = 475;
public static final int WALL_BEAST = 476;
public static final int GIANT_FROG = 477;
@@ -493,40 +492,37 @@ public final class NpcID
public static final int VANESSA = 502;
public static final int RICHARD = 503;
public static final int ALICE = 504;
public static final int BOB = 505;
public static final int SHOP_KEEPER = 506;
public static final int SHOP_ASSISTANT = 507;
public static final int SHOP_KEEPER_508 = 508;
public static final int SHOP_ASSISTANT_509 = 509;
public static final int SHOP_KEEPER_510 = 510;
public static final int SHOP_ASSISTANT_511 = 511;
public static final int SHOP_KEEPER_512 = 512;
public static final int SHOP_ASSISTANT_513 = 513;
public static final int SHOP_KEEPER_514 = 514;
public static final int SHOP_ASSISTANT_515 = 515;
public static final int SHOP_KEEPER_516 = 516;
public static final int SHOP_ASSISTANT_517 = 517;
public static final int SHOP_KEEPER_518 = 518;
public static final int SHOP_ASSISTANT_519 = 519;
public static final int FAIRY_SHOP_KEEPER = 520;
public static final int FAIRY_SHOP_ASSISTANT = 521;
public static final int VALAINE = 522;
public static final int SCAVVO = 523;
public static final int PEKSA = 524;
public static final int SILK_TRADER = 525;
public static final int GEM_TRADER = 526;
public static final int ZEKE = 527;
public static final int LOUIE_LEGS = 528;
public static final int KARIM = 529;
public static final int RANAEL = 530;
public static final int DOMMIK = 531;
public static final int ZAFF = 532;
public static final int BARAEK = 533;
public static final int MUGGER = 505;
public static final int WITCH = 506;
public static final int WITCH_507 = 507;
public static final int BLACK_KNIGHT = 508;
public static final int BLACK_KNIGHT_509 = 509;
public static final int HIGHWAYMAN = 510;
public static final int HIGHWAYMAN_511 = 511;
public static final int CHAOS_DRUID = 512;
public static final int PIRATE = 513;
public static final int PIRATE_514 = 514;
public static final int PIRATE_515 = 515;
public static final int PIRATE_516 = 516;
public static final int THUG = 517;
public static final int ROGUE = 518;
public static final int MONK_OF_ZAMORAK = 519;
public static final int MONK_OF_ZAMORAK_520 = 520;
public static final int MONK_OF_ZAMORAK_521 = 521;
public static final int TRIBESMAN = 522;
public static final int DARK_WARRIOR = 523;
public static final int CHAOS_DRUID_WARRIOR = 524;
public static final int NECROMANCER = 525;
public static final int BANDIT = 526;
public static final int GUARD_BANDIT = 527;
public static final int BARBARIAN_GUARD = 528;
public static final int PORTAL = 530;
public static final int PORTAL_532 = 532;
public static final int FUNGI = 533;
public static final int THESSALIA = 534;
public static final int HORVIK = 535;
public static final int LOWE = 536;
public static final int SHOP_KEEPER_537 = 537;
public static final int SHOP_ASSISTANT_538 = 538;
public static final int FUNGI_535 = 535;
public static final int ZYGOMITE = 537;
public static final int FUNGI_538 = 538;
public static final int ELFINLOCKS = 539;
public static final int CLOCKWORK_CAT = 540;
public static final int CLOCKWORK_CAT_541 = 541;
@@ -625,7 +621,7 @@ public final class NpcID
public static final int BREWER_634 = 634;
public static final int FISHING_SPOT = 635;
public static final int KARAMTHULHU = 636;
public static final int AUBURY = 637;
public static final int FUNGI_637 = 637;
public static final int ELF_TRACKER = 638;
public static final int TYRAS_GUARD = 639;
public static final int UG = 640;
@@ -678,7 +674,7 @@ public final class NpcID
public static final int BARTENDER = 687;
public static final int EBLIS = 688;
public static final int EBLIS_689 = 689;
public static final int BANDIT = 690;
public static final int BANDIT_690 = 690;
public static final int BANDIT_691 = 691;
public static final int BANDIT_692 = 692;
public static final int BANDIT_693 = 693;
@@ -992,37 +988,34 @@ public final class NpcID
public static final int RAT = 1020;
public static final int RAT_1021 = 1021;
public static final int RAT_1022 = 1022;
public static final int FANCY_DRESS_SHOP_OWNER = 1023;
public static final int SHOP_KEEPER_1024 = 1024;
public static final int GRUM = 1025;
public static final int WYDIN = 1026;
public static final int GERRANT = 1027;
public static final int BRIAN = 1028;
public static final int JIMINUA = 1029;
public static final int SHOP_KEEPER_1030 = 1030;
public static final int CANDLE_MAKER = 1031;
public static final int ARHEIN = 1032;
public static final int JUKAT = 1033;
public static final int LUNDERWIN = 1034;
public static final int IRKSOL = 1035;
public static final int FAIRY = 1036;
public static final int ZAMBO = 1037;
public static final int SILVER_MERCHANT = 1038;
public static final int GEM_MERCHANT = 1039;
public static final int BAKER = 1040;
public static final int SPICE_SELLER = 1041;
public static final int FUR_TRADER = 1042;
public static final int SILK_MERCHANT = 1043;
public static final int HICKTON = 1044;
public static final int HARRY = 1045;
public static final int CASSIE = 1046;
public static final int FRINCOS = 1047;
public static final int DROGO_DWARF = 1048;
public static final int FLYNN = 1049;
public static final int WAYNE = 1050;
public static final int DWARF_1051 = 1051;
public static final int BETTY = 1052;
public static final int HERQUIN = 1053;
public static final int ZYGOMITE_1024 = 1024;
public static final int BANKER_1027 = 1027;
public static final int BANKER_1028 = 1028;
public static final int BANKER_1029 = 1029;
public static final int BANKER_1030 = 1030;
public static final int BANKER_1031 = 1031;
public static final int BANKER_1032 = 1032;
public static final int BANKER_1033 = 1033;
public static final int BANKER_1034 = 1034;
public static final int BANKER_1035 = 1035;
public static final int BANKER_1036 = 1036;
public static final int SNAKE = 1037;
public static final int MONKEY_1038 = 1038;
public static final int ALBINO_BAT = 1039;
public static final int CRAB = 1040;
public static final int GIANT_MOSQUITO = 1041;
public static final int JUNGLE_HORROR = 1042;
public static final int JUNGLE_HORROR_1043 = 1043;
public static final int JUNGLE_HORROR_1044 = 1044;
public static final int JUNGLE_HORROR_1045 = 1045;
public static final int JUNGLE_HORROR_1046 = 1046;
public static final int CAVE_HORROR = 1047;
public static final int CAVE_HORROR_1048 = 1048;
public static final int CAVE_HORROR_1049 = 1049;
public static final int CAVE_HORROR_1050 = 1050;
public static final int CAVE_HORROR_1051 = 1051;
public static final int CAVEY_DAVEY = 1052;
public static final int PATCHY = 1053;
public static final int LAUNA = 1054;
public static final int LAUNA_1055 = 1055;
public static final int BRANA = 1056;
@@ -1134,13 +1127,12 @@ public final class NpcID
public static final int MONK_OF_ENTRANA_1169 = 1169;
public static final int MONK_OF_ENTRANA_1170 = 1170;
public static final int MONK_1171 = 1171;
public static final int ROMMIK = 1172;
public static final int GAIUS = 1173;
public static final int JATIX = 1174;
public static final int DAVON = 1175;
public static final int ZENESHA = 1176;
public static final int AEMAD = 1177;
public static final int KORTAN = 1178;
public static final int CHICKEN = 1173;
public static final int CHICKEN_1174 = 1174;
public static final int ROOSTER = 1175;
public static final int LIL_LAMB = 1176;
public static final int LAMB = 1177;
public static final int SHEEP_1178 = 1178;
public static final int LUMBRIDGE_GUIDE_1179 = 1179;
public static final int LUMBRIDGE_GUIDE_1181 = 1181;
public static final int ___ = 1182;
@@ -1252,17 +1244,17 @@ public final class NpcID
public static final int MORTTON_LOCAL_1296 = 1296;
public static final int AFFLICTED_1297 = 1297;
public static final int AFFLICTED_1298 = 1298;
public static final int ROACHEY = 1299;
public static final int FRENITA = 1300;
public static final int NURMOF = 1301;
public static final int TEA_SELLER = 1302;
public static final int FAT_TONY = 1303;
public static final int NOTERAZZO = 1304;
public static final int SHEEP_1299 = 1299;
public static final int SHEEP_1300 = 1300;
public static final int SHEEP_1301 = 1301;
public static final int SHEEP_1302 = 1302;
public static final int SHEEP_1303 = 1303;
public static final int SHEEP_1304 = 1304;
public static final int HAIRDRESSER = 1305;
public static final int MAKEOVER_MAGE = 1306;
public static final int MAKEOVER_MAGE_1307 = 1307;
public static final int DIANGO = 1308;
public static final int BRIAN_1309 = 1309;
public static final int SHEEP_1308 = 1308;
public static final int SHEEP_1309 = 1309;
public static final int BARTENDER_1310 = 1310;
public static final int BARTENDER_1311 = 1311;
public static final int BARTENDER_1312 = 1312;
@@ -1392,12 +1384,12 @@ public final class NpcID
public static final int DAERO = 1444;
public static final int DAERO_1445 = 1445;
public static final int WAYDAR = 1446;
public static final int PIRATE = 1447;
public static final int PIRATE_1447 = 1447;
public static final int THIEF = 1448;
public static final int LUMDO_1453 = 1453;
public static final int LUMDO_1454 = 1454;
public static final int GLO_CARANOCK = 1460;
public static final int MUGGER = 1461;
public static final int MUGGER_1461 = 1461;
public static final int SMALL_NINJA_MONKEY = 1462;
public static final int MEDIUM_NINJA_MONKEY = 1463;
public static final int GORILLA = 1464;
@@ -1478,7 +1470,7 @@ public final class NpcID
public static final int FISHING_SPOT_1542 = 1542;
public static final int GARGOYLE_1543 = 1543;
public static final int FISHING_SPOT_1544 = 1544;
public static final int BLACK_KNIGHT = 1545;
public static final int BLACK_KNIGHT_1545 = 1545;
public static final int GUARD_1546 = 1546;
public static final int GUARD_1547 = 1547;
public static final int GUARD_1548 = 1548;
@@ -1486,7 +1478,7 @@ public final class NpcID
public static final int GUARD_1550 = 1550;
public static final int GUARD_1551 = 1551;
public static final int GUARD_1552 = 1552;
public static final int CRAB = 1553;
public static final int CRAB_1553 = 1553;
public static final int SEAGULL_1554 = 1554;
public static final int SEAGULL_1555 = 1555;
public static final int FIRE_WIZARD = 1556;
@@ -1668,7 +1660,7 @@ public final class NpcID
public static final int BRAWLER_1736 = 1736;
public static final int BRAWLER_1737 = 1737;
public static final int BRAWLER_1738 = 1738;
public static final int PORTAL = 1739;
public static final int PORTAL_1739 = 1739;
public static final int PORTAL_1740 = 1740;
public static final int PORTAL_1741 = 1741;
public static final int PORTAL_1742 = 1742;
@@ -1716,10 +1708,10 @@ public final class NpcID
public static final int SKELETON_1785 = 1785;
public static final int GHOST_1786 = 1786;
public static final int SKELETON_MAGE_1787 = 1787;
public static final int BETTY_1788 = 1788;
public static final int GRUM_1789 = 1789;
public static final int GERRANT_1790 = 1790;
public static final int WYDIN_1791 = 1791;
public static final int BETTY = 1788;
public static final int GRUM = 1789;
public static final int GERRANT = 1790;
public static final int WYDIN = 1791;
public static final int GOAT = 1792;
public static final int GOAT_1793 = 1793;
public static final int BILLY_GOAT = 1794;
@@ -1767,7 +1759,7 @@ public final class NpcID
public static final int STAG = 1845;
public static final int WOOD_DRYAD = 1846;
public static final int FAIRY_VERY_WISE = 1847;
public static final int FAIRY_1848 = 1848;
public static final int FAIRY = 1848;
public static final int FAIRY_1849 = 1849;
public static final int FAIRY_1850 = 1850;
public static final int FAIRY_1851 = 1851;
@@ -1915,7 +1907,7 @@ public final class NpcID
public static final int FRITZ_THE_GLASSBLOWER = 2053;
public static final int CHAOS_ELEMENTAL = 2054;
public static final int CHAOS_ELEMENTAL_JR = 2055;
public static final int DARK_WIZARD = 2056;
public static final int DARK_WIZARD_2056 = 2056;
public static final int DARK_WIZARD_2057 = 2057;
public static final int DARK_WIZARD_2058 = 2058;
public static final int DARK_WIZARD_2059 = 2059;
@@ -2488,7 +2480,7 @@ public final class NpcID
public static final int LILIYA = 2632;
public static final int BANKER_2633 = 2633;
public static final int MYRE_BLAMISH_SNAIL = 2634;
public static final int BOB_2635 = 2635;
public static final int BOB = 2635;
public static final int BOB_2636 = 2636;
public static final int SPHINX = 2637;
public static final int NEITE = 2638;
@@ -2544,11 +2536,12 @@ public final class NpcID
public static final int IMIAGO = 2688;
public static final int LILIWEN = 2689;
public static final int COOL_MOM227 = 2690;
public static final int CHICKEN = 2692;
public static final int CHICKEN_2693 = 2693;
public static final int ROOSTER = 2694;
public static final int LIL_LAMB = 2695;
public static final int LAMB = 2696;
public static final int SHEEP_2691 = 2691;
public static final int SHEEP_2692 = 2692;
public static final int SHEEP_2693 = 2693;
public static final int SHEEP_2694 = 2694;
public static final int SHEEP_2695 = 2695;
public static final int SHEEP_2696 = 2696;
public static final int SHEEP_2697 = 2697;
public static final int SHEEP_2698 = 2698;
public static final int SHEEP_2699 = 2699;
@@ -2642,43 +2635,43 @@ public final class NpcID
public static final int SHEEP_2787 = 2787;
public static final int SHEEP_2788 = 2788;
public static final int SHEEP_2789 = 2789;
public static final int SHEEP_2790 = 2790;
public static final int SHEEP_2791 = 2791;
public static final int SHEEP_2792 = 2792;
public static final int SHEEP_2793 = 2793;
public static final int SHEEP_2794 = 2794;
public static final int SHEEP_2795 = 2795;
public static final int SHEEP_2796 = 2796;
public static final int SHEEP_2797 = 2797;
public static final int SHEEP_2798 = 2798;
public static final int SHEEP_2799 = 2799;
public static final int SHEEP_2800 = 2800;
public static final int SHEEP_2801 = 2801;
public static final int SHEEP_2802 = 2802;
public static final int SHEEP_2803 = 2803;
public static final int SHEEP_2804 = 2804;
public static final int COW = 2805;
public static final int COW_2806 = 2806;
public static final int COW_CALF = 2807;
public static final int COW_2808 = 2808;
public static final int COW_CALF_2809 = 2809;
public static final int COW_2810 = 2810;
public static final int PIG = 2811;
public static final int PIG_2812 = 2812;
public static final int PIGLET = 2813;
public static final int PIGLET_2814 = 2814;
public static final int PIGLET_2815 = 2815;
public static final int COW_CALF_2816 = 2816;
public static final int SHEEPDOG = 2817;
public static final int ROOSTER_2818 = 2818;
public static final int CHICKEN_2819 = 2819;
public static final int CHICKEN_2820 = 2820;
public static final int CHICKEN_2821 = 2821;
public static final int PIG_2822 = 2822;
public static final int PIG_2823 = 2823;
public static final int PIGLET_2824 = 2824;
public static final int PIGLET_2825 = 2825;
public static final int PIGLET_2826 = 2826;
public static final int COW = 2790;
public static final int COW_2791 = 2791;
public static final int COW_CALF = 2792;
public static final int COW_2793 = 2793;
public static final int COW_CALF_2794 = 2794;
public static final int COW_2795 = 2795;
public static final int PIG = 2796;
public static final int PIG_2797 = 2797;
public static final int PIGLET = 2798;
public static final int PIGLET_2799 = 2799;
public static final int PIGLET_2800 = 2800;
public static final int COW_CALF_2801 = 2801;
public static final int SHEEPDOG = 2802;
public static final int ROOSTER_2803 = 2803;
public static final int CHICKEN_2804 = 2804;
public static final int CHICKEN_2805 = 2805;
public static final int CHICKEN_2806 = 2806;
public static final int PIG_2807 = 2807;
public static final int PIG_2808 = 2808;
public static final int PIGLET_2809 = 2809;
public static final int PIGLET_2810 = 2810;
public static final int PIGLET_2811 = 2811;
public static final int BOB_2812 = 2812;
public static final int SHOP_KEEPER = 2813;
public static final int SHOP_ASSISTANT = 2814;
public static final int SHOP_KEEPER_2815 = 2815;
public static final int SHOP_ASSISTANT_2816 = 2816;
public static final int SHOP_KEEPER_2817 = 2817;
public static final int SHOP_ASSISTANT_2818 = 2818;
public static final int SHOP_KEEPER_2819 = 2819;
public static final int SHOP_ASSISTANT_2820 = 2820;
public static final int SHOP_KEEPER_2821 = 2821;
public static final int SHOP_ASSISTANT_2822 = 2822;
public static final int SHOP_KEEPER_2823 = 2823;
public static final int SHOP_ASSISTANT_2824 = 2824;
public static final int SHOP_KEEPER_2825 = 2825;
public static final int SHOP_ASSISTANT_2826 = 2826;
public static final int BAT = 2827;
public static final int DRYAD = 2828;
public static final int FAIRY_2829 = 2829;
@@ -2697,7 +2690,7 @@ public final class NpcID
public static final int ICE_WARRIOR_2842 = 2842;
public static final int OTHERWORLDLY_BEING = 2843;
public static final int MAGIC_AXE = 2844;
public static final int SNAKE = 2845;
public static final int SNAKE_2845 = 2845;
public static final int SKAVID = 2846;
public static final int YETI = 2847;
public static final int MONKEY_2848 = 2848;
@@ -2720,33 +2713,33 @@ public final class NpcID
public static final int DUNGEON_RAT = 2865;
public static final int DUNGEON_RAT_2866 = 2866;
public static final int DUNGEON_RAT_2867 = 2867;
public static final int DARK_WIZARD_2868 = 2868;
public static final int INVRIGAR_THE_NECROMANCER = 2869;
public static final int DARK_WIZARD_2870 = 2870;
public static final int MUGGER_2871 = 2871;
public static final int WITCH = 2872;
public static final int WITCH_2873 = 2873;
public static final int BLACK_KNIGHT_2874 = 2874;
public static final int BLACK_KNIGHT_2875 = 2875;
public static final int HIGHWAYMAN = 2876;
public static final int HIGHWAYMAN_2877 = 2877;
public static final int CHAOS_DRUID = 2878;
public static final int PIRATE_2879 = 2879;
public static final int PIRATE_2880 = 2880;
public static final int PIRATE_2881 = 2881;
public static final int PIRATE_2882 = 2882;
public static final int THUG = 2883;
public static final int ROGUE = 2884;
public static final int MONK_OF_ZAMORAK = 2885;
public static final int MONK_OF_ZAMORAK_2886 = 2886;
public static final int MONK_OF_ZAMORAK_2887 = 2887;
public static final int TRIBESMAN = 2888;
public static final int DARK_WARRIOR = 2889;
public static final int CHAOS_DRUID_WARRIOR = 2890;
public static final int NECROMANCER = 2891;
public static final int BANDIT_2892 = 2892;
public static final int GUARD_BANDIT = 2893;
public static final int BARBARIAN_GUARD = 2894;
public static final int FAIRY_SHOP_KEEPER = 2868;
public static final int FAIRY_SHOP_ASSISTANT = 2869;
public static final int VALAINE = 2870;
public static final int SCAVVO = 2871;
public static final int PEKSA = 2872;
public static final int SILK_TRADER = 2873;
public static final int GEM_TRADER = 2874;
public static final int ZEKE = 2875;
public static final int LOUIE_LEGS = 2876;
public static final int KARIM = 2877;
public static final int RANAEL = 2878;
public static final int DOMMIK = 2879;
public static final int ZAFF = 2880;
public static final int BARAEK = 2881;
public static final int HORVIK = 2882;
public static final int LOWE = 2883;
public static final int SHOP_KEEPER_2884 = 2884;
public static final int SHOP_ASSISTANT_2885 = 2885;
public static final int AUBURY = 2886;
public static final int FANCY_DRESS_SHOP_OWNER = 2887;
public static final int SHOP_KEEPER_2888 = 2888;
public static final int GRUM_2889 = 2889;
public static final int WYDIN_2890 = 2890;
public static final int GERRANT_2891 = 2891;
public static final int BRIAN = 2892;
public static final int JIMINUA = 2893;
public static final int SHOP_KEEPER_2894 = 2894;
public static final int COOK_2895 = 2895;
public static final int COOK_2896 = 2896;
public static final int BANKER_2897 = 2897;
@@ -3022,23 +3015,23 @@ public final class NpcID
public static final int EMERALD_BENEDICT = 3194;
public static final int SPIN_BLADES = 3195;
public static final int SPIN_BLADES_3196 = 3196;
public static final int SNAKE_3199 = 3199;
public static final int MONKEY_3200 = 3200;
public static final int ALBINO_BAT = 3201;
public static final int CRAB_3202 = 3202;
public static final int GIANT_MOSQUITO = 3203;
public static final int JUNGLE_HORROR = 3204;
public static final int JUNGLE_HORROR_3205 = 3205;
public static final int JUNGLE_HORROR_3206 = 3206;
public static final int JUNGLE_HORROR_3207 = 3207;
public static final int JUNGLE_HORROR_3208 = 3208;
public static final int CAVE_HORROR = 3209;
public static final int CAVE_HORROR_3210 = 3210;
public static final int CAVE_HORROR_3211 = 3211;
public static final int CAVE_HORROR_3212 = 3212;
public static final int CAVE_HORROR_3213 = 3213;
public static final int CAVEY_DAVEY = 3214;
public static final int PATCHY = 3215;
public static final int CANDLE_MAKER = 3199;
public static final int ARHEIN = 3200;
public static final int JUKAT = 3201;
public static final int LUNDERWIN = 3202;
public static final int IRKSOL = 3203;
public static final int FAIRY_3204 = 3204;
public static final int ZAMBO = 3205;
public static final int SILVER_MERCHANT = 3206;
public static final int GEM_MERCHANT = 3207;
public static final int BAKER = 3208;
public static final int SPICE_SELLER = 3209;
public static final int FUR_TRADER = 3210;
public static final int SILK_MERCHANT = 3211;
public static final int HICKTON = 3212;
public static final int HARRY = 3213;
public static final int CASSIE = 3214;
public static final int FRINCOS = 3215;
public static final int MELEE_COMBAT_TUTOR = 3216;
public static final int RANGED_COMBAT_TUTOR = 3217;
public static final int MAGIC_COMBAT_TUTOR = 3218;
@@ -4354,7 +4347,7 @@ public final class NpcID
public static final int GEM_MERCHANT_4581 = 4581;
public static final int SILVER_MERCHANT_4582 = 4582;
public static final int SILK_MERCHANT_4583 = 4583;
public static final int ZENESHA_4584 = 4584;
public static final int ZENESHA = 4584;
public static final int ALI_MORRISANE_4585 = 4585;
public static final int GRIMESQUIT = 4586;
public static final int PHINGSPET = 4587;
@@ -5591,11 +5584,11 @@ public final class NpcID
public static final int TZREKJAD = 5892;
public static final int TZREKJAD_5893 = 5893;
public static final int BAST = 5894;
public static final int BANKER_5895 = 5895;
public static final int BANKER_5896 = 5896;
public static final int BANKER_5897 = 5897;
public static final int BANKER_5904 = 5904;
public static final int BANKER_5905 = 5905;
public static final int DROGO_DWARF = 5895;
public static final int FLYNN = 5896;
public static final int WAYNE = 5897;
public static final int DWARF_5904 = 5904;
public static final int BETTY_5905 = 5905;
public static final int PROBITA = 5906;
public static final int CHAOS_ELEMENTAL_JR_5907 = 5907;
public static final int ABYSSAL_SIRE_5908 = 5908;
@@ -6021,8 +6014,8 @@ public final class NpcID
public static final int FIDELIO = 6525;
public static final int SBOTT = 6526;
public static final int ROAVAR = 6527;
public static final int BANKER_6529 = 6529;
public static final int BANKER_6530 = 6530;
public static final int HERQUIN = 6529;
public static final int ROMMIK = 6530;
public static final int BLURBERRY = 6531;
public static final int BARMAN_6532 = 6532;
public static final int ROMILY_WEAKLAX = 6533;
@@ -7135,7 +7128,7 @@ public final class NpcID
public static final int ANCIENT_WYVERN = 7795;
public static final int LOBSTROSITY = 7796;
public static final int ANCIENT_ZYGOMITE = 7797;
public static final int ANCIENT_FUNGI = 7798;
public static final int GAIUS = 7798;
public static final int AMMONITE_CRAB = 7799;
public static final int FOSSIL_ROCK = 7800;
public static final int TAR_BUBBLES = 7801;
@@ -7745,7 +7738,7 @@ public final class NpcID
public static final int TRAPPED_SOUL_HARD = 8529;
public static final int AMELIA_8530 = 8530;
public static final int ALLANNA = 8531;
public static final int LEKE_QUO_KERAN = 8532;
public static final int JATIX = 8532;
public static final int NIKKIE = 8533;
public static final int ROSIE = 8534;
public static final int ALAN = 8535;
@@ -7855,11 +7848,23 @@ public final class NpcID
public static final int ILFEEN_8677 = 8677;
public static final int FERAL_VAMPYRE_8678 = 8678;
public static final int ABIDOR_CRANK_8679 = 8679;
public static final int BANKER_8680 = 8680;
public static final int BANKER_8681 = 8681;
public static final int BANKER_8682 = 8682;
public static final int PORTAL_8684 = 8684;
public static final int PORTAL_8686 = 8686;
public static final int DAVON = 8680;
public static final int ZENESHA_8681 = 8681;
public static final int AEMAD = 8682;
public static final int KORTAN = 8683;
public static final int ROACHEY = 8684;
public static final int FRENITA = 8685;
public static final int NURMOF = 8686;
public static final int TEA_SELLER = 8687;
public static final int FAT_TONY = 8688;
public static final int ANCIENT_FUNGI = 8690;
public static final int ANCIENT_FUNGI_8691 = 8691;
public static final int NOTERAZZO = 8692;
public static final int DIANGO = 8693;
public static final int BRIAN_8694 = 8694;
public static final int MOSOL_REI_8696 = 8696;
public static final int LEKE_QUO_KERAN = 8697;
public static final int MONK_OF_ZAMORAK_8698 = 8698;
public static final int LARRAN = 8699;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+7
View File
@@ -12456,5 +12456,12 @@ public final class NullItemID
public static final int NULL_23455 = 23455;
public static final int NULL_23456 = 23456;
public static final int NULL_23457 = 23457;
public static final int NULL_23459 = 23459;
public static final int NULL_23487 = 23487;
public static final int NULL_23488 = 23488;
public static final int NULL_23491 = 23491;
public static final int NULL_23492 = 23492;
public static final int NULL_23493 = 23493;
public static final int NULL_23494 = 23494;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+2
View File
@@ -16209,5 +16209,7 @@ public final class NullObjectID
public static final int NULL_34823 = 34823;
public static final int NULL_34824 = 34824;
public static final int NULL_34825 = 34825;
public static final int NULL_34831 = 34831;
public static final int NULL_34832 = 34832;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+7 -2
View File
@@ -16133,7 +16133,7 @@ public final class ObjectID
public static final int GRAND_EXCHANGE_BOOTH_30390 = 30390;
public static final int IRON_LADDER_30391 = 30391;
public static final int IRON_LADDER_30392 = 30392;
public static final int JADFEST_PORTAL = 30395;
public static final int MYSTERIOUS_POOL = 30395;
public static final int SHIMMERING_BARRIER_30396 = 30396;
public static final int SHIMMERING_BARRIER_30397 = 30397;
public static final int SHIMMERING_BARRIER_30398 = 30398;
@@ -17528,7 +17528,7 @@ public final class ObjectID
public static final int FIRE_OF_DEHUMIDIFICATION = 33322;
public static final int PILE_OF_RUBBLE_33340 = 33340;
public static final int PILE_OF_RUBBLE_33341 = 33341;
public static final int HUB_PORTAL = 33343;
public static final int LARRANS_SMALL_CHEST = 33343;
public static final int BROKEN_WALL_33344 = 33344;
public static final int PORTAL_NEXUS_SPACE = 33346;
public static final int RUG_SPACE_33347 = 33347;
@@ -18605,5 +18605,10 @@ public final class ObjectID
public static final int RUBBLE_34803 = 34803;
public static final int RUBBLE_34804 = 34804;
public static final int RUBBLE_34805 = 34805;
public static final int JADFEST_PORTAL = 34826;
public static final int HUB_PORTAL = 34827;
public static final int LARRANS_SMALL_CHEST_34828 = 34828;
public static final int LARRANS_BIG_CHEST = 34829;
public static final int LARRANS_BIG_CHEST_34830 = 34830;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ScriptID.java
+10
View File
@@ -110,6 +110,16 @@ public final class ScriptID
*/
public static final int KEPT_LOST_ITEM_EXAMINE = 1603;
/**
* Displays the game messages when clicking on an item inside the Items Kept on Death interface
* <ul>
* <li> int (boolean) Item kept on death </li>
* <li> int Item Quantity </li>
* <li> String Item Name </li>
* </ul>
*/
public static final int DEATH_KEEP_ITEM_EXAMINE = 1603;
/**
* Checks the state of the given stash unit.
* <ul>
runelite-api/src/main/java/net/runelite/api/SpriteID.java
+19
View File
@@ -1564,9 +1564,28 @@ public final class SpriteID
public static final int MOBILE_FUNCTION_MODE_DISABLED = 1624;
public static final int MOBILE_YELLOW_TOUCH_ANIMATION_1 = 1625;
public static final int MOBILE_YELLOW_TOUCH_ANIMATION_2 = 1626;
/* Unmapped: 1627~1707 */
public static final int TAB_MAGIC_SPELLBOOK_ARCEUUS_UNUSED = 1708;
/* Unmapped: 1709, 1710 */
public static final int TAB_MAGIC_SPELLBOOK_ARCEUUS = 1711;
public static final int BIG_ASS_GUTHIX_SPELL = 1774;
public static final int BIG_SUPERHEAT = 1800;
public static final int BIG_SPEC_TRANSFER = 1959;
/* Unmapped: 1712~2175 */
public static final int HEALTHBAR_DEFAULT_FRONT_30PX = 2176;
public static final int HEALTHBAR_DEFAULT_BACK_30PX = 2177;
public static final int HEALTHBAR_DEFAULT_FRONT_50PX = 2178;
public static final int HEALTHBAR_DEFAULT_BACK_50PX = 2179;
public static final int HEALTHBAR_DEFAULT_FRONT_60PX = 2180;
public static final int HEALTHBAR_DEFAULT_BACK_60PX = 2181;
public static final int HEALTHBAR_DEFAULT_FRONT_80PX = 2182;
public static final int HEALTHBAR_DEFAULT_BACK_80PX = 2183;
public static final int HEALTHBAR_DEFAULT_FRONT_100PX = 2184;
public static final int HEALTHBAR_DEFAULT_BACK_100PX = 2185;
public static final int HEALTHBAR_DEFAULT_FRONT_120PX = 2186;
public static final int HEALTHBAR_DEFAULT_BACK_120PX = 2187;
public static final int HEALTHBAR_DEFAULT_FRONT_140PX = 2188;
public static final int HEALTHBAR_DEFAULT_BACK_140PX = 2189;
public static final int HEALTHBAR_DEFAULT_FRONT_160PX = 2190;
public static final int HEALTHBAR_DEFAULT_BACK_160PX = 2191;
}
runelite-api/src/main/java/net/runelite/api/vars/SlayerUnlock.java
+2 -2
View File
@@ -56,7 +56,7 @@ public enum SlayerUnlock
TZHARR_ENABLE(18),
BOSS_ENABLE(19),
BLOODVELD_EXTEND(20),
ABBERANT_SPECTRE_EXTEND(21),
ABERRANT_SPECTRE_EXTEND(21),
AVIANSIES_EXTEND(22),
MITHRIL_DRAGON_EXTEND(23),
CAVE_HORROR_EXTEND(24),
@@ -79,7 +79,7 @@ public enum SlayerUnlock
RUNE_DRAGON_EXTEND(41),
VORKATH_SLAYER_HELM(42),
FOSSIL_ISLAND_WYVERN_DISABLE(43, Varbits.FOSSIL_ISLAND_WYVERN_DISABLE),
GROTESQUE_GARDIAN_DOUBLE_COUNT(44);
GROTESQUE_GUARDIAN_DOUBLE_COUNT(44);
private Varbits toggleVarbit;
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
+6 -4
View File
@@ -149,6 +149,7 @@ public class WidgetID
public static final int BEGINNER_CLUE_MAP_NORTH_OF_FALADOR = 351;
public static final int BEGINNER_CLUE_MAP_WIZARDS_TOWER = 356;
public static final int SEED_BOX_GROUP_ID = 128;
public static final int ITEMS_KEPT_ON_DEATH_GROUP_ID = 4;
static class WorldMap
{
@@ -962,9 +963,9 @@ public class WidgetID
static final int ATTACK_RANGE = 59; // OUTDATED?
static final int BOUNTY_HUNTER_INFO = 19;
static final int KILLDEATH_RATIO = 15;
static final int SKULL_CONTAINER = 62;
static final int SAFE_ZONE = 64;
static final int WILDERNESS_LEVEL = 67; // this can also be the Deadman Mode "Protection" text
static final int SKULL_CONTAINER = 61;
static final int SAFE_ZONE = 63;
static final int WILDERNESS_LEVEL = 66; // this can also be the Deadman Mode "Protection" text
}
static class KourendFavour
@@ -1047,12 +1048,13 @@ public class WidgetID
static class KeptOnDeath
{
static final int KEPT_ITEMS_CONTAINER = 18;
static final int KEPT_ITEMS_TEXT = 17;
static final int LOST_ITEMS_TEXT = 20;
static final int LOST_ITEMS_CONTAINER = 21;
static final int LOST_ITEMS_VALUE = 23;
static final int INFORMATION_CONTAINER = 29;
static final int MAX_ITEMS_KEPT_ON_DEATH = 30;
static final int SAFE_ZONE_CONTAINER = 31;
static final int CUSTOM_TEXT_CONTAINER = 33;
}
runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
+4 -1
View File
@@ -739,7 +739,10 @@ public enum WidgetInfo
XP_DROP_4(WidgetID.EXPERIENCE_DROP_GROUP_ID, WidgetID.ExperienceDrop.DROP_4),
XP_DROP_5(WidgetID.EXPERIENCE_DROP_GROUP_ID, WidgetID.ExperienceDrop.DROP_5),
XP_DROP_6(WidgetID.EXPERIENCE_DROP_GROUP_ID, WidgetID.ExperienceDrop.DROP_6),
XP_DROP_7(WidgetID.EXPERIENCE_DROP_GROUP_ID, WidgetID.ExperienceDrop.DROP_7);
XP_DROP_7(WidgetID.EXPERIENCE_DROP_GROUP_ID, WidgetID.ExperienceDrop.DROP_7),
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);
private final int groupId;
private final int childId;