Merge branch '1.10.21.2'

cache/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.10.21.1</version>
+		<version>1.10.21.2</version>
 	</parent>
 
 	<artifactId>cache</artifactId>

pom.xml

@@ -28,7 +28,7 @@
 
 	<groupId>net.runelite</groupId>
 	<artifactId>runelite-parent</artifactId>
-	<version>1.10.21.1</version>
+	<version>1.10.21.2</version>
 	<packaging>pom</packaging>
 
 	<name>RuneLite</name>
@@ -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.21.1</tag>
+		<tag>runelite-parent-1.10.21.2</tag>
 	</scm>
 
 	<developers>

runelite-api/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.10.21.1</version>
+		<version>1.10.21.2</version>
 	</parent>
 
 	<artifactId>runelite-api</artifactId>

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

@@ -416,6 +416,7 @@ id=726
 id=724
 ui=2
 item_container=10
+search_button=16
 
 [group_storage_inventory]
 id=725

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

@@ -57,6 +57,7 @@ public final class AnimationID
 	public static final int WOODCUTTING_2H_RUNE = 10070;
 	public static final int WOODCUTTING_2H_DRAGON = 10071;
 	public static final int WOODCUTTING_2H_CRYSTAL = 10072;
+	public static final int WOODCUTTING_2H_CRYSTAL_INACTIVE = 10073;
 	public static final int WOODCUTTING_2H_3A = 10074;
 	public static final int CONSUMING = 829; // consuming consumables
 	public static final int FIREMAKING = 733;

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

@@ -10571,6 +10571,8 @@ public final class NpcID
 	public static final int BARBARIAN_BARTENDER = 12603;
 	public static final int WAITRESS = 12604;
 	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 TRADER_STAN_12630 = 12630;
 	public static final int TRADER_STAN_12631 = 12631;
 	public static final int TRADER_CREWMEMBER_12632 = 12632;

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

@@ -2017,5 +2017,6 @@ public final class NullNpcID
 	public static final int NULL_12595 = 12595;
 	public static final int NULL_12596 = 12596;
 	public static final int NULL_12606 = 12606;
+	public static final int NULL_12609 = 12609;
 	/* This file is automatically generated. Do not edit. */
 }

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

@@ -25428,6 +25428,15 @@ public final class NullObjectID
 	public static final int NULL_50016 = 50016;
 	public static final int NULL_50017 = 50017;
 	public static final int NULL_50018 = 50018;
+	public static final int NULL_50020 = 50020;
+	public static final int NULL_50021 = 50021;
+	public static final int NULL_50022 = 50022;
+	public static final int NULL_50023 = 50023;
+	public static final int NULL_50024 = 50024;
+	public static final int NULL_50025 = 50025;
+	public static final int NULL_50026 = 50026;
+	public static final int NULL_50027 = 50027;
+	public static final int NULL_50028 = 50028;
 	public static final int NULL_50038 = 50038;
 	public static final int NULL_50039 = 50039;
 	public static final int NULL_50040 = 50040;

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

@@ -106,4 +106,16 @@ public interface ObjectComposition extends ParamHolder
 	 * @see #getImpostorIds()
 	 */
 	int getVarPlayerId();
+
+	/**
+	 * Get the size of the object on the X-axis in tiles
+	 * @return
+	 */
+	int getSizeX();
+
+	/**
+	 * Get the size of the object on the Y-axis in tiles
+	 * @return
+	 */
+	int getSizeY();
 }

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

@@ -24574,6 +24574,7 @@ public final class ObjectID
 	public static final int ROOTS_50007 = 50007;
 	public static final int ROOTS_50008 = 50008;
 	public static final int ROOTS_50009 = 50009;
+	public static final int BIG_EGG_50019 = 50019;
 	public static final int TREE_50034 = 50034;
 	public static final int TREE_STUMP_50035 = 50035;
 	public static final int SNOW_SHARK = 50036;

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

@@ -60,12 +60,19 @@ public interface ScriptEvent
 	Object[] getArguments();
 
 	/**
-	 * Gets the menu index of the event
+	 * Gets the menu op of the event
 	 *
-	 * @return the index
+	 * @return the menu op
 	 */
 	int getOp();
 
+	/**
+	 * Set the menu op of the event
+	 *
+	 * @param op
+	 */
+	ScriptEvent setOp(int op);
+
 	/**
 	 * Gets the target of the menu option
 	 *

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

@@ -871,4 +871,12 @@ public final class Varbits
 	 * This varbit determines which location he will appear in, which is useful for a master clue step.
 	 */
 	public static final int VIGGORA_LOCATION = 815;
+
+	/**
+	 * If the player has a spellbook swap active
+	 * <p>
+	 * 0 = inactive
+	 * 1 = active
+	 */
+	public static final int SPELLBOOK_SWAP = 3617;
 }

runelite-api/src/main/java/net/runelite/api/widgets/Widget.java

@@ -621,13 +621,6 @@ 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
 	 *

runelite-client/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.10.21.1</version>
+		<version>1.10.21.2</version>
 	</parent>
 
 	<artifactId>client</artifactId>

runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/FremennikDiaryRequirement.java

@@ -106,12 +106,12 @@ public FremennikDiaryRequirement()
 		add("Teleport to Waterbirth Island.",
 			new SkillRequirement(Skill.MAGIC, 72),
 			new QuestRequirement(Quest.LUNAR_DIPLOMACY));
-		add("Obtain the Blast Furnace Foreman's permission to use the Blast Furnace for free.",
+		add("Obtain the Blast Furnace Foremans permission to use the Blast Furnace for free.",
 			new SkillRequirement(Skill.SMITHING, 60),
 			new QuestRequirement(Quest.THE_GIANT_DWARF, true));
 
 		// ELITE
-		add("Craft 56 astral runes simultaneously from Essence without the use of Extracts.",
+		add("Craft 56 astral runes from Essence simultaneously from Essence without the use of Extracts.",
 			new SkillRequirement(Skill.RUNECRAFT, 82),
 			new QuestRequirement(Quest.LUNAR_DIPLOMACY));
 		add("Create a dragonstone amulet in the Neitiznot furnace.",

runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/KandarinDiaryRequirement.java

@@ -120,7 +120,7 @@ public KandarinDiaryRequirement()
 			new SkillRequirement(Skill.AGILITY, 60));
 		add("Smith a Rune Hasta at Otto's Grotto.",
 			new SkillRequirement(Skill.SMITHING, 90));
-		add("Construct a Pyre ship from Magic Logs.(Requires Chewed Bones.)",
+		add("Construct a Pyre ship from Magic Logs.",
 			new SkillRequirement(Skill.FIREMAKING, 85),
 			new SkillRequirement(Skill.CRAFTING, 85));
 		add("Teleport to Catherby.",

runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/WesternDiaryRequirement.java

@@ -128,7 +128,7 @@ public WesternDiaryRequirement()
 		add("Fletch a Magic Longbow in Tirannwn.",
 			new SkillRequirement(Skill.FLETCHING, 85),
 			new QuestRequirement(Quest.MOURNINGS_END_PART_I));
-		add("Kill the Thermonuclear Smoke devil (Does not require task).",
+		add("Kill the Thermonuclear Smoke devil.",
 			new SkillRequirement(Skill.SLAYER, 93));
 		add("Have Prissy Scilla protect your Magic tree.",
 			new SkillRequirement(Skill.FARMING, 75));

runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java

@@ -37,7 +37,6 @@
 import net.runelite.api.Skill;
 import net.runelite.client.ui.overlay.OverlayPanel;
 import net.runelite.client.ui.overlay.OverlayPosition;
-import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.components.LineComponent;
 
 class LapCounterOverlay extends OverlayPanel
@@ -54,7 +53,7 @@ private LapCounterOverlay(AgilityPlugin plugin, AgilityConfig config, Client cli
 	{
 		super(plugin);
 		setPosition(OverlayPosition.TOP_LEFT);
-		setPriority(OverlayPriority.LOW);
+		setPriority(PRIORITY_LOW);
 		this.plugin = plugin;
 		this.config = config;
 		this.client = client;

runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java

@@ -2,6 +2,7 @@
  * Copyright (c) 2018, TheLonelyDev <https://github.com/TheLonelyDev>
  * Copyright (c) 2018, Jeremy Plsek <https://github.com/jplsek>
  * Copyright (c) 2019, Hydrox6 <[email protected]>
+ * Copyright (c) 2024, PhraZier <https://github.com/phrazier>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -132,6 +133,31 @@ public void keyPressed(KeyEvent e)
 					e.consume();
 				}
 
+				Widget groupStorageSearchButton = client.getWidget(ComponentID.GROUP_STORAGE_SEARCH_BUTTON);
+				if (groupStorageSearchButton != null)
+				{
+					log.debug("Search hotkey pressed");
+					clientThread.invoke(() ->
+					{
+						Widget searchButton = client.getWidget(ComponentID.GROUP_STORAGE_SEARCH_BUTTON);
+						if (searchButton == null || searchButton.isHidden())
+						{
+							return;
+						}
+
+						Object[] searchToggleArgs = searchButton.getOnOpListener();
+						if (searchToggleArgs == null)
+						{
+							return;
+						}
+
+						client.createScriptEvent(searchToggleArgs) // [clientscript,shared_bank_search_toggle]
+							.setOp(1)
+							.run();
+					});
+					e.consume();
+				}
+
 				Widget seedVaultSearchButton = client.getWidget(ComponentID.SEED_VAULT_SEARCH_BUTTON);
 				if (seedVaultSearchButton != null)
 				{