Baseline for gametests

Author: robotgryphon

build.gradle

@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url = 'https://maven.minecraftforge.net' }
         mavenCentral()
+        mavenLocal()
     }
 
     dependencies {
@@ -52,6 +53,14 @@ sourceSets {
         compileClasspath += sourceSets.api.output
         runtimeClasspath += sourceSets.api.output
     }
+
+    test {
+        java { srcDir "src/test/java" }
+        resources { srcDir "src/test/resources" }
+
+        compileClasspath += sourceSets.api.output
+        runtimeClasspath += sourceSets.api.output
+    }
 }
 
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
@@ -132,10 +141,42 @@ minecraft {
                 }
             }
         }
+
+        gametestserver {
+            workingDirectory project.file('run/gametest')
+
+            // Recommended logging data for a userdev environment
+            // The markers can be added/remove as needed separated by commas.
+            // "SCAN": For mods scan.
+            // "REGISTRIES": For firing of registry events.
+            // "REGISTRYDUMP": For getting the contents of all registries.
+            property 'forge.logging.markers', 'REGISTRIES'
+
+            // Recommended logging level for the console
+            // You can set various levels here.
+            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
+            property 'forge.logging.console.level', 'debug'
+
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
+
+            // Only runs gametests which use "examplemod" as the namespace
+            args '--enableNamespace', mod_id
+
+            mods {
+                compactmachines {
+                    source sourceSets.api
+                    source sourceSets.main
+                    source sourceSets.test
+                }
+            }
+        }
     }
 }
 
 repositories {
+    mavenLocal()
+
     maven {
         url "https://www.cursemaven.com"
         content {
@@ -188,7 +229,7 @@ dependencies {
     runtimeOnly(fg.deobf("curse.maven:create-328085:3556823"))
     runtimeOnly(fg.deobf("curse.maven:refinedpipes-370696:3570151"))
     runtimeOnly(fg.deobf("curse.maven:prettypipes-376737:3573145"))
-    runtimeOnly(fg.deobf("curse.maven:refinedstorage-243076:3569563"))
+    runtimeOnly(fg.deobf("curse.maven:refinedstorage-243076:3623324"))
 
     // Mekanism + Mek Generators - Tunnel testing
 //    runtimeOnly(fg.deobf("curse.maven:mekanism-268560:3206392"))
@@ -199,6 +240,10 @@ processResources {
     duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
 }
 
+processTestResources {
+    duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
+}
+
 jar {
     from sourceSets.main.output
     from sourceSets.api.output

gradle.properties

@@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 minecraft_version=1.18.1
-forge_version=39.0.75
+forge_version=39.0.97-gametest-1.18.x
 
 mod_id=compactmachines
-mod_version=4.0.0-beta.6
+mod_version=4.0.0-beta.7
 
 # Dependencies and Libs
 jei_mc_version=1.18.1

src/test/java/dev/compactmods/machines/test/GameTestsMain.java

@@ -0,0 +1,16 @@
+package dev.compactmods.machines.test;
+
+import dev.compactmods.machines.CompactMachines;
+import dev.compactmods.machines.test.data.CodecTests;
+import net.minecraftforge.event.RegisterGameTestsEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+
+@Mod.EventBusSubscriber(modid = CompactMachines.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
+public class GameTestsMain {
+
+    @SubscribeEvent
+    public static void registerTests(final RegisterGameTestsEvent game) {
+        game.register(CodecTests.class);
+    }
+}

…mpactmods/machines/tests/GraphTests.java …ompactmods/machines/test/GraphTests.java1.16.5-test/java/dev/compactmods/machines/tests/GraphTests.java renamed to src/test/java/dev/compactmods/machines/test/GraphTests.java 1.16.5-test/java/dev/compactmods/machines/tests/GraphTests.java renamed to src/test/java/dev/compactmods/machines/test/GraphTests.java

@@ -1,5 +1,7 @@
-package dev.compactmods.machines.tests;
+package dev.compactmods.machines.test;
 
+import java.util.Collection;
+import java.util.Optional;
 import com.google.common.graph.Graph;
 import com.mojang.serialization.DataResult;
 import dev.compactmods.machines.data.codec.CodecExtensions;
@@ -8,17 +10,17 @@
 import dev.compactmods.machines.data.graph.CompactMachineRoomNode;
 import dev.compactmods.machines.data.graph.IMachineGraphNode;
 import dev.compactmods.machines.util.MathUtil;
-import net.minecraft.nbt.*;
-import net.minecraft.util.math.ChunkPos;
-import net.minecraftforge.common.util.Constants;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.nbt.Tag;
+import net.minecraft.world.level.ChunkPos;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-import java.util.Collection;
-import java.util.Optional;
-
 @DisplayName("Machine Graph Tests")
+@org.junit.jupiter.api.Tag("minecraft")
 public class GraphTests {
 
     private CompactMachineConnectionGraph generateGraphWithSingleRoom() {
@@ -135,42 +137,34 @@ void canCreateRoomWithMultipleLinkedMachines() {
     void canSerialize() {
         CompactMachineConnectionGraph graph = generateGraphWithSingleRoom();
 
-        DataResult<INBT> nbtResult = CompactMachineConnectionGraph.CODEC.encodeStart(NBTDynamicOps.INSTANCE, graph);
+        DataResult<Tag> nbtResult = CompactMachineConnectionGraph.CODEC.encodeStart(NbtOps.INSTANCE, graph);
 
         nbtResult.resultOrPartial(Assertions::fail)
                 .ifPresent(nbt -> {
-                    Assertions.assertTrue(nbt instanceof CompoundNBT);
-
-//                    try {
-//                        File file = FileHelper.RESOURCES_DIR.resolve("graph.dat").toFile();
-//                        file.delete();
-//                        CompressedStreamTools.writeCompressed((CompoundNBT) nbt, file);
-//                    } catch (IOException e) {
-//                        e.printStackTrace();
-//                    }
+                    Assertions.assertTrue(nbt instanceof CompoundTag);
 
-                    CompoundNBT c = (CompoundNBT) nbt;
+                    CompoundTag c = (CompoundTag) nbt;
                     Assertions.assertFalse(c.isEmpty());
 
                     Assertions.assertTrue(c.contains("connections"));
 
-                    ListNBT connections = c.getList("connections", Constants.NBT.TAG_COMPOUND);
+                    ListTag connections = c.getList("connections", Tag.TAG_COMPOUND);
                     Assertions.assertEquals(1, connections.size(), "Expected one connection from a machine to a single room.");
 
-                    CompoundNBT conn1 = connections.getCompound(0);
+                    CompoundTag conn1 = connections.getCompound(0);
                     Assertions.assertNotNull(conn1);
 
                     Assertions.assertTrue(conn1.contains("machine"));
                     Assertions.assertTrue(conn1.contains("connections"));
 
-                    INBT machineChunk = conn1.get("machine");
-                    DataResult<ChunkPos> chunkRes = CodecExtensions.CHUNKPOS.parse(NBTDynamicOps.INSTANCE, machineChunk);
+                    Tag machineChunk = conn1.get("machine");
+                    DataResult<ChunkPos> chunkRes = CodecExtensions.CHUNKPOS.parse(NbtOps.INSTANCE, machineChunk);
                     chunkRes.resultOrPartial(Assertions::fail)
                             .ifPresent(chunk -> {
                                 Assertions.assertEquals(new ChunkPos(0, 0), chunk);
                             });
 
-                    ListNBT connList = conn1.getList("connections", Constants.NBT.TAG_INT);
+                    ListTag connList = conn1.getList("connections", Tag.TAG_COMPOUND);
                     Assertions.assertNotNull(connList);
                     Assertions.assertEquals(1, connList.size());
                     Assertions.assertEquals(0, connList.getInt(0));
@@ -199,88 +193,6 @@ void simpleNestedMachines() {
         graph.connectMachineToRoom(1, room1);
 
     }
-//    private void generateData(MutableGraph<IGraphNode> g, HashMap<String, IGraphNode> lookup) {
-//        Random r = new Random();
-//        MachineExternalLocation[] values = MachineExternalLocation.values();
-//        int numInsides = 0;
-//        int numOutsides = 0;
-//
-//        Set<IMachineGraphNode> disconnected = new HashSet<>();
-//        List<CompactMachineExternalNode> externals = new ArrayList<>();
-//        List<CompactMachineInsideNode> internals = new ArrayList<>();
-//
-//        // Seed a couple of machines and insides so they're always there
-//        for(int i = 0; i < 10; i++) {
-//            ChunkPos machineChunk = getMachineChunkPos(numInsides + 1);
-//            CompactMachineExternalNode extern = createMachineExternalNode(g, lookup, i);
-//            CompactMachineInsideNode intern = createMachineInternalNode(g, lookup, machineChunk);
-//
-//            externals.add(extern);
-//            internals.add(intern);
-//
-//            extern.connectTo(intern);
-//            numOutsides++;
-//            numInsides++;
-//        }
-//
-//        for(int i = 0; i < 50; i++) {
-//
-//            if(r.nextBoolean()) {
-//                // Creating the outside of a machine
-//                MachineExternalLocation loc = values[r.nextInt(values.length)];
-//
-//                CompactMachineExternalNode machine = createMachineExternalNode(g, lookup, numOutsides + 1);
-//                externals.add(machine);
-//
-//                switch (loc) {
-//                    case EXTERNAL_DIMENSION:
-//                        int randomMachineInsideE = r.nextInt(internals.size());
-//                        CompactMachineInsideNode miE = internals.get(randomMachineInsideE);
-//                        machine.connectTo(miE);
-//
-//                        // try to remove from disconnected if it exists there
-//                        disconnected.remove(miE);
-//                        break;
-//
-//                    case INSIDE_MACHINE:
-//                        int randomMachineInsideI = r.nextInt(internals.size());
-//                        CompactMachineInsideNode miI = internals.get(randomMachineInsideI);
-//
-//                        // Put the machine inside a randomly chosen existing machine
-//                        g.putEdge(miI, machine);
-//
-//                        boolean connectToAnother = r.nextBoolean();
-//                        if(connectToAnother) {
-//                            System.out.println("connect");
-//                            int randomMachine = r.nextInt(internals.size());
-//                            CompactMachineInsideNode in = internals.get(randomMachine);
-//                            machine.connectTo(in);
-//
-//                            g.successors(machine); // All the connections internally
-//                        }
-//                        break;
-//                }
-//
-//                numOutsides++;
-//            } else {
-//                // Creating the inside of a machine
-//                ChunkPos machineChunk= getMachineChunkPos(numInsides + 1);
-//                CompactMachineInsideNode mi = createMachineInternalNode(g, lookup, machineChunk);
-//                disconnected.add(mi);
-//                numInsides++;
-//            }
-//        }
-//
-//        if(!disconnected.isEmpty()) {
-//            for (IMachineGraphNode di : disconnected) {
-//                CompactMachineExternalNode machine = createMachineExternalNode(g, lookup, numOutsides + 1);
-//                machine.connectTo(di);
-//                numOutsides++;
-//            }
-//        }
-//
-//        disconnected.clear();
-//    }
 
     public static String write(final CompactMachineConnectionGraph graph) {
         StringBuilder sb = new StringBuilder();
@@ -290,20 +202,6 @@ public static String write(final CompactMachineConnectionGraph graph) {
                 .append("\tlayout = fdp;").append(System.lineSeparator())
                 .append("\tnode [shape=square,style=filled,color=lightgray];").append(System.lineSeparator());
 
-//        Set<CompactMachineNode> topLevelMachines = graph.getMachines()
-//                .filter(n -> graph.getConnectedRoom(n.getMachineId()).isPresent())
-//                .collect(Collectors.toSet());
-//
-//        for (CompactMachineNode n : topLevelMachines)
-//            outputExternalNode(sb, n);
-//
-//        graph.nodes().stream()
-//                .filter(n -> n instanceof CompactMachineRoomNode)
-//                .map(n -> (CompactMachineRoomNode) n)
-//                .forEach(n -> {
-//                    outputMachineInside(graph, sb, n);
-//                });
-
         sb.append("}");
         return sb.toString();
     }

…ompactmods/machines/tests/MathTests.java …compactmods/machines/test/MathTests.java1.16.5-test/java/dev/compactmods/machines/tests/MathTests.java renamed to src/test/java/dev/compactmods/machines/test/MathTests.java 1.16.5-test/java/dev/compactmods/machines/tests/MathTests.java renamed to src/test/java/dev/compactmods/machines/test/MathTests.java

@@ -1,12 +1,13 @@
-package dev.compactmods.machines.tests;
-
-import dev.compactmods.machines.util.MathUtil;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.ChunkPos;
-import net.minecraft.util.math.vector.Vector3i;
-import org.junit.jupiter.api.*;
+package dev.compactmods.machines.test;
 
 import java.util.HashMap;
+import dev.compactmods.machines.util.MathUtil;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.ChunkPos;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
 
 @DisplayName("Math")
 public class MathTests {
@@ -33,7 +34,7 @@ void positionGeneratorWorksCorrectly() {
         tests.put(8, new ChunkPos(-64, -64));
 
         tests.forEach((id, expectedChunk) -> {
-            Vector3i byIndex = MathUtil.getRegionPositionByIndex(id);
+            Vec3i byIndex = MathUtil.getRegionPositionByIndex(id);
             BlockPos finalPos = MathUtil.getCenterWithY(byIndex, 0);
 
             ChunkPos calculatedChunk = new ChunkPos(finalPos);

src/test/java/dev/compactmods/machines/test/data/CodecTests.java

@@ -0,0 +1,14 @@
+package dev.compactmods.machines.test.data;
+
+import dev.compactmods.machines.CompactMachines;
+import net.minecraft.gametest.framework.GameTest;
+import net.minecraft.gametest.framework.GameTestHelper;
+
+// @GameTestHolder / @ModGameTests here?
+public class CodecTests {
+
+    @GameTest(templateNamespace = CompactMachines.MOD_ID, prefixTemplateWithClassname = false, template = "empty_5x")
+    public static void testCodec(GameTestHelper test) {
+        test.succeed();
+    }
+}

…mods/machines/tests/util/FileHelper.java …tmods/machines/test/util/FileHelper.java1.16.5-test/java/dev/compactmods/machines/tests/util/FileHelper.java renamed to src/test/java/dev/compactmods/machines/test/util/FileHelper.java 1.16.5-test/java/dev/compactmods/machines/tests/util/FileHelper.java renamed to src/test/java/dev/compactmods/machines/test/util/FileHelper.java

@@ -1,16 +1,15 @@
-package dev.compactmods.machines.tests.util;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.nbt.CompressedStreamTools;
+package dev.compactmods.machines.test.util;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtIo;
 
 public class FileHelper {
     public static final FileHelper INSTANCE = new FileHelper();
@@ -41,8 +40,8 @@ public JsonElement getJsonFromFile(String filename) {
         return g.fromJson(isr, JsonElement.class);
     }
 
-    public CompoundNBT getNbtFromFile(String filename) throws IOException {
+    public CompoundTag getNbtFromFile(String filename) throws IOException {
         InputStream isr = getFileStream(filename);
-        return CompressedStreamTools.readCompressed(isr);
+        return NbtIo.readCompressed(isr);
     }
 }