From e89fe8efc1c814aa62e5a38881af89c9982335db Mon Sep 17 00:00:00 2001
From: Chrys Chrysanthemum <cow@chrysanthemum.lgbt>
Date: Tue, 7 Jul 2026 18:18:52 +1000
Subject: [PATCH] fix: Fix NeoForge files not being merged into the merged JAR.

---
 .../cowponents/gradle/platform/fabric.gradle.kts  | 15 ---------------
 .../cowponents/gradle/platform/loader.gradle.kts  | 10 +++++++---
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/fabric.gradle.kts b/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/fabric.gradle.kts
index ce2f0d8..7d31e7a 100644
--- a/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/fabric.gradle.kts
+++ b/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/fabric.gradle.kts
@@ -24,21 +24,6 @@ sourceSets {
 	}
 }
 
-xplatProject.tasks {
-	named<Jar>("mergeJar") {
-		dependsOn(tasks["jar"])
-		from(zipTree(tasks.getByName<Jar>("jar").archiveFile.get()))
-	}
-	named<Jar>("mergeJavadocJar") {
-		dependsOn(tasks["javadocJar"])
-		from(zipTree(tasks.getByName<Jar>("javadocJar").archiveFile.get()))
-	}
-	named<Jar>("mergeSourcesJar") {
-		dependsOn(tasks["sourcesJar"])
-		from(zipTree(tasks.getByName<Jar>("sourcesJar").archiveFile.get()))
-	}
-}
-
 repositories {
 	maven("https://maven.fabricmc.net/") {
 		name = "Fabric"
diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/loader.gradle.kts b/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/loader.gradle.kts
index d0f1941..12c33af 100644
--- a/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/loader.gradle.kts
+++ b/build_logic/src/main/kotlin/lgbt/greenhouse/cowponents/gradle/platform/loader.gradle.kts
@@ -35,6 +35,7 @@ sourceSets {
 	}
 }
 
+
 xplatProject.tasks {
 	if (hasApi) {
 		named<Jar>("mergeApiJar") {
@@ -43,13 +44,16 @@ xplatProject.tasks {
 		}
 	}
 	named<Jar>("mergeJar") {
-		from(project.tasks.named("jar"))
+		dependsOn(tasks["jar"])
+		from(zipTree(tasks.getByName<Jar>("jar").archiveFile.get()))
 	}
 	named<Jar>("mergeJavadocJar") {
-		from(project.tasks.named("javadocJar"))
+		dependsOn(tasks["javadocJar"])
+		from(zipTree(tasks.getByName<Jar>("javadocJar").archiveFile.get()))
 	}
 	named<Jar>("mergeSourcesJar") {
-		from(project.tasks.named("sourcesJar"))
+		dependsOn(tasks["sourcesJar"])
+		from(zipTree(tasks.getByName<Jar>("sourcesJar").archiveFile.get()))
 	}
 }
 
-- 
2.51.2