Skip to content

Commit 018e0cd

Browse files
authored
Merge pull request #343 from chsami/development
1.4.1
2 parents 0c04815 + edaad2b commit 018e0cd

86 files changed

Lines changed: 2369 additions & 521 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.

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727
uses: "marvinpinto/action-automatic-releases@latest"
2828
with:
2929
repo_token: "${{ secrets.GITHUB_TOKEN }}"
30-
automatic_release_tag: "1.4.0"
30+
automatic_release_tag: "1.4.1"
3131
prerelease: false
32-
title: "Release 1.4.0"
32+
title: "Release 1.4.1"
3333
files: |
3434
/home/runner/work/microbot/microbot/runelite-client/target/microbot-*.jar

cache/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<groupId>net.runelite</groupId>
3131
<artifactId>runelite-parent</artifactId>
32-
<version>1.10.34-SNAPSHOT</version>
32+
<version>1.10.35-SNAPSHOT</version>
3333
</parent>
3434

3535
<artifactId>cache</artifactId>

pom.xml

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

2929
<groupId>net.runelite</groupId>
3030
<artifactId>runelite-parent</artifactId>
31-
<version>1.10.34-SNAPSHOT</version>
31+
<version>1.10.35-SNAPSHOT</version>
3232
<packaging>pom</packaging>
3333

3434
<name>RuneLite</name>

runelite-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<groupId>net.runelite</groupId>
3131
<artifactId>runelite-parent</artifactId>
32-
<version>1.10.34-SNAPSHOT</version>
32+
<version>1.10.35-SNAPSHOT</version>
3333
</parent>
3434

3535
<artifactId>runelite-api</artifactId>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,4 +351,21 @@ public final class AnimationID
351351

352352
// POH Animations
353353
public static final int INCENSE_BURNER = 3687;
354+
355+
// Wyrms
356+
public static final int WYRM_IDLE_DORMANT = 8266;
357+
public static final int WYRM_IDLE_ACTIVE = 8267;
358+
public static final int WYRM_ATTACK_MELEE = 8270;
359+
public static final int WYRM_ATTACK_MAGE = 8271;
360+
361+
// Lost City's Tree spirit
362+
public static final int TREE_SPIRIT_IDLE = 5530;
363+
public static final int TREE_SPIRIT_WALK = 5531;
364+
365+
public static final int SIGN_HOLDING_ZOMBIE_PROTESTOR_WALK = 5583;
366+
367+
public static final int VIGGORAS_CHAINMACE_IDLE = 244;
368+
369+
public static final int MLM_WATER_WHEEL_SPINNING = 1051;
370+
public static final int GIANTS_FOUNDRY_WATER_WHEEL_SPINNING = 9450;
354371
}

runelite-api/src/main/java/net/runelite/api/ChatMessageType.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,10 @@ public enum ChatMessageType
189189
* Chat type for dialog with a graphic/object
190190
*/
191191
MESBOX(115),
192+
/**
193+
* Chat type for some npcs overhead text
194+
*/
195+
NPC_SAY(116),
192196
/**
193197
* An unknown message type.
194198
*/

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

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14061,8 +14061,8 @@ public final class ItemID
1406114061
public static final int DARK_SQUALL_ROBE_BOTTOM = 29570;
1406214062
public static final int SILIF = 29572;
1406314063
public static final int LIT_EXPLOSIVE = 29573;
14064-
public static final int BONE_CLAW = 29574;
14065-
public static final int BONE_CLAWS = 29577;
14064+
public static final int BURNING_CLAW = 29574;
14065+
public static final int BURNING_CLAWS = 29577;
1406614066
public static final int TORMENTED_SYNAPSE = 29580;
1406714067
public static final int SMOULDERING_HEART = 29583;
1406814068
public static final int SMOULDERING_PILE_OF_FLESH = 29585;
@@ -14071,5 +14071,47 @@ public final class ItemID
1407114071
public static final int SCORCHING_BOW = 29591;
1407214072
public static final int PURGING_STAFF = 29594;
1407314073
public static final int DURADELS_NOTES = 29596;
14074+
public static final int DEADMAN_RUG = 29598;
14075+
public static final int CORRUPTED_DARK_BOW = 29599;
14076+
public static final int CORRUPTED_VOLATILE_NIGHTMARE_STAFF = 29602;
14077+
public static final int ARMADYL_GODSWORD_DEADMAN = 29605;
14078+
public static final int VOIDWAKER_DEADMAN = 29607;
14079+
public static final int VOLATILE_NIGHTMARE_STAFF_DEADMAN = 29609;
14080+
public static final int DARK_BOW_DEADMAN = 29611;
14081+
public static final int IMBUED_ZAMORAK_CAPE_DEADMAN = 29613;
14082+
public static final int IMBUED_GUTHIX_CAPE_DEADMAN = 29615;
14083+
public static final int IMBUED_SARADOMIN_CAPE_DEADMAN = 29617;
14084+
public static final int ARMAGEDDON_RUG = 29619;
14085+
public static final int ARMAGEDDON_TELEPORT_SCROLL = 29622;
14086+
public static final int ARMAGEDDON_WEAPON_SCROLL = 29625;
14087+
public static final int ARMAGEDDON_CAPE_FABRIC = 29628;
14088+
public static final int BLIGHTED_OVERLOAD_4 = 29631;
14089+
public static final int BLIGHTED_OVERLOAD_3 = 29634;
14090+
public static final int BLIGHTED_OVERLOAD_2 = 29637;
14091+
public static final int BLIGHTED_OVERLOAD_1 = 29640;
14092+
public static final int CHITIN = 29643;
14093+
public static final int CABBAGE_29646 = 29646;
14094+
public static final int SIGIL_OF_METICULOUSNESS = 29648;
14095+
public static final int SIGIL_OF_METICULOUSNESS_29649 = 29649;
14096+
public static final int SIGIL_OF_REVOKED_LIMITATION = 29651;
14097+
public static final int SIGIL_OF_REVOKED_LIMITATION_29652 = 29652;
14098+
public static final int SIGIL_OF_RAMPART = 29654;
14099+
public static final int SIGIL_OF_RAMPART_29655 = 29655;
14100+
public static final int SIGIL_OF_DECEPTION = 29657;
14101+
public static final int SIGIL_OF_DECEPTION_29658 = 29658;
14102+
public static final int SIGIL_OF_LITHE = 29660;
14103+
public static final int SIGIL_OF_LITHE_29661 = 29661;
14104+
public static final int SIGIL_OF_ADROIT = 29663;
14105+
public static final int SIGIL_OF_ADROIT_29664 = 29664;
14106+
public static final int SIGIL_OF_ONSLAUGHT = 29666;
14107+
public static final int SIGIL_OF_ONSLAUGHT_29667 = 29667;
14108+
public static final int SIGIL_OF_RESTORATION = 29669;
14109+
public static final int SIGIL_OF_RESTORATION_29670 = 29670;
14110+
public static final int SIGIL_OF_SWASHBUCKLER = 29672;
14111+
public static final int SIGIL_OF_SWASHBUCKLER_29673 = 29673;
14112+
public static final int SIGIL_OF_GUNSLINGER = 29675;
14113+
public static final int SIGIL_OF_GUNSLINGER_29676 = 29676;
14114+
public static final int SIGIL_OF_ARCANE_SWIFTNESS = 29678;
14115+
public static final int SIGIL_OF_ARCANE_SWIFTNESS_29679 = 29679;
1407414116
/* This file is automatically generated. Do not edit. */
1407514117
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11468,5 +11468,14 @@ public final class NpcID
1146811468
public static final int KURADAL = 13623;
1146911469
public static final int RAT_13624 = 13624;
1147011470
public static final int ZEMBO = 13655;
11471+
public static final int VARDORVIS_13656 = 13656;
11472+
public static final int CERBERUS_13657 = 13657;
11473+
public static final int BEE_SWARM_13658 = 13658;
11474+
public static final int THERMONUCLEAR_SMOKE_DEVIL_13659 = 13659;
11475+
public static final int JAGUAR_WARRIOR_13660 = 13660;
11476+
public static final int TZTOKJAD_13661 = 13661;
11477+
public static final int DURIAL321 = 13662;
11478+
public static final int MAGIC_MARK = 13663;
11479+
public static final int RANGING_RO = 13664;
1147111480
/* This file is automatically generated. Do not edit. */
1147211481
}

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15316,5 +15316,46 @@ public final class NullItemID
1531615316
public static final int NULL_29593 = 29593;
1531715317
public static final int NULL_29595 = 29595;
1531815318
public static final int NULL_29597 = 29597;
15319+
public static final int NULL_29600 = 29600;
15320+
public static final int NULL_29601 = 29601;
15321+
public static final int NULL_29603 = 29603;
15322+
public static final int NULL_29604 = 29604;
15323+
public static final int NULL_29606 = 29606;
15324+
public static final int NULL_29608 = 29608;
15325+
public static final int NULL_29610 = 29610;
15326+
public static final int NULL_29612 = 29612;
15327+
public static final int NULL_29614 = 29614;
15328+
public static final int NULL_29616 = 29616;
15329+
public static final int NULL_29618 = 29618;
15330+
public static final int NULL_29620 = 29620;
15331+
public static final int NULL_29621 = 29621;
15332+
public static final int NULL_29623 = 29623;
15333+
public static final int NULL_29624 = 29624;
15334+
public static final int NULL_29626 = 29626;
15335+
public static final int NULL_29627 = 29627;
15336+
public static final int NULL_29629 = 29629;
15337+
public static final int NULL_29630 = 29630;
15338+
public static final int NULL_29632 = 29632;
15339+
public static final int NULL_29633 = 29633;
15340+
public static final int NULL_29635 = 29635;
15341+
public static final int NULL_29636 = 29636;
15342+
public static final int NULL_29638 = 29638;
15343+
public static final int NULL_29639 = 29639;
15344+
public static final int NULL_29641 = 29641;
15345+
public static final int NULL_29642 = 29642;
15346+
public static final int NULL_29644 = 29644;
15347+
public static final int NULL_29645 = 29645;
15348+
public static final int NULL_29647 = 29647;
15349+
public static final int NULL_29650 = 29650;
15350+
public static final int NULL_29653 = 29653;
15351+
public static final int NULL_29656 = 29656;
15352+
public static final int NULL_29659 = 29659;
15353+
public static final int NULL_29662 = 29662;
15354+
public static final int NULL_29665 = 29665;
15355+
public static final int NULL_29668 = 29668;
15356+
public static final int NULL_29671 = 29671;
15357+
public static final int NULL_29674 = 29674;
15358+
public static final int NULL_29677 = 29677;
15359+
public static final int NULL_29680 = 29680;
1531915360
/* This file is automatically generated. Do not edit. */
1532015361
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26014,5 +26014,8 @@ public final class ObjectID
2601426014
public static final int DOOR_54059 = 54059;
2601526015
public static final int DEBUG_MAN = 54062;
2601626016
public static final int DEBUG_WOMAN = 54063;
26017+
public static final int RUG_54114 = 54114;
26018+
public static final int RUG_54115 = 54115;
26019+
public static final int RUG_54116 = 54116;
2601726020
/* This file is automatically generated. Do not edit. */
2601826021
}

0 commit comments

Comments
 (0)