Skip to content

Commit 590fd01

Browse files
authored
Merge pull request #326 from chsami/development
Merge with latest runelite version - Microbot 1.4.0
2 parents 5791672 + d95cd08 commit 590fd01

57 files changed

Lines changed: 3979 additions & 1420 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.

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.33-SNAPSHOT</version>
32+
<version>1.10.34-SNAPSHOT</version>
3333
</parent>
3434

3535
<artifactId>cache</artifactId>

cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,6 @@ public class ObjectDefinition
7878
private int ambientSoundChangeTicksMax = 0;
7979
private boolean blocksProjectile = true;
8080
private boolean randomizeAnimStart;
81+
private boolean deferAnimChange;
8182
private Map<Integer, Object> params = null;
8283
}

cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,10 @@ else if (opcode == 89)
334334
{
335335
def.setRandomizeAnimStart(true);
336336
}
337+
else if (opcode == 90)
338+
{
339+
def.setDeferAnimChange(true);
340+
}
337341
else if (opcode == 92)
338342
{
339343
int varpID = is.readUnsignedShort();

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.33-SNAPSHOT</version>
31+
<version>1.10.34-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.33-SNAPSHOT</version>
32+
<version>1.10.34-SNAPSHOT</version>
3333
</parent>
3434

3535
<artifactId>runelite-api</artifactId>

runelite-api/src/main/interfaces/interfaces.toml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,12 @@ deposit_inventory=42
6868
deposit_equipment=44
6969
incinerator=46
7070
incinerator_confirm=47
71-
equipment_content_container=69
71+
equipment_parent=69
72+
equipment_set_bonus=110
7273
settings_button=114
7374
equipment_button=115
7475
popup=117
75-
76-
[bank_equipment]
77-
id=12
78-
parent=69
79-
set_bonus=110
80-
stat_bonus=122
76+
equipment_stat_bonus=122
8177

8278
[bank_inventory]
8379
id=15
@@ -284,9 +280,6 @@ id=607
284280
[duel_inventory]
285281
id=421
286282

287-
[duel_inventory_other]
288-
id=481
289-
290283
[emotes]
291284
id=216
292285
window=0
@@ -298,6 +291,7 @@ emote_scrollbar=4
298291
id=387
299292
inventory_item_container=0
300293
cape=16
294+
dizanas_quiver_item_container=28
301295

302296
[equipment_bonuses]
303297
id=84
@@ -515,10 +509,6 @@ info=2
515509
id=328
516510
info=4
517511

518-
[lms_kda]
519-
id=333
520-
info=4
521-
522512
[login_click_to_play_screen]
523513
id=378
524514
message_of_the_day=6
@@ -535,10 +525,6 @@ looting_bag_inventory=5
535525
[lunar_chest]
536526
id=868
537527

538-
[minigames]
539-
id=160
540-
teleport_button=30
541-
542528
[minimap]
543529
id=160
544530
container=0

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

Lines changed: 3 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.util.EnumSet;
3333
import java.util.List;
3434
import java.util.Map;
35+
import java.util.function.IntPredicate;
3536
import java.util.stream.Collectors;
3637
import javax.annotation.Nonnull;
3738
import javax.annotation.Nullable;
@@ -1584,47 +1585,8 @@ public interface Client extends OAuthApi, GameEngine
15841585
*/
15851586
NPC getHintArrowNpc();
15861587

1587-
/**
1588-
* Checks whether animation smoothing is enabled for players.
1589-
*
1590-
* @return true if player animation smoothing is enabled, false otherwise
1591-
*/
1592-
boolean isInterpolatePlayerAnimations();
1593-
1594-
/**
1595-
* Sets the animation smoothing state for players.
1596-
*
1597-
* @param interpolate the new smoothing state
1598-
*/
1599-
void setInterpolatePlayerAnimations(boolean interpolate);
1600-
1601-
/**
1602-
* Checks whether animation smoothing is enabled for NPC.
1603-
*
1604-
* @return true if NPC animation smoothing is enabled, false otherwise
1605-
*/
1606-
boolean isInterpolateNpcAnimations();
1607-
1608-
/**
1609-
* Sets the animation smoothing state for NPCs.
1610-
*
1611-
* @param interpolate the new smoothing state
1612-
*/
1613-
void setInterpolateNpcAnimations(boolean interpolate);
1614-
1615-
/**
1616-
* Checks whether animation smoothing is enabled for objects.
1617-
*
1618-
* @return true if object animation smoothing is enabled, false otherwise
1619-
*/
1620-
boolean isInterpolateObjectAnimations();
1621-
1622-
/**
1623-
* Sets the animation smoothing state for objects.
1624-
*
1625-
* @param interpolate the new smoothing state
1626-
*/
1627-
void setInterpolateObjectAnimations(boolean interpolate);
1588+
IntPredicate getAnimationInterpolationFilter();
1589+
void setAnimationInterpolationFilter(IntPredicate filter);
16281590

16291591
@VisibleForDevtools
16301592
int[] getBoostedSkillLevels();

runelite-api/src/main/java/net/runelite/api/HealthBar.java renamed to runelite-api/src/main/java/net/runelite/api/HealthBarConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
package net.runelite.api;
2626

27-
public interface HealthBar
27+
public interface HealthBarConfig
2828
{
2929
SpritePixels getHealthBarFrontSprite();
3030

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

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14013,5 +14013,63 @@ public final class ItemID
1401314013
public static final int COLOURFUL_CROWN_SHIRT_29514 = 29514;
1401414014
public static final int COLOURFUL_CROWN_SHIRT_29515 = 29515;
1401514015
public static final int COLOURFUL_CROWN_SHIRT_29516 = 29516;
14016+
public static final int ARMADYL_COMMUNIQU = 29517;
14017+
public static final int UNCONSCIOUS_BROAV = 29518;
14018+
public static final int BROAV = 29519;
14019+
public static final int DIRTY_SHIRT = 29521;
14020+
public static final int WASTEPAPER_BASKET = 29522;
14021+
public static final int RUBY_KEY_29523 = 29523;
14022+
public static final int NOTES_ON_PRESSURE = 29524;
14023+
public static final int MOVARIOS_NOTES_VOLUME_1 = 29525;
14024+
public static final int MOVARIOS_NOTES_VOLUME_2 = 29526;
14025+
public static final int WEIGHT_1KG = 29527;
14026+
public static final int WEIGHT_2KG = 29528;
14027+
public static final int WEIGHT_5KG = 29529;
14028+
public static final int ENRICHED_SNAPDRAGON = 29530;
14029+
public static final int SUPER_TRUTH_SERUM = 29531;
14030+
public static final int TRUTH_SERUM_29532 = 29532;
14031+
public static final int SUSPECT_SKETCH = 29533;
14032+
public static final int CELL_KEY = 29534;
14033+
public static final int STRANGE_TELEORB = 29535;
14034+
public static final int TELEORB = 29536;
14035+
public static final int TELEORB_29537 = 29537;
14036+
public static final int ENRICHED_SNAPDRAGON_SEED = 29538;
14037+
public static final int AGILITY_DOLMEN = 29539;
14038+
public static final int ENERGY_DOLMEN = 29540;
14039+
public static final int RESTORATION_DOLMEN = 29541;
14040+
public static final int ATTACK_DOLMEN = 29542;
14041+
public static final int STRENGTH_DOLMEN = 29543;
14042+
public static final int DEFENCE_DOLMEN = 29544;
14043+
public static final int COMBAT_DOLMEN = 29545;
14044+
public static final int RANGED_DOLMEN = 29546;
14045+
public static final int PRAYER_DOLMEN = 29547;
14046+
public static final int HUNTER_DOLMEN = 29548;
14047+
public static final int FISHING_DOLMEN = 29549;
14048+
public static final int MAGIC_DOLMEN = 29550;
14049+
public static final int BALANCE_DOLMEN = 29551;
14050+
public static final int AIR_BLOCK = 29552;
14051+
public static final int EARTH_BLOCK = 29553;
14052+
public static final int FIRE_BLOCK = 29554;
14053+
public static final int WATER_BLOCK = 29555;
14054+
public static final int VINE_FLOWER = 29556;
14055+
public static final int GRIMY_NOTE = 29558;
14056+
public static final int ELITE_BLACK_FULL_HELM = 29560;
14057+
public static final int ELITE_BLACK_PLATEBODY = 29562;
14058+
public static final int ELITE_BLACK_PLATELEGS = 29564;
14059+
public static final int DARK_SQUALL_HOOD = 29566;
14060+
public static final int DARK_SQUALL_ROBE_TOP = 29568;
14061+
public static final int DARK_SQUALL_ROBE_BOTTOM = 29570;
14062+
public static final int SILIF = 29572;
14063+
public static final int LIT_EXPLOSIVE = 29573;
14064+
public static final int BONE_CLAW = 29574;
14065+
public static final int BONE_CLAWS = 29577;
14066+
public static final int TORMENTED_SYNAPSE = 29580;
14067+
public static final int SMOULDERING_HEART = 29583;
14068+
public static final int SMOULDERING_PILE_OF_FLESH = 29585;
14069+
public static final int SMOULDERING_GLAND = 29587;
14070+
public static final int EMBERLIGHT = 29589;
14071+
public static final int SCORCHING_BOW = 29591;
14072+
public static final int PURGING_STAFF = 29594;
14073+
public static final int DURADELS_NOTES = 29596;
1401614074
/* This file is automatically generated. Do not edit. */
1401714075
}

0 commit comments

Comments
 (0)