Merge remote-tracking branch 'runelite/master' into upstream-0203

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

@@ -11770,5 +11770,6 @@ public final class ItemID
 	public static final int DHAROKS_GREATAXE_25516 = 25516;
 	public static final int VOLATILE_NIGHTMARE_STAFF_25517 = 25517;
 	public static final int ANCESTRAL_HAT_25518 = 25518;
+	public static final int JALREKJAD = 25519;
 	/* This file is automatically generated. Do not edit. */
 }

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

@@ -8972,5 +8972,11 @@ public final class NpcID
 	public static final int UNICORN1337KILR = 10609;
 	public static final int BOB_10610 = 10610;
 	public static final int BOB_10611 = 10611;
+	public static final int JALREKJAD = 10620;
+	public static final int TZHAARKETRAK = 10621;
+	public static final int TZHAARKETRAK_10622 = 10622;
+	public static final int JALTOKJAD_10623 = 10623;
+	public static final int YTHURKOT_10624 = 10624;
+	public static final int JALREKJAD_10625 = 10625;
 	/* This file is automatically generated. Do not edit. */
 }

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

@@ -13538,5 +13538,6 @@ public final class NullItemID
 	public static final int NULL_25483 = 25483;
 	public static final int NULL_25501 = 25501;
 	public static final int NULL_25503 = 25503;
+	public static final int NULL_25520 = 25520;
 	/* This file is automatically generated. Do not edit. */
 }

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

@@ -1631,5 +1631,6 @@ public final class NullNpcID
 	public static final int NULL_10617 = 10617;
 	public static final int NULL_10618 = 10618;
 	public static final int NULL_10619 = 10619;
+	public static final int NULL_10626 = 10626;
 	/* This file is automatically generated. Do not edit. */
 }

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

@@ -20059,6 +20059,7 @@ public final class NullObjectID
 	public static final int NULL_41010 = 41010;
 	public static final int NULL_41011 = 41011;
 	public static final int NULL_41012 = 41012;
+	public static final int NULL_41014 = 41014;
 	public static final int NULL_41022 = 41022;
 	public static final int NULL_41191 = 41191;
 	public static final int NULL_41192 = 41192;

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

@@ -20940,6 +20940,7 @@ public final class ObjectID
 	public static final int CAGED_MONKEY_SHEEP = 40971;
 	public static final int FIREWORKS = 40972;
 	public static final int POST_40982 = 40982;
+	public static final int SCOREBOARD_41013 = 41013;
 	public static final int POTION_OF_POWER_TABLE_41023 = 41023;
 	public static final int PEDESTAL_SPACE = 41024;
 	public static final int PEDESTAL_SPACE_41025 = 41025;

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

@@ -376,7 +376,7 @@ public class Perspective
 	 */
 	public static Polygon getCanvasTilePoly(@Nonnull Client client, @Nonnull LocalPoint localLocation, int zOffset)
 	{
-		return getCanvasTileAreaPoly(client, localLocation, 1, 1, zOffset);
+		return getCanvasTileAreaPoly(client, localLocation, 1, 1, client.getPlane(), zOffset);
 	}
 
 	/**
@@ -389,7 +389,7 @@ public class Perspective
 	 */
 	public static Polygon getCanvasTileAreaPoly(@Nonnull Client client, @Nonnull LocalPoint localLocation, int size)
 	{
-		return getCanvasTileAreaPoly(client, localLocation, size, size, 0);
+		return getCanvasTileAreaPoly(client, localLocation, size, size, client.getPlane(), 0);
 	}
 
 	/**
@@ -399,6 +399,7 @@ public class Perspective
 	 * @param localLocation the center location of the AoE
 	 * @param sizeX the size of the area in tiles on the x axis
 	 * @param sizeY the size of the area in tiles on the y axis
+	 * @param plane the plane of the area
 	 * @param zOffset offset from ground plane
 	 * @return a polygon representing the tiles in the area
 	 */
@@ -407,10 +408,9 @@ public class Perspective
 		@Nonnull LocalPoint localLocation,
 		int sizeX,
 		int sizeY,
+		int plane,
 		int zOffset)
 	{
-		final int plane = client.getPlane();
-
 		final int swX = localLocation.getX() - (sizeX * LOCAL_TILE_SIZE / 2);
 		final int swY = localLocation.getY() - (sizeY * LOCAL_TILE_SIZE / 2);
 

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

@@ -205,7 +205,7 @@ public enum Quest
 
 	public QuestState getState(Client client)
 	{
-		client.runScript(ScriptID.QUESTLIST_PROGRESS, id);
+		client.runScript(ScriptID.QUEST_STATUS_GET, id);
 		switch (client.getIntStack()[0])
 		{
 			case 2:

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

@@ -150,7 +150,7 @@ public final class ScriptID
 	 * </ul>
 	 */
 	@ScriptArguments(integer = 1)
-	public static final int QUESTLIST_PROGRESS = 2267;
+	public static final int QUEST_STATUS_GET = 4029;
 
 	/**
 	 * Updates the Diary/Quest interface's scrollbar