Merge pull request #1677 from gmason0/fix/menuaction Update MENU_ACTION_DESCRIPTOR_VANILLA signature

gradle.properties

@@ -28,10 +28,10 @@ org.gradle.parallel=true
 org.gradle.caching=false
 
 project.build.group=net.runelite
-project.build.version=1.12.15
+project.build.version=1.12.16
 
 glslang.path=
-microbot.version=2.1.17
+microbot.version=2.1.18
 microbot.commit.sha=nogit
 microbot.repo.url=http://138.201.81.246:8081/repository/microbot-snapshot/
 microbot.repo.username=

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

@@ -13015,5 +13015,8 @@ public final class NpcID
 	public static final int ZEMOUREGAL_15564 = 15564;
 	public static final int GUARD_15566 = 15566;
 	public static final int GUARD_15568 = 15568;
+	public static final int KETZEK_15572 = 15572;
+	public static final int KETZEK_15573 = 15573;
+	public static final int TZTOKJAD_15574 = 15574;
 /* This file is automatically generated. Do not edit. */
 }

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

@@ -16634,5 +16634,7 @@ public final class NullItemID
 	public static final int NULL_33073 = 33073;
 	public static final int NULL_33075 = 33075;
 	public static final int NULL_33076 = 33076;
+	public static final int NULL_33078 = 33078;
+	public static final int NULL_33079 = 33079;
 /* This file is automatically generated. Do not edit. */
 }

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

@@ -13715,5 +13715,6 @@ public final class AnimationID
 	public static final int DEADMAN_2026_SOTD_SPECIAL_TOXIC_UNCHARGED = 13715;
 	public static final int DEADMAN_2026_SOTD_SPECIAL_TOXIC_CHARGED = 13716;
 	public static final int ZUK_SPAWN_NO_ROCK = 13717;
+	public static final int FEVER_SPIDER_DEATH = 13718;
 /* This file is automatically generated. Do not edit. */
 }

runelite-api/src/main/java/net/runelite/api/gameval/DBTableID.java

@@ -9463,15 +9463,20 @@ public static final class SlayerTask
 		 */
 		public static final int COL_EXTENSION_MIN_MAX = 15;
 
+		/**
+		 * (dbrow, integer, integer)
+		 */
+		public static final int COL_EXTENSION_ADDITIVE = 16;
+
 		/**
 		 * dbrow
 		 */
-		public static final int COL_BLOCK_UNLOCK = 16;
+		public static final int COL_BLOCK_UNLOCK = 17;
 
 		/**
 		 * integer
 		 */
-		public static final int COL_RELATED_CONTENT = 17;
+		public static final int COL_RELATED_CONTENT = 18;
 
 		public static final class Row
 		{
@@ -10033,6 +10038,11 @@ public static final class SlayerArea
 		 */
 		public static final int COL_AREA_NAME_IN_HELPER = 3;
 
+		/**
+		 * string
+		 */
+		public static final int COL_AREA_HINT = 4;
+
 		/**
 		 * integer
 		 */
@@ -10262,6 +10272,7 @@ public static final class Row
 			public static final int SLAYER_REWARDS_LONGER_WYRMS = 9419;
 			public static final int SLAYER_REWARDS_UNLOCK_GRYPHONS = 9420;
 			public static final int SLAYER_REWARDS_UNLOCK_HELM_HOODED = 9641;
+			public static final int SLAYER_REWARDS_LONGER_GRYPHONS = 9642;
 		}
 	}
 
@@ -14766,6 +14777,11 @@ public static final class SailingDock
 		 */
 		public static final int COL_LEVEL_REQUIRED = 4;
 
+		/**
+		 * dbrow
+		 */
+		public static final int COL_QUEST_REQUIRED = 5;
+
 		/**
 		 * graphic
 		 */

runelite-api/src/main/java/net/runelite/api/gameval/InterfaceID.java

@@ -953,6 +953,7 @@ public final class InterfaceID
 	public static final int PATCHY = 946;
 	public static final int MENU_NEW = 947;
 	public static final int DEADMANSKULL_INTERFACE = 948;
+	public static final int QUETZALWHISTLE_MENU = 949;
 
 	public static final class _100GuideEggsOverlay
 	{
@@ -30844,5 +30845,28 @@ public static final class DeadmanskullInterface
 		public static final int RESIZE_PREVIEW = 0x03b4_000e;
 		public static final int TOOLTIP = 0x03b4_000f;
 	}
+
+	public static final class QuetzalwhistleMenu
+	{
+		public static final int UNIVERSE = 0x03b5_0000;
+		public static final int CONTENTS = 0x03b5_0001;
+		public static final int BACKGROUND = 0x03b5_0002;
+		public static final int SCROLL = 0x03b5_0003;
+		public static final int MAP = 0x03b5_0004;
+		public static final int BACKGROUND_MODEL2 = 0x03b5_0005;
+		public static final int BACKGROUND_MODEL3 = 0x03b5_0006;
+		public static final int BACKGROUND_MODEL4 = 0x03b5_0007;
+		public static final int BACKGROUND_MODEL5 = 0x03b5_0008;
+		public static final int BACKGROUND_MODEL6 = 0x03b5_0009;
+		public static final int BACKGROUND_MODEL7 = 0x03b5_000a;
+		public static final int BACKGROUND_MODEL8 = 0x03b5_000b;
+		public static final int ICONS = 0x03b5_000c;
+		public static final int CURRENT = 0x03b5_000d;
+		public static final int SELECTED_BACK = 0x03b5_000e;
+		public static final int SELECTED_FRONT = 0x03b5_000f;
+		public static final int SELECTED_LOCKED = 0x03b5_0010;
+		public static final int SELECTED_CURRENT = 0x03b5_0011;
+		public static final int CLOSE = 0x03b5_0012;
+	}
 /* This file is automatically generated. Do not edit. */
 }

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

@@ -91217,6 +91217,8 @@ public static final class Cert
 		public static final int MAGIC_ROCK_OF_FORTUITY_INACTIVE = 33048;
 		public static final int MAGIC_ROCK_OF_FORTUITY_ACTIVE = 33051;
 		public static final int SAILING_FACILITY_BOTTLE_EMPTY = 33075;
+		public static final int BREW_RED_RUM = 33078;
+		public static final int BREW_BLUE_RUM = 33079;
 	}
 
 	public static final class Placeholder

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

@@ -67696,5 +67696,20 @@ public final class NpcID
 	public static final int DEADMAN_THRALL_ZOMBIE_GREATER_ZUK = 15569;
 	public static final int DEADMAN_THRALL_SKELETAL_GREATER_PRINCESS = 15570;
 	public static final int DEADMAN_THRALL_GHOSTLY_GREATER_WISP = 15571;
+
+	/**
+	 * Ket-Zek
+	 */
+	public static final int TZHAAR_FIGHTPIT_SWARM_4A = 15572;
+
+	/**
+	 * Ket-Zek
+	 */
+	public static final int TZHAAR_FIGHTPIT_SWARM_4B = 15573;
+
+	/**
+	 * TzTok-Jad
+	 */
+	public static final int TZHAAR_FIGHTPIT_SWARM_BOSS = 15574;
 /* This file is automatically generated. Do not edit. */
 }

runelite-api/src/main/java/net/runelite/api/gameval/VarbitID.java

@@ -13897,6 +13897,7 @@ public final class VarbitID
 	public static final int DEADMAN_2026_INITIAL_SETUP_DONE = 19678;
 	public static final int DEADMAN_2026_TUTORIAL_END = 19679;
 	public static final int DEADMAN_2026_TUTORIAL_TELEPORT_DEST = 19680;
+	public static final int SETTINGS_QUETZALWHISTLE_DEFAULT_TP = 19681;
 	public static final int DEADMAN_SKULL_TAB = 19682;
 	public static final int SIGIL_OF_AGILE_FORTUNE_STATE = 19683;
 	public static final int SIGIL_OF_HOARDING_STATE = 19684;

runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java

@@ -2030,7 +2030,7 @@ public class CrypticClue extends ClueScroll implements NpcClueScroll, ObjectClue
 		CrypticClue.builder()
 			.itemId(ItemID.TRAIL_ELITE_RIDDLE_SAIL)
 			.text("Their bane awaits, but don't be going in there without permission.")
-			.location(new WorldPoint(3120, 2424, 0))
+			.location(new WorldPoint(3176, 2478, 0))
 			.npc("Shellbane gryphon")
 			.solution("Kill the shellbane gryphon.")
 			.build(),

runelite-client/src/main/java/net/runelite/client/plugins/microbot/util/reflection/Rs2Reflection.java

@@ -32,7 +32,7 @@ public static void invokeMenu(int param0, int param1, int opcode, int identifier
     {
         if (menuAction == null)
         {
-            final String MENU_ACTION_DESCRIPTOR_VANILLA = "(IIIIIILjava/lang/String;Ljava/lang/String;IIB)V";
+            final String MENU_ACTION_DESCRIPTOR_VANILLA = "(IIIIIILjava/lang/String;Ljava/lang/String;III)V";
             final String MENU_ACTION_DESCRIPTOR_RUNELITE = "(IILnet/runelite/api/MenuAction;IILjava/lang/String;Ljava/lang/String;)V";
 
             final Class<?> clientClazz = Microbot.getClient().getClass();

runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/ping/Ping.java

@@ -98,14 +98,10 @@ public static int ping(World world, boolean useTcpPing)
 					catch (IOException ex)
 					{
 						log.debug("error during icmp ping", ex);
-					}
-					// FALLTHROUGH
-				default:
-					if (useTcpPing)
-					{
 						return tcpPing(inetAddress);
 					}
-					return -1;
+				default:
+					return tcpPing(inetAddress);
 			}
 		}
 		catch (IOException ex)

runelite-client/src/main/scripts/BankMainBuild.hash

@@ -1 +1 @@
-74F5261D8C6A9EDB8BA3354B82BE354427CA6F962EC0824A0CA9658075E17C3F
+1E188C47BE23BDDA6760D0F9E0F5F718657668683D350283CD5094FCB2ECBF97