Update to Minecraft 1.17.1

- Remap everything to use MojMap class names too. This is what Forge
   uses, so \o/.

   This does NOT currently rename any classes to use suffix notation or
   BlockEntity. That will come in a later change. We do however rename
   references of "World" to "Level".

 - Move the test mod into a separate "cctest" source set. As Forge now
   works using Jigsaw we cannot have multiple mods defining the same
   package, which causes problems with our JUnit test classes.

 - Remove our custom test framework and replace it with vanilla's (this
   is no longer stripped from the jar). RIP kotlin coroutines.

   It's still worth using Kotlin here though, just for extension
   methods.

 - Other 1.17-related changes:
    - Use separate tile/block entity tick methods for server and client
      side, often avoiding ticking at all on the client.

    - Switch much of the monitor rendering code to use vanilla's
      built-in shader system. It's still an incredibly ugly hack, so not
      really expecting this to work with any rendering mods, but we'll
      cross that bridge when we come to it.

CONTRIBUTING.md

@@ -90,7 +90,7 @@ Before we get into writing tests, it's worth mentioning the various test suites
 
    These tests are run by the '"Core" Java' test suite, and so are also run with `./gradlew test`.
 
- - In-game (`./src/test/java/dan200/computercraft/ingame/`): These tests are run on an actual Minecraft server, using
+ - In-game (`./src/cctest/java/dan200/computercraft/ingame/`): These tests are run on an actual Minecraft server, using
    [the same system Mojang do][mc-test]. The aim of these is to test in-game behaviour of blocks and peripherals.
 
    These are run by `./gradlew testInGame`.

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:5.0.24'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:5.1.17'
     }
 }
 
@@ -18,7 +18,7 @@ plugins {
     id "com.github.hierynomus.license" version "0.16.1"
     id "com.matthewprenger.cursegradle" version "1.4.0"
     id "com.github.breadmoirai.github-release" version "2.2.12"
-    id "org.jetbrains.kotlin.jvm" version "1.3.72"
+    id "org.jetbrains.kotlin.jvm" version "1.5.21"
     id "com.modrinth.minotaur" version "1.2.1"
 }
 
@@ -29,7 +29,7 @@ version = mod_version
 group = "org.squiddev"
 archivesBaseName = "cc-tweaked-${mc_version}"
 
-def javaVersion = JavaLanguageVersion.of(8)
+def javaVersion = JavaLanguageVersion.of(16)
 java {
     toolchain {
         languageVersion = javaVersion
@@ -45,8 +45,32 @@ tasks.withType(JavaExec).configureEach {
     }
 }
 
+sourceSets {
+    main.java {
+        exclude 'dan200/computercraft/shared/integration/**'
+    }
+    main.resources {
+        srcDir 'src/generated/resources'
+    }
+
+    // Rename to testMod
+    cctest {
+        java {
+            compileClasspath += main.output
+            compileClasspath += configurations.compileClasspath
+            runtimeClasspath += main.output
+        }
+    }
+}
+
 minecraft {
     runs {
+        all {
+            lazyToken('minecraft_classpath') {
+                configurations.shade.copyRecursive().resolve().collect { it.absolutePath }.join(File.pathSeparator)
+            }
+        }
+
         client {
             workingDirectory project.file('run')
             property 'forge.logging.markers', 'REGISTRIES'
@@ -92,9 +116,15 @@ minecraft {
 
             mods {
                 cctest {
-                    source sourceSets.test
+                    source sourceSets.cctest
                 }
             }
+
+            lazyToken('minecraft_classpath') {
+                (configurations.shade.copyRecursive().resolve() + configurations.cctest.copyRecursive().resolve())
+                    .collect { it.absolutePath }
+                    .join(File.pathSeparator)
+            }
         }
     }
 
@@ -104,12 +134,6 @@ minecraft {
     accessTransformer file('src/test/resources/META-INF/accesstransformer.cfg')
 }
 
-sourceSets {
-    main.resources {
-        srcDir 'src/generated/resources'
-    }
-}
-
 repositories {
     mavenCentral()
     maven {
@@ -120,7 +144,11 @@ repositories {
 
 configurations {
     shade
-    compile.extendsFrom shade
+    implementation.extendsFrom shade
+
+    cctest
+    cctestImplementation.extendsFrom cctest
+
     cctJavadoc
 }
 
@@ -130,10 +158,10 @@ dependencies {
     minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
 
     compileOnly fg.deobf("mezz.jei:jei-1.16.5:7.7.0.104:api")
-    compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.16.5:7.1.0.313")
-    compileOnly fg.deobf("commoble.morered:morered-1.16.5:2.1.1.0")
+    // compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.16.5:7.1.0.313")
+    // compileOnly fg.deobf("commoble.morered:morered-1.16.5:2.1.1.0")
 
-    runtimeOnly fg.deobf("mezz.jei:jei-1.16.5:7.7.0.104")
+    // runtimeOnly fg.deobf("mezz.jei:jei-1.16.5:7.7.0.104")
 
     shade 'org.squiddev:Cobalt:0.5.2-SNAPSHOT'
 
@@ -141,15 +169,24 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
     testImplementation 'org.hamcrest:hamcrest:2.2'
-    testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72'
-    testImplementation 'org.jetbrains.kotlin:kotlin-reflect:1.3.72'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
+    testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1'
+
+    cctest 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21'
 
     cctJavadoc 'cc.tweaked:cct-javadoc:1.4.1'
 }
 
 // Compile tasks
 
+java {
+    modularity.inferModulePath = true
+}
+
+compileCctestJava {
+    dependsOn(compileJava)
+}
+
 javadoc {
     include "dan200/computercraft/api/**/*.java"
 }
@@ -167,24 +204,28 @@ task luaJavadoc(type: Javadoc) {
     options.noTimestamp = false
 
     javadocTool = javaToolchains.javadocToolFor {
-        languageVersion = JavaLanguageVersion.of(11)
+        languageVersion = javaVersion
     }
 }
 
 jar {
     manifest {
-        attributes(["Specification-Title"     : "computercraft",
-                    "Specification-Vendor"    : "SquidDev",
-                    "Specification-Version"   : "1",
-                    "Implementation-Title"    : "CC: Tweaked",
-                    "Implementation-Version"  : "${mod_version}",
-                    "Implementation-Vendor"   : "SquidDev",
-                    "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")])
+        attributes([
+            "Specification-Title"     : "computercraft",
+            "Specification-Vendor"    : "SquidDev",
+            "Specification-Version"   : "1",
+            "Implementation-Title"    : "CC: Tweaked",
+            "Implementation-Version"  : "${mod_version}",
+            "Implementation-Vendor"   : "SquidDev",
+            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+        ])
     }
 
     from configurations.shade.collect { it.isDirectory() ? it : zipTree(it) }
 }
 
+jar.finalizedBy('reobfJar')
+
 [compileJava, compileTestJava].forEach {
     it.configure {
         options.compilerArgs << "-Xlint" << "-Xlint:-processing"
@@ -214,9 +255,11 @@ processResources {
         include 'META-INF/mods.toml'
         include 'data/computercraft/lua/rom/help/credits.txt'
 
-        expand 'version': mod_version,
-                'mcversion': mc_version,
-                'gitcontributors': contributors.sort(false, String.CASE_INSENSITIVE_ORDER).join('\n')
+        expand(
+            'version': mod_version,
+            'mcversion': mc_version,
+            'gitcontributors': contributors.sort(false, String.CASE_INSENSITIVE_ORDER).join('\n')
+        )
     }
 
     from(sourceSets.main.resources.srcDirs) {
@@ -234,6 +277,7 @@ sourcesJar {
 
 import com.hierynomus.gradle.license.tasks.LicenseCheck
 import com.hierynomus.gradle.license.tasks.LicenseFormat
+import com.modrinth.minotaur.TaskModrinthUpload
 import org.apache.tools.ant.taskdefs.condition.Os
 
 List<String> mkCommand(String command) {
@@ -318,7 +362,7 @@ license {
     }
 }
 
-[licenseTest, licenseFormatTest].forEach {
+[licenseTest, licenseFormatTest, licenseCctest, licenseFormatCctest].forEach {
     it.configure {
         include("**/*.java")
         header file('config/license/main.txt')
@@ -346,7 +390,7 @@ task setupServer(type: Copy) {
     group "test server"
     description "Sets up the environment for the test server."
 
-    from("src/test/server-files") {
+    from("src/cctest/server-files") {
         include "eula.txt"
         include "server.properties"
     }
@@ -356,7 +400,7 @@ task setupServer(type: Copy) {
 tasks.register('testInGame', JavaExec.class).configure {
     it.group('test server')
     it.description("Runs tests on a temporary Minecraft server.")
-    it.dependsOn(setupServer, 'prepareRunTestServer', 'cleanTestInGame')
+    it.dependsOn(setupServer, 'prepareRunTestServer', 'cleanTestInGame', 'compileCctestJava')
 
     // Copy from runTestServer. We do it in this slightly odd way as runTestServer
     // isn't created until the task is configured (which is no good for us).
@@ -456,7 +500,6 @@ curseforge {
     }
 }
 
-import com.modrinth.minotaur.TaskModrinthUpload
 tasks.register('publishModrinth', TaskModrinthUpload.class).configure {
     dependsOn('assemble', 'reobfJar')
     onlyIf {

config/pre-commit/config.yml

@@ -50,6 +50,6 @@ exclude: |
   (?x)^(
     src/generated|
     src/test/resources/test-rom/data/json-parsing/|
-    src/test/server-files/|
+    src/cctest/server-files/|
     config/idea/
   )

gradle.properties

@@ -2,6 +2,6 @@
 mod_version=1.98.1
 
 # Minecraft properties (update mods.toml when changing)
-mc_version=1.16.5
-forge_version=36.1.0
+mc_version=1.17.1
+forge_version=37.0.19
 # NO SERIOUSLY, UPDATE mods.toml WHEN CHANGING

src/cctest/java/dan200/computercraft/ingame/ComputerTest.kt

@@ -0,0 +1,34 @@
+package dan200.computercraft.ingame
+
+import dan200.computercraft.ingame.api.modifyBlock
+import dan200.computercraft.ingame.api.sequence
+import net.minecraft.core.BlockPos
+import net.minecraft.gametest.framework.GameTest
+import net.minecraft.gametest.framework.GameTestHelper
+import net.minecraft.world.level.block.LeverBlock
+import net.minecraft.world.level.block.RedstoneLampBlock
+
+class Computer_Test {
+    /**
+     * Ensures redstone signals do not travel through computers.
+     *
+     * @see [#548](https://github.com/SquidDev-CC/CC-Tweaked/issues/548)
+     */
+    @GameTest
+    fun No_through_signal(context: GameTestHelper) = context.sequence {
+        val lamp = BlockPos(2, 2, 4)
+        val lever = BlockPos(2, 2, 0)
+        this
+            .thenExecute {
+                context.assertBlockState(lamp, { !it.getValue(RedstoneLampBlock.LIT) }, { "Lamp should not be lit" })
+                context.modifyBlock(lever) { x -> x.setValue(LeverBlock.POWERED, true) }
+            }
+            .thenIdle(3)
+            .thenExecute {
+                context.assertBlockState(
+                    lamp,
+                    { !it.getValue(RedstoneLampBlock.LIT) },
+                    { "Lamp should still not be lit" })
+            }
+    }
+}

src/cctest/java/dan200/computercraft/ingame/CraftOsTest.kt

@@ -0,0 +1,14 @@
+package dan200.computercraft.ingame
+
+import dan200.computercraft.ingame.api.sequence
+import dan200.computercraft.ingame.api.thenComputerOk
+import net.minecraft.gametest.framework.GameTest
+import net.minecraft.gametest.framework.GameTestHelper
+
+class CraftOs_Test {
+    /**
+     * Sends a rednet message to another a computer and back again.
+     */
+    @GameTest
+    fun Sends_basic_rednet_messages(context: GameTestHelper) = context.sequence { thenComputerOk(13) }
+}

src/cctest/java/dan200/computercraft/ingame/DiskDriveTest.kt

@@ -0,0 +1,26 @@
+package dan200.computercraft.ingame
+
+import dan200.computercraft.ingame.api.sequence
+import dan200.computercraft.ingame.api.thenComputerOk
+import net.minecraft.core.BlockPos
+import net.minecraft.gametest.framework.GameTest
+import net.minecraft.gametest.framework.GameTestHelper
+import net.minecraft.world.item.Items
+
+class Disk_Drive_Test {
+    /**
+     * Ensure audio disks exist and we can play them.
+     *
+     * @see [#688](https://github.com/SquidDev-CC/CC-Tweaked/issues/688)
+     */
+    @GameTest
+    fun Audio_disk(helper: GameTestHelper) = helper.sequence { thenComputerOk(3) }
+
+    @GameTest
+    fun Ejects_disk(helper: GameTestHelper) = helper.sequence {
+        val stackAt = BlockPos(2, 2, 2)
+        this
+            .thenComputerOk(4)
+            .thenWaitUntil { helper.assertItemEntityPresent(Items.MUSIC_DISC_13, stackAt, 0.0) }
+    }
+}

src/cctest/java/dan200/computercraft/ingame/MonitorTest.kt

@@ -0,0 +1,45 @@
+package dan200.computercraft.ingame
+
+import dan200.computercraft.ingame.api.sequence
+import dan200.computercraft.ingame.api.setBlock
+import dan200.computercraft.shared.Registry
+import dan200.computercraft.shared.peripheral.monitor.TileMonitor
+import net.minecraft.commands.arguments.blocks.BlockInput
+import net.minecraft.core.BlockPos
+import net.minecraft.gametest.framework.GameTest
+import net.minecraft.gametest.framework.GameTestHelper
+import net.minecraft.nbt.CompoundTag
+import net.minecraft.world.level.block.Blocks
+import java.util.*
+
+class Monitor_Test {
+    @GameTest
+    fun Ensures_valid_on_place(context: GameTestHelper) = context.sequence {
+        val pos = BlockPos(2, 2, 2)
+        val tag = CompoundTag()
+        tag.putInt("Width", 2)
+        tag.putInt("Height", 2)
+
+        val toSet = BlockInput(
+            Registry.ModBlocks.MONITOR_ADVANCED.get().defaultBlockState(),
+            Collections.emptySet(),
+            tag
+        )
+
+        context.setBlock(pos, Blocks.AIR.defaultBlockState())
+        context.setBlock(pos, toSet)
+
+        thenIdle(2)
+            .thenExecute {
+                val tile = context.getBlockEntity(pos)
+                if (tile !is TileMonitor) {
+                    context.fail("Expected tile to be monitor, is $tile", pos)
+                    return@thenExecute
+                }
+
+                if (tile.width != 1 || tile.height != 1) {
+                    context.fail("Tile has width and height of ${tile.width}x${tile.height}, but should be 1x1", pos)
+                }
+            }
+    }
+}

src/cctest/java/dan200/computercraft/ingame/TurtleTest.kt

@@ -0,0 +1,78 @@
+package dan200.computercraft.ingame
+
+import dan200.computercraft.ingame.api.sequence
+import dan200.computercraft.ingame.api.thenComputerOk
+import net.minecraft.gametest.framework.GameTest
+import net.minecraft.gametest.framework.GameTestHelper
+
+class Turtle_Test {
+    @GameTest(timeoutTicks = TIMEOUT)
+    fun Unequip_refreshes_peripheral(helper: GameTestHelper) = helper.sequence { thenComputerOk(1) }
+
+    /**
+     * Checks turtles can sheer sheep (and drop items)
+     *
+     * @see [#537](https://github.com/SquidDev-CC/CC-Tweaked/issues/537)
+     */
+    @GameTest(timeoutTicks = TIMEOUT)
+    fun Shears_sheep(helper: GameTestHelper) = helper.sequence { thenComputerOk(5) }
+
+    /**
+     * Checks turtles can place lava.
+     *
+     * @see [#518](https://github.com/SquidDev-CC/CC-Tweaked/issues/518)
+     */
+    @GameTest(timeoutTicks = TIMEOUT)
+    fun Place_lava(helper: GameTestHelper) = helper.sequence { thenComputerOk(5) }
+
+    /**
+     * Checks turtles can place when waterlogged.
+     *
+     * @see [#385](https://github.com/SquidDev-CC/CC-Tweaked/issues/385)
+     */
+    @GameTest(timeoutTicks = TIMEOUT)
+    fun Place_waterlogged(helper: GameTestHelper) = helper.sequence { thenComputerOk(7) }
+
+    /**
+     * Checks turtles can pick up lava
+     *
+     * @see [#297](https://github.com/SquidDev-CC/CC-Tweaked/issues/297)
+     */
+    @GameTest(timeoutTicks = TIMEOUT)
+    fun Gather_lava(helper: GameTestHelper) = helper.sequence { thenComputerOk(8) }
+
+    /**
+     * Checks turtles can hoe dirt.
+     *
+     * @see [#258](https://github.com/SquidDev-CC/CC-Tweaked/issues/258)
+     */
+    @GameTest(timeoutTicks = TIMEOUT)
+    fun Hoe_dirt(helper: GameTestHelper) = helper.sequence { thenComputerOk(9) }
+
+    /**
+     * Checks turtles can place monitors
+     *
+     * @see [#691](https://github.com/SquidDev-CC/CC-Tweaked/issues/691)
+     */
+    @GameTest(timeoutTicks = TIMEOUT)
+    fun Place_monitor(helper: GameTestHelper) = helper.sequence { thenComputerOk(10) }
+
+    /**
+     * Checks turtles can place into compostors. These are non-typical inventories, so
+     * worth testing.
+     */
+    @GameTest(timeoutTicks = TIMEOUT)
+    fun Use_compostors(helper: GameTestHelper) = helper.sequence { thenComputerOk(11) }
+
+    /**
+     * Checks turtles can be cleaned in cauldrons.
+     *
+     * Currently not required as turtles can no longer right-click cauldrons.
+     */
+    @GameTest(required = false)
+    fun Cleaned_with_cauldrons(helper: GameTestHelper) = helper.sequence { thenComputerOk(12) }
+
+    companion object {
+        const val TIMEOUT = 200
+    }
+}

src/cctest/java/dan200/computercraft/ingame/api/ComputerState.java

@@ -6,7 +6,8 @@
 package dan200.computercraft.ingame.api;
 
 import dan200.computercraft.ingame.mod.TestAPI;
-import kotlin.coroutines.Continuation;
+import net.minecraft.gametest.framework.GameTestAssertException;
+import net.minecraft.gametest.framework.GameTestSequence;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -15,7 +16,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * Assertion state of a computer.
  *
  * @see TestAPI For the Lua interface for this.
- * @see TestExtensionsKt#checkComputerOk(TestContext, int, Continuation)
+ * @see TestExtensionsKt#thenComputerOk(GameTestSequence, int)
  */
 public class ComputerState
 {
@@ -31,8 +32,8 @@ public class ComputerState
 
     public void check()
     {
-        if( !done ) throw new IllegalStateException( "Not yet done" );
-        if( error != null ) throw new AssertionError( error );
+        if( !done ) throw new GameTestAssertException( "Not yet done" );
+        if( error != null ) throw new GameTestAssertException( error );
     }
 
     public static ComputerState get( int id )

src/cctest/java/dan200/computercraft/ingame/api/TestExtensions.kt

@@ -0,0 +1,35 @@
+package dan200.computercraft.ingame.api
+
+import net.minecraft.commands.arguments.blocks.BlockInput
+import net.minecraft.core.BlockPos
+import net.minecraft.gametest.framework.GameTestAssertException
+import net.minecraft.gametest.framework.GameTestHelper
+import net.minecraft.gametest.framework.GameTestSequence
+import net.minecraft.world.level.block.state.BlockState
+
+/**
+ * Wait until a computer has finished running and check it is OK.
+ */
+fun GameTestSequence.thenComputerOk(id: Int): GameTestSequence =
+    thenWaitUntil {
+        val computer = ComputerState.get(id)
+        if (computer == null || !computer.isDone) throw GameTestAssertException("Computer #${id} has not finished yet.")
+    }.thenExecute {
+        ComputerState.get(id).check()
+    }
+
+/**
+ * Modify a block state within the test.
+ */
+fun GameTestHelper.modifyBlock(pos: BlockPos, modify: (BlockState) -> BlockState) {
+    setBlock(pos, modify(getBlockState(pos)))
+}
+
+fun GameTestHelper.sequence(run: GameTestSequence.() -> GameTestSequence) {
+    run(startSequence()).thenSucceed()
+}
+
+/**
+ * Set a block within the test structure.
+ */
+fun GameTestHelper.setBlock(pos: BlockPos, state: BlockInput) = state.place(level, absolutePos(pos), 3)

src/cctest/java/dan200/computercraft/ingame/mod/CCTestCommand.java

@@ -6,22 +6,23 @@
 package dan200.computercraft.ingame.mod;
 
 import com.mojang.brigadier.CommandDispatcher;
-import dan200.computercraft.utils.Copier;
-import net.minecraft.command.CommandSource;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.gametest.framework.GameTestRegistry;
+import net.minecraft.gametest.framework.TestFunction;
 import net.minecraft.server.MinecraftServer;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
 
 import static dan200.computercraft.shared.command.builder.HelpingArgumentBuilder.choice;
-import static net.minecraft.command.Commands.literal;
+import static net.minecraft.commands.Commands.literal;
 
 /**
  * Helper commands for importing/exporting the computer directory.
  */
 class CCTestCommand
 {
-    public static void register( CommandDispatcher<CommandSource> dispatcher )
+    public static void register( CommandDispatcher<CommandSourceStack> dispatcher )
     {
         dispatcher.register( choice( "cctest" )
             .then( literal( "import" ).executes( context -> {
@@ -30,7 +31,14 @@ class CCTestCommand
             } ) )
             .then( literal( "export" ).executes( context -> {
                 exportFiles( context.getSource().getServer() );
-                return 0;
+
+                int total = 0;
+                for( TestFunction function : GameTestRegistry.getAllTestFunctions() )
+                {
+                    total += dispatcher.execute( "test import " + function.getTestName(), context.getSource() );
+                    total += dispatcher.execute( "test export " + function.getTestName(), context.getSource() );
+                }
+                return total;
             } ) )
         );
     }

src/cctest/java/dan200/computercraft/ingame/mod/Copier.java

@@ -3,7 +3,7 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-package dan200.computercraft.utils;
+package dan200.computercraft.ingame.mod;
 
 import com.google.common.io.MoreFiles;
 
@@ -14,7 +14,7 @@ import java.nio.file.Path;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 
-public final class Copier extends SimpleFileVisitor<Path>
+final class Copier extends SimpleFileVisitor<Path>
 {
     private final Path sourceDir;
     private final Path targetDir;

src/cctest/java/dan200/computercraft/ingame/mod/TestAPI.java

@@ -5,21 +5,21 @@
  */
 package dan200.computercraft.ingame.mod;
 
+import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.lua.IComputerSystem;
 import dan200.computercraft.api.lua.ILuaAPI;
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.api.lua.LuaFunction;
 import dan200.computercraft.ingame.api.ComputerState;
-import dan200.computercraft.ingame.api.TestContext;
 import dan200.computercraft.ingame.api.TestExtensionsKt;
-import kotlin.coroutines.Continuation;
+import net.minecraft.gametest.framework.GameTestSequence;
 
 /**
  * API exposed to computers to help write tests.
  *
  * Note, we extend this API within startup file of computers (see {@code cctest.lua}).
  *
- * @see TestExtensionsKt#checkComputerOk(TestContext, int, Continuation) To check tests on the computer have passed.
+ * @see TestExtensionsKt#thenComputerOk(GameTestSequence, int)  To check tests on the computer have passed.
  */
 public class TestAPI extends ComputerState implements ILuaAPI
 {
@@ -33,6 +33,7 @@ public class TestAPI extends ComputerState implements ILuaAPI
     @Override
     public void startup()
     {
+        ComputerCraft.log.info( "Computer #{} has turned on.", id );
         done = false;
         error = null;
         lookup.put( id, this );
@@ -41,6 +42,7 @@ public class TestAPI extends ComputerState implements ILuaAPI
     @Override
     public void shutdown()
     {
+        ComputerCraft.log.info( "Computer #{} has shut down.", id );
         if( lookup.get( id ) == this ) lookup.remove( id );
     }
 
@@ -53,6 +55,7 @@ public class TestAPI extends ComputerState implements ILuaAPI
     @LuaFunction
     public final void fail( String message ) throws LuaException
     {
+        ComputerCraft.log.error( "Computer #{} failed with {}", id, message );
         if( done ) throw new LuaException( "Cannot call fail/ok multiple times." );
         done = true;
         error = message;
@@ -65,4 +68,10 @@ public class TestAPI extends ComputerState implements ILuaAPI
         if( done ) throw new LuaException( "Cannot call fail/ok multiple times." );
         done = true;
     }
+
+    @LuaFunction
+    public final void log( String message )
+    {
+        ComputerCraft.log.info( "[Computer #{}] {}", id, message );
+    }
 }

src/cctest/java/dan200/computercraft/ingame/mod/TestLoader.java

@@ -0,0 +1,52 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+package dan200.computercraft.ingame.mod;
+
+import net.minecraft.gametest.framework.GameTest;
+import net.minecraft.gametest.framework.GameTestRegistry;
+import net.minecraftforge.fml.ModList;
+import net.minecraftforge.forgespi.language.ModFileScanData;
+import org.objectweb.asm.Type;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+/**
+ * Loads methods annotated with {@link GameTest} and adds them to the {@link GameTestRegistry}.
+ */
+class TestLoader
+{
+    private static final Type gameTest = Type.getType( GameTest.class );
+
+    public static void setup()
+    {
+        ModList.get().getAllScanData().stream()
+            .flatMap( x -> x.getAnnotations().stream() )
+            .filter( x -> x.annotationType().equals( gameTest ) )
+            .forEach( TestLoader::loadTest );
+    }
+
+    private static void loadTest( ModFileScanData.AnnotationData annotation )
+    {
+        Class<?> klass;
+        Method method;
+        try
+        {
+            klass = TestLoader.class.getClassLoader().loadClass( annotation.clazz().getClassName() );
+
+            // We don't know the exact signature (could suspend or not), so find something with the correct descriptor instead.
+            String methodName = annotation.memberName();
+            method = Arrays.stream( klass.getMethods() ).filter( x -> (x.getName() + Type.getMethodDescriptor( x )).equals( methodName ) ).findFirst()
+                .orElseThrow( () -> new NoSuchMethodException( "No method " + annotation.clazz().getClassName() + "." + annotation.memberName() ) );
+        }
+        catch( ReflectiveOperationException e )
+        {
+            throw new RuntimeException( e );
+        }
+
+        GameTestRegistry.register( method );
+    }
+}

src/cctest/java/dan200/computercraft/ingame/mod/TestMod.java

@@ -6,19 +6,19 @@
 package dan200.computercraft.ingame.mod;
 
 import dan200.computercraft.api.ComputerCraftAPI;
-import net.minecraft.command.CommandSource;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.core.BlockPos;
+import net.minecraft.gametest.framework.*;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.test.*;
-import net.minecraft.util.Rotation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.GameRules;
-import net.minecraft.world.gen.Heightmap;
+import net.minecraft.world.level.GameRules;
+import net.minecraft.world.level.block.Rotation;
+import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
-import net.minecraftforge.fml.server.ServerLifecycleHooks;
+import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks;
+import net.minecraftforge.fmlserverevents.FMLServerStartedEvent;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -29,14 +29,14 @@ import java.util.Collection;
 @Mod( TestMod.MOD_ID )
 public class TestMod
 {
-    public static final Path sourceDir = Paths.get( "../../src/test/server-files/" ).toAbsolutePath();
+    public static final Path sourceDir = Paths.get( "../../src/cctest/server-files/" ).toAbsolutePath();
 
     public static final String MOD_ID = "cctest";
 
     public static final Logger log = LogManager.getLogger( MOD_ID );
 
-    private TestResultList runningTests = null;
-    private int countdown = 20;
+    private MultipleTestTracker runningTests = null;
+    private int countdown = 60;
 
     public TestMod()
     {
@@ -44,7 +44,7 @@ public class TestMod
         ComputerCraftAPI.registerAPIFactory( TestAPI::new );
         TestLoader.setup();
 
-        StructureHelper.testStructuresDir = sourceDir.resolve( "structures" ).toString();
+        StructureUtils.testStructuresDir = sourceDir.resolve( "structures" ).toString();
 
         MinecraftForge.EVENT_BUS.addListener( ( RegisterCommandsEvent event ) -> {
             log.info( "Starting server, registering command helpers." );
@@ -60,8 +60,8 @@ public class TestMod
             rules.getRule( GameRules.RULE_DOMOBSPAWNING ).set( false, server );
 
             log.info( "Cleaning up after last run" );
-            CommandSource source = server.createCommandSourceStack();
-            TestUtils.clearAllTests( source.getLevel(), getStart( source ), TestCollection.singleton, 200 );
+            CommandSourceStack source = server.createCommandSourceStack();
+            GameTestRunner.clearAllTests( source.getLevel(), getStart( source ), GameTestTicker.SINGLETON, 200 );
 
             log.info( "Importing files" );
             CCTestCommand.importFiles( server );
@@ -74,8 +74,7 @@ public class TestMod
             countdown--;
             if( countdown == 0 && System.getProperty( "cctest.run", "false" ).equals( "true" ) ) startTests();
 
-            TestCollection.singleton.tick();
-            MainThread.INSTANCE.tick();
+            GameTestTicker.SINGLETON.tick();
 
             if( runningTests != null && runningTests.isDone() ) finishTests();
         } );
@@ -84,12 +83,12 @@ public class TestMod
     private void startTests()
     {
         MinecraftServer server = ServerLifecycleHooks.getCurrentServer();
-        CommandSource source = server.createCommandSourceStack();
-        Collection<TestFunctionInfo> tests = TestRegistry.getAllTestFunctions();
+        CommandSourceStack source = server.createCommandSourceStack();
+        Collection<TestFunction> tests = GameTestRegistry.getAllTestFunctions();
 
         log.info( "Running {} tests...", tests.size() );
-        runningTests = new TestResultList( TestUtils.runTests(
-            tests, getStart( source ), Rotation.NONE, source.getLevel(), TestCollection.singleton, 8
+        runningTests = new MultipleTestTracker( GameTestRunner.runTests(
+            tests, getStart( source ), Rotation.NONE, source.getLevel(), GameTestTicker.SINGLETON, 8
         ) );
     }
 
@@ -117,9 +116,9 @@ public class TestMod
         }
     }
 
-    private BlockPos getStart( CommandSource source )
+    private BlockPos getStart( CommandSourceStack source )
     {
         BlockPos pos = new BlockPos( source.getPosition() );
-        return new BlockPos( pos.getX(), source.getLevel().getHeightmapPos( Heightmap.Type.WORLD_SURFACE, pos ).getY(), pos.getZ() + 3 );
+        return new BlockPos( pos.getX(), source.getLevel().getHeightmapPos( Heightmap.Types.WORLD_SURFACE, pos ).getY(), pos.getZ() + 3 );
     }
 }

src/cctest/resources/META-INF/accesstransformer.cfg

@@ -0,0 +1,10 @@
+public-f net.minecraft.gametest.framework.TestFunction f_128067_
+public-f net.minecraft.gametest.framework.TestFunction f_128071_
+public-f net.minecraft.gametest.framework.TestFunction f_177798_
+public-f net.minecraft.gametest.framework.TestFunction f_128072_
+public-f net.minecraft.gametest.framework.TestFunction f_128070_
+public-f net.minecraft.gametest.framework.TestFunction f_177799_
+public-f net.minecraft.gametest.framework.TestFunction f_128074_
+public-f net.minecraft.gametest.framework.TestFunction f_128073_
+public-f net.minecraft.gametest.framework.TestFunction f_128069_
+public-f net.minecraft.gametest.framework.TestFunction f_128068_

src/cctest/server-files/structures/computer_test.no_through_signal.snbt

@@ -0,0 +1,141 @@
+{
+    DataVersion: 2730,
+    size: [5, 5, 5],
+    data: [
+        {pos: [0, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [0, 1, 0], state: "minecraft: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: 2, On: 1b, 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"}
+    ],
+    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}",
+        "computercraft:computer_advanced{facing:north,state:blinking}"
+    ]
+}

src/cctest/server-files/structures/craftos_test.sends_basic_rednet_messages.snbt

@@ -0,0 +1,526 @@
+{
+    DataVersion: 2730, 
+    size: [5, 5, 5], 
+    entities: [], 
+    data: [
+        {
+            pos: [0, 0, 0], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [1, 0, 0], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [2, 0, 0], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [3, 0, 0], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [4, 0, 0], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [0, 0, 1], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [1, 0, 1], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [2, 0, 1], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [3, 0, 1], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [4, 0, 1], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [0, 0, 2], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [1, 0, 2], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [2, 0, 2], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [3, 0, 2], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [4, 0, 2], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [0, 0, 3], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [1, 0, 3], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [2, 0, 3], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [3, 0, 3], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [4, 0, 3], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [0, 0, 4], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [1, 0, 4], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [2, 0, 4], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [3, 0, 4], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [4, 0, 4], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [1, 1, 2], 
+            state: "computercraft:computer_advanced{facing:north,state:on}", 
+            nbt: {
+                Label: "Echo", 
+                id: "computercraft:computer_advanced", 
+                ComputerId: 14, 
+                On: 1b
+            }
+        }, 
+        {
+            pos: [3, 1, 2], 
+            state: "computercraft:computer_advanced{facing:north,state:blinking}", 
+            nbt: {
+                Label: "Main", 
+                id: "computercraft:computer_advanced", 
+                ComputerId: 13, 
+                On: 1b
+            }
+        }, 
+        {
+            pos: [1, 2, 2], 
+            state: "computercraft:wireless_modem_normal{waterlogged:false,facing:down,on:true}", 
+            nbt: {
+                id: "computercraft:wireless_modem_normal"
+            }
+        }, 
+        {
+            pos: [3, 2, 2], 
+            state: "computercraft:wireless_modem_normal{waterlogged:false,facing:down,on:true}", 
+            nbt: {
+                id: "computercraft:wireless_modem_normal"
+            }
+        }, 
+        {
+            pos: [0, 1, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 1, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 1, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 1, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 1, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 2, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 2, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 2, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 2, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 2, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 3, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 3, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 3, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 3, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 3, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 4, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 4, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 4, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 4, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 4, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 1, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 1, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 1, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 1, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 1, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 2, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 2, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 2, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 2, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 2, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 3, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 3, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 3, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 3, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 3, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 4, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 4, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 4, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 4, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 4, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 1, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 1, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 1, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 2, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 2, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 2, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 3, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 3, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 3, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 3, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 3, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 4, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 4, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 4, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 4, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 4, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 1, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 1, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 1, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 1, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 1, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 2, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 2, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 2, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 2, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 2, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 3, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 3, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 3, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 3, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 3, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 4, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 4, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 4, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 4, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 4, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 1, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 1, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 1, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 1, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 1, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 2, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 2, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 2, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 2, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 2, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 3, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 3, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 3, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 3, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 3, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 4, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 4, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 4, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 4, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 4, 4], 
+            state: "minecraft:air"
+        }
+    ], 
+    palette: ["minecraft:polished_andesite", "computercraft:computer_advanced{facing:north,state:on}", "computercraft:computer_advanced{facing:north,state:blinking}", "computercraft:wireless_modem_normal{waterlogged:false,facing:down,on:true}", "minecraft:air"]
+}

src/cctest/server-files/structures/disk_drive_test.audio_disk.snbt

@@ -0,0 +1,40 @@
+{
+    DataVersion: 2730,
+    size: [3, 3, 3],
+    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: [1, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 2], 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: [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: 3, 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"}
+    ],
+    entities: [],
+    palette: [
+        "minecraft:polished_andesite",
+        "computercraft:disk_drive{facing:north,state:full}",
+        "computercraft:computer_advanced{facing:north,state:blinking}",
+        "minecraft:air"
+    ]
+}

src/cctest/server-files/structures/disk_drive_test.ejects_disk.snbt

@@ -0,0 +1,139 @@
+{
+    DataVersion: 2730,
+    size: [5, 5, 5],
+    data: [
+        {pos: [0, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [0, 1, 0], state: "minecraft: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: 4, 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"}
+    ],
+    entities: [],
+    palette: [
+        "minecraft:polished_andesite",
+        "minecraft:white_stained_glass",
+        "computercraft:disk_drive{facing:south,state:full}",
+        "computercraft:computer_advanced{facing:north,state:blinking}",
+        "minecraft:air"
+    ]
+}

src/cctest/server-files/structures/monitor_test.ensures_valid_on_place.snbt

@@ -0,0 +1,508 @@
+{
+    DataVersion: 2730, 
+    size: [5, 5, 5], 
+    entities: [], 
+    data: [
+        {
+            pos: [0, 0, 0], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [1, 0, 0], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [2, 0, 0], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [3, 0, 0], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [4, 0, 0], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [0, 0, 1], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [1, 0, 1], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [2, 0, 1], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [3, 0, 1], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [4, 0, 1], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [0, 0, 2], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [1, 0, 2], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [2, 0, 2], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [3, 0, 2], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [4, 0, 2], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [0, 0, 3], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [1, 0, 3], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [2, 0, 3], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [3, 0, 3], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [4, 0, 3], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [0, 0, 4], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [1, 0, 4], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [2, 0, 4], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [3, 0, 4], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [4, 0, 4], 
+            state: "minecraft:polished_andesite"
+        }, 
+        {
+            pos: [0, 1, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 1, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 1, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 1, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 1, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 2, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 2, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 2, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 2, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 2, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 3, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 3, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 3, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 3, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 3, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 4, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 4, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 4, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 4, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 4, 0], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 1, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 1, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 1, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 1, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 1, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 2, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 2, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 2, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 2, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 2, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 3, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 3, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 3, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 3, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 3, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 4, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 4, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 4, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 4, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 4, 1], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 1, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 1, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 1, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 1, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 1, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 2, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 2, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 2, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 2, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 2, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 3, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 3, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 3, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 3, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 3, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 4, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 4, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 4, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 4, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 4, 2], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 1, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 1, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 1, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 1, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 1, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 2, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 2, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 2, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 2, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 2, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 3, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 3, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 3, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 3, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 3, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 4, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 4, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 4, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 4, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 4, 3], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 1, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 1, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 1, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 1, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 1, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 2, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 2, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 2, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 2, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 2, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 3, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 3, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 3, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 3, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 3, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [0, 4, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [1, 4, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [2, 4, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [3, 4, 4], 
+            state: "minecraft:air"
+        }, 
+        {
+            pos: [4, 4, 4], 
+            state: "minecraft:air"
+        }
+    ], 
+    palette: ["minecraft:polished_andesite", "minecraft:air"]
+}

src/cctest/server-files/structures/turtle_test.cleaned_with_cauldrons.snbt

@@ -0,0 +1,40 @@
+{
+    DataVersion: 2730,
+    size: [3, 3, 3],
+    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: [1, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 2], 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: [0, 1, 0], state: "minecraft:air"},
+        {pos: [0, 1, 1], state: "minecraft:air"},
+        {pos: [0, 1, 2], state: "minecraft:air"},
+        {pos: [1, 1, 0], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 12, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "computercraft:turtle_normal", tag: {Color: 13388876, ComputerId: 12, display: {Name: '{"text":"Clean turtle"}'}}}], Label: "Clean turtle", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
+        {pos: [1, 1, 1], state: "minecraft:water_cauldron{level:3}"},
+        {pos: [1, 1, 2], state: "minecraft:air"},
+        {pos: [2, 1, 0], state: "minecraft:air"},
+        {pos: [2, 1, 1], state: "minecraft:air"},
+        {pos: [2, 1, 2], state: "minecraft:air"},
+        {pos: [0, 2, 0], state: "minecraft:air"},
+        {pos: [0, 2, 1], state: "minecraft:air"},
+        {pos: [0, 2, 2], state: "minecraft:air"},
+        {pos: [1, 2, 0], state: "minecraft:air"},
+        {pos: [1, 2, 1], state: "minecraft:air"},
+        {pos: [1, 2, 2], state: "minecraft:air"},
+        {pos: [2, 2, 0], state: "minecraft:air"},
+        {pos: [2, 2, 1], state: "minecraft:air"},
+        {pos: [2, 2, 2], state: "minecraft:air"}
+    ],
+    entities: [],
+    palette: [
+        "minecraft:polished_andesite",
+        "minecraft:air",
+        "minecraft:water_cauldron{level:3}",
+        "computercraft:turtle_normal{facing:south,waterlogged:false}"
+    ]
+}

src/cctest/server-files/structures/turtle_test.gather_lava.snbt

@@ -0,0 +1,139 @@
+{
+    DataVersion: 2730,
+    size: [5, 5, 5],
+    data: [
+        {pos: [0, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [0, 1, 0], state: "minecraft:air"},
+        {pos: [0, 1, 1], state: "minecraft:air"},
+        {pos: [0, 1, 2], state: "minecraft:air"},
+        {pos: [0, 1, 3], state: "minecraft:air"},
+        {pos: [0, 1, 4], state: "minecraft:air"},
+        {pos: [1, 1, 0], state: "minecraft:air"},
+        {pos: [1, 1, 1], state: "minecraft:white_stained_glass"},
+        {pos: [1, 1, 2], state: "minecraft:white_stained_glass"},
+        {pos: [1, 1, 3], state: "minecraft:white_stained_glass"},
+        {pos: [1, 1, 4], state: "minecraft:air"},
+        {pos: [2, 1, 0], state: "minecraft:air"},
+        {pos: [2, 1, 1], state: "minecraft:white_stained_glass"},
+        {pos: [2, 1, 2], state: "minecraft:lava{level:0}"},
+        {pos: [2, 1, 3], state: "minecraft:white_stained_glass"},
+        {pos: [2, 1, 4], state: "minecraft:air"},
+        {pos: [3, 1, 0], state: "minecraft:air"},
+        {pos: [3, 1, 1], state: "minecraft:white_stained_glass"},
+        {pos: [3, 1, 2], state: "minecraft:white_stained_glass"},
+        {pos: [3, 1, 3], state: "minecraft:white_stained_glass"},
+        {pos: [3, 1, 4], state: "minecraft:air"},
+        {pos: [4, 1, 0], state: "minecraft:air"},
+        {pos: [4, 1, 1], state: "minecraft:air"},
+        {pos: [4, 1, 2], state: "minecraft:air"},
+        {pos: [4, 1, 3], state: "minecraft:air"},
+        {pos: [4, 1, 4], state: "minecraft:air"},
+        {pos: [0, 2, 0], state: "minecraft:air"},
+        {pos: [0, 2, 1], state: "minecraft:air"},
+        {pos: [0, 2, 2], state: "minecraft:air"},
+        {pos: [0, 2, 3], state: "minecraft:air"},
+        {pos: [0, 2, 4], state: "minecraft:air"},
+        {pos: [1, 2, 0], state: "minecraft:air"},
+        {pos: [1, 2, 1], state: "minecraft:air"},
+        {pos: [1, 2, 2], state: "minecraft:air"},
+        {pos: [1, 2, 3], state: "minecraft:air"},
+        {pos: [1, 2, 4], state: "minecraft:air"},
+        {pos: [2, 2, 0], state: "minecraft:air"},
+        {pos: [2, 2, 1], state: "minecraft:air"},
+        {pos: [2, 2, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 8, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "minecraft:bucket"}], On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
+        {pos: [2, 2, 3], state: "minecraft:air"},
+        {pos: [2, 2, 4], state: "minecraft:air"},
+        {pos: [3, 2, 0], state: "minecraft:air"},
+        {pos: [3, 2, 1], state: "minecraft:air"},
+        {pos: [3, 2, 2], state: "minecraft:air"},
+        {pos: [3, 2, 3], state: "minecraft:air"},
+        {pos: [3, 2, 4], state: "minecraft:air"},
+        {pos: [4, 2, 0], state: "minecraft:air"},
+        {pos: [4, 2, 1], state: "minecraft:air"},
+        {pos: [4, 2, 2], state: "minecraft:air"},
+        {pos: [4, 2, 3], state: "minecraft:air"},
+        {pos: [4, 2, 4], state: "minecraft:air"},
+        {pos: [0, 3, 0], state: "minecraft:air"},
+        {pos: [0, 3, 1], state: "minecraft:air"},
+        {pos: [0, 3, 2], state: "minecraft:air"},
+        {pos: [0, 3, 3], state: "minecraft:air"},
+        {pos: [0, 3, 4], state: "minecraft:air"},
+        {pos: [1, 3, 0], state: "minecraft:air"},
+        {pos: [1, 3, 1], state: "minecraft:air"},
+        {pos: [1, 3, 2], state: "minecraft:air"},
+        {pos: [1, 3, 3], state: "minecraft:air"},
+        {pos: [1, 3, 4], state: "minecraft:air"},
+        {pos: [2, 3, 0], state: "minecraft:air"},
+        {pos: [2, 3, 1], state: "minecraft:air"},
+        {pos: [2, 3, 2], state: "minecraft:air"},
+        {pos: [2, 3, 3], state: "minecraft:air"},
+        {pos: [2, 3, 4], state: "minecraft:air"},
+        {pos: [3, 3, 0], state: "minecraft:air"},
+        {pos: [3, 3, 1], state: "minecraft:air"},
+        {pos: [3, 3, 2], state: "minecraft:air"},
+        {pos: [3, 3, 3], state: "minecraft:air"},
+        {pos: [3, 3, 4], state: "minecraft:air"},
+        {pos: [4, 3, 0], state: "minecraft:air"},
+        {pos: [4, 3, 1], state: "minecraft:air"},
+        {pos: [4, 3, 2], state: "minecraft:air"},
+        {pos: [4, 3, 3], state: "minecraft:air"},
+        {pos: [4, 3, 4], state: "minecraft:air"},
+        {pos: [0, 4, 0], state: "minecraft:air"},
+        {pos: [0, 4, 1], state: "minecraft:air"},
+        {pos: [0, 4, 2], state: "minecraft:air"},
+        {pos: [0, 4, 3], state: "minecraft:air"},
+        {pos: [0, 4, 4], state: "minecraft:air"},
+        {pos: [1, 4, 0], state: "minecraft:air"},
+        {pos: [1, 4, 1], state: "minecraft:air"},
+        {pos: [1, 4, 2], state: "minecraft:air"},
+        {pos: [1, 4, 3], state: "minecraft:air"},
+        {pos: [1, 4, 4], state: "minecraft:air"},
+        {pos: [2, 4, 0], state: "minecraft:air"},
+        {pos: [2, 4, 1], state: "minecraft:air"},
+        {pos: [2, 4, 2], state: "minecraft:air"},
+        {pos: [2, 4, 3], state: "minecraft:air"},
+        {pos: [2, 4, 4], state: "minecraft:air"},
+        {pos: [3, 4, 0], state: "minecraft:air"},
+        {pos: [3, 4, 1], state: "minecraft:air"},
+        {pos: [3, 4, 2], state: "minecraft:air"},
+        {pos: [3, 4, 3], state: "minecraft:air"},
+        {pos: [3, 4, 4], state: "minecraft:air"},
+        {pos: [4, 4, 0], state: "minecraft:air"},
+        {pos: [4, 4, 1], state: "minecraft:air"},
+        {pos: [4, 4, 2], state: "minecraft:air"},
+        {pos: [4, 4, 3], state: "minecraft:air"},
+        {pos: [4, 4, 4], state: "minecraft:air"}
+    ],
+    entities: [],
+    palette: [
+        "minecraft:polished_andesite",
+        "minecraft:white_stained_glass",
+        "computercraft:turtle_normal{facing:south,waterlogged:false}",
+        "minecraft:air",
+        "minecraft:lava{level:0}"
+    ]
+}

src/cctest/server-files/structures/turtle_test.hoe_dirt.snbt

@@ -0,0 +1,40 @@
+{
+    DataVersion: 2730,
+    size: [3, 3, 3],
+    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: [1, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 2], 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: [0, 1, 0], state: "minecraft:air"},
+        {pos: [0, 1, 1], state: "minecraft:air"},
+        {pos: [0, 1, 2], state: "minecraft:air"},
+        {pos: [1, 1, 0], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 9, Fuel: 0, Items: [], LeftUpgrade: "minecraft:diamond_hoe", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
+        {pos: [1, 1, 1], state: "minecraft:dirt"},
+        {pos: [1, 1, 2], state: "minecraft:air"},
+        {pos: [2, 1, 0], state: "minecraft:air"},
+        {pos: [2, 1, 1], state: "minecraft:air"},
+        {pos: [2, 1, 2], state: "minecraft:air"},
+        {pos: [0, 2, 0], state: "minecraft:air"},
+        {pos: [0, 2, 1], state: "minecraft:air"},
+        {pos: [0, 2, 2], state: "minecraft:air"},
+        {pos: [1, 2, 0], state: "minecraft:air"},
+        {pos: [1, 2, 1], state: "minecraft:air"},
+        {pos: [1, 2, 2], state: "minecraft:air"},
+        {pos: [2, 2, 0], state: "minecraft:air"},
+        {pos: [2, 2, 1], state: "minecraft:air"},
+        {pos: [2, 2, 2], state: "minecraft:air"}
+    ],
+    entities: [],
+    palette: [
+        "minecraft:polished_andesite",
+        "minecraft:dirt",
+        "computercraft:turtle_normal{facing:south,waterlogged:false}",
+        "minecraft:air"
+    ]
+}

src/cctest/server-files/structures/turtle_test.place_lava.snbt

@@ -0,0 +1,138 @@
+{
+    DataVersion: 2730,
+    size: [5, 5, 5],
+    data: [
+        {pos: [0, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [0, 1, 0], state: "minecraft:air"},
+        {pos: [0, 1, 1], state: "minecraft:air"},
+        {pos: [0, 1, 2], state: "minecraft:air"},
+        {pos: [0, 1, 3], state: "minecraft:air"},
+        {pos: [0, 1, 4], state: "minecraft:air"},
+        {pos: [1, 1, 0], state: "minecraft:air"},
+        {pos: [1, 1, 1], state: "minecraft:white_stained_glass"},
+        {pos: [1, 1, 2], state: "minecraft:white_stained_glass"},
+        {pos: [1, 1, 3], state: "minecraft:white_stained_glass"},
+        {pos: [1, 1, 4], state: "minecraft:air"},
+        {pos: [2, 1, 0], state: "minecraft:air"},
+        {pos: [2, 1, 1], state: "minecraft:white_stained_glass"},
+        {pos: [2, 1, 2], state: "minecraft:air"},
+        {pos: [2, 1, 3], state: "minecraft:white_stained_glass"},
+        {pos: [2, 1, 4], state: "minecraft:air"},
+        {pos: [3, 1, 0], state: "minecraft:air"},
+        {pos: [3, 1, 1], state: "minecraft:white_stained_glass"},
+        {pos: [3, 1, 2], state: "minecraft:white_stained_glass"},
+        {pos: [3, 1, 3], state: "minecraft:white_stained_glass"},
+        {pos: [3, 1, 4], state: "minecraft:air"},
+        {pos: [4, 1, 0], state: "minecraft:air"},
+        {pos: [4, 1, 1], state: "minecraft:air"},
+        {pos: [4, 1, 2], state: "minecraft:air"},
+        {pos: [4, 1, 3], state: "minecraft:air"},
+        {pos: [4, 1, 4], state: "minecraft:air"},
+        {pos: [0, 2, 0], state: "minecraft:air"},
+        {pos: [0, 2, 1], state: "minecraft:air"},
+        {pos: [0, 2, 2], state: "minecraft:air"},
+        {pos: [0, 2, 3], state: "minecraft:air"},
+        {pos: [0, 2, 4], state: "minecraft:air"},
+        {pos: [1, 2, 0], state: "minecraft:air"},
+        {pos: [1, 2, 1], state: "minecraft:air"},
+        {pos: [1, 2, 2], state: "minecraft:air"},
+        {pos: [1, 2, 3], state: "minecraft:air"},
+        {pos: [1, 2, 4], state: "minecraft:air"},
+        {pos: [2, 2, 0], state: "minecraft:air"},
+        {pos: [2, 2, 1], state: "minecraft:air"},
+        {pos: [2, 2, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 6, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "minecraft:lava_bucket"}], On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
+        {pos: [2, 2, 3], state: "minecraft:air"},
+        {pos: [2, 2, 4], state: "minecraft:air"},
+        {pos: [3, 2, 0], state: "minecraft:air"},
+        {pos: [3, 2, 1], state: "minecraft:air"},
+        {pos: [3, 2, 2], state: "minecraft:air"},
+        {pos: [3, 2, 3], state: "minecraft:air"},
+        {pos: [3, 2, 4], state: "minecraft:air"},
+        {pos: [4, 2, 0], state: "minecraft:air"},
+        {pos: [4, 2, 1], state: "minecraft:air"},
+        {pos: [4, 2, 2], state: "minecraft:air"},
+        {pos: [4, 2, 3], state: "minecraft:air"},
+        {pos: [4, 2, 4], state: "minecraft:air"},
+        {pos: [0, 3, 0], state: "minecraft:air"},
+        {pos: [0, 3, 1], state: "minecraft:air"},
+        {pos: [0, 3, 2], state: "minecraft:air"},
+        {pos: [0, 3, 3], state: "minecraft:air"},
+        {pos: [0, 3, 4], state: "minecraft:air"},
+        {pos: [1, 3, 0], state: "minecraft:air"},
+        {pos: [1, 3, 1], state: "minecraft:air"},
+        {pos: [1, 3, 2], state: "minecraft:air"},
+        {pos: [1, 3, 3], state: "minecraft:air"},
+        {pos: [1, 3, 4], state: "minecraft:air"},
+        {pos: [2, 3, 0], state: "minecraft:air"},
+        {pos: [2, 3, 1], state: "minecraft:air"},
+        {pos: [2, 3, 2], state: "minecraft:air"},
+        {pos: [2, 3, 3], state: "minecraft:air"},
+        {pos: [2, 3, 4], state: "minecraft:air"},
+        {pos: [3, 3, 0], state: "minecraft:air"},
+        {pos: [3, 3, 1], state: "minecraft:air"},
+        {pos: [3, 3, 2], state: "minecraft:air"},
+        {pos: [3, 3, 3], state: "minecraft:air"},
+        {pos: [3, 3, 4], state: "minecraft:air"},
+        {pos: [4, 3, 0], state: "minecraft:air"},
+        {pos: [4, 3, 1], state: "minecraft:air"},
+        {pos: [4, 3, 2], state: "minecraft:air"},
+        {pos: [4, 3, 3], state: "minecraft:air"},
+        {pos: [4, 3, 4], state: "minecraft:air"},
+        {pos: [0, 4, 0], state: "minecraft:air"},
+        {pos: [0, 4, 1], state: "minecraft:air"},
+        {pos: [0, 4, 2], state: "minecraft:air"},
+        {pos: [0, 4, 3], state: "minecraft:air"},
+        {pos: [0, 4, 4], state: "minecraft:air"},
+        {pos: [1, 4, 0], state: "minecraft:air"},
+        {pos: [1, 4, 1], state: "minecraft:air"},
+        {pos: [1, 4, 2], state: "minecraft:air"},
+        {pos: [1, 4, 3], state: "minecraft:air"},
+        {pos: [1, 4, 4], state: "minecraft:air"},
+        {pos: [2, 4, 0], state: "minecraft:air"},
+        {pos: [2, 4, 1], state: "minecraft:air"},
+        {pos: [2, 4, 2], state: "minecraft:air"},
+        {pos: [2, 4, 3], state: "minecraft:air"},
+        {pos: [2, 4, 4], state: "minecraft:air"},
+        {pos: [3, 4, 0], state: "minecraft:air"},
+        {pos: [3, 4, 1], state: "minecraft:air"},
+        {pos: [3, 4, 2], state: "minecraft:air"},
+        {pos: [3, 4, 3], state: "minecraft:air"},
+        {pos: [3, 4, 4], state: "minecraft:air"},
+        {pos: [4, 4, 0], state: "minecraft:air"},
+        {pos: [4, 4, 1], state: "minecraft:air"},
+        {pos: [4, 4, 2], state: "minecraft:air"},
+        {pos: [4, 4, 3], state: "minecraft:air"},
+        {pos: [4, 4, 4], state: "minecraft:air"}
+    ],
+    entities: [],
+    palette: [
+        "minecraft:polished_andesite",
+        "minecraft:white_stained_glass",
+        "computercraft:turtle_normal{facing:south,waterlogged:false}",
+        "minecraft:air"
+    ]
+}

src/cctest/server-files/structures/turtle_test.place_monitor.snbt

@@ -0,0 +1,142 @@
+{
+    DataVersion: 2730,
+    size: [5, 5, 5],
+    data: [
+        {pos: [0, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [0, 1, 0], state: "minecraft:air"},
+        {pos: [0, 1, 1], state: "minecraft:air"},
+        {pos: [0, 1, 2], state: "minecraft:air"},
+        {pos: [0, 1, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:none}", nbt: {Height: 1, Width: 1, XIndex: 0, YIndex: 0, id: "computercraft:monitor_advanced"}},
+        {pos: [0, 1, 4], state: "minecraft:air"},
+        {pos: [1, 1, 0], state: "minecraft:air"},
+        {pos: [1, 1, 1], state: "minecraft:air"},
+        {pos: [1, 1, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 10, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "computercraft:monitor_advanced"}], On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
+        {pos: [1, 1, 3], state: "minecraft:air"},
+        {pos: [1, 1, 4], state: "minecraft:dark_oak_planks"},
+        {pos: [2, 1, 0], state: "minecraft:air"},
+        {pos: [2, 1, 1], state: "minecraft:air"},
+        {pos: [2, 1, 2], state: "minecraft:air"},
+        {pos: [2, 1, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:l}", nbt: {Height: 1, Width: 3, XIndex: 2, YIndex: 0, id: "computercraft:monitor_advanced"}},
+        {pos: [2, 1, 4], state: "minecraft:air"},
+        {pos: [3, 1, 0], state: "minecraft:air"},
+        {pos: [3, 1, 1], state: "minecraft:air"},
+        {pos: [3, 1, 2], state: "minecraft:air"},
+        {pos: [3, 1, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:lr}", nbt: {Height: 1, Width: 3, XIndex: 1, YIndex: 0, id: "computercraft:monitor_advanced"}},
+        {pos: [3, 1, 4], state: "minecraft:air"},
+        {pos: [4, 1, 0], state: "minecraft:air"},
+        {pos: [4, 1, 1], state: "minecraft:air"},
+        {pos: [4, 1, 2], state: "minecraft:air"},
+        {pos: [4, 1, 3], state: "computercraft:monitor_advanced{facing:north,orientation:north,state:r}", nbt: {Height: 1, Width: 3, XIndex: 0, YIndex: 0, id: "computercraft:monitor_advanced"}},
+        {pos: [4, 1, 4], state: "minecraft:air"},
+        {pos: [0, 2, 0], state: "minecraft:air"},
+        {pos: [0, 2, 1], state: "minecraft:air"},
+        {pos: [0, 2, 2], state: "minecraft:air"},
+        {pos: [0, 2, 3], state: "minecraft:air"},
+        {pos: [0, 2, 4], state: "minecraft:air"},
+        {pos: [1, 2, 0], state: "minecraft:air"},
+        {pos: [1, 2, 1], state: "minecraft:air"},
+        {pos: [1, 2, 2], state: "minecraft:air"},
+        {pos: [1, 2, 3], state: "minecraft:air"},
+        {pos: [1, 2, 4], state: "minecraft:air"},
+        {pos: [2, 2, 0], state: "minecraft:air"},
+        {pos: [2, 2, 1], state: "minecraft:air"},
+        {pos: [2, 2, 2], state: "minecraft:air"},
+        {pos: [2, 2, 3], state: "minecraft:air"},
+        {pos: [2, 2, 4], state: "minecraft:air"},
+        {pos: [3, 2, 0], state: "minecraft:air"},
+        {pos: [3, 2, 1], state: "minecraft:air"},
+        {pos: [3, 2, 2], state: "minecraft:air"},
+        {pos: [3, 2, 3], state: "minecraft:air"},
+        {pos: [3, 2, 4], state: "minecraft:air"},
+        {pos: [4, 2, 0], state: "minecraft:air"},
+        {pos: [4, 2, 1], state: "minecraft:air"},
+        {pos: [4, 2, 2], state: "minecraft:air"},
+        {pos: [4, 2, 3], state: "minecraft:air"},
+        {pos: [4, 2, 4], state: "minecraft:air"},
+        {pos: [0, 3, 0], state: "minecraft:air"},
+        {pos: [0, 3, 1], state: "minecraft:air"},
+        {pos: [0, 3, 2], state: "minecraft:air"},
+        {pos: [0, 3, 3], state: "minecraft:air"},
+        {pos: [0, 3, 4], state: "minecraft:air"},
+        {pos: [1, 3, 0], state: "minecraft:air"},
+        {pos: [1, 3, 1], state: "minecraft:air"},
+        {pos: [1, 3, 2], state: "minecraft:air"},
+        {pos: [1, 3, 3], state: "minecraft:air"},
+        {pos: [1, 3, 4], state: "minecraft:air"},
+        {pos: [2, 3, 0], state: "minecraft:air"},
+        {pos: [2, 3, 1], state: "minecraft:air"},
+        {pos: [2, 3, 2], state: "minecraft:air"},
+        {pos: [2, 3, 3], state: "minecraft:air"},
+        {pos: [2, 3, 4], state: "minecraft:air"},
+        {pos: [3, 3, 0], state: "minecraft:air"},
+        {pos: [3, 3, 1], state: "minecraft:air"},
+        {pos: [3, 3, 2], state: "minecraft:air"},
+        {pos: [3, 3, 3], state: "minecraft:air"},
+        {pos: [3, 3, 4], state: "minecraft:air"},
+        {pos: [4, 3, 0], state: "minecraft:air"},
+        {pos: [4, 3, 1], state: "minecraft:air"},
+        {pos: [4, 3, 2], state: "minecraft:air"},
+        {pos: [4, 3, 3], state: "minecraft:air"},
+        {pos: [4, 3, 4], state: "minecraft:air"},
+        {pos: [0, 4, 0], state: "minecraft:air"},
+        {pos: [0, 4, 1], state: "minecraft:air"},
+        {pos: [0, 4, 2], state: "minecraft:air"},
+        {pos: [0, 4, 3], state: "minecraft:air"},
+        {pos: [0, 4, 4], state: "minecraft:air"},
+        {pos: [1, 4, 0], state: "minecraft:air"},
+        {pos: [1, 4, 1], state: "minecraft:air"},
+        {pos: [1, 4, 2], state: "minecraft:air"},
+        {pos: [1, 4, 3], state: "minecraft:air"},
+        {pos: [1, 4, 4], state: "minecraft:air"},
+        {pos: [2, 4, 0], state: "minecraft:air"},
+        {pos: [2, 4, 1], state: "minecraft:air"},
+        {pos: [2, 4, 2], state: "minecraft:air"},
+        {pos: [2, 4, 3], state: "minecraft:air"},
+        {pos: [2, 4, 4], state: "minecraft:air"},
+        {pos: [3, 4, 0], state: "minecraft:air"},
+        {pos: [3, 4, 1], state: "minecraft:air"},
+        {pos: [3, 4, 2], state: "minecraft:air"},
+        {pos: [3, 4, 3], state: "minecraft:air"},
+        {pos: [3, 4, 4], state: "minecraft:air"},
+        {pos: [4, 4, 0], state: "minecraft:air"},
+        {pos: [4, 4, 1], state: "minecraft:air"},
+        {pos: [4, 4, 2], state: "minecraft:air"},
+        {pos: [4, 4, 3], state: "minecraft:air"},
+        {pos: [4, 4, 4], state: "minecraft:air"}
+    ],
+    entities: [],
+    palette: [
+        "minecraft:polished_andesite",
+        "minecraft:dark_oak_planks",
+        "computercraft:turtle_normal{facing:south,waterlogged:false}",
+        "computercraft:monitor_advanced{facing:north,orientation:north,state:none}",
+        "computercraft:monitor_advanced{facing:north,orientation:north,state:l}",
+        "computercraft:monitor_advanced{facing:north,orientation:north,state:lr}",
+        "computercraft:monitor_advanced{facing:north,orientation:north,state:r}",
+        "minecraft:air"
+    ]
+}

src/cctest/server-files/structures/turtle_test.place_waterlogged.snbt

@@ -0,0 +1,139 @@
+{
+    DataVersion: 2730,
+    size: [5, 5, 5],
+    data: [
+        {pos: [0, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [0, 1, 0], state: "minecraft:air"},
+        {pos: [0, 1, 1], state: "minecraft:air"},
+        {pos: [0, 1, 2], state: "minecraft:air"},
+        {pos: [0, 1, 3], state: "minecraft:air"},
+        {pos: [0, 1, 4], state: "minecraft:air"},
+        {pos: [1, 1, 0], state: "minecraft:white_stained_glass"},
+        {pos: [1, 1, 1], state: "minecraft:white_stained_glass"},
+        {pos: [1, 1, 2], state: "minecraft:white_stained_glass"},
+        {pos: [1, 1, 3], state: "minecraft:white_stained_glass"},
+        {pos: [1, 1, 4], state: "minecraft:air"},
+        {pos: [2, 1, 0], state: "minecraft:white_stained_glass"},
+        {pos: [2, 1, 1], state: "computercraft:turtle_normal{facing:south,waterlogged:true}", nbt: {ComputerId: 7, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "minecraft:oak_fence"}], On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
+        {pos: [2, 1, 2], state: "minecraft:water{level:0}"},
+        {pos: [2, 1, 3], state: "minecraft:white_stained_glass"},
+        {pos: [2, 1, 4], state: "minecraft:air"},
+        {pos: [3, 1, 0], state: "minecraft:white_stained_glass"},
+        {pos: [3, 1, 1], state: "minecraft:white_stained_glass"},
+        {pos: [3, 1, 2], state: "minecraft:white_stained_glass"},
+        {pos: [3, 1, 3], state: "minecraft:white_stained_glass"},
+        {pos: [3, 1, 4], state: "minecraft:air"},
+        {pos: [4, 1, 0], state: "minecraft:air"},
+        {pos: [4, 1, 1], state: "minecraft:air"},
+        {pos: [4, 1, 2], state: "minecraft:air"},
+        {pos: [4, 1, 3], state: "minecraft:air"},
+        {pos: [4, 1, 4], state: "minecraft:air"},
+        {pos: [0, 2, 0], state: "minecraft:air"},
+        {pos: [0, 2, 1], state: "minecraft:air"},
+        {pos: [0, 2, 2], state: "minecraft:air"},
+        {pos: [0, 2, 3], state: "minecraft:air"},
+        {pos: [0, 2, 4], state: "minecraft:air"},
+        {pos: [1, 2, 0], state: "minecraft:air"},
+        {pos: [1, 2, 1], state: "minecraft:air"},
+        {pos: [1, 2, 2], state: "minecraft:air"},
+        {pos: [1, 2, 3], state: "minecraft:air"},
+        {pos: [1, 2, 4], state: "minecraft:air"},
+        {pos: [2, 2, 0], state: "minecraft:air"},
+        {pos: [2, 2, 1], state: "minecraft:air"},
+        {pos: [2, 2, 2], state: "minecraft:air"},
+        {pos: [2, 2, 3], state: "minecraft:air"},
+        {pos: [2, 2, 4], state: "minecraft:air"},
+        {pos: [3, 2, 0], state: "minecraft:air"},
+        {pos: [3, 2, 1], state: "minecraft:air"},
+        {pos: [3, 2, 2], state: "minecraft:air"},
+        {pos: [3, 2, 3], state: "minecraft:air"},
+        {pos: [3, 2, 4], state: "minecraft:air"},
+        {pos: [4, 2, 0], state: "minecraft:air"},
+        {pos: [4, 2, 1], state: "minecraft:air"},
+        {pos: [4, 2, 2], state: "minecraft:air"},
+        {pos: [4, 2, 3], state: "minecraft:air"},
+        {pos: [4, 2, 4], state: "minecraft:air"},
+        {pos: [0, 3, 0], state: "minecraft:air"},
+        {pos: [0, 3, 1], state: "minecraft:air"},
+        {pos: [0, 3, 2], state: "minecraft:air"},
+        {pos: [0, 3, 3], state: "minecraft:air"},
+        {pos: [0, 3, 4], state: "minecraft:air"},
+        {pos: [1, 3, 0], state: "minecraft:air"},
+        {pos: [1, 3, 1], state: "minecraft:air"},
+        {pos: [1, 3, 2], state: "minecraft:air"},
+        {pos: [1, 3, 3], state: "minecraft:air"},
+        {pos: [1, 3, 4], state: "minecraft:air"},
+        {pos: [2, 3, 0], state: "minecraft:air"},
+        {pos: [2, 3, 1], state: "minecraft:air"},
+        {pos: [2, 3, 2], state: "minecraft:air"},
+        {pos: [2, 3, 3], state: "minecraft:air"},
+        {pos: [2, 3, 4], state: "minecraft:air"},
+        {pos: [3, 3, 0], state: "minecraft:air"},
+        {pos: [3, 3, 1], state: "minecraft:air"},
+        {pos: [3, 3, 2], state: "minecraft:air"},
+        {pos: [3, 3, 3], state: "minecraft:air"},
+        {pos: [3, 3, 4], state: "minecraft:air"},
+        {pos: [4, 3, 0], state: "minecraft:air"},
+        {pos: [4, 3, 1], state: "minecraft:air"},
+        {pos: [4, 3, 2], state: "minecraft:air"},
+        {pos: [4, 3, 3], state: "minecraft:air"},
+        {pos: [4, 3, 4], state: "minecraft:air"},
+        {pos: [0, 4, 0], state: "minecraft:air"},
+        {pos: [0, 4, 1], state: "minecraft:air"},
+        {pos: [0, 4, 2], state: "minecraft:air"},
+        {pos: [0, 4, 3], state: "minecraft:air"},
+        {pos: [0, 4, 4], state: "minecraft:air"},
+        {pos: [1, 4, 0], state: "minecraft:air"},
+        {pos: [1, 4, 1], state: "minecraft:air"},
+        {pos: [1, 4, 2], state: "minecraft:air"},
+        {pos: [1, 4, 3], state: "minecraft:air"},
+        {pos: [1, 4, 4], state: "minecraft:air"},
+        {pos: [2, 4, 0], state: "minecraft:air"},
+        {pos: [2, 4, 1], state: "minecraft:air"},
+        {pos: [2, 4, 2], state: "minecraft:air"},
+        {pos: [2, 4, 3], state: "minecraft:air"},
+        {pos: [2, 4, 4], state: "minecraft:air"},
+        {pos: [3, 4, 0], state: "minecraft:air"},
+        {pos: [3, 4, 1], state: "minecraft:air"},
+        {pos: [3, 4, 2], state: "minecraft:air"},
+        {pos: [3, 4, 3], state: "minecraft:air"},
+        {pos: [3, 4, 4], state: "minecraft:air"},
+        {pos: [4, 4, 0], state: "minecraft:air"},
+        {pos: [4, 4, 1], state: "minecraft:air"},
+        {pos: [4, 4, 2], state: "minecraft:air"},
+        {pos: [4, 4, 3], state: "minecraft:air"},
+        {pos: [4, 4, 4], state: "minecraft:air"}
+    ],
+    entities: [],
+    palette: [
+        "minecraft:polished_andesite",
+        "minecraft:white_stained_glass",
+        "computercraft:turtle_normal{facing:south,waterlogged:true}",
+        "minecraft:air",
+        "minecraft:water{level:0}"
+    ]
+}

src/cctest/server-files/structures/turtle_test.shears_sheep.snbt

@@ -0,0 +1,140 @@
+{
+    DataVersion: 2730,
+    size: [5, 5, 5],
+    data: [
+        {pos: [0, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [0, 1, 0], state: "minecraft:air"},
+        {pos: [0, 1, 1], state: "minecraft:air"},
+        {pos: [0, 1, 2], state: "minecraft:air"},
+        {pos: [0, 1, 3], state: "minecraft:air"},
+        {pos: [0, 1, 4], state: "minecraft:air"},
+        {pos: [1, 1, 0], state: "minecraft:air"},
+        {pos: [1, 1, 1], state: "minecraft:white_stained_glass"},
+        {pos: [1, 1, 2], state: "minecraft:white_stained_glass"},
+        {pos: [1, 1, 3], state: "minecraft:white_stained_glass"},
+        {pos: [1, 1, 4], state: "minecraft:air"},
+        {pos: [2, 1, 0], state: "minecraft:air"},
+        {pos: [2, 1, 1], state: "minecraft:white_stained_glass"},
+        {pos: [2, 1, 2], state: "minecraft:air"},
+        {pos: [2, 1, 3], state: "minecraft:white_stained_glass"},
+        {pos: [2, 1, 4], state: "minecraft:air"},
+        {pos: [3, 1, 0], state: "minecraft:air"},
+        {pos: [3, 1, 1], state: "minecraft:white_stained_glass"},
+        {pos: [3, 1, 2], state: "minecraft:white_stained_glass"},
+        {pos: [3, 1, 3], state: "minecraft:white_stained_glass"},
+        {pos: [3, 1, 4], state: "minecraft:air"},
+        {pos: [4, 1, 0], state: "minecraft:air"},
+        {pos: [4, 1, 1], state: "minecraft:air"},
+        {pos: [4, 1, 2], state: "minecraft:air"},
+        {pos: [4, 1, 3], state: "minecraft:air"},
+        {pos: [4, 1, 4], state: "minecraft:air"},
+        {pos: [0, 2, 0], state: "minecraft:air"},
+        {pos: [0, 2, 1], state: "minecraft:air"},
+        {pos: [0, 2, 2], state: "minecraft:air"},
+        {pos: [0, 2, 3], state: "minecraft:air"},
+        {pos: [0, 2, 4], state: "minecraft:air"},
+        {pos: [1, 2, 0], state: "minecraft:air"},
+        {pos: [1, 2, 1], state: "minecraft:white_stained_glass"},
+        {pos: [1, 2, 2], state: "minecraft:white_stained_glass"},
+        {pos: [1, 2, 3], state: "minecraft:white_stained_glass"},
+        {pos: [1, 2, 4], state: "minecraft:air"},
+        {pos: [2, 2, 0], state: "minecraft:air"},
+        {pos: [2, 2, 1], state: "minecraft:white_stained_glass"},
+        {pos: [2, 2, 2], state: "minecraft:air"},
+        {pos: [2, 2, 3], state: "minecraft:white_stained_glass"},
+        {pos: [2, 2, 4], state: "minecraft:air"},
+        {pos: [3, 2, 0], state: "minecraft:air"},
+        {pos: [3, 2, 1], state: "minecraft:white_stained_glass"},
+        {pos: [3, 2, 2], state: "minecraft:white_stained_glass"},
+        {pos: [3, 2, 3], state: "minecraft:white_stained_glass"},
+        {pos: [3, 2, 4], state: "minecraft:air"},
+        {pos: [4, 2, 0], state: "minecraft:air"},
+        {pos: [4, 2, 1], state: "minecraft:air"},
+        {pos: [4, 2, 2], state: "minecraft:air"},
+        {pos: [4, 2, 3], state: "minecraft:air"},
+        {pos: [4, 2, 4], state: "minecraft:air"},
+        {pos: [0, 3, 0], state: "minecraft:air"},
+        {pos: [0, 3, 1], state: "minecraft:air"},
+        {pos: [0, 3, 2], state: "minecraft:air"},
+        {pos: [0, 3, 3], state: "minecraft:air"},
+        {pos: [0, 3, 4], state: "minecraft:air"},
+        {pos: [1, 3, 0], state: "minecraft:air"},
+        {pos: [1, 3, 1], state: "minecraft:air"},
+        {pos: [1, 3, 2], state: "minecraft:air"},
+        {pos: [1, 3, 3], state: "minecraft:air"},
+        {pos: [1, 3, 4], state: "minecraft:air"},
+        {pos: [2, 3, 0], state: "minecraft:air"},
+        {pos: [2, 3, 1], state: "minecraft:air"},
+        {pos: [2, 3, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 5, Fuel: 0, Items: [{Count: 1b, Slot: 0b, id: "minecraft:shears", tag: {Damage: 0}}], On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
+        {pos: [2, 3, 3], state: "minecraft:air"},
+        {pos: [2, 3, 4], state: "minecraft:air"},
+        {pos: [3, 3, 0], state: "minecraft:air"},
+        {pos: [3, 3, 1], state: "minecraft:air"},
+        {pos: [3, 3, 2], state: "minecraft:air"},
+        {pos: [3, 3, 3], state: "minecraft:air"},
+        {pos: [3, 3, 4], state: "minecraft:air"},
+        {pos: [4, 3, 0], state: "minecraft:air"},
+        {pos: [4, 3, 1], state: "minecraft:air"},
+        {pos: [4, 3, 2], state: "minecraft:air"},
+        {pos: [4, 3, 3], state: "minecraft:air"},
+        {pos: [4, 3, 4], state: "minecraft:air"},
+        {pos: [0, 4, 0], state: "minecraft:air"},
+        {pos: [0, 4, 1], state: "minecraft:air"},
+        {pos: [0, 4, 2], state: "minecraft:air"},
+        {pos: [0, 4, 3], state: "minecraft:air"},
+        {pos: [0, 4, 4], state: "minecraft:air"},
+        {pos: [1, 4, 0], state: "minecraft:air"},
+        {pos: [1, 4, 1], state: "minecraft:air"},
+        {pos: [1, 4, 2], state: "minecraft:air"},
+        {pos: [1, 4, 3], state: "minecraft:air"},
+        {pos: [1, 4, 4], state: "minecraft:air"},
+        {pos: [2, 4, 0], state: "minecraft:air"},
+        {pos: [2, 4, 1], state: "minecraft:air"},
+        {pos: [2, 4, 2], state: "minecraft:air"},
+        {pos: [2, 4, 3], state: "minecraft:air"},
+        {pos: [2, 4, 4], state: "minecraft:air"},
+        {pos: [3, 4, 0], state: "minecraft:air"},
+        {pos: [3, 4, 1], state: "minecraft:air"},
+        {pos: [3, 4, 2], state: "minecraft:air"},
+        {pos: [3, 4, 3], state: "minecraft:air"},
+        {pos: [3, 4, 4], state: "minecraft:air"},
+        {pos: [4, 4, 0], state: "minecraft:air"},
+        {pos: [4, 4, 1], state: "minecraft:air"},
+        {pos: [4, 4, 2], state: "minecraft:air"},
+        {pos: [4, 4, 3], state: "minecraft:air"},
+        {pos: [4, 4, 4], state: "minecraft:air"}
+    ],
+    entities: [
+        {blockPos: [2, 1, 2], pos: [2.5d, 1.0d, 2.5d], nbt: {AbsorptionAmount: 0.0f, Age: 0, Air: 300s, ArmorDropChances: [0.085f, 0.085f, 0.085f, 0.085f], ArmorItems: [{}, {}, {}, {}], Attributes: [{Base: 8.0d, Name: "generic.maxHealth"}, {Base: 0.0d, Name: "generic.knockbackResistance"}, {Base: 0.23000000417232513d, Name: "generic.movementSpeed"}, {Base: 0.0d, Name: "generic.armor"}, {Base: 0.0d, Name: "generic.armorToughness"}, {Base: 1.0d, Name: "forge.swimSpeed"}, {Base: 64.0d, Name: "forge.nameTagDistance"}, {Base: 0.08d, Name: "forge.entity_gravity"}, {Base: 16.0d, Modifiers: [{Amount: -0.04393447767139704d, Name: "Random spawn bonus", Operation: 1, UUIDLeast: -7913974980122166977L, UUIDMost: 2135385928807173041L}], Name: "generic.followRange"}, {Base: 0.0d, Name: "generic.attackKnockback"}], Brain: {memories: {}}, CanPickUpLoot: 0b, CanUpdate: 1b, Color: 0b, DeathTime: 0s, Dimension: 0, FallDistance: 0.0f, FallFlying: 0b, Fire: -1s, ForcedAge: 0, HandDropChances: [0.085f, 0.085f], HandItems: [{}, {}], Health: 8.0f, HurtByTimestamp: 0, HurtTime: 0s, InLove: 0, Invulnerable: 0b, LeftHanded: 0b, Motion: [0.0d, -0.0784000015258789d, 0.0d], OnGround: 1b, PersistenceRequired: 0b, PortalCooldown: 0, Pos: [-12.5d, 6.0d, 110.5d], Rotation: [99.779915f, 0.0f], Sheared: 0b, UUIDLeast: -5245632071702074643L, UUIDMost: -3792049278188698748L, id: "minecraft:sheep"}}
+    ],
+    palette: [
+        "minecraft:polished_andesite",
+        "minecraft:white_stained_glass",
+        "computercraft:turtle_normal{facing:south,waterlogged:false}",
+        "minecraft:air"
+    ]
+}

src/cctest/server-files/structures/turtle_test.unequip_refreshes_peripheral.snbt

@@ -0,0 +1,138 @@
+{
+    DataVersion: 2730,
+    size: [5, 5, 5],
+    data: [
+        {pos: [0, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [0, 1, 0], state: "minecraft:air"},
+        {pos: [0, 1, 1], state: "minecraft:air"},
+        {pos: [0, 1, 2], state: "minecraft:air"},
+        {pos: [0, 1, 3], state: "minecraft:air"},
+        {pos: [0, 1, 4], state: "minecraft:air"},
+        {pos: [1, 1, 0], state: "minecraft:air"},
+        {pos: [1, 1, 1], state: "minecraft:air"},
+        {pos: [1, 1, 2], state: "computercraft:disk_drive{facing:north,state:empty}", nbt: {id: "computercraft:disk_drive"}},
+        {pos: [1, 1, 3], state: "minecraft:air"},
+        {pos: [1, 1, 4], state: "minecraft:air"},
+        {pos: [2, 1, 0], state: "minecraft:air"},
+        {pos: [2, 1, 1], state: "minecraft:air"},
+        {pos: [2, 1, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 1, Fuel: 0, Items: [], Label: "Unequip refreshes peripheral", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, RightUpgrade: "computercraft:wireless_modem_normal", RightUpgradeNbt: {active: 0b}, Slot: 0, id: "computercraft:turtle_normal"}},
+        {pos: [2, 1, 3], state: "minecraft:air"},
+        {pos: [2, 1, 4], state: "minecraft:air"},
+        {pos: [3, 1, 0], state: "minecraft:air"},
+        {pos: [3, 1, 1], state: "minecraft:air"},
+        {pos: [3, 1, 2], state: "minecraft:air"},
+        {pos: [3, 1, 3], state: "minecraft:air"},
+        {pos: [3, 1, 4], state: "minecraft:air"},
+        {pos: [4, 1, 0], state: "minecraft:air"},
+        {pos: [4, 1, 1], state: "minecraft:air"},
+        {pos: [4, 1, 2], state: "minecraft:air"},
+        {pos: [4, 1, 3], state: "minecraft:air"},
+        {pos: [4, 1, 4], state: "minecraft:air"},
+        {pos: [0, 2, 0], state: "minecraft:air"},
+        {pos: [0, 2, 1], state: "minecraft:air"},
+        {pos: [0, 2, 2], state: "minecraft:air"},
+        {pos: [0, 2, 3], state: "minecraft:air"},
+        {pos: [0, 2, 4], state: "minecraft:air"},
+        {pos: [1, 2, 0], state: "minecraft:air"},
+        {pos: [1, 2, 1], state: "minecraft:air"},
+        {pos: [1, 2, 2], state: "minecraft:air"},
+        {pos: [1, 2, 3], state: "minecraft:air"},
+        {pos: [1, 2, 4], state: "minecraft:air"},
+        {pos: [2, 2, 0], state: "minecraft:air"},
+        {pos: [2, 2, 1], state: "minecraft:air"},
+        {pos: [2, 2, 2], state: "minecraft:air"},
+        {pos: [2, 2, 3], state: "minecraft:air"},
+        {pos: [2, 2, 4], state: "minecraft:air"},
+        {pos: [3, 2, 0], state: "minecraft:air"},
+        {pos: [3, 2, 1], state: "minecraft:air"},
+        {pos: [3, 2, 2], state: "minecraft:air"},
+        {pos: [3, 2, 3], state: "minecraft:air"},
+        {pos: [3, 2, 4], state: "minecraft:air"},
+        {pos: [4, 2, 0], state: "minecraft:air"},
+        {pos: [4, 2, 1], state: "minecraft:air"},
+        {pos: [4, 2, 2], state: "minecraft:air"},
+        {pos: [4, 2, 3], state: "minecraft:air"},
+        {pos: [4, 2, 4], state: "minecraft:air"},
+        {pos: [0, 3, 0], state: "minecraft:air"},
+        {pos: [0, 3, 1], state: "minecraft:air"},
+        {pos: [0, 3, 2], state: "minecraft:air"},
+        {pos: [0, 3, 3], state: "minecraft:air"},
+        {pos: [0, 3, 4], state: "minecraft:air"},
+        {pos: [1, 3, 0], state: "minecraft:air"},
+        {pos: [1, 3, 1], state: "minecraft:air"},
+        {pos: [1, 3, 2], state: "minecraft:air"},
+        {pos: [1, 3, 3], state: "minecraft:air"},
+        {pos: [1, 3, 4], state: "minecraft:air"},
+        {pos: [2, 3, 0], state: "minecraft:air"},
+        {pos: [2, 3, 1], state: "minecraft:air"},
+        {pos: [2, 3, 2], state: "minecraft:air"},
+        {pos: [2, 3, 3], state: "minecraft:air"},
+        {pos: [2, 3, 4], state: "minecraft:air"},
+        {pos: [3, 3, 0], state: "minecraft:air"},
+        {pos: [3, 3, 1], state: "minecraft:air"},
+        {pos: [3, 3, 2], state: "minecraft:air"},
+        {pos: [3, 3, 3], state: "minecraft:air"},
+        {pos: [3, 3, 4], state: "minecraft:air"},
+        {pos: [4, 3, 0], state: "minecraft:air"},
+        {pos: [4, 3, 1], state: "minecraft:air"},
+        {pos: [4, 3, 2], state: "minecraft:air"},
+        {pos: [4, 3, 3], state: "minecraft:air"},
+        {pos: [4, 3, 4], state: "minecraft:air"},
+        {pos: [0, 4, 0], state: "minecraft:air"},
+        {pos: [0, 4, 1], state: "minecraft:air"},
+        {pos: [0, 4, 2], state: "minecraft:air"},
+        {pos: [0, 4, 3], state: "minecraft:air"},
+        {pos: [0, 4, 4], state: "minecraft:air"},
+        {pos: [1, 4, 0], state: "minecraft:air"},
+        {pos: [1, 4, 1], state: "minecraft:air"},
+        {pos: [1, 4, 2], state: "minecraft:air"},
+        {pos: [1, 4, 3], state: "minecraft:air"},
+        {pos: [1, 4, 4], state: "minecraft:air"},
+        {pos: [2, 4, 0], state: "minecraft:air"},
+        {pos: [2, 4, 1], state: "minecraft:air"},
+        {pos: [2, 4, 2], state: "minecraft:air"},
+        {pos: [2, 4, 3], state: "minecraft:air"},
+        {pos: [2, 4, 4], state: "minecraft:air"},
+        {pos: [3, 4, 0], state: "minecraft:air"},
+        {pos: [3, 4, 1], state: "minecraft:air"},
+        {pos: [3, 4, 2], state: "minecraft:air"},
+        {pos: [3, 4, 3], state: "minecraft:air"},
+        {pos: [3, 4, 4], state: "minecraft:air"},
+        {pos: [4, 4, 0], state: "minecraft:air"},
+        {pos: [4, 4, 1], state: "minecraft:air"},
+        {pos: [4, 4, 2], state: "minecraft:air"},
+        {pos: [4, 4, 3], state: "minecraft:air"},
+        {pos: [4, 4, 4], state: "minecraft:air"}
+    ],
+    entities: [],
+    palette: [
+        "minecraft:polished_andesite",
+        "computercraft:disk_drive{facing:north,state:empty}",
+        "computercraft:turtle_normal{facing:south,waterlogged:false}",
+        "minecraft:air"
+    ]
+}

src/cctest/server-files/structures/turtle_test.use_compostors.snbt

@@ -0,0 +1,138 @@
+{
+    DataVersion: 2730,
+    size: [5, 5, 5],
+    data: [
+        {pos: [0, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [0, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [1, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [2, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [3, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 0], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 1], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 2], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 3], state: "minecraft:polished_andesite"},
+        {pos: [4, 0, 4], state: "minecraft:polished_andesite"},
+        {pos: [0, 1, 0], state: "minecraft:air"},
+        {pos: [0, 1, 1], state: "minecraft:air"},
+        {pos: [0, 1, 2], state: "minecraft:air"},
+        {pos: [0, 1, 3], state: "minecraft:air"},
+        {pos: [0, 1, 4], state: "minecraft:air"},
+        {pos: [1, 1, 0], state: "minecraft:air"},
+        {pos: [1, 1, 1], state: "minecraft:air"},
+        {pos: [1, 1, 2], state: "minecraft:air"},
+        {pos: [1, 1, 3], state: "minecraft:air"},
+        {pos: [1, 1, 4], state: "minecraft:air"},
+        {pos: [2, 1, 0], state: "minecraft:air"},
+        {pos: [2, 1, 1], state: "minecraft:air"},
+        {pos: [2, 1, 2], state: "minecraft:composter{level:0}"},
+        {pos: [2, 1, 3], state: "minecraft:air"},
+        {pos: [2, 1, 4], state: "minecraft:air"},
+        {pos: [3, 1, 0], state: "minecraft:air"},
+        {pos: [3, 1, 1], state: "minecraft:air"},
+        {pos: [3, 1, 2], state: "minecraft:air"},
+        {pos: [3, 1, 3], state: "minecraft:air"},
+        {pos: [3, 1, 4], state: "minecraft:air"},
+        {pos: [4, 1, 0], state: "minecraft:air"},
+        {pos: [4, 1, 1], state: "minecraft:air"},
+        {pos: [4, 1, 2], state: "minecraft:air"},
+        {pos: [4, 1, 3], state: "minecraft:air"},
+        {pos: [4, 1, 4], state: "minecraft:air"},
+        {pos: [0, 2, 0], state: "minecraft:air"},
+        {pos: [0, 2, 1], state: "minecraft:air"},
+        {pos: [0, 2, 2], state: "minecraft:air"},
+        {pos: [0, 2, 3], state: "minecraft:air"},
+        {pos: [0, 2, 4], state: "minecraft:air"},
+        {pos: [1, 2, 0], state: "minecraft:air"},
+        {pos: [1, 2, 1], state: "minecraft:air"},
+        {pos: [1, 2, 2], state: "minecraft:air"},
+        {pos: [1, 2, 3], state: "minecraft:air"},
+        {pos: [1, 2, 4], state: "minecraft:air"},
+        {pos: [2, 2, 0], state: "minecraft:air"},
+        {pos: [2, 2, 1], state: "minecraft:air"},
+        {pos: [2, 2, 2], state: "computercraft:turtle_normal{facing:south,waterlogged:false}", nbt: {ComputerId: 11, Fuel: 0, Items: [{Count: 64b, Slot: 0b, id: "minecraft:spruce_sapling"}], Label: "Uses Compostors", On: 1b, Owner: {LowerId: -6876936588741668278L, Name: "Dev", UpperId: 4039158846114182220L}, Slot: 0, id: "computercraft:turtle_normal"}},
+        {pos: [2, 2, 3], state: "minecraft:air"},
+        {pos: [2, 2, 4], state: "minecraft:air"},
+        {pos: [3, 2, 0], state: "minecraft:air"},
+        {pos: [3, 2, 1], state: "minecraft:air"},
+        {pos: [3, 2, 2], state: "minecraft:air"},
+        {pos: [3, 2, 3], state: "minecraft:air"},
+        {pos: [3, 2, 4], state: "minecraft:air"},
+        {pos: [4, 2, 0], state: "minecraft:air"},
+        {pos: [4, 2, 1], state: "minecraft:air"},
+        {pos: [4, 2, 2], state: "minecraft:air"},
+        {pos: [4, 2, 3], state: "minecraft:air"},
+        {pos: [4, 2, 4], state: "minecraft:air"},
+        {pos: [0, 3, 0], state: "minecraft:air"},
+        {pos: [0, 3, 1], state: "minecraft:air"},
+        {pos: [0, 3, 2], state: "minecraft:air"},
+        {pos: [0, 3, 3], state: "minecraft:air"},
+        {pos: [0, 3, 4], state: "minecraft:air"},
+        {pos: [1, 3, 0], state: "minecraft:air"},
+        {pos: [1, 3, 1], state: "minecraft:air"},
+        {pos: [1, 3, 2], state: "minecraft:air"},
+        {pos: [1, 3, 3], state: "minecraft:air"},
+        {pos: [1, 3, 4], state: "minecraft:air"},
+        {pos: [2, 3, 0], state: "minecraft:air"},
+        {pos: [2, 3, 1], state: "minecraft:air"},
+        {pos: [2, 3, 2], state: "minecraft:air"},
+        {pos: [2, 3, 3], state: "minecraft:air"},
+        {pos: [2, 3, 4], state: "minecraft:air"},
+        {pos: [3, 3, 0], state: "minecraft:air"},
+        {pos: [3, 3, 1], state: "minecraft:air"},
+        {pos: [3, 3, 2], state: "minecraft:air"},
+        {pos: [3, 3, 3], state: "minecraft:air"},
+        {pos: [3, 3, 4], state: "minecraft:air"},
+        {pos: [4, 3, 0], state: "minecraft:air"},
+        {pos: [4, 3, 1], state: "minecraft:air"},
+        {pos: [4, 3, 2], state: "minecraft:air"},
+        {pos: [4, 3, 3], state: "minecraft:air"},
+        {pos: [4, 3, 4], state: "minecraft:air"},
+        {pos: [0, 4, 0], state: "minecraft:air"},
+        {pos: [0, 4, 1], state: "minecraft:air"},
+        {pos: [0, 4, 2], state: "minecraft:air"},
+        {pos: [0, 4, 3], state: "minecraft:air"},
+        {pos: [0, 4, 4], state: "minecraft:air"},
+        {pos: [1, 4, 0], state: "minecraft:air"},
+        {pos: [1, 4, 1], state: "minecraft:air"},
+        {pos: [1, 4, 2], state: "minecraft:air"},
+        {pos: [1, 4, 3], state: "minecraft:air"},
+        {pos: [1, 4, 4], state: "minecraft:air"},
+        {pos: [2, 4, 0], state: "minecraft:air"},
+        {pos: [2, 4, 1], state: "minecraft:air"},
+        {pos: [2, 4, 2], state: "minecraft:air"},
+        {pos: [2, 4, 3], state: "minecraft:air"},
+        {pos: [2, 4, 4], state: "minecraft:air"},
+        {pos: [3, 4, 0], state: "minecraft:air"},
+        {pos: [3, 4, 1], state: "minecraft:air"},
+        {pos: [3, 4, 2], state: "minecraft:air"},
+        {pos: [3, 4, 3], state: "minecraft:air"},
+        {pos: [3, 4, 4], state: "minecraft:air"},
+        {pos: [4, 4, 0], state: "minecraft:air"},
+        {pos: [4, 4, 1], state: "minecraft:air"},
+        {pos: [4, 4, 2], state: "minecraft:air"},
+        {pos: [4, 4, 3], state: "minecraft:air"},
+        {pos: [4, 4, 4], state: "minecraft:air"}
+    ],
+    entities: [],
+    palette: [
+        "minecraft:polished_andesite",
+        "computercraft:turtle_normal{facing:south,waterlogged:false}",
+        "minecraft:air",
+        "minecraft:composter{level:0}"
+    ]
+}

src/main/java/dan200/computercraft/ComputerCraft.java

@@ -62,7 +62,7 @@ public final class ComputerCraft
     public static int modemHighAltitudeRangeDuringStorm = 384;
     public static int maxNotesPerTick = 8;
     public static MonitorRenderer monitorRenderer = MonitorRenderer.BEST;
-    public static double monitorDistanceSq = 4096;
+    public static int monitorDistance = 65;
     public static long monitorBandwidth = 1_000_000;
 
     public static boolean turtlesNeedFuel = true;

src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java

@@ -27,17 +27,17 @@ import dan200.computercraft.shared.peripheral.generic.GenericPeripheralProvider;
 import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork;
 import dan200.computercraft.shared.util.IDAssigner;
 import dan200.computercraft.shared.wired.WiredNode;
-import net.minecraft.resources.IReloadableResourceManager;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockReader;
-import net.minecraft.world.World;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.packs.resources.ReloadableResourceManager;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fml.ModList;
-import net.minecraftforge.fml.server.ServerLifecycleHooks;
+import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks;
 
 import javax.annotation.Nonnull;
 import java.io.File;
@@ -58,7 +58,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
 
     public static InputStream getResourceFile( String domain, String subPath )
     {
-        IReloadableResourceManager manager = (IReloadableResourceManager) ServerLifecycleHooks.getCurrentServer().getDataPackRegistries().getResourceManager();
+        ReloadableResourceManager manager = (ReloadableResourceManager) ServerLifecycleHooks.getCurrentServer().getResourceManager();
         try
         {
             return manager.getResource( new ResourceLocation( domain, subPath ) ).getInputStream();
@@ -80,13 +80,13 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
     }
 
     @Override
-    public int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath )
+    public int createUniqueNumberedSaveDir( @Nonnull Level world, @Nonnull String parentSubPath )
     {
         return IDAssigner.getNextId( parentSubPath );
     }
 
     @Override
-    public IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity )
+    public IWritableMount createSaveDirMount( @Nonnull Level world, @Nonnull String subPath, long capacity )
     {
         try
         {
@@ -101,7 +101,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
     @Override
     public IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath )
     {
-        IReloadableResourceManager manager = (IReloadableResourceManager) ServerLifecycleHooks.getCurrentServer().getDataPackRegistries().getResourceManager();
+        ReloadableResourceManager manager = (ReloadableResourceManager) ServerLifecycleHooks.getCurrentServer().getResourceManager();
         ResourceMount mount = ResourceMount.get( domain, subPath, manager );
         return mount.exists( "" ) ? mount : null;
     }
@@ -137,7 +137,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
     }
 
     @Override
-    public int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side )
+    public int getBundledRedstoneOutput( @Nonnull Level world, @Nonnull BlockPos pos, @Nonnull Direction side )
     {
         return BundledRedstone.getDefaultOutput( world, pos, side );
     }
@@ -176,9 +176,9 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
 
     @Nonnull
     @Override
-    public LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull Direction side )
+    public LazyOptional<IWiredElement> getWiredElementAt( @Nonnull BlockGetter world, @Nonnull BlockPos pos, @Nonnull Direction side )
     {
-        TileEntity tile = world.getBlockEntity( pos );
+        BlockEntity tile = world.getBlockEntity( pos );
         return tile == null ? LazyOptional.empty() : tile.getCapability( CAPABILITY_WIRED_ELEMENT, side );
     }
 }

src/main/java/dan200/computercraft/api/ComputerCraftAPI.java

@@ -20,10 +20,10 @@ import dan200.computercraft.api.peripheral.IPeripheralProvider;
 import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockReader;
-import net.minecraft.world.World;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.Level;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
 
@@ -64,7 +64,7 @@ public final class ComputerCraftAPI
      * available for writing.
      * @see #createSaveDirMount(World, String, long)
      */
-    public static int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath )
+    public static int createUniqueNumberedSaveDir( @Nonnull Level world, @Nonnull String parentSubPath )
     {
         return getInstance().createUniqueNumberedSaveDir( world, parentSubPath );
     }
@@ -88,7 +88,7 @@ public final class ComputerCraftAPI
      * @see IWritableMount
      */
     @Nullable
-    public static IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity )
+    public static IWritableMount createSaveDirMount( @Nonnull Level world, @Nonnull String subPath, long capacity )
     {
         return getInstance().createSaveDirMount( world, subPath, capacity );
     }
@@ -185,7 +185,7 @@ public final class ComputerCraftAPI
      * If there is no block capable of emitting bundled redstone at the location, -1 will be returned.
      * @see IBundledRedstoneProvider
      */
-    public static int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side )
+    public static int getBundledRedstoneOutput( @Nonnull Level world, @Nonnull BlockPos pos, @Nonnull Direction side )
     {
         return getInstance().getBundledRedstoneOutput( world, pos, side );
     }
@@ -244,7 +244,7 @@ public final class ComputerCraftAPI
      * @see IWiredElement#getNode()
      */
     @Nonnull
-    public static LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull Direction side )
+    public static LazyOptional<IWiredElement> getWiredElementAt( @Nonnull BlockGetter world, @Nonnull BlockPos pos, @Nonnull Direction side )
     {
         return getInstance().getWiredElementAt( world, pos, side );
     }
@@ -272,10 +272,10 @@ public final class ComputerCraftAPI
         @Nonnull
         String getInstalledVersion();
 
-        int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath );
+        int createUniqueNumberedSaveDir( @Nonnull Level world, @Nonnull String parentSubPath );
 
         @Nullable
-        IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity );
+        IWritableMount createSaveDirMount( @Nonnull Level world, @Nonnull String subPath, long capacity );
 
         @Nullable
         IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath );
@@ -290,7 +290,7 @@ public final class ComputerCraftAPI
 
         void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider );
 
-        int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side );
+        int getBundledRedstoneOutput( @Nonnull Level world, @Nonnull BlockPos pos, @Nonnull Direction side );
 
         void registerMediaProvider( @Nonnull IMediaProvider provider );
 
@@ -305,6 +305,6 @@ public final class ComputerCraftAPI
         IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element );
 
         @Nonnull
-        LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull Direction side );
+        LazyOptional<IWiredElement> getWiredElementAt( @Nonnull BlockGetter world, @Nonnull BlockPos pos, @Nonnull Direction side );
     }
 }

src/main/java/dan200/computercraft/api/IUpgradeBase.java

@@ -7,9 +7,9 @@ package dan200.computercraft.api;
 
 import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemStack;
 
 import javax.annotation.Nonnull;
 
@@ -76,8 +76,8 @@ public interface IUpgradeBase
 
         // A more expanded form of ItemStack.areShareTagsEqual, but allowing an empty tag to be equal to a
         // null one.
-        CompoundNBT shareTag = stack.getItem().getShareTag( stack );
-        CompoundNBT craftingShareTag = crafting.getItem().getShareTag( crafting );
+        CompoundTag shareTag = stack.getItem().getShareTag( stack );
+        CompoundTag craftingShareTag = crafting.getItem().getShareTag( crafting );
         if( shareTag == craftingShareTag ) return true;
         if( shareTag == null ) return craftingShareTag.isEmpty();
         if( craftingShareTag == null ) return shareTag.isEmpty();

src/main/java/dan200/computercraft/api/client/TransformedModel.java

@@ -5,12 +5,12 @@
  */
 package dan200.computercraft.api.client;
 
+import com.mojang.math.Transformation;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.model.IBakedModel;
-import net.minecraft.client.renderer.model.ModelManager;
-import net.minecraft.client.renderer.model.ModelResourceLocation;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.vector.TransformationMatrix;
+import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.client.resources.model.ModelManager;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.world.item.ItemStack;
 
 import javax.annotation.Nonnull;
 import java.util.Objects;
@@ -20,19 +20,19 @@ import java.util.Objects;
  */
 public final class TransformedModel
 {
-    private final IBakedModel model;
-    private final TransformationMatrix matrix;
+    private final BakedModel model;
+    private final Transformation matrix;
 
-    public TransformedModel( @Nonnull IBakedModel model, @Nonnull TransformationMatrix matrix )
+    public TransformedModel( @Nonnull BakedModel model, @Nonnull Transformation matrix )
     {
         this.model = Objects.requireNonNull( model );
         this.matrix = Objects.requireNonNull( matrix );
     }
 
-    public TransformedModel( @Nonnull IBakedModel model )
+    public TransformedModel( @Nonnull BakedModel model )
     {
         this.model = Objects.requireNonNull( model );
-        matrix = TransformationMatrix.identity();
+        matrix = Transformation.identity();
     }
 
     public static TransformedModel of( @Nonnull ModelResourceLocation location )
@@ -41,20 +41,20 @@ public final class TransformedModel
         return new TransformedModel( modelManager.getModel( location ) );
     }
 
-    public static TransformedModel of( @Nonnull ItemStack item, @Nonnull TransformationMatrix transform )
+    public static TransformedModel of( @Nonnull ItemStack item, @Nonnull Transformation transform )
     {
-        IBakedModel model = Minecraft.getInstance().getItemRenderer().getItemModelShaper().getItemModel( item );
+        BakedModel model = Minecraft.getInstance().getItemRenderer().getItemModelShaper().getItemModel( item );
         return new TransformedModel( model, transform );
     }
 
     @Nonnull
-    public IBakedModel getModel()
+    public BakedModel getModel()
     {
         return model;
     }
 
     @Nonnull
-    public TransformationMatrix getMatrix()
+    public Transformation getMatrix()
     {
         return matrix;
     }

src/main/java/dan200/computercraft/api/filesystem/IMount.java

@@ -7,7 +7,7 @@ package dan200.computercraft.api.filesystem;
 
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.peripheral.IComputerAccess;
-import net.minecraft.world.World;
+import net.minecraft.world.level.Level;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;
@@ -20,10 +20,10 @@ import java.util.List;
  * {@link IComputerAccess#mount(String, IMount)}.
  *
  * Ready made implementations of this interface can be created using
- * {@link ComputerCraftAPI#createSaveDirMount(World, String, long)} or
+ * {@link ComputerCraftAPI#createSaveDirMount(Level, String, long)} or
  * {@link ComputerCraftAPI#createResourceMount(String, String)}, or you're free to implement it yourselves!
  *
- * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
+ * @see ComputerCraftAPI#createSaveDirMount(Level, String, long)
  * @see ComputerCraftAPI#createResourceMount(String, String)
  * @see IComputerAccess#mount(String, IMount)
  * @see IWritableMount

src/main/java/dan200/computercraft/api/filesystem/IWritableMount.java

@@ -7,7 +7,7 @@ package dan200.computercraft.api.filesystem;
 
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.peripheral.IComputerAccess;
-import net.minecraft.world.World;
+import net.minecraft.world.level.Level;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;
@@ -20,9 +20,9 @@ import java.util.OptionalLong;
  * or {@link IComputerAccess#mountWritable(String, IWritableMount)}, that can also be written to.
  *
  * Ready made implementations of this interface can be created using
- * {@link ComputerCraftAPI#createSaveDirMount(World, String, long)}, or you're free to implement it yourselves!
+ * {@link ComputerCraftAPI#createSaveDirMount(Level, String, long)}, or you're free to implement it yourselves!
  *
- * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
+ * @see ComputerCraftAPI#createSaveDirMount(Level, String, long)
  * @see IComputerAccess#mount(String, IMount)
  * @see IComputerAccess#mountWritable(String, IWritableMount)
  * @see IMount

src/main/java/dan200/computercraft/api/lua/GenericSource.java

@@ -9,7 +9,7 @@ import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.peripheral.IPeripheralProvider;
 import dan200.computercraft.core.asm.LuaMethod;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.items.IItemHandler;
 

src/main/java/dan200/computercraft/api/media/IMedia.java

@@ -6,10 +6,10 @@
 package dan200.computercraft.api.media;
 
 import dan200.computercraft.api.filesystem.IMount;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.SoundEvent;
-import net.minecraft.world.World;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -78,11 +78,11 @@ public interface IMedia
      * implements {@link dan200.computercraft.api.filesystem.IWritableMount}, it will mounted using mountWritable()
      * @see IMount
      * @see dan200.computercraft.api.filesystem.IWritableMount
-     * @see dan200.computercraft.api.ComputerCraftAPI#createSaveDirMount(World, String, long)
+     * @see dan200.computercraft.api.ComputerCraftAPI#createSaveDirMount(Level, String, long)
      * @see dan200.computercraft.api.ComputerCraftAPI#createResourceMount(String, String)
      */
     @Nullable
-    default IMount createDataMount( @Nonnull ItemStack stack, @Nonnull World world )
+    default IMount createDataMount( @Nonnull ItemStack stack, @Nonnull Level world )
     {
         return null;
     }

src/main/java/dan200/computercraft/api/media/IMediaProvider.java

@@ -5,7 +5,7 @@
  */
 package dan200.computercraft.api.media;
 
-import net.minecraft.item.ItemStack;
+import net.minecraft.world.item.ItemStack;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

src/main/java/dan200/computercraft/api/network/IPacketReceiver.java

@@ -5,8 +5,8 @@
  */
 package dan200.computercraft.api.network;
 
-import net.minecraft.util.math.vector.Vector3d;
-import net.minecraft.world.World;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
 
 import javax.annotation.Nonnull;
 
@@ -21,7 +21,7 @@ public interface IPacketReceiver
      * @return The receivers's world.
      */
     @Nonnull
-    World getWorld();
+    Level getLevel();
 
     /**
      * Get the position in the world at which this receiver exists.
@@ -29,7 +29,7 @@ public interface IPacketReceiver
      * @return The receiver's position.
      */
     @Nonnull
-    Vector3d getPosition();
+    Vec3 getPosition();
 
     /**
      * Get the maximum distance this receiver can send and receive messages.

src/main/java/dan200/computercraft/api/network/IPacketSender.java

@@ -5,8 +5,8 @@
  */
 package dan200.computercraft.api.network;
 
-import net.minecraft.util.math.vector.Vector3d;
-import net.minecraft.world.World;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
 
 import javax.annotation.Nonnull;
 
@@ -21,7 +21,7 @@ public interface IPacketSender
      * @return The sender's world.
      */
     @Nonnull
-    World getWorld();
+    Level getLevel();
 
     /**
      * Get the position in the world at which this sender exists.
@@ -29,7 +29,7 @@ public interface IPacketSender
      * @return The sender's position.
      */
     @Nonnull
-    Vector3d getPosition();
+    Vec3 getPosition();
 
     /**
      * Get some sort of identification string for this sender. This does not strictly need to be unique, but you

src/main/java/dan200/computercraft/api/peripheral/IComputerAccess.java

@@ -12,7 +12,7 @@ import dan200.computercraft.api.lua.ILuaCallback;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.lua.ILuaTask;
 import dan200.computercraft.api.lua.MethodResult;
-import net.minecraft.world.World;
+import net.minecraft.world.level.Level;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -33,7 +33,7 @@ public interface IComputerAccess
      * @return The location on the computer's file system where you the mount mounted, or {@code null} if there was already a
      * file in the desired location. Store this value if you wish to unmount the mount later.
      * @throws NotAttachedException If the peripheral has been detached.
-     * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
+     * @see ComputerCraftAPI#createSaveDirMount(Level, String, long)
      * @see ComputerCraftAPI#createResourceMount(String, String)
      * @see #mount(String, IMount, String)
      * @see #mountWritable(String, IWritableMount)
@@ -55,7 +55,7 @@ public interface IComputerAccess
      * @return The location on the computer's file system where you the mount mounted, or {@code null} if there was already a
      * file in the desired location. Store this value if you wish to unmount the mount later.
      * @throws NotAttachedException If the peripheral has been detached.
-     * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
+     * @see ComputerCraftAPI#createSaveDirMount(Level, String, long)
      * @see ComputerCraftAPI#createResourceMount(String, String)
      * @see #mount(String, IMount)
      * @see #mountWritable(String, IWritableMount)
@@ -73,7 +73,7 @@ public interface IComputerAccess
      * @return The location on the computer's file system where you the mount mounted, or null if there was already a
      * file in the desired location. Store this value if you wish to unmount the mount later.
      * @throws NotAttachedException If the peripheral has been detached.
-     * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
+     * @see ComputerCraftAPI#createSaveDirMount(Level, String, long)
      * @see ComputerCraftAPI#createResourceMount(String, String)
      * @see #mount(String, IMount)
      * @see #unmount(String)
@@ -94,7 +94,7 @@ public interface IComputerAccess
      * @return The location on the computer's file system where you the mount mounted, or null if there was already a
      * file in the desired location. Store this value if you wish to unmount the mount later.
      * @throws NotAttachedException If the peripheral has been detached.
-     * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
+     * @see ComputerCraftAPI#createSaveDirMount(Level, String, long)
      * @see ComputerCraftAPI#createResourceMount(String, String)
      * @see #mount(String, IMount)
      * @see #unmount(String)

src/main/java/dan200/computercraft/api/peripheral/IPeripheralProvider.java

@@ -5,10 +5,10 @@
  */
 package dan200.computercraft.api.peripheral;
 
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraftforge.common.util.LazyOptional;
 
 import javax.annotation.Nonnull;
@@ -16,7 +16,7 @@ import javax.annotation.Nonnull;
 /**
  * This interface is used to create peripheral implementations for blocks.
  *
- * If you have a {@link TileEntity} which acts as a peripheral, you may alternatively expose the {@link IPeripheral}
+ * If you have a {@link BlockEntity} which acts as a peripheral, you may alternatively expose the {@link IPeripheral}
  * capability.
  *
  * @see dan200.computercraft.api.ComputerCraftAPI#registerPeripheralProvider(IPeripheralProvider)
@@ -34,5 +34,5 @@ public interface IPeripheralProvider
      * @see dan200.computercraft.api.ComputerCraftAPI#registerPeripheralProvider(IPeripheralProvider)
      */
     @Nonnull
-    LazyOptional<IPeripheral> getPeripheral( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side );
+    LazyOptional<IPeripheral> getPeripheral( @Nonnull Level world, @Nonnull BlockPos pos, @Nonnull Direction side );
 }

src/main/java/dan200/computercraft/api/pocket/AbstractPocketUpgrade.java

@@ -5,11 +5,11 @@
  */
 package dan200.computercraft.api.pocket;
 
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IItemProvider;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.Util;
+import net.minecraft.Util;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.ItemLike;
 import net.minecraftforge.common.util.NonNullSupplier;
 
 import javax.annotation.Nonnull;
@@ -48,22 +48,22 @@ public abstract class AbstractPocketUpgrade implements IPocketUpgrade
         this( id, () -> stack );
     }
 
-    protected AbstractPocketUpgrade( ResourceLocation id, String adjective, IItemProvider item )
+    protected AbstractPocketUpgrade( ResourceLocation id, String adjective, ItemLike item )
     {
         this( id, adjective, new CachedStack( () -> item ) );
     }
 
-    protected AbstractPocketUpgrade( ResourceLocation id, IItemProvider item )
+    protected AbstractPocketUpgrade( ResourceLocation id, ItemLike item )
     {
         this( id, new CachedStack( () -> item ) );
     }
 
-    protected AbstractPocketUpgrade( ResourceLocation id, String adjective, Supplier<? extends IItemProvider> item )
+    protected AbstractPocketUpgrade( ResourceLocation id, String adjective, Supplier<? extends ItemLike> item )
     {
         this( id, adjective, new CachedStack( item ) );
     }
 
-    protected AbstractPocketUpgrade( ResourceLocation id, Supplier<? extends IItemProvider> item )
+    protected AbstractPocketUpgrade( ResourceLocation id, Supplier<? extends ItemLike> item )
     {
         this( id, new CachedStack( item ) );
     }
@@ -96,11 +96,11 @@ public abstract class AbstractPocketUpgrade implements IPocketUpgrade
      */
     private static final class CachedStack implements NonNullSupplier<ItemStack>
     {
-        private final Supplier<? extends IItemProvider> provider;
+        private final Supplier<? extends ItemLike> provider;
         private Item item;
         private ItemStack stack;
 
-        CachedStack( Supplier<? extends IItemProvider> provider )
+        CachedStack( Supplier<? extends ItemLike> provider )
         {
             this.provider = provider;
         }

src/main/java/dan200/computercraft/api/pocket/IPocketAccess.java

@@ -6,9 +6,9 @@
 package dan200.computercraft.api.pocket;
 
 import dan200.computercraft.api.peripheral.IPeripheral;
-import net.minecraft.entity.Entity;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.Entity;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -74,7 +74,7 @@ public interface IPocketAccess
      * @see #updateUpgradeNBTData()
      */
     @Nonnull
-    CompoundNBT getUpgradeNBTData();
+    CompoundTag getUpgradeNBTData();
 
     /**
      * Mark the upgrade-specific NBT as dirty.

src/main/java/dan200/computercraft/api/pocket/IPocketUpgrade.java

@@ -8,7 +8,7 @@ package dan200.computercraft.api.pocket;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.IUpgradeBase;
 import dan200.computercraft.api.peripheral.IPeripheral;
-import net.minecraft.world.World;
+import net.minecraft.world.level.Level;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -56,7 +56,7 @@ public interface IPocketUpgrade extends IUpgradeBase
      * access the GUI.
      * @see #createPeripheral(IPocketAccess)
      */
-    default boolean onRightClick( @Nonnull World world, @Nonnull IPocketAccess access, @Nullable IPeripheral peripheral )
+    default boolean onRightClick( @Nonnull Level world, @Nonnull IPocketAccess access, @Nullable IPeripheral peripheral )
     {
         return false;
     }

src/main/java/dan200/computercraft/api/redstone/IBundledRedstoneProvider.java

@@ -5,9 +5,9 @@
  */
 package dan200.computercraft.api.redstone;
 
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.Level;
 
 import javax.annotation.Nonnull;
 
@@ -29,5 +29,5 @@ public interface IBundledRedstoneProvider
      * handle this block.
      * @see dan200.computercraft.api.ComputerCraftAPI#registerBundledRedstoneProvider(IBundledRedstoneProvider)
      */
-    int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side );
+    int getBundledRedstoneOutput( @Nonnull Level world, @Nonnull BlockPos pos, @Nonnull Direction side );
 }

src/main/java/dan200/computercraft/api/turtle/AbstractTurtleUpgrade.java

@@ -5,11 +5,11 @@
  */
 package dan200.computercraft.api.turtle;
 
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IItemProvider;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.Util;
+import net.minecraft.Util;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.ItemLike;
 import net.minecraftforge.common.util.NonNullSupplier;
 
 import javax.annotation.Nonnull;
@@ -50,22 +50,22 @@ public abstract class AbstractTurtleUpgrade implements ITurtleUpgrade
         this( id, type, () -> stack );
     }
 
-    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, String adjective, IItemProvider item )
+    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, String adjective, ItemLike item )
     {
         this( id, type, adjective, new CachedStack( () -> item ) );
     }
 
-    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, IItemProvider item )
+    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, ItemLike item )
     {
         this( id, type, new CachedStack( () -> item ) );
     }
 
-    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, String adjective, Supplier<? extends IItemProvider> item )
+    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, String adjective, Supplier<? extends ItemLike> item )
     {
         this( id, type, adjective, new CachedStack( item ) );
     }
 
-    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, Supplier<? extends IItemProvider> item )
+    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, Supplier<? extends ItemLike> item )
     {
         this( id, type, new CachedStack( item ) );
     }
@@ -105,11 +105,11 @@ public abstract class AbstractTurtleUpgrade implements ITurtleUpgrade
      */
     private static final class CachedStack implements NonNullSupplier<ItemStack>
     {
-        private final Supplier<? extends IItemProvider> provider;
+        private final Supplier<? extends ItemLike> provider;
         private Item item;
         private ItemStack stack;
 
-        CachedStack( Supplier<? extends IItemProvider> provider )
+        CachedStack( Supplier<? extends ItemLike> provider )
         {
             this.provider = provider;
         }

src/main/java/dan200/computercraft/api/turtle/ITurtleAccess.java

@@ -9,12 +9,12 @@ import com.mojang.authlib.GameProfile;
 import dan200.computercraft.api.lua.ILuaCallback;
 import dan200.computercraft.api.lua.MethodResult;
 import dan200.computercraft.api.peripheral.IPeripheral;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
-import net.minecraft.world.World;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.Container;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.items.IItemHandlerModifiable;
 
 import javax.annotation.Nonnull;
@@ -34,7 +34,7 @@ public interface ITurtleAccess
      * @return the world in which the turtle resides.
      */
     @Nonnull
-    World getWorld();
+    Level getLevel();
 
     /**
      * Returns a vector containing the integer co-ordinates at which the turtle resides.
@@ -56,7 +56,7 @@ public interface ITurtleAccess
      * was cancelled.
      * @throws UnsupportedOperationException When attempting to teleport on the client side.
      */
-    boolean teleportTo( @Nonnull World world, @Nonnull BlockPos pos );
+    boolean teleportTo( @Nonnull Level world, @Nonnull BlockPos pos );
 
     /**
      * Returns a vector containing the floating point co-ordinates at which the turtle is rendered.
@@ -67,7 +67,7 @@ public interface ITurtleAccess
      * @see #getVisualYaw(float)
      */
     @Nonnull
-    Vector3d getVisualPosition( float f );
+    Vec3 getVisualPosition( float f );
 
     /**
      * Returns the yaw the turtle is facing when it is rendered.
@@ -151,7 +151,7 @@ public interface ITurtleAccess
      * @see #getItemHandler()
      */
     @Nonnull
-    IInventory getInventory();
+    Container getInventory();
 
     /**
      * Get the inventory of this turtle as an {@link IItemHandlerModifiable}.
@@ -287,7 +287,7 @@ public interface ITurtleAccess
      * @see #updateUpgradeNBTData(TurtleSide)
      */
     @Nonnull
-    CompoundNBT getUpgradeNBTData( @Nullable TurtleSide side );
+    CompoundTag getUpgradeNBTData( @Nullable TurtleSide side );
 
     /**
      * Mark the upgrade-specific data as dirty on a specific side. This is required for the data to be synced to the

src/main/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java

@@ -11,9 +11,9 @@ import dan200.computercraft.api.client.TransformedModel;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.turtle.event.TurtleAttackEvent;
 import dan200.computercraft.api.turtle.event.TurtleBlockEvent;
-import net.minecraft.client.renderer.model.ModelResourceLocation;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.Direction;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.core.Direction;
+import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.event.entity.player.AttackEntityEvent;
@@ -84,8 +84,8 @@ public interface ITurtleUpgrade extends IUpgradeBase
     /**
      * Called to obtain the model to be used when rendering a turtle peripheral.
      *
-     * This can be obtained from {@link net.minecraft.client.renderer.ItemModelMesher#getItemModel(ItemStack)},
-     * {@link net.minecraft.client.renderer.model.ModelManager#getModel(ModelResourceLocation)} or any other
+     * This can be obtained from {@link net.minecraft.client.renderer.ItemModelShaper#getItemModel(ItemStack)},
+     * {@link net.minecraft.client.resources.model.ModelManager#getModel(ModelResourceLocation)} or any other
      * source.
      *
      * @param turtle Access to the turtle that the upgrade resides on. This will be null when getting item models!

src/main/java/dan200/computercraft/api/turtle/TurtleCommandResult.java

@@ -5,7 +5,7 @@
  */
 package dan200.computercraft.api.turtle;
 
-import net.minecraft.util.Direction;
+import net.minecraft.core.Direction;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

src/main/java/dan200/computercraft/api/turtle/TurtleVerb.java

@@ -5,7 +5,7 @@
  */
 package dan200.computercraft.api.turtle;
 
-import net.minecraft.util.Direction;
+import net.minecraft.core.Direction;
 
 /**
  * An enum representing the different actions that an {@link ITurtleUpgrade} of type Tool may be called on to perform by

src/main/java/dan200/computercraft/api/turtle/event/TurtleAttackEvent.java

@@ -9,8 +9,8 @@ import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.api.turtle.TurtleVerb;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.Direction;
+import net.minecraft.core.Direction;
+import net.minecraft.world.entity.Entity;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.entity.player.AttackEntityEvent;
 

src/main/java/dan200/computercraft/api/turtle/event/TurtleBlockEvent.java

@@ -10,11 +10,11 @@ import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.api.turtle.TurtleVerb;
-import net.minecraft.block.BlockState;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.world.BlockEvent;
 
@@ -36,16 +36,16 @@ import java.util.Objects;
  */
 public abstract class TurtleBlockEvent extends TurtlePlayerEvent
 {
-    private final World world;
+    private final Level level;
     private final BlockPos pos;
 
-    protected TurtleBlockEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos )
+    protected TurtleBlockEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player, @Nonnull Level level, @Nonnull BlockPos pos )
     {
         super( turtle, action, player );
 
-        Objects.requireNonNull( world, "world cannot be null" );
+        Objects.requireNonNull( level, "world cannot be null" );
         Objects.requireNonNull( pos, "pos cannot be null" );
-        this.world = world;
+        this.level = level;
         this.pos = pos;
     }
 
@@ -54,9 +54,9 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
      *
      * @return The world the turtle is interacting in.
      */
-    public World getWorld()
+    public Level getLevel()
     {
-        return world;
+        return level;
     }
 
     /**
@@ -86,7 +86,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
         private final ITurtleUpgrade upgrade;
         private final TurtleSide side;
 
-        public Dig( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState block, @Nonnull ITurtleUpgrade upgrade, @Nonnull TurtleSide side )
+        public Dig( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull Level world, @Nonnull BlockPos pos, @Nonnull BlockState block, @Nonnull ITurtleUpgrade upgrade, @Nonnull TurtleSide side )
         {
             super( turtle, TurtleAction.DIG, player, world, pos );
 
@@ -139,7 +139,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
      */
     public static class Move extends TurtleBlockEvent
     {
-        public Move( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos )
+        public Move( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull Level world, @Nonnull BlockPos pos )
         {
             super( turtle, TurtleAction.MOVE, player, world, pos );
         }
@@ -154,7 +154,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
     {
         private final ItemStack stack;
 
-        public Place( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull ItemStack stack )
+        public Place( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull Level world, @Nonnull BlockPos pos, @Nonnull ItemStack stack )
         {
             super( turtle, TurtleAction.PLACE, player, world, pos );
 
@@ -186,7 +186,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
         private final BlockState state;
         private final Map<String, Object> data;
 
-        public Inspect( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull Map<String, Object> data )
+        public Inspect( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull Level world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull Map<String, Object> data )
         {
             super( turtle, TurtleAction.INSPECT, player, world, pos );
 

src/main/java/dan200/computercraft/api/turtle/event/TurtleInspectItemEvent.java

@@ -7,7 +7,7 @@ package dan200.computercraft.api.turtle.event;
 
 import dan200.computercraft.api.lua.MethodResult;
 import dan200.computercraft.api.turtle.ITurtleAccess;
-import net.minecraft.item.ItemStack;
+import net.minecraft.world.item.ItemStack;
 
 import javax.annotation.Nonnull;
 import java.util.Map;

src/main/java/dan200/computercraft/api/turtle/event/TurtleInventoryEvent.java

@@ -6,9 +6,9 @@
 package dan200.computercraft.api.turtle.event;
 
 import dan200.computercraft.api.turtle.ITurtleAccess;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.items.IItemHandler;
 
@@ -23,7 +23,7 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent
 {
     private final IItemHandler handler;
 
-    protected TurtleInventoryEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable IItemHandler handler )
+    protected TurtleInventoryEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player, @Nonnull Level world, @Nonnull BlockPos pos, @Nullable IItemHandler handler )
     {
         super( turtle, action, player, world, pos );
         this.handler = handler;
@@ -47,7 +47,7 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent
      */
     public static class Suck extends TurtleInventoryEvent
     {
-        public Suck( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable IItemHandler handler )
+        public Suck( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull Level world, @Nonnull BlockPos pos, @Nullable IItemHandler handler )
         {
             super( turtle, TurtleAction.SUCK, player, world, pos, handler );
         }
@@ -62,7 +62,7 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent
     {
         private final ItemStack stack;
 
-        public Drop( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable IItemHandler handler, @Nonnull ItemStack stack )
+        public Drop( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull Level world, @Nonnull BlockPos pos, @Nullable IItemHandler handler, @Nonnull ItemStack stack )
         {
             super( turtle, TurtleAction.DROP, player, world, pos, handler );
 

src/main/java/dan200/computercraft/api/turtle/event/TurtleRefuelEvent.java

@@ -6,7 +6,7 @@
 package dan200.computercraft.api.turtle.event;
 
 import dan200.computercraft.api.turtle.ITurtleAccess;
-import net.minecraft.item.ItemStack;
+import net.minecraft.world.item.ItemStack;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

src/main/java/dan200/computercraft/client/ClientRegistry.java

@@ -20,21 +20,22 @@ import dan200.computercraft.shared.media.items.ItemTreasureDisk;
 import dan200.computercraft.shared.pocket.inventory.ContainerPocketComputer;
 import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
 import dan200.computercraft.shared.util.Colour;
-import net.minecraft.client.gui.ScreenManager;
+import net.minecraft.client.gui.screens.MenuScreens;
+import net.minecraft.client.renderer.ItemBlockRenderTypes;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.RenderTypeLookup;
-import net.minecraft.client.renderer.model.ModelResourceLocation;
-import net.minecraft.item.IItemPropertyGetter;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemModelsProperties;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
+import net.minecraft.client.renderer.item.ItemProperties;
+import net.minecraft.client.renderer.item.ItemPropertyFunction;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Item;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.ColorHandlerEvent;
+import net.minecraftforge.client.event.EntityRenderersEvent;
 import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.client.registry.RenderingRegistry;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 
@@ -122,44 +123,48 @@ public final class ClientRegistry
         );
     }
 
+    @SubscribeEvent
+    public static void registerEntityRenderers( EntityRenderersEvent.RegisterRenderers event )
+    {
+        event.registerEntityRenderer( Registry.ModEntities.TURTLE_PLAYER.get(), TurtlePlayerRenderer::new );
+    }
+
     @SubscribeEvent
     public static void setupClient( FMLClientSetupEvent event )
     {
         registerContainers();
 
         // While turtles themselves are not transparent, their upgrades may be.
-        RenderTypeLookup.setRenderLayer( Registry.ModBlocks.TURTLE_NORMAL.get(), RenderType.translucent() );
-        RenderTypeLookup.setRenderLayer( Registry.ModBlocks.TURTLE_ADVANCED.get(), RenderType.translucent() );
+        ItemBlockRenderTypes.setRenderLayer( Registry.ModBlocks.TURTLE_NORMAL.get(), RenderType.translucent() );
+        ItemBlockRenderTypes.setRenderLayer( Registry.ModBlocks.TURTLE_ADVANCED.get(), RenderType.translucent() );
 
         // Monitors' textures have transparent fronts and so count as cutouts.
-        RenderTypeLookup.setRenderLayer( Registry.ModBlocks.MONITOR_NORMAL.get(), RenderType.cutout() );
-        RenderTypeLookup.setRenderLayer( Registry.ModBlocks.MONITOR_ADVANCED.get(), RenderType.cutout() );
+        ItemBlockRenderTypes.setRenderLayer( Registry.ModBlocks.MONITOR_NORMAL.get(), RenderType.cutout() );
+        ItemBlockRenderTypes.setRenderLayer( Registry.ModBlocks.MONITOR_ADVANCED.get(), RenderType.cutout() );
 
         // Setup TESRs
-        net.minecraftforge.fml.client.registry.ClientRegistry.bindTileEntityRenderer( Registry.ModTiles.MONITOR_NORMAL.get(), TileEntityMonitorRenderer::new );
-        net.minecraftforge.fml.client.registry.ClientRegistry.bindTileEntityRenderer( Registry.ModTiles.MONITOR_ADVANCED.get(), TileEntityMonitorRenderer::new );
-        net.minecraftforge.fml.client.registry.ClientRegistry.bindTileEntityRenderer( Registry.ModTiles.TURTLE_NORMAL.get(), TileEntityTurtleRenderer::new );
-        net.minecraftforge.fml.client.registry.ClientRegistry.bindTileEntityRenderer( Registry.ModTiles.TURTLE_ADVANCED.get(), TileEntityTurtleRenderer::new );
-
-        RenderingRegistry.registerEntityRenderingHandler( Registry.ModEntities.TURTLE_PLAYER.get(), TurtlePlayerRenderer::new );
+        BlockEntityRenderers.register( Registry.ModBlockEntities.MONITOR_NORMAL.get(), TileEntityMonitorRenderer::new );
+        BlockEntityRenderers.register( Registry.ModBlockEntities.MONITOR_ADVANCED.get(), TileEntityMonitorRenderer::new );
+        BlockEntityRenderers.register( Registry.ModBlockEntities.TURTLE_NORMAL.get(), TileEntityTurtleRenderer::new );
+        BlockEntityRenderers.register( Registry.ModBlockEntities.TURTLE_ADVANCED.get(), TileEntityTurtleRenderer::new );
 
         registerItemProperty( "state",
-            ( stack, world, player ) -> ItemPocketComputer.getState( stack ).ordinal(),
+            ( stack, world, player, random ) -> ItemPocketComputer.getState( stack ).ordinal(),
             Registry.ModItems.POCKET_COMPUTER_NORMAL, Registry.ModItems.POCKET_COMPUTER_ADVANCED
         );
         registerItemProperty( "coloured",
-            ( stack, world, player ) -> IColouredItem.getColourBasic( stack ) != -1 ? 1 : 0,
+            ( stack, world, player, random ) -> IColouredItem.getColourBasic( stack ) != -1 ? 1 : 0,
             Registry.ModItems.POCKET_COMPUTER_NORMAL, Registry.ModItems.POCKET_COMPUTER_ADVANCED
         );
     }
 
     @SafeVarargs
-    private static void registerItemProperty( String name, IItemPropertyGetter getter, Supplier<? extends Item>... items )
+    private static void registerItemProperty( String name, ItemPropertyFunction getter, Supplier<? extends Item>... items )
     {
         ResourceLocation id = new ResourceLocation( ComputerCraft.MOD_ID, name );
         for( Supplier<? extends Item> item : items )
         {
-            ItemModelsProperties.register( item.get(), id, getter );
+            ItemProperties.register( item.get(), id, getter );
         }
     }
 
@@ -168,14 +173,14 @@ public final class ClientRegistry
     {
         // My IDE doesn't think so, but we do actually need these generics.
 
-        ScreenManager.<ContainerComputer, GuiComputer<ContainerComputer>>register( Registry.ModContainers.COMPUTER.get(), GuiComputer::create );
-        ScreenManager.<ContainerPocketComputer, GuiComputer<ContainerPocketComputer>>register( Registry.ModContainers.POCKET_COMPUTER.get(), GuiComputer::createPocket );
-        ScreenManager.register( Registry.ModContainers.TURTLE.get(), GuiTurtle::new );
+        MenuScreens.<ContainerComputer, GuiComputer<ContainerComputer>>register( Registry.ModContainers.COMPUTER.get(), GuiComputer::create );
+        MenuScreens.<ContainerPocketComputer, GuiComputer<ContainerPocketComputer>>register( Registry.ModContainers.POCKET_COMPUTER.get(), GuiComputer::createPocket );
+        MenuScreens.register( Registry.ModContainers.TURTLE.get(), GuiTurtle::new );
 
-        ScreenManager.register( Registry.ModContainers.PRINTER.get(), GuiPrinter::new );
-        ScreenManager.register( Registry.ModContainers.DISK_DRIVE.get(), GuiDiskDrive::new );
-        ScreenManager.register( Registry.ModContainers.PRINTOUT.get(), GuiPrintout::new );
+        MenuScreens.register( Registry.ModContainers.PRINTER.get(), GuiPrinter::new );
+        MenuScreens.register( Registry.ModContainers.DISK_DRIVE.get(), GuiDiskDrive::new );
+        MenuScreens.register( Registry.ModContainers.PRINTOUT.get(), GuiPrintout::new );
 
-        ScreenManager.<ContainerViewComputer, GuiComputer<ContainerViewComputer>>register( Registry.ModContainers.VIEW_COMPUTER.get(), GuiComputer::createView );
+        MenuScreens.<ContainerViewComputer, GuiComputer<ContainerViewComputer>>register( Registry.ModContainers.VIEW_COMPUTER.get(), GuiComputer::createView );
     }
 }

src/main/java/dan200/computercraft/client/ClientTableFormatter.java

@@ -9,12 +9,12 @@ import dan200.computercraft.shared.command.text.ChatHelpers;
 import dan200.computercraft.shared.command.text.TableBuilder;
 import dan200.computercraft.shared.command.text.TableFormatter;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
+import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.NewChatGui;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextFormatting;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.components.ChatComponent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.util.Mth;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Nullable;
@@ -25,25 +25,25 @@ public class ClientTableFormatter implements TableFormatter
 
     private static final Int2IntOpenHashMap lastHeights = new Int2IntOpenHashMap();
 
-    private static FontRenderer renderer()
+    private static Font renderer()
     {
         return Minecraft.getInstance().font;
     }
 
     @Override
     @Nullable
-    public ITextComponent getPadding( ITextComponent component, int width )
+    public Component getPadding( Component component, int width )
     {
         int extraWidth = width - getWidth( component );
         if( extraWidth <= 0 ) return null;
 
-        FontRenderer renderer = renderer();
+        Font renderer = renderer();
 
         float spaceWidth = renderer.width( " " );
-        int spaces = MathHelper.floor( extraWidth / spaceWidth );
+        int spaces = Mth.floor( extraWidth / spaceWidth );
         int extra = extraWidth - (int) (spaces * spaceWidth);
 
-        return ChatHelpers.coloured( StringUtils.repeat( ' ', spaces ) + StringUtils.repeat( (char) 712, extra ), TextFormatting.GRAY );
+        return ChatHelpers.coloured( StringUtils.repeat( ' ', spaces ) + StringUtils.repeat( (char) 712, extra ), ChatFormatting.GRAY );
     }
 
     @Override
@@ -53,16 +53,16 @@ public class ClientTableFormatter implements TableFormatter
     }
 
     @Override
-    public int getWidth( ITextComponent component )
+    public int getWidth( Component component )
     {
         return renderer().width( component );
     }
 
     @Override
-    public void writeLine( int id, ITextComponent component )
+    public void writeLine( int id, Component component )
     {
         Minecraft mc = Minecraft.getInstance();
-        NewChatGui chat = mc.gui.getChat();
+        ChatComponent chat = mc.gui.getChat();
 
         // TODO: Trim the text if it goes over the allowed length
         // int maxWidth = MathHelper.floor( chat.getChatWidth() / chat.getScale() );
@@ -74,7 +74,7 @@ public class ClientTableFormatter implements TableFormatter
     @Override
     public int display( TableBuilder table )
     {
-        NewChatGui chat = Minecraft.getInstance().gui.getChat();
+        ChatComponent chat = Minecraft.getInstance().gui.getChat();
 
         int lastHeight = lastHeights.get( table.getId() );
 

src/main/java/dan200/computercraft/client/SoundManager.java

@@ -6,13 +6,12 @@
 package dan200.computercraft.client;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.audio.ISound;
-import net.minecraft.client.audio.ITickableSound;
-import net.minecraft.client.audio.LocatableSound;
-import net.minecraft.client.audio.SoundHandler;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.SoundEvent;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.client.resources.sounds.AbstractSoundInstance;
+import net.minecraft.client.resources.sounds.SoundInstance;
+import net.minecraft.client.resources.sounds.TickableSoundInstance;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.world.phys.Vec3;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,9 +21,9 @@ public class SoundManager
 {
     private static final Map<UUID, MoveableSound> sounds = new HashMap<>();
 
-    public static void playSound( UUID source, Vector3d position, SoundEvent event, float volume, float pitch )
+    public static void playSound( UUID source, Vec3 position, SoundEvent event, float volume, float pitch )
     {
-        SoundHandler soundManager = Minecraft.getInstance().getSoundManager();
+        var soundManager = Minecraft.getInstance().getSoundManager();
 
         MoveableSound oldSound = sounds.get( source );
         if( oldSound != null ) soundManager.stop( oldSound );
@@ -36,13 +35,13 @@ public class SoundManager
 
     public static void stopSound( UUID source )
     {
-        ISound sound = sounds.remove( source );
+        SoundInstance sound = sounds.remove( source );
         if( sound == null ) return;
 
         Minecraft.getInstance().getSoundManager().stop( sound );
     }
 
-    public static void moveSound( UUID source, Vector3d position )
+    public static void moveSound( UUID source, Vec3 position )
     {
         MoveableSound sound = sounds.get( source );
         if( sound != null ) sound.setPosition( position );
@@ -53,17 +52,17 @@ public class SoundManager
         sounds.clear();
     }
 
-    private static class MoveableSound extends LocatableSound implements ITickableSound
+    private static class MoveableSound extends AbstractSoundInstance implements TickableSoundInstance
     {
-        protected MoveableSound( SoundEvent sound, Vector3d position, float volume, float pitch )
+        protected MoveableSound( SoundEvent sound, Vec3 position, float volume, float pitch )
         {
-            super( sound, SoundCategory.RECORDS );
+            super( sound, SoundSource.RECORDS );
             setPosition( position );
             this.volume = volume;
             this.pitch = pitch;
         }
 
-        void setPosition( Vector3d position )
+        void setPosition( Vec3 position )
         {
             x = (float) position.x();
             y = (float) position.y();

src/main/java/dan200/computercraft/client/gui/ComputerScreenBase.java

@@ -5,7 +5,7 @@
  */
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
+import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
@@ -17,10 +17,10 @@ import dan200.computercraft.shared.computer.upload.UploadResult;
 import dan200.computercraft.shared.network.NetworkHandler;
 import dan200.computercraft.shared.network.server.ContinueUploadMessage;
 import dan200.computercraft.shared.network.server.UploadFileMessage;
-import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TranslationTextComponent;
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.world.entity.player.Inventory;
 import org.lwjgl.glfw.GLFW;
 
 import javax.annotation.Nonnull;
@@ -34,11 +34,11 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-public abstract class ComputerScreenBase<T extends ContainerComputerBase> extends ContainerScreen<T>
+public abstract class ComputerScreenBase<T extends ContainerComputerBase> extends AbstractContainerScreen<T>
 {
-    private static final ITextComponent OK = new TranslationTextComponent( "gui.ok" );
-    private static final ITextComponent CANCEL = new TranslationTextComponent( "gui.cancel" );
-    private static final ITextComponent OVERWRITE = new TranslationTextComponent( "gui.computercraft.upload.overwrite_button" );
+    private static final Component OK = new TranslatableComponent( "gui.ok" );
+    private static final Component CANCEL = new TranslatableComponent( "gui.cancel" );
+    private static final Component OVERWRITE = new TranslatableComponent( "gui.computercraft.upload.overwrite_button" );
 
     protected WidgetTerminal terminal;
     protected final ClientComputer computer;
@@ -46,7 +46,7 @@ public abstract class ComputerScreenBase<T extends ContainerComputerBase> extend
 
     protected final int sidebarYOffset;
 
-    public ComputerScreenBase( T container, PlayerInventory player, ITextComponent title, int sidebarYOffset )
+    public ComputerScreenBase( T container, Inventory player, Component title, int sidebarYOffset )
     {
         super( container, player, title );
         computer = (ClientComputer) container.getComputer();
@@ -62,8 +62,8 @@ public abstract class ComputerScreenBase<T extends ContainerComputerBase> extend
         super.init();
         minecraft.keyboardHandler.setSendRepeatsToGui( true );
 
-        terminal = addButton( createTerminal() );
-        ComputerSidebar.addButtons( this, computer, this::addButton, leftPos, topPos + sidebarYOffset );
+        terminal = addRenderableWidget( createTerminal() );
+        ComputerSidebar.addButtons( this, computer, this::addRenderableWidget, leftPos, topPos + sidebarYOffset );
         setFocused( terminal );
     }
 
@@ -75,9 +75,9 @@ public abstract class ComputerScreenBase<T extends ContainerComputerBase> extend
     }
 
     @Override
-    public final void tick()
+    public final void containerTick()
     {
-        super.tick();
+        super.containerTick();
         terminal.update();
     }
 
@@ -95,7 +95,7 @@ public abstract class ComputerScreenBase<T extends ContainerComputerBase> extend
 
 
     @Override
-    public final void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
+    public final void render( @Nonnull PoseStack stack, int mouseX, int mouseY, float partialTicks )
     {
         renderBackground( stack );
         super.render( stack, mouseX, mouseY, partialTicks );
@@ -111,7 +111,7 @@ public abstract class ComputerScreenBase<T extends ContainerComputerBase> extend
 
 
     @Override
-    protected void renderLabels( @Nonnull MatrixStack transform, int mouseX, int mouseY )
+    protected void renderLabels( @Nonnull PoseStack transform, int mouseX, int mouseY )
     {
         // Skip rendering labels.
     }
@@ -153,7 +153,7 @@ public abstract class ComputerScreenBase<T extends ContainerComputerBase> extend
             catch( IOException e )
             {
                 ComputerCraft.log.error( "Failed uploading files", e );
-                alert( UploadResult.FAILED_TITLE, new TranslationTextComponent( "computercraft.gui.upload.failed.generic", e.getMessage() ) );
+                alert( UploadResult.FAILED_TITLE, new TranslatableComponent( "computercraft.gui.upload.failed.generic", e.getMessage() ) );
             }
         }
 
@@ -163,7 +163,7 @@ public abstract class ComputerScreenBase<T extends ContainerComputerBase> extend
         }
     }
 
-    public void uploadResult( UploadResult result, ITextComponent message )
+    public void uploadResult( UploadResult result, Component message )
     {
         switch( result )
         {
@@ -198,7 +198,7 @@ public abstract class ComputerScreenBase<T extends ContainerComputerBase> extend
         NetworkHandler.sendToServer( new ContinueUploadMessage( computer.getInstanceID(), false ) );
     }
 
-    private void alert( ITextComponent title, ITextComponent message )
+    private void alert( Component title, Component message )
     {
         OptionScreen.show( minecraft, title, message,
             Collections.singletonList( OptionScreen.newButton( OK, b -> minecraft.setScreen( this ) ) ),

src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java

@@ -5,32 +5,27 @@
  */
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.IVertexBuilder;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.mojang.math.Matrix4f;
 import dan200.computercraft.client.FrameInfo;
+import dan200.computercraft.client.render.RenderTypes;
 import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.util.Colour;
 import dan200.computercraft.shared.util.Palette;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.IRenderTypeBuffer;
-import net.minecraft.client.renderer.RenderState;
+import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.client.renderer.vertex.VertexFormat;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.vector.Matrix4f;
-import net.minecraft.util.math.vector.TransformationMatrix;
-import org.lwjgl.opengl.GL11;
+import net.minecraft.resources.ResourceLocation;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 public final class FixedWidthFontRenderer
 {
-    private static final Matrix4f IDENTITY = TransformationMatrix.identity().getMatrix();
+    private static final RenderType TYPE = RenderTypes.BASIC_TERM;
 
-    private static final ResourceLocation FONT = new ResourceLocation( "computercraft", "textures/gui/term_font.png" );
+    public static final ResourceLocation FONT = new ResourceLocation( "computercraft", "textures/gui/term_font.png" );
 
     public static final int FONT_HEIGHT = 9;
     public static final int FONT_WIDTH = 6;
@@ -39,8 +34,6 @@ public final class FixedWidthFontRenderer
     public static final float BACKGROUND_START = (WIDTH - 6.0f) / WIDTH;
     public static final float BACKGROUND_END = (WIDTH - 4.0f) / WIDTH;
 
-    public static final RenderType TYPE = Type.MAIN;
-
     private FixedWidthFontRenderer()
     {
     }
@@ -55,7 +48,7 @@ public final class FixedWidthFontRenderer
         return 15 - Terminal.getColour( c, def );
     }
 
-    private static void drawChar( Matrix4f transform, IVertexBuilder buffer, float x, float y, int index, float r, float g, float b )
+    private static void drawChar( Matrix4f transform, VertexConsumer buffer, float x, float y, int index, float r, float g, float b )
     {
         // Short circuit to avoid the common case - the texture should be blank here after all.
         if( index == '\0' || index == ' ' ) return;
@@ -74,7 +67,7 @@ public final class FixedWidthFontRenderer
         buffer.vertex( transform, x + FONT_WIDTH, y + FONT_HEIGHT, 0f ).color( r, g, b, 1.0f ).uv( (xStart + FONT_WIDTH) / WIDTH, (yStart + FONT_HEIGHT) / WIDTH ).endVertex();
     }
 
-    private static void drawQuad( Matrix4f transform, IVertexBuilder buffer, float x, float y, float width, float height, float r, float g, float b )
+    private static void drawQuad( Matrix4f transform, VertexConsumer buffer, float x, float y, float width, float height, float r, float g, float b )
     {
         buffer.vertex( transform, x, y, 0 ).color( r, g, b, 1.0f ).uv( BACKGROUND_START, BACKGROUND_START ).endVertex();
         buffer.vertex( transform, x, y + height, 0 ).color( r, g, b, 1.0f ).uv( BACKGROUND_START, BACKGROUND_END ).endVertex();
@@ -84,7 +77,7 @@ public final class FixedWidthFontRenderer
         buffer.vertex( transform, x + width, y + height, 0 ).color( r, g, b, 1.0f ).uv( BACKGROUND_END, BACKGROUND_END ).endVertex();
     }
 
-    private static void drawQuad( Matrix4f transform, IVertexBuilder buffer, float x, float y, float width, float height, Palette palette, boolean greyscale, char colourIndex )
+    private static void drawQuad( Matrix4f transform, VertexConsumer buffer, float x, float y, float width, float height, Palette palette, boolean greyscale, char colourIndex )
     {
         double[] colour = palette.getColour( getColour( colourIndex, Colour.BLACK ) );
         float r, g, b;
@@ -103,7 +96,7 @@ public final class FixedWidthFontRenderer
     }
 
     private static void drawBackground(
-        @Nonnull Matrix4f transform, @Nonnull IVertexBuilder renderer, float x, float y,
+        @Nonnull Matrix4f transform, @Nonnull VertexConsumer renderer, float x, float y,
         @Nonnull TextBuffer backgroundColour, @Nonnull Palette palette, boolean greyscale,
         float leftMarginSize, float rightMarginSize, float height
     )
@@ -142,7 +135,7 @@ public final class FixedWidthFontRenderer
     }
 
     public static void drawString(
-        @Nonnull Matrix4f transform, @Nonnull IVertexBuilder renderer, float x, float y,
+        @Nonnull Matrix4f transform, @Nonnull VertexConsumer renderer, float x, float y,
         @Nonnull TextBuffer text, @Nonnull TextBuffer textColour, @Nullable TextBuffer backgroundColour,
         @Nonnull Palette palette, boolean greyscale, float leftMarginSize, float rightMarginSize
     )
@@ -175,20 +168,8 @@ public final class FixedWidthFontRenderer
 
     }
 
-    public static void drawString(
-        float x, float y, @Nonnull TextBuffer text, @Nonnull TextBuffer textColour, @Nullable TextBuffer backgroundColour,
-        @Nonnull Palette palette, boolean greyscale, float leftMarginSize, float rightMarginSize
-    )
-    {
-        bindFont();
-
-        IRenderTypeBuffer.Impl renderer = Minecraft.getInstance().renderBuffers().bufferSource();
-        drawString( IDENTITY, ((IRenderTypeBuffer) renderer).getBuffer( TYPE ), x, y, text, textColour, backgroundColour, palette, greyscale, leftMarginSize, rightMarginSize );
-        renderer.endBatch();
-    }
-
     public static void drawTerminalWithoutCursor(
-        @Nonnull Matrix4f transform, @Nonnull IVertexBuilder buffer, float x, float y,
+        @Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y,
         @Nonnull Terminal terminal, boolean greyscale,
         float topMarginSize, float bottomMarginSize, float leftMarginSize, float rightMarginSize
     )
@@ -221,7 +202,7 @@ public final class FixedWidthFontRenderer
     }
 
     public static void drawCursor(
-        @Nonnull Matrix4f transform, @Nonnull IVertexBuilder buffer, float x, float y,
+        @Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y,
         @Nonnull Terminal terminal, boolean greyscale
     )
     {
@@ -251,7 +232,7 @@ public final class FixedWidthFontRenderer
     }
 
     public static void drawTerminal(
-        @Nonnull Matrix4f transform, @Nonnull IVertexBuilder buffer, float x, float y,
+        @Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y,
         @Nonnull Terminal terminal, boolean greyscale,
         float topMarginSize, float bottomMarginSize, float leftMarginSize, float rightMarginSize
     )
@@ -265,85 +246,28 @@ public final class FixedWidthFontRenderer
         float topMarginSize, float bottomMarginSize, float leftMarginSize, float rightMarginSize
     )
     {
-        bindFont();
-
-        IRenderTypeBuffer.Impl renderer = Minecraft.getInstance().renderBuffers().bufferSource();
-        IVertexBuilder buffer = renderer.getBuffer( TYPE );
+        MultiBufferSource.BufferSource renderer = Minecraft.getInstance().renderBuffers().bufferSource();
+        VertexConsumer buffer = renderer.getBuffer( RenderTypes.BASIC_TERM );
         drawTerminal( transform, buffer, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize );
-        renderer.endBatch( TYPE );
+        renderer.endBatch( RenderTypes.BASIC_TERM );
     }
 
-    public static void drawTerminal(
-        float x, float y, @Nonnull Terminal terminal, boolean greyscale,
-        float topMarginSize, float bottomMarginSize, float leftMarginSize, float rightMarginSize
-    )
-    {
-        drawTerminal( IDENTITY, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize );
-    }
-
-    public static void drawEmptyTerminal( @Nonnull Matrix4f transform, @Nonnull IRenderTypeBuffer renderer, float x, float y, float width, float height )
+    public static void drawEmptyTerminal( @Nonnull Matrix4f transform, @Nonnull MultiBufferSource renderer, float x, float y, float width, float height )
     {
         Colour colour = Colour.BLACK;
-        drawQuad( transform, renderer.getBuffer( TYPE ), x, y, width, height, colour.getR(), colour.getG(), colour.getB() );
+        drawQuad( transform, renderer.getBuffer( RenderTypes.BASIC_TERM ), x, y, width, height, colour.getR(), colour.getG(), colour.getB() );
     }
 
     public static void drawEmptyTerminal( @Nonnull Matrix4f transform, float x, float y, float width, float height )
     {
-        bindFont();
-
-        IRenderTypeBuffer.Impl renderer = Minecraft.getInstance().renderBuffers().bufferSource();
+        MultiBufferSource.BufferSource renderer = Minecraft.getInstance().renderBuffers().bufferSource();
         drawEmptyTerminal( transform, renderer, x, y, width, height );
         renderer.endBatch();
     }
 
-    public static void drawEmptyTerminal( float x, float y, float width, float height )
-    {
-        drawEmptyTerminal( IDENTITY, x, y, width, height );
-    }
-
-    public static void drawBlocker( @Nonnull Matrix4f transform, @Nonnull IRenderTypeBuffer renderer, float x, float y, float width, float height )
+    public static void drawBlocker( @Nonnull Matrix4f transform, @Nonnull MultiBufferSource renderer, float x, float y, float width, float height )
     {
         Colour colour = Colour.BLACK;
-        drawQuad( transform, renderer.getBuffer( Type.BLOCKER ), x, y, width, height, colour.getR(), colour.getG(), colour.getB() );
-    }
-
-    private static void bindFont()
-    {
-        Minecraft.getInstance().getTextureManager().bind( FONT );
-        RenderSystem.texParameter( GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_CLAMP );
-    }
-
-    private static final class Type extends RenderState
-    {
-        private static final int GL_MODE = GL11.GL_TRIANGLES;
-
-        private static final VertexFormat FORMAT = DefaultVertexFormats.POSITION_COLOR_TEX;
-
-        static final RenderType MAIN = RenderType.create(
-            "terminal_font", FORMAT, GL_MODE, 1024,
-            false, false, // useDelegate, needsSorting
-            RenderType.State.builder()
-                .setTextureState( new RenderState.TextureState( FONT, false, false ) ) // blur, minimap
-                .setAlphaState( DEFAULT_ALPHA )
-                .setLightmapState( NO_LIGHTMAP )
-                .setWriteMaskState( COLOR_WRITE )
-                .createCompositeState( false )
-        );
-
-        static final RenderType BLOCKER = RenderType.create(
-            "terminal_blocker", FORMAT, GL_MODE, 256,
-            false, false, // useDelegate, needsSorting
-            RenderType.State.builder()
-                .setTextureState( new RenderState.TextureState( FONT, false, false ) ) // blur, minimap
-                .setAlphaState( DEFAULT_ALPHA )
-                .setWriteMaskState( DEPTH_WRITE )
-                .setLightmapState( NO_LIGHTMAP )
-                .createCompositeState( false )
-        );
-
-        private Type( String name, Runnable setup, Runnable destroy )
-        {
-            super( name, setup, destroy );
-        }
+        drawQuad( transform, renderer.getBuffer( RenderTypes.MONITOR_BLOCKER ), x, y, width, height, colour.getR(), colour.getG(), colour.getB() );
     }
 }

src/main/java/dan200/computercraft/client/gui/GuiComputer.java

@@ -5,8 +5,8 @@
  */
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
@@ -15,8 +15,8 @@ import dan200.computercraft.shared.computer.inventory.ContainerComputer;
 import dan200.computercraft.shared.computer.inventory.ContainerComputerBase;
 import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
 import dan200.computercraft.shared.pocket.inventory.ContainerPocketComputer;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.util.text.ITextComponent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.player.Inventory;
 
 import javax.annotation.Nonnull;
 
@@ -28,7 +28,7 @@ public final class GuiComputer<T extends ContainerComputerBase> extends Computer
     private final int termHeight;
 
     private GuiComputer(
-        T container, PlayerInventory player, ITextComponent title, int termWidth, int termHeight
+        T container, Inventory player, Component title, int termWidth, int termHeight
     )
     {
         super( container, player, title, BORDER );
@@ -39,7 +39,8 @@ public final class GuiComputer<T extends ContainerComputerBase> extends Computer
         imageHeight = WidgetTerminal.getHeight( termHeight ) + BORDER * 2;
     }
 
-    public static GuiComputer<ContainerComputer> create( ContainerComputer container, PlayerInventory inventory, ITextComponent component )
+    @Nonnull
+    public static GuiComputer<ContainerComputer> create( ContainerComputer container, Inventory inventory, Component component )
     {
         return new GuiComputer<>(
             container, inventory, component,
@@ -47,7 +48,8 @@ public final class GuiComputer<T extends ContainerComputerBase> extends Computer
         );
     }
 
-    public static GuiComputer<ContainerPocketComputer> createPocket( ContainerPocketComputer container, PlayerInventory inventory, ITextComponent component )
+    @Nonnull
+    public static GuiComputer<ContainerPocketComputer> createPocket( ContainerPocketComputer container, Inventory inventory, Component component )
     {
         return new GuiComputer<>(
             container, inventory, component,
@@ -55,7 +57,8 @@ public final class GuiComputer<T extends ContainerComputerBase> extends Computer
         );
     }
 
-    public static GuiComputer<ContainerViewComputer> createView( ContainerViewComputer container, PlayerInventory inventory, ITextComponent component )
+    @Nonnull
+    public static GuiComputer<ContainerViewComputer> createView( ContainerViewComputer container, Inventory inventory, Component component )
     {
         return new GuiComputer<>(
             container, inventory, component,
@@ -72,11 +75,11 @@ public final class GuiComputer<T extends ContainerComputerBase> extends Computer
     }
 
     @Override
-    public void renderBg( @Nonnull MatrixStack stack, float partialTicks, int mouseX, int mouseY )
+    public void renderBg( @Nonnull PoseStack stack, float partialTicks, int mouseX, int mouseY )
     {
         // Draw a border around the terminal
-        RenderSystem.color4f( 1, 1, 1, 1 );
-        minecraft.getTextureManager().bind( ComputerBorderRenderer.getTexture( family ) );
+        RenderSystem.setShaderColor( 1, 1, 1, 1 );
+        RenderSystem.setShaderTexture( 0, ComputerBorderRenderer.getTexture( family ) );
         ComputerBorderRenderer.render( terminal.x, terminal.y, getBlitOffset(), terminal.getWidth(), terminal.getHeight() );
         ComputerSidebar.renderBackground( stack, leftPos, topPos + sidebarYOffset );
     }

src/main/java/dan200/computercraft/client/gui/GuiDiskDrive.java

@@ -5,35 +5,35 @@
  */
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.shared.peripheral.diskdrive.ContainerDiskDrive;
-import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.ITextComponent;
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.player.Inventory;
 
 import javax.annotation.Nonnull;
 
-public class GuiDiskDrive extends ContainerScreen<ContainerDiskDrive>
+public class GuiDiskDrive extends AbstractContainerScreen<ContainerDiskDrive>
 {
     private static final ResourceLocation BACKGROUND = new ResourceLocation( "computercraft", "textures/gui/disk_drive.png" );
 
-    public GuiDiskDrive( ContainerDiskDrive container, PlayerInventory player, ITextComponent title )
+    public GuiDiskDrive( ContainerDiskDrive container, Inventory player, Component title )
     {
         super( container, player, title );
     }
 
     @Override
-    protected void renderBg( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
+    protected void renderBg( @Nonnull PoseStack transform, float partialTicks, int mouseX, int mouseY )
     {
-        RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
-        minecraft.getTextureManager().bind( BACKGROUND );
+        RenderSystem.setShaderColor( 1.0F, 1.0F, 1.0F, 1.0F );
+        RenderSystem.setShaderTexture( 0, BACKGROUND );
         blit( transform, leftPos, topPos, 0, 0, imageWidth, imageHeight );
     }
 
     @Override
-    public void render( @Nonnull MatrixStack transform, int mouseX, int mouseY, float partialTicks )
+    public void render( @Nonnull PoseStack transform, int mouseX, int mouseY, float partialTicks )
     {
         renderBackground( transform );
         super.render( transform, mouseX, mouseY, partialTicks );

src/main/java/dan200/computercraft/client/gui/GuiPrinter.java

@@ -5,37 +5,37 @@
  */
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.shared.peripheral.printer.ContainerPrinter;
-import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.ITextComponent;
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.player.Inventory;
 
 import javax.annotation.Nonnull;
 
-public class GuiPrinter extends ContainerScreen<ContainerPrinter>
+public class GuiPrinter extends AbstractContainerScreen<ContainerPrinter>
 {
     private static final ResourceLocation BACKGROUND = new ResourceLocation( "computercraft", "textures/gui/printer.png" );
 
-    public GuiPrinter( ContainerPrinter container, PlayerInventory player, ITextComponent title )
+    public GuiPrinter( ContainerPrinter container, Inventory player, Component title )
     {
         super( container, player, title );
     }
 
     @Override
-    protected void renderBg( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
+    protected void renderBg( @Nonnull PoseStack transform, float partialTicks, int mouseX, int mouseY )
     {
-        RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
-        minecraft.getTextureManager().bind( BACKGROUND );
+        RenderSystem.setShaderColor( 1.0F, 1.0F, 1.0F, 1.0F );
+        RenderSystem.setShaderTexture( 0, BACKGROUND );
         blit( transform, leftPos, topPos, 0, 0, imageWidth, imageHeight );
 
         if( getMenu().isPrinting() ) blit( transform, leftPos + 34, topPos + 21, 176, 0, 25, 45 );
     }
 
     @Override
-    public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
+    public void render( @Nonnull PoseStack stack, int mouseX, int mouseY, float partialTicks )
     {
         renderBackground( stack );
         super.render( stack, mouseX, mouseY, partialTicks );

src/main/java/dan200/computercraft/client/gui/GuiPrintout.java

@@ -5,24 +5,24 @@
  */
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Matrix4f;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.common.ContainerHeldItem;
 import dan200.computercraft.shared.media.items.ItemPrintout;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.client.renderer.IRenderTypeBuffer;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.util.math.vector.Matrix4f;
-import net.minecraft.util.text.ITextComponent;
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.player.Inventory;
 import org.lwjgl.glfw.GLFW;
 
 import javax.annotation.Nonnull;
 
 import static dan200.computercraft.client.render.PrintoutRenderer.*;
 
-public class GuiPrintout extends ContainerScreen<ContainerHeldItem>
+public class GuiPrintout extends AbstractContainerScreen<ContainerHeldItem>
 {
     private final boolean book;
     private final int pages;
@@ -30,7 +30,7 @@ public class GuiPrintout extends ContainerScreen<ContainerHeldItem>
     private final TextBuffer[] colours;
     private int page;
 
-    public GuiPrintout( ContainerHeldItem container, PlayerInventory player, ITextComponent title )
+    public GuiPrintout( ContainerHeldItem container, Inventory player, Component title )
     {
         super( container, player, title );
 
@@ -91,13 +91,13 @@ public class GuiPrintout extends ContainerScreen<ContainerHeldItem>
     }
 
     @Override
-    protected void renderBg( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
+    protected void renderBg( @Nonnull PoseStack transform, float partialTicks, int mouseX, int mouseY )
     {
         // Draw the printout
-        RenderSystem.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
+        RenderSystem.setShaderColor( 1.0f, 1.0f, 1.0f, 1.0f );
         RenderSystem.enableDepthTest();
 
-        IRenderTypeBuffer.Impl renderer = Minecraft.getInstance().renderBuffers().bufferSource();
+        MultiBufferSource.BufferSource renderer = Minecraft.getInstance().renderBuffers().bufferSource();
         Matrix4f matrix = transform.last().pose();
         drawBorder( matrix, renderer, leftPos, topPos, getBlitOffset(), page, pages, book );
         drawText( matrix, renderer, leftPos + X_TEXT_MARGIN, topPos + Y_TEXT_MARGIN, ItemPrintout.LINES_PER_PAGE * page, text, colours );
@@ -105,7 +105,7 @@ public class GuiPrintout extends ContainerScreen<ContainerHeldItem>
     }
 
     @Override
-    public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
+    public void render( @Nonnull PoseStack stack, int mouseX, int mouseY, float partialTicks )
     {
         // We must take the background further back in order to not overlap with our printed pages.
         setBlitOffset( getBlitOffset() - 1 );
@@ -116,7 +116,7 @@ public class GuiPrintout extends ContainerScreen<ContainerHeldItem>
     }
 
     @Override
-    protected void renderLabels( @Nonnull MatrixStack transform, int mouseX, int mouseY )
+    protected void renderLabels( @Nonnull PoseStack transform, int mouseX, int mouseY )
     {
         // Skip rendering labels.
     }

src/main/java/dan200/computercraft/client/gui/GuiTurtle.java

@@ -5,17 +5,17 @@
  */
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
 import dan200.computercraft.client.render.ComputerBorderRenderer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.turtle.inventory.ContainerTurtle;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.ITextComponent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.player.Inventory;
 
 import javax.annotation.Nonnull;
 
@@ -31,7 +31,7 @@ public class GuiTurtle extends ComputerScreenBase<ContainerTurtle>
 
     private final ComputerFamily family;
 
-    public GuiTurtle( ContainerTurtle container, PlayerInventory player, ITextComponent title )
+    public GuiTurtle( ContainerTurtle container, Inventory player, Component title )
     {
         super( container, player, title, BORDER );
         family = container.getFamily();
@@ -50,16 +50,16 @@ public class GuiTurtle extends ComputerScreenBase<ContainerTurtle>
     }
 
     @Override
-    protected void renderBg( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
+    protected void renderBg( @Nonnull PoseStack transform, float partialTicks, int mouseX, int mouseY )
     {
         boolean advanced = family == ComputerFamily.ADVANCED;
-        minecraft.getTextureManager().bind( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
+        RenderSystem.setShaderTexture( 0, advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
         blit( transform, leftPos + ComputerSidebar.WIDTH, topPos, 0, 0, TEX_WIDTH, TEX_HEIGHT );
 
         int slot = getMenu().getSelectedSlot();
         if( slot >= 0 )
         {
-            RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
+            RenderSystem.setShaderColor( 1.0F, 1.0F, 1.0F, 1.0F );
             int slotX = slot % 4;
             int slotY = slot / 4;
             blit( transform,
@@ -68,7 +68,7 @@ public class GuiTurtle extends ComputerScreenBase<ContainerTurtle>
             );
         }
 
-        minecraft.getTextureManager().bind( advanced ? ComputerBorderRenderer.BACKGROUND_ADVANCED : ComputerBorderRenderer.BACKGROUND_NORMAL );
+        RenderSystem.setShaderTexture( 0, advanced ? ComputerBorderRenderer.BACKGROUND_ADVANCED : ComputerBorderRenderer.BACKGROUND_NORMAL );
         ComputerSidebar.renderBackground( transform, leftPos, topPos + sidebarYOffset );
     }
 }

src/main/java/dan200/computercraft/client/gui/OptionScreen.java

@@ -5,14 +5,15 @@
  */
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.IBidiRenderer;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.Widget;
-import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.ITextComponent;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.MultiLineLabel;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 
 import javax.annotation.Nonnull;
 import java.util.List;
@@ -32,14 +33,14 @@ public final class OptionScreen extends Screen
     private int innerWidth;
     private int innerHeight;
 
-    private IBidiRenderer messageRenderer;
-    private final ITextComponent message;
-    private final List<Widget> buttons;
+    private MultiLineLabel messageRenderer;
+    private final Component message;
+    private final List<AbstractWidget> buttons;
     private final Runnable exit;
 
     private final Screen originalScreen;
 
-    private OptionScreen( ITextComponent title, ITextComponent message, List<Widget> buttons, Runnable exit, Screen originalScreen )
+    private OptionScreen( Component title, Component message, List<AbstractWidget> buttons, Runnable exit, Screen originalScreen )
     {
         super( title );
         this.message = message;
@@ -48,7 +49,7 @@ public final class OptionScreen extends Screen
         this.originalScreen = originalScreen;
     }
 
-    public static void show( Minecraft minecraft, ITextComponent title, ITextComponent message, List<Widget> buttons, Runnable exit )
+    public static void show( Minecraft minecraft, Component title, Component message, List<AbstractWidget> buttons, Runnable exit )
     {
         minecraft.setScreen( new OptionScreen( title, message, buttons, exit, unwrap( minecraft.screen ) ) );
     }
@@ -66,7 +67,7 @@ public final class OptionScreen extends Screen
         int buttonWidth = BUTTON_WIDTH * buttons.size() + PADDING * (buttons.size() - 1);
         int innerWidth = this.innerWidth = Math.max( 256, buttonWidth + PADDING * 2 );
 
-        messageRenderer = IBidiRenderer.create( font, message, innerWidth - PADDING * 2 );
+        messageRenderer = MultiLineLabel.create( font, message, innerWidth - PADDING * 2 );
 
         int textHeight = messageRenderer.getLineCount() * FONT_HEIGHT + PADDING * 2;
         innerHeight = textHeight + (buttons.isEmpty() ? 0 : buttons.get( 0 ).getHeight()) + PADDING;
@@ -75,23 +76,23 @@ public final class OptionScreen extends Screen
         y = (height - innerHeight) / 2;
 
         int x = (width - buttonWidth) / 2;
-        for( Widget button : buttons )
+        for( AbstractWidget button : buttons )
         {
             button.x = x;
             button.y = y + textHeight;
-            addButton( button );
+            addRenderableWidget( button );
 
             x += BUTTON_WIDTH + PADDING;
         }
     }
 
     @Override
-    public void render( @Nonnull MatrixStack transform, int mouseX, int mouseY, float partialTicks )
+    public void render( @Nonnull PoseStack transform, int mouseX, int mouseY, float partialTicks )
     {
         renderBackground( transform );
 
         // Render the actual texture.
-        minecraft.textureManager.bind( BACKGROUND );
+        RenderSystem.setShaderTexture( 0, BACKGROUND );
         blit( transform, x, y, 0, 0, innerWidth, PADDING );
         blit( transform,
             x, y + PADDING, 0, PADDING, innerWidth, innerHeight - PADDING * 2,
@@ -109,14 +110,14 @@ public final class OptionScreen extends Screen
         exit.run();
     }
 
-    public static Widget newButton( ITextComponent component, Button.IPressable clicked )
+    public static AbstractWidget newButton( Component component, Button.OnPress clicked )
     {
         return new Button( 0, 0, BUTTON_WIDTH, BUTTON_HEIGHT, component, clicked );
     }
 
     public void disable()
     {
-        for( Widget widget : buttons ) widget.active = false;
+        for( AbstractWidget widget : buttons ) widget.active = false;
     }
 
     @Nonnull

src/main/java/dan200/computercraft/client/gui/widgets/ComputerSidebar.java

@@ -5,15 +5,15 @@
  */
 package dan200.computercraft.client.gui.widgets;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
+import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.render.ComputerBorderRenderer;
 import dan200.computercraft.shared.computer.core.ClientComputer;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.Widget;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.TranslationTextComponent;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.resources.ResourceLocation;
 
 import java.util.Arrays;
 import java.util.function.Consumer;
@@ -44,7 +44,7 @@ public final class ComputerSidebar
     {
     }
 
-    public static void addButtons( Screen screen, ClientComputer computer, Consumer<Widget> add, int x, int y )
+    public static void addButtons( Screen screen, ClientComputer computer, Consumer<AbstractWidget> add, int x, int y )
     {
         x += CORNERS_BORDER + 1;
         y += CORNERS_BORDER + ICON_MARGIN;
@@ -53,11 +53,11 @@ public final class ComputerSidebar
             screen, x, y, ICON_WIDTH, ICON_HEIGHT, () -> computer.isOn() ? 15 : 1, 1, ICON_TEX_Y_DIFF,
             TEXTURE, TEX_SIZE, TEX_SIZE, b -> toggleComputer( computer ),
             () -> computer.isOn() ? Arrays.asList(
-                new TranslationTextComponent( "gui.computercraft.tooltip.turn_off" ),
-                new TranslationTextComponent( "gui.computercraft.tooltip.turn_off.key" ).withStyle( TextFormatting.GRAY )
+                new TranslatableComponent( "gui.computercraft.tooltip.turn_off" ),
+                new TranslatableComponent( "gui.computercraft.tooltip.turn_off.key" ).withStyle( ChatFormatting.GRAY )
             ) : Arrays.asList(
-                new TranslationTextComponent( "gui.computercraft.tooltip.turn_on" ),
-                new TranslationTextComponent( "gui.computercraft.tooltip.turn_off.key" ).withStyle( TextFormatting.GRAY )
+                new TranslatableComponent( "gui.computercraft.tooltip.turn_on" ),
+                new TranslatableComponent( "gui.computercraft.tooltip.turn_off.key" ).withStyle( ChatFormatting.GRAY )
             )
         ) );
 
@@ -67,13 +67,13 @@ public final class ComputerSidebar
             screen, x, y, ICON_WIDTH, ICON_HEIGHT, 29, 1, ICON_TEX_Y_DIFF,
             TEXTURE, TEX_SIZE, TEX_SIZE, b -> computer.queueEvent( "terminate" ),
             Arrays.asList(
-                new TranslationTextComponent( "gui.computercraft.tooltip.terminate" ),
-                new TranslationTextComponent( "gui.computercraft.tooltip.terminate.key" ).withStyle( TextFormatting.GRAY )
+                new TranslatableComponent( "gui.computercraft.tooltip.terminate" ),
+                new TranslatableComponent( "gui.computercraft.tooltip.terminate.key" ).withStyle( ChatFormatting.GRAY )
             )
         ) );
     }
 
-    public static void renderBackground( MatrixStack transform, int x, int y )
+    public static void renderBackground( PoseStack transform, int x, int y )
     {
         Screen.blit( transform,
             x, y, 0, 102, WIDTH, FULL_BORDER,

src/main/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java

@@ -5,14 +5,13 @@
  */
 package dan200.computercraft.client.gui.widgets;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.StringTextComponent;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.common.util.NonNullSupplier;
 
 import javax.annotation.Nonnull;
@@ -20,7 +19,7 @@ import java.util.List;
 import java.util.function.IntSupplier;
 
 /**
- * Version of {@link net.minecraft.client.gui.widget.button.ImageButton} which allows changing some properties
+ * Version of {@link net.minecraft.client.gui.components.ImageButton} which allows changing some properties
  * dynamically.
  */
 public class DynamicImageButton extends Button
@@ -32,12 +31,12 @@ public class DynamicImageButton extends Button
     private final int yDiffTex;
     private final int textureWidth;
     private final int textureHeight;
-    private final NonNullSupplier<List<ITextComponent>> tooltip;
+    private final NonNullSupplier<List<Component>> tooltip;
 
     public DynamicImageButton(
         Screen screen, int x, int y, int width, int height, int xTexStart, int yTexStart, int yDiffTex,
         ResourceLocation texture, int textureWidth, int textureHeight,
-        IPressable onPress, List<ITextComponent> tooltip
+        OnPress onPress, List<Component> tooltip
     )
     {
         this(
@@ -51,10 +50,10 @@ public class DynamicImageButton extends Button
     public DynamicImageButton(
         Screen screen, int x, int y, int width, int height, IntSupplier xTexStart, int yTexStart, int yDiffTex,
         ResourceLocation texture, int textureWidth, int textureHeight,
-        IPressable onPress, NonNullSupplier<List<ITextComponent>> tooltip
+        OnPress onPress, NonNullSupplier<List<Component>> tooltip
     )
     {
-        super( x, y, width, height, StringTextComponent.EMPTY, onPress );
+        super( x, y, width, height, TextComponent.EMPTY, onPress );
         this.screen = screen;
         this.textureWidth = textureWidth;
         this.textureHeight = textureHeight;
@@ -66,10 +65,9 @@ public class DynamicImageButton extends Button
     }
 
     @Override
-    public void renderButton( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
+    public void renderButton( @Nonnull PoseStack stack, int mouseX, int mouseY, float partialTicks )
     {
-        Minecraft minecraft = Minecraft.getInstance();
-        minecraft.getTextureManager().bind( texture );
+        RenderSystem.setShaderTexture( 0, texture );
         RenderSystem.disableDepthTest();
 
         int yTex = yTexStart;
@@ -83,19 +81,19 @@ public class DynamicImageButton extends Button
 
     @Nonnull
     @Override
-    public ITextComponent getMessage()
+    public Component getMessage()
     {
-        List<ITextComponent> tooltip = this.tooltip.get();
-        return tooltip.isEmpty() ? StringTextComponent.EMPTY : tooltip.get( 0 );
+        List<Component> tooltip = this.tooltip.get();
+        return tooltip.isEmpty() ? TextComponent.EMPTY : tooltip.get( 0 );
     }
 
     @Override
-    public void renderToolTip( @Nonnull MatrixStack stack, int mouseX, int mouseY )
+    public void renderToolTip( @Nonnull PoseStack stack, int mouseX, int mouseY )
     {
-        List<ITextComponent> tooltip = this.tooltip.get();
+        List<Component> tooltip = this.tooltip.get();
         if( !tooltip.isEmpty() )
         {
-            screen.renderWrappedToolTip( stack, tooltip, mouseX, mouseY, screen.getMinecraft().font );
+            screen.renderComponentToolTip( stack, tooltip, mouseX, mouseY, screen.getMinecraft().font );
         }
     }
 }

src/main/java/dan200/computercraft/client/gui/widgets/WidgetTerminal.java

@@ -5,15 +5,16 @@
  */
 package dan200.computercraft.client.gui.widgets;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Matrix4f;
 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.shared.computer.core.ClientComputer;
+import net.minecraft.SharedConstants;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.widget.Widget;
-import net.minecraft.util.SharedConstants;
-import net.minecraft.util.math.vector.Matrix4f;
-import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.narration.NarrationElementOutput;
+import net.minecraft.network.chat.TextComponent;
 import org.lwjgl.glfw.GLFW;
 
 import javax.annotation.Nonnull;
@@ -23,7 +24,7 @@ import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT
 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
 import static dan200.computercraft.client.render.ComputerBorderRenderer.MARGIN;
 
-public class WidgetTerminal extends Widget
+public class WidgetTerminal extends AbstractWidget
 {
     private static final float TERMINATE_TIME = 0.5f;
 
@@ -47,7 +48,7 @@ public class WidgetTerminal extends Widget
 
     public WidgetTerminal( @Nonnull ClientComputer computer, int x, int y, int termWidth, int termHeight )
     {
-        super( x, y, termWidth * FONT_WIDTH + MARGIN * 2, termHeight * FONT_HEIGHT + MARGIN * 2, StringTextComponent.EMPTY );
+        super( x, y, termWidth * FONT_WIDTH + MARGIN * 2, termHeight * FONT_HEIGHT + MARGIN * 2, TextComponent.EMPTY );
 
         this.computer = computer;
 
@@ -309,7 +310,7 @@ public class WidgetTerminal extends Widget
     }
 
     @Override
-    public void render( @Nonnull MatrixStack transform, int mouseX, int mouseY, float partialTicks )
+    public void render( @Nonnull PoseStack transform, int mouseX, int mouseY, float partialTicks )
     {
         Matrix4f matrix = transform.last().pose();
         Terminal terminal = computer.getTerminal();
@@ -323,6 +324,12 @@ public class WidgetTerminal extends Widget
         }
     }
 
+    @Override
+    public void updateNarration( @Nonnull NarrationElementOutput output )
+    {
+        // I'm not sure what the right option is here.
+    }
+
     public static int getWidth( int termWidth )
     {
         return termWidth * FONT_WIDTH + MARGIN * 2;

src/main/java/dan200/computercraft/client/render/CableHighlightRenderer.java

@@ -5,26 +5,25 @@
  */
 package dan200.computercraft.client.render;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
-import com.mojang.blaze3d.vertex.IVertexBuilder;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.mojang.math.Matrix3f;
+import com.mojang.math.Matrix4f;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.Registry;
 import dan200.computercraft.shared.peripheral.modem.wired.BlockCable;
 import dan200.computercraft.shared.peripheral.modem.wired.CableShapes;
 import dan200.computercraft.shared.util.WorldUtil;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.renderer.ActiveRenderInfo;
+import net.minecraft.client.Camera;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.WorldRenderer;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.util.math.shapes.VoxelShape;
-import net.minecraft.util.math.vector.Matrix4f;
-import net.minecraft.util.math.vector.Vector3d;
-import net.minecraft.world.World;
+import net.minecraft.core.BlockPos;
+import net.minecraft.util.Mth;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.DrawHighlightEvent;
+import net.minecraftforge.client.event.DrawSelectionEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
@@ -39,15 +38,15 @@ public final class CableHighlightRenderer
      * Draw an outline for a specific part of a cable "Multipart".
      *
      * @param event The event to observe
-     * @see WorldRenderer#drawSelectionBox(MatrixStack, IVertexBuilder, Entity, double, double, double, BlockPos, BlockState)
+     * @see net.minecraft.client.renderer.LevelRenderer#renderHitOutline
      */
     @SubscribeEvent
-    public static void drawHighlight( DrawHighlightEvent.HighlightBlock event )
+    public static void drawHighlight( DrawSelectionEvent.HighlightBlock event )
     {
-        BlockRayTraceResult hit = event.getTarget();
+        BlockHitResult hit = event.getTarget();
         BlockPos pos = hit.getBlockPos();
-        World world = event.getInfo().getEntity().getCommandSenderWorld();
-        ActiveRenderInfo info = event.getInfo();
+        Level world = event.getInfo().getEntity().getCommandSenderWorld();
+        Camera info = event.getInfo();
 
         BlockState state = world.getBlockState( pos );
 
@@ -63,18 +62,34 @@ public final class CableHighlightRenderer
             ? CableShapes.getModemShape( state )
             : CableShapes.getCableShape( state );
 
-        Vector3d cameraPos = info.getPosition();
+        Vec3 cameraPos = info.getPosition();
         double xOffset = pos.getX() - cameraPos.x();
         double yOffset = pos.getY() - cameraPos.y();
         double zOffset = pos.getZ() - cameraPos.z();
 
-        IVertexBuilder buffer = event.getBuffers().getBuffer( RenderType.lines() );
+        VertexConsumer buffer = event.getBuffers().getBuffer( RenderType.lines() );
         Matrix4f matrix4f = event.getMatrix().last().pose();
+        Matrix3f normal = event.getMatrix().last().normal();
+        // TODO: Can we just accesstransformer out LevelRenderer.renderShape?
         shape.forAllEdges( ( x1, y1, z1, x2, y2, z2 ) -> {
-            buffer.vertex( matrix4f, (float) (x1 + xOffset), (float) (y1 + yOffset), (float) (z1 + zOffset) )
-                .color( 0, 0, 0, 0.4f ).endVertex();
-            buffer.vertex( matrix4f, (float) (x2 + xOffset), (float) (y2 + yOffset), (float) (z2 + zOffset) )
-                .color( 0, 0, 0, 0.4f ).endVertex();
+            float xDelta = (float) (x2 - x1);
+            float yDelta = (float) (y2 - y1);
+            float zDelta = (float) (z2 - z1);
+            float len = Mth.sqrt( xDelta * xDelta + yDelta * yDelta + zDelta * zDelta );
+            xDelta = xDelta / len;
+            yDelta = yDelta / len;
+            zDelta = zDelta / len;
+
+            buffer
+                .vertex( matrix4f, (float) (x1 + xOffset), (float) (y1 + yOffset), (float) (z1 + zOffset) )
+                .color( 0, 0, 0, 0.4f )
+                .normal( normal, xDelta, yDelta, zDelta )
+                .endVertex();
+            buffer
+                .vertex( matrix4f, (float) (x2 + xOffset), (float) (y2 + yOffset), (float) (z2 + zOffset) )
+                .color( 0, 0, 0, 0.4f )
+                .normal( normal, xDelta, yDelta, zDelta )
+                .endVertex();
         } );
     }
 }

src/main/java/dan200/computercraft/client/render/ComputerBorderRenderer.java

@@ -6,15 +6,12 @@
 package dan200.computercraft.client.render;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.IVertexBuilder;
+import com.mojang.blaze3d.vertex.*;
+import com.mojang.math.Matrix4f;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.vector.Matrix4f;
-import org.lwjgl.opengl.GL11;
+import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.resources.ResourceLocation;
 
 import javax.annotation.Nonnull;
 
@@ -56,11 +53,11 @@ public class ComputerBorderRenderer
     private static final float TEX_SCALE = 1 / (float) TEX_SIZE;
 
     private final Matrix4f transform;
-    private final IVertexBuilder builder;
+    private final VertexConsumer builder;
     private final int z;
     private final float r, g, b;
 
-    public ComputerBorderRenderer( Matrix4f transform, IVertexBuilder builder, int z, float r, float g, float b )
+    public ComputerBorderRenderer( Matrix4f transform, VertexConsumer builder, int z, float r, float g, float b )
     {
         this.transform = transform;
         this.builder = builder;
@@ -88,27 +85,28 @@ public class ComputerBorderRenderer
 
     public static void render( int x, int y, int z, int width, int height )
     {
-        Tessellator tessellator = Tessellator.getInstance();
+        RenderSystem.setShader( GameRenderer::getPositionColorTexShader );
+        Tesselator tessellator = Tesselator.getInstance();
         BufferBuilder buffer = tessellator.getBuilder();
-        buffer.begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR_TEX );
+        buffer.begin( VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR_TEX );
 
         render( IDENTITY, buffer, x, y, z, width, height );
 
-        RenderSystem.enableAlphaTest();
+        // TODO: RenderSystem.enableAlphaTest();
         tessellator.end();
     }
 
-    public static void render( Matrix4f transform, IVertexBuilder buffer, int x, int y, int z, int width, int height )
+    public static void render( Matrix4f transform, VertexConsumer buffer, int x, int y, int z, int width, int height )
     {
         render( transform, buffer, x, y, z, width, height, 1, 1, 1 );
     }
 
-    public static void render( Matrix4f transform, IVertexBuilder buffer, int x, int y, int z, int width, int height, float r, float g, float b )
+    public static void render( Matrix4f transform, VertexConsumer buffer, int x, int y, int z, int width, int height, float r, float g, float b )
     {
         render( transform, buffer, x, y, z, width, height, false, r, g, b );
     }
 
-    public static void render( Matrix4f transform, IVertexBuilder buffer, int x, int y, int z, int width, int height, boolean withLight, float r, float g, float b )
+    public static void render( Matrix4f transform, VertexConsumer buffer, int x, int y, int z, int width, int height, boolean withLight, float r, float g, float b )
     {
         new ComputerBorderRenderer( transform, buffer, z, r, g, b ).doRender( x, y, width, height, withLight );
     }

src/main/java/dan200/computercraft/client/render/ItemMapLikeRenderer.java

@@ -5,17 +5,18 @@
  */
 package dan200.computercraft.client.render;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Vector3f;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.player.AbstractClientPlayerEntity;
-import net.minecraft.client.renderer.FirstPersonRenderer;
-import net.minecraft.client.renderer.IRenderTypeBuffer;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.Hand;
-import net.minecraft.util.HandSide;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.vector.Vector3f;
+import net.minecraft.client.renderer.ItemInHandRenderer;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.block.model.ItemTransforms;
+import net.minecraft.util.Mth;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.HumanoidArm;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
 
 public abstract class ItemMapLikeRenderer
 {
@@ -25,16 +26,16 @@ public abstract class ItemMapLikeRenderer
      * @param transform The matrix transformation stack
      * @param render    The buffer to render to
      * @param stack     The stack to render
-     * @see FirstPersonRenderer#renderItemInFirstPerson(AbstractClientPlayerEntity, float, float, Hand, float, ItemStack, float, MatrixStack, IRenderTypeBuffer, int)
+     * @see ItemInHandRenderer#renderItem(LivingEntity, ItemStack, ItemTransforms.TransformType, boolean, PoseStack, MultiBufferSource, int)
      */
-    protected abstract void renderItem( MatrixStack transform, IRenderTypeBuffer render, ItemStack stack );
+    protected abstract void renderItem( PoseStack transform, MultiBufferSource render, ItemStack stack );
 
-    protected void renderItemFirstPerson( MatrixStack transform, IRenderTypeBuffer render, int lightTexture, Hand hand, float pitch, float equipProgress, float swingProgress, ItemStack stack )
+    protected void renderItemFirstPerson( PoseStack transform, MultiBufferSource render, int lightTexture, InteractionHand hand, float pitch, float equipProgress, float swingProgress, ItemStack stack )
     {
-        PlayerEntity player = Minecraft.getInstance().player;
+        Player player = Minecraft.getInstance().player;
 
         transform.pushPose();
-        if( hand == Hand.MAIN_HAND && player.getOffhandItem().isEmpty() )
+        if( hand == InteractionHand.MAIN_HAND && player.getOffhandItem().isEmpty() )
         {
             renderItemFirstPersonCenter( transform, render, lightTexture, pitch, equipProgress, swingProgress, stack );
         }
@@ -42,7 +43,7 @@ public abstract class ItemMapLikeRenderer
         {
             renderItemFirstPersonSide(
                 transform, render, lightTexture,
-                hand == Hand.MAIN_HAND ? player.getMainArm() : player.getMainArm().getOpposite(),
+                hand == InteractionHand.MAIN_HAND ? player.getMainArm() : player.getMainArm().getOpposite(),
                 equipProgress, swingProgress, stack
             );
         }
@@ -59,12 +60,12 @@ public abstract class ItemMapLikeRenderer
      * @param equipProgress The equip progress of this item
      * @param swingProgress The swing progress of this item
      * @param stack         The stack to render
-     * @see FirstPersonRenderer#renderMapFirstPersonSide(MatrixStack, IRenderTypeBuffer, int, float, HandSide, float, ItemStack)
+     * @see ItemInHandRenderer#renderOneHandedMap(PoseStack, MultiBufferSource, int, float, HumanoidArm, float, ItemStack)
      */
-    private void renderItemFirstPersonSide( MatrixStack transform, IRenderTypeBuffer render, int combinedLight, HandSide side, float equipProgress, float swingProgress, ItemStack stack )
+    private void renderItemFirstPersonSide( PoseStack transform, MultiBufferSource render, int combinedLight, HumanoidArm side, float equipProgress, float swingProgress, ItemStack stack )
     {
         Minecraft minecraft = Minecraft.getInstance();
-        float offset = side == HandSide.RIGHT ? 1f : -1f;
+        float offset = side == HumanoidArm.RIGHT ? 1f : -1f;
         transform.translate( offset * 0.125f, -0.125f, 0f );
 
         // If the player is not invisible then render a single arm
@@ -80,11 +81,11 @@ public abstract class ItemMapLikeRenderer
         // corresponding method in ItemRenderer.
         transform.pushPose();
         transform.translate( offset * 0.51f, -0.08f + equipProgress * -1.2f, -0.75f );
-        float f1 = MathHelper.sqrt( swingProgress );
-        float f2 = MathHelper.sin( f1 * (float) Math.PI );
+        float f1 = Mth.sqrt( swingProgress );
+        float f2 = Mth.sin( f1 * (float) Math.PI );
         float f3 = -0.5f * f2;
-        float f4 = 0.4f * MathHelper.sin( f1 * ((float) Math.PI * 2f) );
-        float f5 = -0.3f * MathHelper.sin( swingProgress * (float) Math.PI );
+        float f4 = 0.4f * Mth.sin( f1 * ((float) Math.PI * 2f) );
+        float f5 = -0.3f * Mth.sin( swingProgress * (float) Math.PI );
         transform.translate( offset * f3, f4 - 0.3f * f2, f5 );
         transform.mulPose( Vector3f.XP.rotationDegrees( f2 * -45f ) );
         transform.mulPose( Vector3f.YP.rotationDegrees( offset * f2 * -30f ) );
@@ -104,18 +105,18 @@ public abstract class ItemMapLikeRenderer
      * @param equipProgress The equip progress of this item
      * @param swingProgress The swing progress of this item
      * @param stack         The stack to render
-     * @see FirstPersonRenderer#renderMapFirstPerson(MatrixStack, IRenderTypeBuffer, int, float, float, float)
+     * @see ItemInHandRenderer#renderTwoHandedMap(PoseStack, MultiBufferSource, int, float, float, float)
      */
-    private void renderItemFirstPersonCenter( MatrixStack transform, IRenderTypeBuffer render, int combinedLight, float pitch, float equipProgress, float swingProgress, ItemStack stack )
+    private void renderItemFirstPersonCenter( PoseStack transform, MultiBufferSource render, int combinedLight, float pitch, float equipProgress, float swingProgress, ItemStack stack )
     {
         Minecraft minecraft = Minecraft.getInstance();
-        FirstPersonRenderer renderer = minecraft.getItemInHandRenderer();
+        ItemInHandRenderer renderer = minecraft.getItemInHandRenderer();
 
         // Setup the appropriate transformations. This is just copied from the
         // corresponding method in ItemRenderer.
-        float swingRt = MathHelper.sqrt( swingProgress );
-        float tX = -0.2f * MathHelper.sin( swingProgress * (float) Math.PI );
-        float tZ = -0.4f * MathHelper.sin( swingRt * (float) Math.PI );
+        float swingRt = Mth.sqrt( swingProgress );
+        float tX = -0.2f * Mth.sin( swingProgress * (float) Math.PI );
+        float tZ = -0.4f * Mth.sin( swingRt * (float) Math.PI );
         transform.translate( 0, -tX / 2, tZ );
 
         float pitchAngle = renderer.calculateMapTilt( pitch );
@@ -125,12 +126,12 @@ public abstract class ItemMapLikeRenderer
         {
             transform.pushPose();
             transform.mulPose( Vector3f.YP.rotationDegrees( 90.0F ) );
-            renderer.renderMapHand( transform, render, combinedLight, HandSide.RIGHT );
-            renderer.renderMapHand( transform, render, combinedLight, HandSide.LEFT );
+            renderer.renderMapHand( transform, render, combinedLight, HumanoidArm.RIGHT );
+            renderer.renderMapHand( transform, render, combinedLight, HumanoidArm.LEFT );
             transform.popPose();
         }
 
-        float rX = MathHelper.sin( swingRt * (float) Math.PI );
+        float rX = Mth.sin( swingRt * (float) Math.PI );
         transform.mulPose( Vector3f.XP.rotationDegrees( rX * 20.0F ) );
         transform.scale( 2.0F, 2.0F, 2.0F );
 

src/main/java/dan200/computercraft/client/render/ItemPocketRenderer.java

@@ -5,8 +5,10 @@
  */
 package dan200.computercraft.client.render;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.*;
+import com.mojang.math.Matrix4f;
+import com.mojang.math.Vector3f;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.Terminal;
@@ -14,19 +16,12 @@ import dan200.computercraft.shared.computer.core.ClientComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
 import dan200.computercraft.shared.util.Colour;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.IRenderTypeBuffer;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.vector.Matrix4f;
-import net.minecraft.util.math.vector.Vector3f;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.RenderHandEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
-import org.lwjgl.opengl.GL11;
 
 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
@@ -58,7 +53,7 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
     }
 
     @Override
-    protected void renderItem( MatrixStack transform, IRenderTypeBuffer render, ItemStack stack )
+    protected void renderItem( PoseStack transform, MultiBufferSource render, ItemStack stack )
     {
         ClientComputer computer = ItemPocketComputer.createClientComputer( stack );
         Terminal terminal = computer == null ? null : computer.getTerminal();
@@ -117,16 +112,17 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
     private static void renderFrame( Matrix4f transform, ComputerFamily family, int colour, int width, int height )
     {
         RenderSystem.enableBlend();
-        Minecraft.getInstance().getTextureManager()
-            .bind( colour != -1 ? ComputerBorderRenderer.BACKGROUND_COLOUR : ComputerBorderRenderer.getTexture( family ) );
+        RenderSystem.setShaderTexture( 0,
+            colour != -1 ? ComputerBorderRenderer.BACKGROUND_COLOUR : ComputerBorderRenderer.getTexture( family )
+        );
 
         float r = ((colour >>> 16) & 0xFF) / 255.0f;
         float g = ((colour >>> 8) & 0xFF) / 255.0f;
         float b = (colour & 0xFF) / 255.0f;
 
-        Tessellator tessellator = Tessellator.getInstance();
+        Tesselator tessellator = Tesselator.getInstance();
         BufferBuilder buffer = tessellator.getBuilder();
-        buffer.begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR_TEX );
+        buffer.begin( VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR_TEX );
 
         ComputerBorderRenderer.render( transform, buffer, 0, 0, 0, width, height, true, r, g, b );
 
@@ -141,9 +137,9 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
         float g = ((colour >>> 8) & 0xFF) / 255.0f;
         float b = (colour & 0xFF) / 255.0f;
 
-        Tessellator tessellator = Tessellator.getInstance();
+        Tesselator tessellator = Tesselator.getInstance();
         BufferBuilder buffer = tessellator.getBuilder();
-        buffer.begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR );
+        buffer.begin( VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR );
         buffer.vertex( transform, width - LIGHT_HEIGHT * 2, height + LIGHT_HEIGHT + BORDER / 2.0f, 0 ).color( r, g, b, 1.0f ).endVertex();
         buffer.vertex( transform, width, height + LIGHT_HEIGHT + BORDER / 2.0f, 0 ).color( r, g, b, 1.0f ).endVertex();
         buffer.vertex( transform, width, height + BORDER / 2.0f, 0 ).color( r, g, b, 1.0f ).endVertex();

src/main/java/dan200/computercraft/client/render/ItemPrintoutRenderer.java

@@ -5,13 +5,13 @@
  */
 package dan200.computercraft.client.render;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Matrix4f;
+import com.mojang.math.Vector3f;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.media.items.ItemPrintout;
-import net.minecraft.client.renderer.IRenderTypeBuffer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.vector.Matrix4f;
-import net.minecraft.util.math.vector.Vector3f;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.RenderHandEvent;
 import net.minecraftforge.client.event.RenderItemInFrameEvent;
@@ -50,7 +50,7 @@ public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
     }
 
     @Override
-    protected void renderItem( MatrixStack transform, IRenderTypeBuffer render, ItemStack stack )
+    protected void renderItem( PoseStack transform, MultiBufferSource render, ItemStack stack )
     {
         transform.mulPose( Vector3f.XP.rotationDegrees( 180f ) );
         transform.scale( 0.42f, 0.42f, -0.42f );
@@ -66,7 +66,7 @@ public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
         if( !(stack.getItem() instanceof ItemPrintout) ) return;
         event.setCanceled( true );
 
-        MatrixStack transform = event.getMatrix();
+        PoseStack transform = event.getMatrix();
 
         // Move a little bit forward to ensure we're not clipping with the frame
         transform.translate( 0.0f, 0.0f, -0.001f );
@@ -77,7 +77,7 @@ public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
         drawPrintout( transform, event.getBuffers(), stack );
     }
 
-    private static void drawPrintout( MatrixStack transform, IRenderTypeBuffer render, ItemStack stack )
+    private static void drawPrintout( PoseStack transform, MultiBufferSource render, ItemStack stack )
     {
         int pages = ItemPrintout.getPageCount( stack );
         boolean book = ((ItemPrintout) stack.getItem()).getType() == ItemPrintout.Type.BOOK;

src/main/java/dan200/computercraft/client/render/MonitorHighlightRenderer.java

@@ -5,25 +5,26 @@
  */
 package dan200.computercraft.client.render;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
-import com.mojang.blaze3d.vertex.IVertexBuilder;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.mojang.math.Matrix3f;
+import com.mojang.math.Matrix4f;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Matrix4f;
-import net.minecraft.util.math.vector.Vector3d;
-import net.minecraft.world.World;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.DrawHighlightEvent;
+import net.minecraftforge.client.event.DrawSelectionEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
 import java.util.EnumSet;
 
-import static net.minecraft.util.Direction.*;
+import static net.minecraft.core.Direction.*;
 
 /**
  * Overrides monitor highlighting to only render the outline of the <em>whole</em> monitor, rather than the current
@@ -37,15 +38,15 @@ public final class MonitorHighlightRenderer
     }
 
     @SubscribeEvent
-    public static void drawHighlight( DrawHighlightEvent.HighlightBlock event )
+    public static void drawHighlight( DrawSelectionEvent.HighlightBlock event )
     {
         // Preserve normal behaviour when crouching.
         if( event.getInfo().getEntity().isCrouching() ) return;
 
-        World world = event.getInfo().getEntity().getCommandSenderWorld();
+        Level world = event.getInfo().getEntity().getCommandSenderWorld();
         BlockPos pos = event.getTarget().getBlockPos();
 
-        TileEntity tile = world.getBlockEntity( pos );
+        BlockEntity tile = world.getBlockEntity( pos );
         if( !(tile instanceof TileMonitor) ) return;
 
         TileMonitor monitor = (TileMonitor) tile;
@@ -60,37 +61,46 @@ public final class MonitorHighlightRenderer
         if( monitor.getYIndex() != 0 ) faces.remove( monitor.getDown().getOpposite() );
         if( monitor.getYIndex() != monitor.getHeight() - 1 ) faces.remove( monitor.getDown() );
 
-        MatrixStack transformStack = event.getMatrix();
-        Vector3d cameraPos = event.getInfo().getPosition();
+        PoseStack transformStack = event.getMatrix();
+        Vec3 cameraPos = event.getInfo().getPosition();
         transformStack.pushPose();
         transformStack.translate( pos.getX() - cameraPos.x(), pos.getY() - cameraPos.y(), pos.getZ() - cameraPos.z() );
 
         // I wish I could think of a better way to do this
-        IVertexBuilder buffer = event.getBuffers().getBuffer( RenderType.lines() );
+        VertexConsumer buffer = event.getBuffers().getBuffer( RenderType.lines() );
         Matrix4f transform = transformStack.last().pose();
-        if( faces.contains( NORTH ) || faces.contains( WEST ) ) line( buffer, transform, 0, 0, 0, UP );
-        if( faces.contains( SOUTH ) || faces.contains( WEST ) ) line( buffer, transform, 0, 0, 1, UP );
-        if( faces.contains( NORTH ) || faces.contains( EAST ) ) line( buffer, transform, 1, 0, 0, UP );
-        if( faces.contains( SOUTH ) || faces.contains( EAST ) ) line( buffer, transform, 1, 0, 1, UP );
-        if( faces.contains( NORTH ) || faces.contains( DOWN ) ) line( buffer, transform, 0, 0, 0, EAST );
-        if( faces.contains( SOUTH ) || faces.contains( DOWN ) ) line( buffer, transform, 0, 0, 1, EAST );
-        if( faces.contains( NORTH ) || faces.contains( UP ) ) line( buffer, transform, 0, 1, 0, EAST );
-        if( faces.contains( SOUTH ) || faces.contains( UP ) ) line( buffer, transform, 0, 1, 1, EAST );
-        if( faces.contains( WEST ) || faces.contains( DOWN ) ) line( buffer, transform, 0, 0, 0, SOUTH );
-        if( faces.contains( EAST ) || faces.contains( DOWN ) ) line( buffer, transform, 1, 0, 0, SOUTH );
-        if( faces.contains( WEST ) || faces.contains( UP ) ) line( buffer, transform, 0, 1, 0, SOUTH );
-        if( faces.contains( EAST ) || faces.contains( UP ) ) line( buffer, transform, 1, 1, 0, SOUTH );
+        Matrix3f normal = transformStack.last().normal();
+        if( faces.contains( NORTH ) || faces.contains( WEST ) ) line( buffer, transform, normal, 0, 0, 0, UP );
+        if( faces.contains( SOUTH ) || faces.contains( WEST ) ) line( buffer, transform, normal, 0, 0, 1, UP );
+        if( faces.contains( NORTH ) || faces.contains( EAST ) ) line( buffer, transform, normal, 1, 0, 0, UP );
+        if( faces.contains( SOUTH ) || faces.contains( EAST ) ) line( buffer, transform, normal, 1, 0, 1, UP );
+        if( faces.contains( NORTH ) || faces.contains( DOWN ) ) line( buffer, transform, normal, 0, 0, 0, EAST );
+        if( faces.contains( SOUTH ) || faces.contains( DOWN ) ) line( buffer, transform, normal, 0, 0, 1, EAST );
+        if( faces.contains( NORTH ) || faces.contains( UP ) ) line( buffer, transform, normal, 0, 1, 0, EAST );
+        if( faces.contains( SOUTH ) || faces.contains( UP ) ) line( buffer, transform, normal, 0, 1, 1, EAST );
+        if( faces.contains( WEST ) || faces.contains( DOWN ) ) line( buffer, transform, normal, 0, 0, 0, SOUTH );
+        if( faces.contains( EAST ) || faces.contains( DOWN ) ) line( buffer, transform, normal, 1, 0, 0, SOUTH );
+        if( faces.contains( WEST ) || faces.contains( UP ) ) line( buffer, transform, normal, 0, 1, 0, SOUTH );
+        if( faces.contains( EAST ) || faces.contains( UP ) ) line( buffer, transform, normal, 1, 1, 0, SOUTH );
 
         transformStack.popPose();
     }
 
-    private static void line( IVertexBuilder buffer, Matrix4f transform, float x, float y, float z, Direction direction )
+    private static void line( VertexConsumer buffer, Matrix4f transform, Matrix3f normal, float x, float y, float z, Direction direction )
     {
-        buffer.vertex( transform, x, y, z ).color( 0, 0, 0, 0.4f ).endVertex();
-        buffer.vertex( transform,
-            x + direction.getStepX(),
-            y + direction.getStepY(),
-            z + direction.getStepZ()
-        ).color( 0, 0, 0, 0.4f ).endVertex();
+        buffer
+            .vertex( transform, x, y, z )
+            .color( 0, 0, 0, 0.4f )
+            .normal( normal, direction.getStepX(), direction.getStepY(), direction.getStepZ() )
+            .endVertex();
+        buffer
+            .vertex( transform,
+                x + direction.getStepX(),
+                y + direction.getStepY(),
+                z + direction.getStepZ()
+            )
+            .color( 0, 0, 0, 0.4f )
+            .normal( normal, direction.getStepX(), direction.getStepY(), direction.getStepZ() )
+            .endVertex();
     }
 }

src/main/java/dan200/computercraft/client/render/MonitorTextureBufferShader.java

@@ -5,158 +5,108 @@
  */
 package dan200.computercraft.client.render;
 
-import com.google.common.base.Strings;
-import com.mojang.blaze3d.platform.GlStateManager;
-import com.mojang.blaze3d.systems.RenderSystem;
-import dan200.computercraft.ComputerCraft;
+import com.mojang.blaze3d.shaders.Uniform;
+import com.mojang.blaze3d.vertex.VertexFormat;
 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.shared.util.Palette;
-import net.minecraft.client.renderer.texture.TextureUtil;
-import net.minecraft.util.math.vector.Matrix4f;
-import org.lwjgl.BufferUtils;
+import net.minecraft.client.renderer.ShaderInstance;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.packs.resources.ResourceProvider;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.lwjgl.opengl.GL13;
-import org.lwjgl.opengl.GL20;
 
-import java.io.InputStream;
+import javax.annotation.Nullable;
+import java.io.IOException;
 import java.nio.FloatBuffer;
 
-class MonitorTextureBufferShader
+public class MonitorTextureBufferShader extends ShaderInstance
 {
     static final int TEXTURE_INDEX = GL13.GL_TEXTURE3;
 
-    private static final FloatBuffer MATRIX_BUFFER = BufferUtils.createFloatBuffer( 16 );
-    private static final FloatBuffer PALETTE_BUFFER = BufferUtils.createFloatBuffer( 16 * 3 );
+    private static final Logger LOGGER = LogManager.getLogger();
 
-    private static int uniformMv;
+    private final Uniform palette;
+    private final Uniform width;
+    private final Uniform height;
 
-    private static int uniformFont;
-    private static int uniformWidth;
-    private static int uniformHeight;
-    private static int uniformTbo;
-    private static int uniformPalette;
-
-    private static boolean initialised;
-    private static boolean ok;
-    private static int program;
-
-    static void setupUniform( Matrix4f transform, int width, int height, Palette palette, boolean greyscale )
+    public MonitorTextureBufferShader( ResourceProvider provider, ResourceLocation location, VertexFormat format ) throws IOException
     {
-        MATRIX_BUFFER.rewind();
-        transform.store( MATRIX_BUFFER );
-        MATRIX_BUFFER.rewind();
-        RenderSystem.glUniformMatrix4( uniformMv, false, MATRIX_BUFFER );
+        super( provider, location, format );
 
-        RenderSystem.glUniform1i( uniformWidth, width );
-        RenderSystem.glUniform1i( uniformHeight, height );
+        width = getUniformChecked( "Width" );
+        height = getUniformChecked( "Height" );
+        palette = new Uniform( "Palette", Uniform.UT_FLOAT3, 16 * 3, this );
+        updateUniformLocation( palette );
 
-        PALETTE_BUFFER.rewind();
+        Uniform tbo = getUniformChecked( "Tbo" );
+        if( tbo != null ) tbo.set( TEXTURE_INDEX - GL13.GL_TEXTURE0 );
+    }
+
+    void setupUniform( int width, int height, Palette palette, boolean greyscale )
+    {
+        if( this.width != null ) this.width.set( width );
+        if( this.height != null ) this.height.set( height );
+        setupPalette( palette, greyscale );
+    }
+
+    private void setupPalette( Palette palette, boolean greyscale )
+    {
+        if( this.palette == null ) return;
+
+        FloatBuffer paletteBuffer = this.palette.getFloatBuffer();
+        paletteBuffer.rewind();
         for( int i = 0; i < 16; i++ )
         {
             double[] colour = palette.getColour( i );
             if( greyscale )
             {
                 float f = FixedWidthFontRenderer.toGreyscale( colour );
-                PALETTE_BUFFER.put( f ).put( f ).put( f );
+                paletteBuffer.put( f ).put( f ).put( f );
             }
             else
             {
-                PALETTE_BUFFER.put( (float) colour[0] ).put( (float) colour[1] ).put( (float) colour[2] );
+                paletteBuffer.put( (float) colour[0] ).put( (float) colour[1] ).put( (float) colour[2] );
             }
         }
-        PALETTE_BUFFER.flip();
-        RenderSystem.glUniform3( uniformPalette, PALETTE_BUFFER );
     }
 
-    static boolean use()
+    @Override
+    public void apply()
     {
-        if( initialised )
-        {
-            if( ok ) GlStateManager._glUseProgram( program );
-            return ok;
-        }
-
-        if( ok = load() )
-        {
-            GL20.glUseProgram( program );
-            RenderSystem.glUniform1i( uniformFont, 0 );
-            RenderSystem.glUniform1i( uniformTbo, TEXTURE_INDEX - GL13.GL_TEXTURE0 );
-        }
-
-        return ok;
+        super.apply();
+        palette.upload();
     }
 
-    private static boolean load()
+    @Override
+    public void close()
     {
-        initialised = true;
+        palette.close();
+        super.close();
+    }
 
-        try
+    private void updateUniformLocation( Uniform uniform )
+    {
+        int id = Uniform.glGetUniformLocation( getId(), uniform.getName() );
+        if( id == -1 )
         {
-            int vertexShader = loadShader( GL20.GL_VERTEX_SHADER, "assets/computercraft/shaders/monitor.vert" );
-            int fragmentShader = loadShader( GL20.GL_FRAGMENT_SHADER, "assets/computercraft/shaders/monitor.frag" );
-
-            program = GlStateManager.glCreateProgram();
-            GlStateManager.glAttachShader( program, vertexShader );
-            GlStateManager.glAttachShader( program, fragmentShader );
-            GL20.glBindAttribLocation( program, 0, "v_pos" );
-
-            GlStateManager.glLinkProgram( program );
-            boolean ok = GlStateManager.glGetProgrami( program, GL20.GL_LINK_STATUS ) != 0;
-            String log = GlStateManager.glGetProgramInfoLog( program, Short.MAX_VALUE ).trim();
-            if( !Strings.isNullOrEmpty( log ) )
-            {
-                ComputerCraft.log.warn( "Problems when linking monitor shader: {}", log );
-            }
-
-            GL20.glDetachShader( program, vertexShader );
-            GL20.glDetachShader( program, fragmentShader );
-            GlStateManager.glDeleteShader( vertexShader );
-            GlStateManager.glDeleteShader( fragmentShader );
-
-            if( !ok ) return false;
-
-            uniformMv = getUniformLocation( program, "u_mv" );
-            uniformFont = getUniformLocation( program, "u_font" );
-            uniformWidth = getUniformLocation( program, "u_width" );
-            uniformHeight = getUniformLocation( program, "u_height" );
-            uniformTbo = getUniformLocation( program, "u_tbo" );
-            uniformPalette = getUniformLocation( program, "u_palette" );
-
-            ComputerCraft.log.info( "Loaded monitor shader." );
-            return true;
+            LOGGER.warn( "Shader {} could not find uniform named {} in the specified shader program.", getName(), uniform.getName() );
         }
-        catch( Exception e )
+        else
         {
-            ComputerCraft.log.error( "Cannot load monitor shaders", e );
-            return false;
+            uniform.setLocation( id );
         }
     }
 
-    private static int loadShader( int kind, String path )
+    @Nullable
+    private Uniform getUniformChecked( String name )
     {
-        InputStream stream = TileEntityMonitorRenderer.class.getClassLoader().getResourceAsStream( path );
-        if( stream == null ) throw new IllegalArgumentException( "Cannot find " + path );
-        String contents = TextureUtil.readResourceAsString( stream );
-
-        int shader = GlStateManager.glCreateShader( kind );
-
-        GlStateManager.glShaderSource( shader, contents );
-        GlStateManager.glCompileShader( shader );
-
-        boolean ok = GlStateManager.glGetShaderi( shader, GL20.GL_COMPILE_STATUS ) != 0;
-        String log = GlStateManager.glGetShaderInfoLog( shader, Short.MAX_VALUE ).trim();
-        if( !Strings.isNullOrEmpty( log ) )
+        Uniform uniform = getUniform( name );
+        if( uniform == null )
         {
-            ComputerCraft.log.warn( "Problems when loading monitor shader {}: {}", path, log );
+            LOGGER.warn( "Monitor shader {} should have uniform {}, but it was not present.", getName(), name );
         }
 
-        if( !ok ) throw new IllegalStateException( "Cannot compile shader " + path );
-        return shader;
-    }
-
-    private static int getUniformLocation( int program, String name )
-    {
-        int uniform = GlStateManager._glGetUniformLocation( program, name );
-        if( uniform == -1 ) throw new IllegalStateException( "Cannot find uniform " + name );
         return uniform;
     }
 }

src/main/java/dan200/computercraft/client/render/PrintoutRenderer.java

@@ -5,17 +5,17 @@
  */
 package dan200.computercraft.client.render;
 
-import com.mojang.blaze3d.vertex.IVertexBuilder;
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.mojang.blaze3d.vertex.VertexFormat;
+import com.mojang.math.Matrix4f;
 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.util.Palette;
-import net.minecraft.client.renderer.IRenderTypeBuffer;
-import net.minecraft.client.renderer.RenderState;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.RenderStateShard;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.vector.Matrix4f;
-import org.lwjgl.opengl.GL11;
+import net.minecraft.resources.ResourceLocation;
 
 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
 import static dan200.computercraft.shared.media.items.ItemPrintout.LINES_PER_PAGE;
@@ -60,9 +60,9 @@ public final class PrintoutRenderer
 
     private PrintoutRenderer() {}
 
-    public static void drawText( Matrix4f transform, IRenderTypeBuffer renderer, int x, int y, int start, TextBuffer[] text, TextBuffer[] colours )
+    public static void drawText( Matrix4f transform, MultiBufferSource renderer, int x, int y, int start, TextBuffer[] text, TextBuffer[] colours )
     {
-        IVertexBuilder buffer = renderer.getBuffer( FixedWidthFontRenderer.TYPE );
+        VertexConsumer buffer = renderer.getBuffer( RenderTypes.BASIC_TERM );
         for( int line = 0; line < LINES_PER_PAGE && line < text.length; line++ )
         {
             FixedWidthFontRenderer.drawString( transform, buffer,
@@ -72,9 +72,9 @@ public final class PrintoutRenderer
         }
     }
 
-    public static void drawText( Matrix4f transform, IRenderTypeBuffer renderer, int x, int y, int start, String[] text, String[] colours )
+    public static void drawText( Matrix4f transform, MultiBufferSource renderer, int x, int y, int start, String[] text, String[] colours )
     {
-        IVertexBuilder buffer = renderer.getBuffer( FixedWidthFontRenderer.TYPE );
+        VertexConsumer buffer = renderer.getBuffer( RenderTypes.BASIC_TERM );
         for( int line = 0; line < LINES_PER_PAGE && line < text.length; line++ )
         {
             FixedWidthFontRenderer.drawString( transform, buffer,
@@ -85,12 +85,12 @@ public final class PrintoutRenderer
         }
     }
 
-    public static void drawBorder( Matrix4f transform, IRenderTypeBuffer renderer, float x, float y, float z, int page, int pages, boolean isBook )
+    public static void drawBorder( Matrix4f transform, MultiBufferSource renderer, float x, float y, float z, int page, int pages, boolean isBook )
     {
         int leftPages = page;
         int rightPages = pages - page - 1;
 
-        IVertexBuilder buffer = renderer.getBuffer( Type.TYPE );
+        VertexConsumer buffer = renderer.getBuffer( Type.TYPE );
 
         if( isBook )
         {
@@ -144,7 +144,7 @@ public final class PrintoutRenderer
         }
     }
 
-    private static void drawTexture( Matrix4f matrix, IVertexBuilder buffer, float x, float y, float z, float u, float v, float width, float height )
+    private static void drawTexture( Matrix4f matrix, VertexConsumer buffer, float x, float y, float z, float u, float v, float width, float height )
     {
         buffer.vertex( matrix, x, y + height, z ).uv( u / BG_SIZE, (v + height) / BG_SIZE ).endVertex();
         buffer.vertex( matrix, x + width, y + height, z ).uv( (u + width) / BG_SIZE, (v + height) / BG_SIZE ).endVertex();
@@ -152,7 +152,7 @@ public final class PrintoutRenderer
         buffer.vertex( matrix, x, y, z ).uv( u / BG_SIZE, v / BG_SIZE ).endVertex();
     }
 
-    private static void drawTexture( Matrix4f matrix, IVertexBuilder buffer, float x, float y, float z, float width, float height, float u, float v, float tWidth, float tHeight )
+    private static void drawTexture( Matrix4f matrix, VertexConsumer buffer, float x, float y, float z, float width, float height, float u, float v, float tWidth, float tHeight )
     {
         buffer.vertex( matrix, x, y + height, z ).uv( u / BG_SIZE, (v + tHeight) / BG_SIZE ).endVertex();
         buffer.vertex( matrix, x + width, y + height, z ).uv( (u + tWidth) / BG_SIZE, (v + tHeight) / BG_SIZE ).endVertex();
@@ -165,14 +165,13 @@ public final class PrintoutRenderer
         return (float) (32 * (1 - Math.pow( 1.2, -page )));
     }
 
-    private static final class Type extends RenderState
+    private static final class Type extends RenderStateShard
     {
         static final RenderType TYPE = RenderType.create(
-            "printout_background", DefaultVertexFormats.POSITION_TEX, GL11.GL_QUADS, 1024,
+            "printout_background", DefaultVertexFormat.POSITION_TEX, VertexFormat.Mode.QUADS, 1024,
             false, false, // useDelegate, needsSorting
-            RenderType.State.builder()
-                .setTextureState( new RenderState.TextureState( BG, false, false ) ) // blur, minimap
-                .setAlphaState( DEFAULT_ALPHA )
+            RenderType.CompositeState.builder()
+                .setTextureState( new RenderStateShard.TextureStateShard( BG, false, false ) ) // blur, minimap
                 .setLightmapState( NO_LIGHTMAP )
                 .createCompositeState( false )
         );