Skip to content
Merged

2.0.42 #1609

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cache/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.12.4</version>
<version>1.12.5</version>
</parent>

<artifactId>cache</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.12.4</version>
<version>1.12.5</version>
<packaging>pom</packaging>

<name>RuneLite</name>
Expand Down
2 changes: 1 addition & 1 deletion runelite-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.12.4</version>
<version>1.12.5</version>
</parent>

<artifactId>runelite-api</artifactId>
Expand Down
5 changes: 3 additions & 2 deletions runelite-api/src/main/java/net/runelite/api/ItemID.java
Original file line number Diff line number Diff line change
Expand Up @@ -15001,8 +15001,8 @@ public final class ItemID
public static final int CAMPHOR_PLANK = 31432;
public static final int IRONWOOD_PLANK = 31435;
public static final int ROSEWOOD_PLANK = 31438;
public static final int TELEPORT_BOAT_TO_ME = 31441;
public static final int TELEPORT_ME_TO_BOAT = 31443;
public static final int SUMMON_BOAT = 31441;
public static final int TELEPORT_TO_BOAT = 31443;
public static final int MOUNTED_GIANT_BLUE_KRILL_31445 = 31445;
public static final int MOUNTED_GIANT_BLUE_KRILL_31446 = 31446;
public static final int MOUNTED_GOLDEN_HADDOCK_31447 = 31447;
Expand Down Expand Up @@ -16017,5 +16017,6 @@ public final class ItemID
public static final int CAMPHOR_LOGS = 32904;
public static final int IRONWOOD_LOGS = 32907;
public static final int ROSEWOOD_LOGS = 32910;
public static final int JAR_OF_FEATHERS = 32921;
/* This file is automatically generated. Do not edit. */
}
39 changes: 24 additions & 15 deletions runelite-api/src/main/java/net/runelite/api/NpcID.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public final class NpcID
public static final int ABERRANT_SPECTRE_6 = 6;
public static final int ABERRANT_SPECTRE_7 = 7;
public static final int NECHRYAEL = 8;
public static final int SKYLARK = 9;
public static final int DEATH_SPAWN = 10;
public static final int NECHRYAEL_11 = 11;
public static final int HUDO = 12;
Expand Down Expand Up @@ -282,6 +283,9 @@ public final class NpcID
public static final int PELICAN = 283;
public static final int GULL_284 = 284;
public static final int GULL_285 = 285;
public static final int EAGLE = 286;
public static final int MERCENARY = 287;
public static final int CHARTIN_CHARLES_MCATLESS = 288;
public static final int GHOUL = 289;
public static final int DWARF = 290;
public static final int CHAOS_DWARF = 291;
Expand Down Expand Up @@ -1381,7 +1385,7 @@ public final class NpcID
public static final int DESERT_EAGLE = 1487;
public static final int JUNGLE_EAGLE = 1488;
public static final int POLAR_EAGLE = 1489;
public static final int EAGLE = 1490;
public static final int EAGLE_1490 = 1490;
public static final int KEBBIT = 1494;
public static final int CHARLIE_1495 = 1495;
public static final int BOULDER = 1496;
Expand Down Expand Up @@ -1442,6 +1446,8 @@ public final class NpcID
public static final int GUARD_1551 = 1551;
public static final int GUARD_1552 = 1552;
public static final int CRAB_1553 = 1553;
public static final int CHARTIN_CHARLES_MCATLESS_1554 = 1554;
public static final int LUKE = 1555;
public static final int FIRE_WIZARD = 1556;
public static final int WATER_WIZARD = 1557;
public static final int EARTH_WIZARD = 1558;
Expand Down Expand Up @@ -3637,6 +3643,10 @@ public final class NpcID
public static final int FOX = 3901;
public static final int BUNNY = 3902;
public static final int BUNNY_3903 = 3903;
public static final int SHIPYARD_WORKER_3904 = 3904;
public static final int SHIPYARD_WORKER_3905 = 3905;
public static final int SHIPYARD_ENGINEER = 3906;
public static final int JOE_3907 = 3907;
public static final int BEAR_CUB = 3908;
public static final int BEAR_CUB_3909 = 3909;
public static final int UNICORN_FOAL = 3910;
Expand Down Expand Up @@ -3982,6 +3992,8 @@ public final class NpcID
public static final int OSMAN_4286 = 4286;
public static final int BORDER_GUARD = 4287;
public static final int BORDER_GUARD_4288 = 4288;
public static final int JOE_4289 = 4289;
public static final int CAT_4290 = 4290;
public static final int HERMAN_CARANOS = 4291;
public static final int FRANKLIN_CARANOS = 4292;
public static final int ARNOLD_LYDSPOR = 4293;
Expand Down Expand Up @@ -4307,7 +4319,7 @@ public final class NpcID
public static final int MINE_CART_DRIVER = 4653;
public static final int ROWDY_GUARD = 4654;
public static final int BEDABIN_NOMAD_FIGHTER = 4655;
public static final int MERCENARY = 4656;
public static final int MERCENARY_4656 = 4656;
public static final int MERCENARY_4657 = 4657;
public static final int MERCENARY_4658 = 4658;
public static final int MERCENARY_4659 = 4659;
Expand Down Expand Up @@ -4380,6 +4392,8 @@ public final class NpcID
public static final int MOE = 4726;
public static final int LARRY_4727 = 4727;
public static final int THURGO = 4733;
public static final int JOINTCHIEF_MOUSER_TO_THE_SHIPYARD_OFFICE = 4734;
public static final int JOINTCHIEF_MOUSER_TO_THE_SHIPYARD_OFFICE_4735 = 4735;
public static final int SIR_VYVIN = 4736;
public static final int SQUIRE_4737 = 4737;
public static final int GENIE_4738 = 4738;
Expand Down Expand Up @@ -12342,6 +12356,13 @@ public final class NpcID
public static final int THE_SAGE_14799 = 14799;
public static final int NEVET = 14801;
public static final int NEVET_14802 = 14802;
public static final int SPOTTED_RAE = 14807;
public static final int DUCK_14808 = 14808;
public static final int GECKO = 14809;
public static final int GRUB = 14810;
public static final int RUSTY_CHEST = 14811;
public static final int TARNISHED_CHEST = 14812;
public static final int RUSTY_CHEST_14813 = 14813;
public static final int SPOOKY_CHAIR = 14815;
public static final int MAKO = 14816;
public static final int MORA = 14817;
Expand Down Expand Up @@ -12384,8 +12405,6 @@ public final class NpcID
public static final int SHELLBANE_GRYPHON = 14860;
public static final int ELDER_KELMO = 14861;
public static final int ELDER_NAMA = 14863;
public static final int GULL_14864 = 14864;
public static final int GULL_14865 = 14865;
public static final int HENDERSON = 14866;
public static final int ONE_EYED_ROSALEE = 14867;
public static final int CAPTAIN_DAWSON = 14868;
Expand Down Expand Up @@ -12630,7 +12649,6 @@ public final class NpcID
public static final int CASTAWAY_15148 = 15148;
public static final int CASTAWAY_15149 = 15149;
public static final int CASTAWAY_15150 = 15150;
public static final int CHARTIN_CHARLES_MCATLESS = 15151;
public static final int CURRENT_DUCK = 15152;
public static final int CURRENT_DUCK_15153 = 15153;
public static final int MEATY_AURA_LOGIST = 15154;
Expand All @@ -12657,14 +12675,6 @@ public final class NpcID
public static final int DRINK_TROLL_QUEEN = 15175;
public static final int DRINK_TROLL_QUEEN_15176 = 15176;
public static final int SAILING_CAT = 15177;
public static final int CASTAWAY_DOG = 15178;
public static final int CASTAWAY_DOG_15179 = 15179;
public static final int CASTAWAY_DOG_15180 = 15180;
public static final int WILSON_15181 = 15181;
public static final int LOG_GIRL = 15182;
public static final int BARREL_GIRL = 15183;
public static final int BARREL_DUDE = 15184;
public static final int DEBRIS_DUDE = 15185;
public static final int PUNCHING_BAG = 15191;
public static final int PUNCHING_BAG_15192 = 15192;
public static final int DPS_CALC = 15193;
Expand Down Expand Up @@ -12711,7 +12721,6 @@ public final class NpcID
public static final int DOLPHIN = 15234;
public static final int DOLPHIN_15235 = 15235;
public static final int DOLPHIN_CALF = 15236;
public static final int OCEAN_MAN_15237 = 15237;
public static final int JUNIOR_JIM_15238 = 15238;
public static final int JUMBO_JIM = 15239;
public static final int CREW_REGISTRAR = 15245;
Expand Down Expand Up @@ -12851,7 +12860,7 @@ public final class NpcID
public static final int CHAMELEON_15416 = 15416;
public static final int CHAMELEON_15417 = 15417;
public static final int CHAMELEON_15418 = 15418;
public static final int GECKO = 15419;
public static final int GECKO_15419 = 15419;
public static final int GECKO_15420 = 15420;
public static final int GECKO_15421 = 15421;
public static final int GECKO_15422 = 15422;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16677,5 +16677,6 @@ public final class NullItemID
public static final int NULL_32918 = 32918;
public static final int NULL_32919 = 32919;
public static final int NULL_32920 = 32920;
public static final int NULL_32922 = 32922;
/* This file is automatically generated. Do not edit. */
}
1 change: 1 addition & 0 deletions runelite-api/src/main/java/net/runelite/api/NullNpcID.java
Original file line number Diff line number Diff line change
Expand Up @@ -2492,6 +2492,7 @@ public final class NullNpcID
public static final int NULL_15110 = 15110;
public static final int NULL_15111 = 15111;
public static final int NULL_15123 = 15123;
public static final int NULL_15151 = 15151;
public static final int NULL_15186 = 15186;
public static final int NULL_15187 = 15187;
public static final int NULL_15188 = 15188;
Expand Down
21 changes: 20 additions & 1 deletion runelite-api/src/main/java/net/runelite/api/NullObjectID.java
Original file line number Diff line number Diff line change
Expand Up @@ -30266,7 +30266,6 @@ public final class NullObjectID
public static final int NULL_58523 = 58523;
public static final int NULL_58524 = 58524;
public static final int NULL_58526 = 58526;
public static final int NULL_58527 = 58527;
public static final int NULL_58528 = 58528;
public static final int NULL_58529 = 58529;
public static final int NULL_58530 = 58530;
Expand Down Expand Up @@ -31266,5 +31265,25 @@ public final class NullObjectID
public static final int NULL_60459 = 60459;
public static final int NULL_60460 = 60460;
public static final int NULL_60480 = 60480;
public static final int NULL_60531 = 60531;
public static final int NULL_60532 = 60532;
public static final int NULL_60533 = 60533;
public static final int NULL_60534 = 60534;
public static final int NULL_60535 = 60535;
public static final int NULL_60536 = 60536;
public static final int NULL_60537 = 60537;
public static final int NULL_60538 = 60538;
public static final int NULL_60539 = 60539;
public static final int NULL_60540 = 60540;
public static final int NULL_60543 = 60543;
public static final int NULL_60544 = 60544;
public static final int NULL_60545 = 60545;
public static final int NULL_60546 = 60546;
public static final int NULL_60547 = 60547;
public static final int NULL_60548 = 60548;
public static final int NULL_60549 = 60549;
public static final int NULL_60550 = 60550;
public static final int NULL_60565 = 60565;
public static final int NULL_60569 = 60569;
/* This file is automatically generated. Do not edit. */
}
35 changes: 32 additions & 3 deletions runelite-api/src/main/java/net/runelite/api/ObjectID.java
Original file line number Diff line number Diff line change
Expand Up @@ -1401,6 +1401,7 @@ public final class ObjectID
public static final int CHEST_2588 = 2588;
public static final int HOLE_2589 = 2589;
public static final int LADDER_2590 = 2590;
public static final int BUNK_BED = 2591;
public static final int LADDER_2592 = 2592;
public static final int GANGPLANK_2593 = 2593;
public static final int GANGPLANK_2594 = 2594;
Expand Down Expand Up @@ -8421,7 +8422,7 @@ public final class ObjectID
public static final int CHAIR_14853 = 14853;
public static final int CHEST_14854 = 14854;
public static final int BED_14855 = 14855;
public static final int BUNK_BED = 14856;
public static final int BUNK_BED_14856 = 14856;
public static final int TRUNK = 14857;
public static final int LOCKER = 14858;
public static final int SARADOMIN_STAR = 14859;
Expand Down Expand Up @@ -28507,7 +28508,6 @@ public final class ObjectID
public static final int ROCKS_58922 = 58922;
public static final int NICKEL_ROCKS = 58923;
public static final int ROCKS_58924 = 58924;
public static final int BARRACUDA_TRIAL_EXIT = 58925;
public static final int SCOREBOARD_58926 = 58926;
public static final int SCOREBOARD_58927 = 58927;
public static final int SCOREBOARD_58928 = 58928;
Expand Down Expand Up @@ -28717,7 +28717,6 @@ public final class ObjectID
public static final int SAILS_59549 = 59549;
public static final int SAILS_59550 = 59550;
public static final int SAILS_59551 = 59551;
public static final int SAILS_59552 = 59552;
public static final int SAILS_59553 = 59553;
public static final int HELM = 59555;
public static final int HELM_59556 = 59556;
Expand Down Expand Up @@ -29252,5 +29251,35 @@ public final class ObjectID
public static final int GANGPLANK_60523 = 60523;
public static final int GANGPLANK_60524 = 60524;
public static final int GANGPLANK_60525 = 60525;
public static final int TIN_BATH_60526 = 60526;
public static final int TABLE_60527 = 60527;
public static final int RED_CORAL = 60528;
public static final int RED_CORAL_60529 = 60529;
public static final int RED_CORAL_60530 = 60530;
public static final int SHELVES_60541 = 60541;
public static final int SHELVES_60542 = 60542;
public static final int HELM_60551 = 60551;
public static final int HELM_60552 = 60552;
public static final int HELM_60553 = 60553;
public static final int HELM_60554 = 60554;
public static final int HELM_60555 = 60555;
public static final int HELM_60556 = 60556;
public static final int HELM_60557 = 60557;
public static final int HELM_60558 = 60558;
public static final int HELM_60559 = 60559;
public static final int HELM_60560 = 60560;
public static final int HELM_60561 = 60561;
public static final int HELM_60562 = 60562;
public static final int HELM_60563 = 60563;
public static final int HELM_60564 = 60564;
public static final int CAT_60566 = 60566;
public static final int WORKBENCH_60567 = 60567;
public static final int BOOKCASE_60568 = 60568;
public static final int CURSED_REMAINS = 60570;
public static final int A_SINGULAR_CIRCLE = 60571;
public static final int KATANA = 60572;
public static final int SHRIMP = 60573;
public static final int HAROLD = 60574;
public static final int TENTACLE_60575 = 60575;
/* This file is automatically generated. Do not edit. */
}
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,7 @@ public final class AnimationID
public static final int HUMAN_JADECUTTING = 891;
public static final int HUMAN_REDTOPAZCUTTING = 892;
public static final int HUMAN_SHEARING = 893;
public static final int GHOST_UPDATE_TENDRILL_READY_THRALL = 894;
public static final int HUMAN_FILLBUCKET_SANDPIT = 895;
public static final int HUMAN_COOKING = 896;
public static final int HUMAN_FIRECOOKING = 897;
Expand Down Expand Up @@ -10792,6 +10793,7 @@ public final class AnimationID
public static final int HUNTINGFOX_DEADFALL_CATCHING_SOUTH = 10789;
public static final int HUNTINGFOX_DEADFALL_FULL = 10790;
public static final int HUNTINGFOX_DEADFALL_CATCHINGTEST = 10791;
public static final int GHOST_UPDATE_TENDRILL_WALK_THRALL = 10792;
public static final int MINNOW_FISHING_SPOT_LOCATION_LOOP = 10793;
public static final int HUMAN_CRAFTING = 10794;
public static final int HUMAN_COOKING_WALKMERGE_NORESTART = 10795;
Expand Down Expand Up @@ -11097,6 +11099,7 @@ public final class AnimationID
public static final int HUMAN_FLETCHING_HUNTINGBOLTS_CHISEL_SINGLE = 11098;
public static final int HUMAN_CUTTING_RESTART = 11099;
public static final int HUMAN_FLETCHING_SINGLE = 11100;
public static final int GHOST_UPDATE_TENDRILL_ATTACK_THRALL = 11101;
public static final int HUMAN_PRAY_BLESSED_BONE_SHARDS_01 = 11102;
public static final int HUMAN_PUSHUP_01 = 11103;
public static final int NPC_HARPY_EAGLE_FLYING_IDLE_01 = 11104;
Expand Down Expand Up @@ -11590,6 +11593,7 @@ public final class AnimationID
public static final int WINE_JUG_SPLASH = 11592;
public static final int HUMAN_WALK_B_2LOOPS = 11593;
public static final int FX_BEAM_HUEY = 11594;
public static final int GHOST_UPDATE_TENDRILL_DEATH_THRALL = 11595;
public static final int SPOTANIM_ZEBAK_ATTACK_ROAR_SHORT = 11596;
public static final int NPC_PORCUPINE_COMBAT_MELEE = 11597;
public static final int NPC_PORCUPINE_COMBAT_DEATH = 11598;
Expand Down Expand Up @@ -11738,6 +11742,7 @@ public final class AnimationID
public static final int BREWING_FILL_GLASS = 11741;
public static final int BREWING_TURN_VALVE = 11742;
public static final int BREWING_ADD_INGREDIENT = 11743;
public static final int GHOST_UPDATE_TENDRILL_DEFEND_THRALL = 11744;
public static final int HUMAN_FISHING_CASTING_NPC = 11745;
public static final int NPC_MINOTAUR_BOSS_WALK_FAST = 11746;
public static final int NPC_MINOTAUR_BOSS_ATTACK_MELEE_LOUDER = 11747;
Expand Down Expand Up @@ -13662,5 +13667,31 @@ public final class AnimationID
public static final int FORESTRY_CAMPFIRE_BURNING_CAMPHOR_LOGS = 13667;
public static final int FORESTRY_CAMPFIRE_BURNING_IRONWOOD_LOGS = 13668;
public static final int FORESTRY_CAMPFIRE_BURNING_ROSEWOOD_LOGS = 13669;
public static final int SKELETON_UPDATE_CHAMPION_READY_THRALL = 13670;
public static final int SKELETON_UPDATE_CHAMPION_WALK_THRALL = 13671;
public static final int SKELETON_UPDATE_CHAMPION_ATTACK_THRALL = 13672;
public static final int SKELETON_UPDATE_CHAMPION_DEFEND_THRALL = 13673;
public static final int SKELETON_UPDATE_CHAMPION_DEATH_THRALL = 13674;
public static final int ZOMBIE_UPDATE_READY_NORMAL_THRALL = 13675;
public static final int ZOMBIE_UPDATE_WALK_NORMAL_THRALL = 13676;
public static final int ZOMBIE_UPDATE_WALK_LEFT_NORMAL_THRALL = 13677;
public static final int ZOMBIE_UPDATE_WALK_RIGHT_NORMAL_THRALL = 13678;
public static final int ZOMBIE_UPDATE_WALKBACKWARDS_WEAPON_THRALL = 13679;
public static final int ZOMBIE_UPDATE_DEATH_NORMAL_THRALL = 13680;
public static final int ZOMBIE_UPDATE_ATTACK_NORMAL_THRALL = 13681;
public static final int ZOMBIE_UPDATE_DEFEND_NORMAL_THRALL = 13682;
public static final int GHOST_UPDATE_THRALL_SPAWN_RAISED = 13683;
public static final int SKELETON_UPDATE_THRALL_SPAWN_RAISED = 13684;
public static final int ZOMBIE_UPDATE_THRAWL_SPAWN_RAISED = 13685;
public static final int SAILING_BOAT_SAIL_KANDARIN_3X10_DOWN_TO_FULL_TRIM = 13686;
public static final int SAILING_BOAT_SAIL_KANDARIN_3X10_HALF_TO_FULL_TRIM = 13687;
public static final int SAILING_BOAT_SAIL_KANDARIN_3X10_FULL_TRIM = 13688;
public static final int SAILING_HUMAN_SAIL_KANDARIN_3X10_FURLED_TO_DOWN = 13689;
public static final int SAILING_HUMAN_SAIL_KANDARIN_3X10_DOWN_TO_FURLED = 13690;
public static final int SAILING_HUMAN_SAIL_KANDARIN_3X10_TRIM_SAILS = 13691;
public static final int VFX_WIND_SAIL_3X10_01 = 13692;
public static final int VFX_WIND_SAIL_3X10_SPEEDBOOST01 = 13693;
public static final int HUMAN_WORKBENCH_CRAFTING_LOOP = 13694;
public static final int TURTLE_IDLE01_LOOP = 13695;
/* This file is automatically generated. Do not edit. */
}
Loading