From 074627c5bf0ec8b260a32d870fdcbde893639d64 Mon Sep 17 00:00:00 2001
From: "J. Fronny" <git@akbvopenfl1.hopto.org>
Date: Sat, 25 Jun 2022 09:11:31 +0000
Subject: [PATCH] Fix runTestmodClient in LibJF again (maybe)

---
 jfmod.gradle | 14 +++++++++++++-
 jfmod.yml    |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/jfmod.gradle b/jfmod.gradle
index 10dfbb9..d804aae 100644
--- a/jfmod.gradle
+++ b/jfmod.gradle
@@ -264,6 +264,19 @@ allprojects {
     }
     build.dependsOn remapMavenJar
 
+    task testmodJar(type: Jar) {
+        from sourceSets.testmod.output
+        destinationDirectory = new File(project.buildDir, "devlibs")
+        archiveClassifier = "testmod"
+    }
+
+    task remapTestmodJar(type: net.fabricmc.loom.task.RemapJarTask, dependsOn: testmodJar) {
+        input = testmodJar.archiveFile
+        archiveClassifier = "testmod"
+        addNestedDependencies = false
+    }
+    build.dependsOn remapTestmodJar
+
     publishing {
         publications {
             mavenJava(MavenPublication) {
@@ -342,7 +355,6 @@ dependencies {
                 include it
             }
 
-            testmodImplementation it.sourceSets.main.output
             testmodImplementation it.sourceSets.testmod.output
         }
     }
diff --git a/jfmod.yml b/jfmod.yml
index 3f127db..c42cc73 100644
--- a/jfmod.yml
+++ b/jfmod.yml
@@ -17,7 +17,7 @@ build_test:
     - gradle --build-cache deployDebug -Pmaven="$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/maven"
     - cp build/libs/* ./
     - cp build/devlibs/*-dev.jar ./
-    - rm *-maven.jar *-sources.jar
+    - rm *-maven.jar *-sources.jar *-testmod.jar
     - mv *-dev.jar dev.zip
     - mv *.jar latest.jar
     - mv dev.zip latest-dev.jar