From 65f988601efe5aeed30869cc0c6f82ae6615aa7c Mon Sep 17 00:00:00 2001
From: Ruben Taelman <rubensworks@gmail.com>
Date: Sat, 12 Oct 2024 11:44:22 +0200
Subject: [PATCH] Enable gametests

---
 .github/workflows/ci.yml                         |  3 ---
 .../main/groovy/multiloader-loader-fabric.gradle | 11 +++++++++++
 .../main/groovy/multiloader-loader-forge.gradle  | 16 ++++++++++++++++
 .../groovy/multiloader-loader-neoforge.gradle    |  6 +++---
 gradle.properties                                |  2 +-
 5 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7f8085d..412dbe2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,9 +60,6 @@ jobs:
         if: ${{ env.COVERALLS_REPO_TOKEN }}
         run: ./gradlew test jacocoTestReport coveralls
       - name: 'Game Test'
-        env:
-          GAME_TEST: ${{ secrets.GAME_TEST }}
-        if: ${{ env.GAME_TEST }}
         run: ./gradlew runGameTestServer
       - name: 'Deploy as GitHub CI artifacts'
         uses: actions/upload-artifact@v4
diff --git a/buildSrc/src/main/groovy/multiloader-loader-fabric.gradle b/buildSrc/src/main/groovy/multiloader-loader-fabric.gradle
index 83ae222..9b396a4 100644
--- a/buildSrc/src/main/groovy/multiloader-loader-fabric.gradle
+++ b/buildSrc/src/main/groovy/multiloader-loader-fabric.gradle
@@ -38,9 +38,20 @@ loom {
             ideConfigGenerated(true)
             runDir('runs/server')
         }
+        gameTest {
+            server()
+            setConfigName('Loader-fabric: GameTestServer')
+            ideConfigGenerated(true)
+            runDir('runs/gametest')
+            vmArg "-Dfabric-api.gametest"
+        }
     }
 }
 
+task runGameTestServer {
+    dependsOn tasks.runGameTest
+}
+
 publishing {
     publications { PublicationContainer publicationContainer ->
         publicationContainer.getByName("maven") { MavenPublication publication ->
diff --git a/buildSrc/src/main/groovy/multiloader-loader-forge.gradle b/buildSrc/src/main/groovy/multiloader-loader-forge.gradle
index b324459..5339540 100644
--- a/buildSrc/src/main/groovy/multiloader-loader-forge.gradle
+++ b/buildSrc/src/main/groovy/multiloader-loader-forge.gradle
@@ -52,6 +52,7 @@ minecraft {
 
     runs {
         client {
+            property 'forge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
             workingDirectory file('runs/client')
             ideaModule "${rootProject.name}.${project.name}.main"
             taskName 'Client'
@@ -63,6 +64,8 @@ minecraft {
         }
 
         server {
+            property 'forge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
+            args '--nogui'
             workingDirectory file('runs/server')
             ideaModule "${rootProject.name}.${project.name}.main"
             taskName 'Server'
@@ -73,7 +76,20 @@ minecraft {
             }
         }
 
+        gameTestServer {
+            property 'forge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
+            workingDirectory file('runs/gametest')
+            ideaModule "${rootProject.name}.${project.name}.main"
+            taskName 'runGameTestServer'
+            mods {
+                modDataRun {
+                    source sourceSets.main
+                }
+            }
+        }
+
         data {
+            args '--nogui'
             workingDirectory file('runs/data')
             ideaModule "${rootProject.name}.${project.name}.main"
             args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
diff --git a/buildSrc/src/main/groovy/multiloader-loader-neoforge.gradle b/buildSrc/src/main/groovy/multiloader-loader-neoforge.gradle
index 3508f9a..e0eb0c8 100644
--- a/buildSrc/src/main/groovy/multiloader-loader-neoforge.gradle
+++ b/buildSrc/src/main/groovy/multiloader-loader-neoforge.gradle
@@ -59,16 +59,16 @@ runs {
     }
 
     client {
-        systemProperty 'neoforge.enabledGameTestNamespaces', mod_id
+        systemProperty 'neoforge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
     }
 
     server {
-        systemProperty 'neoforge.enabledGameTestNamespaces', mod_id
+        systemProperty 'neoforge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
         programArgument '--nogui'
     }
 
     gameTestServer {
-        systemProperty 'neoforge.enabledGameTestNamespaces', mod_id
+        systemProperty 'neoforge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
     }
 
     data {
diff --git a/gradle.properties b/gradle.properties
index d71fb5f..f9772d5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -42,4 +42,4 @@ org.gradle.daemon=false
 org.gradle.caching=true
 
 # Common dependencies
-cyclopscore_version=1.20.0-568
+cyclopscore_version=1.25.1-627