Fix merge issues from pre-5.2 to 5.2 code

Author: robotgryphon

src/main/java/dev/compactmods/machines/compat/theoneprobe/providers/TunnelProvider.java

@@ -68,7 +68,7 @@ public void addProbeInfo(ProbeMode probeMode, IProbeInfo info, Player playerEnti
             BlockPos outPosBlock = connectedMachinePos.getBlockPosition();
 
             try {
-                final var state = connectedPos.state(level.getServer());
+                final var state = connectedPos.level(level.getServer()).getBlockState(connectedPos.getBlockPosition());
 
                 // If connected block isn't air, show a connected block line
                 if (!state.isAir()) {

src/main/java/dev/compactmods/machines/machine/CompactMachineBlockEntity.java

@@ -4,7 +4,6 @@
 import dev.compactmods.machines.api.dimension.CompactDimension;
 import dev.compactmods.machines.api.machine.MachineNbt;
 import dev.compactmods.machines.location.LevelBlockPosition;
-import dev.compactmods.machines.api.tunnels.connection.RoomTunnelConnections;
 import dev.compactmods.machines.dimension.MissingDimensionException;
 import dev.compactmods.machines.machine.graph.DimensionMachineGraph;
 import dev.compactmods.machines.machine.graph.CompactMachineNode;
@@ -274,19 +273,4 @@ public Stream<BlockPos> getTunnels(Direction dir) {
 
         return Stream.empty();
     }
-
-    public Optional<RoomTunnelConnections> getTunnelGraph() {
-        if(level == null || roomChunk == null) return Optional.empty();
-
-        if(level instanceof ServerLevel sl) {
-            final var compactDim = CompactDimension.forServer(sl.getServer());
-            if (compactDim == null)
-                return Optional.empty();
-
-            final var tunnelGraph = TunnelConnectionGraph.forRoom(compactDim, roomChunk);
-            return Optional.of(tunnelGraph);
-        }
-
-        return Optional.empty();
-    }
 }

src/main/java/dev/compactmods/machines/room/Rooms.java

@@ -6,9 +6,7 @@
 import dev.compactmods.machines.api.location.IDimensionalBlockPosition;
 import dev.compactmods.machines.api.location.IDimensionalPosition;
 import dev.compactmods.machines.api.room.RoomSize;
-import dev.compactmods.machines.api.room.RoomTemplate;
 import dev.compactmods.machines.config.ServerConfig;
-import dev.compactmods.machines.core.Registries;
 import dev.compactmods.machines.dimension.MissingDimensionException;
 import dev.compactmods.machines.location.LevelBlockPosition;
 import dev.compactmods.machines.machine.graph.DimensionMachineGraph;
@@ -22,7 +20,6 @@
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.registries.RegistryBuilder;
 
 import javax.naming.OperationNotSupportedException;
 import java.util.Objects;

src/main/java/dev/compactmods/machines/tunnel/TunnelWallBlock.java

@@ -2,7 +2,6 @@
 
 import dev.compactmods.machines.api.core.Messages;
 import dev.compactmods.machines.api.dimension.CompactDimension;
-import dev.compactmods.machines.api.tunnels.TunnelDefinition;
 import dev.compactmods.machines.api.tunnels.TunnelPosition;
 import dev.compactmods.machines.api.tunnels.lifecycle.TunnelTeardownHandler;
 import dev.compactmods.machines.i18n.TranslationUtil;
@@ -109,7 +108,7 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player
                 level.addFreshEntity(ie);
 
                 if (def instanceof TunnelTeardownHandler<?> teardown) {
-                    teardown.onRemoved(compactDim.getServer(), new TunnelPosition(pos, tunnelWallSide, tunnelConnectedSide), tunnel.getTunnel());
+                    teardown.onRemoved(new TunnelPosition(compactDim, pos, tunnelWallSide), tunnel.getTunnel());
                 }
 
                 final var tunnels = TunnelConnectionGraph.forRoom(compactDim, new ChunkPos(pos));
@@ -120,7 +119,7 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player
 
                 final var tunnelGraph = TunnelConnectionGraph.forRoom(compactDim, new ChunkPos(pos));
                 final var existingDirs = tunnelGraph
-                        .getTunnelSides(def)
+                        .getTunnelSides(Tunnels.getRegistryId(def))
                         .collect(Collectors.toSet());
 
                 if (existingDirs.size() == 6) {
@@ -136,7 +135,7 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player
                     level.setBlockAndUpdate(pos, state.setValue(CONNECTED_SIDE, newSide));
 
                     if (def instanceof TunnelTeardownHandler<?> teardown) {
-                        teardown.onRotated(compactDim.getServer(), new TunnelPosition(pos, tunnelWallSide, tunnelConnectedSide), tunnel.getTunnel(), dir, newSide);
+                        teardown.onRotated(tunnel.tunnelPosition(), tunnel.getTunnel(), dir, newSide);
                     }
 
                     tunnelGraph.rotateTunnel(pos, newSide);

src/main/java/dev/compactmods/machines/tunnel/TunnelWallEntity.java

@@ -252,7 +252,11 @@ public void setInstance(TunnelInstance newTunn) {
         setChanged();
     }
 
-    public TunnelPosition getTunnelPosition() {
-        return new TunnelPosition(worldPosition, getTunnelSide(), getConnectedSide());
+    @org.jetbrains.annotations.Nullable
+    public TunnelPosition tunnelPosition() {
+        if(level instanceof ServerLevel sl)
+            return new TunnelPosition(sl, worldPosition, getConnectedSide());
+
+        return null;
     }
 }

src/main/java/dev/compactmods/machines/tunnel/graph/TunnelConnectionGraph.java

@@ -8,8 +8,6 @@
 import dev.compactmods.machines.api.location.IDimensionalBlockPosition;
 import dev.compactmods.machines.api.tunnels.TunnelDefinition;
 import dev.compactmods.machines.api.tunnels.capability.CapabilityTunnel;
-import dev.compactmods.machines.api.tunnels.connection.RoomTunnelConnections;
-import dev.compactmods.machines.api.tunnels.redstone.RedstoneTunnel;
 import dev.compactmods.machines.tunnel.Tunnels;
 import dev.compactmods.machines.graph.*;
 import dev.compactmods.machines.location.LevelBlockPosition;
@@ -37,7 +35,7 @@
  * Represents a room's tunnel connections in a graph-style format.
  * This should be accessed through the saved data for specific machine room chunks.
  */
-public class TunnelConnectionGraph extends SavedData implements INBTSerializable<CompoundTag>, RoomTunnelConnections {
+public class TunnelConnectionGraph extends SavedData implements INBTSerializable<CompoundTag> {
 
     /**
      * The full data graph. Contains tunnel nodes, machine ids, and tunnel type information.

src/main/java/dev/compactmods/machines/util/CompactStructureGenerator.java

@@ -5,12 +5,8 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Vec3i;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 
@@ -142,11 +138,4 @@ public static void generateCompactStructure(LevelAccessor world, RoomSize size,
         int s = size.getInternalSize();
         generateCompactStructure(world, new Vec3i(s, s, s), cubeFloorCenter);
     }
-
-    public static void fillRoomTemplate(ServerLevel level, ResourceLocation template, Vec3i dimensions, BlockPos cubeFloorCenter) {
-        level.getStructureManager().get(template).ifPresent(tem -> {
-            BlockPos placeAt = cornerFromSize(dimensions, cubeFloorCenter);
-            tem.placeInWorld(level, placeAt, placeAt, new StructurePlaceSettings(), level.random, Block.UPDATE_ALL);
-        });
-    }
 }

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

@@ -1,14 +1,12 @@
 package dev.compactmods.machines.test.worldgen;
 
 import dev.compactmods.machines.api.core.Constants;
-import dev.compactmods.machines.api.room.RoomTemplate;
 import dev.compactmods.machines.test.TestBatches;
 import dev.compactmods.machines.util.CompactStructureGenerator;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Vec3i;
 import net.minecraft.gametest.framework.GameTest;
 import net.minecraft.gametest.framework.GameTestHelper;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraftforge.gametest.GameTestHolder;
 import net.minecraftforge.gametest.PrefixGameTestTemplate;
@@ -25,9 +23,6 @@ public static void checkRoomGeneratorColossal(final GameTestHelper test) {
         CompactStructureGenerator.generateCompactStructure(test.getLevel(), roomDims, roomCenter);
 
         test.setBlock(new BlockPos(7, 8, 7), Blocks.GOLD_BLOCK.defaultBlockState());
-        CompactStructureGenerator.fillRoomTemplate(test.getLevel(),
-                new ResourceLocation(Constants.MOD_ID, "template_max"),
-                roomDims, roomCenter);
 
         test.succeed();
     }
@@ -40,9 +35,6 @@ public static void checkRoomGeneratorNormal(final GameTestHelper test) {
         CompactStructureGenerator.generateCompactStructure(test.getLevel(), roomDims, roomCenter);
 
         test.setBlock(new BlockPos(7, 5, 7), Blocks.GOLD_BLOCK.defaultBlockState());
-        CompactStructureGenerator.fillRoomTemplate(test.getLevel(),
-                RoomTemplate.NO_TEMPLATE,
-                roomDims, roomCenter);
 
         test.succeed();
     }
@@ -55,9 +47,6 @@ public static void checkRoomGeneratorSmall(final GameTestHelper test) {
         CompactStructureGenerator.generateCompactStructure(test.getLevel(), roomDims, roomCenter);
 
         test.setBlock(new BlockPos(7, 4, 7), Blocks.GOLD_BLOCK.defaultBlockState());
-        CompactStructureGenerator.fillRoomTemplate(test.getLevel(),
-                RoomTemplate.NO_TEMPLATE,
-                roomDims, roomCenter);
 
         test.succeed();
     }