From c65d762c1af1b363cee288132469e3e4caa85447 Mon Sep 17 00:00:00 2001 From: Siphalor Date: Tue, 4 Nov 2025 00:23:35 +0100 Subject: [PATCH] build(minecraft): Fix issues with minecraft mod packaging --- .../de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts | 9 ++++++++- ...iphalor.tweed5.minecraft.mod.cross-version.gradle.kts | 4 ---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts b/conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts index be71963..cc095d9 100644 --- a/conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts +++ b/conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts @@ -40,9 +40,16 @@ tasks.assemble { val minecraftModSourcesJar = tasks.register("minecraftModSourcesJar") { group = LifecycleBasePlugin.BUILD_GROUP + dependsOn(tasks.named("sourcesJar")) dependsOn(processMinecraftModResources) - from(zipTree(tasks.named("sourcesJar").get().archiveFile)) + from(tasks.named("sourcesJar").get().archiveFile.map { + if (it.asFile.exists()) { + zipTree(it) + } else { + files() + } + }) from(project.layout.buildDirectory.dir("minecraftModResources")) archiveClassifier = "sources" diff --git a/tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.cross-version.gradle.kts b/tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.cross-version.gradle.kts index 2a648f1..f96de82 100644 --- a/tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.cross-version.gradle.kts +++ b/tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.cross-version.gradle.kts @@ -110,10 +110,6 @@ tasks.named("compileTestmodJava") { dependsOn(testmodJcyo) } -java { - withSourcesJar() -} - lombok { version = libs.versions.lombok.get() }