Skip to content

Commit

Permalink
Merge branch '220-1.10.23.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@zeruth
zeruth committed Feb 27, 2024
2 parents 855ce2f + 62d4adc commit 45acba7
Show file tree
Hide file tree
Showing 47 changed files with 1,898 additions and 336 deletions.
2 changes: 1 addition & 1 deletion cache/pom.xml
View file
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.10.22</version>
<version>1.10.23.1</version>
</parent>

<artifactId>cache</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
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.10.22</version>
<version>1.10.23.1</version>
<packaging>pom</packaging>

<name>RuneLite</name>
Expand Down Expand Up @@ -65,7 +65,7 @@
<url>https://github.com/runelite/runelite</url>
<connection>scm:git:git://github.com/runelite/runelite</connection>
<developerConnection>scm:git:[email protected]:runelite/runelite</developerConnection>
<tag>runelite-parent-1.10.22</tag>
<tag>runelite-parent-1.10.23.1</tag>
</scm>

<developers>
Expand Down
2 changes: 1 addition & 1 deletion runelite-api/pom.xml
View file
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.10.22</version>
<version>1.10.23.1</version>
</parent>

<artifactId>runelite-api</artifactId>
Expand Down
12 changes: 12 additions & 0 deletions runelite-api/src/main/interfaces/interfaces.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ settings_button=113
equipment_button=114
popup=116

[bank_equipment]
id=12
parent=69
set_bonus=109
stat_bonus=121

[bank_inventory]
id=15
item_container=3
Expand Down Expand Up @@ -290,6 +296,12 @@ emote_scrollbar=4
id=387
inventory_item_container=0

[equipment_bonuses]
id=84
parent=1
set_bonus=43
stat_bonus=48

[equipment_inventory]
id=85

Expand Down
15 changes: 14 additions & 1 deletion runelite-api/src/main/java/net/runelite/api/Client.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ public interface Client extends OAuthApi, GameEngine
/**
* Gets the widget that is being dragged on.
* <p>
* The widget being dragged has the {@link net.runelite.api.widgets.WidgetConfig#DRAG_ON}
* The widget being dragged has the {@link net.runelite.api.widgets.WidgetConfig#DRAG}
* flag set, and is the widget currently under the dragged widget.
*
* @return the dragged on widget, null if not dragging any widget
Expand Down Expand Up @@ -1501,6 +1501,19 @@ Projectile createProjectile(int id, int plane, int startX, int startY, int start
*/
void setCameraPitchTarget(int cameraPitchTarget);

/**
* Sets the camera speed
* @param speed
*/
void setCameraSpeed(float speed);

/**
* Sets the mask for which mouse buttons control the camera.
* Use 0 for the default behavior of mouse button 4 if "middle mouse moves camera" is on.
* @param mask
*/
void setCameraMouseButtonMask(int mask);

/**
* Sets whether the camera pitch can exceed the normal limits set
* by the RuneScape client.
Expand Down
15 changes: 14 additions & 1 deletion runelite-api/src/main/java/net/runelite/api/ItemID.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6885,7 +6885,6 @@ public final class ItemID
public static final int DREAMY_LAMP = 11157;
public static final int CYRISUSS_CHEST = 11158;
public static final int HUNTER_KIT = 11159;
public static final int RESTORED_SHIELD = 11164;
public static final int PHOENIX_CROSSBOW_11165 = 11165;
public static final int PHOENIX_CROSSBOW_11167 = 11167;
public static final int NEWSPAPER = 11169;
Expand Down Expand Up @@ -13668,5 +13667,19 @@ public final class ItemID
public static final int SCURRIUS_SPINE = 28798;
public static final int ANTIQUE_LAMP_28800 = 28800;
public static final int SCURRY = 28801;
public static final int GRUBBY_KEY_28803 = 28803;
public static final int BOTTLE = 28804;
public static final int BOTTLE_OF_MIST = 28805;
public static final int IMBUED_BARRONITE = 28806;
public static final int SHIELD_OF_ARRAV = 28807;
public static final int LIST_OF_ELDERS = 28808;
public static final int ELIAS_WHITE = 28809;
public static final int ZOMBIE_AXE = 28810;
public static final int BROKEN_ZOMBIE_AXE = 28813;
public static final int STONE_TABLET_28816 = 28816;
public static final int GRANITE_TABLET = 28817;
public static final int SLATE_TABLET = 28818;
public static final int SHALE_TABLET = 28819;
public static final int ANTIQUE_LAMP_28820 = 28820;
/* This file is automatically generated. Do not edit. */
}
70 changes: 67 additions & 3 deletions runelite-api/src/main/java/net/runelite/api/NpcID.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6248,8 +6248,7 @@ public final class NpcID
public static final int RICHARD_6954 = 6954;
public static final int FATHER_JEAN = 6955;
public static final int MONK_6956 = 6956;
public static final int CHIEF_FARMER = 6957;
public static final int FARMERS_WIFE = 6958;
public static final int DALE = 6957;
public static final int FARMER_6959 = 6959;
public static final int FARMER_6960 = 6960;
public static final int FARMER_6961 = 6961;
Expand Down Expand Up @@ -10133,7 +10132,6 @@ public final class NpcID
public static final int ALI_THE_TEA_SELLER = 12102;
public static final int MORGIANA = 12103;
public static final int CASSIM = 12104;
public static final int ELIAS_WHITE = 12105;
public static final int SKELETON_HELLHOUND_12107 = 12107;
public static final int GREATER_SKELETON_HELLHOUND_12108 = 12108;
public static final int TOOL_LEPRECHAUN_12109 = 12109;
Expand Down Expand Up @@ -10573,6 +10571,25 @@ public final class NpcID
public static final int GOOSE_12605 = 12605;
public static final int LAVA_DRAGON_12607 = 12607;
public static final int LAVA_DRAGON_12608 = 12608;
public static final int ELIAS_WHITE = 12610;
public static final int ELIAS_WHITE_12611 = 12611;
public static final int ARRAV = 12612;
public static final int ARRAV_12613 = 12613;
public static final int ZEMOUREGAL = 12614;
public static final int ZEMOUREGAL_12615 = 12615;
public static final int SHARATHTEERK = 12617;
public static final int MONK_OF_ZAMORAK_12618 = 12618;
public static final int MONK_OF_ZAMORAK_12619 = 12619;
public static final int AEONISIG_RAISPHER_12620 = 12620;
public static final int KING_ROALD_12621 = 12621;
public static final int SIR_PRYSIN_12622 = 12622;
public static final int AMBASSADOR_FERRNOOK_12623 = 12623;
public static final int QUEEN_ELLAMARIA_12624 = 12624;
public static final int QUEEN_ELLAMARIA_12625 = 12625;
public static final int RELDO_12626 = 12626;
public static final int CAPTAIN_ROVIN_12627 = 12627;
public static final int TREZNOR_12628 = 12628;
public static final int DIMINTHEIS_12629 = 12629;
public static final int TRADER_STAN_12630 = 12630;
public static final int TRADER_STAN_12631 = 12631;
public static final int TRADER_CREWMEMBER_12632 = 12632;
Expand Down Expand Up @@ -10656,5 +10673,52 @@ public final class NpcID
public static final int DWARF_12710 = 12710;
public static final int DWARF_12711 = 12711;
public static final int DWARF_12712 = 12712;
public static final int GUARD_12713 = 12713;
public static final int GUARD_12714 = 12714;
public static final int GUARD_12715 = 12715;
public static final int GUARD_12716 = 12716;
public static final int GUARD_12717 = 12717;
public static final int GUARD_12718 = 12718;
public static final int GUARD_12719 = 12719;
public static final int ARMOURED_ZOMBIE = 12720;
public static final int ARMOURED_ZOMBIE_12721 = 12721;
public static final int ARMOURED_ZOMBIE_12722 = 12722;
public static final int ARMOURED_ZOMBIE_12723 = 12723;
public static final int ARMOURED_ZOMBIE_12724 = 12724;
public static final int ARMOURED_ZOMBIE_12725 = 12725;
public static final int ARMOURED_ZOMBIE_12726 = 12726;
public static final int ARMOURED_ZOMBIE_12727 = 12727;
public static final int ARMOURED_ZOMBIE_12728 = 12728;
public static final int ARMOURED_ZOMBIE_12729 = 12729;
public static final int ARMOURED_ZOMBIE_12730 = 12730;
public static final int ARMOURED_ZOMBIE_12731 = 12731;
public static final int ARMOURED_ZOMBIE_12732 = 12732;
public static final int ARMOURED_ZOMBIE_12733 = 12733;
public static final int ARMOURED_ZOMBIE_12734 = 12734;
public static final int ARMOURED_ZOMBIE_12735 = 12735;
public static final int ARMOURED_ZOMBIE_12736 = 12736;
public static final int ARMOURED_ZOMBIE_12737 = 12737;
public static final int ARMOURED_ZOMBIE_12738 = 12738;
public static final int ARMOURED_ZOMBIE_12739 = 12739;
public static final int ARMOURED_ZOMBIE_12740 = 12740;
public static final int ARMOURED_ZOMBIE_12741 = 12741;
public static final int ARMOURED_ZOMBIE_12742 = 12742;
public static final int ARMOURED_ZOMBIE_12743 = 12743;
public static final int ARMOURED_ZOMBIE_12744 = 12744;
public static final int ARMOURED_ZOMBIE_12745 = 12745;
public static final int ARMOURED_ZOMBIE_12746 = 12746;
public static final int ARMOURED_ZOMBIE_12747 = 12747;
public static final int ARMOURED_ZOMBIE_12748 = 12748;
public static final int ARMOURED_ZOMBIE_12749 = 12749;
public static final int ARMOURED_ZOMBIE_12755 = 12755;
public static final int ARMOURED_ZOMBIE_12756 = 12756;
public static final int ARMOURED_ZOMBIE_12757 = 12757;
public static final int ARMOURED_ZOMBIE_12758 = 12758;
public static final int ARMOURED_ZOMBIE_12759 = 12759;
public static final int ARMOURED_ZOMBIE_12760 = 12760;
public static final int ARMOURED_ZOMBIE_12761 = 12761;
public static final int ARMOURED_ZOMBIE_12762 = 12762;
public static final int ARMOURED_ZOMBIE_12763 = 12763;
public static final int ARMOURED_ZOMBIE_12764 = 12764;
/* This file is automatically generated. Do not edit. */
}
5 changes: 5 additions & 0 deletions runelite-api/src/main/java/net/runelite/api/NullItemID.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4164,6 +4164,7 @@ public final class NullItemID
public static final int NULL_11161 = 11161;
public static final int NULL_11162 = 11162;
public static final int NULL_11163 = 11163;
public static final int NULL_11164 = 11164;
public static final int NULL_11166 = 11166;
public static final int NULL_11168 = 11168;
public static final int NULL_11170 = 11170;
Expand Down Expand Up @@ -14924,5 +14925,9 @@ public final class NullItemID
public static final int NULL_28797 = 28797;
public static final int NULL_28799 = 28799;
public static final int NULL_28802 = 28802;
public static final int NULL_28811 = 28811;
public static final int NULL_28812 = 28812;
public static final int NULL_28814 = 28814;
public static final int NULL_28815 = 28815;
/* This file is automatically generated. Do not edit. */
}
8 changes: 8 additions & 0 deletions runelite-api/src/main/java/net/runelite/api/NullNpcID.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -697,6 +697,7 @@ public final class NullNpcID
public static final int NULL_6924 = 6924;
public static final int NULL_6925 = 6925;
public static final int NULL_6946 = 6946;
public static final int NULL_6958 = 6958;
public static final int NULL_7016 = 7016;
public static final int NULL_7017 = 7017;
public static final int NULL_7070 = 7070;
Expand Down Expand Up @@ -1953,6 +1954,7 @@ public final class NullNpcID
public static final int NULL_12039 = 12039;
public static final int NULL_12042 = 12042;
public static final int NULL_12083 = 12083;
public static final int NULL_12105 = 12105;
public static final int NULL_12106 = 12106;
public static final int NULL_12119 = 12119;
public static final int NULL_12136 = 12136;
Expand Down Expand Up @@ -2018,5 +2020,11 @@ public final class NullNpcID
public static final int NULL_12596 = 12596;
public static final int NULL_12606 = 12606;
public static final int NULL_12609 = 12609;
public static final int NULL_12616 = 12616;
public static final int NULL_12750 = 12750;
public static final int NULL_12751 = 12751;
public static final int NULL_12752 = 12752;
public static final int NULL_12753 = 12753;
public static final int NULL_12754 = 12754;
/* This file is automatically generated. Do not edit. */
}
Loading

0 comments on commit 45acba7

Please sign in to comment.