From b96ba8a968bffc99f8749d13d8b5fc38b0f3f565 Mon Sep 17 00:00:00 2001 From: ILikePlayingGames <22475143+ILikePlayingGames@users.noreply.github.com> Date: Fri, 5 Jul 2024 21:08:07 -0400 Subject: Small buildscript fixes - Update devauth - Fix remapJar not being included when configuring all tasks with type Jar - Rename intermediate artifacts and folder to better show what they are --- build.gradle.kts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7451e88..93ce3eb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -80,7 +80,7 @@ dependencies { annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT") // If you don't want to log in with your real minecraft account, remove this line - runtimeOnly("me.djtheredstoner:DevAuth-forge-legacy:1.1.2") + runtimeOnly("me.djtheredstoner:DevAuth-forge-legacy:1.2.1") } @@ -90,7 +90,7 @@ tasks.withType(JavaCompile::class) { options.encoding = "UTF-8" } -tasks.withType(Jar::class) { +tasks.withType(org.gradle.jvm.tasks.Jar::class) { archiveBaseName.set(modid) manifest.attributes.run { this["FMLCorePluginContainsFMLMod"] = "true" @@ -124,16 +124,16 @@ val remapJar by tasks.named("remapJar") { tasks.jar { archiveClassifier.set("without-deps") - destinationDirectory.set(layout.buildDirectory.dir("badjars")) + destinationDirectory.set(layout.buildDirectory.dir("intermediates")) } tasks.shadowJar { - destinationDirectory.set(layout.buildDirectory.dir("badjars")) - archiveClassifier.set("all-dev") + destinationDirectory.set(layout.buildDirectory.dir("intermediates")) + archiveClassifier.set("non-obfuscated-with-deps") configurations = listOf(shadowImpl) doLast { configurations.forEach { - println("Copying jars into mod: ${it.files}") + println("Copying dependencies into mod: ${it.files}") } } -- cgit