Merge pull request #400 from chsami/development

1.5.0

.github/workflows/manual_,nightly.yml

@@ -39,13 +39,3 @@ jobs:
           title: "Nightly Build"
           files: |
             /home/runner/work/microbot/microbot/runelite-client/target/*.jar
-
-      - name: Upload Jar
-        uses: "bacongobbler/azure-blob-storage-upload@main"
-        with:
-          source_dir: runelite-client/target/jars
-          container_name: microbot
-          connection_string: ${{ secrets.blobConnectionString }}
-          extra_args: '--pattern *.jar --destination-path nightly'
-          # WARNING: this will overwrite existing blobs in your blob storage
-          overwrite: 'true'

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

@@ -66,6 +66,7 @@ scrollbar=14
 search_button_background=42
 deposit_inventory=44
 deposit_equipment=46
+potion_store=48
 incinerator=49
 incinerator_confirm=50
 equipment_parent=74

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

@@ -372,4 +372,6 @@ public final class AnimationID
 	public static final int GWENITH_WINDMILL_SPINNING = 6495;
 	public static final int LITHKREN_GENERATOR_SPINNING = 7898;
 	public static final int GIANTS_FOUNDRY_WATER_WHEEL_SPINNING = 9450;
+
+	public static final int HUEYCOATL_DEATH = 11679;
 }

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

@@ -88,6 +88,7 @@ public class Constants
 
 	public static final int TILE_FLAG_BRIDGE = 2;
 	public static final int TILE_FLAG_UNDER_ROOF = 4;
+	public static final int TILE_FLAG_VIS_BELOW = 8;
 
 	/**
 	 * Flag for roof removal to remove the roofs above the player's current position.

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2024, Adam <[email protected]>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.api;
+
+public interface FloatProjection extends Projection
+{
+	/**
+	 * Get the projection as a 4x4 matrix
+	 */
+	float[] getProjection();
+}

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

@@ -14291,8 +14291,8 @@ public final class ItemID
 	public static final int REAGENT_POUCH = 29996;
 	public static final int OPEN_REAGENT_POUCH = 29998;
 	public static final int POTION_STORAGE = 29999;
-	public static final int PREPOT_DEVICE = 30000;
-	public static final int PREPOT_DEVICE_DISASSEMBLED = 30002;
+	public static final int CHUGGING_BARREL = 30000;
+	public static final int CHUGGING_BARREL_DISASSEMBLED = 30002;
 	public static final int MOX_PASTE = 30005;
 	public static final int AGA_PASTE = 30007;
 	public static final int LYE_PASTE = 30009;

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

@@ -28808,5 +28808,8 @@ public final class NullObjectID
 	public static final int NULL_55399 = 55399;
 	public static final int NULL_55400 = 55400;
 	public static final int NULL_55401 = 55401;
+	public static final int NULL_55403 = 55403;
+	public static final int NULL_55404 = 55404;
+	public static final int NULL_55405 = 55405;
 	/* This file is automatically generated. Do not edit. */
 }

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

@@ -26207,8 +26207,8 @@ public final class ObjectID
 	public static final int SKELETON_54679 = 54679;
 	public static final int SKELETON_54680 = 54680;
 	public static final int SKELETON_54681 = 54681;
-	public static final int ICEY_WATER = 54682;
-	public static final int ICEY_WATER_54683 = 54683;
+	public static final int ICY_WATER = 54682;
+	public static final int ICY_WATER_54683 = 54683;
 	public static final int GATE_54689 = 54689;
 	public static final int CAVE_54690 = 54690;
 	public static final int CAVE_54691 = 54691;
@@ -26578,5 +26578,9 @@ public final class ObjectID
 	public static final int HOUSE_ADVERTISEMENT_55352 = 55352;
 	public static final int PORTAL_55353 = 55353;
 	public static final int HOPPER_CONTROLS_55402 = 55402;
+	public static final int SHELVES_55406 = 55406;
+	public static final int SHELVES_55407 = 55407;
+	public static final int SHELVES_55408 = 55408;
+	public static final int SHELVES_55409 = 55409;
 	/* This file is automatically generated. Do not edit. */
 }

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

@@ -81,10 +81,14 @@ public interface Scene extends Renderable
 	 */
 	void removeGameObject(GameObject gameObject);
 
-	void generateHouses();
+	void buildRoofs();
+
+	int[][][] getRoofs();
 
 	void setRoofRemovalMode(int flags);
 
+	int getRoofRemovalMode();
+
 	/**
 	 * Get the underlay ids for the scene. The value stored is id + 1, with 0 for no underlay.
 	 * @return

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

@@ -916,4 +916,24 @@ public final class Varbits
 	 * The amount of Doom stacks received in the Fortis Colosseum.
 	 */
 	public static final int COLOSSEUM_DOOM = 9801;
+
+	public static final int BUFF_GOADING_POTION = 11294;
+
+	public static final int BUFF_PRAYER_REGENERATION = 11361;
+
+	/**
+	 * The player's progress value for the colossal wyrm advanced basic course.
+	 * <p>
+	 * Max value = 6;
+	 * </p>
+	 */
+	public static final int COLOSSAL_WYRM_COURSE_BASIC = 11292;
+
+	/**
+	 * The player's progress value for the colossal wyrm advanced agility course.
+	 * <p>
+	 * Max value = 6;
+	 * </p>
+	 */
+	public static final int COLOSSAL_WYRM_COURSE_ADVANCED = 11293;
 }

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

@@ -26,4 +26,5 @@
 
 public interface WorldEntity
 {
+	WorldView getWorldView();
 }

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

@@ -202,4 +202,11 @@ Projectile createProjectile(int id, int plane, int startX, int startY, int start
 	 * @see InstanceTemplates
 	 */
 	int[][][] getInstanceTemplateChunks();
+
+	/**
+	 * Gets an array of map region IDs that are currently loaded.
+	 *
+	 * @return the map regions
+	 */
+	int[] getMapRegions();
 }

runelite-api/src/main/java/net/runelite/api/events/PreMapLoad.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2024, Adam <[email protected]>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.api.events;
+
+import lombok.Value;
+import net.runelite.api.Scene;
+import net.runelite.api.WorldView;
+
+/**
+ * This event is run from the maploader thread prior to the map load completing.
+ * Most client operations can't be done from this thread safely.
+ * You probably don't want to use this event.
+ */
+@Value
+public class PreMapLoad
+{
+	WorldView worldView;
+	Scene scene;
+}

runelite-api/src/main/java/net/runelite/api/hooks/DrawCallbacks.java

@@ -24,40 +24,57 @@
  */
 package net.runelite.api.hooks;
 
+import java.util.Set;
+import net.runelite.api.GameObject;
 import net.runelite.api.Model;
 import net.runelite.api.Projection;
 import net.runelite.api.Renderable;
 import net.runelite.api.Scene;
 import net.runelite.api.SceneTileModel;
 import net.runelite.api.SceneTilePaint;
 import net.runelite.api.Texture;
+import net.runelite.api.TileObject;
+import net.runelite.api.WorldView;
 
 public interface DrawCallbacks
 {
 	/**
 	 * GPU mode on.
 	 */
-	int GPU = 1;
+	int GPU = 0x1;
 	/**
 	 * GPU hillskew support. Enables the {@link Model#getUnskewedModel()}
 	 * API to get the unskewed model.
 	 */
-	int HILLSKEW = 2;
+	int HILLSKEW = 0x2;
 	/**
 	 * Requests normals be computed for models. Enables the {@link Model#getVertexNormalsX()}
 	 * {@link Model#getVertexNormalsY()} {@link Model#getVertexNormalsZ()} API.
 	 */
-	int NORMALS = 4;
+	int NORMALS = 0x4;
 	/**
 	 * Disable vertex snapping for animations
 	 */
-	int NO_VERTEX_SNAPPING = 8;
+	int NO_VERTEX_SNAPPING = 0x8;
+	/**
+	 * Enable zbuf renderer.
+	 */
+	int ZBUF = 0x10;
 
-	void draw(Projection projection, Scene scene, Renderable renderable, int orientation, int x, int y, int z, long hash);
+	int PASS_OPAQUE = 0;
+	int PASS_ALPHA = 1;
 
-	void drawScenePaint(Scene scene, SceneTilePaint paint, int plane, int tileX, int tileZ);
+	default void draw(Projection projection, Scene scene, Renderable renderable, int orientation, int x, int y, int z, long hash)
+	{
+	}
 
-	void drawSceneTileModel(Scene scene, SceneTileModel model, int tileX, int tileZ);
+	default void drawScenePaint(Scene scene, SceneTilePaint paint, int plane, int tileX, int tileZ)
+	{
+	}
+
+	default void drawSceneTileModel(Scene scene, SceneTileModel model, int tileX, int tileZ)
+	{
+	}
 
 	/**
 	 * Called when a frame should be drawn.
@@ -69,21 +86,64 @@ public interface DrawCallbacks
 	/**
 	 * Called before the scene is drawn
 	 */
-	void drawScene(double cameraX, double cameraY, double cameraZ, double cameraPitch, double cameraYaw, int plane);
+	default void drawScene(double cameraX, double cameraY, double cameraZ, double cameraPitch, double cameraYaw, int plane)
+	{
+	}
 
 	/**
 	 * Called after the scene has been drawn
 	 */
-	void postDrawScene();
+	default void postDrawScene()
+	{
+	}
 
-	void animate(Texture texture, int diff);
+	default void animate(Texture texture, int diff)
+	{
+	}
 
-	void loadScene(Scene scene);
+	default void loadScene(Scene scene)
+	{
+	}
 
 	void swapScene(Scene scene);
 
 	default boolean tileInFrustum(Scene scene, int pitchSin, int pitchCos, int yawSin, int yawCos, int cameraX, int cameraY, int cameraZ, int plane, int msx, int msy)
 	{
 		return true;
 	}
+
+	default void loadScene(WorldView worldView, Scene scene)
+	{
+	}
+
+	default void despawnWorldView(WorldView worldView)
+	{
+	}
+
+	default void prepareSceneDraw(
+		Scene scene,
+		float cameraX, float cameraY, float cameraZ, float cameraPitch, float cameraYaw,
+		int minLevel, int level, int maxLevel, Set<Integer> hideRoofIds)
+	{
+	}
+
+	default void drawPass(Projection projection, Scene scene, int pass)
+	{
+	}
+
+	default void drawZone(Projection projection, Scene scene, int pass, int zx, int zz)
+	{
+	}
+
+	default void drawDynamic(Scene scene, TileObject tileObject, Renderable r, Model m, int orient, int x, int y, int z)
+	{
+	}
+
+	default void drawTemp(Scene scene, GameObject gameObject, Model m)
+	{
+	}
+
+	default void invalidateZone(Scene scene, int zx, int zz)
+	{
+	}
 }

runelite-client/src/main/java/net/runelite/client/RuntimeConfig.java

@@ -45,11 +45,11 @@ public class RuntimeConfig
 	private Instant outageStart;
 	private Instant outageEnd;
 
-	private Set<Integer> ignoreDeadNpcs;
-	private Set<Integer> forceDeadNpcs;
-	private Set<Integer> resetDeadOnChangeNpcs;
-	private Set<Integer> forceDeadAnimations;
-	private Set<Integer> nonAttackNpcs;
+	private Set<Integer> ignoreDeadNpcs; // npc is never dead
+	private Set<Integer> forceDeadNpcs; // npc is always dead
+	private Set<Integer> resetDeadOnChangeNpcs; // npc dead flag is reset on type change
+	private Set<Integer> forceDeadAnimations; // npc dead flag is reset on anim change
+	private Set<Integer> healthCheckDeadNpcs; // npc is only dead if healthratio == 0
 
 	private Set<String> outdatedClientVersions;
 	private String[] updateLauncherWinVers;
@@ -89,7 +89,7 @@ void refresh(RuntimeConfig config)
 		forceDeadNpcs = config.forceDeadNpcs;
 		resetDeadOnChangeNpcs = config.resetDeadOnChangeNpcs;
 		forceDeadAnimations = config.forceDeadAnimations;
-		nonAttackNpcs = config.nonAttackNpcs;
+		healthCheckDeadNpcs = config.healthCheckDeadNpcs;
 
 		outdatedClientVersions = config.outdatedClientVersions;
 	}

runelite-client/src/main/java/net/runelite/client/game/AgilityShortcut.java

@@ -96,7 +96,9 @@ public enum AgilityShortcut
 			// Nature Grotto bridge
 			BRIDGE_3522,
 			// Rocky Ledges Viyeldi cave
-			ROCKY_LEDGE, ROCKY_LEDGE_2960, ROCKY_LEDGE_2961, ROCKS_2962, ROCKS_2963, ROCKS_2964),
+			ROCKY_LEDGE, ROCKY_LEDGE_2960, ROCKY_LEDGE_2961, ROCKS_2962, ROCKS_2963, ROCKS_2964,
+			// Villa Lucens backstage theatre
+			LOOSE_ROCKS_54720, LOOSE_ROCKS_54721, LOOSE_ROCKS_54722),
 	WEISS_BROKEN_FENCE(1, "Shortcut", null, /* base id */ NullObjectID.NULL_46815)
 	{
 		@Override
@@ -192,6 +194,7 @@ public boolean matches(Client client, TileObject object)
 	ARCEUUS_ESSENCE_MINE_EAST_SCRAMBLE(52, "Rock Climb", new WorldPoint(1770, 3851, 0), ROCKS_27987, ROCKS_27988),
 	KARAMJA_VOLCANO_GRAPPLE_NORTH(53, "Grapple Rock", new WorldPoint(2873, 3143, 0), STRONG_TREE_17074),
 	KARAMJA_VOLCANO_GRAPPLE_SOUTH(53, "Grapple Rock", new WorldPoint(2874, 3128, 0), STRONG_TREE_17074),
+	ALDARIN_ROCKS(54, "Rocks", new WorldPoint(1340, 2916, 0), ROCKS_54775, ROCKS_54776),
 	MOTHERLODE_MINE_WALL_EAST(54, "Wall", new WorldPoint(3124, 9703, 0), DARK_TUNNEL_10047),
 	MOTHERLODE_MINE_WALL_WEST(54, "Wall", new WorldPoint(3118, 9702, 0), DARK_TUNNEL_10047),
 	MISCELLANIA_DOCK_STEPPING_STONE(55, "Stepping Stone", new WorldPoint(2572, 3862, 0), STEPPING_STONE_11768),