Merge development into main

cache/src/main/java/net/runelite/cache/WorldMapManager.java

@@ -62,6 +62,7 @@ public void load() throws IOException
 		Index index = store.getIndex(IndexType.WORLDMAP);
 		Archive compositeMapArchive = index.findArchiveByName("compositemap");
 		WorldMapCompositeLoader worldMapCompositeLoader = new WorldMapCompositeLoader();
+		worldMapCompositeLoader.configureForRevision(index.getRevision());
 
 		ArchiveFiles compositeMapFiles = compositeMapArchive.getFiles(storage.loadArchive(compositeMapArchive));
 		for (FSFile compositeFile : compositeMapFiles.getFiles())

cache/src/main/java/net/runelite/cache/definitions/loaders/WorldMapCompositeLoader.java

@@ -31,9 +31,17 @@
 
 public class WorldMapCompositeLoader
 {
+	private boolean rev238 = true;
+
+	public WorldMapCompositeLoader configureForRevision(int rev)
+	{
+		rev238 = rev > 425;
+		return this;
+	}
+
 	public WorldMapCompositeDefinition load(byte[] buffer)
 	{
-		WorldMapDataLoader worldMapDataLoader = new WorldMapDataLoader();
+		WorldMapDataLoader worldMapDataLoader = new WorldMapDataLoader(rev238);
 		WorldMapElementLoader worldMapElementLoader = new WorldMapElementLoader();
 
 		WorldMapCompositeDefinition worldMapCompositeDefinition = new WorldMapCompositeDefinition();

cache/src/main/java/net/runelite/cache/definitions/loaders/WorldMapDataLoader.java

@@ -30,6 +30,18 @@
 
 public class WorldMapDataLoader
 {
+	private final boolean rev238;
+
+	public WorldMapDataLoader()
+	{
+		this(true);
+	}
+
+	public WorldMapDataLoader(boolean rev238)
+	{
+		this.rev238 = rev238;
+	}
+
 	public MapSquareDefinition loadMapSquare(InputStream in)
 	{
 		int worldMapDataType = in.readUnsignedByte();
@@ -46,8 +58,11 @@ public MapSquareDefinition loadMapSquare(InputStream in)
 		mapSquareDefinition.sourceSquareZ = in.readUnsignedShort();
 		mapSquareDefinition.displaySquareX = in.readUnsignedShort();
 		mapSquareDefinition.displaySquareZ = in.readUnsignedShort();
-		mapSquareDefinition.groupId = in.readBigSmart2();
-		mapSquareDefinition.fileId = in.readBigSmart2();
+		if (!rev238)
+		{
+			mapSquareDefinition.groupId = in.readBigSmart2();
+			mapSquareDefinition.fileId = in.readBigSmart2();
+		}
 
 		return mapSquareDefinition;
 	}
@@ -72,8 +87,11 @@ public ZoneDefinition loadZone(InputStream in)
 		zoneDefinition.displaySquareZ = in.readUnsignedShort();
 		zoneDefinition.displayZoneX = in.readUnsignedByte();
 		zoneDefinition.displayZoneZ = in.readUnsignedByte();
-		zoneDefinition.groupId = in.readBigSmart2();
-		zoneDefinition.fileId = in.readBigSmart2();
+		if (!rev238)
+		{
+			zoneDefinition.groupId = in.readBigSmart2();
+			zoneDefinition.fileId = in.readBigSmart2();
+		}
 
 		return zoneDefinition;
 	}

gradle.properties

@@ -29,9 +29,10 @@ org.gradle.caching=false
 
 project.build.group=net.runelite
 project.build.version=1.12.28
+runelite.injected-client.version=1.12.28
 
 glslang.path=
-microbot.version=2.6.5
+microbot.version=2.6.6
 microbot.commit.sha=nogit
 microbot.repo.url=http://138.201.81.246:8081/repository/microbot-snapshot/
 microbot.repo.username=

runelite-client/build.gradle.kts

@@ -38,6 +38,8 @@ fun loadRootProperty(name: String): String? {
 
 val microbotVersionProvider = providers.gradleProperty("microbot.version")
     .orElse(loadRootProperty("microbot.version") ?: "0.0.0")
+val injectedClientVersionProvider = providers.gradleProperty("runelite.injected-client.version")
+    .orElse(loadRootProperty("runelite.injected-client.version") ?: project.version.toString())
 
 plugins {
     java
@@ -326,7 +328,7 @@ java {
 dependencies {
     api("net.runelite:runelite-api:${project.version}")
     implementation(project(":jshell"))
-    runtimeOnly("net.runelite:injected-client:${project.version}")
+    runtimeOnly("net.runelite:injected-client:${injectedClientVersionProvider.get()}")
 
     api(libs.rl.http.api)
     api(libs.rl.discord)

runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java

@@ -623,6 +623,7 @@ public static DiscordGameEventType fromSkill(final Skill skill)
 			case RUNECRAFT: return TRAINING_RUNECRAFT;
 			case HUNTER: return TRAINING_HUNTER;
 			case CONSTRUCTION: return TRAINING_CONSTRUCTION;
+			case SAILING: return TRAINING_SAILING;
 			default: return null;
 		}
 	}

runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java

@@ -60,7 +60,10 @@ public class EntityHiderPlugin extends Plugin
 	private static final Set<Integer> THRALL_IDS = ImmutableSet.of(
 		NpcID.ARCEUUS_THRALL_GHOST_LESSER, NpcID.ARCEUUS_THRALL_SKELETON_LESSER, NpcID.ARCEUUS_THRALL_ZOMBIE_LESSER,  // Lesser Thrall (ghost, skeleton, zombie)
 		NpcID.ARCEUUS_THRALL_GHOST_SUPERIOR, NpcID.ARCEUUS_THRALL_SKELETON_SUPERIOR, NpcID.ARCEUUS_THRALL_ZOMBIE_SUPERIOR,  // Superior Thrall (ghost, skeleton, zombie)
-		NpcID.ARCEUUS_THRALL_GHOST_GREATER, NpcID.ARCEUUS_THRALL_SKELETON_GREATER, NpcID.ARCEUUS_THRALL_ZOMBIE_GREATER   // Greater Thrall (ghost, skeleton, zombie)
+		NpcID.ARCEUUS_THRALL_GHOST_GREATER, NpcID.ARCEUUS_THRALL_SKELETON_GREATER, NpcID.ARCEUUS_THRALL_ZOMBIE_GREATER,   // Greater Thrall (ghost, skeleton, zombie)
+		NpcID.THRALL_IMP_MAGIC_LESSER, NpcID.THRALL_IMP_RANGED_LESSER, NpcID.THRALL_IMP_MELEE_LESSER, // Leagues 6 Cosmetic Override for lesser thralls
+		NpcID.THRALL_IMP_MAGIC_SUPERIOR, NpcID.THRALL_IMP_RANGED_SUPERIOR, NpcID.THRALL_IMP_MELEE_SUPERIOR, // Leagues 6 Cosmetic Override for superior thralls
+		NpcID.THRALL_IMP_MAGIC_GREATER, NpcID.THRALL_IMP_RANGED_GREATER, NpcID.THRALL_IMP_MELEE_GREATER // Leagues 6 Cosmetic Override for greater thralls
 	);
 	private static final Set<Integer> RANDOM_EVENT_NPC_IDS = ImmutableSet.of(
 		NpcID.MACRO_BEEKEEPER_INVITATION,

runelite-client/src/main/java/net/runelite/client/plugins/poh/PohIcons.java

@@ -67,6 +67,16 @@ public enum PohIcons
 	CIVITASILLAFORTIS("civitasillafortis",
 		ObjectID.POH_PORTAL_TEAK_FORTIS, ObjectID.POH_PORTAL_MAG_FORTIS, ObjectID.POH_PORTAL_MARBLE_FORTIS, ObjectID.POH_PORTAL_LEAGUE_5_FORTIS
 	),
+	TROLLHEIM("trollheim", ObjectID.POH_PORTAL_TEAK_TROLLHEIM, ObjectID.POH_PORTAL_MAG_TROLLHEIM, ObjectID.POH_PORTAL_MARBLE_TROLLHEIM, ObjectID.POH_PORTAL_LEAGUE_5_TROLLHEIM),
+	PADDEWWA("paddewwa", ObjectID.POH_PORTAL_TEAK_PADDEWWA, ObjectID.POH_PORTAL_MAG_PADDEWWA, ObjectID.POH_PORTAL_MARBLE_PADDEWWA, ObjectID.POH_PORTAL_LEAGUE_5_PADDEWWA),
+	LASSAR("lassar", ObjectID.POH_PORTAL_TEAK_LASSAR, ObjectID.POH_PORTAL_MAG_LASSAR, ObjectID.POH_PORTAL_MARBLE_LASSAR, ObjectID.POH_PORTAL_LEAGUE_5_LASSAR),
+	DAREEYAK("dareeyak", ObjectID.POH_PORTAL_TEAK_DAREEYAK, ObjectID.POH_PORTAL_MAG_DAREEYAK, ObjectID.POH_PORTAL_MARBLE_DAREEYAK, ObjectID.POH_PORTAL_LEAGUE_5_DAREEYAK),
+	OURANIA("ourania", ObjectID.POH_PORTAL_TEAK_OURANIA, ObjectID.POH_PORTAL_MAG_OURANIA, ObjectID.POH_PORTAL_MARBLE_OURANIA, ObjectID.POH_PORTAL_LEAGUE_5_OURANIA),
+	BARBARIAN("barbarian", ObjectID.POH_PORTAL_TEAK_BARBARIAN, ObjectID.POH_PORTAL_MAG_BARBARIAN, ObjectID.POH_PORTAL_MARBLE_BARBARIAN, ObjectID.POH_PORTAL_LEAGUE_5_BARBARIAN),
+	KHAZARD("khazard", ObjectID.POH_PORTAL_TEAK_KHAZARD, ObjectID.POH_PORTAL_MAG_KHAZARD, ObjectID.POH_PORTAL_MARBLE_KHAZARD, ObjectID.POH_PORTAL_LEAGUE_5_KHAZARD),
+	ICEPLATEAU("iceplateau", ObjectID.POH_PORTAL_TEAK_ICEPLATEAU, ObjectID.POH_PORTAL_MAG_ICEPLATEAU, ObjectID.POH_PORTAL_MARBLE_ICEPLATEAU, ObjectID.POH_PORTAL_LEAGUE_5_ICEPLATEAU),
+	RESPAWN("respawn", ObjectID.POH_PORTAL_TEAK_RESPAWN, ObjectID.POH_PORTAL_MAG_RESPAWN, ObjectID.POH_PORTAL_MARBLE_RESPAWN, ObjectID.POH_PORTAL_LEAGUE_5_RESPAWN),
+	BOAT("boat", ObjectID.POH_PORTAL_TEAK_BOAT, ObjectID.POH_PORTAL_MAG_BOAT, ObjectID.POH_PORTAL_MARBLE_BOAT, ObjectID.POH_PORTAL_LEAGUE_5_BOAT),
 	ALTAR("altar",
 		ObjectID.POH_ALTAR_SARADOMIN_1, ObjectID.POH_ALTAR_ZAMORAK_1, ObjectID.POH_ALTAR_GUTHIX_1, ObjectID.POH_ALTAR_SARADOMIN_2, ObjectID.POH_ALTAR_ZAMORAK_2, ObjectID.POH_ALTAR_GUTHIX_2, ObjectID.POH_ALTAR_SARADOMIN_3, ObjectID.POH_ALTAR_ZAMORAK_3,
 		ObjectID.POH_ALTAR_GUTHIX_3, ObjectID.POH_ALTAR_SARADOMIN_4, ObjectID.POH_ALTAR_ZAMORAK_4, ObjectID.POH_ALTAR_GUTHIX_4, ObjectID.POH_ALTAR_SARADOMIN_5, ObjectID.POH_ALTAR_ZAMORAK_5, ObjectID.POH_ALTAR_GUTHIX_5, ObjectID.POH_ALTAR_SARADOMIN_6,

runelite-client/src/main/java/net/runelite/client/plugins/poh/PohOverlay.java

@@ -47,7 +47,8 @@ public class PohOverlay extends Overlay
 		PohIcons.TROLLSTRONGHOLD, PohIcons.CARRALLANGER, PohIcons.CATHERBY, PohIcons.WEISS, PohIcons.GHORROCK,
 		PohIcons.APEATOLLDUNGEON, PohIcons.BARROWS, PohIcons.BATTLEFRONT, PohIcons.CEMETERY, PohIcons.DRAYNORMANOR,
 		PohIcons.FENKENSTRAINSCASTLE, PohIcons.HARMONYISLAND, PohIcons.ARCEUUSLIBRARY, PohIcons.MINDALTAR, PohIcons.SALVEGRAVEYARD,
-		PohIcons.WESTARDOUGNE, PohIcons.CIVITASILLAFORTIS,
+		PohIcons.WESTARDOUGNE, PohIcons.CIVITASILLAFORTIS, PohIcons.TROLLHEIM, PohIcons.PADDEWWA, PohIcons.LASSAR, PohIcons.DAREEYAK,
+		PohIcons.OURANIA, PohIcons.BARBARIAN, PohIcons.KHAZARD, PohIcons.ICEPLATEAU, PohIcons.RESPAWN, PohIcons.BOAT
 	};
 
 	private static final int MAX_DISTANCE = 2350;

runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java

@@ -56,6 +56,15 @@ public abstract class Overlay implements LayoutableRenderableEntity
 	@Nullable
 	private final Plugin plugin;
 	private Point preferredLocation;
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
+	private OverlayOrigin origin = OverlayOrigin.AUTO;
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
+	private OverlayOriginX originX = OverlayOriginX.LEFT;
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
+	private OverlayOriginY originY = OverlayOriginY.TOP;
 	private Dimension preferredSize;
 	private OverlayPosition preferredPosition;
 	private Rectangle bounds = new Rectangle();