From 0fe333b7be61b9621edd494fc227da16279518a1 Mon Sep 17 00:00:00 2001
From: AlexProgrammerDE <40795980+AlexProgrammerDE@users.noreply.github.com>
Date: Fri, 27 Feb 2026 20:09:27 +0100
Subject: [PATCH] fix: merge common resources via sourceSets, bundle only
 classes in jar

Adds common's resources as a source dir so they're available during
runClient, and bundles only classesDirs in the jar to avoid duplicates.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 mc-1.21.10/build.gradle.kts | 7 ++-----
 mc-1.21.11/build.gradle.kts | 7 ++-----
 mc-1.21.8/build.gradle.kts  | 7 ++-----
 mc-1.21.9/build.gradle.kts  | 7 ++-----
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/mc-1.21.10/build.gradle.kts b/mc-1.21.10/build.gradle.kts
index 708d17b..0e631ec 100644
--- a/mc-1.21.10/build.gradle.kts
+++ b/mc-1.21.10/build.gradle.kts
@@ -31,11 +31,6 @@ dependencies {
     implementation(project(":common"))
 }
 
-tasks.named<Jar>("jar") {
-    dependsOn(project(":common").tasks.named("classes"))
-    from(project(":common").sourceSets["main"].output)
-}
-
 tasks.processResources {
     inputs.property("version", project.version)
     inputs.property("minecraft_version", minecraftVersion)
@@ -63,6 +58,8 @@ java {
 }
 
 tasks.jar {
+    dependsOn(project(":common").tasks.named("classes"))
+    from(project(":common").sourceSets["main"].output.classesDirs)
     from("LICENSE") {
         rename { "${it}_${base.archivesName.get()}" }
     }
diff --git a/mc-1.21.11/build.gradle.kts b/mc-1.21.11/build.gradle.kts
index 708d17b..0e631ec 100644
--- a/mc-1.21.11/build.gradle.kts
+++ b/mc-1.21.11/build.gradle.kts
@@ -31,11 +31,6 @@ dependencies {
     implementation(project(":common"))
 }
 
-tasks.named<Jar>("jar") {
-    dependsOn(project(":common").tasks.named("classes"))
-    from(project(":common").sourceSets["main"].output)
-}
-
 tasks.processResources {
     inputs.property("version", project.version)
     inputs.property("minecraft_version", minecraftVersion)
@@ -63,6 +58,8 @@ java {
 }
 
 tasks.jar {
+    dependsOn(project(":common").tasks.named("classes"))
+    from(project(":common").sourceSets["main"].output.classesDirs)
     from("LICENSE") {
         rename { "${it}_${base.archivesName.get()}" }
     }
diff --git a/mc-1.21.8/build.gradle.kts b/mc-1.21.8/build.gradle.kts
index 708d17b..0e631ec 100644
--- a/mc-1.21.8/build.gradle.kts
+++ b/mc-1.21.8/build.gradle.kts
@@ -31,11 +31,6 @@ dependencies {
     implementation(project(":common"))
 }
 
-tasks.named<Jar>("jar") {
-    dependsOn(project(":common").tasks.named("classes"))
-    from(project(":common").sourceSets["main"].output)
-}
-
 tasks.processResources {
     inputs.property("version", project.version)
     inputs.property("minecraft_version", minecraftVersion)
@@ -63,6 +58,8 @@ java {
 }
 
 tasks.jar {
+    dependsOn(project(":common").tasks.named("classes"))
+    from(project(":common").sourceSets["main"].output.classesDirs)
     from("LICENSE") {
         rename { "${it}_${base.archivesName.get()}" }
     }
diff --git a/mc-1.21.9/build.gradle.kts b/mc-1.21.9/build.gradle.kts
index 708d17b..0e631ec 100644
--- a/mc-1.21.9/build.gradle.kts
+++ b/mc-1.21.9/build.gradle.kts
@@ -31,11 +31,6 @@ dependencies {
     implementation(project(":common"))
 }
 
-tasks.named<Jar>("jar") {
-    dependsOn(project(":common").tasks.named("classes"))
-    from(project(":common").sourceSets["main"].output)
-}
-
 tasks.processResources {
     inputs.property("version", project.version)
     inputs.property("minecraft_version", minecraftVersion)
@@ -63,6 +58,8 @@ java {
 }
 
 tasks.jar {
+    dependsOn(project(":common").tasks.named("classes"))
+    from(project(":common").sourceSets["main"].output.classesDirs)
     from("LICENSE") {
         rename { "${it}_${base.archivesName.get()}" }
     }