Skip to content

Commit b47a429

Browse files
melxinmelxin
committed
Merge branch 'experimental' into development
2 parents 6a82cc4 + 4851402 commit b47a429

86 files changed

Lines changed: 5102 additions & 2661 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ buildscript {
3737
classpath("org.ajoberstar.grgit:grgit-core:5.2.2")
3838
classpath("com.openosrs:script-assembler-plugin:1.0.3")
3939
classpath("com.openosrs:injector-plugin:2.0.29")
40-
classpath("com.openosrs:interface-parser-plugin:1.0.3")
40+
classpath("com.openosrs:interface-parser-plugin:1.0.4")
4141
}
4242
}
4343

‎buildSrc/src/main/kotlin/Dependencies.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
object ProjectVersions {
2727
const val launcherVersion = "1.0.0"
28-
const val rlVersion = "1.11.7"
28+
const val rlVersion = "1.11.8"
2929

3030
const val openosrsVersion = "4.31.2"
3131

‎runelite-api/src/main/java/net/runelite/api/HitsplatID.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public final class HitsplatID
3232
public static final int DAMAGE_OTHER = 17;
3333
public static final int POISON = 65;
3434
public static final int DISEASE = 4;
35+
public static final int DISEASE_BLOCKED = 3;
3536
public static final int VENOM = 5;
3637
public static final int HEAL = 6;
3738
public static final int CYAN_UP = 11;

‎runelite-api/src/main/java/net/runelite/api/ItemID.java‎

Lines changed: 54 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -881,6 +881,7 @@ public final class ItemID
881881
public static final int DEATH_TALISMAN = 1456;
882882
public static final int LAW_TALISMAN = 1458;
883883
public static final int AUTOWEED = 1459;
884+
public static final int SOUL_TALISMAN = 1460;
884885
public static final int NATURE_TALISMAN = 1462;
885886
public static final int ARCHERY_TICKET = 1464;
886887
public static final int WEAPON_POISON_1465 = 1465;
@@ -14666,23 +14667,62 @@ public final class ItemID
1466614667
public static final int RUNE_POUCH_30692 = 30692;
1466714668
public static final int CASTLE_WARS_ARROW = 30694;
1466814669
public static final int CASTLE_WARS_BOLTS = 30696;
14669-
public static final int FANCY_CARROT = 30706;
14670-
public static final int FANCY_CARROT_JUICE = 30707;
14671-
public static final int CARROT_JUICE_GLASS = 30708;
14672-
public static final int RECIPE_FOR_EASTER_BUNS = 30709;
14673-
public static final int EASTER_SPICES = 30710;
14674-
public static final int RAISINS = 30711;
14675-
public static final int YEASTIER_DOUGH = 30712;
14676-
public static final int SPECIAL_EGG = 30713;
14677-
public static final int UNCOOKED_EASTER_BUN = 30714;
14678-
public static final int EASTER_BUN = 30715;
14679-
public static final int GRAPES_30716 = 30716;
14680-
public static final int RAISINS_30717 = 30717;
14681-
public static final int JUMBLED_SCRIPT = 30718;
14682-
public static final int JUMBLED_SCRIPT_30719 = 30719;
1468314670
public static final int CARROT_COSTUME_HAT = 30720;
1468414671
public static final int CARROT_COSTUME_BODY = 30722;
1468514672
public static final int CARROT_COSTUME_TIGHTS = 30724;
1468614673
public static final int CARROT_COSTUME_GLOVES = 30726;
14674+
public static final int OATHPLATE_ARMOUR_SET = 30744;
14675+
public static final int DEMON_DUNG = 30747;
14676+
public static final int OATHPLATE_HELM = 30750;
14677+
public static final int OATHPLATE_CHEST = 30753;
14678+
public static final int OATHPLATE_LEGS = 30756;
14679+
public static final int SOULFLAME_HORN = 30759;
14680+
public static final int FORGOTTEN_LOCKBOX = 30763;
14681+
public static final int OATHPLATE_SHARDS = 30765;
14682+
public static final int AETHER_CATALYST = 30771;
14683+
public static final int DIABOLIC_WORMS = 30773;
14684+
public static final int CHASM_TELEPORT_SCROLL = 30775;
14685+
public static final int RADIANT_OATHPLATE_HELM = 30777;
14686+
public static final int RADIANT_OATHPLATE_CHEST = 30779;
14687+
public static final int RADIANT_OATHPLATE_LEGS = 30781;
14688+
public static final int PURIFYING_SIGIL_LEFT = 30783;
14689+
public static final int PURIFYING_SIGIL_RIGHT = 30785;
14690+
public static final int PURIFYING_SIGIL_MIDDLE = 30787;
14691+
public static final int PURIFYING_SIGIL_TOP = 30789;
14692+
public static final int PURIFYING_SIGIL_BOTTOM = 30791;
14693+
public static final int PURIFYING_SIGIL = 30793;
14694+
public static final int BARREL_OF_DEMONIC_TALLOW_FULL = 30795;
14695+
public static final int BARREL_OF_DEMONIC_TALLOW = 30798;
14696+
public static final int DEMONIC_TALLOW = 30800;
14697+
public static final int DOSSIER_30803 = 30803;
14698+
public static final int DOSSIER_30805 = 30805;
14699+
public static final int RITE_OF_VILE_TRANSFERENCE = 30806;
14700+
public static final int JIMS_WET_CLOTH = 30808;
14701+
public static final int CONTRACT_OF_GLYPHIC_ATTENUATION = 30810;
14702+
public static final int CONTRACT_OF_SENSORY_CLOUDING = 30813;
14703+
public static final int CONTRACT_OF_BLOODIED_BLOWS = 30816;
14704+
public static final int CONTRACT_OF_DIVINE_SEVERANCE = 30819;
14705+
public static final int CONTRACT_OF_FORFEIT_BREATH = 30822;
14706+
public static final int CONTRACT_OF_OATHPLATE_ACQUISITION = 30825;
14707+
public static final int CONTRACT_OF_SHARD_ACQUISITION = 30828;
14708+
public static final int CONTRACT_OF_CATALYST_ACQUISITION = 30831;
14709+
public static final int CONTRACT_OF_WORM_ACQUISITION = 30834;
14710+
public static final int CONTRACT_OF_HARMONY_ACQUISITION = 30837;
14711+
public static final int CONTRACT_OF_FAMILIAR_ACQUISITION = 30840;
14712+
public static final int AETHER_RUNE = 30843;
14713+
public static final int INFERNAL_SHALE = 30846;
14714+
public static final int CRUSHED_INFERNAL_SHALE = 30848;
14715+
public static final int INFERNAL_BLEND = 30854;
14716+
public static final int MALFORMED_INFERNAL_BLEND = 30856;
14717+
public static final int INFERNAL_NUGGET = 30858;
14718+
public static final int COOLED_INFERNAL_CHUNK = 30860;
14719+
public static final int INFERNAL_CHUNK = 30862;
14720+
public static final int INFERNAL_PLATE = 30864;
14721+
public static final int SURGE_POTION4 = 30875;
14722+
public static final int SURGE_POTION3 = 30878;
14723+
public static final int SURGE_POTION2 = 30881;
14724+
public static final int SURGE_POTION1 = 30884;
14725+
public static final int POLYCATALYTIC_GUARDIAN_STONE = 30887;
14726+
public static final int YAMI = 30888;
1468714727
/* This file is automatically generated. Do not edit. */
1468814728
}

‎runelite-api/src/main/java/net/runelite/api/NpcID.java‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ public final class NpcID
126126
public static final int IGNATIUS_VULCAN = 118;
127127
public static final int AGGIE = 120;
128128
public static final int AGGIE_121 = 121;
129+
public static final int YAMA = 124;
129130
public static final int LEFT_HEAD = 125;
130131
public static final int MIDDLE_HEAD = 126;
131132
public static final int RIGHT_HEAD = 127;
@@ -6857,9 +6858,7 @@ public final class NpcID
68576858
public static final int BANISOCH = 7665;
68586859
public static final int BANISOCH_7666 = 7666;
68596860
public static final int HIEVE = 7667;
6860-
public static final int VOICE_OF_YAMA = 7668;
6861-
public static final int DISCIPLE_OF_YAMA = 7669;
6862-
public static final int DISCIPLE_OF_YAMA_7670 = 7670;
6861+
public static final int DISCIPLE_OF_YAMA = 7670;
68636862
public static final int SKOTOS_7671 = 7671;
68646863
public static final int EVE = 7672;
68656864
public static final int SOLZTUN = 7673;
@@ -11883,6 +11882,7 @@ public final class NpcID
1188311882
public static final int ICICLES = 14153;
1188411883
public static final int PIRATE_14155 = 14155;
1188511884
public static final int PIRATE_14156 = 14156;
11885+
public static final int YAMAS_THRONE = 14157;
1188611886
public static final int CRAWLING_HAND_14158 = 14158;
1188711887
public static final int CRAWLING_HAND_14159 = 14159;
1188811888
public static final int CRAWLING_HAND_14160 = 14160;
@@ -11901,30 +11901,26 @@ public final class NpcID
1190111901
public static final int KURASK_14173 = 14173;
1190211902
public static final int ABYSSAL_DEMON_14174 = 14174;
1190311903
public static final int ABYSSAL_DEMON_14175 = 14175;
11904+
public static final int YAMA_14176 = 14176;
1190411905
public static final int ZOMBIE_PIRATE_14177 = 14177;
1190511906
public static final int ZOMBIE_PIRATE_14178 = 14178;
11906-
public static final int CONCERNED_MAN = 14179;
11907-
public static final int EASTER_BUNNY = 14180;
11908-
public static final int GLANTON = 14181;
11909-
public static final int GLANTON_14182 = 14182;
11910-
public static final int RINDER = 14183;
11911-
public static final int RINDER_14184 = 14184;
11912-
public static final int COOKY_WEASEL = 14185;
11913-
public static final int WHEELER = 14186;
11914-
public static final int EGGUS_MANUS = 14187;
11915-
public static final int BOWLEY_MOLEY = 14188;
11916-
public static final int FRY = 14189;
11917-
public static final int SCORPION_14190 = 14190;
11918-
public static final int BOWLEY_MOLEY_14191 = 14191;
11919-
public static final int EASTER_BUNNY_14192 = 14192;
11920-
public static final int EGGUS_MANUS_14193 = 14193;
11921-
public static final int FRY_14194 = 14194;
11922-
public static final int CLARENCE = 14201;
11923-
public static final int THE_MOUTH_OF_CLARENCE = 14202;
11924-
public static final int DOUGHPHIE = 14203;
11925-
public static final int EGGUS_MANUS_14205 = 14205;
11926-
public static final int GLANTON_14206 = 14206;
11927-
public static final int RINDER_14207 = 14207;
11928-
public static final int BELLA_LE_BOWLE = 14208;
11907+
public static final int VOID_FLARE = 14179;
11908+
public static final int JUDGE_OF_YAMA_14180 = 14180;
11909+
public static final int IMP_14181 = 14181;
11910+
public static final int VOICE_OF_YAMA = 14183;
11911+
public static final int VOICE_OF_YAMA_14184 = 14184;
11912+
public static final int VOICE_OF_YAMA_14185 = 14185;
11913+
public static final int DISCIPLE_OF_YAMA_14186 = 14186;
11914+
public static final int DISCIPLE_OF_YAMA_14187 = 14187;
11915+
public static final int SOLDIER_14189 = 14189;
11916+
public static final int SOLDIER_14191 = 14191;
11917+
public static final int SOLDIER_14193 = 14193;
11918+
public static final int LIEUTENANT = 14195;
11919+
public static final int SERGEANT_14197 = 14197;
11920+
public static final int IMP_14200 = 14200;
11921+
public static final int JIM = 14201;
11922+
public static final int JIM_14202 = 14202;
11923+
public static final int YAMI = 14203;
11924+
public static final int YAMI_14204 = 14204;
1192911925
/* This file is automatically generated. Do not edit. */
1193011926
}

‎runelite-api/src/main/java/net/runelite/api/NullItemID.java‎

Lines changed: 122 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,6 @@ public final class NullItemID
595595
public static final int NULL_1453 = 1453;
596596
public static final int NULL_1455 = 1455;
597597
public static final int NULL_1457 = 1457;
598-
public static final int NULL_1460 = 1460;
599598
public static final int NULL_1461 = 1461;
600599
public static final int NULL_1463 = 1463;
601600
public static final int NULL_1471 = 1471;
@@ -15839,9 +15838,131 @@ public final class NullItemID
1583915838
public static final int NULL_30703 = 30703;
1584015839
public static final int NULL_30704 = 30704;
1584115840
public static final int NULL_30705 = 30705;
15841+
public static final int NULL_30706 = 30706;
15842+
public static final int NULL_30707 = 30707;
15843+
public static final int NULL_30708 = 30708;
15844+
public static final int NULL_30709 = 30709;
15845+
public static final int NULL_30710 = 30710;
15846+
public static final int NULL_30711 = 30711;
15847+
public static final int NULL_30712 = 30712;
15848+
public static final int NULL_30713 = 30713;
15849+
public static final int NULL_30714 = 30714;
15850+
public static final int NULL_30715 = 30715;
15851+
public static final int NULL_30716 = 30716;
15852+
public static final int NULL_30717 = 30717;
15853+
public static final int NULL_30718 = 30718;
15854+
public static final int NULL_30719 = 30719;
1584215855
public static final int NULL_30721 = 30721;
1584315856
public static final int NULL_30723 = 30723;
1584415857
public static final int NULL_30725 = 30725;
1584515858
public static final int NULL_30727 = 30727;
15859+
public static final int NULL_30728 = 30728;
15860+
public static final int NULL_30729 = 30729;
15861+
public static final int NULL_30730 = 30730;
15862+
public static final int NULL_30731 = 30731;
15863+
public static final int NULL_30732 = 30732;
15864+
public static final int NULL_30733 = 30733;
15865+
public static final int NULL_30734 = 30734;
15866+
public static final int NULL_30735 = 30735;
15867+
public static final int NULL_30736 = 30736;
15868+
public static final int NULL_30737 = 30737;
15869+
public static final int NULL_30738 = 30738;
15870+
public static final int NULL_30739 = 30739;
15871+
public static final int NULL_30740 = 30740;
15872+
public static final int NULL_30741 = 30741;
15873+
public static final int NULL_30742 = 30742;
15874+
public static final int NULL_30743 = 30743;
15875+
public static final int NULL_30745 = 30745;
15876+
public static final int NULL_30746 = 30746;
15877+
public static final int NULL_30748 = 30748;
15878+
public static final int NULL_30749 = 30749;
15879+
public static final int NULL_30751 = 30751;
15880+
public static final int NULL_30752 = 30752;
15881+
public static final int NULL_30754 = 30754;
15882+
public static final int NULL_30755 = 30755;
15883+
public static final int NULL_30757 = 30757;
15884+
public static final int NULL_30758 = 30758;
15885+
public static final int NULL_30760 = 30760;
15886+
public static final int NULL_30761 = 30761;
15887+
public static final int NULL_30762 = 30762;
15888+
public static final int NULL_30764 = 30764;
15889+
public static final int NULL_30766 = 30766;
15890+
public static final int NULL_30767 = 30767;
15891+
public static final int NULL_30768 = 30768;
15892+
public static final int NULL_30769 = 30769;
15893+
public static final int NULL_30770 = 30770;
15894+
public static final int NULL_30772 = 30772;
15895+
public static final int NULL_30774 = 30774;
15896+
public static final int NULL_30776 = 30776;
15897+
public static final int NULL_30778 = 30778;
15898+
public static final int NULL_30780 = 30780;
15899+
public static final int NULL_30782 = 30782;
15900+
public static final int NULL_30784 = 30784;
15901+
public static final int NULL_30786 = 30786;
15902+
public static final int NULL_30788 = 30788;
15903+
public static final int NULL_30790 = 30790;
15904+
public static final int NULL_30792 = 30792;
15905+
public static final int NULL_30794 = 30794;
15906+
public static final int NULL_30796 = 30796;
15907+
public static final int NULL_30797 = 30797;
15908+
public static final int NULL_30799 = 30799;
15909+
public static final int NULL_30801 = 30801;
15910+
public static final int NULL_30802 = 30802;
15911+
public static final int NULL_30804 = 30804;
15912+
public static final int NULL_30807 = 30807;
15913+
public static final int NULL_30809 = 30809;
15914+
public static final int NULL_30811 = 30811;
15915+
public static final int NULL_30812 = 30812;
15916+
public static final int NULL_30814 = 30814;
15917+
public static final int NULL_30815 = 30815;
15918+
public static final int NULL_30817 = 30817;
15919+
public static final int NULL_30818 = 30818;
15920+
public static final int NULL_30820 = 30820;
15921+
public static final int NULL_30821 = 30821;
15922+
public static final int NULL_30823 = 30823;
15923+
public static final int NULL_30824 = 30824;
15924+
public static final int NULL_30826 = 30826;
15925+
public static final int NULL_30827 = 30827;
15926+
public static final int NULL_30829 = 30829;
15927+
public static final int NULL_30830 = 30830;
15928+
public static final int NULL_30832 = 30832;
15929+
public static final int NULL_30833 = 30833;
15930+
public static final int NULL_30835 = 30835;
15931+
public static final int NULL_30836 = 30836;
15932+
public static final int NULL_30838 = 30838;
15933+
public static final int NULL_30839 = 30839;
15934+
public static final int NULL_30841 = 30841;
15935+
public static final int NULL_30842 = 30842;
15936+
public static final int NULL_30844 = 30844;
15937+
public static final int NULL_30845 = 30845;
15938+
public static final int NULL_30847 = 30847;
15939+
public static final int NULL_30849 = 30849;
15940+
public static final int NULL_30850 = 30850;
15941+
public static final int NULL_30851 = 30851;
15942+
public static final int NULL_30852 = 30852;
15943+
public static final int NULL_30853 = 30853;
15944+
public static final int NULL_30855 = 30855;
15945+
public static final int NULL_30857 = 30857;
15946+
public static final int NULL_30859 = 30859;
15947+
public static final int NULL_30861 = 30861;
15948+
public static final int NULL_30863 = 30863;
15949+
public static final int NULL_30865 = 30865;
15950+
public static final int NULL_30866 = 30866;
15951+
public static final int NULL_30867 = 30867;
15952+
public static final int NULL_30868 = 30868;
15953+
public static final int NULL_30869 = 30869;
15954+
public static final int NULL_30870 = 30870;
15955+
public static final int NULL_30871 = 30871;
15956+
public static final int NULL_30873 = 30873;
15957+
public static final int NULL_30874 = 30874;
15958+
public static final int NULL_30876 = 30876;
15959+
public static final int NULL_30877 = 30877;
15960+
public static final int NULL_30879 = 30879;
15961+
public static final int NULL_30880 = 30880;
15962+
public static final int NULL_30882 = 30882;
15963+
public static final int NULL_30883 = 30883;
15964+
public static final int NULL_30885 = 30885;
15965+
public static final int NULL_30886 = 30886;
15966+
public static final int NULL_30889 = 30889;
1584615967
/* This file is automatically generated. Do not edit. */
1584715968
}

‎runelite-api/src/main/java/net/runelite/api/NullNpcID.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public final class NullNpcID
1313
public static final int NULL_25 = 25;
1414
public static final int NULL_119 = 119;
1515
public static final int NULL_122 = 122;
16+
public static final int NULL_123 = 123;
1617
public static final int NULL_222 = 222;
1718
public static final int NULL_224 = 224;
1819
public static final int NULL_226 = 226;
@@ -804,6 +805,8 @@ public final class NullNpcID
804805
public static final int NULL_7634 = 7634;
805806
public static final int NULL_7639 = 7639;
806807
public static final int NULL_7655 = 7655;
808+
public static final int NULL_7668 = 7668;
809+
public static final int NULL_7669 = 7669;
807810
public static final int NULL_7690 = 7690;
808811
public static final int NULL_7735 = 7735;
809812
public static final int NULL_7767 = 7767;
@@ -2262,12 +2265,13 @@ public final class NullNpcID
22622265
public static final int NULL_14134 = 14134;
22632266
public static final int NULL_14142 = 14142;
22642267
public static final int NULL_14143 = 14143;
2265-
public static final int NULL_14195 = 14195;
2268+
public static final int NULL_14182 = 14182;
2269+
public static final int NULL_14188 = 14188;
2270+
public static final int NULL_14190 = 14190;
2271+
public static final int NULL_14192 = 14192;
2272+
public static final int NULL_14194 = 14194;
22662273
public static final int NULL_14196 = 14196;
2267-
public static final int NULL_14197 = 14197;
22682274
public static final int NULL_14198 = 14198;
22692275
public static final int NULL_14199 = 14199;
2270-
public static final int NULL_14200 = 14200;
2271-
public static final int NULL_14204 = 14204;
22722276
/* This file is automatically generated. Do not edit. */
22732277
}

0 commit comments

Comments
 (0)