chsami · chsami · Feb 18, 2025 · Jan 26, 2025 · Jan 26, 2025 · Jan 26, 2025
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -4,7 +4,7 @@ on: [ push, pull_request ]
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     permissions:
       contents: read

diff --git a/.github/workflows/nightly_artifact_release.yml b/.github/workflows/nightly_artifact_release.yml
@@ -0,0 +1,43 @@
+name: Nightly artifact release
+
+on:
+  workflow_dispatch:
+    inputs:
+      parameter:
+        description: branch
+
+jobs:
+  build:
+    runs-on: ubuntu-latest  # You can choose a different runner if needed
+    permissions: write-all
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        ref: development
+        fetch-depth: 0
+
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        distribution: temurin
+        java-version: 11
+
+    - name: Build Shaded JAR
+      run: mvn clean package
+
+    - name: Create Release
+      uses: marvinpinto/action-automatic-releases@latest
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        automatic_release_tag: nightly
+        prerelease: false
+        title: Nightly Build
+        files: runelite-client/target/*.jar
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4.6.0
+      with:
+        name: Build Artifacts
+        path: runelite-client/target/*.jar
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,9 +27,9 @@ jobs:
         uses: "marvinpinto/action-automatic-releases@latest"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "1.7.3"
+          automatic_release_tag: "1.7.4"
           prerelease: false
-          title: "Release 1.7.3"
+          title: "Release 1.7.4"
           files: |
             /home/runner/work/Microbot/Microbot/runelite-client/target/microbot-*.jar
 

diff --git a/cache/pom.xml b/cache/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.10.50-SNAPSHOT</version>
+		<version>1.11.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cache</artifactId>

diff --git a/cache/src/test/java/net/runelite/cache/CacheProperties.java b/cache/src/test/java/net/runelite/cache/CacheProperties.java
@@ -38,11 +38,6 @@ private static Properties getProperties() throws IOException
 		return properties;
 	}
 
-	public static int getRsVersion() throws IOException
-	{
-		return (int) Double.parseDouble(getProperties().getProperty("rs.version"));
-	}
-
 	public static int getCacheVersion() throws IOException
 	{
 		return Integer.parseInt(getProperties().getProperty("cache.version"));

diff --git a/cache/src/test/resources/cache.properties b/cache/src/test/resources/cache.properties
@@ -1,3 +1,2 @@
-rs.version=${rs.version}
 cache.version=${cache.version}
 
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
 
 	<groupId>net.runelite</groupId>
 	<artifactId>runelite-parent</artifactId>
-	<version>1.10.50-SNAPSHOT</version>
+	<version>1.11.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>RuneLite</name>
@@ -46,8 +46,6 @@
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		<checkstyle.skip>true</checkstyle.skip>
 		<glslang.path></glslang.path>
-
-		<rs.version>228</rs.version>
 	</properties>
 
 	<licenses>

diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.10.50-SNAPSHOT</version>
+		<version>1.11.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>runelite-api</artifactId>

diff --git a/runelite-api/src/main/java/net/runelite/api/AnimationID.java b/runelite-api/src/main/java/net/runelite/api/AnimationID.java
@@ -319,6 +319,7 @@ public final class AnimationID
 	public static final int TZTOK_JAD_RANGE_ATTACK = 2652;
 	public static final int CYCLOPS_ATTACK = 4652;
 	public static final int HELLHOUND_DEFENCE = 6566;
+	public static final int DUCK_BOBBING = 6818;
 
 	// Farming
 	public static final int FARMING_HARVEST_FRUIT_TREE = 2280;
@@ -364,6 +365,7 @@ public final class AnimationID
 
 	// POH Animations
 	public static final int INCENSE_BURNER = 3687;
+	public static final int PORTAL_NEXUS_SPIN = 367;
 
 	// Wyrms
 	public static final int WYRM_IDLE_DORMANT = 8266;
@@ -386,4 +388,8 @@ public final class AnimationID
 	public static final int GIANTS_FOUNDRY_WATER_WHEEL_SPINNING = 9450;
 
 	public static final int HUEYCOATL_DEATH = 11679;
+
+	public static final int SLAYER_TOWER_WATER_BUCKET_DRIP = 3558;
+
+	public static final int KEY_MASTER_IDLE = 4519;
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java
@@ -917,7 +917,9 @@ public interface Client extends OAuthApi, GameEngine
 	 *
 	 * @param prayer the prayer
 	 * @return true if the prayer is active, false otherwise
+	 * @deprecated this method does not properly handle deadeye/eagle eye or mystic vigour/might
 	 */
+	@Deprecated
 	boolean isPrayerActive(Prayer prayer);
 
 	/**
@@ -2199,32 +2201,6 @@ default List<NPC> getNpcs()
 			.collect(Collectors.toCollection(ArrayList::new));
 	}
 
-	/**
-	 * Gets an array of all cached NPCs.
-	 *
-	 * @return cached NPCs
-	 * @see WorldView#npcs()
-	 */
-	@Deprecated
-	default NPC[] getCachedNPCs()
-	{
-		var wv = getTopLevelWorldView();
-		return wv == null ? new NPC[0] : wv.npcs().getSparse();
-	}
-
-	/**
-	 * Gets an array of all cached players.
-	 *
-	 * @return cached players
-	 * @see WorldView#players()
-	 */
-	@Deprecated
-	default Player[] getCachedPlayers()
-	{
-		var wv = getTopLevelWorldView();
-		return wv == null ? new Player[0] : wv.players().getSparse();
-	}
-
 	/**
 	 * Gets an array of tile collision data.
 	 * <p>

diff --git a/runelite-api/src/main/java/net/runelite/api/IndexedObjectSet.java b/runelite-api/src/main/java/net/runelite/api/IndexedObjectSet.java
@@ -24,68 +24,24 @@
  */
 package net.runelite.api;
 
-import java.util.Iterator;
-import java.util.NoSuchElementException;
 import java.util.Spliterator;
 import java.util.Spliterators;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
-import javax.annotation.Nonnull;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 
-@RequiredArgsConstructor
-public class IndexedObjectSet<T> implements Iterable<T>
+public interface IndexedObjectSet<T> extends Iterable<T>
 {
-	@Getter
-	private final T[] sparse;
+	T byIndex(int index);
 
-	private final int[] indexes;
-
-	@Getter
-	private final int size;
-
-	public T byIndex(int index)
-	{
-		return sparse[index];
-	}
-
-	public Stream<T> stream()
+	default Stream<T> stream()
 	{
 		return StreamSupport.stream(this.spliterator(), false);
 	}
 
 	@Override
-	public Spliterator<T> spliterator()
-	{
-		return Spliterators.spliterator(this.iterator(), this.size,
-			Spliterator.SIZED | Spliterator.DISTINCT | Spliterator.ORDERED);
-	}
-
-	@Nonnull
-	@Override
-	public Iterator<T> iterator()
+	default Spliterator<T> spliterator()
 	{
-		return new Iterator<T>()
-		{
-			int i;
-
-			@Override
-			public boolean hasNext()
-			{
-				return i < size;
-			}
-
-			@Override
-			public T next()
-			{
-				if (!hasNext())
-				{
-					throw new NoSuchElementException();
-				}
-
-				return sparse[indexes[i++]];
-			}
-		};
+		return Spliterators.spliterator(this.iterator(), 0,
+				Spliterator.DISTINCT | Spliterator.ORDERED);
 	}
-}
+}
diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java
@@ -14618,5 +14618,6 @@ public final class ItemID
 	public static final int GIANTSOUL_AMULET_UNCHARGED = 30637;
 	public static final int GIANTSOUL_AMULET = 30638;
 	public static final int DESICCATED_PAGE = 30640;
+	public static final int HUNTERS_LOOT_SACK_SUPPLIES = 30644;
 	/* This file is automatically generated. Do not edit. */
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/NPC.java b/runelite-api/src/main/java/net/runelite/api/NPC.java
@@ -50,7 +50,6 @@ public interface NPC extends Actor
 	 * NPC array.
 	 *
 	 * @return the NPC index
-	 * @see Client#getCachedNPCs()
 	 */
 	int getIndex();
 

diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java
@@ -15815,5 +15815,6 @@ public final class NullItemID
 	public static final int NULL_30641 = 30641;
 	public static final int NULL_30642 = 30642;
 	public static final int NULL_30643 = 30643;
+	public static final int NULL_30645 = 30645;
 	/* This file is automatically generated. Do not edit. */
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java
@@ -4250,6 +4250,7 @@ public final class NullObjectID
 	public static final int NULL_10030 = 10030;
 	public static final int NULL_10031 = 10031;
 	public static final int NULL_10032 = 10032;
+	public static final int NULL_10037 = 10037;
 	public static final int NULL_10039 = 10039;
 	public static final int NULL_10040 = 10040;
 	public static final int NULL_10044 = 10044;
@@ -8449,6 +8450,7 @@ public final class NullObjectID
 	public static final int NULL_19122 = 19122;
 	public static final int NULL_19123 = 19123;
 	public static final int NULL_19124 = 19124;
+	public static final int NULL_19130 = 19130;
 	public static final int NULL_19133 = 19133;
 	public static final int NULL_19134 = 19134;
 	public static final int NULL_19135 = 19135;
@@ -19751,6 +19753,7 @@ public final class NullObjectID
 	public static final int NULL_40305 = 40305;
 	public static final int NULL_40306 = 40306;
 	public static final int NULL_40322 = 40322;
+	public static final int NULL_40323 = 40323;
 	public static final int NULL_40326 = 40326;
 	public static final int NULL_40327 = 40327;
 	public static final int NULL_40328 = 40328;

diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java
@@ -5793,7 +5793,6 @@ public final class ObjectID
 	public static final int TRAP_10034 = 10034;
 	public static final int LOW_WALL_10035 = 10035;
 	public static final int ROCK_10036 = 10036;
-	public static final int ROPE_10037 = 10037;
 	public static final int ROPE_10038 = 10038;
 	public static final int TREE_10041 = 10041;
 	public static final int LADDER_10042 = 10042;
@@ -9301,7 +9300,6 @@ public final class ObjectID
 	public static final int CAVE_ENTRANCE_16308 = 16308;
 	public static final int CAVE_ENTRANCE_16309 = 16309;
 	public static final int POTION_SHELVES_16374 = 16374;
-	public static final int POTION_SHELVES_16375 = 16375;
 	public static final int POTION_SHELF_16376 = 16376;
 	public static final int POTION_SHELF_16377 = 16377;
 	public static final int HEALING_CERTIFICATE_16378 = 16378;
@@ -10685,7 +10683,6 @@ public final class ObjectID
 	public static final int CANDLES_19127 = 19127;
 	public static final int BASKET_19128 = 19128;
 	public static final int BASKET_19129 = 19129;
-	public static final int AIR_BALLOON = 19130;
 	public static final int ROCK_19131 = 19131;
 	public static final int BASKET_19132 = 19132;
 	public static final int ALTAR_19145 = 19145;
@@ -15094,7 +15091,6 @@ public final class ObjectID
 	public static final int KRUK = 28675;
 	public static final int BAMBOO_LADDER_28676 = 28676;
 	public static final int ROWBOAT_28677 = 28677;
-	public static final int ROWBOAT_28678 = 28678;
 	public static final int ROWBOAT_28679 = 28679;
 	public static final int WALL_28681 = 28681;
 	public static final int PASSAGE_28682 = 28682;
@@ -20559,7 +20555,6 @@ public final class ObjectID
 	public static final int DEAD_SOURHOG_40319 = 40319;
 	public static final int SKELETON_40320 = 40320;
 	public static final int SKELETON_40321 = 40321;
-	public static final int SCRAWLED_NOTE = 40323;
 	public static final int PILE_OF_ROPE_40324 = 40324;
 	public static final int DOOR_40325 = 40325;
 	public static final int ROPE_40330 = 40330;

diff --git a/runelite-api/src/main/java/net/runelite/api/Prayer.java b/runelite-api/src/main/java/net/runelite/api/Prayer.java
@@ -131,6 +131,14 @@ public enum Prayer
 	 * Chivalry (Level 60, Defence/Strength/Attack).
 	 */
 	CHIVALRY(Varbits.PRAYER_CHIVALRY),
+	/**
+	 * Deadeye (Level 62, Ranging/Damage/Defence).
+	 */
+	DEADEYE(Varbits.PRAYER_DEADEYE),
+	/**
+	 * Mystic Vigour (Level 63, Magic/Magic Def./Defence).
+	 */
+	MYSTIC_VIGOUR(Varbits.PRAYER_MYSTIC_VIGOUR),
 	/**
 	 * Piety (Level 70, Defence/Strength/Attack).
 	 */

diff --git a/runelite-api/src/main/java/net/runelite/api/Scene.java b/runelite-api/src/main/java/net/runelite/api/Scene.java
@@ -168,4 +168,9 @@ public interface Scene extends Renderable
 	 * @return the map regions
 	 */
 	int[] getMapRegions();
+
+	byte getOverrideAmount();
+	byte getOverrideHue();
+	byte getOverrideSaturation();
+	byte getOverrideLuminance();
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/SoundEffectID.java b/runelite-api/src/main/java/net/runelite/api/SoundEffectID.java
@@ -83,7 +83,9 @@ public final class SoundEffectID
 	public final static int PRAYER_ACTIVATE_PROTECT_FROM_MISSILES = 2677;
 	public final static int PRAYER_ACTIVATE_PROTECT_FROM_MELEE = 2676;
 	public final static int PRAYER_ACTIVATE_EAGLE_EYE = 2665;
+	public final static int PRAYER_ACTIVATE_DEADEYE = 10194;
 	public final static int PRAYER_ACTIVATE_MYSTIC_MIGHT = 2669;
+	public final static int PRAYER_ACTIVATE_MYSTIC_VIGOUR = 10100;
 	public final static int PRAYER_ACTIVATE_RETRIBUTION = 2682;
 	public final static int PRAYER_ACTIVATE_REDEMPTION = 2680;
 	public final static int PRAYER_ACTIVATE_SMITE = 2686;

diff --git a/runelite-api/src/main/java/net/runelite/api/SpriteID.java b/runelite-api/src/main/java/net/runelite/api/SpriteID.java
@@ -1341,10 +1341,12 @@ public final class SpriteID
 	/* Unmapped: 1419 */
 	public static final int PRAYER_RIGOUR = 1420;
 	public static final int PRAYER_AUGURY = 1421;
-	/* Unmapped: 1422, 1423 */
+	public static final int PRAYER_DEADEYE = 1422;
+	public static final int PRAYER_MYSTIC_VIGOUR = 1423;
 	public static final int PRAYER_RIGOUR_DISABLED = 1424;
 	public static final int PRAYER_AUGURY_DISABLED = 1425;
-	/* Unmapped: 1426, 1427 */
+	public static final int PRAYER_DEADEYE_DISABLED = 1426;
+	public static final int PRAYER_MYSTIC_VIGOUR_DISABLED = 1427;
 	public static final int UNKNOWN_BLACK_ANTICLOCKWISE_ARROW_SHADOWED = 1428;
 	public static final int UNKNOWN_BLACK_ANTICLOCKWISE_ARROW = 1429;
 	public static final int YELLOW_CLICK_ANIMATION_1_1430 = 1430;
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,2 @@
		rs.version=${rs.version}
		cache.version=${cache.version}