From c44b80241649572a66c48cf004c3e949af92ebcd Mon Sep 17 00:00:00 2001
From: Des Herriott <des.herriott@gmail.com>
Date: Mon, 25 Nov 2024 14:57:32 +0000
Subject: [PATCH] MDG and gametests now work!

---
 build.gradle | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index d7fe208e..7eceac6f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ ext.isAlpha = ext.releaseTag.contains("alpha")
 ext.isBeta = ext.releaseTag.contains("beta")
 def relType = ext.isAlpha ? "alpha" : (ext.isBeta ? "beta" : "release")
 
-version = mod_version
+def gametest_mod_id = mod_id + "test"
 
 repositories {
     mavenLocal()
@@ -48,10 +48,7 @@ repositories {
     }
 }
 
-//sourceSets {
-//    test
-//}
-
+version = mod_version
 group = project.mod_group_id
 
 base {
@@ -84,7 +81,7 @@ neoForge {
         "${mod_id}" {
             sourceSet sourceSets.main
         }
-        "modularrouterstest" {
+        "${gametest_mod_id}" {
             sourceSet sourceSets.test
         }
     }
@@ -111,14 +108,13 @@ neoForge {
             client()
             systemProperty 'neoforge.enableGameTest', 'true'
             // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
-            systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
-            loadedMods = [mods.modularrouters, mods.modularrouterstest]
+            systemProperty 'neoforge.enabledGameTestNamespaces', "${project.mod_id},${gametest_mod_id}"
             sourceSet = sourceSets.test
         }
 
         server {
             server()
-            systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+            systemProperty 'neoforge.enabledGameTestNamespaces', "${project.mod_id}"
             programArgument '--nogui'
         }
 
@@ -127,8 +123,7 @@ neoForge {
         // The gametest system is also enabled by default for other run configs under the /test command.
         gameTestServer {
             type = "gameTestServer"
-            systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
-            loadedMods = [mods.modularrouters, mods.modularrouterstest]
+            systemProperty 'neoforge.enabledGameTestNamespaces', "${project.mod_id},${gametest_mod_id}"
             sourceSet = sourceSets.test
         }
 
@@ -144,19 +139,20 @@ neoForge {
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 configurations {
+    compileClasspath.extendsFrom localImplementation
+    runtimeClasspath.extendsFrom localImplementation
     runtimeClasspath.extendsFrom localRuntime
 }
 
 dependencies {
-//    implementation "net.neoforged:neoforge:${neo_version}"
     localRuntime(testImplementation("net.neoforged:testframework:${neo_version}"))
 
     compileOnly("mcjty.theoneprobe:theoneprobe:${top_version}") {
         transitive = false
     }
 
-    compileOnly "curse.maven:jade-324717:${jade_curse_id}"
-//
+    localImplementation "curse.maven:jade-324717:${jade_curse_id}"
+
     compileOnly "vazkii.patchouli:Patchouli:${patchouli_version}:api"
 //    runtimeOnly "vazkii.patchouli:Patchouli:${patchouli_version}"
 //