fix propagator, expose resolved for being able to add caching

unimined · Jul 25, 2024 · 9084281 · 9084281
1 parent b596dbc
commit 9084281
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/resolver/MappingResolver.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/resolver/MappingResolver.kt
@@ -43,7 +43,7 @@ abstract class MappingResolver<T : MappingResolver<T>>(val name: String) {
         private set
 
     lateinit var resolved: MemoryMappingTree
-        private set
+        protected set
 
     open val unmappedNs = setOf(Namespace("official"))
 

diff --git a/src/jvmMain/kotlin/xyz/wagyourtail/unimined/mapping/propogator/Propagator.kt b/src/jvmMain/kotlin/xyz/wagyourtail/unimined/mapping/propogator/Propagator.kt
@@ -109,7 +109,8 @@ class Propagator(val namespace: Namespace, val tree: AbstractMappingTree, requir
 
         for ((method, nsNames) in names) {
             visitor.visitClass(mapOf(namespace to method.first))?.use {
-                visitMethod(mapOf(namespace to (method.second.first to method.second.second)) + nsNames.mapValues { it.value.first() to null })?.visitEnd()
+                val targets = nsNames.mapValues { it.value.first() to null } + (namespace to (method.second.first to method.second.second))
+                visitMethod(targets)?.visitEnd()
             }
         }
     }