Always remap files known to be mods

Also improve RemapJar task
terrarium-earth · Feb 16, 2025 · 15b672e · 15b672e
1 parent 8b78dc9
commit 15b672e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 24 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,5 +7,5 @@ org.gradle.configuration-cache=true
 # org.gradle.unsafe.isolated-projects=true
 
 group=net.msrandom
-version=0.5.10
+version=0.5.11
 kotlin.code.style=official
diff --git a/minecraft-codev-remapper/src/main/kotlin/net/msrandom/minecraftcodev/remapper/RemapAction.kt b/minecraft-codev-remapper/src/main/kotlin/net/msrandom/minecraftcodev/remapper/RemapAction.kt
@@ -45,6 +45,11 @@ abstract class RemapAction : TransformAction<RemapAction.Parameters> {
         abstract val filterMods: Property<Boolean>
             @Input get
 
+        abstract val modFiles: ConfigurableFileCollection
+            @PathSensitive(PathSensitivity.ABSOLUTE)
+            @InputFiles
+            get
+
         abstract val cacheDirectory: DirectoryProperty
             @Internal get
 
@@ -57,9 +62,6 @@ abstract class RemapAction : TransformAction<RemapAction.Parameters> {
         }
     }
 
-    abstract val execOperations: ExecOperations
-        @Inject get
-
     abstract val objectFactory: ObjectFactory
         @Inject get
 
@@ -76,7 +78,7 @@ abstract class RemapAction : TransformAction<RemapAction.Parameters> {
     override fun transform(outputs: TransformOutputs) {
         val input = inputFile.get().asFile
 
-        if (parameters.filterMods.get() && !isMod(input.toPath())) {
+        if (parameters.filterMods.get() && input !in parameters.modFiles && !isMod(input.toPath())) {
             outputs.file(inputFile)
 
             return

diff --git a/...raft-codev-remapper/src/main/kotlin/net/msrandom/minecraftcodev/remapper/task/RemapJar.kt b/...raft-codev-remapper/src/main/kotlin/net/msrandom/minecraftcodev/remapper/task/RemapJar.kt
@@ -12,7 +12,7 @@ import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.*
-import org.gradle.api.tasks.bundling.Jar
+import org.gradle.jvm.tasks.Jar
 import org.gradle.language.base.plugins.LifecycleBasePlugin
 
 abstract class RemapJar : Jar() {
@@ -37,32 +37,35 @@ abstract class RemapJar : Jar() {
         @CompileClasspath
         get
 
+    abstract val remappedClasses: DirectoryProperty
+        @Internal get
+
     abstract val cacheDirectory: DirectoryProperty
         @Internal get
 
     init {
-        run {
-            group = LifecycleBasePlugin.BUILD_GROUP
+        group = LifecycleBasePlugin.BUILD_GROUP
 
-            sourceNamespace.convention(MinecraftCodevRemapperPlugin.NAMED_MAPPINGS_NAMESPACE)
+        sourceNamespace.convention(MinecraftCodevRemapperPlugin.NAMED_MAPPINGS_NAMESPACE)
 
-            cacheDirectory.set(getGlobalCacheDirectoryProvider(project))
-        }
-    }
+        cacheDirectory.set(getGlobalCacheDirectoryProvider(project))
+        remappedClasses.set(temporaryDir)
+
+        from(remappedClasses)
 
-    @TaskAction
-    fun remap() {
-        val mappings = MemoryMappingTree()
+        doFirst {
+            val mappings = MemoryMappingTree()
 
-        Tiny2Reader.read(this.mappings.asFile.get().reader(), mappings)
+            Tiny2Reader.read(this.mappings.asFile.get().reader(), mappings)
 
-        JarRemapper.remap(
-            mappings,
-            sourceNamespace.get(),
-            targetNamespace.get(),
-            input.getAsPath(),
-            archiveFile.get().toPath(),
-            classpath,
-        )
+            JarRemapper.remap(
+                mappings,
+                sourceNamespace.get(),
+                targetNamespace.get(),
+                input.getAsPath(),
+                archiveFile.get().toPath(),
+                classpath,
+            )
+        }
     }
 }