Test structures, room gen test, move client code into client pkg

Author: robotgryphon

gradle.properties

@@ -4,14 +4,14 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 minecraft_version=1.18.1
-forge_version=39.0.97-gametest-1.18.x
+forge_version=39.0.88
 
 mod_id=compactmachines
 mod_version=4.0.0-beta.7
 
 # Dependencies and Libs
 jei_mc_version=1.18.1
-jei_version=9.1.0.41
+jei_version=9.4.1.106
 #top_version=1.16-3.1.4-22
 
 # Curseforge

…ctmods/machines/reference/Resources.java …mpactmods/machines/client/Resources.javasrc/main/java/dev/compactmods/machines/reference/Resources.java renamed to src/main/java/dev/compactmods/machines/client/Resources.java src/main/java/dev/compactmods/machines/reference/Resources.java renamed to src/main/java/dev/compactmods/machines/client/Resources.java

@@ -1,4 +1,4 @@
-package dev.compactmods.machines.reference;
+package dev.compactmods.machines.client;
 
 import net.minecraft.resources.ResourceLocation;
 import dev.compactmods.machines.CompactMachines;

…mpactmods/machines/reference/GuiIds.java …pactmods/machines/client/gui/GuiIds.javasrc/main/java/dev/compactmods/machines/reference/GuiIds.java renamed to src/main/java/dev/compactmods/machines/client/gui/GuiIds.java src/main/java/dev/compactmods/machines/reference/GuiIds.java renamed to src/main/java/dev/compactmods/machines/client/gui/GuiIds.java

@@ -1,4 +1,4 @@
-package dev.compactmods.machines.reference;
+package dev.compactmods.machines.client.gui;
 
 public enum GuiIds {
     PSD_GUIDE,

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

@@ -0,0 +1,24 @@
+package dev.compactmods.machines.test;
+
+import dev.compactmods.machines.CompactMachines;
+import dev.compactmods.machines.core.Registration;
+import dev.compactmods.machines.util.DimensionUtil;
+import net.minecraft.server.MinecraftServer;
+import net.minecraftforge.event.server.ServerStartedEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+
+@Mod.EventBusSubscriber(modid = CompactMachines.MOD_ID)
+public class ServerEvents {
+
+    @SubscribeEvent
+    public static void onServerStarted(final ServerStartedEvent evt) {
+        final MinecraftServer serv = evt.getServer();
+
+        var compactLevel = serv.getLevel(Registration.COMPACT_DIMENSION);
+
+        if (compactLevel == null) {
+            DimensionUtil.createAndRegisterWorldAndDimension(serv);
+        }
+    }
+}

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

@@ -2,7 +2,7 @@
 
 import com.mojang.serialization.DataResult;
 import dev.compactmods.machines.data.codec.CodecExtensions;
-import dev.compactmods.machines.reference.EnumMachineSize;
+import dev.compactmods.machines.rooms.RoomSize;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.StringTag;
@@ -31,15 +31,15 @@ void canSerializeVector3d() {
 
     @Test
     void canSerializeMachineSize() {
-        DataResult<Tag> result = EnumMachineSize.CODEC.encodeStart(NbtOps.INSTANCE, EnumMachineSize.LARGE);
+        DataResult<Tag> result = RoomSize.CODEC.encodeStart(NbtOps.INSTANCE, RoomSize.LARGE);
 
         result.resultOrPartial(Assertions::fail)
                 .ifPresent(nbt -> {
                     Assertions.assertEquals(StringTag.TYPE, nbt.getType());
 
                     StringTag string = (StringTag) nbt;
                     Assertions.assertNotNull(string);
-                    Assertions.assertEquals(EnumMachineSize.LARGE.getSerializedName(), string.getAsString());
+                    Assertions.assertEquals(RoomSize.LARGE.getSerializedName(), string.getAsString());
                 });
     }
 }

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

@@ -19,9 +19,11 @@
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
-import org.junit.jupiter.api.DisplayName;
+import net.minecraftforge.gametest.GameTestHolder;
+import net.minecraftforge.gametest.PrefixGameTestTemplate;
 
-@DisplayName("External Machine Data")
+@PrefixGameTestTemplate(false)
+@GameTestHolder(CompactMachines.MOD_ID)
 public class MachineExternalDataTests {
     final static Path EXTERNAL = Paths.get("scenario", "single-machine-player-inside", "machines_external.dat");
 
@@ -30,7 +32,7 @@ public class MachineExternalDataTests {
             .stable()
             .codec();
 
-    @GameTest(templateNamespace = CompactMachines.MOD_ID, prefixTemplateWithClassname = false, template = "empty_5x", timeoutTicks = 240)
+    @GameTest(template = "empty_5x5", timeoutTicks = 240, batch = "machine_data")
     public static void canLoadSingleMachineData(final GameTestHelper game) throws IOException {
         // The external point is overworld @ 8x4x8 (it was made in a default void superflat)
         DimensionalPosition OUTSIDE = new DimensionalPosition(
@@ -53,8 +55,6 @@ public static void canLoadSingleMachineData(final GameTestHelper game) throws IO
             return;
         }
 
-        CompactMachines.LOGGER.debug("hi - " + game.getTick());
-
         res.ifPresent(list -> {
             if (list.size() != 1) {
                 game.fail("Expected exactly one connection; got " + list.size());

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

@@ -0,0 +1,27 @@
+package dev.compactmods.machines.test.util;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.gametest.framework.GameTestHelper;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings;
+
+public class TestUtil {
+
+    public static void loadStructureIntoTestArea(GameTestHelper test, ResourceLocation structure, BlockPos relLocation) {
+        final var structures = test.getLevel().getStructureManager();
+        final var template = structures.get(structure);
+        if(template.isEmpty())
+            return;
+
+        var placeAt = test.absolutePos(relLocation);
+        template.get().placeInWorld(
+                test.getLevel(),
+                placeAt,
+                placeAt,
+                new StructurePlaceSettings(),
+                test.getLevel().getRandom(),
+                Block.UPDATE_ALL);
+    }
+
+}

src/test/java/dev/compactmods/machines/test/util/TestUtil.java

@@ -0,0 +1,26 @@
+package dev.compactmods.machines.test.worldgen;
+
+import dev.compactmods.machines.CompactMachines;
+import dev.compactmods.machines.core.Registration;
+import net.minecraft.gametest.framework.GameTest;
+import net.minecraft.gametest.framework.GameTestHelper;
+import net.minecraftforge.gametest.GameTestHolder;
+import net.minecraftforge.gametest.PrefixGameTestTemplate;
+
+@PrefixGameTestTemplate(false)
+@GameTestHolder(CompactMachines.MOD_ID)
+public class DimensionTests {
+
+    @GameTest(template = "empty_5x5", batch = "dimension")
+    public static void dimensionRegistered(final GameTestHelper test) {
+        var level = test.getLevel();
+        var server = level.getServer();
+
+        var compact = server.getLevel(Registration.COMPACT_DIMENSION);
+
+        if (compact == null)
+            test.fail("Compact dimension not registered.");
+
+        test.succeed();
+    }
+}

src/test/java/dev/compactmods/machines/test/worldgen/DimensionTests.java

@@ -0,0 +1,99 @@
+package dev.compactmods.machines.test.worldgen;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.function.Consumer;
+import dev.compactmods.machines.CompactMachines;
+import dev.compactmods.machines.machine.CompactMachineBlockEntity;
+import dev.compactmods.machines.core.Registration;
+import dev.compactmods.machines.rooms.RoomSize;
+import dev.compactmods.machines.test.util.TestUtil;
+import dev.compactmods.machines.util.CompactStructureGenerator;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.gametest.framework.GameTest;
+import net.minecraft.gametest.framework.GameTestGenerator;
+import net.minecraft.gametest.framework.GameTestHelper;
+import net.minecraft.gametest.framework.TestFunction;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.Vec3;
+import net.minecraftforge.gametest.GameTestHolder;
+import net.minecraftforge.gametest.PrefixGameTestTemplate;
+
+@PrefixGameTestTemplate(false)
+@GameTestHolder(CompactMachines.MOD_ID)
+public class MachineRoomGenerationTests {
+
+    @GameTestGenerator
+    public static Collection<TestFunction> generatesMachinesCorrectly() {
+        HashSet<TestFunction> tests = new HashSet<>();
+
+        // TestFunction(String batch, String testName, String structure, int testTime, long setupTime, boolean isRequired, Consumer<GameTestHelper> tester)
+        for (var size : RoomSize.values()) {
+            var template = new ResourceLocation(CompactMachines.MOD_ID, size.getSerializedName());
+            Consumer<GameTestHelper> test = (t) -> {
+                var lev = t.getLevel();
+                TestUtil.loadStructureIntoTestArea(t, template, new BlockPos(0, 17, 0));
+
+                var centerSpawn = t.absolutePos(new BlockPos(7, 8, 7));
+                CompactStructureGenerator.generateCompactStructure(lev, size, centerSpawn);
+
+                BlockPos
+                        .betweenClosedStream(BlockPos.ZERO.above(), new BlockPos(15, 16, 15))
+                        .forEach(pos -> {
+                            var compare = pos.above(16);
+                            t.assertSameBlockState(pos, compare);
+                        });
+
+                t.succeed();
+            };
+
+            var testf = new TestFunction("room_generation", "room_" + size.getSerializedName(), "compactmachines:empty_15x31", 50, 0, true, test);
+            tests.add(testf);
+        }
+        ;
+
+        return tests;
+    }
+
+    @GameTest(template = "empty_5x5", batch = "dimension")
+    public static void usingPsdCreatesRoom(final GameTestHelper test) {
+        var player = test.makeMockPlayer();
+
+        var machLoc = new BlockPos(3, 0, 3);
+        var realMachLoc = test.absolutePos(machLoc);
+
+        test.setBlock(machLoc, Registration.MACHINE_BLOCK_NORMAL.get());
+
+        player.setItemInHand(InteractionHand.MAIN_HAND, new ItemStack(Registration.PERSONAL_SHRINKING_DEVICE.get()));
+
+        test.startSequence()
+                .thenExecute(() -> {
+                    BlockState blockstate = test.getBlockState(machLoc);
+                    blockstate.use(test.getLevel(), player, InteractionHand.MAIN_HAND, new BlockHitResult(Vec3.atCenterOf(realMachLoc), Direction.NORTH, realMachLoc, true));
+
+                })
+                .thenExecuteAfter(2, () -> {
+                    if(test.getBlockEntity(machLoc) instanceof CompactMachineBlockEntity mach) {
+
+                        if(!mach.mapped())
+                            test.fail("Machine was not mapped to a room.");
+
+                        if(mach.machineId == -1)
+                            test.fail("Machine ID not set after PSD usage.");
+
+                        var roomid = mach.getInternalChunkPos();
+                        if(roomid.isEmpty())
+                            test.fail("Room was not registered.");
+
+                        test.succeed();
+                    } else {
+                        test.fail("Expected machine block to have a block entity.");
+                    }
+                });
+    }
+}