diff --git a/build-logic/src/main/kotlin/floodgate-modded.platform-conventions.gradle.kts b/build-logic/src/main/kotlin/floodgate-modded.platform-conventions.gradle.kts index 71b70a27..19deadc7 100644 --- a/build-logic/src/main/kotlin/floodgate-modded.platform-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/floodgate-modded.platform-conventions.gradle.kts @@ -1,5 +1,3 @@ -import net.fabricmc.loom.task.RemapJarTask - plugins { id("floodgate-modded.publish-conventions") id("architectury-plugin") @@ -85,11 +83,17 @@ tasks { archiveVersion.set("") } - register("remapModrinthJar", RemapJarTask::class) { - dependsOn(shadowJar) - inputFile.set(shadowJar.get().archiveFile) - archiveVersion.set(versionName(project)) - archiveClassifier.set("") + register("renameTask") { + dependsOn(remapJar) + + val modrinthFileName = "${versionName(project)}.jar" + val libsFile = remapJar.get().destinationDirectory.get().asFile + + from(remapJar.get().archiveFile) + rename { modrinthFileName } + into(libsFile) + + outputs.file(libsFile.resolve(modrinthFileName)) } // Readme sync @@ -127,7 +131,7 @@ modrinth { syncBodyFrom.set(rootProject.file("README.md").readText()) - uploadFile.set(tasks.getByPath("remapModrinthJar")) + uploadFile.set(tasks.getByPath("renameTask").outputs.files.first()) gameVersions.add(libs.minecraft.get().version as String) gameVersions.add("1.21.1") failSilently.set(false) diff --git a/mod/build.gradle.kts b/mod/build.gradle.kts index 3d990ac1..3dfb8039 100644 --- a/mod/build.gradle.kts +++ b/mod/build.gradle.kts @@ -23,11 +23,11 @@ dependencies { afterEvaluate { // We don't need these - tasks.named("remapModrinthJar").configure { + tasks.named("renameTask").configure { enabled = false } tasks.named("modrinth").configure { enabled = false } -} \ No newline at end of file +}