From 114c93ed77301f6fe8e76d5a95b988b9c60d15ee Mon Sep 17 00:00:00 2001 From: Ruben Taelman Date: Sat, 12 Oct 2024 12:57:14 +0200 Subject: [PATCH] Enable gametests --- .github/workflows/ci.yml | 3 --- build.gradle | 6 +++--- gradle.properties | 2 +- src/main/resources/META-INF/neoforge.mods.toml | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 79c7af77..5d733cc9 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/build.gradle b/build.gradle index fcb44ae8..265d1529 100644 --- a/build.gradle +++ b/build.gradle @@ -147,16 +147,16 @@ runs { } client { - systemProperty 'forge.enabledGameTestNamespaces', project.mod_id + systemProperty 'neoforge.enabledGameTestNamespaces', "cyclopscore,${mod_id}" } server { - systemProperty 'forge.enabledGameTestNamespaces', project.mod_id + systemProperty 'neoforge.enabledGameTestNamespaces', "cyclopscore,${mod_id}" programArgument '--nogui' } gameTestServer { - systemProperty 'forge.enabledGameTestNamespaces', project.mod_id + systemProperty 'neoforge.enabledGameTestNamespaces', "cyclopscore,${mod_id}" } data { diff --git a/gradle.properties b/gradle.properties index 8efdac60..85b48634 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ minecraft_version=1.21.1 neoforge_version=21.1.2 parchment_version=2024.07.07 parchment_minecraft_version=1.21 -cyclopscore_version=1.20.0-568 +cyclopscore_version=1.25.1-627 integrateddynamics_version=1.23.2-832 release_type=release fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44 diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml index cc98cb63..1e560eea 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -16,7 +16,7 @@ Create scripts for handling operations in Integrated Dynamics. [[dependencies.integratedscripting]] modId="cyclopscore" type="required" - versionRange="[1.20.0,)" + versionRange="[1.25.1,)" ordering="NONE" side="BOTH" [[dependencies.integratedscripting]]