Merge branch '221-1.10.26'

MeteorLite · Mar 29, 2024 · 8729618 · 8729618
2 parents 7fe218f + e709289
commit 8729618
Show file tree

Hide file tree

Showing 41 changed files with 402 additions and 372 deletions.
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.25.2</version>
+		<version>1.10.26</version>
 	</parent>
 
 	<artifactId>cache</artifactId>

diff --git a/cache/src/main/java/net/runelite/cache/IndexType.java b/cache/src/main/java/net/runelite/cache/IndexType.java
@@ -43,7 +43,6 @@ public enum IndexType
 	FONTS(13),
 	MUSIC_SAMPLES(14),
 	MUSIC_PATCHES(15),
-	WORLDMAP_OLD(16), // looks unused
 	WORLDMAP_GEOGRAPHY(18),
 	WORLDMAP(19),
 	WORLDMAP_GROUND(20),

diff --git a/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java
@@ -33,6 +33,7 @@ public class ItemDefinition
 	public final int id;
 
 	public String name = "null";
+	public String examine;
 	public String unknown1;
 
 	public int resizeX = 128;

diff --git a/cache/src/main/java/net/runelite/cache/definitions/WorldMapDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/WorldMapDefinition.java
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java
@@ -67,6 +67,10 @@ else if (opcode == 2)
 		{
 			def.name = stream.readString();
 		}
+		else if (opcode == 3)
+		{
+			def.examine = stream.readString();
+		}
 		else if (opcode == 4)
 		{
 			def.zoom2d = stream.readUnsignedShort();

diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/WorldMapLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/WorldMapLoader.java
diff --git a/cache/src/test/java/net/runelite/cache/WorldMapDumperTest.java b/cache/src/test/java/net/runelite/cache/WorldMapDumperTest.java
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
 
 	<groupId>net.runelite</groupId>
 	<artifactId>runelite-parent</artifactId>
-	<version>1.10.25.2</version>
+	<version>1.10.26</version>
 	<packaging>pom</packaging>
 
 	<name>RuneLite</name>
@@ -46,7 +46,8 @@
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		<checkstyle.skip>true</checkstyle.skip>
 		<glslang.path></glslang.path>
-		<rs.version>220</rs.version>
+
+		<rs.version>221</rs.version>
 
 		<!--HotLite-->
 		<kotlin.version>1.9.22</kotlin.version>
@@ -65,7 +66,7 @@
 		<url>https://github.com/runelite/runelite</url>
 		<connection>scm:git:git://github.com/runelite/runelite</connection>
 		<developerConnection>scm:git:[email protected]:runelite/runelite</developerConnection>
-		<tag>runelite-parent-1.10.25.2</tag>
+		<tag>runelite-parent-1.10.26</tag>
 	</scm>
 
 	<developers>

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.25.2</version>
+		<version>1.10.26</version>
 	</parent>
 
 	<artifactId>runelite-api</artifactId>