From 47021caeab1e03b682f1f3f5447f0cd1806f6d25 Mon Sep 17 00:00:00 2001
From: Cadiboo <37298044+Cadiboo@users.noreply.github.com>
Date: Fri, 26 Apr 2024 21:32:01 +1000
Subject: [PATCH] Fabric prep: Integration test changes

---
 .github/workflows/build.yml                     |  4 ++--
 .../cadiboo/nocubes/fabric/GameTests.java       | 14 ++++++++++++++
 .../github/cadiboo/nocubes/forge/GameTests.java | 17 +++++++++++++++++
 .../integrationtesting/GameTestsAdapter.java    |  4 ----
 4 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 src/test/java/io/github/cadiboo/nocubes/fabric/GameTests.java
 create mode 100644 src/test/java/io/github/cadiboo/nocubes/forge/GameTests.java

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c2576065..0a65a46f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,8 +23,6 @@ jobs:
           echo "signSHA1=${{ secrets.KEYSTORE_SIGN_SHA1 }}" >> gradle.properties
       - name: Build and check
         run: ./gradlew build --stacktrace
-      - name: Integration tests
-        run: ./gradlew runGameTestServer --stacktrace
       - name: Archive jars
         uses: actions/upload-artifact@v3
         with:
@@ -32,6 +30,8 @@ jobs:
           path: |
             ./build/libs/*.jar
           if-no-files-found: error
+      - name: Integration tests
+        run: ./gradlew runGameTestServer --stacktrace
       - name: Publish
         uses: Kir-Antipov/mc-publish@v3.3
         if: "contains(github.event.head_commit.message, '[ci publish]')"
diff --git a/src/test/java/io/github/cadiboo/nocubes/fabric/GameTests.java b/src/test/java/io/github/cadiboo/nocubes/fabric/GameTests.java
new file mode 100644
index 00000000..cf9e54e3
--- /dev/null
+++ b/src/test/java/io/github/cadiboo/nocubes/fabric/GameTests.java
@@ -0,0 +1,14 @@
+package io.github.cadiboo.nocubes.fabric;
+
+import io.github.cadiboo.nocubes.integrationtesting.GameTestsAdapter;
+import net.minecraft.gametest.framework.GameTestGenerator;
+import net.minecraft.gametest.framework.TestFunction;
+
+import java.util.Collection;
+
+public class GameTests {
+	@GameTestGenerator
+	public static Collection<TestFunction> createTests() {
+		return GameTestsAdapter.createTests();
+	}
+}
diff --git a/src/test/java/io/github/cadiboo/nocubes/forge/GameTests.java b/src/test/java/io/github/cadiboo/nocubes/forge/GameTests.java
new file mode 100644
index 00000000..a624e907
--- /dev/null
+++ b/src/test/java/io/github/cadiboo/nocubes/forge/GameTests.java
@@ -0,0 +1,17 @@
+package io.github.cadiboo.nocubes.forge;
+
+import io.github.cadiboo.nocubes.NoCubes;
+import io.github.cadiboo.nocubes.integrationtesting.GameTestsAdapter;
+import net.minecraft.gametest.framework.GameTestGenerator;
+import net.minecraft.gametest.framework.TestFunction;
+import net.minecraftforge.gametest.GameTestHolder;
+
+import java.util.Collection;
+
+@GameTestHolder(NoCubes.MOD_ID)
+public class GameTests {
+	@GameTestGenerator
+	public static Collection<TestFunction> createTests() {
+		return GameTestsAdapter.createTests();
+	}
+}
diff --git a/src/test/java/io/github/cadiboo/nocubes/integrationtesting/GameTestsAdapter.java b/src/test/java/io/github/cadiboo/nocubes/integrationtesting/GameTestsAdapter.java
index a58c0052..d650c5c3 100644
--- a/src/test/java/io/github/cadiboo/nocubes/integrationtesting/GameTestsAdapter.java
+++ b/src/test/java/io/github/cadiboo/nocubes/integrationtesting/GameTestsAdapter.java
@@ -1,23 +1,19 @@
 package io.github.cadiboo.nocubes.integrationtesting;
 
 import io.github.cadiboo.nocubes.NoCubes;
-import net.minecraft.gametest.framework.GameTestGenerator;
 import net.minecraft.gametest.framework.TestFunction;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Rotation;
-import net.minecraftforge.gametest.GameTestHolder;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-@GameTestHolder(NoCubes.MOD_ID)
 final public class GameTestsAdapter {
 
 	// Refers to './run/gameTestServer/gameteststructures/empty.snbt'
 	public static final String EMPTY_STRUCTURE = new ResourceLocation(NoCubes.MOD_ID, "empty").toString();
 
-	@GameTestGenerator
 	public static Collection<TestFunction> createTests() {
 		return Arrays.stream(NoCubesTests.createTests())
 			.map(test -> new TestFunction(