Merge pull request #10 from tamateea/master

bump runelite-cache version to "1.9.6-SNAPSHOT"
Qodat · Dec 19, 2022 · c3dc886 · c3dc886
2 parents 69f8ebc + 0675166
commit c3dc886
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/qodat-api/build.gradle.kts b/qodat-api/build.gradle.kts
@@ -1,7 +1,7 @@
 version = "0.0.1"
 
 dependencies {
-    api(group = "net.runelite", name = "cache", version = "1.8.9") {
+    api(group = "net.runelite", name = "cache", version = "1.9.6-SNAPSHOT") {
         exclude(group = "com.google.common")
     }
 }
diff --git a/src/main/kotlin/stan/qodat/cache/impl/oldschool/OldschoolCacheRuneLite.kt b/src/main/kotlin/stan/qodat/cache/impl/oldschool/OldschoolCacheRuneLite.kt
@@ -61,8 +61,8 @@ object OldschoolCacheRuneLite : Cache("LIVE") {
 
     private fun load() {
         store.load()
-        frameIndex = store.getIndex(IndexType.FRAMES)
-        framemapIndex = store.getIndex(IndexType.FRAMEMAPS)
+        frameIndex = store.getIndex(IndexType.ANIMATIONS)
+        framemapIndex = store.getIndex(IndexType.SKELETONS)
         frames = HashMap<Int, Map<Int, AnimationFrameDefinition>>()
         frameMaps = HashMap<Int, Pair<FramemapDefinition, AnimationTransformationGroup>>()
         npcManager = NpcManager(store)

diff --git a/src/main/kotlin/stan/qodat/scene/runescape/animation/AnimationExporter.kt b/src/main/kotlin/stan/qodat/scene/runescape/animation/AnimationExporter.kt
@@ -64,7 +64,7 @@ class AnimationExporter {
 
     private fun packFrames(animation: Animation): Int {
         val store = OldschoolCacheRuneLite.store
-        val frameIndex = store.getIndex(IndexType.FRAMES)
+        val frameIndex = store.getIndex(IndexType.ANIMATIONS)
 
         val curArchives = animation.getFrameList().map {
             val hexString = Integer.toHexString(it.idProperty.get())

diff --git a/src/main/kotlin/stan/qodat/util/osrs_anim_parser.kt b/src/main/kotlin/stan/qodat/util/osrs_anim_parser.kt
@@ -39,7 +39,7 @@ fun createNpcAnimsJsonDir(
         val seqArchive = index.getArchive(ConfigType.SEQUENCE.id)
         val archiveData = storage.loadArchive(seqArchive)
         val files = seqArchive.getFiles(archiveData)
-        val frameIndex = store.getIndex(IndexType.FRAMES)
+        val frameIndex = store.getIndex(IndexType.ANIMATIONS)
         val animationFiles = files.files
         val animations: Map<Int, Set<Int>> = animationFiles.parallelStream().map { file ->
             val loader = SequenceLoader206()
@@ -79,10 +79,10 @@ fun createNpcAnimsJsonDir(
             val animationRef = intArrayOf(
                 npc.walkingAnimation,
                 npc.standingAnimation,
-                npc.rotateLeftAnimation,
+                npc.idleRotateLeftAnimation ,
+                npc.idleRotateRightAnimation ,
+                npc.rotateLeftAnimation ,
                 npc.rotateRightAnimation,
-                npc.rotate90LeftAnimation,
-                npc.rotate90RightAnimation,
                 npc.rotate180Animation
             ).filter { it > 0 }
             try {
@@ -137,7 +137,7 @@ fun createObjectAnimsJsonDir(
         val seqArchive = index.getArchive(ConfigType.SEQUENCE.id)
         val archiveData = storage.loadArchive(seqArchive)
         val files = seqArchive.getFiles(archiveData)
-        val frameIndex = store.getIndex(IndexType.FRAMES)
+        val frameIndex = store.getIndex(IndexType.ANIMATIONS)
         val animationFiles = files.files
         val animations = animationFiles.parallelStream().map { file ->
             val loader = SequenceLoader206()