From 2fa6eb1dc38f4df36d2b063027d2469b683a7dfb Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Sat, 7 May 2022 09:38:19 -0400
Subject: [PATCH] cache: update indextype names

---
 .../main/java/net/runelite/cache/IndexType.java | 17 ++++++++++-------
 .../java/net/runelite/cache/FrameDumper.java    |  4 ++--
 .../java/net/runelite/cache/FramemapDumper.java |  2 +-
 .../net/runelite/cache/TrackDumperTest.java     |  4 ++--
 .../net/runelite/cache/WorldMapDumperTest.java  |  2 +-
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/cache/src/main/java/net/runelite/cache/IndexType.java b/cache/src/main/java/net/runelite/cache/IndexType.java
index 813594bac5..a7f75342b1 100644
--- a/cache/src/main/java/net/runelite/cache/IndexType.java
+++ b/cache/src/main/java/net/runelite/cache/IndexType.java
@@ -27,23 +27,26 @@ package net.runelite.cache;
 
 public enum IndexType
 {
-	FRAMES(0),
-	FRAMEMAPS(1),
+	ANIMATIONS(0),
+	SKELETONS(1),
 	CONFIGS(2),
 	INTERFACES(3),
 	SOUNDEFFECTS(4),
 	MAPS(5),
-	TRACK1(6),
+	MUSIC_TRACKS(6),
 	MODELS(7),
 	SPRITES(8),
 	TEXTURES(9),
 	BINARY(10),
-	TRACK2(11),
+	MUSIC_JINGLES(11),
 	CLIENTSCRIPT(12),
 	FONTS(13),
-	VORBIS(14),
-	INSTRUMENTS(15),
-	WORLDMAP(16);
+	MUSIC_SAMPLES(14),
+	MUSIC_PATCHES(15),
+	WORLDMAP_OLD(16), // looks unused
+	WORLDMAP_GEOGRAPHY(18),
+	WORLDMAP(19),
+	WORLDMAP_GROUND(20);
 
 	private int id;
 	
diff --git a/cache/src/test/java/net/runelite/cache/FrameDumper.java b/cache/src/test/java/net/runelite/cache/FrameDumper.java
index f6cc20532d..3619d7e163 100644
--- a/cache/src/test/java/net/runelite/cache/FrameDumper.java
+++ b/cache/src/test/java/net/runelite/cache/FrameDumper.java
@@ -72,8 +72,8 @@ public class FrameDumper
 			store.load();
 
 			Storage storage = store.getStorage();
-			Index frameIndex = store.getIndex(IndexType.FRAMES);
-			Index framemapIndex = store.getIndex(IndexType.FRAMEMAPS);
+			Index frameIndex = store.getIndex(IndexType.ANIMATIONS);
+			Index framemapIndex = store.getIndex(IndexType.SKELETONS);
 
 			for (Archive archive : frameIndex.getArchives())
 			{
diff --git a/cache/src/test/java/net/runelite/cache/FramemapDumper.java b/cache/src/test/java/net/runelite/cache/FramemapDumper.java
index 8feef1f814..ea44ae7d14 100644
--- a/cache/src/test/java/net/runelite/cache/FramemapDumper.java
+++ b/cache/src/test/java/net/runelite/cache/FramemapDumper.java
@@ -66,7 +66,7 @@ public class FramemapDumper
 			store.load();
 
 			Storage storage = store.getStorage();
-			Index index = store.getIndex(IndexType.FRAMEMAPS);
+			Index index = store.getIndex(IndexType.SKELETONS);
 
 			for (Archive archive : index.getArchives())
 			{
diff --git a/cache/src/test/java/net/runelite/cache/TrackDumperTest.java b/cache/src/test/java/net/runelite/cache/TrackDumperTest.java
index dc70a798ef..0a7079ab7d 100644
--- a/cache/src/test/java/net/runelite/cache/TrackDumperTest.java
+++ b/cache/src/test/java/net/runelite/cache/TrackDumperTest.java
@@ -67,8 +67,8 @@ public class TrackDumperTest
 			store.load();
 
 			Storage storage = store.getStorage();
-			Index index = store.getIndex(IndexType.TRACK1);
-			Index index2 = store.getIndex(IndexType.TRACK2);
+			Index index = store.getIndex(IndexType.MUSIC_TRACKS);
+			Index index2 = store.getIndex(IndexType.MUSIC_JINGLES);
 
 			for (Archive archive : index.getArchives())
 			{
diff --git a/cache/src/test/java/net/runelite/cache/WorldMapDumperTest.java b/cache/src/test/java/net/runelite/cache/WorldMapDumperTest.java
index 92b2582a91..1f3a8607af 100644
--- a/cache/src/test/java/net/runelite/cache/WorldMapDumperTest.java
+++ b/cache/src/test/java/net/runelite/cache/WorldMapDumperTest.java
@@ -66,7 +66,7 @@ public class WorldMapDumperTest
 			store.load();
 
 			Storage storage = store.getStorage();
-			Index index = store.getIndex(IndexType.WORLDMAP);
+			Index index = store.getIndex(IndexType.WORLDMAP_OLD);
 			Archive archive = index.getArchive(0); // there is also archive 1/2, but their data format is not this
 
 			byte[] archiveData = storage.loadArchive(archive);