Merge branch 'mc-1.20.x' into mc-1.21.x

CONTRIBUTING.md

@@ -88,8 +88,8 @@ You'll first need to [set up a development environment as above](#setting-up-a-d
 
 Once this is set up, you can now run `./gradlew docWebsite`. This generates documentation from our Lua and Java code,
 writing the resulting HTML into `./projects/web/build/site`, which can then be opened in a browser. When iterating on
-documentation, you can instead run `./gradlew docWebsite -t`, which will rebuild documentation every time you change a
-file.
+documentation, you can instead run `./gradlew :web:assemble -x :web:compileTeaVM -t`, which will rebuild documentation
+every time you change a file.
 
 Documentation is built using [illuaminate] which, while not currently documented (somewhat ironic), is largely the same
 as [ldoc][ldoc]. Documentation comments are written in Markdown, though note that we do not support many GitHub-specific

projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlock.java

@@ -4,7 +4,6 @@
 
 package dan200.computercraft.shared.computer.blocks;
 
-import dan200.computercraft.annotations.ForgeOverride;
 import dan200.computercraft.shared.common.IBundledRedstoneBlock;
 import dan200.computercraft.shared.network.container.ComputerContainerData;
 import dan200.computercraft.shared.platform.PlatformHelper;
@@ -132,12 +131,6 @@ public abstract class AbstractComputerBlock<T extends AbstractComputerBlockEntit
         if (be instanceof AbstractComputerBlockEntity computer) computer.neighborChanged(neighbourPos);
     }
 
-    @ForgeOverride
-    public final void onNeighborChange(BlockState state, LevelReader world, BlockPos pos, BlockPos neighbour) {
-        var be = world.getBlockEntity(pos);
-        if (be instanceof AbstractComputerBlockEntity computer) computer.neighborChanged(neighbour);
-    }
-
     @Override
     protected BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor level, BlockPos pos, BlockPos neighborPos) {
         var be = level.getBlockEntity(pos);

projects/common/src/main/java/dan200/computercraft/shared/computer/menu/ServerInputState.java

@@ -74,7 +74,7 @@ public class ServerInputState<T extends AbstractContainerMenu & ComputerMenu> im
     }
 
     private static boolean isValidClipboard(ByteBuffer buffer) {
-        for (int i = buffer.remaining(), max = buffer.limit(); i < max; i++) {
+        for (int i = buffer.position(), max = buffer.limit(); i < max; i++) {
             if (!StringUtil.isTypableChar(buffer.get(i))) return false;
         }
         return true;

projects/common/src/main/java/dan200/computercraft/shared/media/items/DiskItem.java

@@ -4,13 +4,10 @@
 
 package dan200.computercraft.shared.media.items;
 
-import dan200.computercraft.annotations.ForgeOverride;
 import dan200.computercraft.shared.peripheral.diskdrive.DiskDriveBlock;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.item.context.UseOnContext;
 
 /**
  * An item that can be shift-right-clicked into a {@link DiskDriveBlock}.
@@ -20,8 +17,8 @@ public class DiskItem extends Item {
         super(settings);
     }
 
-    @ForgeOverride
-    public boolean doesSneakBypassUse(ItemStack stack, LevelReader world, BlockPos pos, Player player) {
-        return true;
+    @Override
+    public InteractionResult useOn(UseOnContext context) {
+        return DiskDriveBlock.defaultUseItemOn(context);
     }
 }

projects/common/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/DiskDriveBlock.java

@@ -7,13 +7,11 @@ package dan200.computercraft.shared.peripheral.diskdrive;
 import com.mojang.serialization.MapCodec;
 import dan200.computercraft.shared.ModRegistry;
 import dan200.computercraft.shared.common.HorizontalContainerBlock;
-import dan200.computercraft.shared.platform.PlatformHelper;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.ItemInteractionResult;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.BaseEntityBlock;
 import net.minecraft.world.level.block.Block;
@@ -23,7 +21,6 @@ import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
-import net.minecraft.world.phys.BlockHitResult;
 import org.jspecify.annotations.Nullable;
 
 public class DiskDriveBlock extends HorizontalContainerBlock {
@@ -50,19 +47,24 @@ public class DiskDriveBlock extends HorizontalContainerBlock {
         return CODEC;
     }
 
-    @Override
-    protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
-        if (player.isCrouching() && level.getBlockEntity(pos) instanceof DiskDriveBlockEntity drive) {
-            // Try to put a disk into the drive
-            if (stack.isEmpty()) return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION;
-
-            if (!level.isClientSide && drive.getDiskStack().isEmpty() && PlatformHelper.get().getMedia(stack) != null) {
-                drive.setDiskStack(stack.split(1));
+    /**
+     * A default implementation of {@link Item#useOn(UseOnContext)} for items that can be placed into a drive.
+     *
+     * @param context The context of this item usage action.
+     * @return Whether the item was placed or not.
+     */
+    public static InteractionResult defaultUseItemOn(UseOnContext context) {
+        var level = context.getLevel();
+        var blockPos = context.getClickedPos();
+        var blockState = level.getBlockState(blockPos);
+        if (blockState.is(ModRegistry.Blocks.DISK_DRIVE.get()) && blockState.getValue(STATE) == DiskDriveState.EMPTY) {
+            if (!level.isClientSide && level.getBlockEntity(blockPos) instanceof DiskDriveBlockEntity drive && drive.getDiskStack().isEmpty()) {
+                drive.setDiskStack(context.getItemInHand().split(1));
             }
-            return ItemInteractionResult.sidedSuccess(level.isClientSide);
+            return InteractionResult.sidedSuccess(level.isClientSide);
         }
 
-        return super.useItemOn(stack, state, level, pos, player, hand, hit);
+        return InteractionResult.PASS;
     }
 
     @Nullable

projects/common/src/main/java/dan200/computercraft/shared/peripheral/generic/methods/AbstractFluidMethods.java

@@ -41,9 +41,9 @@ public abstract class AbstractFluidMethods<T> implements GenericPeripheral {
      * The returned table is sparse, and so empty tanks will be `nil` - it is recommended to loop over using [`pairs`]
      * rather than [`ipairs`].
      *
-     * @param fluids The current fluid handler.
+     * @param fluids The current fluid storage.
      * @return All tanks.
-     * @cc.treturn { (table|nil)... } All tanks in this fluid storage.
+     * @cc.treturn { (table|nil)... } Basic information about all fluids in this fluid storage.
      */
     @LuaFunction(mainThread = true)
     public abstract Map<Integer, Map<String, ?>> tanks(T fluids);

projects/common/src/main/java/dan200/computercraft/shared/peripheral/generic/methods/AbstractInventoryMethods.java

@@ -56,8 +56,8 @@ public abstract class AbstractInventoryMethods<T> implements GenericPeripheral {
      * rather than [`ipairs`].
      *
      * @param inventory The current inventory.
-     * @return All items in this inventory.
-     * @cc.treturn { (table|nil)... } All items in this inventory.
+     * @return Basic information about all items in this inventory.
+     * @cc.treturn { (table|nil)... } Basic information about all items in this inventory.
      * @cc.usage Find an adjacent chest and print all items in it.
      *
      * <pre>{@code
@@ -86,9 +86,8 @@ public abstract class AbstractInventoryMethods<T> implements GenericPeripheral {
      *
      * @param inventory The current inventory.
      * @param slot      The slot to get information about.
-     * @return Information about the item in this slot, or {@code nil} if not present.
+     * @return Information about the item in this slot, or {@code nil} if it is empty.
      * @throws LuaException If the slot is out of range.
-     * @cc.treturn table Information about the item in this slot, or {@code nil} if not present.
      * @cc.usage Print some information about the first in a chest.
      *
      * <pre>{@code
@@ -106,7 +105,7 @@ public abstract class AbstractInventoryMethods<T> implements GenericPeripheral {
      */
     @Nullable
     @LuaFunction(mainThread = true)
-    public abstract Map<String, ?> getItemDetail(T inventory, int slot) throws LuaException;
+    public abstract Map<?, ?> getItemDetail(T inventory, int slot) throws LuaException;
 
     /**
      * Get the maximum number of items which can be stored in this slot.

projects/common/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/CableBlock.java

@@ -252,11 +252,6 @@ public class CableBlock extends Block implements SimpleWaterloggedBlock, EntityB
         if (world.getBlockEntity(pos) instanceof CableBlockEntity modem) modem.neighborChanged(neighbourPos);
     }
 
-    @ForgeOverride
-    public final void onNeighborChange(BlockState state, LevelReader world, BlockPos pos, BlockPos neighbour) {
-        if (world.getBlockEntity(pos) instanceof CableBlockEntity modem) modem.neighborChanged(neighbour);
-    }
-
     @Override
     protected void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource rand) {
         if (world.getBlockEntity(pos) instanceof CableBlockEntity modem) modem.blockTick();

projects/common/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/WiredModemFullBlock.java

@@ -4,7 +4,6 @@
 
 package dan200.computercraft.shared.peripheral.modem.wired;
 
-import dan200.computercraft.annotations.ForgeOverride;
 import dan200.computercraft.shared.ModRegistry;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -14,7 +13,6 @@ import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.EntityBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -62,13 +60,6 @@ public class WiredModemFullBlock extends Block implements EntityBlock {
         }
     }
 
-    @ForgeOverride
-    public final void onNeighborChange(BlockState state, LevelReader level, BlockPos pos, BlockPos neighbour) {
-        if (state.getValue(PERIPHERAL_ON) && level.getBlockEntity(pos) instanceof WiredModemFullBlockEntity modem) {
-            modem.neighborChanged(neighbour);
-        }
-    }
-
     @Override
     protected void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource rand) {
         if (world.getBlockEntity(pos) instanceof WiredModemFullBlockEntity modem) modem.blockTick();

projects/common/src/main/java/dan200/computercraft/shared/recipe/function/CopyComponents.java

@@ -17,8 +17,8 @@ import net.minecraft.world.item.crafting.CraftingInput;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.storage.loot.functions.CopyComponentsFunction;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;

projects/common/src/main/java/dan200/computercraft/shared/turtle/apis/TurtleAPI.java

@@ -694,7 +694,7 @@ public class TurtleAPI implements ILuaAPI {
      * This returns information about the currently equipped item, in the same form as
      * {@link #getItemDetail(ILuaContext, Optional, Optional)}.
      *
-     * @return Details about the currently equipped item, or {@code nil} if no upgrade is equipped.
+     * @return Information about the currently equipped item, or {@code nil} if no upgrade is equipped.
      * @see #equipLeft()
      * @cc.since 1.116.0
      */
@@ -710,7 +710,7 @@ public class TurtleAPI implements ILuaAPI {
      * This returns information about the currently equipped item, in the same form as
      * {@link #getItemDetail(ILuaContext, Optional, Optional)}.
      *
-     * @return Details about the currently equipped item, or {@code nil} if no upgrade is equipped.
+     * @return Information about the currently equipped item, or {@code nil} if no upgrade is equipped.
      * @see #equipRight()
      * @cc.since 1.116.0
      */
@@ -781,7 +781,7 @@ public class TurtleAPI implements ILuaAPI {
      *                 more information about the item at the cost of taking longer to run.
      * @return The command result.
      * @throws LuaException If the slot is out of range.
-     * @cc.treturn nil|table Information about the given slot, or {@code nil} if it is empty.
+     * @cc.treturn nil|table Information about the item in this slot, or {@code nil} if it is empty.
      * @cc.since 1.64
      * @cc.changed 1.90.0 Added detailed parameter.
      * @cc.usage Print the current slot, assuming it contains 13 dirt.

projects/common/src/testMod/java/dan200/computercraft/gametest/core/CCTestCommand.java

@@ -56,7 +56,7 @@ class CCTestCommand {
             }))
             .then(literal("regen-structures").executes(context -> {
                 for (var function : GameTestRegistry.getAllTestFunctions()) {
-                    dispatcher.execute("test import " + function.testName(), context.getSource());
+                    dispatcher.execute("test import " + function.structureName(), context.getSource());
                     TestCommandAccessor.callExportTestStructure(context.getSource(), function.structureName());
                 }
                 return 0;

projects/common/src/testMod/java/dan200/computercraft/mixin/gametest/NbtUtilsMixin.java

@@ -0,0 +1,39 @@
+// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.mixin.gametest;
+
+import dan200.computercraft.gametest.core.TestHooks;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtUtils;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Objects;
+
+/**
+ * Patches {@link NbtUtils#structureToSnbt(CompoundTag)} to remove air blocks from the structure file. This
+ * significantly reduces the size of our generated templates.
+ *
+ * @see StructureTemplateManagerMixin Loading structures
+ * @see NbtUtils#structureToSnbt(CompoundTag)
+ */
+@Mixin(NbtUtils.class)
+class NbtUtilsMixin {
+    @Inject(method = "structureToSnbt", at = @At("HEAD"))
+    @SuppressWarnings("unused")
+    private static void structureToSnbt(CompoundTag tag, CallbackInfoReturnable<String> ci) {
+        // Load in the structure, strip out air, then save it back again.
+        var structure = Objects.requireNonNull(TestHooks.getStructureManager()).readStructure(tag);
+        var palette = ((StructureTemplateAccessor) structure).getPalettes().get(0);
+        palette.blocks().removeIf(x -> x.state().isAir());
+        var newTag = structure.save(new CompoundTag());
+
+        // Overwrite the existing tag.
+        tag.getAllKeys().clear();
+        for (var key : newTag.getAllKeys()) tag.put(key, newTag.get(key));
+    }
+}

projects/common/src/testMod/java/dan200/computercraft/mixin/gametest/StructureTemplateAccessor.java

@@ -0,0 +1,17 @@
+// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.mixin.gametest;
+
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.List;
+
+@Mixin(StructureTemplate.class)
+interface StructureTemplateAccessor {
+    @Accessor
+    List<StructureTemplate.Palette> getPalettes();
+}

projects/common/src/testMod/java/dan200/computercraft/mixin/gametest/StructureTemplateManagerMixin.java

@@ -4,10 +4,20 @@
 
 package dan200.computercraft.mixin.gametest;
 
+import net.minecraft.core.BlockPos;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
 
 @Mixin(StructureTemplateManager.class)
 class StructureTemplateManagerMixin {
@@ -22,4 +32,36 @@ class StructureTemplateManagerMixin {
     private boolean getRunningInIde() {
         return true;
     }
+
+    /**
+     * Add missing {@link Blocks#AIR} to our "reduced" game test structures.
+     *
+     * @param id The structure to load.
+     * @param ci The callback info.
+     * @see NbtUtilsMixin Saving structures
+     * @see StructureTemplateManagerMixin#loadFromTestStructures(ResourceLocation, CallbackInfoReturnable)
+     */
+    @Inject(method = "loadFromTestStructures", at = @At(value = "RETURN"))
+    @SuppressWarnings("unused")
+    private void loadFromTestStructures(ResourceLocation id, CallbackInfoReturnable<Optional<StructureTemplate>> ci) {
+        ci.getReturnValue().ifPresent(StructureTemplateManagerMixin::addMissingAir);
+    }
+
+    private static void addMissingAir(StructureTemplate template) {
+        var size = template.getSize();
+        var palette = ((StructureTemplateAccessor) template).getPalettes().getFirst();
+
+        Set<BlockPos> positions = new HashSet<>();
+        for (var x = 0; x < size.getX(); x++) {
+            for (var y = 0; y < size.getY(); y++) {
+                for (var z = 0; z < size.getZ(); z++) positions.add(new BlockPos(x, y, z));
+            }
+        }
+
+        for (var block : palette.blocks()) positions.remove(block.pos());
+
+        for (var pos : positions) {
+            palette.blocks().add(new StructureTemplate.StructureBlockInfo(pos, Blocks.AIR.defaultBlockState(), null));
+        }
+    }
 }

projects/common/src/testMod/kotlin/dan200/computercraft/gametest/Disk_Drive_Test.kt

@@ -194,6 +194,24 @@ class Disk_Drive_Test {
         }
     }
 
+    /**
+     * Asserts items can be inserted into a disk drive.
+     */
+    @GameTest
+    fun Can_insert_items(helper: GameTestHelper) = helper.sequence {
+        thenWaitUntil {
+            helper.assertContainerExactly(BlockPos(2, 2, 2), listOf(ItemStack(ModRegistry.Items.COMPUTER_NORMAL.get())))
+        }
+    }
+
+    /**
+     * Asserts items can be removed from a disk drive.
+     */
+    @GameTest
+    fun Can_extract_items(helper: GameTestHelper) = helper.sequence {
+        thenWaitUntil { helper.assertContainerEmpty(BlockPos(2, 3, 2)) }
+    }
+
     /**
      * Loads a structure created on an older version of the game, and checks that data fixers have been applied.
      */

projects/common/src/testMod/kotlin/dan200/computercraft/gametest/Printer_Test.kt

@@ -192,6 +192,25 @@ class Printer_Test {
         }
     }
 
+    /**
+     * Asserts items can be inserted into a printer.
+     */
+    @GameTest
+    fun Can_insert_items(helper: GameTestHelper) = helper.sequence {
+        thenWaitUntil {
+            helper.assertContainerExactly(BlockPos(1, 2, 2), listOf(ItemStack.EMPTY, ItemStack(Items.PAPER)))
+            helper.assertContainerExactly(BlockPos(3, 2, 2), listOf(ItemStack(Items.BLACK_DYE)))
+        }
+    }
+
+    /**
+     * Asserts items can be removed from a printer.
+     */
+    @GameTest
+    fun Can_extract_items(helper: GameTestHelper) = helper.sequence {
+        thenWaitUntil { helper.assertContainerEmpty(BlockPos(2, 3, 2)) }
+    }
+
     /**
      * Loads a structure created on an older version of the game, and checks that data fixers have been applied.
      */

projects/common/src/testMod/kotlin/dan200/computercraft/gametest/Turtle_Test.kt

@@ -953,6 +953,24 @@ class Turtle_Test {
         }
     }
 
+    /**
+     * Asserts items can be inserted into a turtle.
+     */
+    @GameTest
+    fun Can_insert_items(helper: GameTestHelper) = helper.sequence {
+        thenWaitUntil {
+            helper.assertContainerExactly(BlockPos(2, 2, 2), listOf(ItemStack(ModRegistry.Items.COMPUTER_NORMAL.get())))
+        }
+    }
+
+    /**
+     * Asserts items can be removed from a turtle.
+     */
+    @GameTest
+    fun Can_extract_items(helper: GameTestHelper) = helper.sequence {
+        thenWaitUntil { helper.assertContainerEmpty(BlockPos(2, 3, 2)) }
+    }
+
     /**
      * Render turtles as an item.
      */

projects/common/src/testMod/kotlin/dan200/computercraft/gametest/core/TestHooks.kt

@@ -22,6 +22,7 @@ import net.minecraft.world.level.LevelAccessor
 import net.minecraft.world.level.block.Blocks
 import net.minecraft.world.level.block.entity.StructureBlockEntity
 import net.minecraft.world.level.block.state.BlockState
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager
 import net.minecraft.world.phys.Vec3
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -43,6 +44,9 @@ object TestHooks {
     @JvmStatic
     val sourceDir: Path = Paths.get(System.getProperty("cctest.sources")).normalize().toAbsolutePath()
 
+    @JvmStatic
+    var structureManager: StructureTemplateManager? = null
+
     @JvmStatic
     fun init() {
         ServerContext.luaMachine = ManagedComputers
@@ -84,6 +88,8 @@ object TestHooks {
             StructureUtils.clearSpaceForStructure(StructureUtils.getStructureBoundingBox(structure), level)
         }
 
+        structureManager = server.structureManager
+
         ManagedComputers.reset()
 
         // Delete server context and add one with a mutable machine factory. This allows us to set the factory for

projects/common/src/testMod/resources/computercraft-gametest.mixins.json

@@ -12,6 +12,8 @@
         "GameTestSequenceAccessor",
         "GameTestSequenceMixin",
         "GameTestServerMixin",
+        "NbtUtilsMixin",
+        "StructureTemplateAccessor",
         "StructureTemplateManagerMixin",
         "TestCommandAccessor"
     ],

projects/common/src/testMod/resources/data/cctest/structures/computer_test.chest_resizes_on_change.snbt

@@ -27,111 +27,12 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "minecraft:chest{facing:north,type:single,waterlogged:false}", nbt: {Items: [], id: "minecraft:chest"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "computercraft:computer_normal{facing:north,state:on}", nbt: {ComputerId: 1, Label: "computer_test.chest_resizes_on_change", On: 1b, id: "computercraft:computer_normal"}},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [3, 1, 2], state: "computercraft:computer_normal{facing:north,state:on}", nbt: {ComputerId: 1, Label: "computer_test.chest_resizes_on_change", On: 1b, id: "computercraft:computer_normal"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "minecraft:chest{facing:north,type:single,waterlogged:false}",
         "computercraft:computer_normal{facing:north,state:on}"
     ]

projects/common/src/testMod/resources/data/cctest/structures/computer_test.drops_on_explosion.snbt

@@ -33,19 +33,11 @@
         {pos: [0, 1, 3], state: "minecraft:barrier"},
         {pos: [0, 1, 4], state: "minecraft:barrier"},
         {pos: [1, 1, 0], state: "minecraft:barrier"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
         {pos: [1, 1, 4], state: "minecraft:barrier"},
         {pos: [2, 1, 0], state: "minecraft:barrier"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:computer_normal{facing:east,state:off}", nbt: {On: 0b, id: "computercraft:computer_normal"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
         {pos: [2, 1, 4], state: "minecraft:barrier"},
         {pos: [3, 1, 0], state: "minecraft:barrier"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
         {pos: [3, 1, 4], state: "minecraft:barrier"},
         {pos: [4, 1, 0], state: "minecraft:barrier"},
         {pos: [4, 1, 1], state: "minecraft:barrier"},
@@ -54,85 +46,24 @@
         {pos: [4, 1, 4], state: "minecraft:barrier"},
         {pos: [0, 2, 0], state: "minecraft:barrier"},
         {pos: [0, 2, 1], state: "minecraft:barrier"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
         {pos: [0, 2, 3], state: "minecraft:barrier"},
         {pos: [0, 2, 4], state: "minecraft:barrier"},
         {pos: [1, 2, 0], state: "minecraft:barrier"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
         {pos: [1, 2, 4], state: "minecraft:barrier"},
         {pos: [2, 2, 0], state: "minecraft:barrier"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
         {pos: [2, 2, 4], state: "minecraft:barrier"},
         {pos: [3, 2, 0], state: "minecraft:barrier"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
         {pos: [3, 2, 4], state: "minecraft:barrier"},
         {pos: [4, 2, 0], state: "minecraft:barrier"},
         {pos: [4, 2, 1], state: "minecraft:barrier"},
         {pos: [4, 2, 2], state: "minecraft:barrier"},
         {pos: [4, 2, 3], state: "minecraft:barrier"},
-        {pos: [4, 2, 4], state: "minecraft:barrier"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [4, 2, 4], state: "minecraft:barrier"}
     ],
     entities: [],
     palette: [
         "minecraft:obsidian",
         "minecraft:barrier",
-        "minecraft:air",
         "computercraft:computer_normal{facing:east,state:off}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/computer_test.no_through_signal.snbt

@@ -27,115 +27,19 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
         {pos: [2, 1, 0], state: "minecraft:lever{face:floor,facing:south,powered:false}"},
         {pos: [2, 1, 1], state: "minecraft:repeater{delay:1,facing:north,locked:false,powered:false}"},
         {pos: [2, 1, 2], state: "computercraft:computer_advanced{facing:north,state:blinking}", nbt: {ComputerId: 0, Label: "computer_test.no_through_signal", On: 1b, id: "computercraft:computer_advanced"}},
         {pos: [2, 1, 3], state: "minecraft:redstone_wire{east:none,north:side,power:0,south:none,west:none}"},
-        {pos: [2, 1, 4], state: "minecraft:redstone_lamp{lit:false}"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 4], state: "minecraft:redstone_lamp{lit:false}"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
         "minecraft:redstone_lamp{lit:false}",
-        "computercraft:computer_advanced{facing:north,state:blinking}",
-        "minecraft:air",
         "minecraft:lever{face:floor,facing:south,powered:false}",
         "minecraft:repeater{delay:1,facing:north,locked:false,powered:false}",
-        "minecraft:redstone_wire{east:none,north:side,power:0,south:none,west:none}"
+        "minecraft:redstone_wire{east:none,north:side,power:0,south:none,west:none}",
+        "computercraft:computer_advanced{facing:north,state:blinking}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/computer_test.no_through_signal_reverse.snbt

@@ -27,112 +27,16 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
         {pos: [2, 1, 0], state: "minecraft:lever{face:floor,facing:south,powered:false}"},
         {pos: [2, 1, 1], state: "minecraft:repeater{delay:1,facing:north,locked:false,powered:false}"},
         {pos: [2, 1, 2], state: "computercraft:computer_advanced{facing:north,state:off}", nbt: {ComputerId: 0, Label: "computer_test.no_through_signal_rev", On: 0b, id: "computercraft:computer_advanced"}},
         {pos: [2, 1, 3], state: "minecraft:redstone_wire{east:none,north:side,power:0,south:side,west:none}"},
-        {pos: [2, 1, 4], state: "minecraft:redstone_lamp{lit:false}"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 4], state: "minecraft:redstone_lamp{lit:false}"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
         "minecraft:redstone_lamp{lit:false}",
-        "minecraft:air",
         "minecraft:lever{face:floor,facing:south,powered:false}",
         "minecraft:repeater{delay:1,facing:north,locked:false,powered:false}",
         "minecraft:redstone_wire{east:none,north:side,power:0,south:side,west:none}",

projects/common/src/testMod/resources/data/cctest/structures/computer_test.open_on_client.snbt

@@ -27,111 +27,11 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "computercraft:computer_advanced{facing:north,state:on}", nbt: {ComputerId: 1, Label: "computer_test.open_on_client", On: 1b, id: "computercraft:computer_advanced"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 2], state: "computercraft:computer_advanced{facing:north,state:on}", nbt: {ComputerId: 1, Label: "computer_test.open_on_client", On: 1b, id: "computercraft:computer_advanced"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:computer_advanced{facing:north,state:on}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/computer_test.self_output_update.snbt

@@ -27,111 +27,12 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:computer_advanced{facing:north,state:on}", nbt: {ComputerId: 1, Label: "computer_test.self_output_update", On: 1b, id: "computercraft:computer_advanced"}},
-        {pos: [2, 1, 3], state: "minecraft:polished_andesite"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 3], state: "minecraft:polished_andesite"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:computer_advanced{facing:north,state:on}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/computer_test.set_and_destroy.snbt

@@ -27,112 +27,13 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:computer_advanced{facing:north,state:on}", nbt: {ComputerId: 1, Label: "computer_test.set_and_destroy", On: 1b, id: "computercraft:computer_advanced"}},
-        {pos: [2, 1, 3], state: "minecraft:redstone_lamp{lit:false}"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 3], state: "minecraft:redstone_lamp{lit:false}"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
         "minecraft:redstone_lamp{lit:false}",
-        "minecraft:air",
         "computercraft:computer_advanced{facing:north,state:on}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/craftos_test.sends_basic_rednet_messages.snbt

@@ -27,111 +27,14 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
         {pos: [1, 1, 2], state: "computercraft:computer_advanced{facing:north,state:on}", nbt: {ComputerId: 0, Label: "craftos_test.sends_basic_rednet_messages.echo", On: 1b, id: "computercraft:computer_advanced"}},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:air"},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
         {pos: [3, 1, 2], state: "computercraft:computer_advanced{facing:north,state:blinking}", nbt: {ComputerId: 0, Label: "craftos_test.sends_basic_rednet_messages.main", On: 1b, id: "computercraft:computer_advanced"}},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
         {pos: [1, 2, 2], state: "computercraft:wireless_modem_normal{facing:down,on:true,waterlogged:false}", nbt: {id: "computercraft:wireless_modem_normal"}},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "computercraft:wireless_modem_normal{facing:down,on:true,waterlogged:false}", nbt: {id: "computercraft:wireless_modem_normal"}},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [3, 2, 2], state: "computercraft:wireless_modem_normal{facing:down,on:true,waterlogged:false}", nbt: {id: "computercraft:wireless_modem_normal"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:computer_advanced{facing:north,state:on}",
         "computercraft:computer_advanced{facing:north,state:blinking}",
         "computercraft:wireless_modem_normal{facing:down,on:true,waterlogged:false}"

projects/common/src/testMod/resources/data/cctest/structures/default.snbt

@@ -26,111 +26,10 @@
         {pos: [4, 0, 1], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
-        {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:air"},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [4, 0, 4], state: "minecraft:polished_andesite"}
     ],
     entities: [],
     palette: [
-        "minecraft:polished_andesite",
-        "minecraft:air"
+        "minecraft:polished_andesite"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.adds_removes_mount.snbt

@@ -27,111 +27,12 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
         {pos: [1, 1, 2], state: "computercraft:disk_drive{facing:north,state:full}", nbt: {id: "computercraft:disk_drive"}},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "computercraft:computer_advanced{facing:north,state:blinking}", nbt: {ComputerId: 1, Label: "disk_drive_test.adds_removes_mount", On: 1b, id: "computercraft:computer_advanced"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 2], state: "computercraft:computer_advanced{facing:north,state:blinking}", nbt: {ComputerId: 1, Label: "disk_drive_test.adds_removes_mount", On: 1b, id: "computercraft:computer_advanced"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:disk_drive{facing:north,state:full}",
         "computercraft:computer_advanced{facing:north,state:blinking}"
     ]

projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.audio_disk.snbt

@@ -11,29 +11,12 @@
         {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
         {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
         {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
         {pos: [0, 1, 1], state: "computercraft:disk_drive{facing:north,state:full}", nbt: {Item: {Count: 1b, id: "minecraft:music_disc_13"}, id: "computercraft:disk_drive"}},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "computercraft:computer_advanced{facing:north,state:blinking}", nbt: {ComputerId: 1, Label: "disk_drive_test.audio_disk", On: 1b, id: "computercraft:computer_advanced"}},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"}
+        {pos: [1, 1, 1], state: "computercraft:computer_advanced{facing:north,state:blinking}", nbt: {ComputerId: 1, Label: "disk_drive_test.audio_disk", On: 1b, id: "computercraft:computer_advanced"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:disk_drive{facing:north,state:full}",
         "computercraft:computer_advanced{facing:north,state:blinking}"
     ]

projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.audio_title_when_empty.snbt

@@ -11,29 +11,12 @@
         {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
         {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
         {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
         {pos: [0, 1, 1], state: "computercraft:disk_drive{facing:north,state:full}", nbt: {id: "computercraft:disk_drive"}},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "computercraft:computer_advanced{facing:north,state:blinking}", nbt: {ComputerId: 1, Label: "disk_drive_test.audio_title_when_empty", On: 1b, id: "computercraft:computer_advanced"}},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"}
+        {pos: [1, 1, 1], state: "computercraft:computer_advanced{facing:north,state:blinking}", nbt: {ComputerId: 1, Label: "disk_drive_test.audio_title_when_empty", On: 1b, id: "computercraft:computer_advanced"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:disk_drive{facing:north,state:full}",
         "computercraft:computer_advanced{facing:north,state:blinking}"
     ]

projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.can_extract_items.snbt

@@ -0,0 +1,39 @@
+{
+    DataVersion: 3465,
+    size: [5, 5, 5],
+    data: [
+        {pos: [0, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [2, 1, 2], state: "minecraft:hopper{enabled:false,facing:down}", nbt: {Items: [], TransferCooldown: 0, id: "minecraft:hopper"}},
+        {pos: [2, 2, 2], state: "computercraft:disk_drive{facing:north,state:full}", nbt: {Item: {Count: 1b, id: "computercraft:computer_normal"}, id: "computercraft:disk_drive"}}
+    ],
+    entities: [],
+    palette: [
+        "minecraft:polished_andesite",
+        "minecraft:hopper{enabled:false,facing:down}",
+        "computercraft:disk_drive{facing:north,state:full}"
+    ]
+}

projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.can_insert_items.snbt

@@ -0,0 +1,39 @@
+{
+    DataVersion: 3465,
+    size: [5, 5, 5],
+    data: [
+        {pos: [0, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [2, 1, 2], state: "computercraft:disk_drive{facing:north,state:empty}", nbt: {id: "computercraft:disk_drive"}},
+        {pos: [2, 2, 2], state: "minecraft:hopper{enabled:false,facing:down}", nbt: {Items: [{Count: 1b, Slot: 0b, id: "computercraft:computer_normal"}], TransferCooldown: 0, id: "minecraft:hopper"}}
+    ],
+    entities: [],
+    palette: [
+        "minecraft:polished_andesite",
+        "computercraft:disk_drive{facing:north,state:empty}",
+        "minecraft:hopper{enabled:false,facing:down}"
+    ]
+}

projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.comparator.snbt

@@ -27,111 +27,13 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:disk_drive{facing:north,state:empty}", nbt: {id: "computercraft:disk_drive"}},
         {pos: [2, 1, 3], state: "minecraft:comparator{facing:north,mode:compare,powered:false}", nbt: {OutputSignal: 0, id: "minecraft:comparator"}},
-        {pos: [2, 1, 4], state: "minecraft:redstone_wire{east:none,north:side,power:0,south:side,west:none}"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 4], state: "minecraft:redstone_wire{east:none,north:side,power:0,south:side,west:none}"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "minecraft:redstone_wire{east:none,north:side,power:0,south:side,west:none}",
         "computercraft:disk_drive{facing:north,state:empty}",
         "minecraft:comparator{facing:north,mode:compare,powered:false}"

projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.contents_updates_state.snbt

@@ -27,111 +27,11 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "computercraft:disk_drive{facing:north,state:empty}", nbt: {ForgeCaps: {}, id: "computercraft:disk_drive"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 2], state: "computercraft:disk_drive{facing:north,state:empty}", nbt: {ForgeCaps: {}, id: "computercraft:disk_drive"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:disk_drive{facing:north,state:empty}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.creates_disk_id.snbt

@@ -27,111 +27,12 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
         {pos: [1, 1, 2], state: "computercraft:computer_advanced{facing:north,state:on}", nbt: {ComputerId: 1, Label: "disk_drive_test.creates_disk_id", On: 1b, id: "computercraft:computer_advanced"}},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "computercraft:disk_drive{facing:north,state:full}", nbt: {Item: {Count: 1b, id: "computercraft:disk", tag: {Color: 1118481}}, id: "computercraft:disk_drive"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 2], state: "computercraft:disk_drive{facing:north,state:full}", nbt: {Item: {Count: 1b, id: "computercraft:disk", tag: {Color: 1118481}}, id: "computercraft:disk_drive"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:computer_advanced{facing:north,state:on}",
         "computercraft:disk_drive{facing:north,state:full}"
     ]

projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.data_fixers.snbt

@@ -27,111 +27,12 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
         {pos: [1, 1, 2], state: "computercraft:disk_drive{facing:north,state:full}", nbt: {Item: {Count: 1b, id: "computercraft:disk", tag: {Color: 123456, DiskId: 123}}, id: "computercraft:disk_drive"}},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:air"},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "computercraft:disk_drive{facing:north,state:full}", nbt: {Item: {Count: 1b, id: "computercraft:treasure_disk", tag: {Colour: 123456, SubPath: "demo", Title: "Demo disk"}}, id: "computercraft:disk_drive"}},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [3, 1, 2], state: "computercraft:disk_drive{facing:north,state:full}", nbt: {Item: {Count: 1b, id: "computercraft:treasure_disk", tag: {Colour: 123456, SubPath: "demo", Title: "Demo disk"}}, id: "computercraft:disk_drive"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:disk_drive{facing:north,state:full}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.drops_contents.snbt

@@ -27,111 +27,11 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "computercraft:disk_drive{facing:north,state:full}", nbt: {CustomName: '{"text":"My Disk Drive"}', ForgeCaps: {}, Item: {Count: 1b, id: "computercraft:treasure_disk"}, id: "computercraft:disk_drive"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 2], state: "computercraft:disk_drive{facing:north,state:full}", nbt: {CustomName: '{"text":"My Disk Drive"}', ForgeCaps: {}, Item: {Count: 1b, id: "computercraft:treasure_disk"}, id: "computercraft:disk_drive"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:disk_drive{facing:north,state:full}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.ejects_disk.snbt

@@ -27,112 +27,27 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
         {pos: [1, 1, 1], state: "minecraft:white_stained_glass"},
         {pos: [1, 1, 2], state: "minecraft:white_stained_glass"},
         {pos: [1, 1, 3], state: "minecraft:white_stained_glass"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
         {pos: [2, 1, 1], state: "computercraft:disk_drive{facing:south,state:full}", nbt: {Item: {Count: 1b, id: "minecraft:music_disc_13"}, id: "computercraft:disk_drive"}},
-        {pos: [2, 1, 2], state: "minecraft:air"},
         {pos: [2, 1, 3], state: "minecraft:white_stained_glass"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
         {pos: [3, 1, 1], state: "computercraft:computer_advanced{facing:north,state:blinking}", nbt: {ComputerId: 1, Label: "disk_drive_test.ejects_disk", On: 1b, id: "computercraft:computer_advanced"}},
         {pos: [3, 1, 2], state: "minecraft:white_stained_glass"},
         {pos: [3, 1, 3], state: "minecraft:white_stained_glass"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
         {pos: [1, 2, 1], state: "minecraft:white_stained_glass"},
         {pos: [1, 2, 2], state: "minecraft:white_stained_glass"},
         {pos: [1, 2, 3], state: "minecraft:white_stained_glass"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
         {pos: [2, 2, 1], state: "minecraft:white_stained_glass"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
         {pos: [2, 2, 3], state: "minecraft:white_stained_glass"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
         {pos: [3, 2, 1], state: "minecraft:white_stained_glass"},
         {pos: [3, 2, 2], state: "minecraft:white_stained_glass"},
-        {pos: [3, 2, 3], state: "minecraft:white_stained_glass"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [3, 2, 3], state: "minecraft:white_stained_glass"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
         "minecraft:white_stained_glass",
-        "minecraft:air",
         "computercraft:disk_drive{facing:south,state:full}",
         "computercraft:computer_advanced{facing:north,state:blinking}"
     ]

projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.queues_event.snbt

@@ -27,111 +27,12 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
         {pos: [1, 1, 2], state: "computercraft:disk_drive{facing:north,state:full}", nbt: {id: "computercraft:disk_drive"}},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "computercraft:computer_advanced{facing:north,state:blinking}", nbt: {ComputerId: 1, Label: "disk_drive_test.queues_event", On: 1b, id: "computercraft:computer_advanced"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 2], state: "computercraft:computer_advanced{facing:north,state:blinking}", nbt: {ComputerId: 1, Label: "disk_drive_test.queues_event", On: 1b, id: "computercraft:computer_advanced"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:disk_drive{facing:north,state:full}",
         "computercraft:computer_advanced{facing:north,state:blinking}"
     ]

projects/common/src/testMod/resources/data/cctest/structures/inventory_test.checks_valid_item.snbt

@@ -27,111 +27,17 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
         {pos: [1, 1, 2], state: "minecraft:shulker_box{facing:up}", nbt: {id: "minecraft:shulker_box"}},
         {pos: [1, 1, 3], state: "computercraft:wired_modem_full{modem:false,peripheral:true}", nbt: {PeripheralAccess: 1b, PeripheralId2: 0, PeripheralType2: "minecraft:shulker_box", id: "computercraft:wired_modem_full"}},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
         {pos: [2, 1, 1], state: "computercraft:computer_advanced{facing:north,state:on}", nbt: {ComputerId: 1, Label: "inventory_test.checks_valid_item", On: 1b, id: "computercraft:computer_advanced"}},
         {pos: [2, 1, 2], state: "computercraft:cable{cable:true,down:false,east:false,modem:north_off,north:true,south:true,up:false,waterlogged:false,west:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
         {pos: [2, 1, 3], state: "computercraft:cable{cable:true,down:false,east:true,modem:none,north:true,south:false,up:false,waterlogged:false,west:true}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
         {pos: [3, 1, 2], state: "minecraft:barrel{facing:up,open:false}", nbt: {Items: [{Count: 1b, Slot: 0b, id: "minecraft:shulker_box"}], id: "minecraft:barrel"}},
-        {pos: [3, 1, 3], state: "computercraft:wired_modem_full{modem:false,peripheral:true}", nbt: {PeripheralAccess: 1b, PeripheralId2: 0, PeripheralType2: "minecraft:barrel", id: "computercraft:wired_modem_full"}},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [3, 1, 3], state: "computercraft:wired_modem_full{modem:false,peripheral:true}", nbt: {PeripheralAccess: 1b, PeripheralId2: 0, PeripheralType2: "minecraft:barrel", id: "computercraft:wired_modem_full"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "minecraft:shulker_box{facing:up}",
         "computercraft:wired_modem_full{modem:false,peripheral:true}",
         "computercraft:computer_advanced{facing:north,state:on}",

projects/common/src/testMod/resources/data/cctest/structures/inventory_test.double_chest_size.snbt

@@ -27,111 +27,15 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
         {pos: [0, 1, 2], state: "minecraft:chest{facing:north,type:left,waterlogged:false}", nbt: {Items: [], id: "minecraft:chest"}},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
         {pos: [1, 1, 2], state: "minecraft:chest{facing:north,type:right,waterlogged:false}", nbt: {Items: [{Count: 64b, Slot: 0b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 1b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 2b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 3b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 4b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 5b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 6b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 7b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 8b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 9b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 10b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 11b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 12b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 13b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 14b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 15b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 16b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 17b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 18b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 19b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 20b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 21b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 22b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 23b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 24b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 25b, id: "minecraft:polished_andesite"}, {Count: 64b, Slot: 26b, id: "minecraft:polished_andesite"}], id: "minecraft:chest"}},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:computer_advanced{facing:north,state:on}", nbt: {ComputerId: 1, Label: "inventory_test.double_chest_size", On: 1b, id: "computercraft:computer_advanced"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
         {pos: [3, 1, 2], state: "minecraft:chest{facing:north,type:left,waterlogged:false}", nbt: {Items: [], id: "minecraft:chest"}},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:chest{facing:north,type:right,waterlogged:false}", nbt: {Items: [{Count: 32b, Slot: 0b, id: "minecraft:dirt"}], id: "minecraft:chest"}},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [4, 1, 2], state: "minecraft:chest{facing:north,type:right,waterlogged:false}", nbt: {Items: [{Count: 32b, Slot: 0b, id: "minecraft:dirt"}], id: "minecraft:chest"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "minecraft:chest{facing:north,type:left,waterlogged:false}",
         "minecraft:chest{facing:north,type:right,waterlogged:false}",
         "computercraft:computer_advanced{facing:north,state:on}"

projects/common/src/testMod/resources/data/cctest/structures/inventory_test.fails_on_full.snbt

@@ -27,111 +27,17 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
         {pos: [1, 1, 2], state: "minecraft:furnace{facing:north,lit:false}", nbt: {BurnTime: 0s, CookTime: 0s, CookTimeTotal: 200s, Items: [{Count: 1b, Slot: 2b, id: "minecraft:iron_ingot"}], RecipesUsed: {"minecraft:iron_ingot_from_smelting_iron_ore": 1}, id: "minecraft:furnace"}},
         {pos: [1, 1, 3], state: "computercraft:wired_modem_full{modem:false,peripheral:true}", nbt: {PeripheralAccess: 1b, PeripheralId2: 0, PeripheralType2: "minecraft:furnace", id: "computercraft:wired_modem_full"}},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
         {pos: [2, 1, 1], state: "computercraft:computer_advanced{facing:north,state:on}", nbt: {ComputerId: 1, Label: "inventory_test.fails_on_full", On: 1b, id: "computercraft:computer_advanced"}},
         {pos: [2, 1, 2], state: "computercraft:cable{cable:true,down:false,east:false,modem:north_off,north:true,south:true,up:false,waterlogged:false,west:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
         {pos: [2, 1, 3], state: "computercraft:cable{cable:true,down:false,east:true,modem:none,north:true,south:false,up:false,waterlogged:false,west:true}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
         {pos: [3, 1, 2], state: "minecraft:barrel{facing:up,open:false}", nbt: {Items: [{Count: 1b, Slot: 0b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 1b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 2b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 3b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 4b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 5b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 6b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 7b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 8b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 9b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 10b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 11b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 12b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 13b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 14b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 15b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 16b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 17b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 18b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 19b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 20b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 21b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 22b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 23b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 24b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 25b, id: "minecraft:polished_andesite"}, {Count: 1b, Slot: 26b, id: "minecraft:polished_andesite"}], id: "minecraft:barrel"}},
-        {pos: [3, 1, 3], state: "computercraft:wired_modem_full{modem:false,peripheral:true}", nbt: {PeripheralAccess: 1b, PeripheralId2: 0, PeripheralType2: "minecraft:barrel", id: "computercraft:wired_modem_full"}},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [3, 1, 3], state: "computercraft:wired_modem_full{modem:false,peripheral:true}", nbt: {PeripheralAccess: 1b, PeripheralId2: 0, PeripheralType2: "minecraft:barrel", id: "computercraft:wired_modem_full"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "minecraft:furnace{facing:north,lit:false}",
         "computercraft:wired_modem_full{modem:false,peripheral:true}",
         "computercraft:computer_advanced{facing:north,state:on}",

projects/common/src/testMod/resources/data/cctest/structures/modem_test.cable_modem_does_not_report_self.snbt

@@ -27,111 +27,13 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
         {pos: [1, 1, 2], state: "computercraft:cable{cable:true,down:false,east:true,modem:east_off_peripheral,north:false,south:false,up:false,waterlogged:false,west:false}", nbt: {PeripheralAccess: 1b, PeripheralId: 0, PeripheralType: "computer", id: "computercraft:cable"}},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:computer_normal{facing:north,state:on}", nbt: {ComputerId: 1, Label: "modem_test.cable_modem_does_not_report_self", On: 1b, id: "computercraft:computer_normal"}},
-        {pos: [2, 1, 3], state: "computercraft:cable{cable:true,down:false,east:false,modem:north_off,north:true,south:false,up:false,waterlogged:false,west:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 3], state: "computercraft:cable{cable:true,down:false,east:false,modem:north_off,north:true,south:false,up:false,waterlogged:false,west:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:cable{cable:true,down:false,east:true,modem:east_off_peripheral,north:false,south:false,up:false,waterlogged:false,west:false}",
         "computercraft:computer_normal{facing:north,state:on}",
         "computercraft:cable{cable:true,down:false,east:false,modem:north_off,north:true,south:false,up:false,waterlogged:false,west:false}"

projects/common/src/testMod/resources/data/cctest/structures/modem_test.chest_resizes_on_change.snbt

@@ -27,111 +27,13 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "minecraft:chest{facing:north,type:single,waterlogged:false}", nbt: {Items: [], id: "minecraft:chest"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
         {pos: [3, 1, 1], state: "computercraft:computer_normal{facing:north,state:on}", nbt: {ComputerId: 1, Label: "modem_test.chest_resizes_on_change", On: 1b, id: "computercraft:computer_normal"}},
-        {pos: [3, 1, 2], state: "computercraft:wired_modem_full{modem:false,peripheral:true}", nbt: {PeripheralId2: 2, PeripheralId4: 0, PeripheralType2: "computer", PeripheralType4: "minecraft:chest", id: "computercraft:wired_modem_full"}},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [3, 1, 2], state: "computercraft:wired_modem_full{modem:false,peripheral:true}", nbt: {PeripheralId2: 2, PeripheralId4: 0, PeripheralType2: "computer", PeripheralType4: "minecraft:chest", id: "computercraft:wired_modem_full"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "minecraft:chest{facing:north,type:single,waterlogged:false}",
         "computercraft:computer_normal{facing:north,state:on}",
         "computercraft:wired_modem_full{modem:false,peripheral:true}"

projects/common/src/testMod/resources/data/cctest/structures/modem_test.full_block_modem_does_not_report_self.snbt

@@ -27,111 +27,13 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
         {pos: [1, 1, 2], state: "computercraft:wired_modem_full{modem:false,peripheral:true}", nbt: {PeripheralAccess: 1b, PeripheralId5: 1, PeripheralType5: "computer", id: "computercraft:wired_modem_full"}},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:computer_normal{facing:north,state:on}", nbt: {ComputerId: 1, Label: "modem_test.full_block_modem_does_not_report_self", On: 1b, id: "computercraft:computer_normal"}},
-        {pos: [2, 1, 3], state: "computercraft:wired_modem_full{modem:false,peripheral:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:wired_modem_full"}},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 3], state: "computercraft:wired_modem_full{modem:false,peripheral:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:wired_modem_full"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:wired_modem_full{modem:false,peripheral:true}",
         "computercraft:computer_normal{facing:north,state:on}",
         "computercraft:wired_modem_full{modem:false,peripheral:false}"

projects/common/src/testMod/resources/data/cctest/structures/modem_test.full_modems_form_networks.snbt

@@ -27,111 +27,17 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
         {pos: [1, 1, 1], state: "computercraft:wired_modem_full{modem:false,peripheral:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:wired_modem_full"}},
         {pos: [1, 1, 2], state: "computercraft:wired_modem_full{modem:false,peripheral:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:wired_modem_full"}},
         {pos: [1, 1, 3], state: "computercraft:wired_modem_full{modem:false,peripheral:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:wired_modem_full"}},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:air"},
         {pos: [2, 1, 3], state: "computercraft:wired_modem_full{modem:false,peripheral:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:wired_modem_full"}},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
         {pos: [3, 1, 1], state: "computercraft:wired_modem_full{modem:false,peripheral:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:wired_modem_full"}},
         {pos: [3, 1, 2], state: "computercraft:wired_modem_full{modem:false,peripheral:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:wired_modem_full"}},
-        {pos: [3, 1, 3], state: "computercraft:wired_modem_full{modem:false,peripheral:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:wired_modem_full"}},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [3, 1, 3], state: "computercraft:wired_modem_full{modem:false,peripheral:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:wired_modem_full"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:wired_modem_full{modem:false,peripheral:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/modem_test.gains_peripherals.snbt

@@ -29,109 +29,18 @@
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
         {pos: [0, 1, 0], state: "computercraft:printer{bottom:false,facing:north,top:false}", nbt: {Items: [], PageTitle: "", Printing: 0b, id: "computercraft:printer", term_bgColour: 15, term_cursorBlink: 0b, term_cursorX: 0, term_cursorY: 0, term_palette: [I; 1118481, 13388876, 5744206, 8349260, 3368652, 11691749, 5020082, 10066329, 5000268, 15905484, 8375321, 14605932, 10072818, 15040472, 15905331, 15790320], term_textBgColour_0: "fffffffffffffffffffffffff", term_textBgColour_1: "fffffffffffffffffffffffff", term_textBgColour_10: "fffffffffffffffffffffffff", term_textBgColour_11: "fffffffffffffffffffffffff", term_textBgColour_12: "fffffffffffffffffffffffff", term_textBgColour_13: "fffffffffffffffffffffffff", term_textBgColour_14: "fffffffffffffffffffffffff", term_textBgColour_15: "fffffffffffffffffffffffff", term_textBgColour_16: "fffffffffffffffffffffffff", term_textBgColour_17: "fffffffffffffffffffffffff", term_textBgColour_18: "fffffffffffffffffffffffff", term_textBgColour_19: "fffffffffffffffffffffffff", term_textBgColour_2: "fffffffffffffffffffffffff", term_textBgColour_20: "fffffffffffffffffffffffff", term_textBgColour_3: "fffffffffffffffffffffffff", term_textBgColour_4: "fffffffffffffffffffffffff", term_textBgColour_5: "fffffffffffffffffffffffff", term_textBgColour_6: "fffffffffffffffffffffffff", term_textBgColour_7: "fffffffffffffffffffffffff", term_textBgColour_8: "fffffffffffffffffffffffff", term_textBgColour_9: "fffffffffffffffffffffffff", term_textColour: 0, term_textColour_0: "0000000000000000000000000", term_textColour_1: "0000000000000000000000000", term_textColour_10: "0000000000000000000000000", term_textColour_11: "0000000000000000000000000", term_textColour_12: "0000000000000000000000000", term_textColour_13: "0000000000000000000000000", term_textColour_14: "0000000000000000000000000", term_textColour_15: "0000000000000000000000000", term_textColour_16: "0000000000000000000000000", term_textColour_17: "0000000000000000000000000", term_textColour_18: "0000000000000000000000000", term_textColour_19: "0000000000000000000000000", term_textColour_2: "0000000000000000000000000", term_textColour_20: "0000000000000000000000000", term_textColour_3: "0000000000000000000000000", term_textColour_4: "0000000000000000000000000", term_textColour_5: "0000000000000000000000000", term_textColour_6: "0000000000000000000000000", term_textColour_7: "0000000000000000000000000", term_textColour_8: "0000000000000000000000000", term_textColour_9: "0000000000000000000000000", term_text_0: "                         ", term_text_1: "                         ", term_text_10: "                         ", term_text_11: "                         ", term_text_12: "                         ", term_text_13: "                         ", term_text_14: "                         ", term_text_15: "                         ", term_text_16: "                         ", term_text_17: "                         ", term_text_18: "                         ", term_text_19: "                         ", term_text_2: "                         ", term_text_20: "                         ", term_text_3: "                         ", term_text_4: "                         ", term_text_5: "                         ", term_text_6: "                         ", term_text_7: "                         ", term_text_8: "                         ", term_text_9: "                         "}},
         {pos: [0, 1, 1], state: "computercraft:cable{cable:true,down:false,east:true,modem:north_off_peripheral,north:true,south:false,up:false,waterlogged:false,west:false}", nbt: {PeripheralAccess: 1b, PeripheralId: 1, PeripheralType: "printer", id: "computercraft:cable"}},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
         {pos: [0, 1, 4], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:none}", nbt: {Height: 1, Width: 1, XIndex: 0, YIndex: 0, id: "computercraft:monitor_advanced"}},
-        {pos: [1, 1, 0], state: "minecraft:air"},
         {pos: [1, 1, 1], state: "computercraft:cable{cable:true,down:false,east:false,modem:none,north:false,south:true,up:false,waterlogged:false,west:true}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
         {pos: [1, 1, 2], state: "computercraft:cable{cable:true,down:false,east:false,modem:none,north:true,south:true,up:false,waterlogged:false,west:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
         {pos: [1, 1, 3], state: "computercraft:cable{cable:true,down:false,east:false,modem:none,north:true,south:true,up:false,waterlogged:false,west:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
         {pos: [1, 1, 4], state: "computercraft:cable{cable:true,down:false,east:false,modem:west_off_peripheral,north:true,south:false,up:false,waterlogged:false,west:true}", nbt: {PeripheralAccess: 1b, PeripheralId: 1, PeripheralType: "monitor", id: "computercraft:cable"}},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:air"},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
         {pos: [3, 1, 2], state: "computercraft:cable{cable:true,down:false,east:true,modem:none,north:false,south:false,up:false,waterlogged:false,west:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
         {pos: [4, 1, 1], state: "computercraft:computer_advanced{facing:north,state:blinking}", nbt: {ComputerId: 1, Label: "modem_test.gains_peripherals", On: 1b, id: "computercraft:computer_advanced"}},
-        {pos: [4, 1, 2], state: "computercraft:cable{cable:true,down:false,east:false,modem:north_off,north:true,south:false,up:false,waterlogged:false,west:true}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [4, 1, 2], state: "computercraft:cable{cable:true,down:false,east:false,modem:north_off,north:true,south:false,up:false,waterlogged:false,west:true}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:printer{bottom:false,facing:north,top:false}",
         "computercraft:cable{cable:true,down:false,east:true,modem:north_off_peripheral,north:true,south:false,up:false,waterlogged:false,west:false}",
         "computercraft:monitor_advanced{facing:north,orientation:north,state:none}",

projects/common/src/testMod/resources/data/cctest/structures/modem_test.have_peripherals.snbt

@@ -30,108 +30,17 @@
         {pos: [0, 1, 0], state: "computercraft:printer{bottom:false,facing:north,top:false}", nbt: {Items: [], PageTitle: "", Printing: 0b, id: "computercraft:printer", term_bgColour: 15, term_cursorBlink: 0b, term_cursorX: 0, term_cursorY: 0, term_palette: [I; 1118481, 13388876, 5744206, 8349260, 3368652, 11691749, 5020082, 10066329, 5000268, 15905484, 8375321, 14605932, 10072818, 15040472, 15905331, 15790320], term_textBgColour_0: "fffffffffffffffffffffffff", term_textBgColour_1: "fffffffffffffffffffffffff", term_textBgColour_10: "fffffffffffffffffffffffff", term_textBgColour_11: "fffffffffffffffffffffffff", term_textBgColour_12: "fffffffffffffffffffffffff", term_textBgColour_13: "fffffffffffffffffffffffff", term_textBgColour_14: "fffffffffffffffffffffffff", term_textBgColour_15: "fffffffffffffffffffffffff", term_textBgColour_16: "fffffffffffffffffffffffff", term_textBgColour_17: "fffffffffffffffffffffffff", term_textBgColour_18: "fffffffffffffffffffffffff", term_textBgColour_19: "fffffffffffffffffffffffff", term_textBgColour_2: "fffffffffffffffffffffffff", term_textBgColour_20: "fffffffffffffffffffffffff", term_textBgColour_3: "fffffffffffffffffffffffff", term_textBgColour_4: "fffffffffffffffffffffffff", term_textBgColour_5: "fffffffffffffffffffffffff", term_textBgColour_6: "fffffffffffffffffffffffff", term_textBgColour_7: "fffffffffffffffffffffffff", term_textBgColour_8: "fffffffffffffffffffffffff", term_textBgColour_9: "fffffffffffffffffffffffff", term_textColour: 0, term_textColour_0: "0000000000000000000000000", term_textColour_1: "0000000000000000000000000", term_textColour_10: "0000000000000000000000000", term_textColour_11: "0000000000000000000000000", term_textColour_12: "0000000000000000000000000", term_textColour_13: "0000000000000000000000000", term_textColour_14: "0000000000000000000000000", term_textColour_15: "0000000000000000000000000", term_textColour_16: "0000000000000000000000000", term_textColour_17: "0000000000000000000000000", term_textColour_18: "0000000000000000000000000", term_textColour_19: "0000000000000000000000000", term_textColour_2: "0000000000000000000000000", term_textColour_20: "0000000000000000000000000", term_textColour_3: "0000000000000000000000000", term_textColour_4: "0000000000000000000000000", term_textColour_5: "0000000000000000000000000", term_textColour_6: "0000000000000000000000000", term_textColour_7: "0000000000000000000000000", term_textColour_8: "0000000000000000000000000", term_textColour_9: "0000000000000000000000000", term_text_0: "                         ", term_text_1: "                         ", term_text_10: "                         ", term_text_11: "                         ", term_text_12: "                         ", term_text_13: "                         ", term_text_14: "                         ", term_text_15: "                         ", term_text_16: "                         ", term_text_17: "                         ", term_text_18: "                         ", term_text_19: "                         ", term_text_2: "                         ", term_text_20: "                         ", term_text_3: "                         ", term_text_4: "                         ", term_text_5: "                         ", term_text_6: "                         ", term_text_7: "                         ", term_text_8: "                         ", term_text_9: "                         "}},
         {pos: [0, 1, 1], state: "computercraft:cable{cable:true,down:false,east:false,modem:north_off_peripheral,north:true,south:true,up:false,waterlogged:false,west:false}", nbt: {PeripheralAccess: 1b, PeripheralId: 0, PeripheralType: "printer", id: "computercraft:cable"}},
         {pos: [0, 1, 2], state: "computercraft:cable{cable:true,down:false,east:true,modem:none,north:true,south:false,up:false,waterlogged:false,west:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
-        {pos: [0, 1, 3], state: "minecraft:air"},
         {pos: [0, 1, 4], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:none}", nbt: {Height: 1, Width: 1, XIndex: 0, YIndex: 0, id: "computercraft:monitor_advanced"}},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
         {pos: [1, 1, 2], state: "computercraft:cable{cable:true,down:false,east:true,modem:none,north:false,south:true,up:false,waterlogged:false,west:true}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
         {pos: [1, 1, 3], state: "computercraft:cable{cable:true,down:false,east:false,modem:none,north:true,south:true,up:false,waterlogged:false,west:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
         {pos: [1, 1, 4], state: "computercraft:cable{cable:true,down:false,east:false,modem:west_off_peripheral,north:true,south:false,up:false,waterlogged:false,west:true}", nbt: {PeripheralAccess: 1b, PeripheralId: 0, PeripheralType: "monitor", id: "computercraft:cable"}},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:cable{cable:true,down:false,east:true,modem:none,north:false,south:false,up:false,waterlogged:false,west:true}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
         {pos: [3, 1, 2], state: "computercraft:cable{cable:true,down:false,east:true,modem:east_off,north:false,south:false,up:false,waterlogged:false,west:true}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "computercraft:computer_advanced{facing:north,state:blinking}", nbt: {ComputerId: 1, Label: "modem_test.have_peripherals", On: 1b, id: "computercraft:computer_advanced"}},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [4, 1, 2], state: "computercraft:computer_advanced{facing:north,state:blinking}", nbt: {ComputerId: 1, Label: "modem_test.have_peripherals", On: 1b, id: "computercraft:computer_advanced"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:printer{bottom:false,facing:north,top:false}",
         "computercraft:cable{cable:true,down:false,east:false,modem:north_off_peripheral,north:true,south:true,up:false,waterlogged:false,west:false}",
         "computercraft:cable{cable:true,down:false,east:true,modem:none,north:true,south:false,up:false,waterlogged:false,west:false}",

projects/common/src/testMod/resources/data/cctest/structures/modem_test.modem_drops_when_neighbour_removed.snbt

@@ -27,112 +27,29 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
         {pos: [1, 1, 1], state: "minecraft:light_gray_stained_glass"},
         {pos: [1, 1, 2], state: "minecraft:light_gray_stained_glass"},
         {pos: [1, 1, 3], state: "minecraft:light_gray_stained_glass"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
         {pos: [2, 1, 1], state: "minecraft:light_gray_stained_glass"},
         {pos: [2, 1, 2], state: "computercraft:cable{cable:false,down:false,east:false,modem:up_off,north:false,south:false,up:false,waterlogged:false,west:false}", nbt: {id: "computercraft:cable"}},
         {pos: [2, 1, 3], state: "minecraft:light_gray_stained_glass"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
         {pos: [3, 1, 1], state: "minecraft:light_gray_stained_glass"},
         {pos: [3, 1, 2], state: "minecraft:light_gray_stained_glass"},
         {pos: [3, 1, 3], state: "minecraft:light_gray_stained_glass"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
         {pos: [1, 2, 1], state: "minecraft:light_gray_stained_glass"},
         {pos: [1, 2, 2], state: "minecraft:light_gray_stained_glass"},
         {pos: [1, 2, 3], state: "minecraft:light_gray_stained_glass"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
         {pos: [2, 2, 1], state: "minecraft:light_gray_stained_glass"},
         {pos: [2, 2, 2], state: "minecraft:light_gray_stained_glass"},
         {pos: [2, 2, 3], state: "minecraft:light_gray_stained_glass"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
         {pos: [3, 2, 1], state: "minecraft:light_gray_stained_glass"},
         {pos: [3, 2, 2], state: "minecraft:light_gray_stained_glass"},
-        {pos: [3, 2, 3], state: "minecraft:light_gray_stained_glass"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [3, 2, 3], state: "minecraft:light_gray_stained_glass"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
         "minecraft:light_gray_stained_glass",
-        "minecraft:air",
         "computercraft:cable{cable:false,down:false,east:false,modem:up_off,north:false,south:false,up:false,waterlogged:false,west:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/modem_test.modem_keeps_cable_when_neighbour_removed.snbt

@@ -27,112 +27,29 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
         {pos: [1, 1, 1], state: "minecraft:light_gray_stained_glass"},
         {pos: [1, 1, 2], state: "minecraft:light_gray_stained_glass"},
         {pos: [1, 1, 3], state: "minecraft:light_gray_stained_glass"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
         {pos: [2, 1, 1], state: "minecraft:light_gray_stained_glass"},
         {pos: [2, 1, 2], state: "computercraft:cable{cable:true,down:false,east:false,modem:up_off,north:false,south:false,up:true,waterlogged:false,west:false}", nbt: {id: "computercraft:cable"}},
         {pos: [2, 1, 3], state: "minecraft:light_gray_stained_glass"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
         {pos: [3, 1, 1], state: "minecraft:light_gray_stained_glass"},
         {pos: [3, 1, 2], state: "minecraft:light_gray_stained_glass"},
         {pos: [3, 1, 3], state: "minecraft:light_gray_stained_glass"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
         {pos: [1, 2, 1], state: "minecraft:light_gray_stained_glass"},
         {pos: [1, 2, 2], state: "minecraft:light_gray_stained_glass"},
         {pos: [1, 2, 3], state: "minecraft:light_gray_stained_glass"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
         {pos: [2, 2, 1], state: "minecraft:light_gray_stained_glass"},
         {pos: [2, 2, 2], state: "minecraft:light_gray_stained_glass"},
         {pos: [2, 2, 3], state: "minecraft:light_gray_stained_glass"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
         {pos: [3, 2, 1], state: "minecraft:light_gray_stained_glass"},
         {pos: [3, 2, 2], state: "minecraft:light_gray_stained_glass"},
-        {pos: [3, 2, 3], state: "minecraft:light_gray_stained_glass"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [3, 2, 3], state: "minecraft:light_gray_stained_glass"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
         "minecraft:light_gray_stained_glass",
-        "minecraft:air",
         "computercraft:cable{cable:true,down:false,east:false,modem:up_off,north:false,south:false,up:true,waterlogged:false,west:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/modem_test.transmits_messages.snbt

@@ -27,111 +27,15 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
         {pos: [1, 1, 3], state: "computercraft:computer_advanced{facing:north,state:blinking}", nbt: {ComputerId: 1, Label: "modem_test.transmits_messages.receive", On: 1b, id: "computercraft:computer_advanced"}},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
         {pos: [2, 1, 1], state: "computercraft:cable{cable:true,down:false,east:true,modem:east_off,north:false,south:true,up:false,waterlogged:false,west:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
         {pos: [2, 1, 2], state: "computercraft:cable{cable:true,down:false,east:false,modem:none,north:true,south:true,up:false,waterlogged:false,west:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
         {pos: [2, 1, 3], state: "computercraft:cable{cable:true,down:false,east:false,modem:west_off,north:true,south:false,up:false,waterlogged:false,west:true}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "computercraft:computer_advanced{facing:north,state:blinking}", nbt: {ComputerId: 1, Label: "modem_test.transmits_messages.send", On: 1b, id: "computercraft:computer_advanced"}},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [3, 1, 1], state: "computercraft:computer_advanced{facing:north,state:blinking}", nbt: {ComputerId: 1, Label: "modem_test.transmits_messages.send", On: 1b, id: "computercraft:computer_advanced"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:computer_advanced{facing:north,state:blinking}",
         "computercraft:cable{cable:true,down:false,east:true,modem:east_off,north:false,south:true,up:false,waterlogged:false,west:false}",
         "computercraft:cable{cable:true,down:false,east:false,modem:none,north:true,south:true,up:false,waterlogged:false,west:false}",

projects/common/src/testMod/resources/data/cctest/structures/monitor_test.contract_on_destroy.snbt

@@ -27,111 +27,13 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
         {pos: [1, 1, 2], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:l}", nbt: {ForgeCaps: {}, Height: 1, Width: 3, XIndex: 2, YIndex: 0, id: "computercraft:monitor_advanced"}},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:lr}", nbt: {ForgeCaps: {}, Height: 1, Width: 3, XIndex: 1, YIndex: 0, id: "computercraft:monitor_advanced"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:r}", nbt: {ForgeCaps: {}, Height: 1, Width: 3, XIndex: 0, YIndex: 0, id: "computercraft:monitor_advanced"}},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [3, 1, 2], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:r}", nbt: {ForgeCaps: {}, Height: 1, Width: 3, XIndex: 0, YIndex: 0, id: "computercraft:monitor_advanced"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:monitor_advanced{facing:north,orientation:north,state:l}",
         "computercraft:monitor_advanced{facing:north,orientation:north,state:lr}",
         "computercraft:monitor_advanced{facing:north,orientation:north,state:r}"

projects/common/src/testMod/resources/data/cctest/structures/monitor_test.creates_terminal.snbt

@@ -27,111 +27,13 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
         {pos: [1, 1, 2], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:l}", nbt: {Height: 1, Width: 3, XIndex: 2, YIndex: 0, id: "computercraft:monitor_advanced"}},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:lr}", nbt: {Height: 1, Width: 3, XIndex: 1, YIndex: 0, id: "computercraft:monitor_advanced"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:r}", nbt: {Height: 1, Width: 3, XIndex: 0, YIndex: 0, id: "computercraft:monitor_advanced"}},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [3, 1, 2], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:r}", nbt: {Height: 1, Width: 3, XIndex: 0, YIndex: 0, id: "computercraft:monitor_advanced"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:monitor_advanced{facing:north,orientation:north,state:l}",
         "computercraft:monitor_advanced{facing:north,orientation:north,state:lr}",
         "computercraft:monitor_advanced{facing:north,orientation:north,state:r}"

projects/common/src/testMod/resources/data/cctest/structures/monitor_test.ensures_valid_on_place.snbt

@@ -26,111 +26,10 @@
         {pos: [4, 0, 1], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
-        {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:air"},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [4, 0, 4], state: "minecraft:polished_andesite"}
     ],
     entities: [],
     palette: [
-        "minecraft:polished_andesite",
-        "minecraft:air"
+        "minecraft:polished_andesite"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/monitor_test.looks_acceptable.snbt

@@ -1,146 +0,0 @@
-{
-    DataVersion: 2730,
-    size: [5, 5, 5],
-    data: [
-        {pos: [0, 0, 0], state: "minecraft:polished_andesite"},
-        {pos: [0, 0, 1], state: "minecraft:polished_andesite"},
-        {pos: [0, 0, 2], state: "minecraft:polished_andesite"},
-        {pos: [0, 0, 3], state: "minecraft:polished_andesite"},
-        {pos: [0, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [1, 0, 0], state: "minecraft:polished_andesite"},
-        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
-        {pos: [1, 0, 2], state: "minecraft:polished_andesite"},
-        {pos: [1, 0, 3], state: "minecraft:polished_andesite"},
-        {pos: [1, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
-        {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
-        {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
-        {pos: [2, 0, 3], state: "minecraft:polished_andesite"},
-        {pos: [2, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [3, 0, 0], state: "minecraft:polished_andesite"},
-        {pos: [3, 0, 1], state: "minecraft:polished_andesite"},
-        {pos: [3, 0, 2], state: "minecraft:polished_andesite"},
-        {pos: [3, 0, 3], state: "minecraft:polished_andesite"},
-        {pos: [3, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [4, 0, 0], state: "minecraft:polished_andesite"},
-        {pos: [4, 0, 1], state: "minecraft:polished_andesite"},
-        {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
-        {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
-        {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:white_concrete"},
-        {pos: [0, 1, 1], state: "minecraft:shroomlight"},
-        {pos: [0, 1, 2], state: "minecraft:white_concrete"},
-        {pos: [0, 1, 3], state: "minecraft:white_concrete"},
-        {pos: [0, 1, 4], state: "minecraft:white_concrete"},
-        {pos: [1, 1, 0], state: "minecraft:white_concrete"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:lu}", nbt: {Height: 2, Width: 3, XIndex: 2, YIndex: 0, id: "computercraft:monitor_advanced"}},
-        {pos: [1, 1, 4], state: "minecraft:white_concrete"},
-        {pos: [2, 1, 0], state: "minecraft:white_concrete"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:air"},
-        {pos: [2, 1, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:lru}", nbt: {Height: 2, Width: 3, XIndex: 1, YIndex: 0, id: "computercraft:monitor_advanced"}},
-        {pos: [2, 1, 4], state: "minecraft:white_concrete"},
-        {pos: [3, 1, 0], state: "minecraft:white_concrete"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:ru}", nbt: {Height: 2, Width: 3, XIndex: 0, YIndex: 0, id: "computercraft:monitor_advanced"}},
-        {pos: [3, 1, 4], state: "minecraft:white_concrete"},
-        {pos: [4, 1, 0], state: "minecraft:white_concrete"},
-        {pos: [4, 1, 1], state: "minecraft:shroomlight"},
-        {pos: [4, 1, 2], state: "minecraft:white_concrete"},
-        {pos: [4, 1, 3], state: "minecraft:white_concrete"},
-        {pos: [4, 1, 4], state: "minecraft:white_concrete"},
-        {pos: [0, 2, 0], state: "minecraft:white_concrete"},
-        {pos: [0, 2, 1], state: "minecraft:white_concrete"},
-        {pos: [0, 2, 2], state: "minecraft:white_concrete"},
-        {pos: [0, 2, 3], state: "minecraft:white_concrete"},
-        {pos: [0, 2, 4], state: "minecraft:white_concrete"},
-        {pos: [1, 2, 0], state: "minecraft:white_concrete"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:ld}", nbt: {Height: 2, Width: 3, XIndex: 2, YIndex: 1, id: "computercraft:monitor_advanced"}},
-        {pos: [1, 2, 4], state: "minecraft:white_concrete"},
-        {pos: [2, 2, 0], state: "minecraft:white_concrete"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:lrd}", nbt: {Height: 2, Width: 3, XIndex: 1, YIndex: 1, id: "computercraft:monitor_advanced"}},
-        {pos: [2, 2, 4], state: "minecraft:white_concrete"},
-        {pos: [3, 2, 0], state: "minecraft:white_concrete"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:rd}", nbt: {Height: 2, Width: 3, XIndex: 0, YIndex: 1, id: "computercraft:monitor_advanced"}},
-        {pos: [3, 2, 4], state: "minecraft:white_concrete"},
-        {pos: [4, 2, 0], state: "minecraft:white_concrete"},
-        {pos: [4, 2, 1], state: "minecraft:white_concrete"},
-        {pos: [4, 2, 2], state: "minecraft:white_concrete"},
-        {pos: [4, 2, 3], state: "minecraft:white_concrete"},
-        {pos: [4, 2, 4], state: "minecraft:white_concrete"},
-        {pos: [0, 3, 0], state: "minecraft:white_concrete"},
-        {pos: [0, 3, 1], state: "minecraft:white_concrete"},
-        {pos: [0, 3, 2], state: "minecraft:white_concrete"},
-        {pos: [0, 3, 3], state: "minecraft:white_concrete"},
-        {pos: [0, 3, 4], state: "minecraft:white_concrete"},
-        {pos: [1, 3, 0], state: "minecraft:white_concrete"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:white_concrete"},
-        {pos: [2, 3, 0], state: "minecraft:white_concrete"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:white_concrete"},
-        {pos: [3, 3, 0], state: "minecraft:white_concrete"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:white_concrete"},
-        {pos: [4, 3, 0], state: "minecraft:white_concrete"},
-        {pos: [4, 3, 1], state: "minecraft:white_concrete"},
-        {pos: [4, 3, 2], state: "minecraft:white_concrete"},
-        {pos: [4, 3, 3], state: "minecraft:white_concrete"},
-        {pos: [4, 3, 4], state: "minecraft:white_concrete"},
-        {pos: [0, 4, 0], state: "minecraft:white_concrete"},
-        {pos: [0, 4, 1], state: "minecraft:white_concrete"},
-        {pos: [0, 4, 2], state: "minecraft:white_concrete"},
-        {pos: [0, 4, 3], state: "minecraft:white_concrete"},
-        {pos: [0, 4, 4], state: "minecraft:white_concrete"},
-        {pos: [1, 4, 0], state: "minecraft:white_concrete"},
-        {pos: [1, 4, 1], state: "minecraft:white_concrete"},
-        {pos: [1, 4, 2], state: "minecraft:white_concrete"},
-        {pos: [1, 4, 3], state: "minecraft:shroomlight"},
-        {pos: [1, 4, 4], state: "minecraft:white_concrete"},
-        {pos: [2, 4, 0], state: "minecraft:white_concrete"},
-        {pos: [2, 4, 1], state: "minecraft:white_concrete"},
-        {pos: [2, 4, 2], state: "minecraft:white_concrete"},
-        {pos: [2, 4, 3], state: "minecraft:white_concrete"},
-        {pos: [2, 4, 4], state: "minecraft:white_concrete"},
-        {pos: [3, 4, 0], state: "minecraft:white_concrete"},
-        {pos: [3, 4, 1], state: "minecraft:white_concrete"},
-        {pos: [3, 4, 2], state: "minecraft:white_concrete"},
-        {pos: [3, 4, 3], state: "minecraft:shroomlight"},
-        {pos: [3, 4, 4], state: "minecraft:white_concrete"},
-        {pos: [4, 4, 0], state: "minecraft:white_concrete"},
-        {pos: [4, 4, 1], state: "minecraft:white_concrete"},
-        {pos: [4, 4, 2], state: "minecraft:white_concrete"},
-        {pos: [4, 4, 3], state: "minecraft:white_concrete"},
-        {pos: [4, 4, 4], state: "minecraft:white_concrete"}
-    ],
-    entities: [
-        {blockPos: [2, 1, 1], pos: [2.392713937302208d, 1.0d, 1.300000011920929d], nbt: {AbsorptionAmount: 0.0f, Air: 300s, ArmorItems: [{}, {}, {}, {}], Attributes: [{Base: 0.699999988079071d, Name: "minecraft:generic.movement_speed"}], Brain: {memories: {}}, CanUpdate: 1b, CustomName: '{"text":"monitor_test.looks_acceptable"}', DeathTime: 0s, DisabledSlots: 0, FallDistance: 0.0f, FallFlying: 0b, Fire: -1s, HandItems: [{}, {}], Health: 20.0f, HurtByTimestamp: 0, HurtTime: 0s, Invisible: 1b, Invulnerable: 0b, Marker: 1b, Motion: [0.0d, 0.0d, 0.0d], NoBasePlate: 0b, OnGround: 0b, PortalCooldown: 0, Pos: [21.392713937302208d, 6.0d, 35.30000001192093d], Pose: {}, Rotation: [0.15043798f, 15.347454f], ShowArms: 0b, Small: 0b, UUID: [I; 474729512, 2108312608, -1494837479, 630038770], id: "minecraft:armor_stand"}}
-    ],
-    palette: [
-        "minecraft:polished_andesite",
-        "minecraft:white_concrete",
-        "minecraft:shroomlight",
-        "minecraft:air",
-        "computercraft:monitor_advanced{facing:north,orientation:north,state:lu}",
-        "computercraft:monitor_advanced{facing:north,orientation:north,state:lru}",
-        "computercraft:monitor_advanced{facing:north,orientation:north,state:ru}",
-        "computercraft:monitor_advanced{facing:north,orientation:north,state:ld}",
-        "computercraft:monitor_advanced{facing:north,orientation:north,state:lrd}",
-        "computercraft:monitor_advanced{facing:north,orientation:north,state:rd}"
-    ]
-}

projects/common/src/testMod/resources/data/cctest/structures/monitor_test.looks_acceptable_dark.snbt

@@ -1,145 +0,0 @@
-{
-    DataVersion: 2730,
-    size: [5, 5, 5],
-    data: [
-        {pos: [0, 0, 0], state: "minecraft:polished_andesite"},
-        {pos: [0, 0, 1], state: "minecraft:polished_andesite"},
-        {pos: [0, 0, 2], state: "minecraft:polished_andesite"},
-        {pos: [0, 0, 3], state: "minecraft:polished_andesite"},
-        {pos: [0, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [1, 0, 0], state: "minecraft:polished_andesite"},
-        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
-        {pos: [1, 0, 2], state: "minecraft:polished_andesite"},
-        {pos: [1, 0, 3], state: "minecraft:polished_andesite"},
-        {pos: [1, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
-        {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
-        {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
-        {pos: [2, 0, 3], state: "minecraft:polished_andesite"},
-        {pos: [2, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [3, 0, 0], state: "minecraft:polished_andesite"},
-        {pos: [3, 0, 1], state: "minecraft:polished_andesite"},
-        {pos: [3, 0, 2], state: "minecraft:polished_andesite"},
-        {pos: [3, 0, 3], state: "minecraft:polished_andesite"},
-        {pos: [3, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [4, 0, 0], state: "minecraft:polished_andesite"},
-        {pos: [4, 0, 1], state: "minecraft:polished_andesite"},
-        {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
-        {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
-        {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:white_concrete"},
-        {pos: [0, 1, 1], state: "minecraft:white_concrete"},
-        {pos: [0, 1, 2], state: "minecraft:white_concrete"},
-        {pos: [0, 1, 3], state: "minecraft:white_concrete"},
-        {pos: [0, 1, 4], state: "minecraft:white_concrete"},
-        {pos: [1, 1, 0], state: "minecraft:white_concrete"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:lu}", nbt: {Height: 2, Width: 3, XIndex: 2, YIndex: 0, id: "computercraft:monitor_advanced"}},
-        {pos: [1, 1, 4], state: "minecraft:white_concrete"},
-        {pos: [2, 1, 0], state: "minecraft:white_concrete"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:air"},
-        {pos: [2, 1, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:lru}", nbt: {Height: 2, Width: 3, XIndex: 1, YIndex: 0, id: "computercraft:monitor_advanced"}},
-        {pos: [2, 1, 4], state: "minecraft:white_concrete"},
-        {pos: [3, 1, 0], state: "minecraft:white_concrete"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:ru}", nbt: {Height: 2, Width: 3, XIndex: 0, YIndex: 0, id: "computercraft:monitor_advanced"}},
-        {pos: [3, 1, 4], state: "minecraft:white_concrete"},
-        {pos: [4, 1, 0], state: "minecraft:white_concrete"},
-        {pos: [4, 1, 1], state: "minecraft:white_concrete"},
-        {pos: [4, 1, 2], state: "minecraft:white_concrete"},
-        {pos: [4, 1, 3], state: "minecraft:white_concrete"},
-        {pos: [4, 1, 4], state: "minecraft:white_concrete"},
-        {pos: [0, 2, 0], state: "minecraft:white_concrete"},
-        {pos: [0, 2, 1], state: "minecraft:white_concrete"},
-        {pos: [0, 2, 2], state: "minecraft:white_concrete"},
-        {pos: [0, 2, 3], state: "minecraft:white_concrete"},
-        {pos: [0, 2, 4], state: "minecraft:white_concrete"},
-        {pos: [1, 2, 0], state: "minecraft:white_concrete"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:ld}", nbt: {Height: 2, Width: 3, XIndex: 2, YIndex: 1, id: "computercraft:monitor_advanced"}},
-        {pos: [1, 2, 4], state: "minecraft:white_concrete"},
-        {pos: [2, 2, 0], state: "minecraft:white_concrete"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:lrd}", nbt: {Height: 2, Width: 3, XIndex: 1, YIndex: 1, id: "computercraft:monitor_advanced"}},
-        {pos: [2, 2, 4], state: "minecraft:white_concrete"},
-        {pos: [3, 2, 0], state: "minecraft:white_concrete"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:rd}", nbt: {Height: 2, Width: 3, XIndex: 0, YIndex: 1, id: "computercraft:monitor_advanced"}},
-        {pos: [3, 2, 4], state: "minecraft:white_concrete"},
-        {pos: [4, 2, 0], state: "minecraft:white_concrete"},
-        {pos: [4, 2, 1], state: "minecraft:white_concrete"},
-        {pos: [4, 2, 2], state: "minecraft:white_concrete"},
-        {pos: [4, 2, 3], state: "minecraft:white_concrete"},
-        {pos: [4, 2, 4], state: "minecraft:white_concrete"},
-        {pos: [0, 3, 0], state: "minecraft:white_concrete"},
-        {pos: [0, 3, 1], state: "minecraft:white_concrete"},
-        {pos: [0, 3, 2], state: "minecraft:white_concrete"},
-        {pos: [0, 3, 3], state: "minecraft:white_concrete"},
-        {pos: [0, 3, 4], state: "minecraft:white_concrete"},
-        {pos: [1, 3, 0], state: "minecraft:white_concrete"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:white_concrete"},
-        {pos: [2, 3, 0], state: "minecraft:white_concrete"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:white_concrete"},
-        {pos: [3, 3, 0], state: "minecraft:white_concrete"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:white_concrete"},
-        {pos: [4, 3, 0], state: "minecraft:white_concrete"},
-        {pos: [4, 3, 1], state: "minecraft:white_concrete"},
-        {pos: [4, 3, 2], state: "minecraft:white_concrete"},
-        {pos: [4, 3, 3], state: "minecraft:white_concrete"},
-        {pos: [4, 3, 4], state: "minecraft:white_concrete"},
-        {pos: [0, 4, 0], state: "minecraft:white_concrete"},
-        {pos: [0, 4, 1], state: "minecraft:white_concrete"},
-        {pos: [0, 4, 2], state: "minecraft:white_concrete"},
-        {pos: [0, 4, 3], state: "minecraft:white_concrete"},
-        {pos: [0, 4, 4], state: "minecraft:white_concrete"},
-        {pos: [1, 4, 0], state: "minecraft:white_concrete"},
-        {pos: [1, 4, 1], state: "minecraft:white_concrete"},
-        {pos: [1, 4, 2], state: "minecraft:white_concrete"},
-        {pos: [1, 4, 3], state: "minecraft:white_concrete"},
-        {pos: [1, 4, 4], state: "minecraft:white_concrete"},
-        {pos: [2, 4, 0], state: "minecraft:white_concrete"},
-        {pos: [2, 4, 1], state: "minecraft:white_concrete"},
-        {pos: [2, 4, 2], state: "minecraft:white_concrete"},
-        {pos: [2, 4, 3], state: "minecraft:white_concrete"},
-        {pos: [2, 4, 4], state: "minecraft:white_concrete"},
-        {pos: [3, 4, 0], state: "minecraft:white_concrete"},
-        {pos: [3, 4, 1], state: "minecraft:white_concrete"},
-        {pos: [3, 4, 2], state: "minecraft:white_concrete"},
-        {pos: [3, 4, 3], state: "minecraft:white_concrete"},
-        {pos: [3, 4, 4], state: "minecraft:white_concrete"},
-        {pos: [4, 4, 0], state: "minecraft:white_concrete"},
-        {pos: [4, 4, 1], state: "minecraft:white_concrete"},
-        {pos: [4, 4, 2], state: "minecraft:white_concrete"},
-        {pos: [4, 4, 3], state: "minecraft:white_concrete"},
-        {pos: [4, 4, 4], state: "minecraft:white_concrete"}
-    ],
-    entities: [
-        {blockPos: [2, 1, 1], pos: [2.3927139373022044d, 1.0d, 1.300000011920929d], nbt: {AbsorptionAmount: 0.0f, Air: 300s, ArmorItems: [{}, {}, {}, {}], Attributes: [{Base: 0.699999988079071d, Name: "minecraft:generic.movement_speed"}], Brain: {memories: {}}, CanUpdate: 1b, CustomName: '{"text":"monitor_test.looks_acceptable_dark"}', DeathTime: 0s, DisabledSlots: 0, FallDistance: 0.0f, FallFlying: 0b, Fire: -1s, HandItems: [{}, {}], Health: 20.0f, HurtByTimestamp: 0, HurtTime: 0s, Invisible: 1b, Invulnerable: 0b, Marker: 1b, Motion: [0.0d, 0.0d, 0.0d], NoBasePlate: 0b, OnGround: 0b, PortalCooldown: 0, Pos: [64.3927139373022d, 6.0d, 59.30000001192093d], Pose: {}, Rotation: [0.15043798f, 15.347454f], ShowArms: 0b, Small: 0b, UUID: [I; -1516632699, -1770765897, -1362337958, -475677268], id: "minecraft:armor_stand"}}
-    ],
-    palette: [
-        "minecraft:polished_andesite",
-        "minecraft:white_concrete",
-        "minecraft:air",
-        "computercraft:monitor_advanced{facing:north,orientation:north,state:lu}",
-        "computercraft:monitor_advanced{facing:north,orientation:north,state:lru}",
-        "computercraft:monitor_advanced{facing:north,orientation:north,state:ru}",
-        "computercraft:monitor_advanced{facing:north,orientation:north,state:ld}",
-        "computercraft:monitor_advanced{facing:north,orientation:north,state:lrd}",
-        "computercraft:monitor_advanced{facing:north,orientation:north,state:rd}"
-    ]
-}

projects/common/src/testMod/resources/data/cctest/structures/monitor_test.render_monitor.snbt

@@ -27,113 +27,18 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
         {pos: [1, 1, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:lu}", nbt: {Height: 2, Width: 3, XIndex: 2, YIndex: 0, id: "computercraft:monitor_advanced"}},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:air"},
         {pos: [2, 1, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:lru}", nbt: {Height: 2, Width: 3, XIndex: 1, YIndex: 0, id: "computercraft:monitor_advanced"}},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
         {pos: [3, 1, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:ru}", nbt: {Height: 2, Width: 3, XIndex: 0, YIndex: 0, id: "computercraft:monitor_advanced"}},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
         {pos: [1, 2, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:ld}", nbt: {Height: 2, Width: 3, XIndex: 2, YIndex: 1, id: "computercraft:monitor_advanced"}},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
         {pos: [2, 2, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:lrd}", nbt: {Height: 2, Width: 3, XIndex: 1, YIndex: 1, id: "computercraft:monitor_advanced"}},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:rd}", nbt: {Height: 2, Width: 3, XIndex: 0, YIndex: 1, id: "computercraft:monitor_advanced"}},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [3, 2, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:rd}", nbt: {Height: 2, Width: 3, XIndex: 0, YIndex: 1, id: "computercraft:monitor_advanced"}}
     ],
     entities: [
         {blockPos: [2, 1, 0], pos: [2.5773471891671482d, 1.0d, 0.31606672131648317d], nbt: {AbsorptionAmount: 0.0f, Air: 300s, ArmorItems: [{}, {}, {}, {}], Attributes: [{Base: 0.699999988079071d, Name: "minecraft:generic.movement_speed"}], Brain: {memories: {}}, DeathTime: 0s, DisabledSlots: 0, FallDistance: 0.0f, FallFlying: 0b, Fire: 0s, HandItems: [{}, {}], Health: 20.0f, HurtByTimestamp: 0, HurtTime: 0s, Invisible: 1b, Invulnerable: 0b, Marker: 1b, Motion: [0.0d, 0.0d, 0.0d], NoBasePlate: 0b, OnGround: 0b, PortalCooldown: 0, Pos: [-5.422652810832852d, -58.0d, 14.316066721316483d], Pose: {}, Rotation: [0.0f, 0.0f], ShowArms: 0b, Small: 0b, UUID: [I; -1438461995, 798246633, -1208936981, 1180880781], id: "minecraft:armor_stand"}}
     ],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:monitor_advanced{facing:north,orientation:north,state:lu}",
         "computercraft:monitor_advanced{facing:north,orientation:north,state:lru}",
         "computercraft:monitor_advanced{facing:north,orientation:north,state:ru}",

projects/common/src/testMod/resources/data/cctest/structures/pocket_computer_test.data_fixers.snbt

@@ -27,111 +27,11 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:chest{facing:north,type:single,waterlogged:false}", nbt: {Items: [{Count: 1b, Slot: 0b, id: "computercraft:pocket_computer_advanced", tag: {ComputerId: 123, Upgrade: "computercraft:wireless_modem_normal", display: {Name: '{"text":"Test"}'}}}], id: "minecraft:chest"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 2], state: "minecraft:chest{facing:north,type:single,waterlogged:false}", nbt: {Items: [{Count: 1b, Slot: 0b, id: "computercraft:pocket_computer_advanced", tag: {ComputerId: 123, Upgrade: "computercraft:wireless_modem_normal", display: {Name: '{"text":"Test"}'}}}], id: "minecraft:chest"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "minecraft:chest{facing:north,type:single,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/printer_test.can_insert_items.snbt

@@ -0,0 +1,42 @@
+{
+    DataVersion: 3465,
+    size: [5, 5, 5],
+    data: [
+        {pos: [0, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [1, 1, 2], state: "computercraft:printer{bottom:false,facing:north,top:false}", nbt: {Items: [], PageTitle: "", Printing: 0b, id: "computercraft:printer", term_bgColour: 15, term_cursorBlink: 0b, term_cursorX: 0, term_cursorY: 0, term_palette: [I; 1118481, 13388876, 5744206, 8349260, 3368652, 11691749, 5020082, 10066329, 5000268, 15905484, 8375321, 14605932, 10072818, 15040472, 15905331, 15790320], term_textBgColour_0: "fffffffffffffffffffffffff", term_textBgColour_1: "fffffffffffffffffffffffff", term_textBgColour_10: "fffffffffffffffffffffffff", term_textBgColour_11: "fffffffffffffffffffffffff", term_textBgColour_12: "fffffffffffffffffffffffff", term_textBgColour_13: "fffffffffffffffffffffffff", term_textBgColour_14: "fffffffffffffffffffffffff", term_textBgColour_15: "fffffffffffffffffffffffff", term_textBgColour_16: "fffffffffffffffffffffffff", term_textBgColour_17: "fffffffffffffffffffffffff", term_textBgColour_18: "fffffffffffffffffffffffff", term_textBgColour_19: "fffffffffffffffffffffffff", term_textBgColour_2: "fffffffffffffffffffffffff", term_textBgColour_20: "fffffffffffffffffffffffff", term_textBgColour_3: "fffffffffffffffffffffffff", term_textBgColour_4: "fffffffffffffffffffffffff", term_textBgColour_5: "fffffffffffffffffffffffff", term_textBgColour_6: "fffffffffffffffffffffffff", term_textBgColour_7: "fffffffffffffffffffffffff", term_textBgColour_8: "fffffffffffffffffffffffff", term_textBgColour_9: "fffffffffffffffffffffffff", term_textColour: 0, term_textColour_0: "0000000000000000000000000", term_textColour_1: "0000000000000000000000000", term_textColour_10: "0000000000000000000000000", term_textColour_11: "0000000000000000000000000", term_textColour_12: "0000000000000000000000000", term_textColour_13: "0000000000000000000000000", term_textColour_14: "0000000000000000000000000", term_textColour_15: "0000000000000000000000000", term_textColour_16: "0000000000000000000000000", term_textColour_17: "0000000000000000000000000", term_textColour_18: "0000000000000000000000000", term_textColour_19: "0000000000000000000000000", term_textColour_2: "0000000000000000000000000", term_textColour_20: "0000000000000000000000000", term_textColour_3: "0000000000000000000000000", term_textColour_4: "0000000000000000000000000", term_textColour_5: "0000000000000000000000000", term_textColour_6: "0000000000000000000000000", term_textColour_7: "0000000000000000000000000", term_textColour_8: "0000000000000000000000000", term_textColour_9: "0000000000000000000000000", term_text_0: "                         ", term_text_1: "                         ", term_text_10: "                         ", term_text_11: "                         ", term_text_12: "                         ", term_text_13: "                         ", term_text_14: "                         ", term_text_15: "                         ", term_text_16: "                         ", term_text_17: "                         ", term_text_18: "                         ", term_text_19: "                         ", term_text_2: "                         ", term_text_20: "                         ", term_text_3: "                         ", term_text_4: "                         ", term_text_5: "                         ", term_text_6: "                         ", term_text_7: "                         ", term_text_8: "                         ", term_text_9: "                         "}},
+        {pos: [3, 1, 2], state: "computercraft:printer{bottom:false,facing:north,top:false}", nbt: {Items: [], PageTitle: "", Printing: 0b, id: "computercraft:printer", term_bgColour: 15, term_cursorBlink: 0b, term_cursorX: 0, term_cursorY: 0, term_palette: [I; 1118481, 13388876, 5744206, 8349260, 3368652, 11691749, 5020082, 10066329, 5000268, 15905484, 8375321, 14605932, 10072818, 15040472, 15905331, 15790320], term_textBgColour_0: "fffffffffffffffffffffffff", term_textBgColour_1: "fffffffffffffffffffffffff", term_textBgColour_10: "fffffffffffffffffffffffff", term_textBgColour_11: "fffffffffffffffffffffffff", term_textBgColour_12: "fffffffffffffffffffffffff", term_textBgColour_13: "fffffffffffffffffffffffff", term_textBgColour_14: "fffffffffffffffffffffffff", term_textBgColour_15: "fffffffffffffffffffffffff", term_textBgColour_16: "fffffffffffffffffffffffff", term_textBgColour_17: "fffffffffffffffffffffffff", term_textBgColour_18: "fffffffffffffffffffffffff", term_textBgColour_19: "fffffffffffffffffffffffff", term_textBgColour_2: "fffffffffffffffffffffffff", term_textBgColour_20: "fffffffffffffffffffffffff", term_textBgColour_3: "fffffffffffffffffffffffff", term_textBgColour_4: "fffffffffffffffffffffffff", term_textBgColour_5: "fffffffffffffffffffffffff", term_textBgColour_6: "fffffffffffffffffffffffff", term_textBgColour_7: "fffffffffffffffffffffffff", term_textBgColour_8: "fffffffffffffffffffffffff", term_textBgColour_9: "fffffffffffffffffffffffff", term_textColour: 0, term_textColour_0: "0000000000000000000000000", term_textColour_1: "0000000000000000000000000", term_textColour_10: "0000000000000000000000000", term_textColour_11: "0000000000000000000000000", term_textColour_12: "0000000000000000000000000", term_textColour_13: "0000000000000000000000000", term_textColour_14: "0000000000000000000000000", term_textColour_15: "0000000000000000000000000", term_textColour_16: "0000000000000000000000000", term_textColour_17: "0000000000000000000000000", term_textColour_18: "0000000000000000000000000", term_textColour_19: "0000000000000000000000000", term_textColour_2: "0000000000000000000000000", term_textColour_20: "0000000000000000000000000", term_textColour_3: "0000000000000000000000000", term_textColour_4: "0000000000000000000000000", term_textColour_5: "0000000000000000000000000", term_textColour_6: "0000000000000000000000000", term_textColour_7: "0000000000000000000000000", term_textColour_8: "0000000000000000000000000", term_textColour_9: "0000000000000000000000000", term_text_0: "                         ", term_text_1: "                         ", term_text_10: "                         ", term_text_11: "                         ", term_text_12: "                         ", term_text_13: "                         ", term_text_14: "                         ", term_text_15: "                         ", term_text_16: "                         ", term_text_17: "                         ", term_text_18: "                         ", term_text_19: "                         ", term_text_2: "                         ", term_text_20: "                         ", term_text_3: "                         ", term_text_4: "                         ", term_text_5: "                         ", term_text_6: "                         ", term_text_7: "                         ", term_text_8: "                         ", term_text_9: "                         "}},
+        {pos: [3, 1, 3], state: "minecraft:hopper{enabled:false,facing:north}", nbt: {Items: [{Count: 1b, Slot: 0b, id: "minecraft:black_dye"}, {Count: 1b, Slot: 1b, id: "minecraft:paper"}], TransferCooldown: 0, id: "minecraft:hopper"}},
+        {pos: [1, 2, 2], state: "minecraft:hopper{enabled:false,facing:down}", nbt: {Items: [{Count: 1b, Slot: 0b, id: "minecraft:black_dye"}, {Count: 1b, Slot: 1b, id: "minecraft:paper"}], TransferCooldown: 0, id: "minecraft:hopper"}}
+    ],
+    entities: [],
+    palette: [
+        "minecraft:polished_andesite",
+        "computercraft:printer{bottom:false,facing:north,top:false}",
+        "minecraft:hopper{enabled:false,facing:north}",
+        "minecraft:hopper{enabled:false,facing:down}"
+    ]
+}

projects/common/src/testMod/resources/data/cctest/structures/printer_test.comparator.snbt

@@ -27,111 +27,13 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:printer{bottom:false,facing:north,top:false}", nbt: {ForgeCaps: {}, Items: [], PageTitle: "", Printing: 0b, id: "computercraft:printer", term_bgColour: 15, term_cursorBlink: 0b, term_cursorX: 0, term_cursorY: 0, term_palette: [I; 1118481, 13388876, 5744206, 8349260, 3368652, 11691749, 5020082, 10066329, 5000268, 15905484, 8375321, 14605932, 10072818, 15040472, 15905331, 15790320], term_textBgColour_0: "fffffffffffffffffffffffff", term_textBgColour_1: "fffffffffffffffffffffffff", term_textBgColour_10: "fffffffffffffffffffffffff", term_textBgColour_11: "fffffffffffffffffffffffff", term_textBgColour_12: "fffffffffffffffffffffffff", term_textBgColour_13: "fffffffffffffffffffffffff", term_textBgColour_14: "fffffffffffffffffffffffff", term_textBgColour_15: "fffffffffffffffffffffffff", term_textBgColour_16: "fffffffffffffffffffffffff", term_textBgColour_17: "fffffffffffffffffffffffff", term_textBgColour_18: "fffffffffffffffffffffffff", term_textBgColour_19: "fffffffffffffffffffffffff", term_textBgColour_2: "fffffffffffffffffffffffff", term_textBgColour_20: "fffffffffffffffffffffffff", term_textBgColour_3: "fffffffffffffffffffffffff", term_textBgColour_4: "fffffffffffffffffffffffff", term_textBgColour_5: "fffffffffffffffffffffffff", term_textBgColour_6: "fffffffffffffffffffffffff", term_textBgColour_7: "fffffffffffffffffffffffff", term_textBgColour_8: "fffffffffffffffffffffffff", term_textBgColour_9: "fffffffffffffffffffffffff", term_textColour: 0, term_textColour_0: "0000000000000000000000000", term_textColour_1: "0000000000000000000000000", term_textColour_10: "0000000000000000000000000", term_textColour_11: "0000000000000000000000000", term_textColour_12: "0000000000000000000000000", term_textColour_13: "0000000000000000000000000", term_textColour_14: "0000000000000000000000000", term_textColour_15: "0000000000000000000000000", term_textColour_16: "0000000000000000000000000", term_textColour_17: "0000000000000000000000000", term_textColour_18: "0000000000000000000000000", term_textColour_19: "0000000000000000000000000", term_textColour_2: "0000000000000000000000000", term_textColour_20: "0000000000000000000000000", term_textColour_3: "0000000000000000000000000", term_textColour_4: "0000000000000000000000000", term_textColour_5: "0000000000000000000000000", term_textColour_6: "0000000000000000000000000", term_textColour_7: "0000000000000000000000000", term_textColour_8: "0000000000000000000000000", term_textColour_9: "0000000000000000000000000", term_text_0: "                         ", term_text_1: "                         ", term_text_10: "                         ", term_text_11: "                         ", term_text_12: "                         ", term_text_13: "                         ", term_text_14: "                         ", term_text_15: "                         ", term_text_16: "                         ", term_text_17: "                         ", term_text_18: "                         ", term_text_19: "                         ", term_text_2: "                         ", term_text_20: "                         ", term_text_3: "                         ", term_text_4: "                         ", term_text_5: "                         ", term_text_6: "                         ", term_text_7: "                         ", term_text_8: "                         ", term_text_9: "                         "}},
         {pos: [2, 1, 3], state: "minecraft:comparator{facing:north,mode:compare,powered:false}", nbt: {OutputSignal: 0, id: "minecraft:comparator"}},
-        {pos: [2, 1, 4], state: "minecraft:redstone_wire{east:none,north:side,power:0,south:side,west:none}"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 4], state: "minecraft:redstone_wire{east:none,north:side,power:0,south:side,west:none}"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "minecraft:redstone_wire{east:none,north:side,power:0,south:side,west:none}",
         "computercraft:printer{bottom:false,facing:north,top:false}",
         "minecraft:comparator{facing:north,mode:compare,powered:false}"

projects/common/src/testMod/resources/data/cctest/structures/printer_test.drops_contents.snbt

@@ -27,111 +27,11 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "computercraft:printer{bottom:false,facing:north,top:true}", nbt: {CustomName: '{"text":"My Printer"}', ForgeCaps: {}, Items: [{Count: 1b, Slot: 0b, id: "minecraft:black_dye"}, {Count: 1b, Slot: 1b, id: "minecraft:paper"}], PageTitle: "", Printing: 0b, id: "computercraft:printer", term_bgColour: 15, term_cursorBlink: 0b, term_cursorX: 0, term_cursorY: 0, term_palette: [I; 1118481, 13388876, 5744206, 8349260, 3368652, 11691749, 5020082, 10066329, 5000268, 15905484, 8375321, 14605932, 10072818, 15040472, 15905331, 15790320], term_textBgColour_0: "fffffffffffffffffffffffff", term_textBgColour_1: "fffffffffffffffffffffffff", term_textBgColour_10: "fffffffffffffffffffffffff", term_textBgColour_11: "fffffffffffffffffffffffff", term_textBgColour_12: "fffffffffffffffffffffffff", term_textBgColour_13: "fffffffffffffffffffffffff", term_textBgColour_14: "fffffffffffffffffffffffff", term_textBgColour_15: "fffffffffffffffffffffffff", term_textBgColour_16: "fffffffffffffffffffffffff", term_textBgColour_17: "fffffffffffffffffffffffff", term_textBgColour_18: "fffffffffffffffffffffffff", term_textBgColour_19: "fffffffffffffffffffffffff", term_textBgColour_2: "fffffffffffffffffffffffff", term_textBgColour_20: "fffffffffffffffffffffffff", term_textBgColour_3: "fffffffffffffffffffffffff", term_textBgColour_4: "fffffffffffffffffffffffff", term_textBgColour_5: "fffffffffffffffffffffffff", term_textBgColour_6: "fffffffffffffffffffffffff", term_textBgColour_7: "fffffffffffffffffffffffff", term_textBgColour_8: "fffffffffffffffffffffffff", term_textBgColour_9: "fffffffffffffffffffffffff", term_textColour: 0, term_textColour_0: "0000000000000000000000000", term_textColour_1: "0000000000000000000000000", term_textColour_10: "0000000000000000000000000", term_textColour_11: "0000000000000000000000000", term_textColour_12: "0000000000000000000000000", term_textColour_13: "0000000000000000000000000", term_textColour_14: "0000000000000000000000000", term_textColour_15: "0000000000000000000000000", term_textColour_16: "0000000000000000000000000", term_textColour_17: "0000000000000000000000000", term_textColour_18: "0000000000000000000000000", term_textColour_19: "0000000000000000000000000", term_textColour_2: "0000000000000000000000000", term_textColour_20: "0000000000000000000000000", term_textColour_3: "0000000000000000000000000", term_textColour_4: "0000000000000000000000000", term_textColour_5: "0000000000000000000000000", term_textColour_6: "0000000000000000000000000", term_textColour_7: "0000000000000000000000000", term_textColour_8: "0000000000000000000000000", term_textColour_9: "0000000000000000000000000", term_text_0: "                         ", term_text_1: "                         ", term_text_10: "                         ", term_text_11: "                         ", term_text_12: "                         ", term_text_13: "                         ", term_text_14: "                         ", term_text_15: "                         ", term_text_16: "                         ", term_text_17: "                         ", term_text_18: "                         ", term_text_19: "                         ", term_text_2: "                         ", term_text_20: "                         ", term_text_3: "                         ", term_text_4: "                         ", term_text_5: "                         ", term_text_6: "                         ", term_text_7: "                         ", term_text_8: "                         ", term_text_9: "                         "}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 2], state: "computercraft:printer{bottom:false,facing:north,top:true}", nbt: {CustomName: '{"text":"My Printer"}', ForgeCaps: {}, Items: [{Count: 1b, Slot: 0b, id: "minecraft:black_dye"}, {Count: 1b, Slot: 1b, id: "minecraft:paper"}], PageTitle: "", Printing: 0b, id: "computercraft:printer", term_bgColour: 15, term_cursorBlink: 0b, term_cursorX: 0, term_cursorY: 0, term_palette: [I; 1118481, 13388876, 5744206, 8349260, 3368652, 11691749, 5020082, 10066329, 5000268, 15905484, 8375321, 14605932, 10072818, 15040472, 15905331, 15790320], term_textBgColour_0: "fffffffffffffffffffffffff", term_textBgColour_1: "fffffffffffffffffffffffff", term_textBgColour_10: "fffffffffffffffffffffffff", term_textBgColour_11: "fffffffffffffffffffffffff", term_textBgColour_12: "fffffffffffffffffffffffff", term_textBgColour_13: "fffffffffffffffffffffffff", term_textBgColour_14: "fffffffffffffffffffffffff", term_textBgColour_15: "fffffffffffffffffffffffff", term_textBgColour_16: "fffffffffffffffffffffffff", term_textBgColour_17: "fffffffffffffffffffffffff", term_textBgColour_18: "fffffffffffffffffffffffff", term_textBgColour_19: "fffffffffffffffffffffffff", term_textBgColour_2: "fffffffffffffffffffffffff", term_textBgColour_20: "fffffffffffffffffffffffff", term_textBgColour_3: "fffffffffffffffffffffffff", term_textBgColour_4: "fffffffffffffffffffffffff", term_textBgColour_5: "fffffffffffffffffffffffff", term_textBgColour_6: "fffffffffffffffffffffffff", term_textBgColour_7: "fffffffffffffffffffffffff", term_textBgColour_8: "fffffffffffffffffffffffff", term_textBgColour_9: "fffffffffffffffffffffffff", term_textColour: 0, term_textColour_0: "0000000000000000000000000", term_textColour_1: "0000000000000000000000000", term_textColour_10: "0000000000000000000000000", term_textColour_11: "0000000000000000000000000", term_textColour_12: "0000000000000000000000000", term_textColour_13: "0000000000000000000000000", term_textColour_14: "0000000000000000000000000", term_textColour_15: "0000000000000000000000000", term_textColour_16: "0000000000000000000000000", term_textColour_17: "0000000000000000000000000", term_textColour_18: "0000000000000000000000000", term_textColour_19: "0000000000000000000000000", term_textColour_2: "0000000000000000000000000", term_textColour_20: "0000000000000000000000000", term_textColour_3: "0000000000000000000000000", term_textColour_4: "0000000000000000000000000", term_textColour_5: "0000000000000000000000000", term_textColour_6: "0000000000000000000000000", term_textColour_7: "0000000000000000000000000", term_textColour_8: "0000000000000000000000000", term_textColour_9: "0000000000000000000000000", term_text_0: "                         ", term_text_1: "                         ", term_text_10: "                         ", term_text_11: "                         ", term_text_12: "                         ", term_text_13: "                         ", term_text_14: "                         ", term_text_15: "                         ", term_text_16: "                         ", term_text_17: "                         ", term_text_18: "                         ", term_text_19: "                         ", term_text_2: "                         ", term_text_20: "                         ", term_text_3: "                         ", term_text_4: "                         ", term_text_5: "                         ", term_text_6: "                         ", term_text_7: "                         ", term_text_8: "                         ", term_text_9: "                         "}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:printer{bottom:false,facing:north,top:true}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/printer_test.empty.snbt

@@ -27,111 +27,11 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "computercraft:printer{bottom:false,facing:north,top:false}", nbt: {ForgeCaps: {}, Items: [], PageTitle: "", Printing: 0b, id: "computercraft:printer", term_bgColour: 15, term_cursorBlink: 0b, term_cursorX: 0, term_cursorY: 0, term_palette: [I; 1118481, 13388876, 5744206, 8349260, 3368652, 11691749, 5020082, 10066329, 5000268, 15905484, 8375321, 14605932, 10072818, 15040472, 15905331, 15790320], term_textBgColour_0: "fffffffffffffffffffffffff", term_textBgColour_1: "fffffffffffffffffffffffff", term_textBgColour_10: "fffffffffffffffffffffffff", term_textBgColour_11: "fffffffffffffffffffffffff", term_textBgColour_12: "fffffffffffffffffffffffff", term_textBgColour_13: "fffffffffffffffffffffffff", term_textBgColour_14: "fffffffffffffffffffffffff", term_textBgColour_15: "fffffffffffffffffffffffff", term_textBgColour_16: "fffffffffffffffffffffffff", term_textBgColour_17: "fffffffffffffffffffffffff", term_textBgColour_18: "fffffffffffffffffffffffff", term_textBgColour_19: "fffffffffffffffffffffffff", term_textBgColour_2: "fffffffffffffffffffffffff", term_textBgColour_20: "fffffffffffffffffffffffff", term_textBgColour_3: "fffffffffffffffffffffffff", term_textBgColour_4: "fffffffffffffffffffffffff", term_textBgColour_5: "fffffffffffffffffffffffff", term_textBgColour_6: "fffffffffffffffffffffffff", term_textBgColour_7: "fffffffffffffffffffffffff", term_textBgColour_8: "fffffffffffffffffffffffff", term_textBgColour_9: "fffffffffffffffffffffffff", term_textColour: 0, term_textColour_0: "0000000000000000000000000", term_textColour_1: "0000000000000000000000000", term_textColour_10: "0000000000000000000000000", term_textColour_11: "0000000000000000000000000", term_textColour_12: "0000000000000000000000000", term_textColour_13: "0000000000000000000000000", term_textColour_14: "0000000000000000000000000", term_textColour_15: "0000000000000000000000000", term_textColour_16: "0000000000000000000000000", term_textColour_17: "0000000000000000000000000", term_textColour_18: "0000000000000000000000000", term_textColour_19: "0000000000000000000000000", term_textColour_2: "0000000000000000000000000", term_textColour_20: "0000000000000000000000000", term_textColour_3: "0000000000000000000000000", term_textColour_4: "0000000000000000000000000", term_textColour_5: "0000000000000000000000000", term_textColour_6: "0000000000000000000000000", term_textColour_7: "0000000000000000000000000", term_textColour_8: "0000000000000000000000000", term_textColour_9: "0000000000000000000000000", term_text_0: "                         ", term_text_1: "                         ", term_text_10: "                         ", term_text_11: "                         ", term_text_12: "                         ", term_text_13: "                         ", term_text_14: "                         ", term_text_15: "                         ", term_text_16: "                         ", term_text_17: "                         ", term_text_18: "                         ", term_text_19: "                         ", term_text_2: "                         ", term_text_20: "                         ", term_text_3: "                         ", term_text_4: "                         ", term_text_5: "                         ", term_text_6: "                         ", term_text_7: "                         ", term_text_8: "                         ", term_text_9: "                         "}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 2], state: "computercraft:printer{bottom:false,facing:north,top:false}", nbt: {ForgeCaps: {}, Items: [], PageTitle: "", Printing: 0b, id: "computercraft:printer", term_bgColour: 15, term_cursorBlink: 0b, term_cursorX: 0, term_cursorY: 0, term_palette: [I; 1118481, 13388876, 5744206, 8349260, 3368652, 11691749, 5020082, 10066329, 5000268, 15905484, 8375321, 14605932, 10072818, 15040472, 15905331, 15790320], term_textBgColour_0: "fffffffffffffffffffffffff", term_textBgColour_1: "fffffffffffffffffffffffff", term_textBgColour_10: "fffffffffffffffffffffffff", term_textBgColour_11: "fffffffffffffffffffffffff", term_textBgColour_12: "fffffffffffffffffffffffff", term_textBgColour_13: "fffffffffffffffffffffffff", term_textBgColour_14: "fffffffffffffffffffffffff", term_textBgColour_15: "fffffffffffffffffffffffff", term_textBgColour_16: "fffffffffffffffffffffffff", term_textBgColour_17: "fffffffffffffffffffffffff", term_textBgColour_18: "fffffffffffffffffffffffff", term_textBgColour_19: "fffffffffffffffffffffffff", term_textBgColour_2: "fffffffffffffffffffffffff", term_textBgColour_20: "fffffffffffffffffffffffff", term_textBgColour_3: "fffffffffffffffffffffffff", term_textBgColour_4: "fffffffffffffffffffffffff", term_textBgColour_5: "fffffffffffffffffffffffff", term_textBgColour_6: "fffffffffffffffffffffffff", term_textBgColour_7: "fffffffffffffffffffffffff", term_textBgColour_8: "fffffffffffffffffffffffff", term_textBgColour_9: "fffffffffffffffffffffffff", term_textColour: 0, term_textColour_0: "0000000000000000000000000", term_textColour_1: "0000000000000000000000000", term_textColour_10: "0000000000000000000000000", term_textColour_11: "0000000000000000000000000", term_textColour_12: "0000000000000000000000000", term_textColour_13: "0000000000000000000000000", term_textColour_14: "0000000000000000000000000", term_textColour_15: "0000000000000000000000000", term_textColour_16: "0000000000000000000000000", term_textColour_17: "0000000000000000000000000", term_textColour_18: "0000000000000000000000000", term_textColour_19: "0000000000000000000000000", term_textColour_2: "0000000000000000000000000", term_textColour_20: "0000000000000000000000000", term_textColour_3: "0000000000000000000000000", term_textColour_4: "0000000000000000000000000", term_textColour_5: "0000000000000000000000000", term_textColour_6: "0000000000000000000000000", term_textColour_7: "0000000000000000000000000", term_textColour_8: "0000000000000000000000000", term_textColour_9: "0000000000000000000000000", term_text_0: "                         ", term_text_1: "                         ", term_text_10: "                         ", term_text_11: "                         ", term_text_12: "                         ", term_text_13: "                         ", term_text_14: "                         ", term_text_15: "                         ", term_text_16: "                         ", term_text_17: "                         ", term_text_18: "                         ", term_text_19: "                         ", term_text_2: "                         ", term_text_20: "                         ", term_text_3: "                         ", term_text_4: "                         ", term_text_5: "                         ", term_text_6: "                         ", term_text_7: "                         ", term_text_8: "                         ", term_text_9: "                         "}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:printer{bottom:false,facing:north,top:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/printout_test.render_in_frame.snbt

@@ -27,113 +27,14 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:air"},
-        {pos: [2, 1, 3], state: "minecraft:air"},
         {pos: [2, 1, 4], state: "minecraft:polished_andesite"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:polished_andesite"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 2, 4], state: "minecraft:polished_andesite"}
     ],
     entities: [
         {blockPos: [2, 1, 2], pos: [2.583196949396921d, 1.0d, 2.608974919959593d], nbt: {AbsorptionAmount: 0.0f, Air: 300s, ArmorItems: [{}, {}, {}, {}], Attributes: [{Base: 0.699999988079071d, Name: "minecraft:generic.movement_speed"}], Brain: {memories: {}}, CustomName: '{"text":"printouttest.in_frame_at_night"}', DeathTime: 0s, DisabledSlots: 0, FallDistance: 0.0f, FallFlying: 0b, Fire: -1s, HandItems: [{}, {}], Health: 20.0f, HurtByTimestamp: 0, HurtTime: 0s, Invisible: 1b, Invulnerable: 0b, Marker: 1b, Motion: [0.0d, 0.0d, 0.0d], NoBasePlate: 0b, OnGround: 0b, PortalCooldown: 0, Pos: [221.58319694939692d, -58.0d, 92.60897491995959d], Pose: {}, Rotation: [1.3504658f, 6.7031174f], ShowArms: 0b, Small: 0b, UUID: [I; 1854159985, -991539606, -1317309541, 1483112386], id: "minecraft:armor_stand"}},
         {blockPos: [2, 2, 3], pos: [2.5d, 2.5d, 3.96875d], nbt: {Air: 300s, Facing: 2b, FallDistance: 0.0f, Fire: -1s, Fixed: 0b, Invisible: 0b, Invulnerable: 0b, Item: {Count: 1b, id: "computercraft:printed_page", tag: {Color0: "eeeeeeeeeeeeeeeeeeeeeeeee", Color1: "eeeeeeeeeeeeeeeeeeeeeeeee", Color10: "eeeeeeeeeeeeeeeeeeeeeeeee", Color11: "eeeeeeeeeeeeeeeeeeeeeeeee", Color12: "eeeeeeeeeeeeeeeeeeeeeeeee", Color13: "eeeeeeeeeeeeeeeeeeeeeeeee", Color14: "eeeeeeeeeeeeeeeeeeeeeeeee", Color15: "eeeeeeeeeeeeeeeeeeeeeeeee", Color16: "eeeeeeeeeeeeeeeeeeeeeeeee", Color17: "eeeeeeeeeeeeeeeeeeeeeeeee", Color18: "eeeeeeeeeeeeeeeeeeeeeeeee", Color19: "eeeeeeeeeeeeeeeeeeeeeeeee", Color2: "eeeeeeeeeeeeeeeeeeeeeeeee", Color20: "eeeeeeeeeeeeeeeeeeeeeeeee", Color3: "eeeeeeeeeeeeeeeeeeeeeeeee", Color4: "eeeeeeeeeeeeeeeeeeeeeeeee", Color5: "eeeeeeeeeeeeeeeeeeeeeeeee", Color6: "eeeeeeeeeeeeeeeeeeeeeeeee", Color7: "eeeeeeeeeeeeeeeeeeeeeeeee", Color8: "eeeeeeeeeeeeeeeeeeeeeeeee", Color9: "eeeeeeeeeeeeeeeeeeeeeeeee", Pages: 1, Text0: "If you're reading this,  ", Text1: "the test failed.         ", Text10: "                         ", Text11: "                         ", Text12: "                         ", Text13: "                         ", Text14: "                         ", Text15: "                         ", Text16: "                         ", Text17: "                         ", Text18: "                         ", Text19: "                         ", Text2: "                         ", Text20: "                         ", Text3: "                         ", Text4: "                         ", Text5: "                         ", Text6: "                         ", Text7: "                         ", Text8: "                         ", Text9: "                         ", Title: "a.lua"}}, ItemDropChance: 1.0f, ItemRotation: 0b, Motion: [0.0d, 0.0d, 0.0d], OnGround: 0b, PortalCooldown: 0, Pos: [221.5d, -56.5d, 93.96875d], Rotation: [-540.0f, 0.0f], TileX: 221, TileY: -57, TileZ: 93, UUID: [I; 1972443954, 193152445, -1823446000, -1684171214], id: "minecraft:item_frame"}}
     ],
     palette: [
-        "minecraft:polished_andesite",
-        "minecraft:air"
+        "minecraft:polished_andesite"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/relay_test.no_through_signal.snbt

@@ -27,113 +27,17 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
         {pos: [2, 1, 0], state: "minecraft:lever{face:floor,facing:south,powered:false}"},
         {pos: [2, 1, 1], state: "minecraft:repeater{delay:1,facing:north,locked:false,powered:false}"},
         {pos: [2, 1, 2], state: "computercraft:redstone_relay{facing:north}"},
         {pos: [2, 1, 3], state: "minecraft:redstone_wire{east:none,north:side,power:0,south:none,west:none}"},
-        {pos: [2, 1, 4], state: "minecraft:redstone_lamp{lit:false}"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 4], state: "minecraft:redstone_lamp{lit:false}"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:redstone_lamp{lit:false}",
         "computercraft:redstone_relay{facing:north}",
-        "minecraft:air",
+        "minecraft:redstone_lamp{lit:false}",
         "minecraft:lever{face:floor,facing:south,powered:false}",
         "minecraft:repeater{delay:1,facing:north,locked:false,powered:false}",
         "minecraft:redstone_wire{east:none,north:side,power:0,south:none,west:none}"

projects/common/src/testMod/resources/data/cctest/structures/relay_test.no_through_signal_reverse.snbt

@@ -27,115 +27,19 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
         {pos: [2, 1, 0], state: "minecraft:lever{face:floor,facing:south,powered:false}"},
         {pos: [2, 1, 1], state: "minecraft:repeater{delay:1,facing:north,locked:false,powered:false}"},
         {pos: [2, 1, 2], state: "computercraft:redstone_relay{facing:north}"},
         {pos: [2, 1, 3], state: "minecraft:redstone_wire{east:none,north:side,power:0,south:side,west:none}"},
-        {pos: [2, 1, 4], state: "minecraft:redstone_lamp{lit:false}"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 4], state: "minecraft:redstone_lamp{lit:false}"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
+        "computercraft:redstone_relay{facing:north}",
         "minecraft:redstone_lamp{lit:false}",
-        "minecraft:air",
         "minecraft:lever{face:floor,facing:south,powered:false}",
         "minecraft:repeater{delay:1,facing:north,locked:false,powered:false}",
-        "minecraft:redstone_wire{east:none,north:side,power:0,south:side,west:none}",
-        "computercraft:redstone_relay{facing:north}"
+        "minecraft:redstone_wire{east:none,north:side,power:0,south:side,west:none}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/relay_test.self_output_update.snbt

@@ -27,111 +27,12 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:redstone_relay{facing:north}"},
-        {pos: [2, 1, 3], state: "minecraft:polished_andesite"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 3], state: "minecraft:polished_andesite"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:redstone_relay{facing:north}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/relay_test.set_and_destroy.snbt

@@ -27,112 +27,13 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:redstone_relay{facing:north}"},
-        {pos: [2, 1, 3], state: "minecraft:redstone_lamp{lit:false}"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 3], state: "minecraft:redstone_lamp{lit:false}"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:redstone_lamp{lit:false}",
-        "minecraft:air",
-        "computercraft:redstone_relay{facing:north}"
+        "computercraft:redstone_relay{facing:north}",
+        "minecraft:redstone_lamp{lit:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/speaker_test.fails_to_play_multiple_sounds.snbt

@@ -27,111 +27,12 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
         {pos: [1, 1, 2], state: "computercraft:speaker{facing:north}", nbt: {id: "computercraft:speaker"}},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "computercraft:computer_normal{facing:north,state:on}", nbt: {ComputerId: 1, Label: "speaker_test.fails_to_play_multiple_sounds", On: 1b, id: "computercraft:computer_normal"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 2], state: "computercraft:computer_normal{facing:north,state:on}", nbt: {ComputerId: 1, Label: "speaker_test.fails_to_play_multiple_sounds", On: 1b, id: "computercraft:computer_normal"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:speaker{facing:north}",
         "computercraft:computer_normal{facing:north,state:on}"
     ]

projects/common/src/testMod/resources/data/cctest/structures/speaker_test.will_not_play_record.snbt

@@ -27,111 +27,12 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
         {pos: [1, 1, 2], state: "computercraft:speaker{facing:north}", nbt: {id: "computercraft:speaker"}},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "computercraft:computer_normal{facing:north,state:on}", nbt: {ComputerId: 1, Label: "speaker_test.will_not_play_record", On: 1b, id: "computercraft:computer_normal"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 2], state: "computercraft:computer_normal{facing:north,state:on}", nbt: {ComputerId: 1, Label: "speaker_test.will_not_play_record", On: 1b, id: "computercraft:computer_normal"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:speaker{facing:north}",
         "computercraft:computer_normal{facing:north,state:on}"
     ]

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.attack_entity.snbt

@@ -27,106 +27,22 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
         {pos: [1, 1, 2], state: "minecraft:light_gray_stained_glass"},
         {pos: [1, 1, 3], state: "minecraft:light_gray_stained_glass"},
         {pos: [1, 1, 4], state: "minecraft:light_gray_stained_glass"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [], Label: "turtle_test.attack_entity", LeftUpgrade: "minecraft:diamond_sword", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
         {pos: [2, 1, 4], state: "minecraft:light_gray_stained_glass"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
         {pos: [3, 1, 2], state: "minecraft:light_gray_stained_glass"},
         {pos: [3, 1, 3], state: "minecraft:light_gray_stained_glass"},
         {pos: [3, 1, 4], state: "minecraft:light_gray_stained_glass"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
         {pos: [1, 2, 2], state: "minecraft:light_gray_stained_glass"},
         {pos: [1, 2, 3], state: "minecraft:light_gray_stained_glass"},
         {pos: [1, 2, 4], state: "minecraft:light_gray_stained_glass"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
         {pos: [2, 2, 2], state: "minecraft:light_gray_stained_glass"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
         {pos: [2, 2, 4], state: "minecraft:light_gray_stained_glass"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
         {pos: [3, 2, 2], state: "minecraft:light_gray_stained_glass"},
         {pos: [3, 2, 3], state: "minecraft:light_gray_stained_glass"},
-        {pos: [3, 2, 4], state: "minecraft:light_gray_stained_glass"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [3, 2, 4], state: "minecraft:light_gray_stained_glass"}
     ],
     entities: [
         {blockPos: [2, 1, 3], pos: [2.5d, 1.0d, 3.5d], nbt: {AbsorptionAmount: 0.0f, Age: 0, Air: 300s, ArmorDropChances: [0.085f, 0.085f, 0.085f, 0.085f], ArmorItems: [{}, {}, {}, {}], Brain: {memories: {}}, CanPickUpLoot: 0b, CanUpdate: 1b, Color: 0b, DeathTime: 0s, FallDistance: 0.0f, FallFlying: 0b, Fire: -1s, ForcedAge: 0, HandDropChances: [0.085f, 0.085f], HandItems: [{}, {}], Health: 8.0f, HurtByTimestamp: 0, HurtTime: 0s, InLove: 0, Invulnerable: 0b, LeftHanded: 0b, Motion: [0.0d, -0.0784000015258789d, 0.0d], OnGround: 1b, PersistenceRequired: 0b, PortalCooldown: 0, Pos: [92.5d, -58.0d, 35.5d], Rotation: [5.6449127f, 0.0f], Sheared: 0b, UUID: [I; -551270274, -502513578, -1253838680, -1186962441], id: "minecraft:sheep"}}
@@ -134,7 +50,6 @@
     palette: [
         "minecraft:polished_andesite",
         "minecraft:light_gray_stained_glass",
-        "minecraft:air",
         "computercraft:turtle_normal{facing:south,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.attack_entity_destroy.snbt

@@ -33,19 +33,11 @@
         {pos: [0, 1, 3], state: "minecraft:barrier"},
         {pos: [0, 1, 4], state: "minecraft:barrier"},
         {pos: [1, 1, 0], state: "minecraft:barrier"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
         {pos: [1, 1, 4], state: "minecraft:barrier"},
         {pos: [2, 1, 0], state: "minecraft:barrier"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [], Label: "turtle_test.attack_entity_destroy", LeftUpgrade: "minecraft:diamond_sword", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
         {pos: [2, 1, 4], state: "minecraft:barrier"},
         {pos: [3, 1, 0], state: "minecraft:barrier"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
         {pos: [3, 1, 4], state: "minecraft:barrier"},
         {pos: [4, 1, 0], state: "minecraft:barrier"},
         {pos: [4, 1, 1], state: "minecraft:barrier"},
@@ -58,19 +50,10 @@
         {pos: [0, 2, 3], state: "minecraft:barrier"},
         {pos: [0, 2, 4], state: "minecraft:barrier"},
         {pos: [1, 2, 0], state: "minecraft:barrier"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
         {pos: [1, 2, 4], state: "minecraft:barrier"},
         {pos: [2, 2, 0], state: "minecraft:barrier"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
         {pos: [2, 2, 4], state: "minecraft:barrier"},
         {pos: [3, 2, 0], state: "minecraft:barrier"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
         {pos: [3, 2, 4], state: "minecraft:barrier"},
         {pos: [4, 2, 0], state: "minecraft:barrier"},
         {pos: [4, 2, 1], state: "minecraft:barrier"},
@@ -83,50 +66,16 @@
         {pos: [0, 3, 3], state: "minecraft:barrier"},
         {pos: [0, 3, 4], state: "minecraft:barrier"},
         {pos: [1, 3, 0], state: "minecraft:barrier"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
         {pos: [1, 3, 4], state: "minecraft:barrier"},
         {pos: [2, 3, 0], state: "minecraft:barrier"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
         {pos: [2, 3, 4], state: "minecraft:barrier"},
         {pos: [3, 3, 0], state: "minecraft:barrier"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
         {pos: [3, 3, 4], state: "minecraft:barrier"},
         {pos: [4, 3, 0], state: "minecraft:barrier"},
         {pos: [4, 3, 1], state: "minecraft:barrier"},
         {pos: [4, 3, 2], state: "minecraft:barrier"},
         {pos: [4, 3, 3], state: "minecraft:barrier"},
-        {pos: [4, 3, 4], state: "minecraft:barrier"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [4, 3, 4], state: "minecraft:barrier"}
     ],
     entities: [
         {blockPos: [2, 1, 3], pos: [2.5d, 1.0d, 3.5d], nbt: {Air: 300s, CanUpdate: 1b, FallDistance: 0.0f, Fire: -1s, Invulnerable: 0b, Motion: [0.0d, 0.0d, 0.0d], OnGround: 0b, PortalCooldown: 0, Pos: [84.5d, -58.0d, 35.5d], Rotation: [0.0f, 0.0f], ShowBottom: 0b, UUID: [I; 1784803273, 2137542103, -1349475969, -423460124], id: "minecraft:end_crystal"}}
@@ -135,7 +84,6 @@
         "minecraft:polished_andesite",
         "minecraft:obsidian",
         "minecraft:barrier",
-        "minecraft:air",
         "computercraft:turtle_normal{facing:south,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.break_cable.snbt

@@ -27,111 +27,12 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 80, Items: [], Label: "turtle_test.break_cable", LeftUpgrade: "minecraft:diamond_pickaxe", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [2, 1, 3], state: "computercraft:cable{cable:true,down:true,east:false,modem:down_off,north:false,south:false,up:false,waterlogged:false,west:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 3], state: "computercraft:cable{cable:true,down:true,east:false,modem:down_off,north:false,south:false,up:false,waterlogged:false,west:false}", nbt: {PeripheralAccess: 0b, id: "computercraft:cable"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:turtle_normal{facing:south,waterlogged:false}",
         "computercraft:cable{cable:true,down:true,east:false,modem:down_off,north:false,south:false,up:false,waterlogged:false,west:false}"
     ]

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.breaks_exploding_block.snbt

@@ -33,19 +33,12 @@
         {pos: [0, 1, 3], state: "minecraft:barrier"},
         {pos: [0, 1, 4], state: "minecraft:barrier"},
         {pos: [1, 1, 0], state: "minecraft:barrier"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
         {pos: [1, 1, 4], state: "minecraft:barrier"},
         {pos: [2, 1, 0], state: "minecraft:barrier"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [], Label: "turtle_test.breaks_exploding_block", LeftUpgrade: "minecraft:diamond_pickaxe", LeftUpgradeNbt: {Tag: {Damage: 0}}, On: 1b, Owner: {LowerId: -5670393268852517359L, Name: "Player172", UpperId: 3578583684139923613L}, Slot: 0, Items: [{Count: 64b, Slot: 0b, id: "minecraft:bone_block"}], id: "computercraft:turtle_normal"}},
+        {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 64b, Slot: 0b, id: "minecraft:bone_block"}], Label: "turtle_test.breaks_exploding_block", LeftUpgrade: "minecraft:diamond_pickaxe", LeftUpgradeNbt: {Tag: {Damage: 0}}, On: 1b, Owner: {LowerId: -5670393268852517359L, Name: "Player172", UpperId: 3578583684139923613L}, Slot: 0, id: "computercraft:turtle_normal"}},
         {pos: [2, 1, 3], state: "minecraft:bone_block{axis:y}"},
         {pos: [2, 1, 4], state: "minecraft:barrier"},
         {pos: [3, 1, 0], state: "minecraft:barrier"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
         {pos: [3, 1, 4], state: "minecraft:barrier"},
         {pos: [4, 1, 0], state: "minecraft:barrier"},
         {pos: [4, 1, 1], state: "minecraft:barrier"},
@@ -54,86 +47,25 @@
         {pos: [4, 1, 4], state: "minecraft:barrier"},
         {pos: [0, 2, 0], state: "minecraft:barrier"},
         {pos: [0, 2, 1], state: "minecraft:barrier"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
         {pos: [0, 2, 3], state: "minecraft:barrier"},
         {pos: [0, 2, 4], state: "minecraft:barrier"},
         {pos: [1, 2, 0], state: "minecraft:barrier"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
         {pos: [1, 2, 4], state: "minecraft:barrier"},
         {pos: [2, 2, 0], state: "minecraft:barrier"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
         {pos: [2, 2, 4], state: "minecraft:barrier"},
         {pos: [3, 2, 0], state: "minecraft:barrier"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
         {pos: [3, 2, 4], state: "minecraft:barrier"},
         {pos: [4, 2, 0], state: "minecraft:barrier"},
         {pos: [4, 2, 1], state: "minecraft:barrier"},
         {pos: [4, 2, 2], state: "minecraft:barrier"},
         {pos: [4, 2, 3], state: "minecraft:barrier"},
-        {pos: [4, 2, 4], state: "minecraft:barrier"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [4, 2, 4], state: "minecraft:barrier"}
     ],
     entities: [],
     palette: [
         "minecraft:obsidian",
         "minecraft:barrier",
         "minecraft:bone_block{axis:y}",
-        "minecraft:air",
         "computercraft:turtle_normal{facing:south,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.can_extract_items.snbt

@@ -0,0 +1,39 @@
+{
+    DataVersion: 3465,
+    size: [5, 5, 5],
+    data: [
+        {pos: [0, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [2, 1, 2], state: "minecraft:hopper{enabled:false,facing:down}", nbt: {Items: [], TransferCooldown: 0, id: "minecraft:hopper"}},
+        {pos: [2, 2, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {Items: [{Count: 1b, Slot: 1b, id: "computercraft:computer_normal"}], id: "computercraft:turtle_normal"}}
+    ],
+    entities: [],
+    palette: [
+        "minecraft:polished_andesite",
+        "minecraft:hopper{enabled:false,facing:down}",
+        "computercraft:turtle_normal{facing:south,waterlogged:false}"
+    ]
+}

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.can_insert_items.snbt

@@ -0,0 +1,39 @@
+{
+    DataVersion: 3465,
+    size: [5, 5, 5],
+    data: [
+        {pos: [0, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {id: "computercraft:turtle_normal"}},
+        {pos: [2, 2, 2], state: "minecraft:hopper{enabled:false,facing:down}", nbt: {Items: [{Count: 1b, Slot: 0b, id: "computercraft:computer_normal"}], TransferCooldown: 0, id: "minecraft:hopper"}}
+    ],
+    entities: [],
+    palette: [
+        "minecraft:polished_andesite",
+        "computercraft:turtle_normal{facing:south,waterlogged:false}",
+        "minecraft:hopper{enabled:false,facing:down}"
+    ]
+}

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.cleaned_with_cauldrons.snbt

@@ -11,29 +11,12 @@
         {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
         {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
         {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
         {pos: [1, 1, 0], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "computercraft:turtle_normal", tag: {Color: 13388876, ComputerId: 0, display: {Name: '{"text":"Clean turtle"}'}}}], Label: "turtle_test.cleaned_with_cauldrons", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [1, 1, 1], state: "minecraft:water_cauldron{level:3}"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"}
+        {pos: [1, 1, 1], state: "minecraft:water_cauldron{level:3}"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "minecraft:water_cauldron{level:3}",
         "computercraft:turtle_normal{facing:south,waterlogged:false}"
     ]

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.craft.snbt

@@ -27,111 +27,11 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:north,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 2b, Slot: 0b, id: "minecraft:diamond"}, {Count: 2b, Slot: 1b, id: "minecraft:diamond"}, {Count: 2b, Slot: 2b, id: "minecraft:diamond"}, {Count: 2b, Slot: 5b, id: "minecraft:stick"}, {Count: 2b, Slot: 9b, id: "minecraft:stick"}], Label: "turtle_test.craft", LeftUpgrade: "minecraft:crafting_table", LeftUpgradeNbt: {}, On: 1b, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:north,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 2b, Slot: 0b, id: "minecraft:diamond"}, {Count: 2b, Slot: 1b, id: "minecraft:diamond"}, {Count: 2b, Slot: 2b, id: "minecraft:diamond"}, {Count: 2b, Slot: 5b, id: "minecraft:stick"}, {Count: 2b, Slot: 9b, id: "minecraft:stick"}], Label: "turtle_test.craft", LeftUpgrade: "minecraft:crafting_table", LeftUpgradeNbt: {}, On: 1b, Slot: 0, id: "computercraft:turtle_normal"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:turtle_normal{facing:north,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.craft_offset.snbt

@@ -27,111 +27,11 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [], Label: "turtle_test.craft_offset", LeftUpgrade: "minecraft:crafting_table", LeftUpgradeNbt: {}, On: 1b, Owner: {LowerId: -9198338595628574826L, Name: "Player630", UpperId: -2783603765457764926L}, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [], Label: "turtle_test.craft_offset", LeftUpgrade: "minecraft:crafting_table", LeftUpgradeNbt: {}, On: 1b, Owner: {LowerId: -9198338595628574826L, Name: "Player630", UpperId: -2783603765457764926L}, Slot: 0, id: "computercraft:turtle_normal"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:turtle_normal{facing:south,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.craft_remainder.snbt

@@ -27,111 +27,11 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:north,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "computercraft:turtle_normal", tag: {Color: 13388876}}, {Count: 1b, Slot: 1b, id: "minecraft:wet_sponge"}], Label: "turtle_test.craft_remainder", LeftUpgrade: "minecraft:crafting_table", LeftUpgradeNbt: {}, On: 1b, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:north,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "computercraft:turtle_normal", tag: {Color: 13388876}}, {Count: 1b, Slot: 1b, id: "minecraft:wet_sponge"}], Label: "turtle_test.craft_remainder", LeftUpgrade: "minecraft:crafting_table", LeftUpgradeNbt: {}, On: 1b, Slot: 0, id: "computercraft:turtle_normal"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:turtle_normal{facing:north,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.craft_shapeless.snbt

@@ -27,111 +27,11 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:north,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "minecraft:ender_pearl"}, {Count: 1b, Slot: 1b, id: "minecraft:blaze_powder"}], Label: "turtle_test.craft_shapeless", LeftUpgrade: "minecraft:crafting_table", LeftUpgradeNbt: {}, On: 1b, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:turtle_normal{facing:north,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.data_fixers.snbt

@@ -11,29 +11,11 @@
         {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
         {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
         {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
         {pos: [1, 1, 1], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 123, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "computercraft:turtle_normal", tag: {ComputerId: 123, LeftUpgrade: "minecraft:diamond_pickaxe", Overlay: "computercraft:block/turtle_trans_overlay"}}], LeftUpgrade: "minecraft:diamond_pickaxe", LeftUpgradeNbt: {}, On: 0b, Overlay: "computercraft:block/turtle_trans_overlay", Owner: {LowerId: -4770154215762454977L, Name: "Player436", UpperId: 114963728012426084L}, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:turtle_normal{facing:south,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.dig_breaks_tool.snbt

@@ -27,112 +27,13 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 80, Items: [], Label: "turtle_test.dig_breaks_tool", LeftUpgrade: {id: "cctest:wooden_pickaxe", components: {"minecraft:damage": 58}}, On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [2, 1, 3], state: "minecraft:stone"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 3], state: "minecraft:stone"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
         "minecraft:stone",
-        "minecraft:air",
         "computercraft:turtle_normal{facing:south,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.dig_consume_durability.snbt

@@ -27,112 +27,13 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 80, Items: [], Label: "turtle_test.dig_consume_durability", LeftUpgrade: "cctest:wooden_pickaxe", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [2, 1, 3], state: "minecraft:stone"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 3], state: "minecraft:stone"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
         "minecraft:stone",
-        "minecraft:air",
         "computercraft:turtle_normal{facing:south,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.dig_enchanted_consume_durability.snbt

@@ -27,112 +27,13 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 80, Items: [], Label: "turtle_test.dig_enchanted_consume_durability", LeftUpgrade: {id: "cctest:netherite_pickaxe", components: {"minecraft:enchantments": {levels: {"minecraft:silk_touch": 1}}}}, On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [2, 1, 3], state: "minecraft:stone"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 3], state: "minecraft:stone"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
         "minecraft:stone",
-        "minecraft:air",
         "computercraft:turtle_normal{facing:south,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.drop_into_chest.snbt

@@ -27,111 +27,12 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 64b, Slot: 0b, id: "minecraft:dirt"}, {Count: 32b, Slot: 2b, id: "minecraft:dirt"}], Label: "turtle_test.drop_into_chest", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [2, 1, 3], state: "minecraft:chest{facing:west,type:single,waterlogged:false}", nbt: {Items: [{Count: 16b, Slot: 0b, id: "minecraft:dirt"}], id: "minecraft:chest"}},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 3], state: "minecraft:chest{facing:west,type:single,waterlogged:false}", nbt: {Items: [{Count: 16b, Slot: 0b, id: "minecraft:dirt"}], id: "minecraft:chest"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:turtle_normal{facing:south,waterlogged:false}",
         "minecraft:chest{facing:west,type:single,waterlogged:false}"
     ]

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.drop_into_entity.snbt

@@ -27,113 +27,16 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
         {pos: [1, 1, 3], state: "minecraft:polished_andesite"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 64b, Slot: 0b, id: "minecraft:dirt"}], Label: "turtle_test.drop_into_entity", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
         {pos: [2, 1, 3], state: "minecraft:powered_rail{powered:false,shape:east_west,waterlogged:false}"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:polished_andesite"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [3, 1, 3], state: "minecraft:polished_andesite"}
     ],
     entities: [
         {blockPos: [2, 1, 3], pos: [2.5d, 1.0625d, 3.5d], nbt: {Air: 300s, CanUpdate: 1b, FallDistance: 0.0f, Fire: -1s, Invulnerable: 0b, Items: [{Count: 16b, Slot: 0b, id: "minecraft:dirt"}], Motion: [0.0d, 0.0d, 0.0d], OnGround: 0b, PortalCooldown: 0, Pos: [76.5d, -57.9375d, 24.5d], Rotation: [0.0f, 0.0f], UUID: [I; 248684729, -1164292658, -1115871518, 1954015777], id: "minecraft:chest_minecart"}}
     ],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "minecraft:powered_rail{powered:false,shape:east_west,waterlogged:false}",
         "computercraft:turtle_normal{facing:south,waterlogged:false}"
     ]

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.equip_tool.snbt

@@ -27,111 +27,11 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:north,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "minecraft:diamond_pickaxe"}], Label: "turtle_test.equip_tool", On: 1b, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:north,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "minecraft:diamond_pickaxe"}], Label: "turtle_test.equip_tool", On: 1b, Slot: 0, id: "computercraft:turtle_normal"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:turtle_normal{facing:north,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.gather_lava.snbt

@@ -27,113 +27,22 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
         {pos: [1, 1, 1], state: "minecraft:white_stained_glass"},
         {pos: [1, 1, 2], state: "minecraft:white_stained_glass"},
         {pos: [1, 1, 3], state: "minecraft:white_stained_glass"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
         {pos: [2, 1, 1], state: "minecraft:white_stained_glass"},
         {pos: [2, 1, 2], state: "minecraft:lava{level:0}"},
         {pos: [2, 1, 3], state: "minecraft:white_stained_glass"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
         {pos: [3, 1, 1], state: "minecraft:white_stained_glass"},
         {pos: [3, 1, 2], state: "minecraft:white_stained_glass"},
         {pos: [3, 1, 3], state: "minecraft:white_stained_glass"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "minecraft:bucket"}], Label: "turtle_test.gather_lava", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 2, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "minecraft:bucket"}], Label: "turtle_test.gather_lava", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
         "minecraft:white_stained_glass",
-        "computercraft:turtle_normal{facing:south,waterlogged:false}",
-        "minecraft:air",
-        "minecraft:lava{level:0}"
+        "minecraft:lava{level:0}",
+        "computercraft:turtle_normal{facing:south,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.hoe_dirt.snbt

@@ -11,30 +11,13 @@
         {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
         {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
         {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
         {pos: [1, 1, 0], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [], Label: "turtle_test.hoe_dirt", LeftUpgrade: "minecraft:diamond_hoe", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [1, 1, 1], state: "minecraft:dirt"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"}
+        {pos: [1, 1, 1], state: "minecraft:dirt"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
         "minecraft:dirt",
-        "computercraft:turtle_normal{facing:south,waterlogged:false}",
-        "minecraft:air"
+        "computercraft:turtle_normal{facing:south,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.hoe_dirt_below.snbt

@@ -11,30 +11,12 @@
         {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
         {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
         {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [], Label: "turtle_test.hoe_dirt_below", LeftUpgrade: "minecraft:diamond_hoe", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"}
+        {pos: [1, 2, 1], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [], Label: "turtle_test.hoe_dirt_below", LeftUpgrade: "minecraft:diamond_hoe", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
         "minecraft:dirt",
-        "computercraft:turtle_normal{facing:south,waterlogged:false}",
-        "minecraft:air"
+        "computercraft:turtle_normal{facing:south,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.hoe_dirt_distant.snbt

@@ -11,30 +11,13 @@
         {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
         {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
         {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
         {pos: [1, 1, 0], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [], Label: "turtle_test.hoe_dirt_distant", LeftUpgrade: "minecraft:diamond_hoe", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:dirt"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"}
+        {pos: [1, 1, 2], state: "minecraft:dirt"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
         "minecraft:dirt",
-        "computercraft:turtle_normal{facing:south,waterlogged:false}",
-        "minecraft:air"
+        "computercraft:turtle_normal{facing:south,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.item_detail_provider.snbt

@@ -11,29 +11,11 @@
         {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
         {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
         {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "computercraft:printed_page", tag: {Color0: "fffffffffffffffffffffffff", Color1: "fffffffffffffffffffffffff", Color10: "fffffffffffffffffffffffff", Color11: "fffffffffffffffffffffffff", Color12: "fffffffffffffffffffffffff", Color13: "fffffffffffffffffffffffff", Color14: "fffffffffffffffffffffffff", Color15: "fffffffffffffffffffffffff", Color16: "fffffffffffffffffffffffff", Color17: "fffffffffffffffffffffffff", Color18: "fffffffffffffffffffffffff", Color19: "fffffffffffffffffffffffff", Color2: "fffffffffffffffffffffffff", Color20: "fffffffffffffffffffffffff", Color3: "fffffffffffffffffffffffff", Color4: "fffffffffffffffffffffffff", Color5: "fffffffffffffffffffffffff", Color6: "fffffffffffffffffffffffff", Color7: "fffffffffffffffffffffffff", Color8: "fffffffffffffffffffffffff", Color9: "fffffffffffffffffffffffff", Pages: 1, Text0: "Example                  ", Text1: "                         ", Text10: "                         ", Text11: "                         ", Text12: "                         ", Text13: "                         ", Text14: "                         ", Text15: "                         ", Text16: "                         ", Text17: "                         ", Text18: "                         ", Text19: "                         ", Text2: "                         ", Text20: "                         ", Text3: "                         ", Text4: "                         ", Text5: "                         ", Text6: "                         ", Text7: "                         ", Text8: "                         ", Text9: "                         ", Title: "Example page"}}], Label: "turtle_test.item_detail_provider", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"}
+        {pos: [1, 1, 0], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "computercraft:printed_page", tag: {Color0: "fffffffffffffffffffffffff", Color1: "fffffffffffffffffffffffff", Color10: "fffffffffffffffffffffffff", Color11: "fffffffffffffffffffffffff", Color12: "fffffffffffffffffffffffff", Color13: "fffffffffffffffffffffffff", Color14: "fffffffffffffffffffffffff", Color15: "fffffffffffffffffffffffff", Color16: "fffffffffffffffffffffffff", Color17: "fffffffffffffffffffffffff", Color18: "fffffffffffffffffffffffff", Color19: "fffffffffffffffffffffffff", Color2: "fffffffffffffffffffffffff", Color20: "fffffffffffffffffffffffff", Color3: "fffffffffffffffffffffffff", Color4: "fffffffffffffffffffffffff", Color5: "fffffffffffffffffffffffff", Color6: "fffffffffffffffffffffffff", Color7: "fffffffffffffffffffffffff", Color8: "fffffffffffffffffffffffff", Color9: "fffffffffffffffffffffffff", Pages: 1, Text0: "Example                  ", Text1: "                         ", Text10: "                         ", Text11: "                         ", Text12: "                         ", Text13: "                         ", Text14: "                         ", Text15: "                         ", Text16: "                         ", Text17: "                         ", Text18: "                         ", Text19: "                         ", Text2: "                         ", Text20: "                         ", Text3: "                         ", Text4: "                         ", Text5: "                         ", Text6: "                         ", Text7: "                         ", Text8: "                         ", Text9: "                         ", Title: "Example page"}}], Label: "turtle_test.item_detail_provider", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:turtle_normal{facing:south,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_obstruct.snbt

@@ -27,112 +27,13 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
         {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [], Label: "turtle_test.move_obstruct", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [2, 1, 3], state: "minecraft:dirt"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 3], state: "minecraft:dirt"}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
         "minecraft:dirt",
-        "minecraft:air",
         "computercraft:turtle_normal{facing:south,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_preserves_state.snbt

@@ -27,111 +27,11 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
-        {pos: [1, 1, 1], state: "minecraft:air"},
-        {pos: [1, 1, 2], state: "minecraft:air"},
-        {pos: [1, 1, 3], state: "minecraft:air"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
-        {pos: [2, 1, 1], state: "minecraft:air"},
-        {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Label: "turtle_test.move_preserves_state", Fuel: 80, Items: [{Count: 32b, Slot: 0b, id: "minecraft:dirt"}], On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
-        {pos: [2, 1, 3], state: "minecraft:air"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
-        {pos: [3, 1, 1], state: "minecraft:air"},
-        {pos: [3, 1, 2], state: "minecraft:air"},
-        {pos: [3, 1, 3], state: "minecraft:air"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
-        {pos: [1, 2, 1], state: "minecraft:air"},
-        {pos: [1, 2, 2], state: "minecraft:air"},
-        {pos: [1, 2, 3], state: "minecraft:air"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
-        {pos: [2, 2, 1], state: "minecraft:air"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
-        {pos: [2, 2, 3], state: "minecraft:air"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
-        {pos: [3, 2, 1], state: "minecraft:air"},
-        {pos: [3, 2, 2], state: "minecraft:air"},
-        {pos: [3, 2, 3], state: "minecraft:air"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
-        {pos: [1, 3, 1], state: "minecraft:air"},
-        {pos: [1, 3, 2], state: "minecraft:air"},
-        {pos: [1, 3, 3], state: "minecraft:air"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
-        {pos: [2, 3, 1], state: "minecraft:air"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
-        {pos: [2, 3, 3], state: "minecraft:air"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
-        {pos: [3, 3, 1], state: "minecraft:air"},
-        {pos: [3, 3, 2], state: "minecraft:air"},
-        {pos: [3, 3, 3], state: "minecraft:air"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
-        {pos: [1, 4, 1], state: "minecraft:air"},
-        {pos: [1, 4, 2], state: "minecraft:air"},
-        {pos: [1, 4, 3], state: "minecraft:air"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
-        {pos: [2, 4, 1], state: "minecraft:air"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
-        {pos: [2, 4, 3], state: "minecraft:air"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
-        {pos: [3, 4, 1], state: "minecraft:air"},
-        {pos: [3, 4, 2], state: "minecraft:air"},
-        {pos: [3, 4, 3], state: "minecraft:air"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 80, Items: [{Count: 32b, Slot: 0b, id: "minecraft:dirt"}], Label: "turtle_test.move_preserves_state", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}}
     ],
     entities: [],
     palette: [
         "minecraft:polished_andesite",
-        "minecraft:air",
         "computercraft:turtle_normal{facing:south,waterlogged:false}"
     ]
 }

projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_push_entity.snbt

@@ -27,106 +27,39 @@
         {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
         {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
-        {pos: [0, 1, 0], state: "minecraft:air"},
-        {pos: [0, 1, 1], state: "minecraft:air"},
-        {pos: [0, 1, 2], state: "minecraft:air"},
-        {pos: [0, 1, 3], state: "minecraft:air"},
-        {pos: [0, 1, 4], state: "minecraft:air"},
-        {pos: [1, 1, 0], state: "minecraft:air"},
         {pos: [1, 1, 1], state: "minecraft:white_stained_glass"},
         {pos: [1, 1, 2], state: "minecraft:white_stained_glass"},
         {pos: [1, 1, 3], state: "minecraft:white_stained_glass"},
-        {pos: [1, 1, 4], state: "minecraft:air"},
-        {pos: [2, 1, 0], state: "minecraft:air"},
         {pos: [2, 1, 1], state: "minecraft:white_stained_glass"},
-        {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:west,waterlogged:false}", nbt: {ComputerId: 1, Label: "turtle_test.move_push_entity", Fuel: 80, Items: [], On: 1b, Slot: 0, id: "computercraft:turtle_normal"}},
+        {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:west,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 80, Items: [], Label: "turtle_test.move_push_entity", On: 1b, Slot: 0, id: "computercraft:turtle_normal"}},
         {pos: [2, 1, 3], state: "minecraft:white_stained_glass"},
-        {pos: [2, 1, 4], state: "minecraft:air"},
-        {pos: [3, 1, 0], state: "minecraft:air"},
         {pos: [3, 1, 1], state: "minecraft:white_stained_glass"},
         {pos: [3, 1, 2], state: "minecraft:white_stained_glass"},
         {pos: [3, 1, 3], state: "minecraft:white_stained_glass"},
-        {pos: [3, 1, 4], state: "minecraft:air"},
-        {pos: [4, 1, 0], state: "minecraft:air"},
-        {pos: [4, 1, 1], state: "minecraft:air"},
-        {pos: [4, 1, 2], state: "minecraft:air"},
-        {pos: [4, 1, 3], state: "minecraft:air"},
-        {pos: [4, 1, 4], state: "minecraft:air"},
-        {pos: [0, 2, 0], state: "minecraft:air"},
-        {pos: [0, 2, 1], state: "minecraft:air"},
-        {pos: [0, 2, 2], state: "minecraft:air"},
-        {pos: [0, 2, 3], state: "minecraft:air"},
-        {pos: [0, 2, 4], state: "minecraft:air"},
-        {pos: [1, 2, 0], state: "minecraft:air"},
         {pos: [1, 2, 1], state: "minecraft:white_stained_glass"},
         {pos: [1, 2, 2], state: "minecraft:white_stained_glass"},
         {pos: [1, 2, 3], state: "minecraft:white_stained_glass"},
-        {pos: [1, 2, 4], state: "minecraft:air"},
-        {pos: [2, 2, 0], state: "minecraft:air"},
         {pos: [2, 2, 1], state: "minecraft:white_stained_glass"},
-        {pos: [2, 2, 2], state: "minecraft:air"},
         {pos: [2, 2, 3], state: "minecraft:white_stained_glass"},
-        {pos: [2, 2, 4], state: "minecraft:air"},
-        {pos: [3, 2, 0], state: "minecraft:air"},
         {pos: [3, 2, 1], state: "minecraft:white_stained_glass"},
         {pos: [3, 2, 2], state: "minecraft:white_stained_glass"},
         {pos: [3, 2, 3], state: "minecraft:white_stained_glass"},
-        {pos: [3, 2, 4], state: "minecraft:air"},
-        {pos: [4, 2, 0], state: "minecraft:air"},
-        {pos: [4, 2, 1], state: "minecraft:air"},
-        {pos: [4, 2, 2], state: "minecraft:air"},
-        {pos: [4, 2, 3], state: "minecraft:air"},
-        {pos: [4, 2, 4], state: "minecraft:air"},
-        {pos: [0, 3, 0], state: "minecraft:air"},
-        {pos: [0, 3, 1], state: "minecraft:air"},
-        {pos: [0, 3, 2], state: "minecraft:air"},
-        {pos: [0, 3, 3], state: "minecraft:air"},
-        {pos: [0, 3, 4], state: "minecraft:air"},
-        {pos: [1, 3, 0], state: "minecraft:air"},
         {pos: [1, 3, 1], state: "minecraft:white_stained_glass"},
         {pos: [1, 3, 2], state: "minecraft:white_stained_glass"},
         {pos: [1, 3, 3], state: "minecraft:white_stained_glass"},
-        {pos: [1, 3, 4], state: "minecraft:air"},
-        {pos: [2, 3, 0], state: "minecraft:air"},
         {pos: [2, 3, 1], state: "minecraft:white_stained_glass"},
-        {pos: [2, 3, 2], state: "minecraft:air"},
         {pos: [2, 3, 3], state: "minecraft:white_stained_glass"},
-        {pos: [2, 3, 4], state: "minecraft:air"},
-        {pos: [3, 3, 0], state: "minecraft:air"},
         {pos: [3, 3, 1], state: "minecraft:white_stained_glass"},
         {pos: [3, 3, 2], state: "minecraft:white_stained_glass"},
         {pos: [3, 3, 3], state: "minecraft:white_stained_glass"},
-        {pos: [3, 3, 4], state: "minecraft:air"},
-        {pos: [4, 3, 0], state: "minecraft:air"},
-        {pos: [4, 3, 1], state: "minecraft:air"},
-        {pos: [4, 3, 2], state: "minecraft:air"},
-        {pos: [4, 3, 3], state: "minecraft:air"},
-        {pos: [4, 3, 4], state: "minecraft:air"},
-        {pos: [0, 4, 0], state: "minecraft:air"},
-        {pos: [0, 4, 1], state: "minecraft:air"},
-        {pos: [0, 4, 2], state: "minecraft:air"},
-        {pos: [0, 4, 3], state: "minecraft:air"},
-        {pos: [0, 4, 4], state: "minecraft:air"},
-        {pos: [1, 4, 0], state: "minecraft:air"},
         {pos: [1, 4, 1], state: "minecraft:white_stained_glass"},
         {pos: [1, 4, 2], state: "minecraft:white_stained_glass"},
         {pos: [1, 4, 3], state: "minecraft:white_stained_glass"},
-        {pos: [1, 4, 4], state: "minecraft:air"},
-        {pos: [2, 4, 0], state: "minecraft:air"},
         {pos: [2, 4, 1], state: "minecraft:white_stained_glass"},
-        {pos: [2, 4, 2], state: "minecraft:air"},
         {pos: [2, 4, 3], state: "minecraft:white_stained_glass"},
-        {pos: [2, 4, 4], state: "minecraft:air"},
-        {pos: [3, 4, 0], state: "minecraft:air"},
         {pos: [3, 4, 1], state: "minecraft:white_stained_glass"},
         {pos: [3, 4, 2], state: "minecraft:white_stained_glass"},
-        {pos: [3, 4, 3], state: "minecraft:white_stained_glass"},
-        {pos: [3, 4, 4], state: "minecraft:air"},
-        {pos: [4, 4, 0], state: "minecraft:air"},
-        {pos: [4, 4, 1], state: "minecraft:air"},
-        {pos: [4, 4, 2], state: "minecraft:air"},
-        {pos: [4, 4, 3], state: "minecraft:air"},
-        {pos: [4, 4, 4], state: "minecraft:air"}
+        {pos: [3, 4, 3], state: "minecraft:white_stained_glass"}
     ],
     entities: [
         {blockPos: [2, 1, 2], pos: [2.5d, 1.875d, 2.5d], nbt: {AbsorptionAmount: 0.0f, Age: 0, Air: 300s, ArmorDropChances: [0.085f, 0.085f, 0.085f, 0.085f], ArmorItems: [{}, {}, {}, {}], Attributes: [{Base: 0.5d, Name: "minecraft:generic.movement_speed"}, {Base: 48.0d, Modifiers: [{Amount: -0.01165046535152748d, Name: "Random spawn bonus", Operation: 1, UUID: [I; 1412502412, 1522745411, -1211155694, 2103054347]}], Name: "minecraft:generic.follow_range"}], Brain: {memories: {}}, CanPickUpLoot: 1b, DeathTime: 0s, FallDistance: 0.0f, FallFlying: 0b, Fire: -1s, FoodLevel: 0b, ForcedAge: 0, Gossips: [], HandDropChances: [0.085f, 0.085f], HandItems: [{}, {}], Health: 20.0f, HurtByTimestamp: 0, HurtTime: 0s, Inventory: [], Invulnerable: 0b, LastGossipDecay: 52357L, LastRestock: 0L, LeftHanded: 0b, Motion: [0.0d, -0.0784000015258789d, 0.0d], OnGround: 1b, PersistenceRequired: 0b, PortalCooldown: 0, Pos: [-33.5d, 58.875d, -21.5d], RestocksToday: 0, Rotation: [-102.704926f, 0.0f], UUID: [I; 164071932, -867285780, -1817215456, -2129864016], VillagerData: {level: 1, profession: "minecraft:none", type: "minecraft:desert"}, Xp: 0, id: "minecraft:villager"}}
@@ -134,7 +67,6 @@
     palette: [
         "minecraft:polished_andesite",
         "minecraft:white_stained_glass",
-        "minecraft:air",
         "computercraft:turtle_normal{facing:west,waterlogged:false}"
     ]
 }