Skip to content

Commit

Permalink
Merge branch '1.10.17.2' into hotlite
Browse files Browse the repository at this point in the history
  • Loading branch information
zeruth committed Dec 6, 2023
2 parents 85eb0fd + 1d23a2a commit 4694118
Show file tree
Hide file tree
Showing 21 changed files with 656 additions and 910 deletions.
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.10.17.1</version>
<version>1.10.17.2</version>
</parent>

<artifactId>cache</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions 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.10.17.1</version>
<version>1.10.17.2</version>
<packaging>pom</packaging>

<name>RuneLite</name>
Expand Down Expand Up @@ -62,7 +62,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.17.1</tag>
<tag>runelite-parent-1.10.17.2</tag>
</scm>

<developers>
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.10.17.1</version>
<version>1.10.17.2</version>
</parent>

<artifactId>runelite-api</artifactId>
Expand Down
1 change: 1 addition & 0 deletions runelite-api/src/main/java/net/runelite/api/EnumID.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public final class EnumID
* val: namedobj
*/
public static final int PETS = 2158;
public static final int POH_COSTUME_MEMBERS = 3077;
public static final int POH_COSTUMES_CLUE_BEGINNER = 3293;
public static final int POH_COSTUMES_CLUE_EASY = 3294;
public static final int POH_COSTUMES_CLUE_MEDIUM = 3295;
Expand Down
7 changes: 7 additions & 0 deletions runelite-api/src/main/java/net/runelite/api/ScriptID.java
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ public final class ScriptID
* because you need an op listener attached to it for it to work
*/
@ScriptArguments()
@Deprecated
public static final int NULL = 10003;

/**
Expand Down Expand Up @@ -301,6 +302,9 @@ public final class ScriptID
@ScriptArguments(integer = 4, string = 1)
public static final int XPDROPS_SETDROPSIZE = 996;

@ScriptArguments(integer = 34)
public static final int BANKMAIN_INIT = 274;

/**
* Main layout script for the bank
* <ul>
Expand Down Expand Up @@ -330,6 +334,9 @@ public final class ScriptID
@ScriptArguments(integer = 18)
public static final int BANKMAIN_SEARCH_TOGGLE = 281;

@ScriptArguments(integer = 6)
public static final int BANKMAIN_SIZE_CHECK = 840;

/**
* Chooses the click handler for a {@link ParamID#SETTING_SLIDER_CUSTOM_ONOP} = 1 settings slider
*
Expand Down
17 changes: 15 additions & 2 deletions runelite-api/src/main/java/net/runelite/api/widgets/Widget.java
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,8 @@ public interface Widget

/**
* Gets a dynamic child by index
*
* @throws IndexOutOfBoundsException if the index is outside of the child array
*/
@Nullable
Widget getChild(int index);

/**
Expand Down Expand Up @@ -622,6 +621,13 @@ Widget setSize(int width, int height,
@Nullable
String[] getActions();

/**
* Create a static widget child
* @param type the {@link WidgetType} of the widget
* @return
*/
Widget createStaticChild(@MagicConstant(valuesFromClass = WidgetType.class) int type);

/**
* Creates a dynamic widget child
*
Expand Down Expand Up @@ -1030,6 +1036,13 @@ Widget setSize(int width, int height,
*/
void setOnDragListener(Object ...args);

/**
* Sets a script to be ran when the mouse is scrolled when on the widget
*
* @param args A ScriptID, then the args for the script
*/
void setOnScrollWheelListener(Object ...args);

/**
* Container this can be dragged in
*/
Expand Down
2 changes: 1 addition & 1 deletion runelite-client/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.10.17.1</version>
<version>1.10.17.2</version>
</parent>

<artifactId>client</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ private BankSearch(
public void layoutBank()
{
Widget bankContainer = client.getWidget(ComponentID.BANK_ITEM_CONTAINER);
if (bankContainer == null || bankContainer.isHidden())
if (bankContainer == null)
{
return;
}
Expand Down
Loading

0 comments on commit 4694118

Please sign in to comment.