project: Merge upstream

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

@@ -363,6 +363,7 @@ public interface Client extends GameShell
 	 * @param scale the scale of the sprite
 	 * @return the created sprite
 	 */
+	@Nullable
 	Sprite createItemSprite(int itemId, int quantity, int border, int shadowColor, int stackable, boolean noted, int scale);
 
 	/**
@@ -373,6 +374,7 @@ public interface Client extends GameShell
 	 * @param fileId the sprites file ID
 	 * @return the sprite image of the file
 	 */
+	@Nullable
 	Sprite[] getSprites(IndexDataBase source, int archiveId, int fileId);
 
 	/**

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

@@ -160,9 +160,11 @@ public final class ScriptID
 
 	/**
 	 * Handles zoom input
+	 *
+	 * Updates the VarClientInts (73, 74) to this same value
 	 * <ul>
-	 * <li> int  zoom value </li>
-	 * <li> int  zoom value </li>
+	 * <li> int  Reset zoom position </li>
+	 * <li> int  Reset zoom position </li>
 	 * </ul>
 	 */
 	public static final int CAMERA_DO_ZOOM = 42;