Bump CC:T to 1.116.0

I don't love the implementation of this (see discussion in #2220), but
it's better than nothing. Wow, the editor really needs a bit of a
rewrite, the code is kinda messy.

Fixes #1396.

.editorconfig

@@ -27,7 +27,7 @@ indent_size = 2
 [*.yml]
 indent_size = 2
 
-[{*.kt,*.kts}]
+[*.{kt,kts}]
 ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
 ij_kotlin_continuation_indent_size = 4
 ij_kotlin_spaces_around_equality_operators = true
@@ -39,3 +39,14 @@ ij_kotlin_allow_trailing_comma_on_call_site = true
 ij_kotlin_method_parameters_wrap = off
 ij_kotlin_call_parameters_wrap = off
 ij_kotlin_extends_list_wrap = off
+
+ktlint_code_style = intellij_idea
+ktlint_standard_class-naming = disabled
+ktlint_standard_class-signature = disabled
+ktlint_standard_function-naming = disabled
+ktlint_standard_no-wildcard-imports = disabled
+
+# FIXME: These two are disable right now as they're over-eager in putting things
+#  on the same line. We should set max_line_length and handle this properly.
+ktlint_standard_function-signature = disabled
+ktlint_standard_function-expression-body = disabled

CONTRIBUTING.md

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

buildSrc/src/main/kotlin/cc-tweaked.forge.gradle.kts

@@ -6,7 +6,6 @@
 
 import cc.tweaked.gradle.CCTweakedExtension
 import cc.tweaked.gradle.CCTweakedPlugin
-import cc.tweaked.gradle.IdeaRunConfigurations
 import cc.tweaked.gradle.MinecraftConfigurations
 
 plugins {
@@ -20,7 +19,7 @@ val mcVersion: String by extra
 
 legacyForge {
     val libs = project.extensions.getByType<VersionCatalogsExtension>().named("libs")
-    version = "${mcVersion}-${libs.findVersion("forge").get()}"
+    version = "$mcVersion-${libs.findVersion("forge").get()}"
 
     parchment {
         minecraftVersion = libs.findVersion("parchmentMc").get().toString()

buildSrc/src/main/kotlin/cc-tweaked.java-convention.gradle.kts

@@ -29,7 +29,7 @@ base.archivesName.convention("cc-tweaked-$mcVersion-${project.name}")
 
 java {
     toolchain {
-        languageVersion= CCTweakedPlugin.JAVA_VERSION
+        languageVersion = CCTweakedPlugin.JAVA_VERSION
     }
 
     withSourcesJar()
@@ -86,6 +86,7 @@ sourceSets.all {
             check("InvalidBlockTag", CheckSeverity.OFF) // Broken by @cc.xyz
             check("InlineMeSuggester", CheckSeverity.OFF) // Minecraft uses @Deprecated liberally
             // Too many false positives right now. Maybe we need an indirection for it later on.
+            check("AssignmentExpression", CheckSeverity.OFF) // I'm a bad person.
             check("ReferenceEquality", CheckSeverity.OFF)
             check("EnumOrdinal", CheckSeverity.OFF) // For now. We could replace most of these with EnumMap.
             check("OperatorPrecedence", CheckSeverity.OFF) // For now.
@@ -114,7 +115,6 @@ tasks.compileTestJava {
     }
 }
 
-
 tasks.withType(JavaCompile::class.java).configureEach {
     options.encoding = "UTF-8"
 }
@@ -163,7 +163,7 @@ tasks.test {
 
 tasks.withType(JacocoReport::class.java).configureEach {
     reports.xml.required = true
-    reports.html.required =true
+    reports.html.required = true
 }
 
 project.plugins.withType(CCTweakedPlugin::class.java) {
@@ -187,30 +187,23 @@ spotless {
     fun FormatExtension.defaults() {
         endWithNewline()
         trimTrailingWhitespace()
-        indentWithSpaces(4)
+        leadingTabsToSpaces(4)
     }
 
     java {
         defaults()
+        importOrder("", "javax|java", "\\#")
         removeUnusedImports()
     }
 
-    val ktlintConfig = mapOf(
-        "ktlint_standard_no-wildcard-imports" to "disabled",
-        "ktlint_standard_class-naming" to "disabled",
-        "ktlint_standard_function-naming" to "disabled",
-        "ij_kotlin_allow_trailing_comma" to "true",
-        "ij_kotlin_allow_trailing_comma_on_call_site" to "true",
-    )
-
     kotlinGradle {
         defaults()
-        ktlint().editorConfigOverride(ktlintConfig)
+        ktlint()
     }
 
     kotlin {
         defaults()
-        ktlint().editorConfigOverride(ktlintConfig)
+        ktlint()
     }
 }
 

buildSrc/src/main/kotlin/cc/tweaked/gradle/ExecTasks.kt

@@ -5,10 +5,8 @@
 package cc.tweaked.gradle
 
 import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.provider.Property
 import org.gradle.api.tasks.AbstractExecTask
 import org.gradle.api.tasks.OutputDirectory
-import java.io.File
 
 abstract class ExecToDir : AbstractExecTask<ExecToDir>(ExecToDir::class.java) {
     @get:OutputDirectory

buildSrc/src/main/kotlin/cc/tweaked/gradle/IdeaRunConfigurations.kt

@@ -25,7 +25,6 @@ import javax.xml.xpath.XPathFactory
  * Would be good to PR some (or all) of these changes upstream at some point.
  *
  * @see net.fabricmc.loom.configuration.ide.idea.IdeaSyncTask
- * @see net.minecraftforge.gradle.common.util.runs.IntellijRunGenerator
  */
 internal class IdeaRunConfigurations(project: Project) {
     private val rootProject = project.rootProject
@@ -35,22 +34,6 @@ internal class IdeaRunConfigurations(project: Project) {
     private val writer = TransformerFactory.newInstance().newTransformer()
 
     private val ideaDir = rootProject.file(".idea/")
-    private val buildDir: Lazy<String?> = lazy {
-        val ideaMisc = ideaDir.resolve("misc.xml")
-
-        try {
-            val doc = Files.newBufferedReader(ideaMisc.toPath()).use {
-                documentBuilder.parse(InputSource(it))
-            }
-            val node =
-                xpath.evaluate("//component[@name=\"ProjectRootManager\"]/output", doc, XPathConstants.NODE) as Node
-            val attr = node.attributes.getNamedItem("url") as Attr
-            attr.value.removePrefix("file://")
-        } catch (e: Exception) {
-            LOGGER.error("Failed to find root directory", e)
-            null
-        }
-    }
 
     fun patch() = synchronized(LOCK) {
         val runConfigDir = ideaDir.resolve("runConfigurations")
@@ -58,10 +41,9 @@ internal class IdeaRunConfigurations(project: Project) {
 
         Files.list(runConfigDir.toPath()).use {
             for (configuration in it) {
-                val filename = configuration.fileName.toString();
+                val filename = configuration.fileName.toString()
                 when {
                     filename.endsWith("_fabric.xml") -> patchFabric(configuration)
-                    filename.startsWith("forge_") && filename.endsWith(".xml") -> patchForge(configuration)
                     else -> {}
                 }
             }
@@ -72,65 +54,6 @@ internal class IdeaRunConfigurations(project: Project) {
         setXml("//configuration", "folderName") { "Fabric" }
     }
 
-    private fun patchForge(path: Path) = withXml(path) {
-        val configId = path.fileName.toString().removePrefix("forge_").removeSuffix(".xml")
-        val sourceSet = forgeConfigs[configId]
-        if (sourceSet == null) {
-            LOGGER.error("[{}] Cannot map run configuration to a known source set", path)
-            return@withXml
-        }
-
-        setXml("//configuration", "folderName") { "Forge" }
-        setXml("//configuration/module", "name") { "${rootProject.name}.forge.$sourceSet" }
-
-        if (buildDir.value == null) return@withXml
-        setXml("//configuration/envs/env[@name=\"MOD_CLASSES\"]", "value") { classpath ->
-            val classes = classpath!!.split(':')
-            val newClasses = mutableListOf<String>()
-            fun appendUnique(x: String) {
-                if (!newClasses.contains(x)) newClasses.add(x)
-            }
-
-            for (entry in classes) {
-                if (!entry.contains("/out/")) {
-                    appendUnique(entry)
-                    continue
-                }
-
-                val match = CLASSPATH_ENTRY.matchEntire(entry)
-                if (match != null) {
-                    val modId = match.groups["modId"]!!.value
-                    val proj = match.groups["proj"]!!.value
-                    var component = match.groups["component"]!!.value
-                    if (component == "production") component = "main"
-
-                    appendUnique(forgeModEntry(modId, proj, component))
-                } else {
-                    LOGGER.warn("[{}] Unknown classpath entry {}", path, entry)
-                    appendUnique(entry)
-                }
-            }
-
-            // Ensure common code is on the classpath
-            for (proj in listOf("common", "common-api")) {
-                for (component in listOf("main", "client")) {
-                    appendUnique(forgeModEntry("computercraft", proj, component))
-                }
-            }
-
-            if (newClasses.any { it.startsWith("cctest%%") }) {
-                appendUnique(forgeModEntry("cctest", "core", "testFixtures"))
-                appendUnique(forgeModEntry("cctest", "common", "testFixtures"))
-                appendUnique(forgeModEntry("cctest", "common", "testMod"))
-            }
-
-            newClasses.joinToString(":")
-        }
-    }
-
-    private fun forgeModEntry(mod: String, project: String, component: String) =
-        "$mod%%${buildDir.value}/production/${rootProject.name}.$project.$component"
-
     private fun LocatedDocument.setXml(xpath: String, attribute: String, value: (String?) -> String) {
         val node = this@IdeaRunConfigurations.xpath.evaluate(xpath, document, XPathConstants.NODE) as Node?
         if (node == null) {
@@ -159,16 +82,5 @@ internal class IdeaRunConfigurations(project: Project) {
     companion object {
         private val LOGGER = Logging.getLogger(IdeaRunConfigurations::class.java)
         private val LOCK = Any()
-
-        private val CLASSPATH_ENTRY =
-            Regex("(?<modId>[a-z]+)%%\\\$PROJECT_DIR\\\$/projects/(?<proj>[a-z-]+)/out/(?<component>\\w+)/(?<type>[a-z]+)\$")
-
-        private val forgeConfigs = mapOf(
-            "runClient" to "client",
-            "runData" to "main",
-            "runGameTestServer" to "testMod",
-            "runServer" to "main",
-            "runTestClient" to "testMod",
-        )
     }
 }

buildSrc/src/main/kotlin/cc/tweaked/gradle/XmlUtil.kt

@@ -1,16 +0,0 @@
-// SPDX-FileCopyrightText: 2022 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package cc.tweaked.gradle
-
-import groovy.util.Node
-import groovy.util.NodeList
-
-object XmlUtil {
-    fun findChild(node: Node, name: String): Node? = when (val child = node.get(name)) {
-        is Node -> child
-        is NodeList -> child.singleOrNull() as Node?
-        else -> null
-    }
-}

gradle.properties

@@ -10,7 +10,7 @@ kotlin.jvm.target.validation.mode=error
 
 # Mod properties
 isUnstable=false
-modVersion=1.115.1
+modVersion=1.116.0
 
 # Minecraft properties: We want to configure this here so we can read it in settings.gradle
 mcVersion=1.20.1

gradle/libs.versions.toml

@@ -26,7 +26,7 @@ slf4j = "2.0.1"
 asm = "9.6"
 autoService = "1.1.1"
 checkerFramework = "3.42.0"
-cobalt = { strictly = "0.9.5" }
+cobalt = { strictly = "0.9.6" }
 commonsCli = "1.6.0"
 jetbrainsAnnotations = "24.1.0"
 jspecify = "1.0.0"
@@ -57,24 +57,24 @@ junitPlatform = "1.11.4"
 jmh = "1.37"
 
 # Build tools
-cctJavadoc = "1.8.3"
-checkstyle = "10.21.2"
-errorProne-core = "2.36.0"
+cctJavadoc = "1.8.4"
+checkstyle = "10.23.1"
+errorProne-core = "2.38.0"
 errorProne-plugin = "4.1.0"
-fabric-loom = "1.9.2"
+fabric-loom = "1.10.4"
 githubRelease = "2.5.2"
 gradleVersions = "0.50.0"
 ideaExt = "1.1.7"
-illuaminate = "0.1.0-74-gf1551d5"
+illuaminate = "0.1.0-83-g1131f68"
 lwjgl = "3.3.3"
 minotaur = "2.8.7"
-modDevGradle = "2.0.74"
-nullAway = "0.12.3"
+modDevGradle = "2.0.95"
+nullAway = "0.12.7"
 shadow = "8.3.1"
-spotless = "6.23.3"
+spotless = "7.0.2"
 taskTree = "2.1.1"
 teavm = "0.11.0-SQUID.1"
-vanillaExtract = "0.2.0"
+vanillaExtract = "0.2.1"
 versionCatalogUpdate = "0.8.1"
 
 [libraries]

package.json

@@ -12,11 +12,11 @@
     "tslib": "^2.0.3"
   },
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "^15.2.1",
-    "@rollup/plugin-typescript": "^12.0.0",
+    "@rollup/plugin-node-resolve": "^16.0.0",
+    "@rollup/plugin-typescript": "^12.0.0 && <12.1.3",
     "@rollup/plugin-url": "^8.0.1",
     "@swc/core": "^1.3.92",
-    "@types/node": "^22.0.0",
+    "@types/node": "^24.0.0",
     "lightningcss": "^1.22.0",
     "preact-render-to-string": "^6.2.1",
     "rehype": "^13.0.0",

projects/common-api/src/main/java/dan200/computercraft/api/ComputerCraftTags.java

@@ -26,6 +26,20 @@ public class ComputerCraftTags {
         public static final TagKey<Item> WIRED_MODEM = make("wired_modem");
         public static final TagKey<Item> MONITOR = make("monitor");
 
+        /**
+         * Floppy disks. Both the read/write version, and treasure disks.
+         *
+         * @since 1.116.0
+         */
+        public static final TagKey<Item> DISKS = make("disks");
+
+        /**
+         * All pocket computers.
+         *
+         * @since 1.116.0
+         */
+        public static final TagKey<Item> POCKET_COMPUTERS = make("pocket_computers");
+
         /**
          * Items which can be {@linkplain Item#use(Level, Player, InteractionHand) used} when calling
          * {@code turtle.place()}.

projects/common/src/client/java/dan200/computercraft/client/ClientRegistry.java

@@ -47,6 +47,8 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.ItemLike;
 import org.jspecify.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -63,6 +65,8 @@ import java.util.function.Supplier;
  * @see ModRegistry The common registry for actual game objects.
  */
 public final class ClientRegistry {
+    private static final Logger LOG = LoggerFactory.getLogger(ClientRegistry.class);
+
     private ClientRegistry() {
     }
 
@@ -182,7 +186,18 @@ public final class ClientRegistry {
     }
 
     public static void registerShaders(ResourceProvider resources, BiConsumer<ShaderInstance, Consumer<ShaderInstance>> load) throws IOException {
-        RenderTypes.registerShaders(resources, load);
+        RenderTypes.registerShaders(resources, (name, create, onLoaded) -> {
+            ShaderInstance shader;
+            try {
+                shader = create.get();
+            } catch (Exception e) {
+                LOG.error("Failed to load {}", name, e);
+                onLoaded.accept(null);
+                return;
+            }
+
+            load.accept(shader, onLoaded);
+        });
     }
 
     private record UnclampedPropertyFunction(

projects/common/src/client/java/dan200/computercraft/client/gui/KeyConverter.java

@@ -0,0 +1,40 @@
+// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.client.gui;
+
+import org.lwjgl.glfw.GLFW;
+
+/**
+ * Supports for converting/translating key codes.
+ */
+public class KeyConverter {
+    /**
+     * GLFW's key events refer to the physical key code, rather than the "actual" key code (with keyboard layout
+     * applied).
+     * <p>
+     * This makes sense for WASD-style input, but is a right pain for keyboard shortcuts — this function attempts to
+     * translate those keys back to their "actual" key code. See also
+     * <a href="https://github.com/glfw/glfw/issues/1502"> this discussion on GLFW's GitHub.</a>
+     *
+     * @param key      The current key code.
+     * @param scanCode The current scan code.
+     * @return The translated key code.
+     */
+    public static int physicalToActual(int key, int scanCode) {
+        var name = GLFW.glfwGetKeyName(key, scanCode);
+        if (name == null || name.length() != 1) return key;
+
+        // If we've got a single character as the key name, treat that as the ASCII value of the key,
+        // and map that back to a key code.
+        var character = name.charAt(0);
+
+        // 0-9 and A-Z map directly to their GLFW key (they're the same ASCII code).
+        if ((character >= '0' && character <= '9') || (character >= 'A' && character <= 'Z')) return character;
+        // a-z map to GLFW_KEY_{A,Z}
+        if (character >= 'a' && character <= 'z') return GLFW.GLFW_KEY_A + (character - 'a');
+
+        return key;
+    }
+}

projects/common/src/client/java/dan200/computercraft/client/gui/widgets/TerminalWidget.java

@@ -5,6 +5,7 @@
 package dan200.computercraft.client.gui.widgets;
 
 import com.mojang.blaze3d.vertex.Tesselator;
+import dan200.computercraft.client.gui.KeyConverter;
 import dan200.computercraft.client.render.RenderTypes;
 import dan200.computercraft.client.render.text.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.Terminal;
@@ -85,7 +86,7 @@ public class TerminalWidget extends AbstractWidget {
         }
 
         if ((modifiers & GLFW.GLFW_MOD_CONTROL) != 0) {
-            switch (key) {
+            switch (KeyConverter.physicalToActual(key, scancode)) {
                 case GLFW.GLFW_KEY_T -> {
                     if (terminateTimer < 0) terminateTimer = 0;
                 }
@@ -121,7 +122,7 @@ public class TerminalWidget extends AbstractWidget {
             computer.keyUp(key);
         }
 
-        switch (key) {
+        switch (KeyConverter.physicalToActual(key, scancode)) {
             case GLFW.GLFW_KEY_T -> terminateTimer = -1;
             case GLFW.GLFW_KEY_R -> rebootTimer = -1;
             case GLFW.GLFW_KEY_S -> shutdownTimer = -1;

projects/common/src/client/java/dan200/computercraft/client/render/CustomLecternRenderer.java

@@ -12,6 +12,7 @@ import dan200.computercraft.client.pocket.ClientPocketComputers;
 import dan200.computercraft.client.render.text.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.core.util.Colour;
+import dan200.computercraft.shared.ModRegistry;
 import dan200.computercraft.shared.lectern.CustomLecternBlockEntity;
 import dan200.computercraft.shared.media.items.PrintoutItem;
 import dan200.computercraft.shared.pocket.items.PocketComputerItem;
@@ -57,9 +58,9 @@ public class CustomLecternRenderer implements BlockEntityRenderer<CustomLecternB
         poseStack.translate(0, -0.125f, 0);
 
         var item = lectern.getItem();
-        if (item.getItem() instanceof PrintoutItem printout) {
+        if (item.getItem() instanceof PrintoutItem) {
             var vertexConsumer = LecternPrintoutModel.MATERIAL.buffer(buffer, RenderType::entitySolid);
-            if (printout.getType() == PrintoutItem.Type.BOOK) {
+            if (item.is(ModRegistry.Items.PRINTED_BOOK.get())) {
                 printoutModel.renderBook(poseStack, vertexConsumer, packedLight, packedOverlay);
             } else {
                 printoutModel.renderPages(poseStack, vertexConsumer, packedLight, packedOverlay, PrintoutItem.getPageCount(item));

projects/common/src/client/java/dan200/computercraft/client/render/PrintoutItemRenderer.java

@@ -6,6 +6,7 @@ package dan200.computercraft.client.render;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
+import dan200.computercraft.shared.ModRegistry;
 import dan200.computercraft.shared.media.items.PrintoutItem;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.world.entity.EntityType;
@@ -51,7 +52,7 @@ public final class PrintoutItemRenderer extends ItemMapLikeRenderer {
 
     private static void drawPrintout(PoseStack transform, MultiBufferSource render, ItemStack stack, int light) {
         var pages = PrintoutItem.getPageCount(stack);
-        var book = ((PrintoutItem) stack.getItem()).getType() == PrintoutItem.Type.BOOK;
+        var book = stack.is(ModRegistry.Items.PRINTED_BOOK.get());
 
         double width = LINE_MAX_LENGTH * FONT_WIDTH + X_TEXT_MARGIN * 2;
         double height = LINES_PER_PAGE * FONT_HEIGHT + Y_TEXT_MARGIN * 2;

projects/common/src/client/java/dan200/computercraft/client/render/RenderTypes.java

@@ -16,11 +16,11 @@ import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.ShaderInstance;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.ResourceProvider;
+import org.apache.commons.io.function.IOSupplier;
 import org.jspecify.annotations.Nullable;
 
 import java.io.IOException;
 import java.util.Objects;
-import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 /**
@@ -68,9 +68,12 @@ public class RenderTypes {
         return Objects.requireNonNull(GameRenderer.getRendertypeTextShader(), "Text shader has not been registered");
     }
 
-    public static void registerShaders(ResourceProvider resources, BiConsumer<ShaderInstance, Consumer<ShaderInstance>> load) throws IOException {
-        load.accept(
-            new MonitorTextureBufferShader(
+    public interface ShaderLoader {
+        void tryLoad(String name, IOSupplier<ShaderInstance> create, Consumer<@Nullable ShaderInstance> accept) throws IOException;
+    }
+
+    public static void registerShaders(ResourceProvider resources, ShaderLoader load) throws IOException {
+        load.tryLoad("monitor shader", () -> new MonitorTextureBufferShader(
                 resources,
                 ComputerCraftAPI.MOD_ID + "/monitor_tbo",
                 MONITOR_TBO.format()

projects/common/src/client/java/dan200/computercraft/client/render/TurtleBlockEntityRenderer.java

@@ -66,8 +66,8 @@ public class TurtleBlockEntityRenderer implements BlockEntityRenderer<TurtleBloc
             var matrix = transform.last().pose();
             var opacity = (int) (mc.options.getBackgroundOpacity(0.25f) * 255) << 24;
             var width = -font.width(label) / 2.0f;
-            font.drawInBatch(label, width, (float) 0, 0x20ffffff, false, matrix, buffers, Font.DisplayMode.SEE_THROUGH, opacity, lightmapCoord);
-            font.drawInBatch(label, width, (float) 0, 0xffffffff, false, matrix, buffers, Font.DisplayMode.NORMAL, 0, lightmapCoord);
+            font.drawInBatch(label, width, 0, 0x20ffffff, false, matrix, buffers, Font.DisplayMode.SEE_THROUGH, opacity, lightmapCoord);
+            font.drawInBatch(label, width, 0, 0xffffffff, false, matrix, buffers, Font.DisplayMode.NORMAL, 0, lightmapCoord);
 
             transform.popPose();
         }

projects/common/src/datagen/java/dan200/computercraft/data/LanguageProvider.java

@@ -106,6 +106,8 @@ public final class LanguageProvider implements DataProvider {
         add(ComputerCraftTags.Items.TURTLE, "Turtles");
         add(ComputerCraftTags.Items.WIRED_MODEM, "Wired modems");
         add(ComputerCraftTags.Items.MONITOR, "Monitors");
+        add(ComputerCraftTags.Items.DISKS, "Disks");
+        add(ComputerCraftTags.Items.POCKET_COMPUTERS, "Pocket Computers");
 
         // Turtle/pocket upgrades
         add("upgrade.minecraft.diamond_sword.adjective", "Melee");
@@ -183,7 +185,6 @@ public final class LanguageProvider implements DataProvider {
         // Metrics
         add(Metrics.COMPUTER_TASKS, "Tasks");
         add(Metrics.SERVER_TASKS, "Server tasks");
-        add(Metrics.JAVA_ALLOCATION, "Java Allocations");
         add(Metrics.PERIPHERAL_OPS, "Peripheral calls");
         add(Metrics.FS_OPS, "Filesystem operations");
         add(Metrics.HTTP_REQUESTS, "HTTP requests");

projects/common/src/datagen/java/dan200/computercraft/data/TagProvider.java

@@ -98,6 +98,8 @@ class TagProvider {
         tags.copy(ComputerCraftTags.Blocks.TURTLE, ComputerCraftTags.Items.TURTLE);
         tags.tag(ComputerCraftTags.Items.WIRED_MODEM).add(ModRegistry.Items.WIRED_MODEM.get(), ModRegistry.Items.WIRED_MODEM_FULL.get());
         tags.copy(ComputerCraftTags.Blocks.MONITOR, ComputerCraftTags.Items.MONITOR);
+        tags.tag(ComputerCraftTags.Items.DISKS).add(ModRegistry.Items.DISK.get(), ModRegistry.Items.TREASURE_DISK.get());
+        tags.tag(ComputerCraftTags.Items.POCKET_COMPUTERS).add(ModRegistry.Items.POCKET_COMPUTER_NORMAL.get(), ModRegistry.Items.POCKET_COMPUTER_ADVANCED.get());
 
         tags.tag(ItemTags.PIGLIN_LOVED).add(
             ModRegistry.Items.COMPUTER_ADVANCED.get(), ModRegistry.Items.TURTLE_ADVANCED.get(),

projects/common/src/generated/resources/assets/computercraft/lang/en_us.json

@@ -205,7 +205,9 @@
   "item.computercraft.treasure_disk": "Floppy Disk",
   "itemGroup.computercraft": "ComputerCraft",
   "tag.item.computercraft.computer": "Computers",
+  "tag.item.computercraft.disks": "Disks",
   "tag.item.computercraft.monitor": "Monitors",
+  "tag.item.computercraft.pocket_computers": "Pocket Computers",
   "tag.item.computercraft.turtle": "Turtles",
   "tag.item.computercraft.wired_modem": "Wired modems",
   "tracking_field.computercraft.avg": "%s (avg)",
@@ -215,7 +217,6 @@
   "tracking_field.computercraft.http_download.name": "HTTP download",
   "tracking_field.computercraft.http_requests.name": "HTTP requests",
   "tracking_field.computercraft.http_upload.name": "HTTP upload",
-  "tracking_field.computercraft.java_allocation.name": "Java Allocations",
   "tracking_field.computercraft.max": "%s (max)",
   "tracking_field.computercraft.peripheral.name": "Peripheral calls",
   "tracking_field.computercraft.server_tasks.name": "Server tasks",

projects/common/src/main/java/dan200/computercraft/impl/network/wired/WiredNetworkImpl.java

@@ -437,8 +437,8 @@ final class WiredNetworkImpl implements WiredNetwork {
     }
 
     private static WiredNodeImpl checkNode(WiredNode node) {
-        if (node instanceof WiredNodeImpl) {
-            return (WiredNodeImpl) node;
+        if (node instanceof WiredNodeImpl n) {
+            return n;
         } else {
             throw new IllegalArgumentException("Unknown implementation of IWiredNode: " + node);
         }

projects/common/src/main/java/dan200/computercraft/shared/ModRegistry.java

@@ -264,11 +264,11 @@ public final class ModRegistry {
             REGISTRY.register("treasure_disk", () -> new TreasureDiskItem(properties().stacksTo(1)));
 
         public static final RegistryEntry<PrintoutItem> PRINTED_PAGE = REGISTRY.register("printed_page",
-            () -> new PrintoutItem(properties().stacksTo(1), PrintoutItem.Type.PAGE));
+            () -> new PrintoutItem(properties().stacksTo(1)));
         public static final RegistryEntry<PrintoutItem> PRINTED_PAGES = REGISTRY.register("printed_pages",
-            () -> new PrintoutItem(properties().stacksTo(1), PrintoutItem.Type.PAGES));
+            () -> new PrintoutItem(properties().stacksTo(1)));
         public static final RegistryEntry<PrintoutItem> PRINTED_BOOK = REGISTRY.register("printed_book",
-            () -> new PrintoutItem(properties().stacksTo(1), PrintoutItem.Type.BOOK));
+            () -> new PrintoutItem(properties().stacksTo(1)));
 
         public static final RegistryEntry<BlockItem> SPEAKER = ofBlock(Blocks.SPEAKER, BlockItem::new);
         public static final RegistryEntry<BlockItem> DISK_DRIVE = ofBlock(Blocks.DISK_DRIVE, BlockItem::new);

projects/common/src/main/java/dan200/computercraft/shared/command/builder/HelpingArgumentBuilder.java

@@ -66,8 +66,8 @@ public final class HelpingArgumentBuilder extends LiteralArgumentBuilder<Command
     public LiteralArgumentBuilder<CommandSourceStack> then(final ArgumentBuilder<CommandSourceStack, ?> argument) {
         if (getRedirect() != null) throw new IllegalStateException("Cannot add children to a redirected node");
 
-        if (argument instanceof HelpingArgumentBuilder) {
-            children.add((HelpingArgumentBuilder) argument);
+        if (argument instanceof HelpingArgumentBuilder child) {
+            children.add(child);
         } else if (argument instanceof LiteralArgumentBuilder) {
             super.then(argument);
         } else {

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

@@ -4,7 +4,6 @@
 
 package dan200.computercraft.shared.computer.blocks;
 
-import dan200.computercraft.annotations.ForgeOverride;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.shared.common.IBundledRedstoneBlock;
 import dan200.computercraft.shared.computer.items.IComputerItem;
@@ -25,7 +24,6 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.EntityBlock;
 import net.minecraft.world.level.block.HorizontalDirectionalBlock;
@@ -177,12 +175,6 @@ public abstract class AbstractComputerBlock<T extends AbstractComputerBlockEntit
         if (be instanceof AbstractComputerBlockEntity computer) computer.neighborChanged(neighbourPos);
     }
 
-    @ForgeOverride
-    public final void onNeighborChange(BlockState state, LevelReader world, BlockPos pos, BlockPos neighbour) {
-        var be = world.getBlockEntity(pos);
-        if (be instanceof AbstractComputerBlockEntity computer) computer.neighborChanged(neighbour);
-    }
-
     @Override
     @Deprecated
     public BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor level, BlockPos pos, BlockPos neighborPos) {

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

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

projects/common/src/main/java/dan200/computercraft/shared/media/MountMedia.java

@@ -14,8 +14,8 @@ import dan200.computercraft.shared.media.items.DiskItem;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.item.ItemStack;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.function.Supplier;
 import java.util.function.ToIntFunction;
 

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

@@ -4,19 +4,18 @@
 
 package dan200.computercraft.shared.media.items;
 
-import dan200.computercraft.annotations.ForgeOverride;
 import dan200.computercraft.core.util.Colour;
 import dan200.computercraft.shared.ModRegistry;
 import dan200.computercraft.shared.common.IColouredItem;
+import dan200.computercraft.shared.peripheral.diskdrive.DiskDriveBlock;
 import net.minecraft.ChatFormatting;
-import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
+import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelReader;
 import org.jspecify.annotations.Nullable;
 
 import java.util.List;
@@ -47,9 +46,9 @@ public class DiskItem extends Item implements IColouredItem {
         }
     }
 
-    @ForgeOverride
-    public boolean doesSneakBypassUse(ItemStack stack, LevelReader world, BlockPos pos, Player player) {
-        return true;
+    @Override
+    public InteractionResult useOn(UseOnContext context) {
+        return DiskDriveBlock.defaultUseItemOn(context);
     }
 
     public static int getDiskID(ItemStack stack) {

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

@@ -33,17 +33,8 @@ public class PrintoutItem extends Item {
     public static final int LINE_MAX_LENGTH = 25;
     public static final int MAX_PAGES = 16;
 
-    public enum Type {
-        PAGE,
-        PAGES,
-        BOOK
-    }
-
-    private final Type type;
-
-    public PrintoutItem(Properties settings, Type type) {
+    public PrintoutItem(Properties settings) {
         super(settings);
-        this.type = type;
     }
 
     @Override
@@ -103,10 +94,6 @@ public class PrintoutItem extends Item {
         return ModRegistry.Items.PRINTED_BOOK.get().createFromTitleAndText(title, text, colours);
     }
 
-    public Type getType() {
-        return type;
-    }
-
     public static String getTitle(ItemStack stack) {
         var nbt = stack.getTag();
         return nbt != null && nbt.contains(NBT_TITLE) ? nbt.getString(NBT_TITLE) : "";

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

@@ -4,17 +4,16 @@
 
 package dan200.computercraft.shared.media.items;
 
-import dan200.computercraft.annotations.ForgeOverride;
 import dan200.computercraft.core.util.Colour;
 import dan200.computercraft.shared.ModRegistry;
-import net.minecraft.core.BlockPos;
+import dan200.computercraft.shared.peripheral.diskdrive.DiskDriveBlock;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
+import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelReader;
 import org.jspecify.annotations.Nullable;
 
 import java.util.List;
@@ -34,9 +33,9 @@ public class TreasureDiskItem extends Item {
         if (!label.isEmpty()) list.add(Component.literal(label));
     }
 
-    @ForgeOverride
-    public boolean doesSneakBypassUse(ItemStack stack, LevelReader world, BlockPos pos, Player player) {
-        return true;
+    @Override
+    public InteractionResult useOn(UseOnContext context) {
+        return DiskDriveBlock.defaultUseItemOn(context);
     }
 
     public static ItemStack create(String subPath, int colourIndex) {

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

@@ -10,8 +10,8 @@ import dan200.computercraft.api.media.IMedia;
 import dan200.computercraft.core.filesystem.SubMount;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.item.ItemStack;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 
 /**

projects/common/src/main/java/dan200/computercraft/shared/media/recipes/PrintoutRecipe.java

@@ -58,7 +58,7 @@ public final class PrintoutRecipe extends CustomRecipe {
             for (var x = 0; x < inventory.getWidth(); x++) {
                 var stack = inventory.getItem(x + y * inventory.getWidth());
                 if (!stack.isEmpty()) {
-                    if (stack.getItem() instanceof PrintoutItem printout && printout.getType() != PrintoutItem.Type.BOOK) {
+                    if (stack.is(ModRegistry.Items.PRINTED_PAGE.get()) || stack.is(ModRegistry.Items.PRINTED_PAGES.get())) {
                         if (printouts == null) printouts = new ItemStack[9];
                         printouts[numPrintouts] = stack;
                         numPages += PrintoutItem.getPageCount(stack);

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

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

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

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

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

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

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

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

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

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

projects/common/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessModemBlockEntity.java

@@ -38,7 +38,7 @@ public class WirelessModemBlockEntity extends BlockEntity {
 
         @Override
         public boolean equals(@Nullable IPeripheral other) {
-            return this == other || (other instanceof Peripheral && entity == ((Peripheral) other).entity);
+            return this == other || (other instanceof Peripheral o && entity == o.entity);
         }
 
         @Override

projects/common/src/main/java/dan200/computercraft/shared/peripheral/monitor/MonitorPeripheral.java

@@ -40,7 +40,6 @@ import org.jspecify.annotations.Nullable;
  * monitor.setCursorPos(1, 1)
  * monitor.write("Hello, world!")
  * }</pre>
- *
  * @cc.see monitor_resize Queued when a monitor is resized.
  * @cc.see monitor_touch Queued when an advanced monitor is clicked.
  */
@@ -95,7 +94,7 @@ public class MonitorPeripheral extends TermMethods implements IPeripheral {
 
     @Override
     public boolean equals(@Nullable IPeripheral other) {
-        return other instanceof MonitorPeripheral && monitor == ((MonitorPeripheral) other).monitor;
+        return other instanceof MonitorPeripheral o && monitor == o.monitor;
     }
 
     private ServerMonitor getMonitor() throws LuaException {

projects/common/src/main/java/dan200/computercraft/shared/peripheral/monitor/MonitorWatcher.java

@@ -57,11 +57,10 @@ public final class MonitorWatcher {
             if (monitor == null) continue;
 
             var pos = tile.getBlockPos();
-            var world = tile.getLevel();
-            if (!(world instanceof ServerLevel)) continue;
+            if (!(tile.getLevel() instanceof ServerLevel level)) continue;
 
-            var chunk = world.getChunkAt(pos);
-            if (((ServerLevel) world).getChunkSource().chunkMap.getPlayers(chunk.getPos(), false).isEmpty()) {
+            var chunk = level.getChunkAt(pos);
+            if (level.getChunkSource().chunkMap.getPlayers(chunk.getPos(), false).isEmpty()) {
                 continue;
             }
 

projects/common/src/main/java/dan200/computercraft/shared/peripheral/printer/PrinterBlockEntity.java

@@ -5,6 +5,7 @@
 package dan200.computercraft.shared.peripheral.printer;
 
 import dan200.computercraft.api.peripheral.IPeripheral;
+import dan200.computercraft.shared.ModRegistry;
 import dan200.computercraft.shared.common.AbstractContainerBlockEntity;
 import dan200.computercraft.shared.computer.terminal.NetworkedTerminal;
 import dan200.computercraft.shared.container.BasicWorldlyContainer;
@@ -159,9 +160,7 @@ public final class PrinterBlockEntity extends AbstractContainerBlockEntity imple
     }
 
     static boolean isPaper(ItemStack stack) {
-        var item = stack.getItem();
-        return item == Items.PAPER
-            || (item instanceof PrintoutItem printout && printout.getType() == PrintoutItem.Type.PAGE);
+        return stack.is(Items.PAPER) || stack.is(ModRegistry.Items.PRINTED_PAGE.get());
     }
 
     private boolean canInputPage() {

projects/common/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerBlockEntity.java

@@ -53,7 +53,7 @@ public class SpeakerBlockEntity extends BlockEntity {
 
         @Override
         public boolean equals(@Nullable IPeripheral other) {
-            return this == other || (other instanceof Peripheral && speaker == ((Peripheral) other).speaker);
+            return this == other || (other instanceof Peripheral o && speaker == o.speaker);
         }
     }
 }

projects/common/src/main/java/dan200/computercraft/shared/pocket/core/PocketBrain.java

@@ -44,11 +44,12 @@ public final class PocketBrain implements IPocketAccess {
     private int colour = -1;
     private int lightColour = -1;
 
-    public PocketBrain(PocketHolder holder, @Nullable UpgradeData<IPocketUpgrade> upgrade, ServerComputer.Properties properties) {
+    public PocketBrain(PocketHolder holder, @Nullable UpgradeData<IPocketUpgrade> upgrade, int colour, ServerComputer.Properties properties) {
         this.computer = new PocketServerComputer(this, holder, properties);
         this.holder = holder;
         this.position = holder.pos();
         this.upgrade = UpgradeData.copyOf(upgrade);
+        this.colour = colour;
         invalidatePeripheral();
     }
 

projects/common/src/main/java/dan200/computercraft/shared/pocket/items/PocketComputerItem.java

@@ -272,7 +272,7 @@ public class PocketComputerItem extends Item implements IComputerItem, IColoured
         }
 
         var brain = new PocketBrain(
-            holder, getUpgradeWithData(stack),
+            holder, getUpgradeWithData(stack), getColour(stack),
             ServerComputer.properties(getComputerID(stack), getFamily()).label(getLabel(stack))
         );
         var computer = brain.computer();
@@ -314,10 +314,14 @@ public class PocketComputerItem extends Item implements IComputerItem, IColoured
         // item. However, if we've just crafted the computer with an upgrade, we should sync the other way, and update
         // the computer.
         var server = level.getServer();
-        if (server != null) {
-            var computer = getServerComputer(server, stack);
-            if (computer != null) computer.getBrain().setUpgrade(getUpgradeWithData(stack));
-        }
+        if (server == null) return;
+
+        var computer = getServerComputer(server, stack);
+        if (computer == null) return;
+
+        var brain = computer.getBrain();
+        brain.setUpgrade(getUpgradeWithData(stack));
+        brain.setColour(getColour(stack));
     }
 
     // IComputerItem implementation

projects/common/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketSpeaker.java

@@ -25,7 +25,6 @@ public class PocketSpeaker extends AbstractPocketUpgrade {
 
     @Override
     public void update(IPocketAccess access, @Nullable IPeripheral peripheral) {
-        if (!(peripheral instanceof PocketSpeakerPeripheral)) return;
-        ((PocketSpeakerPeripheral) peripheral).update();
+        if (peripheral instanceof PocketSpeakerPeripheral speaker) speaker.update();
     }
 }

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

@@ -13,7 +13,9 @@ import dan200.computercraft.core.metrics.Metrics;
 import dan200.computercraft.core.metrics.MetricsObserver;
 import dan200.computercraft.shared.peripheral.generic.methods.AbstractInventoryMethods;
 import dan200.computercraft.shared.turtle.core.*;
+import org.jspecify.annotations.Nullable;
 
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -659,6 +661,7 @@ public class TurtleAPI implements ILuaAPI {
      * @cc.treturn [2] string The reason equipping this item failed.
      * @cc.since 1.6
      * @see #equipRight()
+     * @see #getEquippedLeft()
      */
     @LuaFunction
     public final MethodResult equipLeft() {
@@ -678,12 +681,45 @@ public class TurtleAPI implements ILuaAPI {
      * @cc.treturn [2] string The reason equipping this item failed.
      * @cc.since 1.6
      * @see #equipLeft()
+     * @see #getEquippedRight()
      */
     @LuaFunction
     public final MethodResult equipRight() {
         return trackCommand(new TurtleEquipCommand(TurtleSide.RIGHT));
     }
 
+    /**
+     * Get the upgrade currently equipped on the left of the turtle.
+     * <p>
+     * This returns information about the currently equipped item, in the same form as
+     * {@link #getItemDetail(ILuaContext, Optional, Optional)}.
+     *
+     * @return Information about the currently equipped item, or {@code nil} if no upgrade is equipped.
+     * @see #equipLeft()
+     * @cc.since 1.116.0
+     */
+    @LuaFunction(mainThread = true)
+    public final @Nullable Map<?, ?> getEquippedLeft() {
+        var upgrade = turtle.getUpgradeWithData(TurtleSide.LEFT);
+        return upgrade == null ? null : VanillaDetailRegistries.ITEM_STACK.getDetails(upgrade.getUpgradeItem());
+    }
+
+    /**
+     * Get the upgrade currently equipped on the right of the turtle.
+     * <p>
+     * This returns information about the currently equipped item, in the same form as
+     * {@link #getItemDetail(ILuaContext, Optional, Optional)}.
+     *
+     * @return Information about the currently equipped item, or {@code nil} if no upgrade is equipped.
+     * @see #equipRight()
+     * @cc.since 1.116.0
+     */
+    @LuaFunction(mainThread = true)
+    public final @Nullable Map<?, ?> getEquippedRight() {
+        var upgrade = turtle.getUpgradeWithData(TurtleSide.RIGHT);
+        return upgrade == null ? null : VanillaDetailRegistries.ITEM_STACK.getDetails(upgrade.getUpgradeItem());
+    }
+
     /**
      * Get information about the block in front of the turtle.
      *
@@ -745,7 +781,7 @@ public class TurtleAPI implements ILuaAPI {
      *                 more information about the item at the cost of taking longer to run.
      * @return The command result.
      * @throws LuaException If the slot is out of range.
-     * @cc.treturn nil|table Information about the given slot, or {@code nil} if it is empty.
+     * @cc.treturn nil|table Information about the item in this slot, or {@code nil} if it is empty.
      * @cc.since 1.64
      * @cc.changed 1.90.0 Added detailed parameter.
      * @cc.usage Print the current slot, assuming it contains 13 dirt.

projects/common/src/main/java/dan200/computercraft/shared/turtle/core/TurtleDropCommand.java

@@ -62,14 +62,13 @@ public class TurtleDropCommand implements TurtleCommand {
             }
         }
 
-        switch (transferred) {
-            case ContainerTransfer.NO_SPACE:
-                return TurtleCommandResult.failure("No space for items");
-            case ContainerTransfer.NO_ITEMS:
-                return TurtleCommandResult.failure("No items to drop");
-            default:
+        return switch (transferred) {
+            case ContainerTransfer.NO_SPACE -> TurtleCommandResult.failure("No space for items");
+            case ContainerTransfer.NO_ITEMS -> TurtleCommandResult.failure("No items to drop");
+            default -> {
                 turtle.playAnimation(TurtleAnimation.WAIT);
-                return TurtleCommandResult.success();
-        }
+                yield TurtleCommandResult.success();
+            }
+        };
     }
 }

projects/common/src/main/java/dan200/computercraft/shared/turtle/core/TurtleSuckCommand.java

@@ -50,15 +50,14 @@ public class TurtleSuckCommand implements TurtleCommand {
         if (inventory != null) {
             // Take from inventory of thing in front
             var transferred = inventory.moveTo(TurtleUtil.getOffsetInventory(turtle), quantity);
-            switch (transferred) {
-                case ContainerTransfer.NO_SPACE:
-                    return TurtleCommandResult.failure("No space for items");
-                case ContainerTransfer.NO_ITEMS:
-                    return TurtleCommandResult.failure("No items to take");
-                default:
+            return switch (transferred) {
+                case ContainerTransfer.NO_SPACE -> TurtleCommandResult.failure("No space for items");
+                case ContainerTransfer.NO_ITEMS -> TurtleCommandResult.failure("No items to take");
+                default -> {
                     turtle.playAnimation(TurtleAnimation.WAIT);
-                    return TurtleCommandResult.success();
-            }
+                    yield TurtleCommandResult.success();
+                }
+            };
         } else {
             // Suck up loose items off the ground
             var aabb = new AABB(

projects/common/src/main/java/dan200/computercraft/shared/turtle/recipes/TurtleUpgradeRecipe.java

@@ -111,7 +111,9 @@ public final class TurtleUpgradeRecipe extends CustomRecipe {
             itemTurtle.getUpgradeWithData(turtle, TurtleSide.RIGHT),
         };
 
-        // Get the upgrades for the new items
+        // Get the upgrades for the new items.
+        // Note: because the turtle is facing towards us, the directions are flipped. Items placed to the left
+        // of the turtle, are equipped on its right (and vice versa).
         var items = new ItemStack[]{ rightItem, leftItem };
         for (var i = 0; i < 2; i++) {
             if (!items[i].isEmpty()) {

projects/common/src/main/java/dan200/computercraft/shared/util/DropConsumer.java

@@ -70,9 +70,9 @@ public final class DropConsumer {
 
     public static boolean onEntitySpawn(Entity entity) {
         // Capture any nearby item spawns
-        if (dropWorld == entity.level() && entity instanceof ItemEntity
+        if (dropWorld == entity.level() && entity instanceof ItemEntity item
             && assertNonNull(dropBounds).contains(entity.position())) {
-            handleDrops(((ItemEntity) entity).getItem());
+            handleDrops(item.getItem());
             return true;
         }
 

projects/common/src/main/java/dan200/computercraft/shared/util/PrettyJsonWriter.java

@@ -79,8 +79,8 @@ public class PrettyJsonWriter extends JsonWriter {
 
         // Otherwise we either need to push to our list or finish a record pair.
         var head = stack.getLast();
-        if (head instanceof DocList) {
-            ((DocList) head).add(object);
+        if (head instanceof DocList headList) {
+            headList.add(object);
         } else {
             stack.removeLast();
             ((DocList) stack.getLast()).add(new Pair((String) head, object));

projects/common/src/main/java/dan200/computercraft/shared/util/TickScheduler.java

@@ -165,7 +165,7 @@ public final class TickScheduler {
         UNLOADED,
     }
 
-    private record ChunkReference(ResourceKey<Level> level, Long position) {
+    private record ChunkReference(ResourceKey<Level> level, long position) {
         @Override
         public String toString() {
             return "ChunkReference(" + level + " at " + new ChunkPos(position) + ")";

projects/common/src/main/resources/assets/computercraft/lang/cs_cz.json

@@ -205,7 +205,9 @@
     "item.computercraft.treasure_disk": "Disketa",
     "itemGroup.computercraft": "ComputerCraft",
     "tag.item.computercraft.computer": "Počítače",
+    "tag.item.computercraft.disks": "Disky",
     "tag.item.computercraft.monitor": "Monitory",
+    "tag.item.computercraft.pocket_computers": "Kapesní počítače",
     "tag.item.computercraft.turtle": "Roboti",
     "tag.item.computercraft.wired_modem": "Drátové modemy",
     "tracking_field.computercraft.avg": "%s (průměr)",
@@ -215,7 +217,6 @@
     "tracking_field.computercraft.http_download.name": "Stahování HTTP",
     "tracking_field.computercraft.http_requests.name": "Požadavky HTTP",
     "tracking_field.computercraft.http_upload.name": "Nahrávání HTTP",
-    "tracking_field.computercraft.java_allocation.name": "Java alokace",
     "tracking_field.computercraft.max": "%s (max)",
     "tracking_field.computercraft.peripheral.name": "Periferní volání",
     "tracking_field.computercraft.server_tasks.name": "Serverové úlohy",

projects/common/src/main/resources/assets/computercraft/lang/es_es.json

@@ -206,7 +206,6 @@
     "tracking_field.computercraft.http_download.name": "Descarga HTTP",
     "tracking_field.computercraft.http_requests.name": "Peticiones HTTP",
     "tracking_field.computercraft.http_upload.name": "Subida HTTP",
-    "tracking_field.computercraft.java_allocation.name": "Asignaciones de Java",
     "tracking_field.computercraft.max": "%s (max)",
     "tracking_field.computercraft.peripheral.name": "Llamadas del periférico",
     "tracking_field.computercraft.server_tasks.name": "Tareas del servidor",

projects/common/src/main/resources/assets/computercraft/lang/fr_fr.json

@@ -215,7 +215,6 @@
     "tracking_field.computercraft.http_download.name": "Téléchargement HTTP",
     "tracking_field.computercraft.http_requests.name": "Requêtes HTTP",
     "tracking_field.computercraft.http_upload.name": "Publication HTTP",
-    "tracking_field.computercraft.java_allocation.name": "Allocations Java",
     "tracking_field.computercraft.max": "%s (max)",
     "tracking_field.computercraft.peripheral.name": "Appels aux périphériques",
     "tracking_field.computercraft.server_tasks.name": "Tâches du serveur",

projects/common/src/main/resources/assets/computercraft/lang/it_it.json

@@ -12,9 +12,12 @@
     "block.computercraft.cable": "Cavo Di Rete",
     "block.computercraft.computer_advanced": "Computer Avanzato",
     "block.computercraft.computer_command": "Computer Comando",
+    "block.computercraft.computer_normal": "Computer",
     "block.computercraft.disk_drive": "Lettore Di Dischi",
     "block.computercraft.monitor_advanced": "Monitor Avanzato",
+    "block.computercraft.monitor_normal": "Monitor",
     "block.computercraft.printer": "Stampante",
+    "block.computercraft.redstone_relay": "Relè di redstone",
     "block.computercraft.speaker": "Altoparlante",
     "block.computercraft.turtle_advanced": "Tartaruga Avanzata",
     "block.computercraft.turtle_advanced.upgraded": "Tartaruga %s Avanzata",
@@ -35,6 +38,7 @@
     "commands.computercraft.dump.synopsis": "Mostra lo stato dei computer.",
     "commands.computercraft.generic.additional_rows": "%d colonne aggiuntive…",
     "commands.computercraft.generic.exception": "Eccezione non gestita (%s)",
+    "commands.computercraft.generic.no": "N",
     "commands.computercraft.generic.yes": "S",
     "commands.computercraft.help.desc": "Mostra questo messaggio d'aiuto",
     "commands.computercraft.help.no_children": "%s non ha sottocomandi",
@@ -50,6 +54,7 @@
     "commands.computercraft.tp.desc": "Teletrasporta alla posizione di un computer. Puoi specificare il computer con l'instance id (e.g. 123) o con l'id (e.g. #123).",
     "commands.computercraft.tp.synopsis": "Teletrasporta al computer specificato.",
     "commands.computercraft.track.desc": "Monitora per quanto tempo i computer vengono eseguiti e quanti eventi ricevono. Questo comando fornisce le informazioni in modo simile a /forge track e può essere utile per diagnosticare il lag.",
+    "commands.computercraft.track.dump.computer": "Computer",
     "commands.computercraft.track.dump.desc": "Cancella gli ultimi risultati del monitoraggio dei computer.",
     "commands.computercraft.track.dump.no_timings": "No ci sono tempi disponibili",
     "commands.computercraft.track.dump.synopsis": "Cancella gli ultimi risultati monitorati",
@@ -86,6 +91,7 @@
     "gui.computercraft.config.execution.tooltip": "Controlla comportamento esecuzione dei computer. Questo è largamente utilizzato\nper ritoccare la performance dei server, e generale non dovrebbe essere toccato.",
     "gui.computercraft.config.floppy_space_limit": "Limite spazio Disco Floppy (bytes)",
     "gui.computercraft.config.floppy_space_limit.tooltip": "Limite di spazio di archiviazione per i dischi floppy, in byte.",
+    "gui.computercraft.config.http": "HTTP",
     "gui.computercraft.config.http.bandwidth": "Banda larga",
     "gui.computercraft.config.http.bandwidth.global_download": "Limite download globale",
     "gui.computercraft.config.http.bandwidth.global_download.tooltip": "Numero di byte che possono essere scaricati in un secondo. Questo è condiviso tra tutti i computer. (bytes/s).",
@@ -98,6 +104,7 @@
     "gui.computercraft.config.http.max_requests.tooltip": "Il numero di richieste http che un computer può fare alla volta. Ulteriori richieste verranno messe in coda, ed inviate quando le richieste correnti sono terminate. Imposta a 0 per illimitato.",
     "gui.computercraft.config.http.max_websockets": "Connessioni websocket massime",
     "gui.computercraft.config.http.max_websockets.tooltip": "Il numero di websocket che un computer può avere aperte allo stesso momento.Imposta a 0 per illimitato.",
+    "gui.computercraft.config.http.proxy": "Proxy",
     "gui.computercraft.config.http.proxy.host": "Nome host",
     "gui.computercraft.config.http.proxy.host.tooltip": "Il nome dell'host o l'indirizzo IP del server proxy.",
     "gui.computercraft.config.http.proxy.port": "Porta",
@@ -135,16 +142,24 @@
     "gui.computercraft.config.peripheral.monitor_bandwidth.tooltip": "Il limite di quanti dati dei monitor possono essere inviati *al tick*. Nota:\n - La banda larga è misurata prima della compressione, così che il dato inviato al client è\n   più piccolo.\n - Questo ignora il numero di giocatori a cui viene inviato il pacchetto. Aggiornare un monitor\n   per un giocatore consuma lo stesso limite di banda larga dell'invio a 20 giocatori.\n - Un monitor alla massima grandezza invia ~25kb di dati. Quindi il valore predefinito (1MB) concede\n   ~40 monitor di essere aggiornati in un singolo tick.\nImposta a 0 per disattivare.",
     "gui.computercraft.config.peripheral.tooltip": "Opzioni varie riguardo le periferiche.",
     "gui.computercraft.config.term_sizes": "Dimensioni terminale",
+    "gui.computercraft.config.term_sizes.computer": "Computer",
     "gui.computercraft.config.term_sizes.computer.height": "Altezza terminale",
+    "gui.computercraft.config.term_sizes.computer.height.tooltip": "Altezza del terminale del computer",
     "gui.computercraft.config.term_sizes.computer.tooltip": "Dimensioni del terminale dei computer.",
     "gui.computercraft.config.term_sizes.computer.width": "Larghezza terminale",
+    "gui.computercraft.config.term_sizes.computer.width.tooltip": "Larghezza del terminale del computer",
+    "gui.computercraft.config.term_sizes.monitor": "Monitor",
     "gui.computercraft.config.term_sizes.monitor.height": "Massima altezza del monitor",
+    "gui.computercraft.config.term_sizes.monitor.height.tooltip": "Altezza massima dei monitor",
     "gui.computercraft.config.term_sizes.monitor.tooltip": "Massima grandezza dei monitor (in blocchi).",
     "gui.computercraft.config.term_sizes.monitor.width": "Larghezza massima del monitor",
+    "gui.computercraft.config.term_sizes.monitor.width.tooltip": "Larghezza massima dei monitor",
     "gui.computercraft.config.term_sizes.pocket_computer": "Computer Tascabile",
     "gui.computercraft.config.term_sizes.pocket_computer.height": "Altezza terminale",
+    "gui.computercraft.config.term_sizes.pocket_computer.height.tooltip": "Altezza del terminale dei computer tascabili",
     "gui.computercraft.config.term_sizes.pocket_computer.tooltip": "Dimensioni del terminale dei computer tascabili.",
     "gui.computercraft.config.term_sizes.pocket_computer.width": "Larghezza terminale",
+    "gui.computercraft.config.term_sizes.pocket_computer.width.tooltip": "Larghezza del terminale del computer tascabile",
     "gui.computercraft.config.term_sizes.tooltip": "Configura le dimensioni dei terminali di vari computer.\nTerminali più grandi richiedono più banda larga, usa con cautela.",
     "gui.computercraft.config.turtle": "Tartarughe",
     "gui.computercraft.config.turtle.advanced_fuel_limit": "Limite carburante tartarughe avanzate",
@@ -188,6 +203,7 @@
     "item.computercraft.printed_page": "Pagina Stampata",
     "item.computercraft.printed_pages": "Pagine Stampate",
     "item.computercraft.treasure_disk": "Disco Floppy",
+    "itemGroup.computercraft": "ComputerCraft",
     "tag.item.computercraft.computer": "Computer",
     "tag.item.computercraft.monitor": "Monitor",
     "tag.item.computercraft.turtle": "Tartarughe",
@@ -199,7 +215,6 @@
     "tracking_field.computercraft.http_download.name": "Download HTTP",
     "tracking_field.computercraft.http_requests.name": "Richieste HTTP",
     "tracking_field.computercraft.http_upload.name": "Upload HTTP",
-    "tracking_field.computercraft.java_allocation.name": "Allocazioni Java",
     "tracking_field.computercraft.max": "%s (massimo)",
     "tracking_field.computercraft.peripheral.name": "Chiamate alle periferiche",
     "tracking_field.computercraft.server_tasks.name": "Attività server",
@@ -207,6 +222,8 @@
     "tracking_field.computercraft.websocket_incoming.name": "Websocket in arrivo",
     "tracking_field.computercraft.websocket_outgoing.name": "Websocket in uscita",
     "upgrade.computercraft.speaker.adjective": "Rumoroso",
+    "upgrade.computercraft.wireless_modem_advanced.adjective": "Ender",
+    "upgrade.computercraft.wireless_modem_normal.adjective": "Senza fili",
     "upgrade.minecraft.crafting_table.adjective": "Artigiana",
     "upgrade.minecraft.diamond_axe.adjective": "Taglialegna",
     "upgrade.minecraft.diamond_hoe.adjective": "Contadina",

projects/common/src/main/resources/assets/computercraft/lang/ja_jp.json

@@ -205,7 +205,9 @@
     "item.computercraft.treasure_disk": "フロッピーディスク",
     "itemGroup.computercraft": "ComputerCraft",
     "tag.item.computercraft.computer": "コンピューター",
+    "tag.item.computercraft.disks": "ディスク",
     "tag.item.computercraft.monitor": "モニター",
+    "tag.item.computercraft.pocket_computers": "ポケットコンピューター",
     "tag.item.computercraft.turtle": "タートル",
     "tag.item.computercraft.wired_modem": "有線モデム",
     "tracking_field.computercraft.avg": "%s (平均)",
@@ -215,7 +217,6 @@
     "tracking_field.computercraft.http_download.name": "HTTPダウンロード",
     "tracking_field.computercraft.http_requests.name": "HTTPリクエスト",
     "tracking_field.computercraft.http_upload.name": "HTTPアップロード",
-    "tracking_field.computercraft.java_allocation.name": "Java割当",
     "tracking_field.computercraft.max": "%s (最大)",
     "tracking_field.computercraft.peripheral.name": "実行呼び出し",
     "tracking_field.computercraft.server_tasks.name": "サーバータスク",

projects/common/src/main/resources/assets/computercraft/lang/pt_br.json

@@ -208,7 +208,6 @@
     "tracking_field.computercraft.http_download.name": "Download HTTP",
     "tracking_field.computercraft.http_requests.name": "Solicitações HTTP",
     "tracking_field.computercraft.http_upload.name": "Upload de HTTP",
-    "tracking_field.computercraft.java_allocation.name": "Alocações Java",
     "tracking_field.computercraft.max": "%s (máximo)",
     "tracking_field.computercraft.peripheral.name": "Chamadas Periféricas",
     "tracking_field.computercraft.server_tasks.name": "Tarefas do servidor",

projects/common/src/main/resources/assets/computercraft/lang/ru_ru.json

@@ -109,6 +109,7 @@
     "gui.computercraft.config.log_computer_errors": "Регистрировать ошибки компьютера",
     "gui.computercraft.config.log_computer_errors.tooltip": "Регистрировать исключения, вызванные периферийными устройствами и другими объектами Lua. Это облегчает\nдля авторам модов устранение проблем, но может привести к спаму в логах, если люди будут использовать\nглючные методы.",
     "gui.computercraft.config.maximum_open_files": "Максимальное количество файлов, открытых на одном компьютере",
+    "gui.computercraft.config.peripheral": "Периферия",
     "gui.computercraft.config.term_sizes": "Размер терминала",
     "gui.computercraft.config.term_sizes.computer": "Компьютер",
     "gui.computercraft.config.term_sizes.computer.height": "Высота терминала",

projects/common/src/main/resources/assets/computercraft/lang/sv_se.json

@@ -1,8 +1,14 @@
 {
     "argument.computercraft.argument_expected": "Argument förväntas",
+    "argument.computercraft.computer.distance": "Distans till entitet",
+    "argument.computercraft.computer.family": "Datorfamilj",
+    "argument.computercraft.computer.id": "Dator-ID",
+    "argument.computercraft.computer.instance": "Unikt instans-ID",
+    "argument.computercraft.computer.label": "Datoretikett",
     "argument.computercraft.computer.many_matching": "Flera datorer matchar '%s' (%s träffar)",
     "argument.computercraft.computer.no_matching": "Inga datorer matchar '%s'",
     "argument.computercraft.tracking_field.no_field": "Okänt fält '%s'",
+    "argument.computercraft.unknown_computer_family": "Okänd datorfamilj '%s'",
     "block.computercraft.cable": "Nätverkskabel",
     "block.computercraft.computer_advanced": "Avancerad Dator",
     "block.computercraft.computer_command": "Kommandodator",
@@ -66,7 +72,10 @@
     "commands.computercraft.view.desc": "Öppna datorns terminal för att möjligöra fjärrstyrning. Detta ger inte tillgång till turtlens inventory. Du kan ange en dators instans-id (t.ex. 123) eller dator-id (t.ex. #123).",
     "commands.computercraft.view.not_player": "Kan inte öppna terminalen för en ickespelare",
     "commands.computercraft.view.synopsis": "Titta på datorns terminal.",
+    "gui.computercraft.config.command_require_creative": "Kommandodatorer kräver kreativt läge",
+    "gui.computercraft.config.command_require_creative.tooltip": "Kräv att spelare är i kreativt läge och har operatörsrättigheter för att kunna interagera med kommandodatorer.\nDetta är standardbeteendet för vaniljversionens kommandoblock.",
     "gui.computercraft.config.computer_space_limit": "Dator maximalt utrymme (bytes)",
+    "gui.computercraft.config.computer_space_limit.tooltip": "Gränsen för diskutrymme för datorer och sköldpaddor, i bytes.",
     "gui.computercraft.config.default_computer_settings": "Standard Datorinställningar",
     "gui.computercraft.config.execution.computer_threads": "Dator trådar",
     "gui.computercraft.config.floppy_space_limit": "Diskett maximalt utrymme (bytes)",

projects/common/src/main/resources/assets/computercraft/lang/tr_tr.json

@@ -205,7 +205,9 @@
     "item.computercraft.treasure_disk": "Disket",
     "itemGroup.computercraft": "ComputerCraft",
     "tag.item.computercraft.computer": "Bilgisayarlar",
+    "tag.item.computercraft.disks": "Diskler",
     "tag.item.computercraft.monitor": "Monitörler",
+    "tag.item.computercraft.pocket_computers": "Cep Bilgisayarları",
     "tag.item.computercraft.turtle": "Turtlelar",
     "tag.item.computercraft.wired_modem": "Kablolu modemler",
     "tracking_field.computercraft.avg": "%s (ort.)",
@@ -215,7 +217,6 @@
     "tracking_field.computercraft.http_download.name": "HTTP indirme",
     "tracking_field.computercraft.http_requests.name": "HTTP istekleri",
     "tracking_field.computercraft.http_upload.name": "HTTP yükleme",
-    "tracking_field.computercraft.java_allocation.name": "Java'ya Ayrılan",
     "tracking_field.computercraft.max": "%s (azami)",
     "tracking_field.computercraft.peripheral.name": "Çevre birimi çağrıları",
     "tracking_field.computercraft.server_tasks.name": "Sunucu görevleri",

projects/common/src/main/resources/assets/computercraft/lang/uk_ua.json

@@ -215,7 +215,6 @@
     "tracking_field.computercraft.http_download.name": "HTTP завантаження",
     "tracking_field.computercraft.http_requests.name": "HTTP запитів",
     "tracking_field.computercraft.http_upload.name": "HTTP завантаження",
-    "tracking_field.computercraft.java_allocation.name": "Java Виділення",
     "tracking_field.computercraft.max": "%s (макс)",
     "tracking_field.computercraft.peripheral.name": "Викликів преферійних девайсів",
     "tracking_field.computercraft.server_tasks.name": "Серверних задач",

projects/common/src/main/resources/assets/computercraft/lang/zh_cn.json

@@ -205,7 +205,9 @@
     "item.computercraft.treasure_disk": "软盘",
     "itemGroup.computercraft": "ComputerCraft",
     "tag.item.computercraft.computer": "计算机",
+    "tag.item.computercraft.disks": "磁盘",
     "tag.item.computercraft.monitor": "监视器",
+    "tag.item.computercraft.pocket_computers": "便携式计算机",
     "tag.item.computercraft.turtle": "海龟",
     "tag.item.computercraft.wired_modem": "有线调制解调器",
     "tracking_field.computercraft.avg": "%s (平均)",
@@ -215,7 +217,6 @@
     "tracking_field.computercraft.http_download.name": "HTTP下载",
     "tracking_field.computercraft.http_requests.name": "HTTP请求",
     "tracking_field.computercraft.http_upload.name": "HTTP上传",
-    "tracking_field.computercraft.java_allocation.name": "Java分配",
     "tracking_field.computercraft.max": "%s (最大)",
     "tracking_field.computercraft.peripheral.name": "外部设备呼叫",
     "tracking_field.computercraft.server_tasks.name": "服务器任务",

projects/common/src/main/resources/assets/computercraft/models/block/turtle_colour.json

@@ -1,7 +1,7 @@
 {
     "parent": "computercraft:block/turtle_base",
     "textures": {
-        "texture": "computercraft:block/turtle_colour",
+        "particle": "computercraft:block/turtle_colour_body_front",
         "body_back": "computercraft:block/turtle_colour_body_back",
         "body_backpack": "computercraft:block/turtle_colour_body_backpack",
         "body_bottom": "computercraft:block/turtle_colour_body_bottom",

projects/common/src/testFixtures/java/dan200/computercraft/test/shared/ItemStackMatcher.java

@@ -27,6 +27,11 @@ public class ItemStackMatcher extends TypeSafeMatcher<ItemStack> {
         description.appendValue(stack).appendValue(stack.getTag());
     }
 
+    @Override
+    protected void describeMismatchSafely(ItemStack item, Description description) {
+        description.appendText("was ").appendValue(item).appendValue(item.getTag());
+    }
+
     public static Matcher<ItemStack> isStack(ItemStack stack) {
         return new ItemStackMatcher(stack);
     }

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;

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<String> ci) {
+        // Load in the structure, strip out air, then save it back again.
+        var structure = Objects.requireNonNull(TestHooks.getStructureManager()).readStructure(tag);
+        var palette = ((StructureTemplateAccessor) structure).getPalettes().get(0);
+        palette.blocks().removeIf(x -> x.state().isAir());
+        var newTag = structure.save(new CompoundTag());
+
+        // Overwrite the existing tag.
+        tag.getAllKeys().clear();
+        for (var key : newTag.getAllKeys()) tag.put(key, newTag.get(key));
+    }
+}

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

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

projects/common/src/testMod/java/dan200/computercraft/mixin/gametest/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<StructureTemplate> ci) {
+        var template = ci.getReturnValue();
+        var size = template.getSize();
+        var palette = ((StructureTemplateAccessor) template).getPalettes().get(0);
+
+        Set<BlockPos> positions = new HashSet<>();
+        for (var x = 0; x < size.getX(); x++) {
+            for (var y = 0; y < size.getY(); y++) {
+                for (var z = 0; z < size.getZ(); z++) positions.add(new BlockPos(x, y, z));
+            }
+        }
+
+        for (var block : palette.blocks()) positions.remove(block.pos());
+
+        for (var pos : positions) {
+            palette.blocks().add(new StructureTemplate.StructureBlockInfo(pos, Blocks.AIR.defaultBlockState(), null));
+        }
+    }
+}

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

@@ -187,4 +187,22 @@ class Disk_Drive_Test {
             )
         }
     }
+
+    /**
+     * Asserts items can be inserted into a disk drive.
+     */
+    @GameTest
+    fun Can_insert_items(helper: GameTestHelper) = helper.sequence {
+        thenWaitUntil {
+            helper.assertContainerExactly(BlockPos(2, 2, 2), listOf(ItemStack(ModRegistry.Items.COMPUTER_NORMAL.get())))
+        }
+    }
+
+    /**
+     * Asserts items can be removed from a disk drive.
+     */
+    @GameTest
+    fun Can_extract_items(helper: GameTestHelper) = helper.sequence {
+        thenWaitUntil { helper.assertContainerEmpty(BlockPos(2, 3, 2)) }
+    }
 }

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

@@ -0,0 +1,36 @@
+// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.gametest
+
+import dan200.computercraft.core.util.Colour
+import dan200.computercraft.gametest.api.craftItem
+import dan200.computercraft.gametest.api.immediate
+import dan200.computercraft.shared.media.items.DiskItem
+import dan200.computercraft.test.shared.ItemStackMatcher.isStack
+import net.minecraft.gametest.framework.GameTest
+import net.minecraft.gametest.framework.GameTestHelper
+import net.minecraft.world.item.ItemStack
+import net.minecraft.world.item.Items
+import org.hamcrest.MatcherAssert.assertThat
+
+class Disk_Test {
+    /**
+     * Ensure disks
+     */
+    @GameTest(template = "default")
+    fun Can_craft_disk(helper: GameTestHelper) = helper.immediate {
+        assertThat(
+            "Disk without dye",
+            helper.craftItem(ItemStack(Items.REDSTONE), ItemStack(Items.PAPER)),
+            isStack(DiskItem.createFromIDAndColour(-1, null, Colour.BLUE.hex)),
+        )
+
+        assertThat(
+            "Disk with dye",
+            helper.craftItem(ItemStack(Items.REDSTONE), ItemStack(Items.PAPER), ItemStack(Items.GREEN_DYE)),
+            isStack(DiskItem.createFromIDAndColour(-1, null, Colour.GREEN.hex)),
+        )
+    }
+}

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

@@ -188,6 +188,25 @@ class Printer_Test {
         }
     }
 
+    /**
+     * Asserts items can be inserted into a printer.
+     */
+    @GameTest(required = false) // Allow on Forge for now, see #1951.
+    fun Can_insert_items(helper: GameTestHelper) = helper.sequence {
+        thenWaitUntil {
+            helper.assertContainerExactly(BlockPos(1, 2, 2), listOf(ItemStack.EMPTY, ItemStack(Items.PAPER)))
+            helper.assertContainerExactly(BlockPos(3, 2, 2), listOf(ItemStack(Items.BLACK_DYE)))
+        }
+    }
+
+    /**
+     * Asserts items can be removed from a printer.
+     */
+    @GameTest
+    fun Can_extract_items(helper: GameTestHelper) = helper.sequence {
+        thenWaitUntil { helper.assertContainerEmpty(BlockPos(2, 3, 2)) }
+    }
+
     private fun createPageOf(c: Char): Array<String> {
         val line = c.toString().repeat(PrintoutItem.LINE_MAX_LENGTH)
         return Array(PrintoutItem.LINES_PER_PAGE) { line }

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

@@ -5,9 +5,17 @@
 package dan200.computercraft.gametest
 
 import dan200.computercraft.gametest.api.*
+import dan200.computercraft.shared.ModRegistry
+import dan200.computercraft.shared.media.items.PrintoutItem
+import dan200.computercraft.test.shared.ItemStackMatcher.isStack
+import net.minecraft.gametest.framework.GameTest
 import net.minecraft.gametest.framework.GameTestGenerator
 import net.minecraft.gametest.framework.GameTestHelper
 import net.minecraft.gametest.framework.TestFunction
+import net.minecraft.world.item.ItemStack
+import net.minecraft.world.item.Items
+import org.hamcrest.MatcherAssert.assertThat
+import org.junit.jupiter.api.Assertions.assertEquals
 
 class Printout_Test {
     /**
@@ -56,4 +64,52 @@ class Printout_Test {
 
         thenExecute { helper.level.dayTime = Times.NOON }
     }
+
+    @GameTest(template = "default")
+    fun Craft_pages(helper: GameTestHelper) = helper.immediate {
+        // Assert that crafting with only one page fails
+        helper.assertNotCraftable(ItemStack(ModRegistry.Items.PRINTED_PAGE.get()), ItemStack(Items.STRING))
+
+        // Assert that crafting with no pages fails
+        helper.assertNotCraftable(ItemStack(Items.PAPER), ItemStack(Items.PAPER), ItemStack(Items.STRING))
+
+        // Assert that crafting with a book fails
+        helper.assertNotCraftable(ItemStack(ModRegistry.Items.PRINTED_PAGE.get()), ItemStack(ModRegistry.Items.PRINTED_BOOK.get()), ItemStack(Items.STRING))
+
+        assertThat(
+            helper.craftItem(
+                PrintoutItem.createSingleFromTitleAndText("First", createPagesOf(' '), createPagesOf('b')),
+                PrintoutItem.createMultipleFromTitleAndText("Second", createPagesOf(' '), createPagesOf('b')),
+                ItemStack(Items.STRING),
+            ),
+            isStack(PrintoutItem.createMultipleFromTitleAndText("First", createPagesOf(' ', 2), createPagesOf('b', 2))),
+        )
+    }
+
+    @GameTest(template = "default")
+    fun Craft_book(helper: GameTestHelper) = helper.immediate {
+        // Assert that crafting with no pages fails
+        helper.assertNotCraftable(ItemStack(Items.PAPER), ItemStack(Items.PAPER), ItemStack(Items.STRING), ItemStack(Items.LEATHER))
+
+        // Assert that crafting with only one page works
+        assertEquals(
+            ModRegistry.Items.PRINTED_BOOK.get(),
+            helper.craftItem(ItemStack(ModRegistry.Items.PRINTED_PAGE.get()), ItemStack(Items.STRING), ItemStack(Items.LEATHER)).item,
+        )
+
+        assertThat(
+            helper.craftItem(
+                PrintoutItem.createSingleFromTitleAndText("First", createPagesOf(' '), createPagesOf('b')),
+                PrintoutItem.createMultipleFromTitleAndText("Second", createPagesOf(' '), createPagesOf('b')),
+                ItemStack(Items.STRING),
+                ItemStack(Items.LEATHER),
+            ),
+            isStack(PrintoutItem.createBookFromTitleAndText("First", createPagesOf(' ', 2), createPagesOf('b', 2))),
+        )
+    }
+
+    private fun createPagesOf(c: Char, pages: Int = 1): Array<String> {
+        val line = c.toString().repeat(PrintoutItem.LINE_MAX_LENGTH)
+        return Array(PrintoutItem.LINES_PER_PAGE * pages) { line }
+    }
 }

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

@@ -6,20 +6,18 @@ package dan200.computercraft.gametest
 
 import com.mojang.authlib.GameProfile
 import dan200.computercraft.gametest.api.Structures
+import dan200.computercraft.gametest.api.craftItem
 import dan200.computercraft.gametest.api.sequence
 import dan200.computercraft.shared.ModRegistry
 import net.minecraft.gametest.framework.GameTest
-import net.minecraft.gametest.framework.GameTestAssertException
 import net.minecraft.gametest.framework.GameTestHelper
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.NbtUtils
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.inventory.AbstractContainerMenu
 import net.minecraft.world.inventory.MenuType
-import net.minecraft.world.inventory.TransientCraftingContainer
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Items
-import net.minecraft.world.item.crafting.RecipeType
 import org.junit.jupiter.api.Assertions.assertEquals
 import java.util.*
 
@@ -32,15 +30,10 @@ class Recipe_Test {
     @GameTest(template = Structures.DEFAULT)
     fun Craft_result_has_nbt(context: GameTestHelper) = context.sequence {
         thenExecute {
-            val container = TransientCraftingContainer(DummyMenu, 3, 3)
-            container.setItem(0, ItemStack(Items.SKELETON_SKULL))
-            container.setItem(1, ItemStack(ModRegistry.Items.COMPUTER_ADVANCED.get()))
-
-            val recipe = context.level.server.recipeManager
-                .getRecipeFor(RecipeType.CRAFTING, container, context.level)
-                .orElseThrow { GameTestAssertException("No recipe matches") }
-
-            val result = recipe.assemble(container, context.level.registryAccess())
+            val result = context.craftItem(
+                ItemStack(Items.SKELETON_SKULL),
+                ItemStack(ModRegistry.Items.COMPUTER_ADVANCED.get()),
+            )
 
             val profile = GameProfile(UUID.fromString("f3c8d69b-0776-4512-8434-d1b2165909eb"), "dan200")
 

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

@@ -29,6 +29,7 @@ import dan200.computercraft.shared.util.WaterloggableHelpers
 import dan200.computercraft.test.core.assertArrayEquals
 import dan200.computercraft.test.core.computer.LuaTaskContext
 import dan200.computercraft.test.core.computer.getApi
+import dan200.computercraft.test.shared.ItemStackMatcher.isStack
 import net.minecraft.core.BlockPos
 import net.minecraft.gametest.framework.GameTest
 import net.minecraft.gametest.framework.GameTestHelper
@@ -439,14 +440,14 @@ class Turtle_Test {
                 object :
                     BasicItemDetailProvider<PrintoutItem>("printout", PrintoutItem::class.java) {
                     override fun provideDetails(data: MutableMap<in String, Any>, stack: ItemStack, item: PrintoutItem) {
-                        data["type"] = item.type.toString().lowercase()
+                        data["pages"] = PrintoutItem.getPageCount(stack)
                     }
                 },
             )
         }
         thenOnComputer {
             val details = getTurtleItemDetail(detailed = true)
-            assertEquals(mapOf("type" to "page"), details["printout"]) {
+            assertEquals(mapOf("pages" to 1), details["printout"]) {
                 "Printout information is returned (whole map is $details)"
             }
         }
@@ -890,6 +891,101 @@ class Turtle_Test {
         }
     }
 
+    /**
+     * Asserts items can be inserted into a turtle.
+     */
+    @GameTest
+    fun Can_insert_items(helper: GameTestHelper) = helper.sequence {
+        thenWaitUntil {
+            helper.assertContainerExactly(BlockPos(2, 2, 2), listOf(ItemStack(ModRegistry.Items.COMPUTER_NORMAL.get())))
+        }
+    }
+
+    /**
+     * Asserts items can be removed from a turtle.
+     */
+    @GameTest
+    fun Can_extract_items(helper: GameTestHelper) = helper.sequence {
+        thenWaitUntil { helper.assertContainerEmpty(BlockPos(2, 3, 2)) }
+    }
+
+    /**
+     * Test that turtles can be crafted with upgrades.
+     */
+    @GameTest(template = Structures.DEFAULT)
+    fun Can_upgrades_be_crafted(helper: GameTestHelper) = helper.immediate {
+        fun turtle(left: UpgradeData<ITurtleUpgrade>? = null, right: UpgradeData<ITurtleUpgrade>? = null): ItemStack =
+            ModRegistry.Items.TURTLE_NORMAL.get()
+                .create(-1, null, -1, left, right, 0, null)
+
+        val pick = TurtleUpgrades.instance().get(ItemStack(Items.DIAMOND_PICKAXE))!!
+        val sword = TurtleUpgrades.instance().get(ItemStack(Items.DIAMOND_SWORD))!!
+
+        // Check we can craft with upgrades
+        assertThat(
+            "Craft with item on left equips on right",
+            helper.craftItem(
+                ItemStack(Items.DIAMOND_PICKAXE), turtle(), ItemStack.EMPTY,
+                ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY,
+                ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY,
+            ),
+            isStack(turtle(right = pick)),
+        )
+        assertThat(
+            "Craft with item on right equips on left",
+            helper.craftItem(
+                ItemStack.EMPTY, turtle(), ItemStack(Items.DIAMOND_PICKAXE),
+                ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY,
+                ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY,
+            ),
+            isStack(turtle(left = pick)),
+        )
+        assertThat(
+            "Craft with two items",
+            helper.craftItem(
+                ItemStack(Items.DIAMOND_SWORD), turtle(), ItemStack(Items.DIAMOND_PICKAXE),
+                ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY,
+                ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY,
+            ),
+            isStack(turtle(left = pick, right = sword)),
+        )
+        assertThat(
+            "Maintains upgrades",
+            helper.craftItem(
+                ItemStack(Items.DIAMOND_SWORD), turtle(left = pick), ItemStack.EMPTY,
+                ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY,
+                ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY,
+            ),
+            isStack(turtle(left = pick, right = sword)),
+        )
+
+        // Cannot craft when already have item
+        helper.assertNotCraftable(
+            ItemStack.EMPTY, turtle(left = sword), ItemStack(Items.DIAMOND_PICKAXE),
+            ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY,
+            ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY,
+        )
+
+        // Cannot craft with an invalid upgrade
+        helper.assertNotCraftable(
+            ItemStack.EMPTY, turtle(), ItemStack(Items.DIRT),
+            ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY,
+            ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY,
+        )
+
+        // Cannot craft with extra items in the inventory
+        helper.assertNotCraftable(
+            ItemStack.EMPTY, ItemStack.EMPTY, ItemStack(Items.DIRT),
+            ItemStack.EMPTY, turtle(), ItemStack(Items.DIAMOND_PICKAXE),
+            ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY,
+        )
+        helper.assertNotCraftable(
+            ItemStack.EMPTY, turtle(), ItemStack(Items.DIAMOND_PICKAXE),
+            ItemStack.EMPTY, ItemStack.EMPTY, ItemStack(Items.DIRT),
+            ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY,
+        )
+    }
+
     /**
      * Render turtles as an item.
      */

projects/common/src/testMod/kotlin/dan200/computercraft/gametest/api/TestExtensions.kt

@@ -5,6 +5,7 @@
 package dan200.computercraft.gametest.api
 
 import dan200.computercraft.api.peripheral.IPeripheral
+import dan200.computercraft.gametest.Recipe_Test.DummyMenu
 import dan200.computercraft.gametest.core.ManagedComputers
 import dan200.computercraft.mixin.gametest.GameTestHelperAccessor
 import dan200.computercraft.mixin.gametest.GameTestInfoAccessor
@@ -22,9 +23,11 @@ import net.minecraft.world.Container
 import net.minecraft.world.InteractionHand
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.entity.EntityType
+import net.minecraft.world.inventory.TransientCraftingContainer
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.context.UseOnContext
+import net.minecraft.world.item.crafting.RecipeType
 import net.minecraft.world.level.block.Blocks
 import net.minecraft.world.level.block.entity.BarrelBlockEntity
 import net.minecraft.world.level.block.entity.BlockEntity
@@ -343,6 +346,32 @@ fun GameTestHelper.placeItemAt(stack: ItemStack, pos: BlockPos, direction: Direc
     stack.useOn(UseOnContext(player, InteractionHand.MAIN_HAND, hit))
 }
 
+/**
+ * Assert a recipe is not craftable.
+ */
+fun GameTestHelper.assertNotCraftable(vararg items: ItemStack) {
+    val container = TransientCraftingContainer(DummyMenu, 3, 3)
+    for ((i, item) in items.withIndex()) container.setItem(i, item)
+
+    val recipe = level.server.recipeManager.getRecipeFor(RecipeType.CRAFTING, container, level)
+
+    if (recipe.isPresent) fail("Expected no recipe to match $items")
+}
+
+/**
+ * Attempt to craft an item.
+ */
+fun GameTestHelper.craftItem(vararg items: ItemStack): ItemStack {
+    val container = TransientCraftingContainer(DummyMenu, 3, 3)
+    for ((i, item) in items.withIndex()) container.setItem(i, item)
+
+    val recipe = level.server.recipeManager
+        .getRecipeFor(RecipeType.CRAFTING, container, level)
+        .orElseThrow { GameTestAssertException("No recipe matches $items") }
+
+    return recipe.assemble(container, level.registryAccess())
+}
+
 /**
  * Run a function multiple times until it succeeds.
  */

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

@@ -83,7 +83,7 @@ object ClientTestHooks {
 
         if (minecraft.levelSource.levelExists(LEVEL_NAME)) {
             LOG.info("World already exists, opening.")
-            minecraft.createWorldOpenFlows().loadLevel(minecraft.screen, LEVEL_NAME)
+            minecraft.createWorldOpenFlows().loadLevel(minecraft.screen!!, LEVEL_NAME)
         } else {
             LOG.info("World does not exist, creating it.")
             val rules = GameRules()

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
@@ -93,6 +99,7 @@ object TestHooks {
         Component_Test::class.java,
         Computer_Test::class.java,
         CraftOs_Test::class.java,
+        Disk_Test::class.java,
         Disk_Drive_Test::class.java,
         Inventory_Test::class.java,
         Loot_Test::class.java,

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

@@ -12,6 +12,9 @@
         "GameTestSequenceAccessor",
         "GameTestSequenceMixin",
         "GameTestServerMixin",
+        "NbtUtilsMixin",
+        "StructureTemplateAccessor",
+        "StructureUtilsMixin",
         "TestCommandAccessor"
     ],
     "client": [

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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