Define default tiny-remapper version in paperweight

Author: jpenilla

gradle/libs.versions.toml

@@ -5,6 +5,7 @@ hypo = "1.2.4"
 serialize = "1.5.1"
 feather = "1.1.0"
 jst = "1.0.68+paper.1-SNAPSHOT"
+tinyRemapper = "0.10.4"
 
 [libraries]
 asm-core = { module = "org.ow2.asm:asm", version.ref = "asm" }
@@ -42,6 +43,7 @@ serialize-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json",
 
 jst = { module = "io.papermc.jst:jst-cli-bundle", version.ref = "jst" }
 # jst = { module = "net.neoforged.jst:jst-cli-bundle", version.ref = "jst" }
+tinyRemapper = { module = "net.fabricmc:tiny-remapper", version.ref = "tinyRemapper" }
 
 # test
 mockk = "io.mockk:mockk:1.13.8"

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/PaperweightCore.kt

@@ -60,7 +60,17 @@ class PaperweightCore : Plugin<Project> {
             delete(target.layout.cache)
         }
 
-        target.configurations.create(REMAPPER_CONFIG)
+        target.configurations.create(REMAPPER_CONFIG) {
+            defaultDependencies {
+                add(
+                    target.dependencies.create(
+                        "${listOf("net", "fabricmc").joinToString(".")}:tiny-remapper:${LibraryVersions.TINY_REMAPPER}:fat"
+                    ) {
+                        isTransitive = false
+                    }
+                )
+            }
+        }
         target.configurations.create(PAPERCLIP_CONFIG)
         target.configurations.create(MACHE_CONFIG) {
             attributes.attribute(MacheOutput.ATTRIBUTE, target.objects.named(MacheOutput.ZIP))
@@ -141,10 +151,6 @@ class PaperweightCore : Plugin<Project> {
 
         target.afterEvaluate {
             target.repositories {
-                maven(ext.remapRepo) {
-                    name = REMAPPER_REPO_NAME
-                    content { onlyForConfigurations(REMAPPER_CONFIG) }
-                }
                 maven(ext.macheRepo) {
                     name = MACHE_REPO_NAME
                     content { onlyForConfigurations(MACHE_CONFIG) }

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/extension/PaperweightCoreExtension.kt

@@ -39,7 +39,6 @@ open class PaperweightCoreExtension(objects: ObjectFactory, layout: ProjectLayou
     val mainClass: Property<String> = objects.property<String>().convention("org.bukkit.craftbukkit.Main")
     val bundlerJarName: Property<String> = objects.property<String>().convention("paper")
 
-    val remapRepo: Property<String> = objects.property<String>().convention(PAPER_MAVEN_REPO_URL)
     val macheRepo: Property<String> = objects.property<String>().convention(PAPER_MAVEN_REPO_URL)
 
     val macheOldPath: DirectoryProperty = objects.directoryProperty()

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/taskcontainers/SoftSpoonTasks.kt

@@ -76,7 +76,7 @@ open class SoftSpoonTasks(
     val jstConfig = project.configurations.register(JST_CONFIG) {
         defaultDependencies {
             // add(project.dependencies.create("net.neoforged.jst:jst-cli-bundle:${JSTVersion.VERSION}"))
-            add(project.dependencies.create("io.papermc.jst:jst-cli-bundle:${JSTVersion.VERSION}"))
+            add(project.dependencies.create("io.papermc.jst:jst-cli-bundle:${LibraryVersions.JST}"))
         }
     }
 

paperweight-lib/build.gradle.kts

@@ -11,6 +11,7 @@ sourceSets.main {
     blossom {
         kotlinSources {
             properties.put("jst_version", libs.versions.jst)
+            properties.put("tinyRemapper_version", libs.versions.tinyRemapper)
         }
     }
 }

paperweight-lib/src/main/kotlin-templates/io/papermc/paperweight/util/JSTVersion.kt.peb renamed to paperweight-lib/src/main/kotlin-templates/io/papermc/paperweight/util/LibraryVersions.kt.peb

@@ -22,6 +22,7 @@
 
 package io.papermc.paperweight.util
 
-object JSTVersion {
-    const val VERSION: String = "{{ jst_version }}"
+object LibraryVersions {
+    const val JST: String = "{{ jst_version }}"
+    const val TINY_REMAPPER: String = "{{ tinyRemapper_version }}"
 }

paperweight-lib/src/main/kotlin/io/papermc/paperweight/taskcontainers/DevBundleTasks.kt

@@ -98,10 +98,8 @@ class DevBundleTasks(
 
     fun configureAfterEvaluate() {
         generateDevelopmentBundle {
-            pluginRemapperUrl.set(project.repositories.named<MavenArtifactRepository>(REMAPPER_REPO_NAME).map { it.url.toString() })
             macheUrl.set(project.repositories.named<MavenArtifactRepository>(MACHE_REPO_NAME).map { it.url.toString() })
             macheDep.set(determineArtifactCoordinates(project.configurations.getByName(MACHE_CONFIG)).single())
-            pluginRemapperDep.set(determineArtifactCoordinates(project.configurations.getByName(REMAPPER_CONFIG)))
         }
     }
 }

paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/GenerateDevBundle.kt

@@ -63,12 +63,6 @@ abstract class GenerateDevBundle : DefaultTask() {
     @get:Input
     abstract val libraryRepositories: ListProperty<String>
 
-    @get:Input
-    abstract val pluginRemapperUrl: Property<String>
-
-    @get:Input
-    abstract val pluginRemapperDep: ListProperty<String>
-
     @get:Input
     abstract val macheUrl: Property<String>
 
@@ -184,7 +178,6 @@ abstract class GenerateDevBundle : DefaultTask() {
         return DevBundleConfig(
             minecraftVersion = minecraftVersion.get(),
             mache = createMacheDep(),
-            pluginRemapper = createRemapDep(),
             patchDir = patchTargetDir,
             reobfMappingsFile = "$dataTargetDir/$reobfMappingsFileName",
             mojangMappedPaperclipFile = "$dataTargetDir/$mojangMappedPaperclipFileName",
@@ -193,16 +186,12 @@ abstract class GenerateDevBundle : DefaultTask() {
         )
     }
 
-    private fun createRemapDep(): MavenDep =
-        pluginRemapperUrl.zip(pluginRemapperDep) { url, dep -> MavenDep(url, dep) }.get()
-
     private fun createMacheDep(): MavenDep =
         macheUrl.zip(macheDep) { url, dep -> MavenDep(url, listOf(dep)) }.get()
 
     data class DevBundleConfig(
         val minecraftVersion: String,
         val mache: MavenDep,
-        val pluginRemapper: MavenDep,
         val patchDir: String,
         val reobfMappingsFile: String,
         val mojangMappedPaperclipFile: String,

paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/constants/constants.kt

@@ -59,6 +59,7 @@ const val REOBF_CONFIG = "reobf"
 const val PARAM_MAPPINGS_REPO_NAME = "paperweightParamMappingsRepository"
 const val DECOMPILER_REPO_NAME = "paperweightDecompilerRepository"
 const val REMAPPER_REPO_NAME = "paperweightRemapperRepository"
+const val PLUGIN_REMAPPER_REPO_NAME = "paperweightPluginRemapperRepository"
 const val MACHE_REPO_NAME = "paperweightMacheRepository"
 
 const val CACHE_PATH = "caches"

paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/PaperweightUser.kt

@@ -233,9 +233,15 @@ abstract class PaperweightUser : Plugin<Project> {
                 content { onlyForConfigurations(PARAM_MAPPINGS_CONFIG) }
             }
         }
-        maven(userdevSetup.remapper.url) {
-            name = REMAPPER_REPO_NAME
-            content { onlyForConfigurations(REMAPPER_CONFIG) }
+        userdevSetup.remapper?.url?.let {
+            maven(it) {
+                name = REMAPPER_REPO_NAME
+                content { onlyForConfigurations(REMAPPER_CONFIG) }
+            }
+        }
+        maven(PAPER_MAVEN_REPO_URL) {
+            name = PLUGIN_REMAPPER_REPO_NAME
+            content { onlyForConfigurations(PLUGIN_REMAPPER_CONFIG) }
         }
         userdevSetup.decompiler?.url?.let {
             maven(it) {
@@ -292,16 +298,21 @@ abstract class PaperweightUser : Plugin<Project> {
             dependenciesFrom { userdevSetup.get().paramMappings }
         }
 
-        fun makeRemapperConfig(name: String) {
-            target.configurations.register(name) {
-                // when using a fat jar for tiny-remapper we don't need its transitive deps
-                dependenciesFrom({ !it.contains(":tiny-remapper:") || !it.endsWith(":fat") }) {
-                    userdevSetup.get().remapper
-                }
+        target.configurations.register(REMAPPER_CONFIG) {
+            // when using a fat jar for tiny-remapper we don't need its transitive deps
+            dependenciesFrom({ !it.contains(":tiny-remapper:") || !it.endsWith(":fat") }) {
+                userdevSetup.get().remapper
+            }
+        }
+        target.configurations.register(PLUGIN_REMAPPER_CONFIG) {
+            // when using a fat jar for tiny-remapper we don't need its transitive deps
+            dependenciesFrom({ !it.contains(":tiny-remapper:") || !it.endsWith(":fat") }) {
+                MavenDep(
+                    PAPER_MAVEN_REPO_URL,
+                    listOf("${listOf("net", "fabricmc").joinToString(".")}:tiny-remapper:${LibraryVersions.TINY_REMAPPER}:fat")
+                )
             }
         }
-        makeRemapperConfig(REMAPPER_CONFIG)
-        makeRemapperConfig(PLUGIN_REMAPPER_CONFIG)
 
         target.configurations.register(MOJANG_MAPPED_SERVER_CONFIG) {
             defaultDependencies {

paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/SetupHandler.kt

@@ -65,7 +65,7 @@ interface SetupHandler {
 
     val decompiler: MavenDep?
 
-    val remapper: MavenDep
+    val remapper: MavenDep?
 
     val mache: MavenDep?
 

paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/SetupHandlerImpl.kt

@@ -226,8 +226,8 @@ class SetupHandlerImpl(
     override val decompiler: MavenDep?
         get() = null
 
-    override val remapper: MavenDep
-        get() = bundle.config.pluginRemapper
+    override val remapper: MavenDep?
+        get() = null
 
     override val mache: MavenDep
         get() = bundle.config.mache

paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/UserdevSetup.kt

@@ -109,7 +109,7 @@ abstract class UserdevSetup : BuildService<UserdevSetup.Parameters>, SetupHandle
     override val decompiler: MavenDep?
         get() = setup.decompiler
 
-    override val remapper: MavenDep
+    override val remapper: MavenDep?
         get() = setup.remapper
 
     override val mache: MavenDep?