From 05af344da2ad773e8a534f0336246a1cdfc5a75f Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Sun, 21 Jul 2024 17:34:43 +0200
Subject: [PATCH] fix: maybe add testmod dependency properly

---
 jfmod/src/main/kotlin/jfmod.module.gradle.kts | 23 ++++++++-----------
 lom/src/main/kotlin/lom.gradle.kts            | 11 +++++++--
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/jfmod/src/main/kotlin/jfmod.module.gradle.kts b/jfmod/src/main/kotlin/jfmod.module.gradle.kts
index 1b50fec..d9420a0 100644
--- a/jfmod/src/main/kotlin/jfmod.module.gradle.kts
+++ b/jfmod/src/main/kotlin/jfmod.module.gradle.kts
@@ -65,22 +65,19 @@ afterEvaluate {
     rootProject.allprojects.forEach {
         it.pAfterEvaluate { sub ->
             if (sub != this && rootArgs.isMod(sub)) {
-                if (rootArgs.isFabric(sub) && lomArgs.isFabric) {
-                    loom {
-                        mods {
-                            register(sub.name) {
-                                sourceSet(sub.sourceSets.main.get())
-                                if (rootArgs.isSplitSources(sub)) sourceSet(sub.sourceSets.client.get())
-                            }
-                            if (!sourceSets.testmod.get().resources.isEmpty) {
-                                register("${sub.name}-testmod") {
-                                    sourceSet(sub.sourceSets.testmod.get())
-                                }
+                loom {
+                    mods {
+                        register(sub.name) {
+                            sourceSet(sub.sourceSets.main.get())
+                            if (rootArgs.isSplitSources(sub)) sourceSet(sub.sourceSets.client.get())
+                        }
+                        if (!sourceSets.testmod.get().resources.isEmpty) {
+                            register("${sub.name}-testmod") {
+                                sourceSet(sub.sourceSets.testmod.get())
                             }
                         }
                     }
                 }
-                //TODO handle forge
             }
         }
     }
@@ -103,7 +100,7 @@ afterEvaluate {
     if (!isRoot) rootProject.dependencies {
         api(project(path = project.path, configuration = "shadow"))
         if (lomArgs.isSplitSources) clientImplementation(sourceSets.client.get().output)
-        testmodImplementation(sourceSets.testmod.get().output)
+        testmodImplementation(project(mapOf("path" to project.path, "configuration" to "testmod")))
 
         if (!devOnly) include(project)
     }
diff --git a/lom/src/main/kotlin/lom.gradle.kts b/lom/src/main/kotlin/lom.gradle.kts
index b363078..6266280 100644
--- a/lom/src/main/kotlin/lom.gradle.kts
+++ b/lom/src/main/kotlin/lom.gradle.kts
@@ -205,7 +205,11 @@ tasks.publish { dependsOn(tasks.build) }
 tasks.deployDebug.dependsOn(tasks.publish)
 
 // create testmodInclude configuration
-val testmodIncludeConfiguration = configurations.create("testmodInclude")
+val testmodInclude by configurations.creating
+val testmod by configurations.creating {
+    isCanBeConsumed = true
+    isCanBeResolved = false
+}
 
 if (hasTestmod) {
     // generate jar from testmod source set
@@ -214,6 +218,9 @@ if (hasTestmod) {
         destinationDirectory.set(devlibs)
         archiveClassifier.set("testmod")
     }
+    artifacts {
+        add(testmod.name, testmodJar)
+    }
 
     afterEvaluate {
         // remap configuration for outputting usable testmod jar
@@ -223,7 +230,7 @@ if (hasTestmod) {
             archiveClassifier.set("testmod")
             // add nested jars from testmodInclude
             addNestedDependencies.set(true)
-            nestedJars.setFrom(*testmodIncludeConfiguration.files.toTypedArray())
+            nestedJars.setFrom(*testmodInclude.files.toTypedArray())
         }
         tasks.assemble { dependsOn(remapTestmodJar) }
     }