So, I heard you like polymorphism...

unimined · Dec 3, 2024 · 83a995b · 83a995b
1 parent ec2ff69
commit 83a995b
Show file tree

Hide file tree

Showing 12 changed files with 137 additions and 76 deletions.
diff --git a/src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/task/AbstractRemapJarTask.kt b/src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/task/AbstractRemapJarTask.kt
@@ -18,7 +18,6 @@ import xyz.wagyourtail.unimined.util.FinalizeOnRead
  * task responsible for transforming your built jar to production.
  * @since 0.1.0
  */
-@Suppress("LeakingThis")
 abstract class AbstractRemapJarTask : Jar() {
 
     @get:InputFile
@@ -36,39 +35,4 @@ abstract class AbstractRemapJarTask : Jar() {
     @set:Internal
     var prodNamespace: MappingNamespaceTree.Namespace? by FinalizeOnRead(null)
 
-    /**
-     * whether to remap AccessTransformers to the legacy format (<=1.7.10)
-     */
-    @get:Input
-    @get:Optional
-    abstract val remapATToLegacy: Property<Boolean?>
-
-    @get:Internal
-    @set:Internal
-    @set:ApiStatus.Experimental
-    abstract var allowImplicitWildcards: Boolean
-
-    abstract fun devNamespace(namespace: String)
-
-    abstract fun devFallbackNamespace(namespace: String)
-
-    abstract fun prodNamespace(namespace: String)
-
-    abstract fun mixinRemap(action: MixinRemapOptions.() -> Unit)
-
-    fun mixinRemap(
-        @DelegatesTo(value = MixinRemapOptions::class, strategy = Closure.DELEGATE_FIRST)
-        action: Closure<*>
-    ) {
-        mixinRemap {
-            action.delegate = this
-            action.resolveStrategy = Closure.DELEGATE_FIRST
-            action.call()
-        }
-    }
-
-    init {
-        remapATToLegacy.convention(null as Boolean?).finalizeValueOnRead()
-    }
-
 }
diff --git a/src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/task/RemapJarTask.kt b/src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/task/RemapJarTask.kt
@@ -1,5 +1,33 @@
 package xyz.wagyourtail.unimined.api.minecraft.task
 
+import groovy.lang.Closure
+import groovy.lang.DelegatesTo
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Optional
+import xyz.wagyourtail.unimined.api.mapping.mixin.MixinRemapOptions
 import xyz.wagyourtail.unimined.util.JarInterface
 
-interface RemapJarTask : JarInterface<AbstractRemapJarTask>
+interface RemapJarTask : JarInterface<AbstractRemapJarTask>, RemapOptions {
+
+    /**
+     * whether to remap AccessTransformers to the legacy format (<=1.7.10)
+     */
+    @get:Input
+    @get:Optional
+    val remapATToLegacy: Property<Boolean?>
+
+    fun mixinRemap(action: MixinRemapOptions.() -> Unit)
+
+    fun mixinRemap(
+        @DelegatesTo(value = MixinRemapOptions::class, strategy = Closure.DELEGATE_FIRST)
+        action: Closure<*>
+    ) {
+        mixinRemap {
+            action.delegate = this
+            action.resolveStrategy = Closure.DELEGATE_FIRST
+            action.call()
+        }
+    }
+
+}
diff --git a/src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/task/RemapOptions.kt b/src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/task/RemapOptions.kt
@@ -0,0 +1,37 @@
+package xyz.wagyourtail.unimined.api.minecraft.task
+
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Internal
+import org.jetbrains.annotations.ApiStatus
+import xyz.wagyourtail.unimined.api.mapping.MappingNamespaceTree
+
+interface RemapOptions {
+
+    @get:InputFile
+    val inputFile: RegularFileProperty
+
+    @get:Internal
+    @set:Internal
+    var devNamespace: MappingNamespaceTree.Namespace?
+
+    @get:Internal
+    @set:Internal
+    var devFallbackNamespace: MappingNamespaceTree.Namespace?
+
+    @get:Internal
+    @set:Internal
+    var prodNamespace: MappingNamespaceTree.Namespace?
+
+    @get:Internal
+    @set:Internal
+    @set:ApiStatus.Experimental
+    var allowImplicitWildcards: Boolean
+
+    fun devNamespace(namespace: String)
+
+    fun devFallbackNamespace(namespace: String)
+
+    fun prodNamespace(namespace: String)
+
+}
diff --git a/src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/task/RemapSourcesJarTask.kt b/src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/task/RemapSourcesJarTask.kt
@@ -2,4 +2,6 @@ package xyz.wagyourtail.unimined.api.minecraft.task
 
 import xyz.wagyourtail.unimined.util.JarInterface
 
-interface RemapSourcesJarTask : JarInterface<AbstractRemapJarTask>
+interface RemapSourcesJarTask : JarInterface<AbstractRemapJarTask>, RemapOptions {
+
+}
diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt
@@ -69,6 +69,8 @@ import java.nio.charset.StandardCharsets
 import java.nio.file.Path
 import java.nio.file.StandardOpenOption
 import java.util.*
+import java.util.function.BiFunction
+import javax.swing.text.html.HTML.Tag.U
 import kotlin.collections.ArrayDeque
 import kotlin.io.path.*
 
@@ -453,11 +455,11 @@ open class MinecraftProvider(project: Project, sourceSet: SourceSet) : Minecraft
         }
     }
 
-    private inline fun <reified T> applyDefaultRemapJar(
+    private inline fun <U: JarInterface<*>> applyDefaultRemapJar(
         inputTaskName: String,
-        remappingFunction: (Task, JarInterface<AbstractRemapJarTask>.() -> Unit) -> TaskProvider<*>,
+        remappingFunction: (Task, U.() -> Unit) -> TaskProvider<U>,
         crossinline defaultTaskConfiguration: Jar.() -> Unit
-    ) where T : AbstractRemapJarTask, T : JarInterface<AbstractRemapJarTask> {
+    ) {
         val inputTaskNameSS = inputTaskName.withSourceSet(sourceSet)
 
         var inputTask = project.tasks.findByName(inputTaskNameSS)
@@ -490,7 +492,9 @@ open class MinecraftProvider(project: Project, sourceSet: SourceSet) : Minecraft
         val taskProvider = remappingFunction(inputTask) {
             group = "unimined"
             description = "Remaps $inputTask's output jar"
-            asJar.archiveClassifier.set(oldClassifier)
+            asJar {
+                archiveClassifier.set(oldClassifier)
+            }
         }
         project.tasks.getByName("build").dependsOn(taskProvider)
     }
@@ -592,15 +596,15 @@ open class MinecraftProvider(project: Project, sourceSet: SourceSet) : Minecraft
         if (mcPatcher.addVanillaLibraries) addLibraries(minecraftData.metadata.libraries)
 
         if (defaultRemapJar) {
-            applyDefaultRemapJar<RemapJarTaskImpl>("jar", ::remap) {
+            applyDefaultRemapJar("jar", ::remap) {
                 from(sourceSet.output)
                 archiveClassifier.set("".withSourceSet(sourceSet))
                 from(combinedWithList.map { it.second.output })
             }
         }
 
         if (defaultRemapSourcesJar) {
-            applyDefaultRemapJar<RemapSourcesJarTaskImpl>("sourcesJar", ::remapSources) {
+            applyDefaultRemapJar("sourcesJar", ::remapSources) {
                 from(sourceSet.allSource)
                 archiveClassifier.set("${"".withSourceSet(sourceSet)}-sources")
                 from(combinedWithList.map { it.second.allSource })

diff --git a/.../wagyourtail/unimined/internal/minecraft/patch/fabric/LegacyFabricMinecraftTransformer.kt b/.../wagyourtail/unimined/internal/minecraft/patch/fabric/LegacyFabricMinecraftTransformer.kt
@@ -4,6 +4,7 @@ import org.gradle.api.Project
 import org.gradle.api.artifacts.Dependency
 import xyz.wagyourtail.unimined.api.minecraft.patch.fabric.LegacyFabricPatcher
 import xyz.wagyourtail.unimined.api.minecraft.task.AbstractRemapJarTask
+import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask
 import xyz.wagyourtail.unimined.api.unimined
 import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider
 import xyz.wagyourtail.unimined.internal.minecraft.resolver.Library
@@ -38,8 +39,10 @@ open class LegacyFabricMinecraftTransformer(
     override fun configureRemapJar(task: AbstractRemapJarTask) {
         if (fabricDep.version?.let { SemVerUtils.matches(it, ">=0.15.0") } == true) {
             project.logger.info("enabling mixin extra")
-            task.mixinRemap {
-                enableMixinExtra()
+            if (task is RemapJarTask) {
+                task.mixinRemap {
+                    enableMixinExtra()
+                }
             }
         }
     }

diff --git a/...agyourtail/unimined/internal/minecraft/patch/fabric/OfficialFabricMinecraftTransformer.kt b/...agyourtail/unimined/internal/minecraft/patch/fabric/OfficialFabricMinecraftTransformer.kt
@@ -3,6 +3,7 @@ package xyz.wagyourtail.unimined.internal.minecraft.patch.fabric
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Dependency
 import xyz.wagyourtail.unimined.api.minecraft.task.AbstractRemapJarTask
+import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask
 import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider
 import xyz.wagyourtail.unimined.util.SemVerUtils
 
@@ -28,8 +29,10 @@ open class OfficialFabricMinecraftTransformer(
     override fun configureRemapJar(task: AbstractRemapJarTask) {
         if (fabricDep.version?.let { SemVerUtils.matches(it, ">=0.15.0") } == true) {
             project.logger.info("enabling mixin extra")
-            task.mixinRemap {
-                enableMixinExtra()
+            if (task is RemapJarTask) {
+                task.mixinRemap {
+                    enableMixinExtra()
+                }
             }
         }
     }

diff --git a/.../xyz/wagyourtail/unimined/internal/minecraft/patch/forge/NeoForgedMinecraftTransformer.kt b/.../xyz/wagyourtail/unimined/internal/minecraft/patch/forge/NeoForgedMinecraftTransformer.kt
@@ -5,6 +5,7 @@ import org.gradle.api.Project
 import org.gradle.api.artifacts.Dependency
 import xyz.wagyourtail.unimined.api.minecraft.patch.forge.NeoForgedPatcher
 import xyz.wagyourtail.unimined.api.minecraft.task.AbstractRemapJarTask
+import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask
 import xyz.wagyourtail.unimined.api.unimined
 import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider
 import xyz.wagyourtail.unimined.internal.minecraft.patch.forge.fg3.FG3MinecraftTransformer
@@ -68,11 +69,13 @@ open class NeoForgedMinecraftTransformer(project: Project, provider: MinecraftPr
         val forgeDep = forge.dependencies.first()
         if (provider.version != "1.20.1") {
             project.logger.info("setting `disableRefmap()` in mixinRemap")
-            task.mixinRemap {
-                if (SemVerUtils.matches(forgeDep.version!!.substringBefore("-"), ">=20.2.84")) {
-                    enableMixinExtra()
+            if (task is RemapJarTask) {
+                task.mixinRemap {
+                    if (SemVerUtils.matches(forgeDep.version!!.substringBefore("-"), ">=20.2.84")) {
+                        enableMixinExtra()
+                    }
+                    disableRefmap()
                 }
-                disableRefmap()
             }
         }
     }

diff --git a/...z/wagyourtail/unimined/internal/minecraft/patch/jarmod/JarModAgentMinecraftTransformer.kt b/...z/wagyourtail/unimined/internal/minecraft/patch/jarmod/JarModAgentMinecraftTransformer.kt
@@ -5,6 +5,7 @@ import org.gradle.api.artifacts.ExternalDependency
 import xyz.wagyourtail.unimined.api.minecraft.patch.jarmod.JarModAgentPatcher
 import xyz.wagyourtail.unimined.api.runs.RunConfig
 import xyz.wagyourtail.unimined.api.minecraft.task.AbstractRemapJarTask
+import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask
 import xyz.wagyourtail.unimined.api.unimined
 import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider
 import xyz.wagyourtail.unimined.internal.minecraft.patch.forge.fg3.mcpconfig.SubprocessExecutor
@@ -104,17 +105,20 @@ open class JarModAgentMinecraftTransformer(
         //TODO: add mods to priority classpath, and resolve their jma.transformers
     }
 
-    override fun beforeRemapJarTask(remapJarTask: AbstractRemapJarTask, input: Path): Path {
-        remapJarTask.mixinRemap {
-            enableJarModAgent()
+    override fun beforeRemapJarTask(task: AbstractRemapJarTask, input: Path): Path {
+        if (task is RemapJarTask) {
+            task.mixinRemap {
+                enableJarModAgent()
+            }
         }
+
         @Suppress("DEPRECATION")
-        return if (compiletimeTransforms && transforms.isNotEmpty()) {
-            project.logger.lifecycle("[Unimined/JarModAgentTransformer] Running compile time transforms for ${remapJarTask.name}...")
+        return if (compiletimeTransforms && transforms.isNotEmpty() && task is RemapJarTask) {
+            project.logger.lifecycle("[Unimined/JarModAgentTransformer] Running compile time transforms for ${task}...")
             val output = getTempFilePath("${input.nameWithoutExtension}-jma", ".jar")
             Files.copy(input, output)
             try {
-                val classpath = (remapJarTask as RemapJarTaskImpl).provider.sourceSet.runtimeClasspath.files.toMutableSet()
+                val classpath = (task as RemapJarTaskImpl).provider.sourceSet.runtimeClasspath.files.toMutableSet()
 
                 val result = SubprocessExecutor.exec(project) {
                     it.jvmArgs = listOf(
@@ -138,7 +142,7 @@ open class JarModAgentMinecraftTransformer(
             }
             output
         } else {
-            super.beforeRemapJarTask(remapJarTask, input)
+            super.beforeRemapJarTask(task, input)
         }
     }
 

diff --git a/...craft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/task/AbstractRemapJarTaskImpl.kt b/...craft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/task/AbstractRemapJarTaskImpl.kt
@@ -18,35 +18,21 @@ import kotlin.io.path.*
 @Suppress("UNCHECKED_CAST")
 abstract class AbstractRemapJarTaskImpl @Inject constructor(@get:Internal val provider: MinecraftConfig): AbstractRemapJarTask() {
 
-    @get:Internal
-    protected var mixinRemapOptions: MixinRemapOptions.() -> Unit by FinalizeOnRead {}
-
-    override fun devNamespace(namespace: String) {
+    fun devNamespace(namespace: String) {
         val delegate: FinalizeOnRead<MappingNamespaceTree.Namespace> = AbstractRemapJarTask::class.getField("devNamespace")!!.getDelegate(this) as FinalizeOnRead<MappingNamespaceTree.Namespace>
         delegate.setValueIntl(LazyMutable { provider.mappings.getNamespace(namespace) })
     }
 
-    override fun devFallbackNamespace(namespace: String) {
+    fun devFallbackNamespace(namespace: String) {
         val delegate: FinalizeOnRead<MappingNamespaceTree.Namespace> = AbstractRemapJarTask::class.getField("devFallbackNamespace")!!.getDelegate(this) as FinalizeOnRead<MappingNamespaceTree.Namespace>
         delegate.setValueIntl(LazyMutable { provider.mappings.getNamespace(namespace) })
     }
 
-    override fun prodNamespace(namespace: String) {
+    fun prodNamespace(namespace: String) {
         val delegate: FinalizeOnRead<MappingNamespaceTree.Namespace> = AbstractRemapJarTask::class.getField("prodNamespace")!!.getDelegate(this) as FinalizeOnRead<MappingNamespaceTree.Namespace>
         delegate.setValueIntl(LazyMutable { provider.mappings.getNamespace(namespace) })
     }
 
-    override fun mixinRemap(action: MixinRemapOptions.() -> Unit) {
-        val delegate: FinalizeOnRead<MixinRemapOptions.() -> Unit> = AbstractRemapJarTaskImpl::class.getField("mixinRemapOptions")!!.getDelegate(this) as FinalizeOnRead<MixinRemapOptions.() -> Unit>
-        val old = delegate.value as MixinRemapOptions.() -> Unit
-        mixinRemapOptions = {
-            old()
-            action()
-        }
-    }
-
-    override var allowImplicitWildcards by FinalizeOnRead(false)
-
     @TaskAction
     @Suppress("UNNECESSARY_NOT_NULL_ASSERTION")
     fun run() {

diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/task/RemapJarTaskImpl.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/task/RemapJarTaskImpl.kt
@@ -4,13 +4,17 @@ import net.fabricmc.loom.util.kotlin.KotlinClasspathService
 import net.fabricmc.loom.util.kotlin.KotlinRemapperClassloader
 import net.fabricmc.tinyremapper.OutputConsumerPath
 import net.fabricmc.tinyremapper.TinyRemapper
+import org.gradle.api.tasks.Internal
 import xyz.wagyourtail.unimined.api.mapping.MappingNamespaceTree
+import xyz.wagyourtail.unimined.api.mapping.mixin.MixinRemapOptions
 import xyz.wagyourtail.unimined.api.minecraft.MinecraftConfig
 import xyz.wagyourtail.unimined.api.minecraft.patch.forge.ForgeLikePatcher
 import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask
 import xyz.wagyourtail.unimined.internal.mapping.at.AccessTransformerApplier
 import xyz.wagyourtail.unimined.internal.mapping.aw.AccessWidenerApplier
 import xyz.wagyourtail.unimined.internal.mapping.extension.MixinRemapExtension
+import xyz.wagyourtail.unimined.util.FinalizeOnRead
+import xyz.wagyourtail.unimined.util.getField
 import xyz.wagyourtail.unimined.util.openZipFileSystem
 import java.nio.file.Path
 import javax.inject.Inject
@@ -20,6 +24,24 @@ import kotlin.io.path.deleteIfExists
 abstract class RemapJarTaskImpl @Inject constructor(provider: MinecraftConfig):
     AbstractRemapJarTaskImpl(provider), RemapJarTask {
 
+    @get:Internal
+    protected var mixinRemapOptions: MixinRemapOptions.() -> Unit by FinalizeOnRead {}
+
+    override fun mixinRemap(action: MixinRemapOptions.() -> Unit) {
+        val delegate: FinalizeOnRead<MixinRemapOptions.() -> Unit> = RemapJarTaskImpl::class.getField("mixinRemapOptions")!!.getDelegate(this) as FinalizeOnRead<MixinRemapOptions.() -> Unit>
+        val old = delegate.value as MixinRemapOptions.() -> Unit
+        mixinRemapOptions = {
+            old()
+            action()
+        }
+    }
+
+    override var allowImplicitWildcards by FinalizeOnRead(false)
+
+    init {
+        remapATToLegacy.convention(null as Boolean?).finalizeValueOnRead()
+    }
+
     @Suppress("UNNECESSARY_NOT_NULL_ASSERTION")
     override fun doRemap(
         from: Path,