diff --git a/projects/common/src/testMod/java/dan200/computercraft/gametest/core/CCTestCommand.java b/projects/common/src/testMod/java/dan200/computercraft/gametest/core/CCTestCommand.java index d3b7f285e..c4418bc12 100644 --- a/projects/common/src/testMod/java/dan200/computercraft/gametest/core/CCTestCommand.java +++ b/projects/common/src/testMod/java/dan200/computercraft/gametest/core/CCTestCommand.java @@ -54,7 +54,7 @@ class CCTestCommand { })) .then(literal("regen-structures").executes(context -> { for (var function : GameTestRegistry.getAllTestFunctions()) { - dispatcher.execute("test import " + function.getTestName(), context.getSource()); + dispatcher.execute("test import " + function.getStructureName(), context.getSource()); TestCommandAccessor.callExportTestStructure(context.getSource(), function.getStructureName()); } return 0; diff --git a/projects/common/src/testMod/java/dan200/computercraft/mixin/gametest/NbtUtilsMixin.java b/projects/common/src/testMod/java/dan200/computercraft/mixin/gametest/NbtUtilsMixin.java new file mode 100644 index 000000000..726ae2a2e --- /dev/null +++ b/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 StructureUtilsMixin 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 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)); + } +} diff --git a/projects/common/src/testMod/java/dan200/computercraft/mixin/gametest/StructureTemplateAccessor.java b/projects/common/src/testMod/java/dan200/computercraft/mixin/gametest/StructureTemplateAccessor.java new file mode 100644 index 000000000..a7aa795f7 --- /dev/null +++ b/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 getPalettes(); +} diff --git a/projects/common/src/testMod/java/dan200/computercraft/mixin/gametest/StructureUtilsMixin.java b/projects/common/src/testMod/java/dan200/computercraft/mixin/gametest/StructureUtilsMixin.java new file mode 100644 index 000000000..b93561305 --- /dev/null +++ b/projects/common/src/testMod/java/dan200/computercraft/mixin/gametest/StructureUtilsMixin.java @@ -0,0 +1,55 @@ +// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers +// +// SPDX-License-Identifier: MPL-2.0 + +package dan200.computercraft.mixin.gametest; + +import net.minecraft.core.BlockPos; +import net.minecraft.gametest.framework.StructureUtils; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate; +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.HashSet; +import java.util.Set; + +/** + * Add missing {@link Blocks#AIR} to our "reduced" game test structures. + * + * @see NbtUtilsMixin Saving structures + * @see StructureUtils#getStructureTemplate(String, ServerLevel) + */ +@Mixin(StructureUtils.class) +class StructureUtilsMixin { + @Inject( + method = "getStructureTemplate", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager;readStructure(Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate;", + shift = At.Shift.AFTER + ) + ) + @SuppressWarnings("unused") + private static void getStructureTemplate(String structureName, ServerLevel serverLevel, CallbackInfoReturnable ci) { + var template = ci.getReturnValue(); + var size = template.getSize(); + var palette = ((StructureTemplateAccessor) template).getPalettes().get(0); + + Set 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)); + } + } +} diff --git a/projects/common/src/testMod/kotlin/dan200/computercraft/gametest/core/TestHooks.kt b/projects/common/src/testMod/kotlin/dan200/computercraft/gametest/core/TestHooks.kt index d18cda24a..02b690ee3 100644 --- a/projects/common/src/testMod/kotlin/dan200/computercraft/gametest/core/TestHooks.kt +++ b/projects/common/src/testMod/kotlin/dan200/computercraft/gametest/core/TestHooks.kt @@ -21,6 +21,7 @@ import net.minecraft.world.level.Level import net.minecraft.world.level.LevelAccessor import net.minecraft.world.level.block.Blocks 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 @@ -42,6 +43,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 @@ -73,6 +77,8 @@ object TestHooks { LOG.info("Cleaning up after last run") GameTestRunner.clearAllTests(server.overworld(), BlockPos(0, -60, 0), GameTestTicker.SINGLETON, 200) + structureManager = server.structureManager + ManagedComputers.reset() // Delete server context and add one with a mutable machine factory. This allows us to set the factory for diff --git a/projects/common/src/testMod/resources/computercraft-gametest.mixins.json b/projects/common/src/testMod/resources/computercraft-gametest.mixins.json index cea7fae8e..9488721fb 100644 --- a/projects/common/src/testMod/resources/computercraft-gametest.mixins.json +++ b/projects/common/src/testMod/resources/computercraft-gametest.mixins.json @@ -12,6 +12,9 @@ "GameTestSequenceAccessor", "GameTestSequenceMixin", "GameTestServerMixin", + "NbtUtilsMixin", + "StructureTemplateAccessor", + "StructureUtilsMixin", "TestCommandAccessor" ], "client": [ diff --git a/projects/common/src/testMod/resources/data/cctest/structures/computer_test.chest_resizes_on_change.snbt b/projects/common/src/testMod/resources/data/cctest/structures/computer_test.chest_resizes_on_change.snbt index 877e24bdd..d3948ddb5 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/computer_test.chest_resizes_on_change.snbt +++ b/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}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/computer_test.drops_on_explosion.snbt b/projects/common/src/testMod/resources/data/cctest/structures/computer_test.drops_on_explosion.snbt index bc64fcd09..4432a8474 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/computer_test.drops_on_explosion.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/computer_test.no_through_signal.snbt b/projects/common/src/testMod/resources/data/cctest/structures/computer_test.no_through_signal.snbt index 58c570746..e739d74bd 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/computer_test.no_through_signal.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/computer_test.no_through_signal_reverse.snbt b/projects/common/src/testMod/resources/data/cctest/structures/computer_test.no_through_signal_reverse.snbt index 592ccefaa..3f11f0492 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/computer_test.no_through_signal_reverse.snbt +++ b/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}", diff --git a/projects/common/src/testMod/resources/data/cctest/structures/computer_test.open_on_client.snbt b/projects/common/src/testMod/resources/data/cctest/structures/computer_test.open_on_client.snbt index 7cc11ed3f..6b92064b5 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/computer_test.open_on_client.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/computer_test.self_output_update.snbt b/projects/common/src/testMod/resources/data/cctest/structures/computer_test.self_output_update.snbt index d0dab68cf..1fb0a3a4a 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/computer_test.self_output_update.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/computer_test.set_and_destroy.snbt b/projects/common/src/testMod/resources/data/cctest/structures/computer_test.set_and_destroy.snbt index c9dcb29c8..23cbebd01 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/computer_test.set_and_destroy.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/craftos_test.sends_basic_rednet_messages.snbt b/projects/common/src/testMod/resources/data/cctest/structures/craftos_test.sends_basic_rednet_messages.snbt index 40c0c4854..511b16a1a 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/craftos_test.sends_basic_rednet_messages.snbt +++ b/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}" diff --git a/projects/common/src/testMod/resources/data/cctest/structures/default.snbt b/projects/common/src/testMod/resources/data/cctest/structures/default.snbt index 6bbbe27a5..9fbd909c1 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/default.snbt +++ b/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" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.adds_removes_mount.snbt b/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.adds_removes_mount.snbt index 207e6cd34..98af30136 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.adds_removes_mount.snbt +++ b/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}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.audio_disk.snbt b/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.audio_disk.snbt index 95da26f01..ff4232f81 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.audio_disk.snbt +++ b/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}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.audio_title_when_empty.snbt b/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.audio_title_when_empty.snbt index 9583c510b..0adfe2a8e 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.audio_title_when_empty.snbt +++ b/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}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.comparator.snbt b/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.comparator.snbt index 278871a50..dc8f44903 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.comparator.snbt +++ b/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}" diff --git a/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.contents_updates_state.snbt b/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.contents_updates_state.snbt index 2add8c4f5..e71d17ebf 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.contents_updates_state.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.creates_disk_id.snbt b/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.creates_disk_id.snbt index dd6b9630f..70094733b 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.creates_disk_id.snbt +++ b/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}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.drops_contents.snbt b/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.drops_contents.snbt index e94dc4311..2588246f9 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.drops_contents.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.ejects_disk.snbt b/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.ejects_disk.snbt index d3576a9c4..5c6a2f804 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.ejects_disk.snbt +++ b/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}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.queues_event.snbt b/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.queues_event.snbt index be71c4493..537ad9357 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/disk_drive_test.queues_event.snbt +++ b/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}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/inventory_test.checks_valid_item.snbt b/projects/common/src/testMod/resources/data/cctest/structures/inventory_test.checks_valid_item.snbt index c8f9d1731..3c4057212 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/inventory_test.checks_valid_item.snbt +++ b/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}", diff --git a/projects/common/src/testMod/resources/data/cctest/structures/inventory_test.double_chest_size.snbt b/projects/common/src/testMod/resources/data/cctest/structures/inventory_test.double_chest_size.snbt index 9517e202c..5694e8df2 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/inventory_test.double_chest_size.snbt +++ b/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}" diff --git a/projects/common/src/testMod/resources/data/cctest/structures/inventory_test.fails_on_full.snbt b/projects/common/src/testMod/resources/data/cctest/structures/inventory_test.fails_on_full.snbt index ee6e88bb0..135b4f03a 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/inventory_test.fails_on_full.snbt +++ b/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}", diff --git a/projects/common/src/testMod/resources/data/cctest/structures/modem_test.cable_modem_does_not_report_self.snbt b/projects/common/src/testMod/resources/data/cctest/structures/modem_test.cable_modem_does_not_report_self.snbt index 9d37cf778..3d59111ec 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/modem_test.cable_modem_does_not_report_self.snbt +++ b/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}" diff --git a/projects/common/src/testMod/resources/data/cctest/structures/modem_test.chest_resizes_on_change.snbt b/projects/common/src/testMod/resources/data/cctest/structures/modem_test.chest_resizes_on_change.snbt index b5fbf4cf8..697621e9a 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/modem_test.chest_resizes_on_change.snbt +++ b/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}" diff --git a/projects/common/src/testMod/resources/data/cctest/structures/modem_test.full_block_modem_does_not_report_self.snbt b/projects/common/src/testMod/resources/data/cctest/structures/modem_test.full_block_modem_does_not_report_self.snbt index 3c8aa88a0..a8c2df09b 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/modem_test.full_block_modem_does_not_report_self.snbt +++ b/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}" diff --git a/projects/common/src/testMod/resources/data/cctest/structures/modem_test.full_modems_form_networks.snbt b/projects/common/src/testMod/resources/data/cctest/structures/modem_test.full_modems_form_networks.snbt index eb5f09031..65eeaff29 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/modem_test.full_modems_form_networks.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/modem_test.gains_peripherals.snbt b/projects/common/src/testMod/resources/data/cctest/structures/modem_test.gains_peripherals.snbt index afb1e3ad7..13f77bcce 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/modem_test.gains_peripherals.snbt +++ b/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}", diff --git a/projects/common/src/testMod/resources/data/cctest/structures/modem_test.have_peripherals.snbt b/projects/common/src/testMod/resources/data/cctest/structures/modem_test.have_peripherals.snbt index ffbb2819a..0ecae8256 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/modem_test.have_peripherals.snbt +++ b/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}", diff --git a/projects/common/src/testMod/resources/data/cctest/structures/modem_test.modem_drops_when_neighbour_removed.snbt b/projects/common/src/testMod/resources/data/cctest/structures/modem_test.modem_drops_when_neighbour_removed.snbt index 3007188a3..c3d8bae95 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/modem_test.modem_drops_when_neighbour_removed.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/modem_test.modem_keeps_cable_when_neighbour_removed.snbt b/projects/common/src/testMod/resources/data/cctest/structures/modem_test.modem_keeps_cable_when_neighbour_removed.snbt index be462dd2c..3ab9b51f2 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/modem_test.modem_keeps_cable_when_neighbour_removed.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/modem_test.transmits_messages.snbt b/projects/common/src/testMod/resources/data/cctest/structures/modem_test.transmits_messages.snbt index 79ed20b01..5cf2eb0b6 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/modem_test.transmits_messages.snbt +++ b/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}", diff --git a/projects/common/src/testMod/resources/data/cctest/structures/monitor_test.contract_on_destroy.snbt b/projects/common/src/testMod/resources/data/cctest/structures/monitor_test.contract_on_destroy.snbt index ac59155b0..5f7b96658 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/monitor_test.contract_on_destroy.snbt +++ b/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}" diff --git a/projects/common/src/testMod/resources/data/cctest/structures/monitor_test.creates_terminal.snbt b/projects/common/src/testMod/resources/data/cctest/structures/monitor_test.creates_terminal.snbt index 83f4fcea8..720d25829 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/monitor_test.creates_terminal.snbt +++ b/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}" diff --git a/projects/common/src/testMod/resources/data/cctest/structures/monitor_test.ensures_valid_on_place.snbt b/projects/common/src/testMod/resources/data/cctest/structures/monitor_test.ensures_valid_on_place.snbt index ff0a97bf1..62076aea4 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/monitor_test.ensures_valid_on_place.snbt +++ b/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" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/monitor_test.looks_acceptable.snbt b/projects/common/src/testMod/resources/data/cctest/structures/monitor_test.looks_acceptable.snbt deleted file mode 100644 index f8c60dc15..000000000 --- a/projects/common/src/testMod/resources/data/cctest/structures/monitor_test.looks_acceptable.snbt +++ /dev/null @@ -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}" - ] -} diff --git a/projects/common/src/testMod/resources/data/cctest/structures/monitor_test.looks_acceptable_dark.snbt b/projects/common/src/testMod/resources/data/cctest/structures/monitor_test.looks_acceptable_dark.snbt deleted file mode 100644 index 1bbce9d32..000000000 --- a/projects/common/src/testMod/resources/data/cctest/structures/monitor_test.looks_acceptable_dark.snbt +++ /dev/null @@ -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}" - ] -} diff --git a/projects/common/src/testMod/resources/data/cctest/structures/monitor_test.render_monitor.snbt b/projects/common/src/testMod/resources/data/cctest/structures/monitor_test.render_monitor.snbt index 832128116..94d4c5542 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/monitor_test.render_monitor.snbt +++ b/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}", diff --git a/projects/common/src/testMod/resources/data/cctest/structures/printer_test.comparator.snbt b/projects/common/src/testMod/resources/data/cctest/structures/printer_test.comparator.snbt index 4d68c3f1d..6be057869 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/printer_test.comparator.snbt +++ b/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}" diff --git a/projects/common/src/testMod/resources/data/cctest/structures/printer_test.drops_contents.snbt b/projects/common/src/testMod/resources/data/cctest/structures/printer_test.drops_contents.snbt index 2ed581375..9ffbf7273 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/printer_test.drops_contents.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/printer_test.empty.snbt b/projects/common/src/testMod/resources/data/cctest/structures/printer_test.empty.snbt index ca594ce80..6228028a2 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/printer_test.empty.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/printer_test.no_print_when_full.snbt b/projects/common/src/testMod/resources/data/cctest/structures/printer_test.no_print_when_full.snbt index 7a742b2fc..9fc7d5808 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/printer_test.no_print_when_full.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/printer_test.no_print_when_full.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:true,facing:north,top:true}", nbt: {Items: [{Count: 1b, Slot: 0b, id: "minecraft:black_dye"}, {Count: 1b, Slot: 1b, id: "minecraft:paper"}, {Count: 1b, Slot: 7b, 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: " ", Text1: " ", Text10: " ", Text11: " ", Text12: " ", Text13: " ", Text14: " ", Text15: " ", Text16: " ", Text17: " ", Text18: " ", Text19: " ", Text2: " ", Text20: " ", Text3: " ", Text4: " ", Text5: " ", Text6: " ", Text7: " ", Text8: " ", Text9: " ", Title: ""}}, {Count: 1b, Slot: 8b, 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: " ", Text1: " ", Text10: " ", Text11: " ", Text12: " ", Text13: " ", Text14: " ", Text15: " ", Text16: " ", Text17: " ", Text18: " ", Text19: " ", Text2: " ", Text20: " ", Text3: " ", Text4: " ", Text5: " ", Text6: " ", Text7: " ", Text8: " ", Text9: " ", Title: ""}}, {Count: 1b, Slot: 9b, 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: " ", Text1: " ", Text10: " ", Text11: " ", Text12: " ", Text13: " ", Text14: " ", Text15: " ", Text16: " ", Text17: " ", Text18: " ", Text19: " ", Text2: " ", Text20: " ", Text3: " ", Text4: " ", Text5: " ", Text6: " ", Text7: " ", Text8: " ", Text9: " ", Title: ""}}, {Count: 1b, Slot: 10b, 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: " ", Text1: " ", Text10: " ", Text11: " ", Text12: " ", Text13: " ", Text14: " ", Text15: " ", Text16: " ", Text17: " ", Text18: " ", Text19: " ", Text2: " ", Text20: " ", Text3: " ", Text4: " ", Text5: " ", Text6: " ", Text7: " ", Text8: " ", Text9: " ", Title: ""}}, {Count: 1b, Slot: 11b, 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: " ", Text1: " ", Text10: " ", Text11: " ", Text12: " ", Text13: " ", Text14: " ", Text15: " ", Text16: " ", Text17: " ", Text18: " ", Text19: " ", Text2: " ", Text20: " ", Text3: " ", Text4: " ", Text5: " ", Text6: " ", Text7: " ", Text8: " ", Text9: " ", Title: ""}}, {Count: 1b, Slot: 12b, 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: " ", Text1: " ", Text10: " ", Text11: " ", Text12: " ", Text13: " ", Text14: " ", Text15: " ", Text16: " ", Text17: " ", Text18: " ", Text19: " ", Text2: " ", Text20: " ", Text3: " ", Text4: " ", Text5: " ", Text6: " ", Text7: " ", Text8: " ", Text9: " ", Title: ""}}], 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: 15, term_textColour_0: "fffffffffffffffffffffffff", term_textColour_1: "fffffffffffffffffffffffff", term_textColour_10: "fffffffffffffffffffffffff", term_textColour_11: "fffffffffffffffffffffffff", term_textColour_12: "fffffffffffffffffffffffff", term_textColour_13: "fffffffffffffffffffffffff", term_textColour_14: "fffffffffffffffffffffffff", term_textColour_15: "fffffffffffffffffffffffff", term_textColour_16: "fffffffffffffffffffffffff", term_textColour_17: "fffffffffffffffffffffffff", term_textColour_18: "fffffffffffffffffffffffff", term_textColour_19: "fffffffffffffffffffffffff", term_textColour_2: "fffffffffffffffffffffffff", term_textColour_20: "fffffffffffffffffffffffff", term_textColour_3: "fffffffffffffffffffffffff", term_textColour_4: "fffffffffffffffffffffffff", term_textColour_5: "fffffffffffffffffffffffff", term_textColour_6: "fffffffffffffffffffffffff", term_textColour_7: "fffffffffffffffffffffffff", term_textColour_8: "fffffffffffffffffffffffff", term_textColour_9: "fffffffffffffffffffffffff", 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:true,facing:north,top:true}", nbt: {Items: [{Count: 1b, Slot: 0b, id: "minecraft:black_dye"}, {Count: 1b, Slot: 1b, id: "minecraft:paper"}, {Count: 1b, Slot: 7b, 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: " ", Text1: " ", Text10: " ", Text11: " ", Text12: " ", Text13: " ", Text14: " ", Text15: " ", Text16: " ", Text17: " ", Text18: " ", Text19: " ", Text2: " ", Text20: " ", Text3: " ", Text4: " ", Text5: " ", Text6: " ", Text7: " ", Text8: " ", Text9: " ", Title: ""}}, {Count: 1b, Slot: 8b, 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: " ", Text1: " ", Text10: " ", Text11: " ", Text12: " ", Text13: " ", Text14: " ", Text15: " ", Text16: " ", Text17: " ", Text18: " ", Text19: " ", Text2: " ", Text20: " ", Text3: " ", Text4: " ", Text5: " ", Text6: " ", Text7: " ", Text8: " ", Text9: " ", Title: ""}}, {Count: 1b, Slot: 9b, 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: " ", Text1: " ", Text10: " ", Text11: " ", Text12: " ", Text13: " ", Text14: " ", Text15: " ", Text16: " ", Text17: " ", Text18: " ", Text19: " ", Text2: " ", Text20: " ", Text3: " ", Text4: " ", Text5: " ", Text6: " ", Text7: " ", Text8: " ", Text9: " ", Title: ""}}, {Count: 1b, Slot: 10b, 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: " ", Text1: " ", Text10: " ", Text11: " ", Text12: " ", Text13: " ", Text14: " ", Text15: " ", Text16: " ", Text17: " ", Text18: " ", Text19: " ", Text2: " ", Text20: " ", Text3: " ", Text4: " ", Text5: " ", Text6: " ", Text7: " ", Text8: " ", Text9: " ", Title: ""}}, {Count: 1b, Slot: 11b, 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: " ", Text1: " ", Text10: " ", Text11: " ", Text12: " ", Text13: " ", Text14: " ", Text15: " ", Text16: " ", Text17: " ", Text18: " ", Text19: " ", Text2: " ", Text20: " ", Text3: " ", Text4: " ", Text5: " ", Text6: " ", Text7: " ", Text8: " ", Text9: " ", Title: ""}}, {Count: 1b, Slot: 12b, 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: " ", Text1: " ", Text10: " ", Text11: " ", Text12: " ", Text13: " ", Text14: " ", Text15: " ", Text16: " ", Text17: " ", Text18: " ", Text19: " ", Text2: " ", Text20: " ", Text3: " ", Text4: " ", Text5: " ", Text6: " ", Text7: " ", Text8: " ", Text9: " ", Title: ""}}], 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: 15, term_textColour_0: "fffffffffffffffffffffffff", term_textColour_1: "fffffffffffffffffffffffff", term_textColour_10: "fffffffffffffffffffffffff", term_textColour_11: "fffffffffffffffffffffffff", term_textColour_12: "fffffffffffffffffffffffff", term_textColour_13: "fffffffffffffffffffffffff", term_textColour_14: "fffffffffffffffffffffffff", term_textColour_15: "fffffffffffffffffffffffff", term_textColour_16: "fffffffffffffffffffffffff", term_textColour_17: "fffffffffffffffffffffffff", term_textColour_18: "fffffffffffffffffffffffff", term_textColour_19: "fffffffffffffffffffffffff", term_textColour_2: "fffffffffffffffffffffffff", term_textColour_20: "fffffffffffffffffffffffff", term_textColour_3: "fffffffffffffffffffffffff", term_textColour_4: "fffffffffffffffffffffffff", term_textColour_5: "fffffffffffffffffffffffff", term_textColour_6: "fffffffffffffffffffffffff", term_textColour_7: "fffffffffffffffffffffffff", term_textColour_8: "fffffffffffffffffffffffff", term_textColour_9: "fffffffffffffffffffffffff", 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:true,facing:north,top:true}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/printout_test.render_in_frame.snbt b/projects/common/src/testMod/resources/data/cctest/structures/printout_test.render_in_frame.snbt index 779f6c8b0..0da90d3cc 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/printout_test.render_in_frame.snbt +++ b/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" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/relay_test.no_through_signal.snbt b/projects/common/src/testMod/resources/data/cctest/structures/relay_test.no_through_signal.snbt index 008775e56..6d3a03521 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/relay_test.no_through_signal.snbt +++ b/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}" diff --git a/projects/common/src/testMod/resources/data/cctest/structures/relay_test.no_through_signal_reverse.snbt b/projects/common/src/testMod/resources/data/cctest/structures/relay_test.no_through_signal_reverse.snbt index d49021b89..13e362ceb 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/relay_test.no_through_signal_reverse.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/relay_test.self_output_update.snbt b/projects/common/src/testMod/resources/data/cctest/structures/relay_test.self_output_update.snbt index c0aacd1f4..21f97d470 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/relay_test.self_output_update.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/relay_test.set_and_destroy.snbt b/projects/common/src/testMod/resources/data/cctest/structures/relay_test.set_and_destroy.snbt index 2078950b0..fbb329a15 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/relay_test.set_and_destroy.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/speaker_test.fails_to_play_multiple_sounds.snbt b/projects/common/src/testMod/resources/data/cctest/structures/speaker_test.fails_to_play_multiple_sounds.snbt index 8ec5cb1db..0dae70a78 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/speaker_test.fails_to_play_multiple_sounds.snbt +++ b/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}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/speaker_test.will_not_play_record.snbt b/projects/common/src/testMod/resources/data/cctest/structures/speaker_test.will_not_play_record.snbt index eb2a11850..8cf45771f 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/speaker_test.will_not_play_record.snbt +++ b/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}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.attack_entity.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.attack_entity.snbt index 93c3f0341..0061161a2 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.attack_entity.snbt +++ b/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: [{}, {}, {}, {}], Attributes: [{Base: 0.08d, Name: "forge:entity_gravity"}, {Base: 16.0d, Modifiers: [{Amount: -0.035951819981951794d, Name: "Random spawn bonus", Operation: 1, UUID: [I; 1700656572, -1622061405, -2001517321, -1044884103]}], Name: "minecraft:generic.follow_range"}, {Base: 0.23000000417232513d, Name: "minecraft:generic.movement_speed"}], 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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.attack_entity_destroy.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.attack_entity_destroy.snbt index 926c2ca45..a0cba8906 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.attack_entity_destroy.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.break_cable.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.break_cable.snbt index 0fc3c6a50..faa9414d0 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.break_cable.snbt +++ b/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}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.breaks_exploding_block.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.breaks_exploding_block.snbt index 3e315e552..c453f8b5c 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.breaks_exploding_block.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.cleaned_with_cauldrons.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.cleaned_with_cauldrons.snbt index cb9f5c194..18db3b0b1 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.cleaned_with_cauldrons.snbt +++ b/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}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.craft.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.craft.snbt index 1dac5c659..7e6258166 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.craft.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.craft_offset.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.craft_offset.snbt index 1e167de19..6c6fc48e0 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.craft_offset.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.craft_remainder.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.craft_remainder.snbt index 414b09b7d..1b60d6ea6 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.craft_remainder.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.dig_breaks_tool.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.dig_breaks_tool.snbt index 7a1f5a7a8..539b04b82 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.dig_breaks_tool.snbt +++ b/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: "cctest:wooden_pickaxe", LeftUpgradeNbt: {Tag: {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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.dig_consume_durability.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.dig_consume_durability.snbt index a75b00e45..339426447 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.dig_consume_durability.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.dig_enchanted_consume_durability.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.dig_enchanted_consume_durability.snbt index e461da3ea..413009301 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.dig_enchanted_consume_durability.snbt +++ b/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: "cctest:netherite_pickaxe", LeftUpgradeNbt: {Tag: {Damage: 0, Enchantments: [{id: "minecraft:silk_touch", lvl: 1s}], RepairCost: 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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.drop_into_chest.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.drop_into_chest.snbt index 51bbe020b..1b1e093b0 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.drop_into_chest.snbt +++ b/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}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.drop_into_entity.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.drop_into_entity.snbt index 5a1021899..b6acb6777 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.drop_into_entity.snbt +++ b/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}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.equip_tool.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.equip_tool.snbt index 09c3db282..1e18a58e2 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.equip_tool.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.gather_lava.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.gather_lava.snbt index e2e703e88..d3d7ef882 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.gather_lava.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.hoe_dirt.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.hoe_dirt.snbt index 4b43c47b3..9804641a2 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.hoe_dirt.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.hoe_dirt_below.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.hoe_dirt_below.snbt index f5ed47357..5d37f2714 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.hoe_dirt_below.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.hoe_dirt_distant.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.hoe_dirt_distant.snbt index 79deeda88..375c1d95f 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.hoe_dirt_distant.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.item_detail_provider.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.item_detail_provider.snbt index 5e67a701f..0aab9a195 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.item_detail_provider.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_obstruct.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_obstruct.snbt index b41511b6e..94f44c07d 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_obstruct.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_preserves_state.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_preserves_state.snbt index 0d1f00159..47116ed57 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_preserves_state.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_push_entity.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_push_entity.snbt index 2c043fe6d..6ee00d849 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_push_entity.snbt +++ b/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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_replace.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_replace.snbt index a678cf757..888221a4a 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_replace.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_replace.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, Label: "turtle_test.move_replace", Fuel: 80, Items: [], On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}}, - {pos: [2, 1, 3], state: "minecraft:grass"}, - {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: [], Label: "turtle_test.move_replace", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}}, + {pos: [2, 1, 3], state: "minecraft:grass"} ], entities: [], palette: [ "minecraft:polished_andesite", "minecraft:dirt", - "minecraft:air", "minecraft:grass", "computercraft:turtle_normal{facing:south,waterlogged:false}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_water.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_water.snbt index ef3076f52..193f65e29 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_water.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.move_water.snbt @@ -27,11 +27,6 @@ {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:polished_andesite_stairs{facing:south,half:bottom,shape:outer_left,waterlogged:false}"}, {pos: [1, 1, 1], state: "minecraft:polished_andesite_stairs{facing:east,half:bottom,shape:straight,waterlogged:false}"}, {pos: [1, 1, 2], state: "minecraft:polished_andesite_stairs{facing:east,half:bottom,shape:straight,waterlogged:false}"}, @@ -46,92 +41,11 @@ {pos: [3, 1, 1], state: "minecraft:polished_andesite_stairs{facing:west,half:bottom,shape:straight,waterlogged:false}"}, {pos: [3, 1, 2], state: "minecraft:polished_andesite_stairs{facing:east,half:bottom,shape:straight,waterlogged:true}"}, {pos: [3, 1, 3], state: "minecraft:polished_andesite_stairs{facing:west,half:bottom,shape:straight,waterlogged:false}"}, - {pos: [3, 1, 4], state: "minecraft:polished_andesite_stairs{facing:north,half:bottom,shape:outer_left,waterlogged:false}"}, - {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, 4], state: "minecraft:polished_andesite_stairs{facing:north,half:bottom,shape:outer_left,waterlogged:false}"} ], entities: [], palette: [ "minecraft:polished_andesite", - "minecraft:air", "minecraft:polished_andesite_stairs{facing:south,half:bottom,shape:outer_left,waterlogged:false}", "minecraft:polished_andesite_stairs{facing:east,half:bottom,shape:straight,waterlogged:false}", "minecraft:polished_andesite_stairs{facing:east,half:bottom,shape:outer_left,waterlogged:false}", diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.no_ghost_peripheral.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.no_ghost_peripheral.snbt index 7ea0eb8a1..8d0c0f461 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.no_ghost_peripheral.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.no_ghost_peripheral.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: 80, Items: [], Label: "turtle_test.no_ghost_peripheral", 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: [], Label: "turtle_test.no_ghost_peripheral", 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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.peripheral_change.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.peripheral_change.snbt index fb2bc5506..c1c5c809f 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.peripheral_change.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.peripheral_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: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 80, Items: [], Label: "turtle_test.peripheral_change.turtle", 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: "computercraft:computer_advanced{facing:north,state:blinking}", nbt: {ComputerId: 1, Label: "turtle_test.peripheral_change.listen", 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: "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_advanced{facing:north,state:blinking}", nbt: {ComputerId: 1, Label: "turtle_test.peripheral_change.listen", On: 1b, id: "computercraft:computer_advanced"}} ], entities: [], palette: [ "minecraft:polished_andesite", - "minecraft:air", "computercraft:turtle_normal{facing:south,waterlogged:false}", "computercraft:computer_advanced{facing:north,state:blinking}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_boat.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_boat.snbt index ef56318f4..2a582b317 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_boat.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_boat.snbt @@ -52,88 +52,13 @@ {pos: [4, 1, 2], state: "minecraft:white_stained_glass"}, {pos: [4, 1, 3], state: "minecraft:white_stained_glass"}, {pos: [4, 1, 4], state: "minecraft:white_stained_glass"}, - {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:oak_boat"}], Label: "turtle_test.place_boat", On: 1b, Owner: {LowerId: -9064043055757671503L, Name: "Player747", UpperId: -7218225988027138284L}, 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:oak_boat"}], Label: "turtle_test.place_boat", On: 1b, Owner: {LowerId: -9064043055757671503L, Name: "Player747", UpperId: -7218225988027138284L}, Slot: 0, id: "computercraft:turtle_normal"}} ], entities: [], palette: [ "minecraft:polished_andesite", "minecraft:white_stained_glass", "minecraft:water{level:0}", - "minecraft:air", "computercraft:turtle_normal{facing:south,waterlogged:false}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_does_not_use.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_does_not_use.snbt index b7c4c2172..77dc74cf4 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_does_not_use.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_does_not_use.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: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "minecraft:polished_andesite"}], Label: "turtle_test.place_does_not_use", On: 1b, Owner: {LowerId: -9198338595628574826L, Name: "Player630", UpperId: -2783603765457764926L}, Slot: 0, id: "computercraft:turtle_normal"}}, {pos: [2, 1, 2], state: "minecraft:lever{face:wall,facing:north,powered:false}"}, - {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", "minecraft:lever{face:wall,facing:north,powered:false}", "computercraft:turtle_normal{facing:south,waterlogged:false}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_into_beehive.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_into_beehive.snbt index 7bf01e9c5..ab13efb27 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_into_beehive.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_into_beehive.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: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 64b, Slot: 0b, id: "minecraft:glass_bottle"}], Label: "turtle_test.place_into_beehive", On: 1b, Owner: {LowerId: -8128385952290657367L, Name: "Player771", UpperId: 252869381310723801L}, Slot: 0, id: "computercraft:turtle_normal"}}, - {pos: [2, 1, 2], state: "minecraft:beehive{facing:north,honey_level:5}", nbt: {Bees: [], id: "minecraft:beehive"}}, - {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:beehive{facing:north,honey_level:5}", nbt: {Bees: [], id: "minecraft:beehive"}} ], entities: [], palette: [ "minecraft:polished_andesite", - "minecraft:air", "computercraft:turtle_normal{facing:south,waterlogged:false}", "minecraft:beehive{facing:north,honey_level:5}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_into_composter.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_into_composter.snbt index 9b9b17950..2b46b8c51 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_into_composter.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_into_composter.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: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 2b, Slot: 0b, id: "minecraft:pumpkin_pie"}], Label: "turtle_test.place_into_composter", On: 1b, Owner: {LowerId: -8822842774267890833L, Name: "Player328", UpperId: -1898723855450425618L}, Slot: 0, id: "computercraft:turtle_normal"}}, - {pos: [2, 1, 2], state: "minecraft:composter{level:1}"}, - {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:composter{level:1}"} ], entities: [], palette: [ "minecraft:polished_andesite", - "minecraft:air", "minecraft:composter{level:1}", "computercraft:turtle_normal{facing:south,waterlogged:false}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_into_composter_non_adjacent.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_into_composter_non_adjacent.snbt index cb3dc3225..d574761dc 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_into_composter_non_adjacent.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_into_composter_non_adjacent.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: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "minecraft:pumpkin_pie"}], Label: "turtle_test.place_into_composter_non_adjacent", On: 1b, Owner: {LowerId: -7298459922670553123L, Name: "Player572", UpperId: -8225029765375707172L}, Slot: 0, id: "computercraft:turtle_normal"}}, - {pos: [2, 1, 2], state: "minecraft:air"}, - {pos: [2, 1, 3], state: "minecraft:composter{level:0}"}, - {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:composter{level:0}"} ], entities: [], palette: [ "minecraft:polished_andesite", - "minecraft:air", "minecraft:composter{level:0}", "computercraft:turtle_normal{facing:south,waterlogged:false}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_lava.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_lava.snbt index c93eb769e..d365c3cd5 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_lava.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_lava.snbt @@ -27,112 +27,20 @@ {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: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: "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:lava_bucket"}], Label: "turtle_test.place_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:lava_bucket"}], Label: "turtle_test.place_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" + "computercraft:turtle_normal{facing:south,waterlogged:false}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_monitor.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_monitor.snbt index a1621f782..b1818508b 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_monitor.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_monitor.snbt @@ -27,116 +27,21 @@ {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: "computercraft:monitor_advanced{facing:north,orientation:north,state:none}", nbt: {Height: 1, Width: 1, XIndex: 0, YIndex: 0, id: "computercraft:monitor_advanced"}}, - {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:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "computercraft:monitor_advanced"}], Label: "turtle_test.place_monitor", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}}, - {pos: [1, 1, 3], state: "minecraft:air"}, {pos: [1, 1, 4], state: "minecraft:dark_oak_planks"}, - {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:l}", nbt: {Height: 1, Width: 3, XIndex: 2, 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:lr}", nbt: {Height: 1, Width: 3, XIndex: 1, 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: "computercraft:monitor_advanced{facing:north,orientation:north,state:r}", nbt: {Height: 1, Width: 3, XIndex: 0, YIndex: 0, id: "computercraft:monitor_advanced"}}, - {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, 3], 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:dark_oak_planks", - "computercraft:turtle_normal{facing:south,waterlogged:false}", "computercraft:monitor_advanced{facing:north,orientation:north,state:none}", + "computercraft:turtle_normal{facing:south,waterlogged:false}", "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}", - "minecraft:air" + "computercraft:monitor_advanced{facing:north,orientation:north,state:r}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_sign.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_sign.snbt index bca86b1cd..244f1f379 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_sign.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_sign.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:oak_sign"}], Label: "turtle_test.place_sign", On: 1b, Owner: {LowerId: -7553144124013011039L, Name: "Player840", UpperId: 8473952144820417152L}, 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:oak_sign"}], Label: "turtle_test.place_sign", On: 1b, Owner: {LowerId: -7553144124013011039L, Name: "Player840", UpperId: 8473952144820417152L}, Slot: 0, id: "computercraft:turtle_normal"}} ], entities: [], palette: [ "minecraft:polished_andesite", - "minecraft:air", "computercraft:turtle_normal{facing:north,waterlogged:false}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_use_reach_limit.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_use_reach_limit.snbt index aaf9f9181..e369efa12 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_use_reach_limit.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_use_reach_limit.snbt @@ -27,112 +27,34 @@ {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:air"}, - {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: "minecraft:air"}, {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:air"}, {pos: [3, 1, 2], state: "minecraft:light_gray_stained_glass"}, - {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:ladder{facing:north,waterlogged:false}"}, {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: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:light_gray_stained_glass"}, {pos: [1, 3, 2], state: "minecraft:light_gray_stained_glass"}, {pos: [1, 3, 3], state: "minecraft:light_gray_stained_glass"}, - {pos: [1, 3, 4], state: "minecraft:air"}, - {pos: [2, 3, 0], state: "minecraft:air"}, {pos: [2, 3, 1], state: "minecraft:light_gray_stained_glass"}, - {pos: [2, 3, 2], state: "minecraft:air"}, {pos: [2, 3, 3], state: "minecraft:light_gray_stained_glass"}, - {pos: [2, 3, 4], state: "minecraft:air"}, - {pos: [3, 3, 0], state: "minecraft:air"}, {pos: [3, 3, 1], state: "minecraft:light_gray_stained_glass"}, {pos: [3, 3, 2], state: "minecraft:light_gray_stained_glass"}, {pos: [3, 3, 3], state: "minecraft:light_gray_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:light_gray_stained_glass"}, {pos: [1, 4, 2], state: "minecraft:light_gray_stained_glass"}, {pos: [1, 4, 3], state: "minecraft:light_gray_stained_glass"}, - {pos: [1, 4, 4], state: "minecraft:air"}, - {pos: [2, 4, 0], state: "minecraft:air"}, {pos: [2, 4, 1], state: "minecraft:light_gray_stained_glass"}, {pos: [2, 4, 2], state: "computercraft:turtle_normal{facing:north,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "minecraft:water_bucket"}], Label: "turtle_test.place_use_reach_limit", On: 1b, Slot: 0, id: "computercraft:turtle_normal"}}, {pos: [2, 4, 3], state: "minecraft:light_gray_stained_glass"}, - {pos: [2, 4, 4], state: "minecraft:air"}, - {pos: [3, 4, 0], state: "minecraft:air"}, {pos: [3, 4, 1], state: "minecraft:light_gray_stained_glass"}, {pos: [3, 4, 2], state: "minecraft:light_gray_stained_glass"}, - {pos: [3, 4, 3], state: "minecraft:light_gray_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:light_gray_stained_glass"} ], entities: [], palette: [ "minecraft:polished_andesite", "minecraft:light_gray_stained_glass", - "minecraft:air", "minecraft:ladder{facing:north,waterlogged:false}", "computercraft:turtle_normal{facing:north,waterlogged:false}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_waterlogged.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_waterlogged.snbt index 434b3d26f..17e873bd4 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_waterlogged.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.place_waterlogged.snbt @@ -27,113 +27,24 @@ {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:white_stained_glass"}, {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:white_stained_glass"}, {pos: [2, 1, 1], state: "computercraft:turtle_normal{facing:south,waterlogged:true}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "minecraft:oak_fence"}], Label: "turtle_test.place_waterlogged", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}}, {pos: [2, 1, 2], state: "minecraft:water{level:0}"}, {pos: [2, 1, 3], state: "minecraft:white_stained_glass"}, - {pos: [2, 1, 4], state: "minecraft:air"}, {pos: [3, 1, 0], state: "minecraft:white_stained_glass"}, {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: "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:white_stained_glass"} ], entities: [], palette: [ "minecraft:polished_andesite", "minecraft:white_stained_glass", - "computercraft:turtle_normal{facing:south,waterlogged:true}", - "minecraft:air", - "minecraft:water{level:0}" + "minecraft:water{level:0}", + "computercraft:turtle_normal{facing:south,waterlogged:true}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.refuel_basic.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.refuel_basic.snbt index 6210a07c9..585eba43f 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.refuel_basic.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.refuel_basic.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.refuel_basic", Fuel: 0, Items: [{Count: 2b, Slot: 0b, id: "minecraft:coal"},{Count: 2b, Slot: 1b, id: "minecraft:blaze_rod"}], 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: 0, Items: [{Count: 2b, Slot: 0b, id: "minecraft:coal"}, {Count: 2b, Slot: 1b, id: "minecraft:blaze_rod"}], Label: "turtle_test.refuel_basic", 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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.refuel_container.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.refuel_container.snbt index bf9d1c1ff..43b6e7c49 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.refuel_container.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.refuel_container.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.refuel_container", Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "minecraft:lava_bucket"}], 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: 0, Items: [{Count: 1b, Slot: 0b, id: "minecraft:lava_bucket"}], Label: "turtle_test.refuel_container", 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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.refuel_fail.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.refuel_fail.snbt index 7255e040c..3487a9c5e 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.refuel_fail.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.refuel_fail.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.refuel_fail", Fuel: 0, 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: 0, Items: [{Count: 32b, Slot: 0b, id: "minecraft:dirt"}], Label: "turtle_test.refuel_fail", 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}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.render_turtle_blocks.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.render_turtle_blocks.snbt index fd929d435..86854cea4 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.render_turtle_blocks.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.render_turtle_blocks.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: "computercraft:turtle_normal{facing:east,waterlogged:false}", nbt: {ComputerId: 8, Fuel: 0, Items: [], LeftUpgrade: "cctest:netherite_pickaxe", LeftUpgradeNbt: {Tag: {Damage: 0, Enchantments: [{id: "minecraft:efficiency", lvl: 5s}], RepairCost: 1}}, On: 1b, Owner: {LowerId: -7931330074873442406L, Name: "Player848", UpperId: 7430876841693101418L}, Slot: 0, id: "computercraft:turtle_normal"}}, - {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: "computercraft:turtle_normal{facing:west,waterlogged:false}", nbt: {ComputerId: 8, Fuel: 0, Items: [], Label: "Dinnerbone", On: 1b, Owner: {LowerId: -7931330074873442406L, Name: "Player848", UpperId: 7430876841693101418L}, RightUpgrade: "minecraft:diamond_pickaxe", RightUpgradeNbt: {Tag: {Damage: 0}}, Slot: 0, id: "computercraft:turtle_normal"}}, - {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: "computercraft:turtle_normal{facing:east,waterlogged:false}", nbt: {ComputerId: 8, Fuel: 0, Items: [], Label: "Dinnerbone", LeftUpgrade: "cctest:netherite_pickaxe", LeftUpgradeNbt: {Tag: {Damage: 0, Enchantments: [{id: "minecraft:efficiency", lvl: 5s}], RepairCost: 1}}, On: 1b, Owner: {LowerId: -7931330074873442406L, Name: "Player848", UpperId: 7430876841693101418L}, Slot: 0, id: "computercraft:turtle_normal"}}, - {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: "computercraft:turtle_normal{facing:west,waterlogged:false}", nbt: {ComputerId: 8, Fuel: 0, Items: [], On: 1b, Owner: {LowerId: -7931330074873442406L, Name: "Player848", UpperId: 7430876841693101418L}, RightUpgrade: "minecraft:diamond_pickaxe", RightUpgradeNbt: {Tag: {Damage: 0}}, Slot: 0, id: "computercraft:turtle_normal"}}, - {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, 3, 3], state: "computercraft:turtle_normal{facing:west,waterlogged:false}", nbt: {ComputerId: 8, Fuel: 0, Items: [], On: 1b, Owner: {LowerId: -7931330074873442406L, Name: "Player848", UpperId: 7430876841693101418L}, RightUpgrade: "minecraft:diamond_pickaxe", RightUpgradeNbt: {Tag: {Damage: 0}}, Slot: 0, id: "computercraft:turtle_normal"}} ], entities: [ {blockPos: [2, 1, 0], pos: [2.52408694606693d, 1.0d, 0.6487863808268131d], nbt: {AbsorptionAmount: 0.0f, Air: 300s, ArmorItems: [{}, {}, {}, {}], Attributes: [{Base: 0.699999988079071d, Name: "minecraft:generic.movement_speed"}], Brain: {memories: {}}, CustomName: '{"text":"turtle_test.render_turtle_blocks"}', 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: [124.52408694606693d, -58.0d, 50.64878638082681d], Pose: {}, Rotation: [0.14965993f, 4.066999f], ShowArms: 0b, Small: 0b, UUID: [I; 755114464, 1289439453, -2088751844, 985194758], id: "minecraft:armor_stand"}} ], palette: [ "minecraft:polished_andesite", - "minecraft:air", "computercraft:turtle_normal{facing:east,waterlogged:false}", "computercraft:turtle_normal{facing:west,waterlogged:false}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.render_turtle_items.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.render_turtle_items.snbt index cca3f79d1..b393325e4 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.render_turtle_items.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.render_turtle_items.snbt @@ -26,117 +26,16 @@ {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: [ {blockPos: [2, 1, 0], pos: [2.5d, 1.0d, 0.5d], nbt: {AbsorptionAmount: 0.0f, Air: 300s, ArmorItems: [{}, {}, {}, {}], Attributes: [{Base: 0.699999988079071d, Name: "minecraft:generic.movement_speed"}], Brain: {memories: {}}, CustomName: '{"text":"turtle_test.render_turtle_items"}', 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: [125.5d, -58.0d, 53.6501934495752d], Pose: {}, Rotation: [0.14965993f, 4.066999f], ShowArms: 0b, Small: 0b, UUID: [I; -1678989666, 1780632657, -1267321893, 665166246], id: "minecraft:armor_stand"}}, - {blockPos: [3, 1, 3], pos: [3.5d, 1.5d, 3.5d], nbt: {Air: 300s, FallDistance: 0.0f, Fire: 0s, Invulnerable: 0b, Motion: [0.0d, 0.0d, 0.0d], OnGround: 0b, PortalCooldown: 0, Pos: [126.5d, -57.5d, 56.5d], Rotation: [90.0f, 0.0f], UUID: [I; 671334450, -268547745, -1360971514, -649716242], billboard: "fixed", glow_color_override: -1, height: 0.0f, id: "minecraft:item_display", interpolation_duration: 0, item: {Count: 1b, id: "computercraft:turtle_normal", tag: {ComputerId: 8, Fuel: 0, Items: [], display: {Name: '{"text":"Dinnerbone"}'}, On: 1b, RightUpgrade: "minecraft:diamond_pickaxe", RightUpgradeNbt: {Tag: {Damage: 0}}}}, item_display: "none", shadow_radius: 0.0f, shadow_strength: 1.0f, transformation: {left_rotation: [0.0f, 0.0f, 0.0f, 1.0f], right_rotation: [0.0f, 0.0f, 0.0f, 1.0f], scale: [1.0f, 1.0f, 1.0f], translation: [0.0f, 0.0f, 0.0f]}, view_range: 1.0f, width: 0.0f}}, - {blockPos: [3, 3, 3], pos: [3.5d, 3.5d, 3.5d], nbt: {Air: 300s, FallDistance: 0.0f, Fire: 0s, Invulnerable: 0b, Motion: [0.0d, 0.0d, 0.0d], OnGround: 0b, PortalCooldown: 0, Pos: [126.5d, -57.5d, 56.5d], Rotation: [90.0f, 0.0f], UUID: [I; 671334422, -268542345, -1362491514, -649716242], billboard: "fixed", glow_color_override: -1, height: 0.0f, id: "minecraft:item_display", interpolation_duration: 0, item: {Count: 1b, id: "computercraft:turtle_normal", tag: {ComputerId: 8, Fuel: 0, Items: [], On: 1b, RightUpgrade: "minecraft:diamond_pickaxe", RightUpgradeNbt: {Tag: {Damage: 0}}}}, item_display: "none", shadow_radius: 0.0f, shadow_strength: 1.0f, transformation: {left_rotation: [0.0f, 0.0f, 0.0f, 1.0f], right_rotation: [0.0f, 0.0f, 0.0f, 1.0f], scale: [1.0f, 1.0f, 1.0f], translation: [0.0f, 0.0f, 0.0f]}, view_range: 1.0f, width: 0.0f}}, - {blockPos: [1, 1, 3], pos: [1.5d, 1.5d, 3.5d], nbt: {Air: 300s, FallDistance: 0.0f, Fire: 0s, Invulnerable: 0b, Motion: [0.0d, 0.0d, 0.0d], OnGround: 0b, PortalCooldown: 0, Pos: [126.5d, -57.5d, 56.5d], Rotation: [-90.0f, 0.0f], UUID: [I; 625334450, -268647745, -1360971514, -649724242], billboard: "fixed", glow_color_override: -1, height: 0.0f, id: "minecraft:item_display", interpolation_duration: 0, item: {Count: 1b, id: "computercraft:turtle_normal", tag: {ComputerId: 8, Fuel: 0, Items: [], On: 1b, LeftUpgrade: "cctest:netherite_pickaxe", LeftUpgradeNbt: {Tag: {Damage: 0, Enchantments: [{id: "minecraft:efficiency", lvl: 5s}], RepairCost: 1}}}}, item_display: "none", shadow_radius: 0.0f, shadow_strength: 1.0f, transformation: {left_rotation: [0.0f, 0.0f, 0.0f, 1.0f], right_rotation: [0.0f, 0.0f, 0.0f, 1.0f], scale: [1.0f, 1.0f, 1.0f], translation: [0.0f, 0.0f, 0.0f]}, view_range: 1.0f, width: 0.0f}}, - {blockPos: [1, 3, 3], pos: [1.5d, 3.5d, 3.5d], nbt: {Air: 300s, FallDistance: 0.0f, Fire: 0s, Invulnerable: 0b, Motion: [0.0d, 0.0d, 0.0d], OnGround: 0b, PortalCooldown: 0, Pos: [126.5d, -57.5d, 56.5d], Rotation: [-90.0f, 0.0f], UUID: [I; 675334422, -268542245, -1362491514, -649755242], billboard: "fixed", glow_color_override: -1, height: 0.0f, id: "minecraft:item_display", interpolation_duration: 0, item: {Count: 1b, id: "computercraft:turtle_normal", tag: {ComputerId: 8, Fuel: 0, Items: [], display: {Name: '{"text":"Dinnerbone"}'}, On: 1b, LeftUpgrade: "cctest:netherite_pickaxe", LeftUpgradeNbt: {Tag: {Damage: 0, Enchantments: [{id: "minecraft:efficiency", lvl: 5s}], RepairCost: 1}}}}, item_display: "none", shadow_radius: 0.0f, shadow_strength: 1.0f, transformation: {left_rotation: [0.0f, 0.0f, 0.0f, 1.0f], right_rotation: [0.0f, 0.0f, 0.0f, 1.0f], scale: [1.0f, 1.0f, 1.0f], translation: [0.0f, 0.0f, 0.0f]}, view_range: 1.0f, width: 0.0f}} + {blockPos: [1, 1, 3], pos: [1.5d, 1.5d, 3.5d], nbt: {Air: 300s, FallDistance: 0.0f, Fire: 0s, Invulnerable: 0b, Motion: [0.0d, 0.0d, 0.0d], OnGround: 0b, PortalCooldown: 0, Pos: [126.5d, -57.5d, 56.5d], Rotation: [-90.0f, 0.0f], UUID: [I; 625334450, -268647745, -1360971514, -649724242], billboard: "fixed", glow_color_override: -1, height: 0.0f, id: "minecraft:item_display", interpolation_duration: 0, item: {Count: 1b, id: "computercraft:turtle_normal", tag: {ComputerId: 8, Fuel: 0, Items: [], LeftUpgrade: "cctest:netherite_pickaxe", LeftUpgradeNbt: {Tag: {Damage: 0, Enchantments: [{id: "minecraft:efficiency", lvl: 5s}], RepairCost: 1}}, On: 1b}}, item_display: "none", shadow_radius: 0.0f, shadow_strength: 1.0f, transformation: {left_rotation: [0.0f, 0.0f, 0.0f, 1.0f], right_rotation: [0.0f, 0.0f, 0.0f, 1.0f], scale: [1.0f, 1.0f, 1.0f], translation: [0.0f, 0.0f, 0.0f]}, view_range: 1.0f, width: 0.0f}}, + {blockPos: [3, 1, 3], pos: [3.5d, 1.5d, 3.5d], nbt: {Air: 300s, FallDistance: 0.0f, Fire: 0s, Invulnerable: 0b, Motion: [0.0d, 0.0d, 0.0d], OnGround: 0b, PortalCooldown: 0, Pos: [126.5d, -57.5d, 56.5d], Rotation: [90.0f, 0.0f], UUID: [I; 671334450, -268547745, -1360971514, -649716242], billboard: "fixed", glow_color_override: -1, height: 0.0f, id: "minecraft:item_display", interpolation_duration: 0, item: {Count: 1b, id: "computercraft:turtle_normal", tag: {ComputerId: 8, Fuel: 0, Items: [], On: 1b, RightUpgrade: "minecraft:diamond_pickaxe", RightUpgradeNbt: {Tag: {Damage: 0}}, display: {Name: '{"text":"Dinnerbone"}'}}}, item_display: "none", shadow_radius: 0.0f, shadow_strength: 1.0f, transformation: {left_rotation: [0.0f, 0.0f, 0.0f, 1.0f], right_rotation: [0.0f, 0.0f, 0.0f, 1.0f], scale: [1.0f, 1.0f, 1.0f], translation: [0.0f, 0.0f, 0.0f]}, view_range: 1.0f, width: 0.0f}}, + {blockPos: [1, 3, 3], pos: [1.5d, 3.5d, 3.5d], nbt: {Air: 300s, FallDistance: 0.0f, Fire: 0s, Invulnerable: 0b, Motion: [0.0d, 0.0d, 0.0d], OnGround: 0b, PortalCooldown: 0, Pos: [126.5d, -57.5d, 56.5d], Rotation: [-90.0f, 0.0f], UUID: [I; 675334422, -268542245, -1362491514, -649755242], billboard: "fixed", glow_color_override: -1, height: 0.0f, id: "minecraft:item_display", interpolation_duration: 0, item: {Count: 1b, id: "computercraft:turtle_normal", tag: {ComputerId: 8, Fuel: 0, Items: [], LeftUpgrade: "cctest:netherite_pickaxe", LeftUpgradeNbt: {Tag: {Damage: 0, Enchantments: [{id: "minecraft:efficiency", lvl: 5s}], RepairCost: 1}}, On: 1b, display: {Name: '{"text":"Dinnerbone"}'}}}, item_display: "none", shadow_radius: 0.0f, shadow_strength: 1.0f, transformation: {left_rotation: [0.0f, 0.0f, 0.0f, 1.0f], right_rotation: [0.0f, 0.0f, 0.0f, 1.0f], scale: [1.0f, 1.0f, 1.0f], translation: [0.0f, 0.0f, 0.0f]}, view_range: 1.0f, width: 0.0f}}, + {blockPos: [3, 3, 3], pos: [3.5d, 3.5d, 3.5d], nbt: {Air: 300s, FallDistance: 0.0f, Fire: 0s, Invulnerable: 0b, Motion: [0.0d, 0.0d, 0.0d], OnGround: 0b, PortalCooldown: 0, Pos: [126.5d, -57.5d, 56.5d], Rotation: [90.0f, 0.0f], UUID: [I; 671334422, -268542345, -1362491514, -649716242], billboard: "fixed", glow_color_override: -1, height: 0.0f, id: "minecraft:item_display", interpolation_duration: 0, item: {Count: 1b, id: "computercraft:turtle_normal", tag: {ComputerId: 8, Fuel: 0, Items: [], On: 1b, RightUpgrade: "minecraft:diamond_pickaxe", RightUpgradeNbt: {Tag: {Damage: 0}}}}, item_display: "none", shadow_radius: 0.0f, shadow_strength: 1.0f, transformation: {left_rotation: [0.0f, 0.0f, 0.0f, 1.0f], right_rotation: [0.0f, 0.0f, 0.0f, 1.0f], scale: [1.0f, 1.0f, 1.0f], translation: [0.0f, 0.0f, 0.0f]}, view_range: 1.0f, width: 0.0f}} ], palette: [ - "minecraft:polished_andesite", - "minecraft:air" + "minecraft:polished_andesite" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.resists_entity_explosions.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.resists_entity_explosions.snbt index 79b2f8ef6..b4840ac2b 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.resists_entity_explosions.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.resists_entity_explosions.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: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {Fuel: 0, Items: [], On: 0b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}}, - {pos: [2, 1, 2], state: "computercraft:turtle_advanced{facing:south,waterlogged:false}", nbt: {Fuel: 0, Items: [], On: 0b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_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:turtle_advanced{facing:south,waterlogged:false}", nbt: {Fuel: 0, Items: [], On: 0b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_advanced"}} ], entities: [ {blockPos: [1, 1, 2], pos: [1.5d, 1.0d, 2.5d], nbt: {AbsorptionAmount: 0.0f, Air: 300s, ArmorDropChances: [0.085f, 0.085f, 0.085f, 0.085f], ArmorItems: [{}, {}, {}, {}], Attributes: [{Base: 0.0d, Name: "forge:step_height_addition"}, {Base: 0.25d, Name: "minecraft:generic.movement_speed"}, {Base: 0.08d, Name: "forge:entity_gravity"}, {Base: 16.0d, Modifiers: [{Amount: -0.0871987524284032d, Name: "Random spawn bonus", Operation: 1, UUID: [I; -1592956383, -599506679, -1812844190, 1076877318]}], Name: "minecraft:generic.follow_range"}], Brain: {memories: {}}, CanPickUpLoot: 0b, CanUpdate: 1b, DeathTime: 0s, ExplosionRadius: 3b, FallDistance: 0.0f, FallFlying: 0b, Fire: -1s, Fuse: 30s, HandDropChances: [0.085f, 0.085f], HandItems: [{}, {}], Health: 20.0f, HurtByTimestamp: 0, HurtTime: 0s, Invulnerable: 0b, LeftHanded: 0b, Motion: [0.0d, -0.0784000015258789d, 0.0d], OnGround: 1b, PersistenceRequired: 0b, PortalCooldown: 0, Pos: [2.5d, -58.0d, 3.5d], Rotation: [143.85756f, 0.0f], UUID: [I; 1463798444, -662876850, -1423329658, 948503391], id: "minecraft:creeper", ignited: 0b}} ], palette: [ "minecraft:polished_andesite", - "minecraft:air", "computercraft:turtle_normal{facing:south,waterlogged:false}", "computercraft:turtle_advanced{facing:south,waterlogged:false}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.resists_explosions.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.resists_explosions.snbt index 89ae4bc14..06790cd0f 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.resists_explosions.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.resists_explosions.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: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {Fuel: 0, Items: [], On: 0b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}}, {pos: [2, 1, 2], state: "computercraft:turtle_advanced{facing:south,waterlogged:false}", nbt: {Fuel: 0, Items: [], On: 0b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_advanced"}}, - {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,81 +51,21 @@ {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:polished_andesite", "minecraft:barrier", - "minecraft:air", "computercraft:turtle_normal{facing:south,waterlogged:false}", "computercraft:turtle_advanced{facing:south,waterlogged:false}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.shears_sheep.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.shears_sheep.snbt index 4f6afef2c..4b64e3c91 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.shears_sheep.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.shears_sheep.snbt @@ -27,106 +27,23 @@ {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: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: "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: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: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "minecraft:shears", tag: {Damage: 0}}], Label: "turtle_test.shears_sheep", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}}, - {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, 3, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "minecraft:shears", tag: {Damage: 0}}], Label: "turtle_test.shears_sheep", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}} ], entities: [ {blockPos: [2, 1, 2], pos: [2.5d, 1.0d, 2.5d], nbt: {AbsorptionAmount: 0.0f, Age: 0, Air: 300s, ArmorDropChances: [0.085f, 0.085f, 0.085f, 0.085f], ArmorItems: [{}, {}, {}, {}], Attributes: [{Base: 8.0d, Name: "generic.maxHealth"}, {Base: 0.0d, Name: "generic.knockbackResistance"}, {Base: 0.23000000417232513d, Name: "generic.movementSpeed"}, {Base: 0.0d, Name: "generic.armor"}, {Base: 0.0d, Name: "generic.armorToughness"}, {Base: 1.0d, Name: "forge.swimSpeed"}, {Base: 64.0d, Name: "forge.nameTagDistance"}, {Base: 0.08d, Name: "forge.entity_gravity"}, {Base: 16.0d, Modifiers: [{Amount: -0.04393447767139704d, Name: "Random spawn bonus", Operation: 1, UUIDLeast: -7913974980122166977L, UUIDMost: 2135385928807173041L}], Name: "generic.followRange"}, {Base: 0.0d, Name: "generic.attackKnockback"}], Brain: {memories: {}}, CanPickUpLoot: 0b, CanUpdate: 1b, Color: 0b, DeathTime: 0s, Dimension: 0, 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: [-12.5d, 6.0d, 110.5d], Rotation: [99.779915f, 0.0f], Sheared: 0b, UUIDLeast: -5245632071702074643L, UUIDMost: -3792049278188698748L, id: "minecraft:sheep"}} @@ -134,7 +51,6 @@ palette: [ "minecraft:polished_andesite", "minecraft:white_stained_glass", - "computercraft:turtle_normal{facing:south,waterlogged:false}", - "minecraft:air" + "computercraft:turtle_normal{facing:south,waterlogged:false}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.sided_drop.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.sided_drop.snbt index cffd37af2..57e2765e5 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.sided_drop.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.sided_drop.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:furnace{facing:north,lit:false}", nbt: {BurnTime: 0s, CookTime: 0s, CookTimeTotal: 200s, Items: [{Count: 8b, Slot: 0b, id: "minecraft:coal"}], RecipesUsed: {}, id: "minecraft:furnace"}}, - {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: "computercraft:turtle_normal{facing:north,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 64b, Slot: 0b, id: "minecraft:coal"}], Label: "turtle_test.sided_drop", On: 1b, Owner: {LowerId: -5939166093450296082L, Name: "Player58", UpperId: 5394875410161482031L}, 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:north,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 64b, Slot: 0b, id: "minecraft:coal"}], Label: "turtle_test.sided_drop", On: 1b, Owner: {LowerId: -5939166093450296082L, Name: "Player58", UpperId: 5394875410161482031L}, Slot: 0, id: "computercraft:turtle_normal"}} ], entities: [], palette: [ "minecraft:polished_andesite", - "minecraft:air", "minecraft:furnace{facing:north,lit:false}", "computercraft:turtle_normal{facing:north,waterlogged:false}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.sided_suck.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.sided_suck.snbt index b520ce1cc..d749c6885 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.sided_suck.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.sided_suck.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:north,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [], Label: "turtle_test.sided_suck", 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:furnace{facing:north,lit:false}", nbt: {BurnTime: 0s, CookTime: 0s, CookTimeTotal: 200s, Items: [{Count: 64b, Slot: 1b, id: "minecraft:coal"}, {Count: 8b, Slot: 2b, id: "minecraft:iron_ingot"}], RecipesUsed: {"minecraft:iron_ingot_from_smelting_raw_iron": 8}, id: "minecraft:furnace"}}, - {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: "minecraft:furnace{facing:north,lit:false}", nbt: {BurnTime: 0s, CookTime: 0s, CookTimeTotal: 200s, Items: [{Count: 64b, Slot: 1b, id: "minecraft:coal"}, {Count: 8b, Slot: 2b, id: "minecraft:iron_ingot"}], RecipesUsed: {"minecraft:iron_ingot_from_smelting_raw_iron": 8}, id: "minecraft:furnace"}} ], entities: [], palette: [ "minecraft:polished_andesite", - "minecraft:air", "computercraft:turtle_normal{facing:north,waterlogged:false}", "minecraft:furnace{facing:north,lit:false}" ] diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.unequip_refreshes_peripheral.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.unequip_refreshes_peripheral.snbt index de5d48438..09421d640 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.unequip_refreshes_peripheral.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.unequip_refreshes_peripheral.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: "computercraft:disk_drive{facing:north,state:empty}", 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:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [], Label: "turtle_test.unequip_refreshes_peripheral", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, RightUpgrade: "computercraft:wireless_modem_normal", RightUpgradeNbt: {active: 0b}, 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.unequip_refreshes_peripheral", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, RightUpgrade: "computercraft:wireless_modem_normal", RightUpgradeNbt: {active: 0b}, Slot: 0, id: "computercraft:turtle_normal"}} ], entities: [], palette: [ "minecraft:polished_andesite", "computercraft:disk_drive{facing:north,state:empty}", - "computercraft:turtle_normal{facing:south,waterlogged:false}", - "minecraft:air" + "computercraft:turtle_normal{facing:south,waterlogged:false}" ] } diff --git a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.use_composters.snbt b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.use_composters.snbt index bd88ffb46..2229578a7 100644 --- a/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.use_composters.snbt +++ b/projects/common/src/testMod/resources/data/cctest/structures/turtle_test.use_composters.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: "minecraft:composter{level:0}"}, - {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: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [{Count: 64b, Slot: 0b, id: "minecraft:spruce_sapling"}], Label: "turtle_test.use_composters", 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: 64b, Slot: 0b, id: "minecraft:spruce_sapling"}], Label: "turtle_test.use_composters", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}} ], entities: [], palette: [ "minecraft:polished_andesite", - "computercraft:turtle_normal{facing:south,waterlogged:false}", - "minecraft:air", - "minecraft:composter{level:0}" + "minecraft:composter{level:0}", + "computercraft:turtle_normal{facing:south,waterlogged:false}" ] }