Skip to content

Commit 204c4bd

Browse files
chsamichsami
authored
Merge pull request #1785 from chsami/development
2.6.4
2 parents 0a588eb + b56cfe0 commit 204c4bd

33 files changed

Lines changed: 1253 additions & 254 deletions

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ org.gradle.parallel=true
2828
org.gradle.caching=false
2929

3030
project.build.group=net.runelite
31-
project.build.version=1.12.26.3
31+
project.build.version=1.12.27
3232

3333
glslang.path=
34-
microbot.version=2.6.3
34+
microbot.version=2.6.4
3535
microbot.commit.sha=nogit
3636
microbot.repo.url=http://138.201.81.246:8081/repository/microbot-snapshot/
3737
microbot.repo.username=

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16284,5 +16284,14 @@ public final class ItemID
1628416284
public static final int OPEN_GEM_TOTE = 33392;
1628516285
public static final int GEM_SACK = 33393;
1628616286
public static final int OPEN_GEM_SACK = 33395;
16287+
public static final int GRANITE_CANNONBALL_33404 = 33404;
16288+
public static final int BOSUNS_WORKBENCH = 33420;
16289+
public static final int RECOLOURED_SAIL = 33421;
16290+
public static final int DYES = 33422;
16291+
public static final int BOSUNS_WORKBENCH_SCHEMATIC = 33423;
16292+
public static final int MISSION_TOTEM = 33424;
16293+
public static final int SPECTATOR_OCULUS = 33427;
16294+
public static final int TRINKET_OF_VENGEANCE_2 = 33428;
16295+
public static final int TRINKET_OF_VENGEANCE_1 = 33431;
1628716296
/* This file is automatically generated. Do not edit. */
1628816297
}

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13105,5 +13105,33 @@ public final class NpcID
1310513105
public static final int SAGEGUARD_MELACAR = 15667;
1310613106
public static final int IMPLIMGS = 15668;
1310713107
public static final int DPS_CALC_15669 = 15669;
13108+
public static final int PIRATE_15672 = 15672;
13109+
public static final int PIRATE_15673 = 15673;
13110+
public static final int PIRATE_15674 = 15674;
13111+
public static final int PIRATE_15675 = 15675;
13112+
public static final int OAKY_DOAK = 15677;
13113+
public static final int BOATSWAIN_BILL_TEAK = 15678;
13114+
public static final int MISTER_U = 15679;
13115+
public static final int OLD_JACK = 15680;
13116+
public static final int MUTE_JACK = 15681;
13117+
public static final int BLOODY_JACK = 15682;
13118+
public static final int CAPTAIN_RUBAN_ACER = 15683;
13119+
public static final int CAPTAIN_JACK = 15684;
13120+
public static final int TEST_PIRATE_RANGER = 15685;
13121+
public static final int TEST_PIRATE_MAGE = 15686;
13122+
public static final int TEST_PIRATE_CAPTAIN = 15687;
13123+
public static final int PIRATE_WRECKAGE = 15688;
13124+
public static final int WARRIOR_15689 = 15689;
13125+
public static final int NUGGET = 15690;
13126+
public static final int RHINO = 15691;
13127+
public static final int FRIEND = 15692;
13128+
public static final int WEASEL = 15693;
13129+
public static final int REBEL = 15694;
13130+
public static final int SCURRIUS_15695 = 15695;
13131+
public static final int SOL_HEREDIT_15696 = 15696;
13132+
public static final int KREEARRA_15697 = 15697;
13133+
public static final int ELIDINIS_WARDEN_15698 = 15698;
13134+
public static final int TZTOKJAD_15699 = 15699;
13135+
public static final int YAMA_15700 = 15700;
1310813136
/* This file is automatically generated. Do not edit. */
1310913137
}

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16802,5 +16802,34 @@ public final class NullItemID
1680216802
public static final int NULL_33388 = 33388;
1680316803
public static final int NULL_33391 = 33391;
1680416804
public static final int NULL_33394 = 33394;
16805+
public static final int NULL_33396 = 33396;
16806+
public static final int NULL_33397 = 33397;
16807+
public static final int NULL_33398 = 33398;
16808+
public static final int NULL_33399 = 33399;
16809+
public static final int NULL_33400 = 33400;
16810+
public static final int NULL_33401 = 33401;
16811+
public static final int NULL_33402 = 33402;
16812+
public static final int NULL_33403 = 33403;
16813+
public static final int NULL_33405 = 33405;
16814+
public static final int NULL_33406 = 33406;
16815+
public static final int NULL_33407 = 33407;
16816+
public static final int NULL_33408 = 33408;
16817+
public static final int NULL_33409 = 33409;
16818+
public static final int NULL_33410 = 33410;
16819+
public static final int NULL_33411 = 33411;
16820+
public static final int NULL_33412 = 33412;
16821+
public static final int NULL_33413 = 33413;
16822+
public static final int NULL_33414 = 33414;
16823+
public static final int NULL_33415 = 33415;
16824+
public static final int NULL_33416 = 33416;
16825+
public static final int NULL_33417 = 33417;
16826+
public static final int NULL_33418 = 33418;
16827+
public static final int NULL_33419 = 33419;
16828+
public static final int NULL_33425 = 33425;
16829+
public static final int NULL_33426 = 33426;
16830+
public static final int NULL_33429 = 33429;
16831+
public static final int NULL_33430 = 33430;
16832+
public static final int NULL_33432 = 33432;
16833+
public static final int NULL_33433 = 33433;
1680516834
/* This file is automatically generated. Do not edit. */
1680616835
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2560,5 +2560,6 @@ public final class NullNpcID
25602560
public static final int NULL_15644 = 15644;
25612561
public static final int NULL_15670 = 15670;
25622562
public static final int NULL_15671 = 15671;
2563+
public static final int NULL_15676 = 15676;
25632564
/* This file is automatically generated. Do not edit. */
25642565
}

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

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13887,7 +13887,47 @@ public final class NullObjectID
1388713887
public static final int NULL_29409 = 29409;
1388813888
public static final int NULL_29413 = 29413;
1388913889
public static final int NULL_29414 = 29414;
13890+
public static final int NULL_29462 = 29462;
13891+
public static final int NULL_29464 = 29464;
13892+
public static final int NULL_29465 = 29465;
13893+
public static final int NULL_29466 = 29466;
13894+
public static final int NULL_29467 = 29467;
13895+
public static final int NULL_29468 = 29468;
13896+
public static final int NULL_29469 = 29469;
13897+
public static final int NULL_29470 = 29470;
13898+
public static final int NULL_29471 = 29471;
13899+
public static final int NULL_29472 = 29472;
13900+
public static final int NULL_29473 = 29473;
13901+
public static final int NULL_29474 = 29474;
13902+
public static final int NULL_29475 = 29475;
13903+
public static final int NULL_29476 = 29476;
13904+
public static final int NULL_29477 = 29477;
13905+
public static final int NULL_29478 = 29478;
13906+
public static final int NULL_29479 = 29479;
13907+
public static final int NULL_29480 = 29480;
13908+
public static final int NULL_29481 = 29481;
13909+
public static final int NULL_29482 = 29482;
13910+
public static final int NULL_29483 = 29483;
13911+
public static final int NULL_29484 = 29484;
13912+
public static final int NULL_29485 = 29485;
1389013913
public static final int NULL_29490 = 29490;
13914+
public static final int NULL_29496 = 29496;
13915+
public static final int NULL_29497 = 29497;
13916+
public static final int NULL_29498 = 29498;
13917+
public static final int NULL_29499 = 29499;
13918+
public static final int NULL_29500 = 29500;
13919+
public static final int NULL_29501 = 29501;
13920+
public static final int NULL_29502 = 29502;
13921+
public static final int NULL_29503 = 29503;
13922+
public static final int NULL_29504 = 29504;
13923+
public static final int NULL_29505 = 29505;
13924+
public static final int NULL_29537 = 29537;
13925+
public static final int NULL_29546 = 29546;
13926+
public static final int NULL_29547 = 29547;
13927+
public static final int NULL_29548 = 29548;
13928+
public static final int NULL_29549 = 29549;
13929+
public static final int NULL_29550 = 29550;
13930+
public static final int NULL_29558 = 29558;
1389113931
public static final int NULL_29628 = 29628;
1389213932
public static final int NULL_29629 = 29629;
1389313933
public static final int NULL_29630 = 29630;
@@ -30836,6 +30876,28 @@ public final class NullObjectID
3083630876
public static final int NULL_59527 = 59527;
3083730877
public static final int NULL_59528 = 59528;
3083830878
public static final int NULL_59529 = 59529;
30879+
public static final int NULL_59530 = 59530;
30880+
public static final int NULL_59531 = 59531;
30881+
public static final int NULL_59532 = 59532;
30882+
public static final int NULL_59533 = 59533;
30883+
public static final int NULL_59534 = 59534;
30884+
public static final int NULL_59535 = 59535;
30885+
public static final int NULL_59536 = 59536;
30886+
public static final int NULL_59537 = 59537;
30887+
public static final int NULL_59538 = 59538;
30888+
public static final int NULL_59539 = 59539;
30889+
public static final int NULL_59540 = 59540;
30890+
public static final int NULL_59541 = 59541;
30891+
public static final int NULL_59542 = 59542;
30892+
public static final int NULL_59543 = 59543;
30893+
public static final int NULL_59544 = 59544;
30894+
public static final int NULL_59545 = 59545;
30895+
public static final int NULL_59546 = 59546;
30896+
public static final int NULL_59547 = 59547;
30897+
public static final int NULL_59548 = 59548;
30898+
public static final int NULL_59549 = 59549;
30899+
public static final int NULL_59550 = 59550;
30900+
public static final int NULL_59551 = 59551;
3083930901
public static final int NULL_59554 = 59554;
3084030902
public static final int NULL_59557 = 59557;
3084130903
public static final int NULL_59560 = 59560;
@@ -31140,6 +31202,7 @@ public final class NullObjectID
3114031202
public static final int NULL_60237 = 60237;
3114131203
public static final int NULL_60238 = 60238;
3114231204
public static final int NULL_60239 = 60239;
31205+
public static final int NULL_60244 = 60244;
3114331206
public static final int NULL_60245 = 60245;
3114431207
public static final int NULL_60247 = 60247;
3114531208
public static final int NULL_60249 = 60249;

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

Lines changed: 55 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15573,6 +15573,8 @@ public final class ObjectID
1557315573
public static final int ORNATE_BANNER_STAND = 29458;
1557415574
public static final int THRONE_29459 = 29459;
1557515575
public static final int SPADE_29460 = 29460;
15576+
public static final int BUOY = 29461;
15577+
public static final int PIRATE_CANNON = 29463;
1557615578
public static final int GATE_29486 = 29486;
1557715579
public static final int GATE_29487 = 29487;
1557815580
public static final int GATE_29488 = 29488;
@@ -15582,6 +15584,53 @@ public final class ObjectID
1558215584
public static final int CORPSE_29493 = 29493;
1558315585
public static final int SKELETON_29494 = 29494;
1558415586
public static final int FAIRY_RING_29495 = 29495;
15587+
public static final int SAILS_29506 = 29506;
15588+
public static final int SAILS_29507 = 29507;
15589+
public static final int SAILS_29508 = 29508;
15590+
public static final int SAILS_29509 = 29509;
15591+
public static final int SAILS_29510 = 29510;
15592+
public static final int SAILS_29511 = 29511;
15593+
public static final int SAILS_29512 = 29512;
15594+
public static final int SAILS_29513 = 29513;
15595+
public static final int SAILS_29514 = 29514;
15596+
public static final int SAILS_29515 = 29515;
15597+
public static final int SAILS_29516 = 29516;
15598+
public static final int SAILS_29517 = 29517;
15599+
public static final int SAILS_29518 = 29518;
15600+
public static final int SAILS_29519 = 29519;
15601+
public static final int SAILS_29520 = 29520;
15602+
public static final int SAILS_29521 = 29521;
15603+
public static final int SAILS_29522 = 29522;
15604+
public static final int SAILS_29523 = 29523;
15605+
public static final int SAILS_29524 = 29524;
15606+
public static final int SAILS_29525 = 29525;
15607+
public static final int SAILS_29526 = 29526;
15608+
public static final int SAILS_29527 = 29527;
15609+
public static final int SAILS_29528 = 29528;
15610+
public static final int SAILS_29529 = 29529;
15611+
public static final int SAILS_29530 = 29530;
15612+
public static final int SAILS_29531 = 29531;
15613+
public static final int SAILS_29532 = 29532;
15614+
public static final int SAILS_29533 = 29533;
15615+
public static final int SAILS_29534 = 29534;
15616+
public static final int SAILS_29535 = 29535;
15617+
public static final int HELM = 29536;
15618+
public static final int BOSUNS_WORKBENCH = 29538;
15619+
public static final int BOSUNS_WORKBENCH_29539 = 29539;
15620+
public static final int BOSUNS_WORKBENCH_29540 = 29540;
15621+
public static final int BOSUNS_WORKBENCH_29541 = 29541;
15622+
public static final int BOSUNS_WORKBENCH_29542 = 29542;
15623+
public static final int BOSUNS_WORKBENCH_29543 = 29543;
15624+
public static final int BOSUNS_WORKBENCH_29544 = 29544;
15625+
public static final int HELM_29545 = 29545;
15626+
public static final int SHIELD_29551 = 29551;
15627+
public static final int BRAZIER_29552 = 29552;
15628+
public static final int BRAZIER_29553 = 29553;
15629+
public static final int BRAZIER_29554 = 29554;
15630+
public static final int BRAZIER_29555 = 29555;
15631+
public static final int BRAZIER_29556 = 29556;
15632+
public static final int HEROIC_STATUE = 29557;
15633+
public static final int DEATH = 29559;
1558515634
public static final int FAIRY_RING_29560 = 29560;
1558615635
public static final int MOUNTED_MAX_CAPE_29625 = 29625;
1558715636
public static final int CRACK_29626 = 29626;
@@ -17344,7 +17393,7 @@ public final class ObjectID
1734417393
public static final int PORTAL_33443 = 33443;
1734517394
public static final int PORTAL_33444 = 33444;
1734617395
public static final int BRAZIER_33454 = 33454;
17347-
public static final int HEROIC_STATUE = 33455;
17396+
public static final int HEROIC_STATUE_33455 = 33455;
1734817397
public static final int CHALICE_33456 = 33456;
1734917398
public static final int ICE_THRONE_33477 = 33477;
1735017399
public static final int PEAR_TREE = 33480;
@@ -18114,7 +18163,7 @@ public final class ObjectID
1811418163
public static final int REDWOOD_TREE_34314 = 34314;
1811518164
public static final int REDWOOD_TREE_34315 = 34315;
1811618165
public static final int SPIKE_DEFENCE_34316 = 34316;
18117-
public static final int DEATH = 34318;
18166+
public static final int DEATH_34318 = 34318;
1811818167
public static final int GLASS_TABLE_34319 = 34319;
1811918168
public static final int DEAD_TREE_34334 = 34334;
1812018169
public static final int SULPHUR_VENT_34335 = 34335;
@@ -28212,9 +28261,9 @@ public final class ObjectID
2821228261
public static final int CRAB_TRAP_FULL_58912 = 58912;
2821328262
public static final int LEAD_ROCKS = 58917;
2821428263
public static final int ROCKS_58918 = 58918;
28215-
public static final int STRANGE_ROCKS = 58919;
28264+
public static final int RUBIUM_ROCKS = 58919;
2821628265
public static final int ROCKS_58920 = 58920;
28217-
public static final int STRANGE_DEPOSIT = 58921;
28266+
public static final int RUBIUM_DEPOSIT = 58921;
2821828267
public static final int ROCKS_58922 = 58922;
2821928268
public static final int NICKEL_ROCKS = 58923;
2822028269
public static final int ROCKS_58924 = 58924;
@@ -28277,7 +28326,7 @@ public final class ObjectID
2827728326
public static final int CHEST_59233 = 59233;
2827828327
public static final int CHEST_59234 = 59234;
2827928328
public static final int CHEST_59235 = 59235;
28280-
public static final int BUOY = 59236;
28329+
public static final int BUOY_59236 = 59236;
2828128330
public static final int BARRACUDA_BOAT = 59238;
2828228331
public static final int BARRACUDA_BOAT_59239 = 59239;
2828328332
public static final int BARRACUDA_BOAT_59241 = 59241;
@@ -28406,31 +28455,9 @@ public final class ObjectID
2840628455
public static final int STORM_CHASERS_FLAG_59491 = 59491;
2840728456
public static final int SWAMP_CRUISERS_FLAG_59492 = 59492;
2840828457
public static final int CRYSTAL_GLIDERS_FLAG_59493 = 59493;
28409-
public static final int SAILS_59530 = 59530;
28410-
public static final int SAILS_59531 = 59531;
28411-
public static final int SAILS_59532 = 59532;
28412-
public static final int SAILS_59533 = 59533;
28413-
public static final int SAILS_59534 = 59534;
28414-
public static final int SAILS_59535 = 59535;
28415-
public static final int SAILS_59536 = 59536;
28416-
public static final int SAILS_59537 = 59537;
28417-
public static final int SAILS_59538 = 59538;
28418-
public static final int SAILS_59539 = 59539;
28419-
public static final int SAILS_59540 = 59540;
28420-
public static final int SAILS_59541 = 59541;
28421-
public static final int SAILS_59542 = 59542;
28422-
public static final int SAILS_59543 = 59543;
28423-
public static final int SAILS_59544 = 59544;
28424-
public static final int SAILS_59545 = 59545;
28425-
public static final int SAILS_59546 = 59546;
28426-
public static final int SAILS_59547 = 59547;
28427-
public static final int SAILS_59548 = 59548;
28428-
public static final int SAILS_59549 = 59549;
28429-
public static final int SAILS_59550 = 59550;
28430-
public static final int SAILS_59551 = 59551;
2843128458
public static final int CREVICE_59552 = 59552;
2843228459
public static final int SAILS_59553 = 59553;
28433-
public static final int HELM = 59555;
28460+
public static final int HELM_59555 = 59555;
2843428461
public static final int HELM_59556 = 59556;
2843528462
public static final int HELM_59558 = 59558;
2843628463
public static final int HELM_59559 = 59559;
@@ -28816,7 +28843,6 @@ public final class ObjectID
2881628843
public static final int HELM_60241 = 60241;
2881728844
public static final int HELM_60242 = 60242;
2881828845
public static final int SAILS_60243 = 60243;
28819-
public static final int SAILS_60244 = 60244;
2882028846
public static final int DEADMANS_CHEST = 60246;
2882128847
public static final int DEADMANS_CHEST_60248 = 60248;
2882228848
public static final int DEADMANS_CHEST_60250 = 60250;

‎runelite-api/src/main/java/net/runelite/api/gameval/AnimationID.java‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13868,5 +13868,36 @@ public final class AnimationID
1386813868
public static final int LEAGUES_6_IMP_LESSER_04_IDLE_01 = 13868;
1386913869
public static final int HUMAN_MINING_DEMONIC_PACT = 13869;
1387013870
public static final int HUMAN_WOODCUTTING_DEMONIC_PACT = 13870;
13871+
public static final int VFX_CANNONBALL_INCENDARY01_PROJECTILE = 13871;
13872+
public static final int VFX_CANNONBALL_CHAINSHOT01_PROJECTILE = 13872;
13873+
public static final int VFX_SAILING_CANNON01_SMALL01_CHAINSHOT01_IMPACT01 = 13873;
13874+
public static final int VFX_SAILING_CANNON01_SMALL01_INCENDARY01_IMPACT01 = 13874;
13875+
public static final int SAILING_BOAT_SAIL_KANDARIN_1X3_DOWN_OFFSET = 13875;
13876+
public static final int SAILING_BOAT_SAIL_KANDARIN_1X3_HALF_TO_DOWN_OFFSET = 13876;
13877+
public static final int SAILING_BOAT_SAIL_KANDARIN_1X3_FULL_TO_DOWN_OFFSET = 13877;
13878+
public static final int SAILING_BOAT_SAIL_KANDARIN_1X3_HALF_OFFSET = 13878;
13879+
public static final int SAILING_BOAT_SAIL_KANDARIN_1X3_DOWN_TO_HALF_OFFSET = 13879;
13880+
public static final int SAILING_BOAT_SAIL_KANDARIN_1X3_FULL_TO_HALF_OFFSET = 13880;
13881+
public static final int SAILING_BOAT_SAIL_KANDARIN_1X3_FULL_OFFSET = 13881;
13882+
public static final int SAILING_BOAT_SAIL_KANDARIN_1X3_DOWN_TO_FULL_OFFSET = 13882;
13883+
public static final int SAILING_BOAT_SAIL_KANDARIN_1X3_HALF_TO_FULL_OFFSET = 13883;
13884+
public static final int SAILING_BOAT_SAIL_KANDARIN_2X5_DOWN_OFFSET = 13884;
13885+
public static final int SAILING_BOAT_SAIL_KANDARIN_2X5_HALF_TO_DOWN_OFFSET = 13885;
13886+
public static final int SAILING_BOAT_SAIL_KANDARIN_2X5_FULL_TO_DOWN_OFFSET = 13886;
13887+
public static final int SAILING_BOAT_SAIL_KANDARIN_2X5_HALF_OFFSET = 13887;
13888+
public static final int SAILING_BOAT_SAIL_KANDARIN_2X5_DOWN_TO_HALF_OFFSET = 13888;
13889+
public static final int SAILING_BOAT_SAIL_KANDARIN_2X5_FULL_TO_HALF_OFFSET = 13889;
13890+
public static final int SAILING_BOAT_SAIL_KANDARIN_2X5_FULL_OFFSET = 13890;
13891+
public static final int SAILING_BOAT_SAIL_KANDARIN_2X5_DOWN_TO_FULL_OFFSET = 13891;
13892+
public static final int SAILING_BOAT_SAIL_KANDARIN_2X5_HALF_TO_FULL_OFFSET = 13892;
13893+
public static final int SAILING_BOAT_SAIL_KANDARIN_3X8_DOWN_OFFSET = 13893;
13894+
public static final int SAILING_BOAT_SAIL_KANDARIN_3X8_HALF_TO_DOWN_OFFSET = 13894;
13895+
public static final int SAILING_BOAT_SAIL_KANDARIN_3X8_FULL_TO_DOWN_OFFSET = 13895;
13896+
public static final int SAILING_BOAT_SAIL_KANDARIN_3X8_HALF_OFFSET = 13896;
13897+
public static final int SAILING_BOAT_SAIL_KANDARIN_3X8_DOWN_TO_HALF_OFFSET = 13897;
13898+
public static final int SAILING_BOAT_SAIL_KANDARIN_3X8_FULL_TO_HALF_OFFSET = 13898;
13899+
public static final int SAILING_BOAT_SAIL_KANDARIN_3X8_FULL_OFFSET = 13899;
13900+
public static final int SAILING_BOAT_SAIL_KANDARIN_3X8_DOWN_TO_FULL_OFFSET = 13900;
13901+
public static final int SAILING_BOAT_SAIL_KANDARIN_3X8_HALF_TO_FULL_OFFSET = 13901;
1387113902
/* This file is automatically generated. Do not edit. */
1387213903
}

0 commit comments

Comments
 (0)