Improve our game test helpers for how we interact with a block from a specific side, and add a test to validate it functions properly

Author: pupnewfster

gradle.properties

@@ -12,7 +12,7 @@ forge_version=20.6.72-beta
 mod_version=10.5.20
 #This determines the minimum version of forge required to use Mekanism
 # Only bump it whenever we need access to a feature in forge that is not available in earlier versions
-forge_version_range=[20.6.50-beta,)
+forge_version_range=[20.6.72-beta,)
 minecraft_version_range=[1.20.6]
 #This specifies what type of release it will be uploaded to CurseForge and Modrinth as
 # options are: alpha, beta, release

src/gameTest/java/mekanism/common/tests/helpers/MekGameTestHelper.java

@@ -3,6 +3,7 @@
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.common.capabilities.Capabilities;
 import mekanism.common.util.WorldUtils;
+import net.minecraft.commands.arguments.EntityAnchorArgument;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -13,7 +14,6 @@
 import net.minecraft.server.level.ChunkMap;
 import net.minecraft.server.level.DistanceManager;
 import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
 import net.minecraft.world.ItemInteractionResult;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
@@ -24,6 +24,7 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.Vec3;
 import net.neoforged.neoforge.items.IItemHandler;
 import net.neoforged.testframework.gametest.ExtendedGameTestHelper;
 
@@ -142,15 +143,9 @@ public Player makeMockPlayerLookingAt(int x, int y, int z, Direction direction)
 
     public Player makeMockPlayerLookingAt(BlockPos relativePos, Direction direction) {
         Player player = makeMockPlayer();
-        player.setXRot(direction == Direction.DOWN ? 90 : direction == Direction.UP ? -90 : 0);
-        float yRot = direction.toYRot();
-        player.setYRot(yRot);
-        player.setYHeadRot(yRot);
-        player.setPos(absolutePos(relativePos).getCenter().subtract(
-              0.45 * direction.getStepX(),
-              0.45 * direction.getStepY() + player.getEyeHeight(),
-              0.45 * direction.getStepZ()
-        ));
+        BlockPos targetPos = absolutePos(relativePos);
+        player.setPos(Vec3.upFromBottomCenterOf(targetPos.relative(direction.getOpposite()), -player.getEyeHeight()));
+        player.lookAt(EntityAnchorArgument.Anchor.EYES, targetPos.getCenter());
         return player;
     }
 

src/gameTest/java/mekanism/common/tests/network/TransmitterNetworkTest.java

@@ -5,11 +5,18 @@
 import mekanism.api.functions.ConstantPredicates;
 import mekanism.common.Mekanism;
 import mekanism.common.content.network.transmitter.Transmitter;
+import mekanism.common.lib.transmitter.ConnectionType;
 import mekanism.common.lib.transmitter.DynamicNetwork;
 import mekanism.common.registries.MekanismBlocks;
 import mekanism.common.tests.MekanismTests;
 import mekanism.common.tests.helpers.MekGameTestHelper;
+import mekanism.common.tests.helpers.TransmitterTestHelper;
+import mekanism.common.tile.transmitter.TileEntityLogisticalTransporter;
 import mekanism.common.tile.transmitter.TileEntityTransmitter;
+import mekanism.common.util.EnumUtils;
+import net.minecraft.SharedConstants;
+import net.minecraft.core.Direction;
+import net.minecraft.core.Direction.AxisDirection;
 import net.minecraft.gametest.framework.GameTest;
 import net.minecraft.server.level.ChunkHolder;
 import net.minecraft.server.level.ChunkLevel;
@@ -36,6 +43,35 @@ public class TransmitterNetworkTest {
           builder -> builder.fill(0, 0, 0, 3 * 16 - 1, 0, 0, MekanismBlocks.BASIC_UNIVERSAL_CABLE.getBlock())
     );
 
+    @GameTest(setupTicks = SharedConstants.TICKS_PER_SECOND)
+    @TestHolder(description = "Tests the GameTest helpers that use a configurator on a position, to ensure it properly interacts with each side.")
+    public static void testConfiguratorSideTargeting(final DynamicTest test) {
+        test.registerGameTestTemplate(() -> StructureTemplateBuilder.withSize(3, 3, 3)
+              .fill(1, 0, 1, 1, 2, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState())
+              .fill(1, 1, 0, 1, 1, 2, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState())
+              .fill(0, 1, 1, 2, 1, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState())
+        );
+
+        //Note: We make negative axis directions get changed twice so that we have a better estimate of if we properly clicked on the correct side of the block
+        test.onGameTest(TransmitterTestHelper.class, helper -> helper.startSequence()
+              .thenExecute(() -> {
+                  //Use the configurator on all sides
+                  for (Direction direction : EnumUtils.DIRECTIONS) {
+                      helper.useConfigurator(1, 2, 1, direction, direction.getAxisDirection() == AxisDirection.POSITIVE ? 1 : 2);
+                  }
+              })
+              .thenMap(() -> helper.requireBlockEntity(1, 2, 1, TileEntityLogisticalTransporter.class).getTransmitter())
+              .thenExecute(transporter -> {
+                  //Validate all sides got properly changed
+                  for (Direction direction : EnumUtils.DIRECTIONS) {
+                      ConnectionType expected = direction.getAxisDirection() == AxisDirection.POSITIVE ? ConnectionType.PUSH : ConnectionType.PULL;
+                      helper.assertValueEqual(transporter.getConnectionTypeRaw(direction), expected, "Connection Type " + direction.getName());
+                  }
+              })
+              .thenSucceed()
+        );
+    }
+
     @GameTest(template = STRAIGHT_CABLE, batch = "1")
     @TestHolder(description = "Tests that reloading intermediary chunks does not cause a network to break.")
     public static void reloadIntermediary(final DynamicTest test) {