More work on fixing tests.

Author: robotgryphon

build.gradle

@@ -171,6 +171,8 @@ minecraft {
             // Only runs gametests which use "examplemod" as the namespace
             args '--enableNamespace', mod_id
 
+            environment "CC_TEST_RESOURCES", sourceSets.test.resources.srcDirs[0]
+
             mods {
                 compactcrafting {
                     source sourceSets.api

src/api/java/dev/compactmods/crafting/api/field/MiniaturizationFieldSize.java

@@ -110,17 +110,32 @@ public BlockPos getOriginCenter() {
         return new BlockPos(BlockPos.ZERO.offset(size, size, size));
     }
 
+    public BlockPos getOriginCenter(int y) {
+        return new BlockPos(0, y, 0).offset(size, size, size);
+    }
+
     public BlockPos getOriginCenterFromCorner() {
         return getOriginCenter().offset(projectorDistance, 0, projectorDistance);
     }
 
+    public BlockPos getOriginCenterFromCorner(int y) {
+        return getOriginCenter(y).offset(projectorDistance, 0, projectorDistance);
+    }
+
     public Stream<BlockPos> getProjectorLocationsAtOrigin() {
         return Arrays
                 .stream(new Direction[]{Direction.NORTH, Direction.SOUTH, Direction.EAST, Direction.WEST})
                 .filter(d -> d.getAxis().isHorizontal())
                 .map(hor -> getProjectorLocationForDirection(getOriginCenter(), hor));
     }
 
+    public Stream<BlockPos> getProjectorLocationsAtOrigin(int y) {
+        return Arrays
+                .stream(new Direction[]{Direction.NORTH, Direction.SOUTH, Direction.EAST, Direction.WEST})
+                .filter(d -> d.getAxis().isHorizontal())
+                .map(hor -> getProjectorLocationForDirection(getOriginCenter(y), hor));
+    }
+
     public Stream<BlockPos> getProjectorLocations(BlockPos center) {
         return Arrays
                 .stream(new Direction[]{Direction.NORTH, Direction.SOUTH, Direction.EAST, Direction.WEST})
@@ -145,6 +160,10 @@ public AABB getBoundsAtOrigin() {
         return getBoundsAtPosition(getOriginCenter());
     }
 
+    public AABB getBoundsAtOrigin(int y) {
+        return getBoundsAtPosition(getOriginCenter(y));
+    }
+
     public AABB getBoundsAtPosition(BlockPos center) {
         return new AABB(center).inflate(this.size);
     }

src/main/java/dev/compactmods/crafting/recipes/blocks/RecipeBlocks.java

@@ -5,12 +5,12 @@
 import dev.compactmods.crafting.api.components.IRecipeComponents;
 import dev.compactmods.crafting.api.recipe.layers.IRecipeBlocks;
 import dev.compactmods.crafting.util.BlockSpaceUtil;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.AABB;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
 import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.Vec3;
 
 public class RecipeBlocks implements IRecipeBlocks {
 

src/main/resources/META-INF/accesstransformer.cfg

@@ -1 +1,3 @@
-public net.minecraft.world.level.dimension.DimensionType f_63848_ # DEFAULT_OVERWORLD
+public net.minecraft.world.level.dimension.DimensionType f_63848_ # DEFAULT_OVERWORLD
+
+public net.minecraft.gametest.framework.GameTestHelper m_177451_()Lnet/minecraft/world/phys/AABB; # getRelativeBounds

src/test/java/dev/compactmods/crafting/tests/BlockSpaceUtilTests.java

@@ -4,30 +4,27 @@
 import java.util.concurrent.ExecutionException;
 import com.google.common.collect.ImmutableSet;
 import dev.compactmods.crafting.CompactCrafting;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.resources.FolderPackFinder;
-import net.minecraft.resources.IPackNameDecorator;
-import net.minecraft.resources.ResourcePackList;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.management.PlayerList;
+import net.minecraft.server.packs.repository.FolderRepositorySource;
+import net.minecraft.server.packs.repository.PackSource;
 import net.minecraftforge.event.entity.player.PlayerEvent;
+import net.minecraftforge.event.server.ServerStartedEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
 
 @Mod.EventBusSubscriber(modid = CompactCrafting.MOD_ID)
 public class ServerEventListener {
 
     @SubscribeEvent
-    public static void onServerStarted(final FMLServerStartedEvent evt) {
+    public static void onServerStarted(final ServerStartedEvent evt) {
         final MinecraftServer server = evt.getServer();
 
         // Add "test/resources" as a resource pack to the pack repository
-        final ResourcePackList packs = server.getPackRepository();
+        final var packs = server.getPackRepository();
 
         final String cc_test_resources = System.getenv("CC_TEST_RESOURCES");
         if(cc_test_resources != null) {
-            final FolderPackFinder testPack = new FolderPackFinder(new File(cc_test_resources), IPackNameDecorator.DEFAULT);
+            final var testPack = new FolderRepositorySource(new File(cc_test_resources), PackSource.DEFAULT);
             packs.addPackFinder(testPack);
             packs.reload();
 
@@ -49,9 +46,9 @@ public static void onServerStarted(final FMLServerStartedEvent evt) {
 
     @SubscribeEvent
     static void onPlayerJoined(final PlayerEvent.PlayerLoggedInEvent evt) {
-        final PlayerEntity player = evt.getPlayer();
-        final MinecraftServer server = player.getServer();
-        final PlayerList players = server.getPlayerList();
+        final var player = evt.getPlayer();
+        final var server = player.getServer();
+        final var players = server.getPlayerList();
         final boolean op = players.isOp(player.getGameProfile());
         if (!op)
             players.op(player.getGameProfile());