cleanup & fix yarn

unimined · Dec 21, 2023 · 1293e84 · 1293e84
1 parent 7947bd8
commit 1293e84
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/MappingDepConfigImpl.kt b/src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/MappingDepConfigImpl.kt
@@ -126,8 +126,8 @@ class ContainedMappingImpl() : ContainedMapping {
         checkFinalized()
         inputActions.add {
             afterRemap {
-                println("memberNameReplacer")
-                println("types: $types")
+//                println("memberNameReplacer")
+//                println("types: $types")
                 val targetKey = it.getNamespaceId(targetNs)
 
                 if (targetKey == MappingTreeView.NULL_NAMESPACE_ID) {
@@ -140,27 +140,27 @@ class ContainedMappingImpl() : ContainedMapping {
                     throw IllegalStateException("Member namespace $memberNs does not exist")
                 }
 
-                println("target: $targetKey")
-                println("member: $memberKey")
-
-                println("namespaces: ${it.srcNamespace} -> ${it.dstNamespaces}")
+//                println("target: $targetKey")
+//                println("member: $memberKey")
+//
+//                println("namespaces: ${it.srcNamespace} -> ${it.dstNamespaces}")
 
                 for (classMapping in it.classes) {
                     if (types.contains(MappedElementKind.CLASS)) {
-                        println("classMapping: $classMapping")
+//                        println("classMapping: $classMapping")
                         val className = classMapping.getName(memberKey)
                         if (className != null) {
-                            println("className: $className")
+//                            println("className: $className")
                             classMapping.setDstName(className, targetKey)
                         }
                     }
                     if (types.contains(MappedElementKind.METHOD) || types.contains(MappedElementKind.METHOD_ARG) || types.contains(MappedElementKind.METHOD_VAR)) {
                         for (method in classMapping.methods) {
                             if (types.contains(MappedElementKind.METHOD)) {
-                                println("method: $method")
+//                                println("method: $method")
                                 val memberName = method.getName(memberKey)
                                 if (memberName != null) {
-                                    println("memberName: $memberName")
+//                                    println("memberName: $memberName")
                                     method.setDstName(memberName, targetKey)
                                 }
                             }
@@ -184,7 +184,7 @@ class ContainedMappingImpl() : ContainedMapping {
                     }
                     if (types.contains(MappedElementKind.FIELD)) {
                         for (field in classMapping.fields) {
-                            println("field: $field")
+//                            println("field: $field")
                             val fieldName = field.getName(memberKey)
                             if (fieldName != null) {
                                 field.setDstName(fieldName, targetKey)

diff --git a/...z/wagyourtail/unimined/internal/minecraft/patch/bukkit/CraftbukkitMinecraftTransformer.kt b/...z/wagyourtail/unimined/internal/minecraft/patch/bukkit/CraftbukkitMinecraftTransformer.kt
@@ -14,10 +14,7 @@ import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider
 import xyz.wagyourtail.unimined.internal.minecraft.patch.AbstractMinecraftTransformer
 import xyz.wagyourtail.unimined.internal.minecraft.patch.MinecraftJar
 import xyz.wagyourtail.unimined.internal.minecraft.patch.bukkit.buildtools.BuildToolsExecutor
-import xyz.wagyourtail.unimined.util.FinalizeOnRead
-import xyz.wagyourtail.unimined.util.LazyMutable
-import xyz.wagyourtail.unimined.util.MustSet
-import xyz.wagyourtail.unimined.util.withSourceSet
+import xyz.wagyourtail.unimined.util.*
 import kotlin.io.path.copyTo
 
 open class CraftbukkitMinecraftTransformer(
@@ -47,6 +44,10 @@ open class CraftbukkitMinecraftTransformer(
         )
     }
 
+    init {
+        unprotectRuntime = true
+    }
+
     override fun beforeMappingsResolve() {
         super.beforeMappingsResolve()
         provider.mappings {
@@ -55,7 +56,13 @@ open class CraftbukkitMinecraftTransformer(
     }
 
     override fun apply() {
-
+        project.configurations.getByName("runtimeOnly".withSourceSet(provider.sourceSet)).dependencies.addAll(
+            listOf(
+                project.dependencies.create("org.ow2.asm:asm:9.5"),
+                project.dependencies.create("org.ow2.asm:asm-commons:9.5"),
+                project.dependencies.create("org.ow2.asm:asm-tree:9.5")
+            )
+        )
     }
 
     var target: BuildToolsExecutor.BuildTarget by FinalizeOnRead(BuildToolsExecutor.BuildTarget.CRAFTBUKKIT)

diff --git a/...xyz/wagyourtail/unimined/internal/minecraft/patch/bukkit/buildtools/BuildToolsExecutor.kt b/...xyz/wagyourtail/unimined/internal/minecraft/patch/bukkit/buildtools/BuildToolsExecutor.kt
@@ -123,7 +123,7 @@ class BuildToolsExecutor(
         dbF.isIgnoringComments = true
         dbF.isIgnoringElementContentWhitespace = true
         val db = dbF.newDocumentBuilder()
-        db.parse(spigot.resolve("pom.xml").toFile())
+        db.parse(spigot.resolve("Spigot-Server").resolve("pom.xml").toFile())
     }
 
     val targetPom by lazy {