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

Merge pull request #2316 from xKylee/master

Browse Source 
upstream: merge
This commit is contained in:
Kyle
2020-02-07 13:53:05 +00:00
committed by GitHub
parent 3469f29b75 4106b25932
commit 8dda5edbb8
6 changed files with 423 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/ItemID.java
+9 -1
View File
@@ -11358,7 +11358,7 @@ public final class ItemID
public static final int TWISTED_BANNER = 24413;
public static final int RUNE_POUCH_L = 24416;
public static final int INQUISITORS_MACE = 24417;
public static final int SIRENS_TOME = 24418;
public static final int CABBAGE_24418 = 24418;
public static final int INQUISITORS_GREAT_HELM = 24419;
public static final int INQUISITORS_HAUBERK = 24420;
public static final int INQUISITORS_PLATESKIRT = 24421;
@@ -11398,5 +11398,13 @@ public final class ItemID
public static final int PHOENIX_24484 = 24484;
public static final int PHOENIX_24485 = 24485;
public static final int PHOENIX_24486 = 24486;
public static final int INQUISITORS_ARMOUR_SET = 24488;
public static final int LITTLE_NIGHTMARE = 24491;
public static final int CLUE_SCROLL_HARD_24493 = 24493;
public static final int PUZZLE_BOX_HARD_24494 = 24494;
public static final int JAR_OF_DREAMS = 24495;
public static final int HARMONISED_ORB = 24511;
public static final int VOLATILE_ORB = 24514;
public static final int ELDRITCH_ORB = 24517;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+58
View File
@@ -6144,6 +6144,7 @@ public final class NpcID
public static final int BABY_CHINCHOMPA_6757 = 6757;
public static final int BABY_CHINCHOMPA_6758 = 6758;
public static final int BABY_CHINCHOMPA_6759 = 6759;
public static final int PYRELORD = 6762;
public static final int LIZARDMAN_SHAMAN = 6766;
public static final int LIZARDMAN_SHAMAN_6767 = 6767;
public static final int SPAWN_6768 = 6768;
@@ -6163,6 +6164,7 @@ public final class NpcID
public static final int HOSA = 6785;
public static final int HELLRAT_BEHEMOTH = 6793;
public static final int MONKEY_ARCHER_6794 = 6794;
public static final int PYRELORD_6795 = 6795;
public static final int NIEVE = 6797;
public static final int STEVE = 6798;
public static final int STEVE_6799 = 6799;
@@ -8411,5 +8413,61 @@ public final class NpcID
public static final int TRADER_CREWMEMBER_9381 = 9381;
public static final int TRADER_CREWMEMBER_9382 = 9382;
public static final int TRADER_CREWMEMBER_9383 = 9383;
public static final int LITTLE_NIGHTMARE = 9398;
public static final int LITTLE_NIGHTMARE_9399 = 9399;
public static final int OATH_LORD_DROWS = 9400;
public static final int OATHBREAKER_MALS = 9401;
public static final int OATHBREAKER_EPIWS = 9402;
public static final int OATHBREAKER_BATS = 9403;
public static final int LITHIL = 9404;
public static final int SISTER_ASERET = 9405;
public static final int SISTER_NAOJ = 9406;
public static final int SISTER_SALOHCIN = 9407;
public static final int LUMIERE = 9408;
public static final int DAER_KRAND = 9409;
public static final int STRONG_RONNY = 9410;
public static final int SHURA = 9413;
public static final int SHURA_9414 = 9414;
public static final int THE_NIGHTMARE = 9415;
public static final int THE_NIGHTMARE_9416 = 9416;
public static final int THE_NIGHTMARE_9417 = 9417;
public static final int THE_NIGHTMARE_9418 = 9418;
public static final int THE_NIGHTMARE_9419 = 9419;
public static final int THE_NIGHTMARE_9420 = 9420;
public static final int THE_NIGHTMARE_9421 = 9421;
public static final int THE_NIGHTMARE_9422 = 9422;
public static final int THE_NIGHTMARE_9423 = 9423;
public static final int THE_NIGHTMARE_9424 = 9424;
public static final int THE_NIGHTMARE_9425 = 9425;
public static final int THE_NIGHTMARE_9426 = 9426;
public static final int THE_NIGHTMARE_9427 = 9427;
public static final int THE_NIGHTMARE_9428 = 9428;
public static final int THE_NIGHTMARE_9429 = 9429;
public static final int THE_NIGHTMARE_9430 = 9430;
public static final int THE_NIGHTMARE_9431 = 9431;
public static final int THE_NIGHTMARE_9432 = 9432;
public static final int THE_NIGHTMARE_9433 = 9433;
public static final int TOTEM = 9434;
public static final int TOTEM_9435 = 9435;
public static final int TOTEM_9436 = 9436;
public static final int TOTEM_9437 = 9437;
public static final int TOTEM_9438 = 9438;
public static final int TOTEM_9439 = 9439;
public static final int TOTEM_9440 = 9440;
public static final int TOTEM_9441 = 9441;
public static final int TOTEM_9442 = 9442;
public static final int TOTEM_9443 = 9443;
public static final int TOTEM_9444 = 9444;
public static final int TOTEM_9445 = 9445;
public static final int SLEEPWALKER_9446 = 9446;
public static final int SLEEPWALKER_9447 = 9447;
public static final int SLEEPWALKER_9448 = 9448;
public static final int SLEEPWALKER_9449 = 9449;
public static final int SLEEPWALKER_9450 = 9450;
public static final int SLEEPWALKER_9451 = 9451;
public static final int PARASITE = 9452;
public static final int PARASITE_9453 = 9453;
public static final int HUSK = 9454;
public static final int HUSK_9455 = 9455;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+24
View File
@@ -12881,5 +12881,29 @@ public final class NullItemID
public static final int NULL_24476 = 24476;
public static final int NULL_24477 = 24477;
public static final int NULL_24487 = 24487;
public static final int NULL_24489 = 24489;
public static final int NULL_24490 = 24490;
public static final int NULL_24492 = 24492;
public static final int NULL_24496 = 24496;
public static final int NULL_24497 = 24497;
public static final int NULL_24498 = 24498;
public static final int NULL_24499 = 24499;
public static final int NULL_24500 = 24500;
public static final int NULL_24501 = 24501;
public static final int NULL_24502 = 24502;
public static final int NULL_24503 = 24503;
public static final int NULL_24504 = 24504;
public static final int NULL_24505 = 24505;
public static final int NULL_24506 = 24506;
public static final int NULL_24507 = 24507;
public static final int NULL_24508 = 24508;
public static final int NULL_24509 = 24509;
public static final int NULL_24510 = 24510;
public static final int NULL_24512 = 24512;
public static final int NULL_24513 = 24513;
public static final int NULL_24515 = 24515;
public static final int NULL_24516 = 24516;
public static final int NULL_24518 = 24518;
public static final int NULL_24519 = 24519;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+271 -1
View File
@@ -15347,7 +15347,6 @@ public final class NullObjectID
public static final int NULL_32668 = 32668;
public static final int NULL_32669 = 32669;
public static final int NULL_32670 = 32670;
public static final int NULL_32671 = 32671;
public static final int NULL_32672 = 32672;
public static final int NULL_32673 = 32673;
public static final int NULL_32674 = 32674;
@@ -18073,5 +18072,276 @@ public final class NullObjectID
public static final int NULL_37481 = 37481;
public static final int NULL_37490 = 37490;
public static final int NULL_37491 = 37491;
public static final int NULL_37623 = 37623;
public static final int NULL_37624 = 37624;
public static final int NULL_37625 = 37625;
public static final int NULL_37626 = 37626;
public static final int NULL_37627 = 37627;
public static final int NULL_37628 = 37628;
public static final int NULL_37632 = 37632;
public static final int NULL_37633 = 37633;
public static final int NULL_37634 = 37634;
public static final int NULL_37635 = 37635;
public static final int NULL_37636 = 37636;
public static final int NULL_37637 = 37637;
public static final int NULL_37638 = 37638;
public static final int NULL_37639 = 37639;
public static final int NULL_37640 = 37640;
public static final int NULL_37641 = 37641;
public static final int NULL_37642 = 37642;
public static final int NULL_37643 = 37643;
public static final int NULL_37644 = 37644;
public static final int NULL_37645 = 37645;
public static final int NULL_37646 = 37646;
public static final int NULL_37647 = 37647;
public static final int NULL_37648 = 37648;
public static final int NULL_37649 = 37649;
public static final int NULL_37650 = 37650;
public static final int NULL_37651 = 37651;
public static final int NULL_37652 = 37652;
public static final int NULL_37653 = 37653;
public static final int NULL_37654 = 37654;
public static final int NULL_37655 = 37655;
public static final int NULL_37656 = 37656;
public static final int NULL_37657 = 37657;
public static final int NULL_37658 = 37658;
public static final int NULL_37659 = 37659;
public static final int NULL_37660 = 37660;
public static final int NULL_37661 = 37661;
public static final int NULL_37662 = 37662;
public static final int NULL_37663 = 37663;
public static final int NULL_37664 = 37664;
public static final int NULL_37665 = 37665;
public static final int NULL_37666 = 37666;
public static final int NULL_37667 = 37667;
public static final int NULL_37668 = 37668;
public static final int NULL_37669 = 37669;
public static final int NULL_37670 = 37670;
public static final int NULL_37671 = 37671;
public static final int NULL_37672 = 37672;
public static final int NULL_37673 = 37673;
public static final int NULL_37674 = 37674;
public static final int NULL_37675 = 37675;
public static final int NULL_37676 = 37676;
public static final int NULL_37677 = 37677;
public static final int NULL_37678 = 37678;
public static final int NULL_37679 = 37679;
public static final int NULL_37680 = 37680;
public static final int NULL_37681 = 37681;
public static final int NULL_37682 = 37682;
public static final int NULL_37683 = 37683;
public static final int NULL_37684 = 37684;
public static final int NULL_37685 = 37685;
public static final int NULL_37686 = 37686;
public static final int NULL_37687 = 37687;
public static final int NULL_37688 = 37688;
public static final int NULL_37689 = 37689;
public static final int NULL_37690 = 37690;
public static final int NULL_37691 = 37691;
public static final int NULL_37692 = 37692;
public static final int NULL_37693 = 37693;
public static final int NULL_37694 = 37694;
public static final int NULL_37695 = 37695;
public static final int NULL_37696 = 37696;
public static final int NULL_37697 = 37697;
public static final int NULL_37698 = 37698;
public static final int NULL_37699 = 37699;
public static final int NULL_37700 = 37700;
public static final int NULL_37701 = 37701;
public static final int NULL_37702 = 37702;
public static final int NULL_37703 = 37703;
public static final int NULL_37704 = 37704;
public static final int NULL_37705 = 37705;
public static final int NULL_37706 = 37706;
public static final int NULL_37707 = 37707;
public static final int NULL_37708 = 37708;
public static final int NULL_37709 = 37709;
public static final int NULL_37710 = 37710;
public static final int NULL_37711 = 37711;
public static final int NULL_37712 = 37712;
public static final int NULL_37713 = 37713;
public static final int NULL_37714 = 37714;
public static final int NULL_37715 = 37715;
public static final int NULL_37716 = 37716;
public static final int NULL_37717 = 37717;
public static final int NULL_37718 = 37718;
public static final int NULL_37719 = 37719;
public static final int NULL_37720 = 37720;
public static final int NULL_37721 = 37721;
public static final int NULL_37722 = 37722;
public static final int NULL_37723 = 37723;
public static final int NULL_37724 = 37724;
public static final int NULL_37732 = 37732;
public static final int NULL_37733 = 37733;
public static final int NULL_37734 = 37734;
public static final int NULL_37735 = 37735;
public static final int NULL_37736 = 37736;
public static final int NULL_37737 = 37737;
public static final int NULL_37746 = 37746;
public static final int NULL_37747 = 37747;
public static final int NULL_37748 = 37748;
public static final int NULL_37749 = 37749;
public static final int NULL_37750 = 37750;
public static final int NULL_37751 = 37751;
public static final int NULL_37752 = 37752;
public static final int NULL_37753 = 37753;
public static final int NULL_37754 = 37754;
public static final int NULL_37755 = 37755;
public static final int NULL_37756 = 37756;
public static final int NULL_37757 = 37757;
public static final int NULL_37758 = 37758;
public static final int NULL_37759 = 37759;
public static final int NULL_37760 = 37760;
public static final int NULL_37761 = 37761;
public static final int NULL_37762 = 37762;
public static final int NULL_37763 = 37763;
public static final int NULL_37764 = 37764;
public static final int NULL_37765 = 37765;
public static final int NULL_37766 = 37766;
public static final int NULL_37767 = 37767;
public static final int NULL_37768 = 37768;
public static final int NULL_37769 = 37769;
public static final int NULL_37770 = 37770;
public static final int NULL_37771 = 37771;
public static final int NULL_37772 = 37772;
public static final int NULL_37773 = 37773;
public static final int NULL_37774 = 37774;
public static final int NULL_37775 = 37775;
public static final int NULL_37776 = 37776;
public static final int NULL_37777 = 37777;
public static final int NULL_37778 = 37778;
public static final int NULL_37779 = 37779;
public static final int NULL_37780 = 37780;
public static final int NULL_37781 = 37781;
public static final int NULL_37782 = 37782;
public static final int NULL_37783 = 37783;
public static final int NULL_37784 = 37784;
public static final int NULL_37785 = 37785;
public static final int NULL_37786 = 37786;
public static final int NULL_37787 = 37787;
public static final int NULL_37788 = 37788;
public static final int NULL_37789 = 37789;
public static final int NULL_37790 = 37790;
public static final int NULL_37791 = 37791;
public static final int NULL_37792 = 37792;
public static final int NULL_37793 = 37793;
public static final int NULL_37794 = 37794;
public static final int NULL_37795 = 37795;
public static final int NULL_37796 = 37796;
public static final int NULL_37797 = 37797;
public static final int NULL_37798 = 37798;
public static final int NULL_37799 = 37799;
public static final int NULL_37800 = 37800;
public static final int NULL_37801 = 37801;
public static final int NULL_37802 = 37802;
public static final int NULL_37803 = 37803;
public static final int NULL_37804 = 37804;
public static final int NULL_37805 = 37805;
public static final int NULL_37806 = 37806;
public static final int NULL_37807 = 37807;
public static final int NULL_37808 = 37808;
public static final int NULL_37809 = 37809;
public static final int NULL_37810 = 37810;
public static final int NULL_37811 = 37811;
public static final int NULL_37812 = 37812;
public static final int NULL_37813 = 37813;
public static final int NULL_37814 = 37814;
public static final int NULL_37815 = 37815;
public static final int NULL_37816 = 37816;
public static final int NULL_37817 = 37817;
public static final int NULL_37820 = 37820;
public static final int NULL_37821 = 37821;
public static final int NULL_37822 = 37822;
public static final int NULL_37837 = 37837;
public static final int NULL_37838 = 37838;
public static final int NULL_37846 = 37846;
public static final int NULL_37847 = 37847;
public static final int NULL_37848 = 37848;
public static final int NULL_37851 = 37851;
public static final int NULL_37854 = 37854;
public static final int NULL_37855 = 37855;
public static final int NULL_37856 = 37856;
public static final int NULL_37857 = 37857;
public static final int NULL_37858 = 37858;
public static final int NULL_37859 = 37859;
public static final int NULL_37860 = 37860;
public static final int NULL_37861 = 37861;
public static final int NULL_37862 = 37862;
public static final int NULL_37863 = 37863;
public static final int NULL_37864 = 37864;
public static final int NULL_37865 = 37865;
public static final int NULL_37867 = 37867;
public static final int NULL_37868 = 37868;
public static final int NULL_37869 = 37869;
public static final int NULL_37870 = 37870;
public static final int NULL_37871 = 37871;
public static final int NULL_37872 = 37872;
public static final int NULL_37873 = 37873;
public static final int NULL_37874 = 37874;
public static final int NULL_37875 = 37875;
public static final int NULL_37876 = 37876;
public static final int NULL_37877 = 37877;
public static final int NULL_37878 = 37878;
public static final int NULL_37879 = 37879;
public static final int NULL_37880 = 37880;
public static final int NULL_37881 = 37881;
public static final int NULL_37883 = 37883;
public static final int NULL_37884 = 37884;
public static final int NULL_37885 = 37885;
public static final int NULL_37886 = 37886;
public static final int NULL_37887 = 37887;
public static final int NULL_37888 = 37888;
public static final int NULL_37889 = 37889;
public static final int NULL_37890 = 37890;
public static final int NULL_37891 = 37891;
public static final int NULL_37892 = 37892;
public static final int NULL_37893 = 37893;
public static final int NULL_37894 = 37894;
public static final int NULL_37895 = 37895;
public static final int NULL_37896 = 37896;
public static final int NULL_37897 = 37897;
public static final int NULL_37898 = 37898;
public static final int NULL_37899 = 37899;
public static final int NULL_37900 = 37900;
public static final int NULL_37901 = 37901;
public static final int NULL_37902 = 37902;
public static final int NULL_37903 = 37903;
public static final int NULL_37904 = 37904;
public static final int NULL_37905 = 37905;
public static final int NULL_37906 = 37906;
public static final int NULL_37907 = 37907;
public static final int NULL_37908 = 37908;
public static final int NULL_37909 = 37909;
public static final int NULL_37910 = 37910;
public static final int NULL_37911 = 37911;
public static final int NULL_37912 = 37912;
public static final int NULL_37913 = 37913;
public static final int NULL_37914 = 37914;
public static final int NULL_37915 = 37915;
public static final int NULL_37916 = 37916;
public static final int NULL_37917 = 37917;
public static final int NULL_37918 = 37918;
public static final int NULL_37919 = 37919;
public static final int NULL_37920 = 37920;
public static final int NULL_37921 = 37921;
public static final int NULL_37922 = 37922;
public static final int NULL_37923 = 37923;
public static final int NULL_37924 = 37924;
public static final int NULL_37925 = 37925;
public static final int NULL_37926 = 37926;
public static final int NULL_37927 = 37927;
public static final int NULL_37928 = 37928;
public static final int NULL_37929 = 37929;
public static final int NULL_37930 = 37930;
public static final int NULL_37931 = 37931;
public static final int NULL_37932 = 37932;
public static final int NULL_37933 = 37933;
public static final int NULL_37934 = 37934;
public static final int NULL_37935 = 37935;
public static final int NULL_37939 = 37939;
public static final int NULL_37940 = 37940;
public static final int NULL_37941 = 37941;
public static final int NULL_37942 = 37942;
public static final int NULL_37943 = 37943;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+56 -4
View File
@@ -16760,7 +16760,7 @@ public final class ObjectID
public static final int ENERGY_SPHERE_31680 = 31680;
public static final int THE_CLOISTER_BELL = 31684;
public static final int THE_CLOISTER_BELL_31685 = 31685;
public static final int THE_GROTESQUE_GUARDIANS_DISPLAY = 31689;
public static final int GROTESQUE_GUARDIANS_DISPLAY = 31689;
public static final int CAVE_31690 = 31690;
public static final int SAND_PILE_31691 = 31691;
public static final int TUNNEL_ENTRANCE_31692 = 31692;
@@ -16912,7 +16912,7 @@ public final class ObjectID
public static final int CERBERUS_DISPLAY_31908 = 31908;
public static final int ABYSSAL_SIRE_DISPLAY_31909 = 31909;
public static final int SKOTIZO_DISPLAY_31910 = 31910;
public static final int THE_GROTESQUE_GUARDIANS_DISPLAY_31911 = 31911;
public static final int THE_GROTESQUE_GUARDIANS_DISPLAY = 31911;
public static final int VORKATH_DISPLAY = 31912;
public static final int ACHIEVEMENT_DIARY_DISPLAY = 31913;
public static final int ACHIEVEMENT_DIARY_DISPLAY_31914 = 31914;
@@ -17290,8 +17290,8 @@ public final class ObjectID
public static final int STONE_TABLET_32634 = 32634;
public static final int CHURCH_ORGAN_32635 = 32635;
public static final int CRATE_32636 = 32636;
public static final int LADDER_32637 = 32637;
public static final int LADDER_32638 = 32638;
public static final int STAIRS_32637 = 32637;
public static final int STAIRS_32638 = 32638;
public static final int LADDER_32639 = 32639;
public static final int LADDER_32640 = 32640;
public static final int TRAPDOOR_32641 = 32641;
@@ -17312,6 +17312,7 @@ public final class ObjectID
public static final int BANK_DEPOSIT_BOX_32665 = 32665;
public static final int BANK_BOOTH_32666 = 32666;
public static final int CLOSED_BANK_BOOTH_32667 = 32667;
public static final int STATUE_32671 = 32671;
public static final int EASEL_32685 = 32685;
public static final int VERZIKS_THRONE = 32686;
public static final int SUPPORTING_PILLAR = 32687;
@@ -19536,5 +19537,56 @@ public final class ObjectID
public static final int WINDOW_SPACE_37619 = 37619;
public static final int SPICE_RACK = 37620;
public static final int SPICE_RACK_37621 = 37621;
public static final int THRONE_37622 = 37622;
public static final int NIGHTMARE_DISPLAY = 37629;
public static final int NIGHTMARE_TOPIARY = 37630;
public static final int SUPPLIES_37631 = 37631;
public static final int POOL_OF_NIGHTMARES = 37725;
public static final int POOL_OF_NIGHTMARES_37726 = 37726;
public static final int POOL_OF_NIGHTMARES_37727 = 37727;
public static final int POOL_OF_NIGHTMARES_37728 = 37728;
public static final int POOL_OF_NIGHTMARES_37729 = 37729;
public static final int ENERGY_BARRIER_37730 = 37730;
public static final int ENERGY_BARRIER_37731 = 37731;
public static final int SPORE = 37738;
public static final int SPORE_37739 = 37739;
public static final int NIGHTMARE_BERRIES = 37740;
public static final int NIGHTMARE_BERRIES_37741 = 37741;
public static final int NIGHTMARE_BERRIES_37742 = 37742;
public static final int NIGHTMARE_BLOSSOM = 37743;
public static final int NIGHTMARE_BLOSSOM_37744 = 37744;
public static final int NIGHTMARE_BLOSSOM_37745 = 37745;
public static final int STATUE_37818 = 37818;
public static final int STATUE_37819 = 37819;
public static final int STATUE_37823 = 37823;
public static final int STATUE_37824 = 37824;
public static final int STONE_POOL = 37825;
public static final int BRAZIER_37826 = 37826;
public static final int CRATE_37827 = 37827;
public static final int TABLE_37828 = 37828;
public static final int TABLE_37829 = 37829;
public static final int TABLE_37830 = 37830;
public static final int STAIRS_37831 = 37831;
public static final int STAIRS_37832 = 37832;
public static final int STAIRS_37833 = 37833;
public static final int CANDLES_37834 = 37834;
public static final int STAIRS_37835 = 37835;
public static final int STAIRS_37836 = 37836;
public static final int TABLE_37839 = 37839;
public static final int BENCH_37840 = 37840;
public static final int BENCH_37841 = 37841;
public static final int STATUE_37842 = 37842;
public static final int STATUE_37843 = 37843;
public static final int CHEST_37844 = 37844;
public static final int BIG_CHEST = 37845;
public static final int COFFIN_37849 = 37849;
public static final int COFFIN_37850 = 37850;
public static final int BROKEN_CHAIN = 37852;
public static final int CHAINS = 37853;
public static final int NIGHTMARE = 37866;
public static final int TOTEM = 37882;
public static final int CRATE_37936 = 37936;
public static final int DOOR_37937 = 37937;
public static final int DOOR_37938 = 37938;
/* This file is automatically generated. Do not edit. */
}
runelite-client/src/main/resources/item_variations.json
+5 -2
View File
@@ -1348,7 +1348,8 @@
23815,
23816,
23817,
24253
24253,
24493
],
"radimus notes": [
714,
@@ -2458,6 +2459,7 @@
22519,
22520,
24367,
24418,
24426
],
"empty cup": [
@@ -2923,7 +2925,8 @@
20282,
23171,
23173,
23417
23417,
24494
],
"challenge scroll": [
2842,