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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2021-06-03 16:07:35 +02:00
parent 5410da4bd9 614649281b
commit 2f425a9d6d
14 changed files with 884 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/ItemID.java
+17
View File
@@ -11878,5 +11878,22 @@ public final class ItemID
public static final int CLAN_VEXILLUM_25727 = 25727;
public static final int CLAN_VEXILLUM_25728 = 25728;
public static final int CLAN_VEXILLUM_25729 = 25729;
public static final int BANDAGES_25730 = 25730;
public static final int HOLY_SANGUINESTI_STAFF = 25731;
public static final int HOLY_SANGUINESTI_STAFF_UNCHARGED = 25733;
public static final int HOLY_GHRAZI_RAPIER = 25734;
public static final int HOLY_SCYTHE_OF_VITUR = 25736;
public static final int HOLY_SCYTHE_OF_VITUR_UNCHARGED = 25738;
public static final int SANGUINE_SCYTHE_OF_VITUR = 25739;
public static final int SANGUINE_SCYTHE_OF_VITUR_UNCHARGED = 25741;
public static final int HOLY_ORNAMENT_KIT = 25742;
public static final int SANGUINE_ORNAMENT_KIT = 25744;
public static final int SANGUINE_DUST = 25746;
public static final int LIL_MAIDEN = 25748;
public static final int LIL_BLOAT = 25749;
public static final int LIL_NYLO = 25750;
public static final int LIL_SOT = 25751;
public static final int LIL_XARP = 25752;
public static final int ANTIQUE_LAMP_25753 = 25753;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+111 -1
View File
@@ -7481,7 +7481,6 @@ public final class NpcID
public static final int BANKER_8322 = 8322;
public static final int VYRE_ORATOR = 8323;
public static final int VYRE_ORATOR_8324 = 8324;
public static final int MYSTERIOUS_STRANGER_8325 = 8325;
public static final int VAMPYRE_JUVENILE_8326 = 8326;
public static final int VAMPYRE_JUVENILE_8327 = 8327;
public static final int MEIYERDITCH_CITIZEN_8328 = 8328;
@@ -9095,5 +9094,116 @@ public final class NpcID
public static final int GARDENER_JAY_JR_10758 = 10758;
public static final int CLERK_10759 = 10759;
public static final int STRAY_DOG_10760 = 10760;
public static final int LIL_MAIDEN = 10761;
public static final int LIL_BLOAT = 10762;
public static final int LIL_NYLO = 10763;
public static final int LIL_SOT = 10764;
public static final int LIL_XARP = 10765;
public static final int XARPUS_10766 = 10766;
public static final int XARPUS_10767 = 10767;
public static final int XARPUS_10768 = 10768;
public static final int XARPUS_10769 = 10769;
public static final int XARPUS_10770 = 10770;
public static final int XARPUS_10771 = 10771;
public static final int XARPUS_10772 = 10772;
public static final int XARPUS_10773 = 10773;
public static final int NYLOCAS_ISCHYROS_10774 = 10774;
public static final int NYLOCAS_TOXOBOLOS_10775 = 10775;
public static final int NYLOCAS_HAGIOS_10776 = 10776;
public static final int NYLOCAS_ISCHYROS_10777 = 10777;
public static final int NYLOCAS_TOXOBOLOS_10778 = 10778;
public static final int NYLOCAS_HAGIOS_10779 = 10779;
public static final int NYLOCAS_ISCHYROS_10780 = 10780;
public static final int NYLOCAS_TOXOBOLOS_10781 = 10781;
public static final int NYLOCAS_HAGIOS_10782 = 10782;
public static final int NYLOCAS_ISCHYROS_10783 = 10783;
public static final int NYLOCAS_TOXOBOLOS_10784 = 10784;
public static final int NYLOCAS_HAGIOS_10785 = 10785;
public static final int NYLOCAS_VASILIAS_10786 = 10786;
public static final int NYLOCAS_VASILIAS_10787 = 10787;
public static final int NYLOCAS_VASILIAS_10788 = 10788;
public static final int NYLOCAS_VASILIAS_10789 = 10789;
public static final int NYLOCAS_ISCHYROS_10791 = 10791;
public static final int NYLOCAS_TOXOBOLOS_10792 = 10792;
public static final int NYLOCAS_HAGIOS_10793 = 10793;
public static final int NYLOCAS_ISCHYROS_10794 = 10794;
public static final int NYLOCAS_TOXOBOLOS_10795 = 10795;
public static final int NYLOCAS_HAGIOS_10796 = 10796;
public static final int NYLOCAS_ISCHYROS_10797 = 10797;
public static final int NYLOCAS_TOXOBOLOS_10798 = 10798;
public static final int NYLOCAS_HAGIOS_10799 = 10799;
public static final int NYLOCAS_ISCHYROS_10800 = 10800;
public static final int NYLOCAS_TOXOBOLOS_10801 = 10801;
public static final int NYLOCAS_HAGIOS_10802 = 10802;
public static final int NYLOCAS_PRINKIPAS = 10803;
public static final int NYLOCAS_PRINKIPAS_10804 = 10804;
public static final int NYLOCAS_PRINKIPAS_10805 = 10805;
public static final int NYLOCAS_PRINKIPAS_10806 = 10806;
public static final int NYLOCAS_VASILIAS_10807 = 10807;
public static final int NYLOCAS_VASILIAS_10808 = 10808;
public static final int NYLOCAS_VASILIAS_10809 = 10809;
public static final int NYLOCAS_VASILIAS_10810 = 10810;
public static final int PESTILENT_BLOAT_10812 = 10812;
public static final int PESTILENT_BLOAT_10813 = 10813;
public static final int THE_MAIDEN_OF_SUGADINTI_10814 = 10814;
public static final int THE_MAIDEN_OF_SUGADINTI_10815 = 10815;
public static final int THE_MAIDEN_OF_SUGADINTI_10816 = 10816;
public static final int THE_MAIDEN_OF_SUGADINTI_10817 = 10817;
public static final int THE_MAIDEN_OF_SUGADINTI_10818 = 10818;
public static final int THE_MAIDEN_OF_SUGADINTI_10819 = 10819;
public static final int NYLOCAS_MATOMENOS_10820 = 10820;
public static final int BLOOD_SPAWN_10821 = 10821;
public static final int THE_MAIDEN_OF_SUGADINTI_10822 = 10822;
public static final int THE_MAIDEN_OF_SUGADINTI_10823 = 10823;
public static final int THE_MAIDEN_OF_SUGADINTI_10824 = 10824;
public static final int THE_MAIDEN_OF_SUGADINTI_10825 = 10825;
public static final int THE_MAIDEN_OF_SUGADINTI_10826 = 10826;
public static final int THE_MAIDEN_OF_SUGADINTI_10827 = 10827;
public static final int NYLOCAS_MATOMENOS_10828 = 10828;
public static final int BLOOD_SPAWN_10829 = 10829;
public static final int VERZIK_VITUR_10830 = 10830;
public static final int VERZIK_VITUR_10831 = 10831;
public static final int VERZIK_VITUR_10832 = 10832;
public static final int VERZIK_VITUR_10833 = 10833;
public static final int VERZIK_VITUR_10834 = 10834;
public static final int VERZIK_VITUR_10835 = 10835;
public static final int VERZIK_VITUR_10836 = 10836;
public static final int WEB_10837 = 10837;
public static final int COLLAPSING_PILLAR_10838 = 10838;
public static final int COLLAPSING_PILLAR_10839 = 10839;
public static final int SUPPORTING_PILLAR_10840 = 10840;
public static final int NYLOCAS_ISCHYROS_10841 = 10841;
public static final int NYLOCAS_TOXOBOLOS_10842 = 10842;
public static final int NYLOCAS_HAGIOS_10843 = 10843;
public static final int NYLOCAS_ATHANATOS_10844 = 10844;
public static final int NYLOCAS_MATOMENOS_10845 = 10845;
public static final int VERZIK_VITUR_10847 = 10847;
public static final int VERZIK_VITUR_10848 = 10848;
public static final int VERZIK_VITUR_10849 = 10849;
public static final int VERZIK_VITUR_10850 = 10850;
public static final int VERZIK_VITUR_10851 = 10851;
public static final int VERZIK_VITUR_10852 = 10852;
public static final int VERZIK_VITUR_10853 = 10853;
public static final int WEB_10854 = 10854;
public static final int COLLAPSING_PILLAR_10855 = 10855;
public static final int COLLAPSING_PILLAR_10856 = 10856;
public static final int SUPPORTING_PILLAR_10857 = 10857;
public static final int NYLOCAS_ISCHYROS_10858 = 10858;
public static final int NYLOCAS_TOXOBOLOS_10859 = 10859;
public static final int NYLOCAS_HAGIOS_10860 = 10860;
public static final int NYLOCAS_ATHANATOS_10861 = 10861;
public static final int NYLOCAS_MATOMENOS_10862 = 10862;
public static final int SOTETSEG_10864 = 10864;
public static final int SOTETSEG_10865 = 10865;
public static final int SOTETSEG_10867 = 10867;
public static final int SOTETSEG_10868 = 10868;
public static final int LIL_MAIDEN_10870 = 10870;
public static final int LIL_BLOAT_10871 = 10871;
public static final int LIL_NYLO_10872 = 10872;
public static final int LIL_SOT_10873 = 10873;
public static final int LIL_XARP_10874 = 10874;
public static final int MYSTERIOUS_STRANGER_10875 = 10875;
public static final int MYSTERIOUS_STRANGER_10876 = 10876;
public static final int MYSTERIOUS_STRANGER_10877 = 10877;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+7
View File
@@ -13641,5 +13641,12 @@ public final class NullItemID
public static final int NULL_25709 = 25709;
public static final int NULL_25713 = 25713;
public static final int NULL_25722 = 25722;
public static final int NULL_25732 = 25732;
public static final int NULL_25735 = 25735;
public static final int NULL_25737 = 25737;
public static final int NULL_25740 = 25740;
public static final int NULL_25743 = 25743;
public static final int NULL_25745 = 25745;
public static final int NULL_25747 = 25747;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullNpcID.java
+7
View File
@@ -828,6 +828,7 @@ public final class NullNpcID
public static final int NULL_8317 = 8317;
public static final int NULL_8318 = 8318;
public static final int NULL_8319 = 8319;
public static final int NULL_8325 = 8325;
public static final int NULL_8358 = 8358;
public static final int NULL_8380 = 8380;
public static final int NULL_8386 = 8386;
@@ -1649,5 +1650,11 @@ public final class NullNpcID
public static final int NULL_10713 = 10713;
public static final int NULL_10738 = 10738;
public static final int NULL_10747 = 10747;
public static final int NULL_10790 = 10790;
public static final int NULL_10811 = 10811;
public static final int NULL_10846 = 10846;
public static final int NULL_10863 = 10863;
public static final int NULL_10866 = 10866;
public static final int NULL_10869 = 10869;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+5
View File
@@ -20360,5 +20360,10 @@ public final class NullObjectID
public static final int NULL_41740 = 41740;
public static final int NULL_41741 = 41741;
public static final int NULL_41742 = 41742;
public static final int NULL_41743 = 41743;
public static final int NULL_41750 = 41750;
public static final int NULL_41751 = 41751;
public static final int NULL_41752 = 41752;
public static final int NULL_41753 = 41753;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+6
View File
@@ -21368,5 +21368,11 @@ public final class ObjectID
public static final int CLAN_RECRUITMENT_BOARD_41730 = 41730;
public static final int STOOL_41733 = 41733;
public static final int WOODEN_BENCH_41734 = 41734;
public static final int REWARDS_CHEST_41744 = 41744;
public static final int REWARDS_CHEST_41745 = 41745;
public static final int MONUMENTAL_CHEST_41746 = 41746;
public static final int ACID_POOL_41747 = 41747;
public static final int TILE_41748 = 41748;
public static final int TILE_41749 = 41749;
/* This file is automatically generated. Do not edit. */
}