From 45711819abe4a65464ea168e91c343bdb83f5fce Mon Sep 17 00:00:00 2001
From: Wagyourtail <wagyourtail@wagyourtail.xyz>
Date: Tue, 14 Nov 2023 14:27:51 -0700
Subject: [PATCH] add to todo

---
 README.md                                                  | 4 ++++
 .../internal/mapping/extension/MixinRemapExtension.kt      | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 548d404e..0f7457e3 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,10 @@ yes, this is possible, see [PrcraftExampleMod](https://github.com/prcraft-minecr
   * forge datagen
   * fabric datagen
   * quilt datagen
+* fix yarn on neoforge (these will probably be agents, possibly in separate projects and pulled like JarModAgent)
+  * inject remapper into ASMAPI
+  * reflection remapper (also for forge potentially, or in general).
+
 
 ## Recommended Setup
 1. take one of the versions from [testing](./testing)
diff --git a/src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/extension/MixinRemapExtension.kt b/src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/extension/MixinRemapExtension.kt
index d1188bc3..795c985f 100644
--- a/src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/extension/MixinRemapExtension.kt
+++ b/src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/extension/MixinRemapExtension.kt
@@ -23,6 +23,7 @@ import xyz.wagyourtail.unimined.internal.mapping.extension.mixin.hard.HardTarget
 import xyz.wagyourtail.unimined.internal.mapping.extension.mixin.refmap.BaseMixinRefmap
 import xyz.wagyourtail.unimined.internal.mapping.extension.mixin.refmap.RefmapBuilderClassVisitor
 import xyz.wagyourtail.unimined.internal.mapping.extension.mixinextra.MixinExtra
+import xyz.wagyourtail.unimined.util.DefaultMap
 import xyz.wagyourtail.unimined.util.FinalizeOnRead
 import xyz.wagyourtail.unimined.util.defaultedMapOf
 import java.nio.file.FileSystem
@@ -113,7 +114,7 @@ class MixinRemapExtension(
 
     open class MixinTarget(override val inputTag: InputTag, val extension: MixinRemapExtension) : InputTagExtension {
         protected val metadata: MergedMetadata = MergedMetadata(extension)
-        protected val tasks: MutableMap<Int, Deque<(CommonData) -> Unit>> = defaultedMapOf { ConcurrentLinkedDeque() }
+        protected val tasks: DefaultMap<Int, Deque<(CommonData) -> Unit>> = defaultedMapOf { ConcurrentLinkedDeque() }
 
         fun addMetadata(metadata: MixinMetadata) {
             this.metadata.addMetadata(metadata)
@@ -144,7 +145,7 @@ class MixinRemapExtension(
                     )
                     extension.modifyHardRemapper(visitor)
                     synchronized(tasks) {
-                        tasks[mrjVersion]!!.add(visitor::runRemap)
+                        tasks[mrjVersion].add(visitor::runRemap)
                     }
                     visitor
                 } else {
@@ -159,7 +160,7 @@ class MixinRemapExtension(
             extension.logger.info("[HardTarget] processing state for ${environment.mrjVersion}")
             val data = CommonData(environment, extension.logger)
             try {
-                for (task in tasks[environment.mrjVersion]!!) {
+                for (task in tasks[environment.mrjVersion]) {
                     task(data)
                 }
             } catch (e: Exception) {