Remove deprecated CSG method, clean up Rooms

Author: robotgryphon

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

@@ -3,13 +3,10 @@
 import com.mojang.authlib.GameProfile;
 import dev.compactmods.machines.CompactMachines;
 import dev.compactmods.machines.api.dimension.CompactDimension;
-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.config.ServerConfig;
 import dev.compactmods.machines.dimension.MissingDimensionException;
-import dev.compactmods.machines.location.LevelBlockPosition;
-import dev.compactmods.machines.machine.graph.DimensionMachineGraph;
 import dev.compactmods.machines.room.data.CompactRoomData;
 import dev.compactmods.machines.room.exceptions.NonexistentRoomException;
 import dev.compactmods.machines.util.CompactStructureGenerator;
@@ -22,10 +19,8 @@
 import net.minecraft.world.phys.Vec3;
 
 import javax.naming.OperationNotSupportedException;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.stream.Stream;
 
 public class Rooms {
     public static ChunkPos createNew(MinecraftServer serv, RoomSize size, UUID owner) throws MissingDimensionException {
@@ -41,7 +36,7 @@ public static ChunkPos createNew(MinecraftServer serv, RoomSize size, UUID owner
         BlockPos newCenter = MathUtil.getCenterWithY(location, ServerConfig.MACHINE_FLOOR_Y.get());
 
         // Generate a new machine room
-        CompactStructureGenerator.generateCompactStructure(compactWorld, size, newCenter);
+        CompactStructureGenerator.generateCompactStructure(compactWorld, size.toVec3(), newCenter);
 
         ChunkPos machineChunk = new ChunkPos(newCenter);
         try {
@@ -58,87 +53,6 @@ public static ChunkPos createNew(MinecraftServer serv, RoomSize size, UUID owner
         return machineChunk;
     }
 
-    // TODO - Revisit with furnace recipe
-//    public static boolean destroy(MinecraftServer server, ChunkPos room) throws MissingDimensionException, NonexistentRoomException {
-//        final var compactDim = server.getLevel(Registration.COMPACT_DIMENSION);
-//        if (compactDim == null)
-//            throw new MissingDimensionException();
-//
-//        var roomData = CompactRoomData.get(compactDim);
-//        if (!roomData.isRegistered(room)) {
-//            throw new NonexistentRoomException(room);
-//        }
-//
-//        final var roomBounds = roomData.getBounds(room);
-//        final var innerBounds = roomBounds.deflate(1);
-//
-//        final var states = compactDim.getBlockStates(innerBounds)
-//                .collect(Collectors.toSet());
-//
-//        final var nonAir = states.stream()
-//                .filter(state -> !state.isAir())
-//                .findAny();
-//
-//        if (nonAir.isPresent()) {
-//            CompactMachines.LOGGER.error("Refusing to delete room at {}; non-air blocks exist inside the room. First match: {}", room, nonAir.get());
-//            return false;
-//        }
-//
-//        // clear tunnel connection info
-//        final var tunnels = RoomTunnelData.getFile(server, room);
-//        final var filename = RoomTunnelData.getDataFilename(room);
-//        if (!tunnels.delete()) {
-//            CompactMachines.LOGGER.warn("Could not delete tunnel data for room {}; clearing the connection graph as an alternative.", room);
-//            CompactMachines.LOGGER.warn("Data file to delete: {}", filename);
-//
-//            var td = RoomTunnelData.forRoom(server, room);
-//            td.getGraph().clear();
-//            td.setDirty();
-//        } else {
-//            // File deletion successful, delete cached data
-//            final var compactDataCache = compactDim.getDataStorage().cache;
-//            compactDataCache.remove(filename);
-//        }
-//
-//        // reset everything for the room boundary
-//        BlockPos.betweenClosedStream(roomBounds.inflate(1))
-//                .forEach(p -> compactDim.setBlock(p, Blocks.AIR.defaultBlockState(), Block.UPDATE_ALL));
-//
-//        // Remove room registration
-//        roomData.remove(room);
-//
-//        // Disconnect all machines
-//        var conns = MachineToRoomConnections.forDimension(server);
-//        var d = CompactMachineData.get(server);
-//
-//        var connected = conns.getMachinesFor(room);
-//        for (int mid : connected) {
-//            var location = d.getMachineLocation(mid);
-//            location.ifPresent(p -> {
-//                var pos = p.getBlockPosition();
-//                var l = p.level(server);
-//                if (l.getBlockEntity(pos) instanceof TunnelWallEntity tunn) {
-//                    tunn.disconnect();
-//                }
-//            });
-//        }
-//
-//        conns.unregisterRoom(room);
-//        return true;
-//    }
-
-    public static Stream<IDimensionalBlockPosition> getConnectedMachines(MinecraftServer server, ChunkPos room) {
-        return server.levelKeys().stream()
-                .map(server::getLevel)
-                .filter(Objects::nonNull)
-                .filter(sl -> sl.getDataStorage().cache.containsKey(DimensionMachineGraph.DATA_KEY))
-                .flatMap(sl -> {
-                    final var graph = DimensionMachineGraph.forDimension(sl);
-                    return graph.getMachinesFor(room).stream()
-                            .map(bp -> new LevelBlockPosition(sl.dimension(), bp));
-                });
-    }
-
     public static RoomSize sizeOf(MinecraftServer server, ChunkPos room) throws NonexistentRoomException {
         final var compactDim = server.getLevel(CompactDimension.LEVEL_KEY);
         return CompactRoomData.get(compactDim)

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

@@ -125,17 +125,4 @@ public static BlockPos cornerFromSize(Vec3i dimensions, BlockPos cubeFloorCenter
 
         return cubeFloorCenter.offset(offset);
     }
-
-    /**
-     * Generates a machine "internal" structure in a world via a machine size and a central point.
-     *
-     * @param world
-     * @param size
-     * @param cubeFloorCenter
-     */
-    @Deprecated(forRemoval = true)
-    public static void generateCompactStructure(LevelAccessor world, RoomSize size, BlockPos cubeFloorCenter) {
-        int s = size.getInternalSize();
-        generateCompactStructure(world, new Vec3i(s, s, s), cubeFloorCenter);
-    }
 }