Bump CC:T to 1.108.3

We can't use FriendlyByte.readCollection to read to a
pre-allocated/array-backed NonNullList, as that doesn't implement
List.add. Instead, we just need to do a normal loop.

We add a couple of tests to round-trip our recipe specs. Unfortunately
we can't test the recipes themselves as our own registries aren't set
up, so this'll have to do for now.

.pre-commit-config.yaml

@@ -44,7 +44,7 @@ repos:
     name: Check Java codestyle
     files: ".*\\.java$"
     language: system
-    entry: ./gradlew checkstyleMain checkstyleTest
+    entry: ./gradlew checkstyle
     pass_filenames: false
     require_serial: true
   - id: illuaminate

.reuse/dep5

@@ -10,8 +10,8 @@ Files:
   projects/common/src/testMod/resources/data/cctest/structures/*
   projects/fabric/src/generated/*
   projects/forge/src/generated/*
-  projects/web/src/export/index.json
-  projects/web/src/export/items/minecraft/*
+  projects/web/src/htmlTransform/export/index.json
+  projects/web/src/htmlTransform/export/items/minecraft/*
 Comment: Generated/data files are CC0.
 Copyright: The CC: Tweaked Developers
 License: CC0-1.0
@@ -37,10 +37,10 @@ Files:
   projects/fabric/src/testMod/resources/computercraft-gametest.fabric.mixins.json
   projects/fabric/src/testMod/resources/fabric.mod.json
   projects/forge/src/client/resources/computercraft-client.forge.mixins.json
-  projects/web/src/mount/.settings
-  projects/web/src/mount/example.nfp
-  projects/web/src/mount/example.nft
-  projects/web/src/mount/expr_template.lua
+  projects/web/src/frontend/mount/.settings
+  projects/web/src/frontend/mount/example.nfp
+  projects/web/src/frontend/mount/example.nft
+  projects/web/src/frontend/mount/expr_template.lua
   projects/web/tsconfig.json
 Comment: Several assets where it's inconvenient to create a .license file.
 Copyright: The CC: Tweaked Developers
@@ -56,7 +56,7 @@ Files:
   projects/core/src/main/resources/data/computercraft/lua/rom/autorun/.ignoreme
   projects/core/src/main/resources/data/computercraft/lua/rom/help/*
   projects/core/src/main/resources/data/computercraft/lua/rom/programs/fun/advanced/levels/*
-  projects/web/src/export/items/computercraft/*
+  projects/web/src/htmlTransform/export/items/computercraft/*
 Comment: Bulk-license original assets as CCPL.
 Copyright: 2011 Daniel Ratcliffe
 License: LicenseRef-CCPL

CONTRIBUTING.md

@@ -100,7 +100,6 @@ about how you can build on that until you've covered everything!
 [new-issue]: https://github.com/cc-tweaked/CC-Tweaked/issues/new/choose "Create a new issue"
 [community]: README.md#community "Get in touch with the community."
 [Adoptium]: https://adoptium.net/temurin/releases?version=17 "Download OpenJDK 17"
-[checkstyle]: https://checkstyle.org/
 [illuaminate]: https://github.com/SquidDev/illuaminate/ "Illuaminate on GitHub"
 [weblate]: https://i18n.tweaked.cc/projects/cc-tweaked/minecraft/ "CC: Tweaked weblate instance"
 [docs]: https://tweaked.cc/ "CC: Tweaked documentation"

buildSrc/build.gradle.kts

@@ -52,7 +52,7 @@ dependencies {
     implementation(libs.forgeGradle)
     implementation(libs.librarian)
     implementation(libs.minotaur)
-    implementation(libs.quiltflower)
+    implementation(libs.vineflower)
     implementation(libs.vanillaGradle)
 }
 

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

@@ -12,7 +12,7 @@ import cc.tweaked.gradle.MinecraftConfigurations
 plugins {
     `java-library`
     id("fabric-loom")
-    id("io.github.juuxel.loom-quiltflower")
+    id("io.github.juuxel.loom-vineflower")
     id("cc-tweaked.java-convention")
 }
 

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

@@ -59,12 +59,14 @@ repositories {
             includeGroup("cc.tweaked")
             includeModule("org.squiddev", "Cobalt")
             // Things we mirror
+            includeGroup("commoble.morered")
             includeGroup("dev.architectury")
             includeGroup("dev.emi")
             includeGroup("maven.modrinth")
             includeGroup("me.shedaniel.cloth")
             includeGroup("me.shedaniel")
             includeGroup("mezz.jei")
+            includeGroup("org.teavm")
             includeModule("com.terraformersmc", "modmenu")
             includeModule("me.lucko", "fabric-permissions-api")
         }
@@ -98,7 +100,10 @@ sourceSets.all {
             check("FutureReturnValueIgnored", CheckSeverity.OFF) // Too many false positives with Netty
 
             check("NullAway", CheckSeverity.ERROR)
-            option("NullAway:AnnotatedPackages", listOf("dan200.computercraft", "net.fabricmc.fabric.api").joinToString(","))
+            option(
+                "NullAway:AnnotatedPackages",
+                listOf("dan200.computercraft", "cc.tweaked", "net.fabricmc.fabric.api").joinToString(","),
+            )
             option("NullAway:ExcludedFieldAnnotations", listOf("org.spongepowered.asm.mixin.Shadow").joinToString(","))
             option("NullAway:CastToNonNullMethod", "dan200.computercraft.core.util.Nullability.assertNonNull")
             option("NullAway:CheckOptionalEmptiness")
@@ -173,6 +178,12 @@ project.plugins.withType(CCTweakedPlugin::class.java) {
     }
 }
 
+tasks.register("checkstyle") {
+    description = "Run Checkstyle on all sources"
+    group = LifecycleBasePlugin.VERIFICATION_GROUP
+    dependsOn(tasks.withType(Checkstyle::class.java))
+}
+
 spotless {
     encoding = StandardCharsets.UTF_8
     lineEndings = LineEnding.UNIX
@@ -190,6 +201,7 @@ spotless {
 
     val ktlintConfig = mapOf(
         "ktlint_standard_no-wildcard-imports" to "disabled",
+        "ktlint_standard_class-naming" to "disabled",
         "ij_kotlin_allow_trailing_comma" to "true",
         "ij_kotlin_allow_trailing_comma_on_call_site" to "true",
     )

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

@@ -4,6 +4,7 @@
 
 package cc.tweaked.gradle
 
+import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.AbstractExecTask
 import org.gradle.api.tasks.OutputDirectory
@@ -11,5 +12,5 @@ import java.io.File
 
 abstract class ExecToDir : AbstractExecTask<ExecToDir>(ExecToDir::class.java) {
     @get:OutputDirectory
-    abstract val output: Property<File>
+    abstract val output: DirectoryProperty
 }

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

@@ -5,6 +5,8 @@
 package cc.tweaked.gradle
 
 import org.gradle.api.artifacts.dsl.DependencyHandler
+import org.gradle.api.file.FileSystemLocation
+import org.gradle.api.file.FileSystemLocationProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.JavaExec
@@ -124,3 +126,6 @@ class CloseScope : AutoCloseable {
 
 /** Proxy method to avoid overload ambiguity. */
 fun <T> Property<T>.setProvider(provider: Provider<out T>) = set(provider)
+
+/** Short-cut method to get the absolute path of a [FileSystemLocation] provider. */
+fun Provider<out FileSystemLocation>.getAbsolutePath(): String = get().asFile.absolutePath

config/checkstyle/suppressions.xml

@@ -16,4 +16,10 @@ SPDX-License-Identifier: MPL-2.0
 
     <!-- The commands API is documented in Lua. -->
     <suppress checks="SummaryJavadocCheck" files=".*[\\/]CommandAPI.java" />
+
+    <!-- Allow putting files in other packages if they look like our TeaVM stubs. -->
+    <suppress checks="PackageName" files=".*[\\/]T[A-Za-z]+.java" />
+
+    <!-- Allow underscores in our test classes. -->
+    <suppress checks="MethodName" files=".*Contract.java" />
 </suppressions>

doc/events/file_transfer.md

@@ -29,7 +29,7 @@ for _, file in ipairs(files.getFiles()) do
   local size = file.seek("end")
   file.seek("set", 0)
 
-  print(file.getName() .. " " .. file.getSize())
+  print(file.getName() .. " " .. size)
 end
 ```
 

gradle.properties

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

gradle/libs.versions.toml

@@ -7,17 +7,17 @@
 # Minecraft
 # MC version is specified in gradle.properties, as we need that in settings.gradle.
 # Remember to update corresponding versions in fabric.mod.json/mods.toml
-fabric-api = "0.86.1+1.19.4"
+fabric-api = "0.86.1+1.20.1"
 fabric-loader = "0.14.21"
-forge = "45.0.42"
+forge = "47.1.0"
 forgeSpi = "6.0.0"
 mixin = "0.8.5"
-parchment = "2023.06.26"
-parchmentMc = "1.19.4"
+parchment = "2023.08.20"
+parchmentMc = "1.20.1"
 
 # Normal dependencies
-asm = "9.3"
-autoService = "1.0.1"
+asm = "9.5"
+autoService = "1.1.1"
 checkerFramework = "3.32.0"
 cobalt = "0.7.3"
 cobalt-next = "0.7.4" # Not a real version, used to constrain the version we accept.
@@ -29,49 +29,52 @@ jzlib = "1.1.3"
 kotlin = "1.8.10"
 kotlin-coroutines = "1.6.4"
 netty = "4.1.82.Final"
-nightConfig = "3.6.5"
-slf4j = "1.7.36"
+nightConfig = "3.6.7"
+slf4j = "2.0.1"
 
 # Minecraft mods
-emi = "1.0.8+1.19.4"
-fabricPermissions = "0.2.20221016"
-iris = "1.5.2+1.19.4"
-jei = "13.1.0.11"
-modmenu = "6.1.0-rc.1"
+emi = "1.0.8+1.20.1"
+fabricPermissions = "0.3.20230723"
+iris = "1.6.4+1.20"
+jei = "15.2.0.22"
+modmenu = "7.1.0"
+moreRed = "4.0.0.4"
 oculus = "1.2.5"
-rei = "10.0.578"
+rei = "12.0.626"
 rubidium = "0.6.1"
-sodium = "mc1.19.4-0.4.10"
+sodium = "mc1.20-0.4.10"
 
 # Testing
-byteBuddy = "1.14.2"
+byteBuddy = "1.14.7"
 hamcrest = "2.2"
-jqwik = "1.7.2"
-junit = "5.9.2"
+jqwik = "1.7.4"
+junit = "5.10.0"
 
 # Build tools
 cctJavadoc = "1.8.0"
-checkstyle = "10.3.4"
+checkstyle = "10.12.3"
 curseForgeGradle = "1.0.14"
-errorProne-core = "2.18.0"
-errorProne-plugin = "3.0.1"
+errorProne-core = "2.21.1"
+errorProne-plugin = "3.1.0"
 fabric-loom = "1.3.7"
 forgeGradle = "6.0.8"
-githubRelease = "2.2.12"
-ideaExt = "1.1.6"
-illuaminate = "0.1.0-40-g975cbc3"
+githubRelease = "2.4.1"
+ideaExt = "1.1.7"
+illuaminate = "0.1.0-44-g9ee0055"
 librarian = "1.+"
 minotaur = "2.+"
 mixinGradle = "0.7.+"
 nullAway = "0.9.9"
-quiltflower = "1.10.0"
-spotless = "6.17.0"
+spotless = "6.21.0"
 taskTree = "2.1.1"
 vanillaGradle = "0.2.1-SNAPSHOT"
+vineflower = "1.11.0"
+teavm = "0.9.0-SQUID.1"
 
 [libraries]
 # Normal dependencies
 asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
+asm-commons = { module = "org.ow2.asm:asm-commons", version.ref = "asm" }
 autoService = { module = "com.google.auto.service:auto-service", version.ref = "autoService" }
 checkerFramework = { module = "org.checkerframework:checker-qual", version.ref = "checkerFramework" }
 cobalt = { module = "org.squiddev:Cobalt", version.ref = "cobalt" }
@@ -97,11 +100,12 @@ fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-l
 fabricPermissions = { module = "me.lucko:fabric-permissions-api", version.ref = "fabricPermissions" }
 emi = { module = "dev.emi:emi-xplat-mojmap", version.ref = "emi" }
 iris = { module = "maven.modrinth:iris", version.ref = "iris" }
-jei-api = { module = "mezz.jei:jei-1.19.4-common-api", version.ref = "jei" }
-jei-fabric = { module = "mezz.jei:jei-1.19.4-fabric", version.ref = "jei" }
-jei-forge = { module = "mezz.jei:jei-1.19.4-forge", version.ref = "jei" }
+jei-api = { module = "mezz.jei:jei-1.20.1-common-api", version.ref = "jei" }
+jei-fabric = { module = "mezz.jei:jei-1.20.1-fabric", version.ref = "jei" }
+jei-forge = { module = "mezz.jei:jei-1.20.1-forge", version.ref = "jei" }
 mixin = { module = "org.spongepowered:mixin", version.ref = "mixin" }
 modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
+moreRed = { module = "commoble.morered:morered-1.20.1", version.ref = "moreRed" }
 oculus = { module = "maven.modrinth:oculus", version.ref = "oculus" }
 rei-api = { module = "me.shedaniel:RoughlyEnoughItems-api", version.ref = "rei" }
 rei-builtin = { module = "me.shedaniel:RoughlyEnoughItems-default-plugin", version.ref = "rei" }
@@ -135,9 +139,17 @@ kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.
 librarian = { module = "org.parchmentmc:librarian", version.ref = "librarian" }
 minotaur = { module = "com.modrinth.minotaur:Minotaur", version.ref = "minotaur" }
 nullAway = { module = "com.uber.nullaway:nullaway", version.ref = "nullAway" }
-quiltflower = { module = "io.github.juuxel:loom-quiltflower", version.ref = "quiltflower" }
 spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }
+teavm-classlib = { module = "org.teavm:teavm-classlib", version.ref = "teavm" }
+teavm-jso = { module = "org.teavm:teavm-jso", version.ref = "teavm" }
+teavm-jso-apis = { module = "org.teavm:teavm-jso-apis", version.ref = "teavm" }
+teavm-jso-impl = { module = "org.teavm:teavm-jso-impl", version.ref = "teavm" }
+teavm-metaprogramming-api = { module = "org.teavm:teavm-metaprogramming-api", version.ref = "teavm" }
+teavm-metaprogramming-impl = { module = "org.teavm:teavm-metaprogramming-impl", version.ref = "teavm" }
+teavm-platform = { module = "org.teavm:teavm-platform", version.ref = "teavm" }
+teavm-tooling = { module = "org.teavm:teavm-tooling", version.ref = "teavm" }
 vanillaGradle = { module = "org.spongepowered:vanillagradle", version.ref = "vanillaGradle" }
+vineflower = { module = "io.github.juuxel:loom-vineflower", version.ref = "vineflower" }
 
 [plugins]
 forgeGradle = { id = "net.minecraftforge.gradle", version.ref = "forgeGradle" }
@@ -149,11 +161,12 @@ mixinGradle = { id = "org.spongepowered.mixin", version.ref = "mixinGradle" }
 taskTree = { id = "com.dorongold.task-tree", version.ref = "taskTree" }
 
 [bundles]
+annotations = ["jsr305", "checkerFramework", "jetbrainsAnnotations"]
 kotlin = ["kotlin-stdlib", "kotlin-coroutines"]
 
 # Minecraft
 externalMods-common = ["jei-api", "nightConfig-core", "nightConfig-toml"]
-externalMods-forge-compile = ["oculus", "jei-api"]
+externalMods-forge-compile = ["moreRed", "oculus", "jei-api"]
 externalMods-forge-runtime = ["jei-forge"]
 externalMods-fabric = ["nightConfig-core", "nightConfig-toml"]
 externalMods-fabric-compile = ["fabricPermissions", "iris", "jei-api", "rei-api", "rei-builtin"]
@@ -162,3 +175,7 @@ externalMods-fabric-runtime = ["jei-fabric", "modmenu"]
 # Testing
 test = ["junit-jupiter-api", "junit-jupiter-params", "hamcrest", "jqwik-api"]
 testRuntime = ["junit-jupiter-engine", "jqwik-engine"]
+
+# Build tools
+teavm-api = [ "teavm-jso", "teavm-jso-apis", "teavm-platform", "teavm-classlib", "teavm-metaprogramming-api" ]
+teavm-tooling = [ "teavm-tooling", "teavm-metaprogramming-impl", "teavm-jso-impl" ]

illuaminate.sexp

@@ -10,7 +10,7 @@
   /projects/core/src/main/resources/data/computercraft/lua/bios.lua
   /projects/core/src/main/resources/data/computercraft/lua/rom/
   /projects/core/src/test/resources/test-rom
-  /projects/web/src/mount)
+  /projects/web/src/frontend/mount)
 
 (doc
   ; Also defined in projects/web/build.gradle.kts
@@ -23,7 +23,7 @@
     (url https://tweaked.cc/)
     (source-link https://github.com/cc-tweaked/CC-Tweaked/blob/${commit}/${path}#L${line})
 
-    (styles /projects/web/src/styles.css)
+    (styles  /projects/web/build/rollup/index.css)
     (scripts /projects/web/build/rollup/index.js)
     (head doc/head.html))
 
@@ -115,4 +115,4 @@
       :max sleep write
       cct_test describe expect howlci fail it pending stub before_each)))
 
-(at /projects/web/src/mount/expr_template.lua (lint (globals :max __expr__)))
+(at /projects/web/src/frontend/mount/expr_template.lua (lint (globals :max __expr__)))

package.json

@@ -6,24 +6,24 @@
   "license": "BSD-3-Clause",
   "type": "module",
   "dependencies": {
+    "@squid-dev/cc-web-term": "^2.0.0",
     "preact": "^10.5.5",
+    "setimmediate": "^1.0.5",
     "tslib": "^2.0.3"
   },
   "devDependencies": {
-    "@rollup/plugin-terser": "^0.4.0",
+    "@rollup/plugin-node-resolve": "^15.2.1",
     "@rollup/plugin-typescript": "^11.0.0",
     "@rollup/plugin-url": "^8.0.1",
-    "@types/glob": "^8.1.0",
-    "@types/react-dom": "^18.0.5",
-    "glob": "^9.3.0",
-    "react-dom": "^18.1.0",
-    "react": "^18.1.0",
-    "rehype-highlight": "^6.0.0",
-    "rehype-react": "^7.1.1",
-    "rehype": "^12.0.1",
-    "requirejs": "^2.3.6",
-    "rollup": "^3.19.1",
-    "ts-node": "^10.8.0",
-    "typescript": "^4.0.5"
+    "@swc/core": "^1.3.92",
+    "@types/node": "^20.8.3",
+    "lightningcss": "^1.22.0",
+    "preact-render-to-string": "^6.2.1",
+    "rehype": "^13.0.0",
+    "rehype-highlight": "^7.0.0",
+    "rehype-react": "^8.0.0",
+    "rollup": "^4.0.0",
+    "tsx": "^3.12.10",
+    "typescript": "^5.2.2"
   }
 }

projects/common-api/src/client/java/dan200/computercraft/api/client/turtle/TurtleUpgradeModellers.java

@@ -17,7 +17,7 @@ import org.joml.Matrix4f;
 
 import javax.annotation.Nullable;
 
-class TurtleUpgradeModellers {
+final class TurtleUpgradeModellers {
     private static final Transformation leftTransform = getMatrixFor(-0.4065f);
     private static final Transformation rightTransform = getMatrixFor(0.4065f);
 
@@ -35,7 +35,7 @@ class TurtleUpgradeModellers {
 
     static final TurtleUpgradeModeller<ITurtleUpgrade> UPGRADE_ITEM = new UpgradeItemModeller();
 
-    private static class UpgradeItemModeller implements TurtleUpgradeModeller<ITurtleUpgrade> {
+    private static final class UpgradeItemModeller implements TurtleUpgradeModeller<ITurtleUpgrade> {
         @Override
         public TransformedModel getModel(ITurtleUpgrade upgrade, @Nullable ITurtleAccess turtle, TurtleSide side) {
             return getModel(turtle == null ? upgrade.getCraftingItem() : upgrade.getUpgradeItem(turtle.getUpgradeNBTData(side)), side);

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

@@ -46,6 +46,14 @@ public class ComputerCraftTags {
         public static final TagKey<Block> WIRED_MODEM = make("wired_modem");
         public static final TagKey<Block> MONITOR = make("monitor");
 
+        /**
+         * Blocks which should be ignored by a {@code peripheral_hub} peripheral.
+         * <p>
+         * This should include blocks which themselves expose a peripheral hub (such as {@linkplain #WIRED_MODEM wired
+         * modems}).
+         */
+        public static final TagKey<Block> PERIPHERAL_HUB_IGNORE = make("peripheral_hub_ignore");
+
         /**
          * Blocks which can be broken by any turtle tool.
          */

projects/common-api/src/main/java/dan200/computercraft/api/pocket/PocketUpgradeSerialiser.java

@@ -4,7 +4,6 @@
 
 package dan200.computercraft.api.pocket;
 
-import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.upgrades.UpgradeBase;
 import dan200.computercraft.api.upgrades.UpgradeSerialiser;
 import dan200.computercraft.impl.ComputerCraftAPIService;
@@ -30,14 +29,6 @@ import java.util.function.Function;
  * @see PocketUpgradeDataProvider
  */
 public interface PocketUpgradeSerialiser<T extends IPocketUpgrade> extends UpgradeSerialiser<T> {
-    /**
-     * The ID for the associated registry.
-     *
-     * @deprecated Use {@link #registryId()} instead.
-     */
-    @Deprecated(forRemoval = true)
-    ResourceKey<Registry<PocketUpgradeSerialiser<?>>> REGISTRY_ID = ResourceKey.createRegistryKey(new ResourceLocation(ComputerCraftAPI.MOD_ID, "pocket_upgrade_serialiser"));
-
     /**
      * The ID for the associated registry.
      *

projects/common-api/src/main/java/dan200/computercraft/api/turtle/ITurtleAccess.java

@@ -16,7 +16,6 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.Container;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.ApiStatus;
 
 import javax.annotation.Nullable;
@@ -71,29 +70,6 @@ public interface ITurtleAccess {
      */
     boolean teleportTo(Level world, BlockPos pos);
 
-    /**
-     * Returns a vector containing the floating point co-ordinates at which the turtle is rendered.
-     * This will shift when the turtle is moving.
-     *
-     * @param f The subframe fraction.
-     * @return A vector containing the floating point co-ordinates at which the turtle resides.
-     * @see #getVisualYaw(float)
-     * @deprecated Will be removed in 1.20.
-     */
-    @Deprecated(forRemoval = true)
-    Vec3 getVisualPosition(float f);
-
-    /**
-     * Returns the yaw the turtle is facing when it is rendered.
-     *
-     * @param f The subframe fraction.
-     * @return The yaw the turtle is facing.
-     * @see #getVisualPosition(float)
-     * @deprecated Will be removed in 1.20.
-     */
-    @Deprecated(forRemoval = true)
-    float getVisualYaw(float f);
-
     /**
      * Returns the world direction the turtle is currently facing.
      *

projects/common-api/src/main/java/dan200/computercraft/api/turtle/TurtleUpgradeSerialiser.java

@@ -4,7 +4,6 @@
 
 package dan200.computercraft.api.turtle;
 
-import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.upgrades.UpgradeBase;
 import dan200.computercraft.api.upgrades.UpgradeSerialiser;
 import dan200.computercraft.impl.ComputerCraftAPIService;
@@ -65,14 +64,6 @@ import java.util.function.Function;
  * @see dan200.computercraft.api.client.turtle.TurtleUpgradeModeller
  */
 public interface TurtleUpgradeSerialiser<T extends ITurtleUpgrade> extends UpgradeSerialiser<T> {
-    /**
-     * The ID for the associated registry.
-     *
-     * @deprecated Use {@link #registryId()} instead.
-     */
-    @Deprecated(forRemoval = true)
-    ResourceKey<Registry<TurtleUpgradeSerialiser<?>>> REGISTRY_ID = ResourceKey.createRegistryKey(new ResourceLocation(ComputerCraftAPI.MOD_ID, "turtle_upgrade_serialiser"));
-
     /**
      * The ID for the associated registry.
      *

projects/common/build.gradle.kts

@@ -39,4 +39,6 @@ dependencies {
     testModImplementation(testFixtures(project(":core")))
     testModImplementation(testFixtures(project(":common")))
     testModImplementation(libs.bundles.kotlin)
+
+    testFixturesImplementation(testFixtures(project(":core")))
 }

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

@@ -4,7 +4,6 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.client.gui.widgets.DynamicImageButton;
 import dan200.computercraft.client.gui.widgets.TerminalWidget;
@@ -19,6 +18,7 @@ import dan200.computercraft.shared.config.Config;
 import dan200.computercraft.shared.network.server.UploadFileMessage;
 import net.minecraft.ChatFormatting;
 import net.minecraft.Util;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
@@ -124,10 +124,10 @@ public abstract class AbstractComputerScreen<T extends AbstractComputerMenu> ext
     }
 
     @Override
-    public void render(PoseStack stack, int mouseX, int mouseY, float partialTicks) {
-        renderBackground(stack);
-        super.render(stack, mouseX, mouseY, partialTicks);
-        renderTooltip(stack, mouseX, mouseY);
+    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
+        renderBackground(graphics);
+        super.render(graphics, mouseX, mouseY, partialTicks);
+        renderTooltip(graphics, mouseX, mouseY);
     }
 
     @Override
@@ -147,7 +147,7 @@ public abstract class AbstractComputerScreen<T extends AbstractComputerMenu> ext
 
 
     @Override
-    protected void renderLabels(PoseStack transform, int mouseX, int mouseY) {
+    protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY) {
         // Skip rendering labels.
     }
 

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

@@ -4,15 +4,13 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.Tesselator;
 import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.client.gui.widgets.TerminalWidget;
 import dan200.computercraft.client.render.ComputerBorderRenderer;
 import dan200.computercraft.client.render.RenderTypes;
 import dan200.computercraft.client.render.SpriteRenderer;
 import dan200.computercraft.shared.computer.inventory.AbstractComputerMenu;
-import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 
@@ -39,12 +37,10 @@ public final class ComputerScreen<T extends AbstractComputerMenu> extends Abstra
     }
 
     @Override
-    public void renderBg(PoseStack stack, float partialTicks, int mouseX, int mouseY) {
+    public void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
         // Draw a border around the terminal
         var terminal = getTerminal();
-        var buffers = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
-
-        var spriteRenderer = SpriteRenderer.createForGui(stack, buffers.getBuffer(RenderTypes.GUI_SPRITES));
+        var spriteRenderer = SpriteRenderer.createForGui(graphics, RenderTypes.GUI_SPRITES);
         var computerTextures = GuiSprites.getComputerTextures(family);
 
         ComputerBorderRenderer.render(
@@ -52,6 +48,6 @@ public final class ComputerScreen<T extends AbstractComputerMenu> extends Abstra
             terminal.getX(), terminal.getY(), terminal.getWidth(), terminal.getHeight(), false
         );
         ComputerSidebar.renderBackground(spriteRenderer, computerTextures, leftPos, topPos + sidebarYOffset);
-        buffers.endBatch();
+        graphics.flush(); // Flush to ensure background textures are drawn before foreground.
     }
 }

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

@@ -4,9 +4,8 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.shared.peripheral.diskdrive.DiskDriveMenu;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -23,16 +22,14 @@ public class DiskDriveScreen extends AbstractContainerScreen<DiskDriveMenu> {
     }
 
     @Override
-    protected void renderBg(PoseStack transform, float partialTicks, int mouseX, int mouseY) {
-        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
-        RenderSystem.setShaderTexture(0, BACKGROUND);
-        blit(transform, leftPos, topPos, 0, 0, imageWidth, imageHeight);
+    protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
+        graphics.blit(BACKGROUND, leftPos, topPos, 0, 0, imageWidth, imageHeight);
     }
 
     @Override
-    public void render(PoseStack transform, int mouseX, int mouseY, float partialTicks) {
-        renderBackground(transform);
-        super.render(transform, mouseX, mouseY, partialTicks);
-        renderTooltip(transform, mouseX, mouseY);
+    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
+        renderBackground(graphics);
+        super.render(graphics, mouseX, mouseY, partialTicks);
+        renderTooltip(graphics, mouseX, mouseY);
     }
 }

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

@@ -4,10 +4,8 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.toasts.Toast;
 import net.minecraft.client.gui.components.toasts.ToastComponent;
 import net.minecraft.network.chat.Component;
@@ -73,55 +71,52 @@ public class ItemToast implements Toast {
     }
 
     @Override
-    public Visibility render(PoseStack transform, ToastComponent component, long time) {
+    public Visibility render(GuiGraphics graphics, ToastComponent component, long time) {
         if (isNew) {
 
             firstDisplay = time;
             isNew = false;
         }
 
-        RenderSystem.setShaderTexture(0, TEXTURE);
-        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
-
         if (width == 160 && message.size() <= 1) {
-            GuiComponent.blit(transform, 0, 0, 0, 64, width, height());
+            graphics.blit(TEXTURE, 0, 0, 0, 64, width, height());
         } else {
 
             var height = height();
 
             var bottom = Math.min(4, height - 28);
-            renderBackgroundRow(transform, component, width, 0, 0, 28);
+            renderBackgroundRow(graphics, width, 0, 0, 28);
 
             for (var i = 28; i < height - bottom; i += 10) {
-                renderBackgroundRow(transform, component, width, 16, i, Math.min(16, height - i - bottom));
+                renderBackgroundRow(graphics, width, 16, i, Math.min(16, height - i - bottom));
             }
 
-            renderBackgroundRow(transform, component, width, 32 - bottom, height - bottom, bottom);
+            renderBackgroundRow(graphics, width, 32 - bottom, height - bottom, bottom);
         }
 
         var textX = MARGIN;
         if (!stack.isEmpty()) {
             textX += MARGIN + IMAGE_SIZE;
-            component.getMinecraft().getItemRenderer().renderAndDecorateFakeItem(transform, stack, MARGIN, MARGIN + height() / 2 - IMAGE_SIZE);
+            graphics.renderFakeItem(stack, MARGIN, MARGIN + height() / 2 - IMAGE_SIZE);
         }
 
-        component.getMinecraft().font.draw(transform, title, textX, MARGIN, 0xff500050);
+        graphics.drawString(component.getMinecraft().font, title, textX, MARGIN, 0xff500050, false);
         for (var i = 0; i < message.size(); ++i) {
-            component.getMinecraft().font.draw(transform, message.get(i), textX, (float) (LINE_SPACING + (i + 1) * LINE_SPACING), 0xff000000);
+            graphics.drawString(component.getMinecraft().font, message.get(i), textX, LINE_SPACING + (i + 1) * LINE_SPACING, 0xff000000, false);
         }
 
         return time - firstDisplay < DISPLAY_TIME ? Visibility.SHOW : Visibility.HIDE;
     }
 
-    private static void renderBackgroundRow(PoseStack transform, ToastComponent component, int x, int u, int y, int height) {
+    private static void renderBackgroundRow(GuiGraphics graphics, int x, int u, int y, int height) {
         var leftOffset = 5;
         var rightOffset = Math.min(60, x - leftOffset);
 
-        GuiComponent.blit(transform, 0, y, 0, 32 + u, leftOffset, height);
+        graphics.blit(TEXTURE, 0, y, 0, 32 + u, leftOffset, height);
         for (var k = leftOffset; k < x - rightOffset; k += 64) {
-            GuiComponent.blit(transform, k, y, 32, 32 + u, Math.min(64, x - k - rightOffset), height);
+            graphics.blit(TEXTURE, k, y, 32, 32 + u, Math.min(64, x - k - rightOffset), height);
         }
 
-        GuiComponent.blit(transform, x - rightOffset, y, 160 - rightOffset, 32 + u, rightOffset, height);
+        graphics.blit(TEXTURE, x - rightOffset, y, 160 - rightOffset, 32 + u, rightOffset, height);
     }
 }

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

@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
 //
-// SPDX-License-Identifier: LicenseRef-CCPL
+// SPDX-License-Identifier: MPL-2.0
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.client.gui.widgets.TerminalWidget;
 import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.shared.computer.inventory.AbstractComputerMenu;
 import net.minecraft.client.KeyMapping;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.MenuAccess;
 import net.minecraft.network.chat.Component;
@@ -42,7 +42,6 @@ public class NoTermComputerScreen<T extends AbstractComputerMenu> extends Screen
 
     @Override
     protected void init() {
-        passEvents = true; // Pass mouse vents through to the game's mouse handler.
         // First ensure we're still grabbing the mouse, so the user can look around. Then reset bits of state that
         // grabbing unsets.
         minecraft.mouseHandler.grabMouse();
@@ -91,15 +90,15 @@ public class NoTermComputerScreen<T extends AbstractComputerMenu> extends Screen
     }
 
     @Override
-    public void render(PoseStack transform, int mouseX, int mouseY, float partialTicks) {
-        super.render(transform, mouseX, mouseY, partialTicks);
+    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
+        super.render(graphics, mouseX, mouseY, partialTicks);
 
         var font = minecraft.font;
         var lines = font.split(Component.translatable("gui.computercraft.pocket_computer_overlay"), (int) (width * 0.8));
-        var y = 10.0f;
+        var y = 10;
         for (var line : lines) {
-            font.drawShadow(transform, line, (float) ((width / 2) - (minecraft.font.width(line) / 2)), y, 0xFFFFFF);
-            y += 9.0f;
+            graphics.drawString(font, line, (width / 2) - (minecraft.font.width(line) / 2), y, 0xFFFFFF, true);
+            y += 9;
         }
     }
 }

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

@@ -4,9 +4,8 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.MultiLineLabel;
@@ -86,20 +85,19 @@ public final class OptionScreen extends Screen {
     }
 
     @Override
-    public void render(PoseStack transform, int mouseX, int mouseY, float partialTicks) {
-        renderBackground(transform);
+    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
+        renderBackground(graphics);
 
         // Render the actual texture.
-        RenderSystem.setShaderTexture(0, BACKGROUND);
-        blit(transform, x, y, 0, 0, innerWidth, PADDING);
-        blit(transform,
+        graphics.blit(BACKGROUND, x, y, 0, 0, innerWidth, PADDING);
+        graphics.blit(BACKGROUND,
             x, y + PADDING, 0, PADDING, innerWidth, innerHeight - PADDING * 2,
             innerWidth, PADDING
         );
-        blit(transform, x, y + innerHeight - PADDING, 0, 256 - PADDING, innerWidth, PADDING);
+        graphics.blit(BACKGROUND, x, y + innerHeight - PADDING, 0, 256 - PADDING, innerWidth, PADDING);
 
-        assertNonNull(messageRenderer).renderLeftAlignedNoShadow(transform, x + PADDING, y + PADDING, FONT_HEIGHT, 0x404040);
-        super.render(transform, mouseX, mouseY, partialTicks);
+        assertNonNull(messageRenderer).renderLeftAlignedNoShadow(graphics, x + PADDING, y + PADDING, FONT_HEIGHT, 0x404040);
+        super.render(graphics, mouseX, mouseY, partialTicks);
     }
 
     @Override

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

@@ -4,9 +4,8 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.shared.peripheral.printer.PrinterMenu;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -23,18 +22,16 @@ public class PrinterScreen extends AbstractContainerScreen<PrinterMenu> {
     }
 
     @Override
-    protected void renderBg(PoseStack transform, float partialTicks, int mouseX, int mouseY) {
-        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
-        RenderSystem.setShaderTexture(0, BACKGROUND);
-        blit(transform, leftPos, topPos, 0, 0, imageWidth, imageHeight);
+    protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
+        graphics.blit(BACKGROUND, leftPos, topPos, 0, 0, imageWidth, imageHeight);
 
-        if (getMenu().isPrinting()) blit(transform, leftPos + 34, topPos + 21, 176, 0, 25, 45);
+        if (getMenu().isPrinting()) graphics.blit(BACKGROUND, leftPos + 34, topPos + 21, 176, 0, 25, 45);
     }
 
     @Override
-    public void render(PoseStack stack, int mouseX, int mouseY, float partialTicks) {
-        renderBackground(stack);
-        super.render(stack, mouseX, mouseY, partialTicks);
-        renderTooltip(stack, mouseX, mouseY);
+    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
+        renderBackground(graphics);
+        super.render(graphics, mouseX, mouseY, partialTicks);
+        renderTooltip(graphics, mouseX, mouseY);
     }
 }

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

@@ -4,12 +4,11 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.Tesselator;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.common.HeldItemMenu;
 import dan200.computercraft.shared.media.items.PrintoutItem;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.network.chat.Component;
@@ -83,30 +82,27 @@ public class PrintoutScreen extends AbstractContainerScreen<HeldItemMenu> {
     }
 
     @Override
-    protected void renderBg(PoseStack transform, float partialTicks, int mouseX, int mouseY) {
+    protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
         // Draw the printout
-        RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
-        RenderSystem.enableDepthTest();
-
         var renderer = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
-        drawBorder(transform, renderer, leftPos, topPos, 0, page, pages, book, FULL_BRIGHT_LIGHTMAP);
-        drawText(transform, renderer, leftPos + X_TEXT_MARGIN, topPos + Y_TEXT_MARGIN, PrintoutItem.LINES_PER_PAGE * page, FULL_BRIGHT_LIGHTMAP, text, colours);
+        drawBorder(graphics.pose(), renderer, leftPos, topPos, 0, page, pages, book, FULL_BRIGHT_LIGHTMAP);
+        drawText(graphics.pose(), renderer, leftPos + X_TEXT_MARGIN, topPos + Y_TEXT_MARGIN, PrintoutItem.LINES_PER_PAGE * page, FULL_BRIGHT_LIGHTMAP, text, colours);
         renderer.endBatch();
     }
 
     @Override
-    public void render(PoseStack stack, int mouseX, int mouseY, float partialTicks) {
+    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
         // We must take the background further back in order to not overlap with our printed pages.
-        stack.pushPose();
-        stack.translate(0, 0, -1);
-        renderBackground(stack);
-        stack.popPose();
+        graphics.pose().pushPose();
+        graphics.pose().translate(0, 0, -1);
+        renderBackground(graphics);
+        graphics.pose().popPose();
 
-        super.render(stack, mouseX, mouseY, partialTicks);
+        super.render(graphics, mouseX, mouseY, partialTicks);
     }
 
     @Override
-    protected void renderLabels(PoseStack transform, int mouseX, int mouseY) {
+    protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY) {
         // Skip rendering labels.
     }
 }

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

@@ -4,9 +4,6 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.Tesselator;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.client.gui.widgets.TerminalWidget;
@@ -15,7 +12,7 @@ import dan200.computercraft.client.render.SpriteRenderer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.inventory.AbstractComputerMenu;
 import dan200.computercraft.shared.turtle.inventory.TurtleMenu;
-import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
@@ -47,26 +44,25 @@ public class TurtleScreen extends AbstractComputerScreen<TurtleMenu> {
     }
 
     @Override
-    protected void renderBg(PoseStack transform, float partialTicks, int mouseX, int mouseY) {
+    protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
         var advanced = family == ComputerFamily.ADVANCED;
-        RenderSystem.setShaderTexture(0, advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL);
-        blit(transform, leftPos + AbstractComputerMenu.SIDEBAR_WIDTH, topPos, 0, 0, 0, TEX_WIDTH, TEX_HEIGHT, FULL_TEX_SIZE, FULL_TEX_SIZE);
+        var texture = advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL;
+        graphics.blit(texture, leftPos + AbstractComputerMenu.SIDEBAR_WIDTH, topPos, 0, 0, 0, TEX_WIDTH, TEX_HEIGHT, FULL_TEX_SIZE, FULL_TEX_SIZE);
 
         // Render selected slot
         var slot = getMenu().getSelectedSlot();
         if (slot >= 0) {
             var slotX = slot % 4;
             var slotY = slot / 4;
-            blit(transform,
+            graphics.blit(texture,
                 leftPos + TURTLE_START_X - 2 + slotX * 18, topPos + PLAYER_START_Y - 2 + slotY * 18, 0,
                 0, 217, 24, 24, FULL_TEX_SIZE, FULL_TEX_SIZE
             );
         }
 
         // Render sidebar
-        var buffers = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
-        var spriteRenderer = SpriteRenderer.createForGui(transform, buffers.getBuffer(RenderTypes.GUI_SPRITES));
+        var spriteRenderer = SpriteRenderer.createForGui(graphics, RenderTypes.GUI_SPRITES);
         ComputerSidebar.renderBackground(spriteRenderer, GuiSprites.getComputerTextures(family), leftPos, topPos + sidebarYOffset);
-        buffers.endBatch();
+        graphics.flush(); // Flush to ensure background textures are drawn before foreground.
     }
 }

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

@@ -5,9 +5,9 @@
 package dan200.computercraft.client.gui.widgets;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
 import it.unimi.dsi.fastutil.booleans.Boolean2ObjectFunction;
 import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.Tooltip;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -42,21 +42,20 @@ public class DynamicImageButton extends Button {
     }
 
     @Override
-    public void renderWidget(PoseStack stack, int mouseX, int mouseY, float partialTicks) {
+    public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
         var texture = this.texture.get(isHoveredOrFocused());
-        RenderSystem.setShaderTexture(0, texture.atlasLocation());
-        RenderSystem.disableDepthTest();
 
-        blit(stack, getX(), getY(), 0, width, height, texture);
+        RenderSystem.disableDepthTest();
+        graphics.blit(getX(), getY(), 0, width, height, texture);
         RenderSystem.enableDepthTest();
     }
 
     @Override
-    public void render(PoseStack stack, int mouseX, int mouseY, float partialTicks) {
+    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
         var message = this.message.get();
         setMessage(message.message());
         setTooltip(message.tooltip());
-        super.render(stack, mouseX, mouseY, partialTicks);
+        super.render(graphics, mouseX, mouseY, partialTicks);
     }
 
     public record HintedMessage(Component message, Tooltip tooltip) {

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

@@ -4,7 +4,6 @@
 
 package dan200.computercraft.client.gui.widgets;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.Tesselator;
 import dan200.computercraft.client.render.RenderTypes;
 import dan200.computercraft.client.render.text.FixedWidthFontRenderer;
@@ -12,6 +11,7 @@ import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.shared.computer.core.InputHandler;
 import net.minecraft.SharedConstants;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.narration.NarratedElementType;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
@@ -274,11 +274,11 @@ public class TerminalWidget extends AbstractWidget {
     }
 
     @Override
-    public void renderWidget(PoseStack transform, int mouseX, int mouseY, float partialTicks) {
+    public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
         if (!visible) return;
 
         var bufferSource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
-        var emitter = FixedWidthFontRenderer.toVertexConsumer(transform, bufferSource.getBuffer(RenderTypes.TERMINAL));
+        var emitter = FixedWidthFontRenderer.toVertexConsumer(graphics.pose(), bufferSource.getBuffer(RenderTypes.TERMINAL));
 
         FixedWidthFontRenderer.drawTerminal(
             emitter,

projects/common/src/client/java/dan200/computercraft/client/integration/ShaderMod.java

@@ -47,7 +47,7 @@ public class ShaderMod {
         Optional<ShaderMod> get();
     }
 
-    private static class Storage {
+    private static final class Storage {
         static final ShaderMod INSTANCE = ServiceLoader.load(Provider.class)
             .stream()
             .flatMap(x -> x.get().get().stream())

projects/common/src/client/java/dan200/computercraft/client/platform/AbstractClientNetworkContext.java

@@ -52,7 +52,7 @@ public abstract class AbstractClientNetworkContext implements ClientNetworkConte
         var player = Minecraft.getInstance().player;
         if (player == null) return;
 
-        var te = player.level.getBlockEntity(pos);
+        var te = player.level().getBlockEntity(pos);
         if (!(te instanceof MonitorBlockEntity monitor)) return;
 
         monitor.read(terminal);

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

@@ -4,14 +4,14 @@
 
 package dan200.computercraft.client.render;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import org.joml.Matrix4f;
 
 /**
- * A {@link GuiComponent}-equivalent which is suitable for both rendering in to a GUI and in-world (as part of an entity
+ * A {@link GuiGraphics}-equivalent which is suitable for both rendering in to a GUI and in-world (as part of an entity
  * renderer).
  * <p>
  * This batches all render calls together, though requires that all {@link TextureAtlasSprite}s are on the same sprite
@@ -34,8 +34,11 @@ public class SpriteRenderer {
         this.b = b;
     }
 
-    public static SpriteRenderer createForGui(PoseStack stack, VertexConsumer builder) {
-        return new SpriteRenderer(stack.last().pose(), builder, 0, RenderTypes.FULL_BRIGHT_LIGHTMAP, 255, 255, 255);
+    public static SpriteRenderer createForGui(GuiGraphics graphics, RenderType renderType) {
+        return new SpriteRenderer(
+            graphics.pose().last().pose(), graphics.bufferSource().getBuffer(renderType),
+            0, RenderTypes.FULL_BRIGHT_LIGHTMAP, 255, 255, 255
+        );
     }
 
     /**
@@ -52,7 +55,7 @@ public class SpriteRenderer {
     }
 
     /**
-     * Render a horizontal 3-sliced texture (i.e. split into left, middle and right). Unlike {@link GuiComponent#blitNineSliced},
+     * Render a horizontal 3-sliced texture (i.e. split into left, middle and right). Unlike {@link GuiGraphics#blitNineSliced},
      * the middle texture is stretched rather than repeated.
      *
      * @param sprite       The texture to draw.
@@ -77,7 +80,7 @@ public class SpriteRenderer {
     }
 
     /**
-     * Render a vertical 3-sliced texture (i.e. split into top, middle and bottom). Unlike {@link GuiComponent#blitNineSliced},
+     * Render a vertical 3-sliced texture (i.e. split into top, middle and bottom). Unlike {@link GuiGraphics#blitNineSliced},
      * the middle texture is stretched rather than repeated.
      *
      * @param sprite        The texture to draw.

projects/common/src/client/java/dan200/computercraft/client/render/monitor/MonitorBlockEntityRenderer.java

@@ -7,10 +7,7 @@ package dan200.computercraft.client.render.monitor;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.platform.MemoryTracker;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.Tesselator;
-import com.mojang.blaze3d.vertex.VertexBuffer;
-import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.mojang.blaze3d.vertex.*;
 import com.mojang.math.Axis;
 import dan200.computercraft.client.FrameInfo;
 import dan200.computercraft.client.integration.ShaderMod;
@@ -170,7 +167,7 @@ public class MonitorBlockEntityRenderer implements BlockEntityRenderer<MonitorBl
                 tboVertex(buffer, matrix, -xMargin, pixelHeight + yMargin);
                 tboVertex(buffer, matrix, pixelWidth + xMargin, -yMargin);
                 tboVertex(buffer, matrix, pixelWidth + xMargin, pixelHeight + yMargin);
-                RenderTypes.MONITOR_TBO.end(buffer, 0, 0, 0);
+                RenderTypes.MONITOR_TBO.end(buffer, VertexSorting.DISTANCE_TO_ORIGIN);
             }
             case VBO -> {
                 var backgroundBuffer = assertNonNull(renderState.backgroundBuffer);

projects/common/src/client/java/dan200/computercraft/client/render/vbo/DirectVertexBuffer.java

@@ -25,6 +25,7 @@ public class DirectVertexBuffer extends VertexBuffer {
     private int actualIndexCount;
 
     public DirectVertexBuffer() {
+        super(Usage.STATIC);
         if (DirectBuffers.HAS_DSA) {
             RenderSystem.glDeleteBuffers(vertexBufferId);
             if (DirectBuffers.ON_LINUX) BufferUploader.reset(); // See comment on DirectBuffers.deleteBuffer.

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

@@ -139,8 +139,6 @@ public final class LanguageProvider implements DataProvider {
         add("commands.computercraft.tp.synopsis", "Teleport to a specific computer.");
         add("commands.computercraft.tp.desc", "Teleport to the location of a computer. You can either specify the computer's instance id (e.g. 123) or computer id (e.g #123).");
         add("commands.computercraft.tp.action", "Teleport to this computer");
-        add("commands.computercraft.tp.not_player", "Cannot open terminal for non-player");
-        add("commands.computercraft.tp.not_there", "Cannot locate computer in the world");
         add("commands.computercraft.view.synopsis", "View the terminal of a computer.");
         add("commands.computercraft.view.desc", "Open the terminal of a computer, allowing remote control of a computer. This does not provide access to turtle's inventories. You can either specify the computer's instance id (e.g. 123) or computer id (e.g #123).");
         add("commands.computercraft.view.action", "View this computer");

projects/common/src/main/java/dan200/computercraft/data/LootTableProvider.java

@@ -23,7 +23,7 @@ import net.minecraft.world.level.storage.loot.entries.LootItem;
 import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer;
 import net.minecraft.world.level.storage.loot.functions.CopyNameFunction;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
-import net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition;
+import net.minecraft.world.level.storage.loot.predicates.AnyOfCondition;
 import net.minecraft.world.level.storage.loot.predicates.ExplosionCondition;
 import net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition;
 import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
@@ -79,7 +79,7 @@ class LootTableProvider {
     }
 
     private static void registerGeneric(BiConsumer<ResourceLocation, LootTable.Builder> add) {
-        add.accept(CommonHooks.LOOT_TREASURE_DISK, LootTable.lootTable());
+        add.accept(CommonHooks.TREASURE_DISK_LOOT, LootTable.lootTable());
     }
 
     private static void selfDrop(BiConsumer<ResourceLocation, LootTable.Builder> add, Supplier<? extends Block> wrapper) {
@@ -98,7 +98,7 @@ class LootTableProvider {
         blockDrop(
             add, block,
             DynamicLoot.dynamicEntry(new ResourceLocation(ComputerCraftAPI.MOD_ID, "computer")),
-            AlternativeLootItemCondition.alternative(
+            AnyOfCondition.anyOf(
                 BlockNamedEntityLootCondition.BUILDER,
                 HasComputerIdLootCondition.BUILDER,
                 PlayerCreativeLootCondition.BUILDER.invert()

projects/common/src/main/java/dan200/computercraft/data/RecipeProvider.java

@@ -5,6 +5,7 @@
 package dan200.computercraft.data;
 
 import com.google.gson.JsonObject;
+import com.mojang.authlib.GameProfile;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.pocket.PocketUpgradeDataProvider;
 import dan200.computercraft.api.turtle.TurtleUpgradeDataProvider;
@@ -25,15 +26,12 @@ import net.minecraft.core.registries.Registries;
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.recipes.*;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtUtils;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
 import net.minecraft.util.GsonHelper;
-import net.minecraft.world.item.DyeColor;
-import net.minecraft.world.item.DyeItem;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.Items;
+import net.minecraft.world.item.*;
 import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.item.crafting.ShapedRecipe;
 import net.minecraft.world.item.crafting.SimpleCraftingRecipeSerializer;
 import net.minecraft.world.level.ItemLike;
@@ -41,6 +39,7 @@ import net.minecraft.world.level.block.Blocks;
 
 import java.util.List;
 import java.util.Locale;
+import java.util.UUID;
 import java.util.function.Consumer;
 
 import static dan200.computercraft.api.ComputerCraftTags.Items.COMPUTER;
@@ -443,7 +442,7 @@ class RecipeProvider extends net.minecraft.data.recipes.RecipeProvider {
             .requires(ModRegistry.Items.MONITOR_NORMAL.get())
             .unlockedBy("has_monitor", inventoryChange(ModRegistry.Items.MONITOR_NORMAL.get()))
             .save(
-                RecipeWrapper.wrap(RecipeSerializer.SHAPELESS_RECIPE, add)
+                RecipeWrapper.wrap(ModRegistry.RecipeSerializers.SHAPELESS.get(), add)
                     .withResultTag(playerHead("Cloudhunter", "6d074736-b1e9-4378-a99b-bd8777821c9c")),
                 new ResourceLocation(ComputerCraftAPI.MOD_ID, "skull_cloudy")
             );
@@ -454,7 +453,7 @@ class RecipeProvider extends net.minecraft.data.recipes.RecipeProvider {
             .requires(ModRegistry.Items.COMPUTER_ADVANCED.get())
             .unlockedBy("has_computer", inventoryChange(ModRegistry.Items.COMPUTER_ADVANCED.get()))
             .save(
-                RecipeWrapper.wrap(RecipeSerializer.SHAPELESS_RECIPE, add)
+                RecipeWrapper.wrap(ModRegistry.RecipeSerializers.SHAPELESS.get(), add)
                     .withResultTag(playerHead("dan200", "f3c8d69b-0776-4512-8434-d1b2165909eb")),
                 new ResourceLocation(ComputerCraftAPI.MOD_ID, "skull_dan200")
             );
@@ -513,17 +512,15 @@ class RecipeProvider extends net.minecraft.data.recipes.RecipeProvider {
     }
 
     private static CompoundTag playerHead(String name, String uuid) {
-        var owner = new CompoundTag();
-        owner.putString("Name", name);
-        owner.putString("Id", uuid);
+        var owner = NbtUtils.writeGameProfile(new CompoundTag(), new GameProfile(UUID.fromString(uuid), name));
 
         var tag = new CompoundTag();
-        tag.put("SkullOwner", owner);
+        tag.put(PlayerHeadItem.TAG_SKULL_OWNER, owner);
         return tag;
     }
 
     private static Consumer<JsonObject> family(ComputerFamily family) {
-        return json -> json.addProperty("family", family.toString());
+        return json -> json.addProperty("family", family.getSerializedName());
     }
 
     private static void addSpecial(Consumer<FinishedRecipe> add, SimpleCraftingRecipeSerializer<?> special) {

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

@@ -35,6 +35,8 @@ class TagProvider {
         tags.tag(ComputerCraftTags.Blocks.WIRED_MODEM).add(ModRegistry.Blocks.CABLE.get(), ModRegistry.Blocks.WIRED_MODEM_FULL.get());
         tags.tag(ComputerCraftTags.Blocks.MONITOR).add(ModRegistry.Blocks.MONITOR_NORMAL.get(), ModRegistry.Blocks.MONITOR_ADVANCED.get());
 
+        tags.tag(ComputerCraftTags.Blocks.PERIPHERAL_HUB_IGNORE).addTag(ComputerCraftTags.Blocks.WIRED_MODEM);
+
         tags.tag(ComputerCraftTags.Blocks.TURTLE_ALWAYS_BREAKABLE).addTag(BlockTags.LEAVES).add(
             Blocks.BAMBOO, Blocks.BAMBOO_SAPLING // Bamboo isn't instabreak for some odd reason.
         );
@@ -88,6 +90,8 @@ class TagProvider {
             ModRegistry.Items.MONITOR_ADVANCED.get()
         );
 
+        tags.tag(ItemTags.BOOKSHELF_BOOKS).add(ModRegistry.Items.PRINTED_BOOK.get());
+
         tags.tag(ComputerCraftTags.Items.TURTLE_CAN_PLACE)
             .add(Items.GLASS_BOTTLE)
             .addTag(ItemTags.BOATS);

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

@@ -24,7 +24,7 @@ final class WiredNetworkImpl implements WiredNetwork {
         nodes.add(node);
     }
 
-    private WiredNetworkImpl(HashSet<WiredNodeImpl> nodes) {
+    private WiredNetworkImpl(Set<WiredNodeImpl> nodes) {
         this.nodes = nodes;
     }
 
@@ -375,7 +375,7 @@ final class WiredNetworkImpl implements WiredNetwork {
         }
     }
 
-    private static HashSet<WiredNodeImpl> reachableNodes(WiredNodeImpl start) {
+    private static Set<WiredNodeImpl> reachableNodes(WiredNodeImpl start) {
         Queue<WiredNodeImpl> enqueued = new ArrayDeque<>();
         var reachable = new HashSet<WiredNodeImpl>();
 

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

@@ -28,8 +28,6 @@ import net.minecraft.world.level.storage.loot.entries.LootTableReference;
 import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
 
 import javax.annotation.Nullable;
-import java.util.Arrays;
-import java.util.HashSet;
 import java.util.Set;
 import java.util.function.BiConsumer;
 
@@ -75,9 +73,9 @@ public final class CommonHooks {
         MonitorWatcher.onWatch(chunk, player);
     }
 
-    public static final ResourceLocation LOOT_TREASURE_DISK = new ResourceLocation(ComputerCraftAPI.MOD_ID, "treasure_disk");
+    public static final ResourceLocation TREASURE_DISK_LOOT = new ResourceLocation(ComputerCraftAPI.MOD_ID, "treasure_disk");
 
-    private static final Set<ResourceLocation> TABLES = new HashSet<>(Arrays.asList(
+    private static final Set<ResourceLocation> TREASURE_DISK_LOOT_TABLES = Set.of(
         BuiltInLootTables.SIMPLE_DUNGEON,
         BuiltInLootTables.ABANDONED_MINESHAFT,
         BuiltInLootTables.STRONGHOLD_CORRIDOR,
@@ -88,14 +86,15 @@ public final class CommonHooks {
         BuiltInLootTables.IGLOO_CHEST,
         BuiltInLootTables.WOODLAND_MANSION,
         BuiltInLootTables.VILLAGE_CARTOGRAPHER
-    ));
-
+    );
 
     public static @Nullable LootPool.Builder getExtraLootPool(ResourceLocation lootTable) {
-        if (!lootTable.getNamespace().equals("minecraft") || !TABLES.contains(lootTable)) return null;
+        if (!lootTable.getNamespace().equals("minecraft") || !TREASURE_DISK_LOOT_TABLES.contains(lootTable)) {
+            return null;
+        }
 
         return LootPool.lootPool()
-            .add(LootTableReference.lootTableReference(LOOT_TREASURE_DISK))
+            .add(LootTableReference.lootTableReference(TREASURE_DISK_LOOT))
             .setRolls(ConstantValue.exactly(1));
     }
 

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

@@ -24,12 +24,14 @@ import dan200.computercraft.shared.common.ClearColourRecipe;
 import dan200.computercraft.shared.common.ColourableRecipe;
 import dan200.computercraft.shared.common.DefaultBundledRedstoneProvider;
 import dan200.computercraft.shared.common.HeldItemMenu;
+import dan200.computercraft.shared.computer.blocks.CommandComputerBlock;
 import dan200.computercraft.shared.computer.blocks.CommandComputerBlockEntity;
 import dan200.computercraft.shared.computer.blocks.ComputerBlock;
 import dan200.computercraft.shared.computer.blocks.ComputerBlockEntity;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.inventory.ComputerMenuWithoutInventory;
 import dan200.computercraft.shared.computer.inventory.ViewComputerMenu;
+import dan200.computercraft.shared.computer.items.CommandComputerItem;
 import dan200.computercraft.shared.computer.items.ComputerItem;
 import dan200.computercraft.shared.computer.recipe.ComputerUpgradeRecipe;
 import dan200.computercraft.shared.data.BlockNamedEntityLootCondition;
@@ -68,6 +70,10 @@ import dan200.computercraft.shared.pocket.items.PocketComputerItem;
 import dan200.computercraft.shared.pocket.peripherals.PocketModem;
 import dan200.computercraft.shared.pocket.peripherals.PocketSpeaker;
 import dan200.computercraft.shared.pocket.recipes.PocketComputerUpgradeRecipe;
+import dan200.computercraft.shared.recipe.CustomShapedRecipe;
+import dan200.computercraft.shared.recipe.CustomShapelessRecipe;
+import dan200.computercraft.shared.recipe.ImpostorShapedRecipe;
+import dan200.computercraft.shared.recipe.ImpostorShapelessRecipe;
 import dan200.computercraft.shared.turtle.FurnaceRefuelHandler;
 import dan200.computercraft.shared.turtle.blocks.TurtleBlock;
 import dan200.computercraft.shared.turtle.blocks.TurtleBlockEntity;
@@ -77,8 +83,6 @@ import dan200.computercraft.shared.turtle.recipes.TurtleOverlayRecipe;
 import dan200.computercraft.shared.turtle.recipes.TurtleRecipe;
 import dan200.computercraft.shared.turtle.recipes.TurtleUpgradeRecipe;
 import dan200.computercraft.shared.turtle.upgrades.*;
-import dan200.computercraft.shared.util.ImpostorRecipe;
-import dan200.computercraft.shared.util.ImpostorShapelessRecipe;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.synchronization.ArgumentTypeInfo;
 import net.minecraft.commands.synchronization.SingletonArgumentInfo;
@@ -97,7 +101,7 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.Material;
+import net.minecraft.world.level.material.MapColor;
 import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType;
 
 import java.util.function.BiFunction;
@@ -117,7 +121,7 @@ public final class ModRegistry {
         static final RegistrationHelper<Block> REGISTRY = PlatformHelper.get().createRegistrationHelper(Registries.BLOCK);
 
         private static BlockBehaviour.Properties properties() {
-            return BlockBehaviour.Properties.of(Material.STONE).strength(2);
+            return BlockBehaviour.Properties.of().strength(2);
         }
 
         private static BlockBehaviour.Properties computerProperties() {
@@ -127,45 +131,45 @@ public final class ModRegistry {
         }
 
         private static BlockBehaviour.Properties turtleProperties() {
-            return BlockBehaviour.Properties.of(Material.STONE).strength(2.5f);
+            return BlockBehaviour.Properties.of().strength(2.5f);
         }
 
         private static BlockBehaviour.Properties modemProperties() {
-            return BlockBehaviour.Properties.of(Material.STONE).strength(1.5f);
+            return BlockBehaviour.Properties.of().strength(1.5f);
         }
 
         public static final RegistryEntry<ComputerBlock<ComputerBlockEntity>> COMPUTER_NORMAL = REGISTRY.register("computer_normal",
-            () -> new ComputerBlock<>(computerProperties(), ComputerFamily.NORMAL, BlockEntities.COMPUTER_NORMAL));
+            () -> new ComputerBlock<>(computerProperties().mapColor(MapColor.STONE), ComputerFamily.NORMAL, BlockEntities.COMPUTER_NORMAL));
         public static final RegistryEntry<ComputerBlock<ComputerBlockEntity>> COMPUTER_ADVANCED = REGISTRY.register("computer_advanced",
-            () -> new ComputerBlock<>(computerProperties(), ComputerFamily.ADVANCED, BlockEntities.COMPUTER_ADVANCED));
+            () -> new ComputerBlock<>(computerProperties().mapColor(MapColor.GOLD), ComputerFamily.ADVANCED, BlockEntities.COMPUTER_ADVANCED));
 
-        public static final RegistryEntry<ComputerBlock<CommandComputerBlockEntity>> COMPUTER_COMMAND = REGISTRY.register("computer_command", () -> new ComputerBlock<>(
+        public static final RegistryEntry<ComputerBlock<CommandComputerBlockEntity>> COMPUTER_COMMAND = REGISTRY.register("computer_command", () -> new CommandComputerBlock<>(
             computerProperties().strength(-1, 6000000.0F),
             ComputerFamily.COMMAND, BlockEntities.COMPUTER_COMMAND
         ));
 
         public static final RegistryEntry<TurtleBlock> TURTLE_NORMAL = REGISTRY.register("turtle_normal",
-            () -> new TurtleBlock(turtleProperties(), ComputerFamily.NORMAL, BlockEntities.TURTLE_NORMAL));
+            () -> new TurtleBlock(turtleProperties().mapColor(MapColor.STONE), ComputerFamily.NORMAL, BlockEntities.TURTLE_NORMAL));
         public static final RegistryEntry<TurtleBlock> TURTLE_ADVANCED = REGISTRY.register("turtle_advanced",
-            () -> new TurtleBlock(turtleProperties(), ComputerFamily.ADVANCED, BlockEntities.TURTLE_ADVANCED));
+            () -> new TurtleBlock(turtleProperties().mapColor(MapColor.GOLD), ComputerFamily.ADVANCED, BlockEntities.TURTLE_ADVANCED));
 
-        public static final RegistryEntry<SpeakerBlock> SPEAKER = REGISTRY.register("speaker", () -> new SpeakerBlock(properties()));
-        public static final RegistryEntry<DiskDriveBlock> DISK_DRIVE = REGISTRY.register("disk_drive", () -> new DiskDriveBlock(properties()));
-        public static final RegistryEntry<PrinterBlock> PRINTER = REGISTRY.register("printer", () -> new PrinterBlock(properties()));
+        public static final RegistryEntry<SpeakerBlock> SPEAKER = REGISTRY.register("speaker", () -> new SpeakerBlock(properties().mapColor(MapColor.STONE)));
+        public static final RegistryEntry<DiskDriveBlock> DISK_DRIVE = REGISTRY.register("disk_drive", () -> new DiskDriveBlock(properties().mapColor(MapColor.STONE)));
+        public static final RegistryEntry<PrinterBlock> PRINTER = REGISTRY.register("printer", () -> new PrinterBlock(properties().mapColor(MapColor.STONE)));
 
         public static final RegistryEntry<MonitorBlock> MONITOR_NORMAL = REGISTRY.register("monitor_normal",
-            () -> new MonitorBlock(properties(), BlockEntities.MONITOR_NORMAL));
+            () -> new MonitorBlock(properties().mapColor(MapColor.STONE), BlockEntities.MONITOR_NORMAL));
         public static final RegistryEntry<MonitorBlock> MONITOR_ADVANCED = REGISTRY.register("monitor_advanced",
-            () -> new MonitorBlock(properties(), BlockEntities.MONITOR_ADVANCED));
+            () -> new MonitorBlock(properties().mapColor(MapColor.GOLD), BlockEntities.MONITOR_ADVANCED));
 
         public static final RegistryEntry<WirelessModemBlock> WIRELESS_MODEM_NORMAL = REGISTRY.register("wireless_modem_normal",
-            () -> new WirelessModemBlock(properties(), BlockEntities.WIRELESS_MODEM_NORMAL));
+            () -> new WirelessModemBlock(properties().mapColor(MapColor.STONE), BlockEntities.WIRELESS_MODEM_NORMAL));
         public static final RegistryEntry<WirelessModemBlock> WIRELESS_MODEM_ADVANCED = REGISTRY.register("wireless_modem_advanced",
-            () -> new WirelessModemBlock(properties(), BlockEntities.WIRELESS_MODEM_ADVANCED));
+            () -> new WirelessModemBlock(properties().mapColor(MapColor.GOLD), BlockEntities.WIRELESS_MODEM_ADVANCED));
 
         public static final RegistryEntry<WiredModemFullBlock> WIRED_MODEM_FULL = REGISTRY.register("wired_modem_full",
-            () -> new WiredModemFullBlock(modemProperties()));
-        public static final RegistryEntry<CableBlock> CABLE = REGISTRY.register("cable", () -> new CableBlock(modemProperties()));
+            () -> new WiredModemFullBlock(modemProperties().mapColor(MapColor.STONE)));
+        public static final RegistryEntry<CableBlock> CABLE = REGISTRY.register("cable", () -> new CableBlock(modemProperties().mapColor(MapColor.STONE)));
     }
 
     public static class BlockEntities {
@@ -222,7 +226,7 @@ public final class ModRegistry {
 
         public static final RegistryEntry<ComputerItem> COMPUTER_NORMAL = ofBlock(Blocks.COMPUTER_NORMAL, ComputerItem::new);
         public static final RegistryEntry<ComputerItem> COMPUTER_ADVANCED = ofBlock(Blocks.COMPUTER_ADVANCED, ComputerItem::new);
-        public static final RegistryEntry<ComputerItem> COMPUTER_COMMAND = ofBlock(Blocks.COMPUTER_COMMAND, ComputerItem::new);
+        public static final RegistryEntry<ComputerItem> COMPUTER_COMMAND = ofBlock(Blocks.COMPUTER_COMMAND, CommandComputerItem::new);
 
         public static final RegistryEntry<PocketComputerItem> POCKET_COMPUTER_NORMAL = REGISTRY.register("pocket_computer_normal",
             () -> new PocketComputerItem(properties().stacksTo(1), ComputerFamily.NORMAL));
@@ -357,17 +361,21 @@ public final class ModRegistry {
             return REGISTRY.register(name, () -> new SimpleCraftingRecipeSerializer<>(factory));
         }
 
+        public static final RegistryEntry<RecipeSerializer<CustomShapedRecipe>> SHAPED = REGISTRY.register("shaped", () -> CustomShapedRecipe.serialiser(CustomShapedRecipe::new));
+        public static final RegistryEntry<RecipeSerializer<CustomShapelessRecipe>> SHAPELESS = REGISTRY.register("shapeless", () -> CustomShapelessRecipe.serialiser(CustomShapelessRecipe::new));
+
+        public static final RegistryEntry<RecipeSerializer<ImpostorShapedRecipe>> IMPOSTOR_SHAPED = REGISTRY.register("impostor_shaped", () -> CustomShapedRecipe.serialiser(ImpostorShapedRecipe::new));
+        public static final RegistryEntry<RecipeSerializer<ImpostorShapelessRecipe>> IMPOSTOR_SHAPELESS = REGISTRY.register("impostor_shapeless", () -> CustomShapelessRecipe.serialiser(ImpostorShapelessRecipe::new));
+
         public static final RegistryEntry<SimpleCraftingRecipeSerializer<ColourableRecipe>> DYEABLE_ITEM = simple("colour", ColourableRecipe::new);
         public static final RegistryEntry<SimpleCraftingRecipeSerializer<ClearColourRecipe>> DYEABLE_ITEM_CLEAR = simple("clear_colour", ClearColourRecipe::new);
-        public static final RegistryEntry<TurtleRecipe.Serializer> TURTLE = REGISTRY.register("turtle", TurtleRecipe.Serializer::new);
+        public static final RegistryEntry<RecipeSerializer<TurtleRecipe>> TURTLE = REGISTRY.register("turtle", () -> TurtleRecipe.validatingSerialiser(TurtleRecipe::of));
         public static final RegistryEntry<SimpleCraftingRecipeSerializer<TurtleUpgradeRecipe>> TURTLE_UPGRADE = simple("turtle_upgrade", TurtleUpgradeRecipe::new);
-        public static final RegistryEntry<TurtleOverlayRecipe.Serializer> TURTLE_OVERLAY = REGISTRY.register("turtle_overlay", TurtleOverlayRecipe.Serializer::new);
+        public static final RegistryEntry<RecipeSerializer<TurtleOverlayRecipe>> TURTLE_OVERLAY = REGISTRY.register("turtle_overlay", TurtleOverlayRecipe.Serializer::new);
         public static final RegistryEntry<SimpleCraftingRecipeSerializer<PocketComputerUpgradeRecipe>> POCKET_COMPUTER_UPGRADE = simple("pocket_computer_upgrade", PocketComputerUpgradeRecipe::new);
         public static final RegistryEntry<SimpleCraftingRecipeSerializer<PrintoutRecipe>> PRINTOUT = simple("printout", PrintoutRecipe::new);
         public static final RegistryEntry<SimpleCraftingRecipeSerializer<DiskRecipe>> DISK = simple("disk", DiskRecipe::new);
-        public static final RegistryEntry<ComputerUpgradeRecipe.Serializer> COMPUTER_UPGRADE = REGISTRY.register("computer_upgrade", ComputerUpgradeRecipe.Serializer::new);
-        public static final RegistryEntry<ImpostorRecipe.Serializer> IMPOSTOR_SHAPED = REGISTRY.register("impostor_shaped", ImpostorRecipe.Serializer::new);
-        public static final RegistryEntry<ImpostorShapelessRecipe.Serializer> IMPOSTOR_SHAPELESS = REGISTRY.register("impostor_shapeless", ImpostorShapelessRecipe.Serializer::new);
+        public static final RegistryEntry<RecipeSerializer<ComputerUpgradeRecipe>> COMPUTER_UPGRADE = REGISTRY.register("computer_upgrade", ComputerUpgradeRecipe.Serializer::new);
     }
 
     public static class Permissions {
@@ -382,51 +390,11 @@ public final class ModRegistry {
         public static final Predicate<CommandSourceStack> PERMISSION_VIEW = REGISTRY.registerCommand("view", UserLevel.OP);
     }
 
-    /**
-     * Register any objects which don't have to be done on the main thread.
-     */
-    public static void register() {
-        Blocks.REGISTRY.register();
-        BlockEntities.REGISTRY.register();
-        Items.REGISTRY.register();
-        TurtleSerialisers.REGISTRY.register();
-        PocketUpgradeSerialisers.REGISTRY.register();
-        Menus.REGISTRY.register();
-        ArgumentTypes.REGISTRY.register();
-        LootItemConditionTypes.REGISTRY.register();
-        RecipeSerializers.REGISTRY.register();
-        Permissions.REGISTRY.register();
+    static class CreativeTabs {
+        static final RegistrationHelper<CreativeModeTab> REGISTRY = PlatformHelper.get().createRegistrationHelper(Registries.CREATIVE_MODE_TAB);
 
-        // Register bundled power providers
-        ComputerCraftAPI.registerBundledRedstoneProvider(new DefaultBundledRedstoneProvider());
-        ComputerCraftAPI.registerRefuelHandler(new FurnaceRefuelHandler());
-        ComputerCraftAPI.registerMediaProvider(stack -> {
-            var item = stack.getItem();
-            if (item instanceof IMedia media) return media;
-            if (item instanceof RecordItem) return RecordMedia.INSTANCE;
-            return null;
-        });
-
-        VanillaDetailRegistries.ITEM_STACK.addProvider(ItemDetails::fill);
-        VanillaDetailRegistries.BLOCK_IN_WORLD.addProvider(BlockDetails::fill);
-    }
-
-    /**
-     * Register any objects which must be done on the main thread.
-     */
-    public static void registerMainThread() {
-        CauldronInteraction.WATER.put(ModRegistry.Items.TURTLE_NORMAL.get(), TurtleItem.CAULDRON_INTERACTION);
-        CauldronInteraction.WATER.put(ModRegistry.Items.TURTLE_ADVANCED.get(), TurtleItem.CAULDRON_INTERACTION);
-    }
-
-    /**
-     * Configure a {@link CreativeModeTab.Builder} to contain all of ComputerCraft's items.
-     *
-     * @param builder The builder to configure.
-     * @return The same building, for calling {@link CreativeModeTab.Builder#build()} on.
-     */
-    public static CreativeModeTab.Builder registerCreativeTab(CreativeModeTab.Builder builder) {
-        return builder
+        @SuppressWarnings("unused")
+        private static final RegistryEntry<CreativeModeTab> TAB = REGISTRY.register("tab", () -> PlatformHelper.get().newCreativeModeTab()
             .icon(() -> new ItemStack(Items.COMPUTER_NORMAL.get()))
             .title(Component.translatable("itemGroup.computercraft"))
             .displayItems((context, out) -> {
@@ -458,7 +426,46 @@ public final class ModRegistry {
                 for (var colour = 0; colour < 16; colour++) {
                     out.accept(DiskItem.createFromIDAndColour(-1, null, Colour.VALUES[colour].getHex()));
                 }
-            });
+            })
+            .build());
+    }
+
+    /**
+     * Register any objects which don't have to be done on the main thread.
+     */
+    public static void register() {
+        Blocks.REGISTRY.register();
+        BlockEntities.REGISTRY.register();
+        Items.REGISTRY.register();
+        TurtleSerialisers.REGISTRY.register();
+        PocketUpgradeSerialisers.REGISTRY.register();
+        Menus.REGISTRY.register();
+        ArgumentTypes.REGISTRY.register();
+        LootItemConditionTypes.REGISTRY.register();
+        RecipeSerializers.REGISTRY.register();
+        Permissions.REGISTRY.register();
+        CreativeTabs.REGISTRY.register();
+
+        // Register bundled power providers
+        ComputerCraftAPI.registerBundledRedstoneProvider(new DefaultBundledRedstoneProvider());
+        ComputerCraftAPI.registerRefuelHandler(new FurnaceRefuelHandler());
+        ComputerCraftAPI.registerMediaProvider(stack -> {
+            var item = stack.getItem();
+            if (item instanceof IMedia media) return media;
+            if (item instanceof RecordItem) return RecordMedia.INSTANCE;
+            return null;
+        });
+
+        VanillaDetailRegistries.ITEM_STACK.addProvider(ItemDetails::fill);
+        VanillaDetailRegistries.BLOCK_IN_WORLD.addProvider(BlockDetails::fill);
+    }
+
+    /**
+     * Register any objects which must be done on the main thread.
+     */
+    public static void registerMainThread() {
+        CauldronInteraction.WATER.put(ModRegistry.Items.TURTLE_NORMAL.get(), TurtleItem.CAULDRON_INTERACTION);
+        CauldronInteraction.WATER.put(ModRegistry.Items.TURTLE_ADVANCED.get(), TurtleItem.CAULDRON_INTERACTION);
     }
 
     private static void addTurtle(CreativeModeTab.Output out, TurtleItem turtle) {

projects/common/src/main/java/dan200/computercraft/shared/command/CommandComputerCraft.java

@@ -26,7 +26,6 @@ import dan200.computercraft.shared.network.container.ComputerContainerData;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.entity.RelativeMovement;
 import net.minecraft.world.entity.player.Inventory;
@@ -34,13 +33,15 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
 
 import javax.annotation.Nullable;
 import java.io.File;
 import java.util.*;
 
 import static dan200.computercraft.shared.command.CommandUtils.isPlayer;
-import static dan200.computercraft.shared.command.Exceptions.*;
+import static dan200.computercraft.shared.command.Exceptions.NOT_TRACKING_EXCEPTION;
+import static dan200.computercraft.shared.command.Exceptions.NO_TIMINGS_EXCEPTION;
 import static dan200.computercraft.shared.command.arguments.ComputerArgumentType.getComputerArgument;
 import static dan200.computercraft.shared.command.arguments.ComputerArgumentType.oneComputer;
 import static dan200.computercraft.shared.command.arguments.ComputersArgumentType.*;
@@ -62,114 +63,25 @@ public final class CommandComputerCraft {
         dispatcher.register(choice("computercraft")
             .then(literal("dump")
                 .requires(ModRegistry.Permissions.PERMISSION_DUMP)
-                .executes(context -> {
-                    var table = new TableBuilder("DumpAll", "Computer", "On", "Position");
-
-                    var source = context.getSource();
-                    List<ServerComputer> computers = new ArrayList<>(ServerContext.get(source.getServer()).registry().getComputers());
-
-                    Level world = source.getLevel();
-                    var pos = BlockPos.containing(source.getPosition());
-
-                    computers.sort((a, b) -> {
-                        if (a.getLevel() == b.getLevel() && a.getLevel() == world) {
-                            return Double.compare(a.getPosition().distSqr(pos), b.getPosition().distSqr(pos));
-                        } else if (a.getLevel() == world) {
-                            return -1;
-                        } else if (b.getLevel() == world) {
-                            return 1;
-                        } else {
-                            return Integer.compare(a.getInstanceID(), b.getInstanceID());
-                        }
-                    });
-
-                    for (var computer : computers) {
-                        table.row(
-                            linkComputer(source, computer, computer.getID()),
-                            bool(computer.isOn()),
-                            linkPosition(source, computer)
-                        );
-                    }
-
-                    table.display(context.getSource());
-                    return computers.size();
-                })
+                .executes(c -> dump(c.getSource()))
                 .then(args()
                     .arg("computer", oneComputer())
-                    .executes(context -> {
-                        var computer = getComputerArgument(context, "computer");
-
-                        var table = new TableBuilder("Dump");
-                        table.row(header("Instance"), text(Integer.toString(computer.getInstanceID())));
-                        table.row(header("Id"), text(Integer.toString(computer.getID())));
-                        table.row(header("Label"), text(computer.getLabel()));
-                        table.row(header("On"), bool(computer.isOn()));
-                        table.row(header("Position"), linkPosition(context.getSource(), computer));
-                        table.row(header("Family"), text(computer.getFamily().toString()));
-
-                        for (var side : ComputerSide.values()) {
-                            var peripheral = computer.getPeripheral(side);
-                            if (peripheral != null) {
-                                table.row(header("Peripheral " + side.getName()), text(peripheral.getType()));
-                            }
-                        }
-
-                        table.display(context.getSource());
-                        return 1;
-                    })))
+                    .executes(c -> dumpComputer(c.getSource(), getComputerArgument(c, "computer")))))
 
             .then(command("shutdown")
                 .requires(ModRegistry.Permissions.PERMISSION_SHUTDOWN)
                 .argManyValue("computers", manyComputers(), s -> ServerContext.get(s.getServer()).registry().getComputers())
-                .executes((context, computerSelectors) -> {
-                    var shutdown = 0;
-                    var computers = unwrap(context.getSource(), computerSelectors);
-                    for (var computer : computers) {
-                        if (computer.isOn()) shutdown++;
-                        computer.shutdown();
-                    }
-                    context.getSource().sendSuccess(Component.translatable("commands.computercraft.shutdown.done", shutdown, computers.size()), false);
-                    return shutdown;
-                }))
+                .executes((c, a) -> shutdown(c.getSource(), unwrap(c.getSource(), a))))
 
             .then(command("turn-on")
                 .requires(ModRegistry.Permissions.PERMISSION_TURN_ON)
                 .argManyValue("computers", manyComputers(), s -> ServerContext.get(s.getServer()).registry().getComputers())
-                .executes((context, computerSelectors) -> {
-                    var on = 0;
-                    var computers = unwrap(context.getSource(), computerSelectors);
-                    for (var computer : computers) {
-                        if (!computer.isOn()) on++;
-                        computer.turnOn();
-                    }
-                    context.getSource().sendSuccess(Component.translatable("commands.computercraft.turn_on.done", on, computers.size()), false);
-                    return on;
-                }))
+                .executes((c, a) -> turnOn(c.getSource(), unwrap(c.getSource(), a))))
 
             .then(command("tp")
                 .requires(ModRegistry.Permissions.PERMISSION_TP)
                 .arg("computer", oneComputer())
-                .executes(context -> {
-                    var computer = getComputerArgument(context, "computer");
-                    var world = computer.getLevel();
-                    var pos = computer.getPosition();
-
-                    var entity = context.getSource().getEntityOrException();
-                    if (!(entity instanceof ServerPlayer player)) throw TP_NOT_PLAYER.create();
-
-                    if (player.getCommandSenderWorld() == world) {
-                        player.connection.teleport(
-                            pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, 0, 0,
-                            EnumSet.noneOf(RelativeMovement.class)
-                        );
-                    } else {
-                        player.teleportTo(world,
-                            pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, 0, 0
-                        );
-                    }
-
-                    return 1;
-                }))
+                .executes(c -> teleport(c.getSource(), getComputerArgument(c, "computer"))))
 
             .then(command("queue")
                 .requires(ModRegistry.Permissions.PERMISSION_QUEUE)
@@ -178,79 +90,243 @@ public final class CommandComputerCraft {
                         .suggests((context, builder) -> Suggestions.empty())
                 )
                 .argManyValue("args", StringArgumentType.string(), Collections.emptyList())
-                .executes((ctx, args) -> {
-                    var computers = getComputersArgument(ctx, "computer");
-                    var rest = args.toArray();
-
-                    var queued = 0;
-                    for (var computer : computers) {
-                        if (computer.getFamily() == ComputerFamily.COMMAND && computer.isOn()) {
-                            computer.queueEvent("computer_command", rest);
-                            queued++;
-                        }
-                    }
-
-                    return queued;
-                }))
+                .executes((c, a) -> queue(getComputersArgument(c, "computer"), a)))
 
             .then(command("view")
                 .requires(ModRegistry.Permissions.PERMISSION_VIEW)
                 .arg("computer", oneComputer())
-                .executes(context -> {
-                    var player = context.getSource().getPlayerOrException();
-                    var computer = getComputerArgument(context, "computer");
-                    new ComputerContainerData(computer, ItemStack.EMPTY).open(player, new MenuProvider() {
-                        @Override
-                        public Component getDisplayName() {
-                            return Component.translatable("gui.computercraft.view_computer");
-                        }
-
-                        @Override
-                        public AbstractContainerMenu createMenu(int id, Inventory player, Player entity) {
-                            return new ViewComputerMenu(id, player, computer);
-                        }
-                    });
-                    return 1;
-                }))
+                .executes(c -> view(c.getSource(), getComputerArgument(c, "computer"))))
 
             .then(choice("track")
                 .requires(ModRegistry.Permissions.PERMISSION_TRACK)
-                .then(command("start")
-                    .executes(context -> {
-                        getMetricsInstance(context.getSource()).start();
-
-                        var stopCommand = "/computercraft track stop";
-                        context.getSource().sendSuccess(Component.translatable(
-                            "commands.computercraft.track.start.stop",
-                            link(text(stopCommand), stopCommand, Component.translatable("commands.computercraft.track.stop.action"))
-                        ), false);
-                        return 1;
-                    }))
-
-                .then(command("stop")
-                    .executes(context -> {
-                        var timings = getMetricsInstance(context.getSource());
-                        if (!timings.stop()) throw NOT_TRACKING_EXCEPTION.create();
-                        displayTimings(context.getSource(), timings.getSnapshot(), new AggregatedMetric(Metrics.COMPUTER_TASKS, Aggregate.AVG), DEFAULT_FIELDS);
-                        return 1;
-                    }))
-
+                .then(command("start").executes(c -> trackStart(c.getSource())))
+                .then(command("stop").executes(c -> trackStop(c.getSource())))
                 .then(command("dump")
                     .argManyValue("fields", metric(), DEFAULT_FIELDS)
-                    .executes((context, fields) -> {
-                        AggregatedMetric sort;
-                        if (fields.size() == 1 && DEFAULT_FIELDS.contains(fields.get(0))) {
-                            sort = fields.get(0);
-                            fields = DEFAULT_FIELDS;
-                        } else {
-                            sort = fields.get(0);
-                        }
-
-                        return displayTimings(context.getSource(), sort, fields);
-                    })))
+                    .executes((c, f) -> trackDump(c.getSource(), f))))
         );
     }
 
+    /**
+     * Display loaded computers to a table.
+     *
+     * @param source The thing that executed this command.
+     * @return The number of loaded computers.
+     */
+    private static int dump(CommandSourceStack source) {
+        var table = new TableBuilder("DumpAll", "Computer", "On", "Position");
+
+        List<ServerComputer> computers = new ArrayList<>(ServerContext.get(source.getServer()).registry().getComputers());
+
+        Level world = source.getLevel();
+        var pos = BlockPos.containing(source.getPosition());
+
+        // Sort by nearby computers.
+        computers.sort((a, b) -> {
+            if (a.getLevel() == b.getLevel() && a.getLevel() == world) {
+                return Double.compare(a.getPosition().distSqr(pos), b.getPosition().distSqr(pos));
+            } else if (a.getLevel() == world) {
+                return -1;
+            } else if (b.getLevel() == world) {
+                return 1;
+            } else {
+                return Integer.compare(a.getInstanceID(), b.getInstanceID());
+            }
+        });
+
+        for (var computer : computers) {
+            table.row(
+                linkComputer(source, computer, computer.getID()),
+                bool(computer.isOn()),
+                linkPosition(source, computer)
+            );
+        }
+
+        table.display(source);
+        return computers.size();
+    }
+
+    /**
+     * Display additional information about a single computer.
+     *
+     * @param source   The thing that executed this command.
+     * @param computer The computer we're dumping.
+     * @return The constant {@code 1}.
+     */
+    private static int dumpComputer(CommandSourceStack source, ServerComputer computer) {
+        var table = new TableBuilder("Dump");
+        table.row(header("Instance"), text(Integer.toString(computer.getInstanceID())));
+        table.row(header("Id"), text(Integer.toString(computer.getID())));
+        table.row(header("Label"), text(computer.getLabel()));
+        table.row(header("On"), bool(computer.isOn()));
+        table.row(header("Position"), linkPosition(source, computer));
+        table.row(header("Family"), text(computer.getFamily().toString()));
+
+        for (var side : ComputerSide.values()) {
+            var peripheral = computer.getPeripheral(side);
+            if (peripheral != null) {
+                table.row(header("Peripheral " + side.getName()), text(peripheral.getType()));
+            }
+        }
+
+        table.display(source);
+        return 1;
+    }
+
+    /**
+     * Shutdown a list of computers.
+     *
+     * @param source    The thing that executed this command.
+     * @param computers The computers to shutdown.
+     * @return The constant {@code 1}.
+     */
+    private static int shutdown(CommandSourceStack source, Collection<ServerComputer> computers) {
+        var shutdown = 0;
+        for (var computer : computers) {
+            if (computer.isOn()) shutdown++;
+            computer.shutdown();
+        }
+
+        var didShutdown = shutdown;
+        source.sendSuccess(() -> Component.translatable("commands.computercraft.shutdown.done", didShutdown, computers.size()), false);
+        return shutdown;
+    }
+
+    /**
+     * Turn on a list of computers.
+     *
+     * @param source    The thing that executed this command.
+     * @param computers The computers to turn on.
+     * @return The constant {@code 1}.
+     */
+    private static int turnOn(CommandSourceStack source, Collection<ServerComputer> computers) {
+        var on = 0;
+        for (var computer : computers) {
+            if (!computer.isOn()) on++;
+            computer.turnOn();
+        }
+
+        var didOn = on;
+        source.sendSuccess(() -> Component.translatable("commands.computercraft.turn_on.done", didOn, computers.size()), false);
+        return on;
+    }
+
+    /**
+     * Teleport to a computer.
+     *
+     * @param source   The thing that executed this command. This must be an entity, other types will throw an exception.
+     * @param computer The computer to teleport to.
+     * @return The constant {@code 1}.
+     */
+    private static int teleport(CommandSourceStack source, ServerComputer computer) throws CommandSyntaxException {
+        var world = computer.getLevel();
+        var pos = Vec3.atBottomCenterOf(computer.getPosition());
+        source.getEntityOrException().teleportTo(world, pos.x(), pos.y(), pos.z(), EnumSet.noneOf(RelativeMovement.class), 0, 0);
+
+        return 1;
+    }
+
+    /**
+     * Queue a {@code computer_command} event on a command computer.
+     *
+     * @param computers The list of computers to queue on.
+     * @param args      The arguments for this event.
+     * @return The number of computers this event was queued on.
+     */
+    private static int queue(Collection<ServerComputer> computers, List<String> args) {
+        var rest = args.toArray();
+
+        var queued = 0;
+        for (var computer : computers) {
+            if (computer.getFamily() == ComputerFamily.COMMAND && computer.isOn()) {
+                computer.queueEvent("computer_command", rest);
+                queued++;
+            }
+        }
+
+        return queued;
+    }
+
+    /**
+     * Open a terminal for a computer.
+     *
+     * @param source   The thing that executed this command.
+     * @param computer The computer to view.
+     * @return The constant {@code 1}.
+     */
+    private static int view(CommandSourceStack source, ServerComputer computer) throws CommandSyntaxException {
+        var player = source.getPlayerOrException();
+        new ComputerContainerData(computer, ItemStack.EMPTY).open(player, new MenuProvider() {
+            @Override
+            public Component getDisplayName() {
+                return Component.translatable("gui.computercraft.view_computer");
+            }
+
+            @Override
+            public AbstractContainerMenu createMenu(int id, Inventory player, Player entity) {
+                return new ViewComputerMenu(id, player, computer);
+            }
+        });
+        return 1;
+    }
+
+    /**
+     * Start tracking metrics for the current player.
+     *
+     * @param source The thing that executed this command.
+     * @return The constant {@code 1}.
+     */
+    private static int trackStart(CommandSourceStack source) {
+        getMetricsInstance(source).start();
+
+        var stopCommand = "/computercraft track stop";
+        source.sendSuccess(() -> Component.translatable(
+            "commands.computercraft.track.start.stop",
+            link(text(stopCommand), stopCommand, Component.translatable("commands.computercraft.track.stop.action"))
+        ), false);
+        return 1;
+    }
+
+    /**
+     * Stop tracking metrics for the current player, displaying a table with the results.
+     *
+     * @param source The thing that executed this command.
+     * @return The constant {@code 1}.
+     */
+    private static int trackStop(CommandSourceStack source) throws CommandSyntaxException {
+        var metrics = getMetricsInstance(source);
+        if (!metrics.stop()) throw NOT_TRACKING_EXCEPTION.create();
+        displayTimings(source, metrics.getSnapshot(), new AggregatedMetric(Metrics.COMPUTER_TASKS, Aggregate.AVG), DEFAULT_FIELDS);
+        return 1;
+    }
+
+    private static final List<AggregatedMetric> DEFAULT_FIELDS = Arrays.asList(
+        new AggregatedMetric(Metrics.COMPUTER_TASKS, Aggregate.COUNT),
+        new AggregatedMetric(Metrics.COMPUTER_TASKS, Aggregate.NONE),
+        new AggregatedMetric(Metrics.COMPUTER_TASKS, Aggregate.AVG)
+    );
+
+    /**
+     * Display the latest metrics for the current player.
+     *
+     * @param source The thing that executed this command.
+     * @param fields The fields to display in this table, defaulting to {@link #DEFAULT_FIELDS}.
+     * @return The constant {@code 1}.
+     */
+    private static int trackDump(CommandSourceStack source, List<AggregatedMetric> fields) throws CommandSyntaxException {
+        AggregatedMetric sort;
+        if (fields.size() == 1 && DEFAULT_FIELDS.contains(fields.get(0))) {
+            sort = fields.get(0);
+            fields = DEFAULT_FIELDS;
+        } else {
+            sort = fields.get(0);
+        }
+
+        return displayTimings(source, getMetricsInstance(source).getTimings(), sort, fields);
+    }
+
+    // Additional helper functions.
+
     private static Component linkComputer(CommandSourceStack source, @Nullable ServerComputer serverComputer, int computerId) {
         var out = Component.literal("");
 
@@ -323,16 +399,6 @@ public final class CommandComputerCraft {
         return ServerContext.get(source.getServer()).metrics().getMetricsInstance(entity instanceof Player ? entity.getUUID() : SYSTEM_UUID);
     }
 
-    private static final List<AggregatedMetric> DEFAULT_FIELDS = Arrays.asList(
-        new AggregatedMetric(Metrics.COMPUTER_TASKS, Aggregate.COUNT),
-        new AggregatedMetric(Metrics.COMPUTER_TASKS, Aggregate.NONE),
-        new AggregatedMetric(Metrics.COMPUTER_TASKS, Aggregate.AVG)
-    );
-
-    private static int displayTimings(CommandSourceStack source, AggregatedMetric sortField, List<AggregatedMetric> fields) throws CommandSyntaxException {
-        return displayTimings(source, getMetricsInstance(source).getTimings(), sortField, fields);
-    }
-
     private static int displayTimings(CommandSourceStack source, List<ComputerMetrics> timings, AggregatedMetric sortField, List<AggregatedMetric> fields) throws CommandSyntaxException {
         if (timings.isEmpty()) throw NO_TIMINGS_EXCEPTION.create();
 

projects/common/src/main/java/dan200/computercraft/shared/command/Exceptions.java

@@ -18,9 +18,6 @@ public final class Exceptions {
     static final SimpleCommandExceptionType NOT_TRACKING_EXCEPTION = translated("commands.computercraft.track.stop.not_enabled");
     static final SimpleCommandExceptionType NO_TIMINGS_EXCEPTION = translated("commands.computercraft.track.dump.no_timings");
 
-    static final SimpleCommandExceptionType TP_NOT_THERE = translated("commands.computercraft.tp.not_there");
-    static final SimpleCommandExceptionType TP_NOT_PLAYER = translated("commands.computercraft.tp.not_player");
-
     public static final SimpleCommandExceptionType ARGUMENT_EXPECTED = translated("argument.computercraft.argument_expected");
 
     private static SimpleCommandExceptionType translated(String key) {

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

@@ -147,14 +147,14 @@ public final class HelpingArgumentBuilder extends LiteralArgumentBuilder<Command
 
         @Override
         public int run(CommandContext<CommandSourceStack> context) {
-            context.getSource().sendSuccess(getHelp(context, assertNonNull(node), id, command), false);
+            context.getSource().sendSuccess(() -> getHelp(context, assertNonNull(node), id, command), false);
             return 0;
         }
     }
 
     private static Command<CommandSourceStack> helpForChild(CommandNode<CommandSourceStack> node, String id, String command) {
         return context -> {
-            context.getSource().sendSuccess(getHelp(context, node, id + "." + node.getName().replace('-', '_'), command + " " + node.getName()), false);
+            context.getSource().sendSuccess(() -> getHelp(context, node, id + "." + node.getName().replace('-', '_'), command + " " + node.getName()), false);
             return 0;
         };
     }

projects/common/src/main/java/dan200/computercraft/shared/command/text/ServerTableFormatter.java

@@ -37,6 +37,6 @@ public class ServerTableFormatter implements TableFormatter {
 
     @Override
     public void writeLine(String label, Component component) {
-        source.sendSuccess(component, false);
+        source.sendSuccess(() -> component, false);
     }
 }

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

@@ -18,11 +18,6 @@ public class DefaultBundledRedstoneProvider implements BundledRedstoneProvider {
 
     public static int getDefaultBundledRedstoneOutput(Level world, BlockPos pos, Direction side) {
         var block = world.getBlockState(pos).getBlock();
-        if (block instanceof IBundledRedstoneBlock generic) {
-            if (generic.getBundledRedstoneConnectivity(world, pos, side)) {
-                return generic.getBundledRedstoneOutput(world, pos, side);
-            }
-        }
-        return -1;
+        return block instanceof IBundledRedstoneBlock bundledBlock ? bundledBlock.getBundledRedstoneOutput(world, pos, side) : -1;
     }
 }

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

@@ -9,7 +9,5 @@ import net.minecraft.core.Direction;
 import net.minecraft.world.level.Level;
 
 public interface IBundledRedstoneBlock {
-    boolean getBundledRedstoneConnectivity(Level world, BlockPos pos, Direction side);
-
     int getBundledRedstoneOutput(Level world, BlockPos pos, Direction side);
 }

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

@@ -32,7 +32,7 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityTicker;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.storage.loot.LootContext;
+import net.minecraft.world.level.storage.loot.LootParams;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.Vec3;
@@ -92,11 +92,6 @@ public abstract class AbstractComputerBlock<T extends AbstractComputerBlockEntit
         return getDirectSignal(state, world, pos, incomingSide);
     }
 
-    @Override
-    public boolean getBundledRedstoneConnectivity(Level world, BlockPos pos, Direction side) {
-        return true;
-    }
-
     @Override
     public int getBundledRedstoneOutput(Level world, BlockPos pos, Direction side) {
         var entity = world.getBlockEntity(pos);
@@ -138,13 +133,12 @@ public abstract class AbstractComputerBlock<T extends AbstractComputerBlockEntit
 
         var tile = world.getBlockEntity(pos);
         if (tile instanceof AbstractComputerBlockEntity computer) {
-            var context = new LootContext.Builder(serverWorld)
-                .withRandom(world.random)
+            var context = new LootParams.Builder(serverWorld)
                 .withParameter(LootContextParams.ORIGIN, Vec3.atCenterOf(pos))
                 .withParameter(LootContextParams.TOOL, player.getMainHandItem())
                 .withParameter(LootContextParams.THIS_ENTITY, player)
                 .withParameter(LootContextParams.BLOCK_ENTITY, tile)
-                .withDynamicDrop(DROP, (ctx, out) -> out.accept(getItem(computer)));
+                .withDynamicDrop(DROP, out -> out.accept(getItem(computer)));
             for (var item : state.getDrops(context)) {
                 popResource(world, pos, item);
             }

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

@@ -0,0 +1,23 @@
+// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.shared.computer.blocks;
+
+import dan200.computercraft.shared.computer.core.ComputerFamily;
+import dan200.computercraft.shared.platform.RegistryEntry;
+import net.minecraft.world.level.block.GameMasterBlock;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+
+/**
+ * A subclass of {@link ComputerBlock} which implements {@link GameMasterBlock}, to prevent players breaking it without
+ * permission.
+ *
+ * @param <T> The type of the computer block entity.
+ * @see dan200.computercraft.shared.computer.items.CommandComputerItem
+ */
+public class CommandComputerBlock<T extends CommandComputerBlockEntity> extends ComputerBlock<T> implements GameMasterBlock {
+    public CommandComputerBlock(Properties settings, ComputerFamily family, RegistryEntry<BlockEntityType<T>> type) {
+        super(settings, family, type);
+    }
+}

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

@@ -104,11 +104,15 @@ public class CommandComputerBlockEntity extends ComputerBlockEntity {
         if (server == null || !server.isCommandBlockEnabled()) {
             player.displayClientMessage(Component.translatable("advMode.notEnabled"), true);
             return false;
-        } else if (Config.commandRequireCreative ? !player.canUseGameMasterBlocks() : !server.getPlayerList().isOp(player.getGameProfile())) {
+        } else if (!canUseCommandBlock(player)) {
             player.displayClientMessage(Component.translatable("advMode.notAllowed"), true);
             return false;
         }
 
         return true;
     }
+
+    private static boolean canUseCommandBlock(Player player) {
+        return Config.commandRequireCreative ? player.canUseGameMasterBlocks() : player.hasPermissions(2);
+    }
 }

projects/common/src/main/java/dan200/computercraft/shared/computer/core/ComputerFamily.java

@@ -4,8 +4,33 @@
 
 package dan200.computercraft.shared.computer.core;
 
-public enum ComputerFamily {
-    NORMAL,
-    ADVANCED,
-    COMMAND
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSyntaxException;
+import net.minecraft.util.GsonHelper;
+import net.minecraft.util.StringRepresentable;
+
+public enum ComputerFamily implements StringRepresentable {
+    NORMAL("normal"),
+    ADVANCED("advanced"),
+    COMMAND("command");
+
+    private final String name;
+
+    ComputerFamily(String name) {
+        this.name = name;
+    }
+
+    public static ComputerFamily getFamily(JsonObject json, String name) {
+        var familyName = GsonHelper.getAsString(json, name);
+        for (var family : values()) {
+            if (family.getSerializedName().equalsIgnoreCase(familyName)) return family;
+        }
+
+        throw new JsonSyntaxException("Unknown computer family '" + familyName + "' for field " + name);
+    }
+
+    @Override
+    public String getSerializedName() {
+        return name;
+    }
 }

projects/common/src/main/java/dan200/computercraft/shared/computer/core/ResourceMount.java

@@ -29,8 +29,6 @@ import java.util.Map;
 public final class ResourceMount extends ArchiveMount<ResourceMount.FileEntry> {
     private static final Logger LOG = LoggerFactory.getLogger(ResourceMount.class);
 
-    private static final byte[] TEMP_BUFFER = new byte[8192];
-
     /**
      * Maintain a cache of currently loaded resource mounts. This cache is invalidated when currentManager changes.
      */
@@ -60,7 +58,7 @@ public final class ResourceMount extends ArchiveMount<ResourceMount.FileEntry> {
         var hasAny = false;
         String existingNamespace = null;
 
-        var newRoot = new FileEntry("", new ResourceLocation(namespace, subPath));
+        var newRoot = new FileEntry(new ResourceLocation(namespace, subPath));
         for (var file : manager.listResources(subPath, s -> true).keySet()) {
             existingNamespace = file.getNamespace();
 
@@ -68,7 +66,11 @@ public final class ResourceMount extends ArchiveMount<ResourceMount.FileEntry> {
             if (!FileSystem.contains(subPath, file.getPath())) continue; // Some packs seem to include the parent?
 
             var localPath = FileSystem.toLocal(file.getPath(), subPath);
-            create(newRoot, localPath);
+            try {
+                getOrCreateChild(newRoot, localPath, this::createEntry);
+            } catch (ResourceLocationException e) {
+                LOG.warn("Cannot create resource location for {} ({})", localPath, e.getMessage());
+            }
             hasAny = true;
         }
 
@@ -83,65 +85,24 @@ public final class ResourceMount extends ArchiveMount<ResourceMount.FileEntry> {
         }
     }
 
-    private void create(FileEntry lastEntry, String path) {
-        var lastIndex = 0;
-        while (lastIndex < path.length()) {
-            var nextIndex = path.indexOf('/', lastIndex);
-            if (nextIndex < 0) nextIndex = path.length();
-
-            var part = path.substring(lastIndex, nextIndex);
-            if (lastEntry.children == null) lastEntry.children = new HashMap<>();
-
-            var nextEntry = lastEntry.children.get(part);
-            if (nextEntry == null) {
-                ResourceLocation childPath;
-                try {
-                    childPath = new ResourceLocation(namespace, subPath + "/" + path);
-                } catch (ResourceLocationException e) {
-                    LOG.warn("Cannot create resource location for {} ({})", part, e.getMessage());
-                    return;
-                }
-                lastEntry.children.put(part, nextEntry = new FileEntry(path, childPath));
-            }
-
-            lastEntry = nextEntry;
-            lastIndex = nextIndex + 1;
-        }
+    private FileEntry createEntry(String path) {
+        return new FileEntry(new ResourceLocation(namespace, subPath + "/" + path));
     }
 
     @Override
-    public long getSize(FileEntry file) {
+    protected byte[] getFileContents(String path, FileEntry file) throws IOException {
         var resource = manager.getResource(file.identifier).orElse(null);
-        if (resource == null) return 0;
-
-        try (var stream = resource.open()) {
-            int total = 0, read = 0;
-            do {
-                total += read;
-                read = stream.read(TEMP_BUFFER);
-            } while (read > 0);
-
-            return total;
-        } catch (IOException e) {
-            return 0;
-        }
-    }
-
-    @Override
-    public byte[] getContents(FileEntry file) throws IOException {
-        var resource = manager.getResource(file.identifier).orElse(null);
-        if (resource == null) throw new FileOperationException(file.path, NO_SUCH_FILE);
+        if (resource == null) throw new FileOperationException(path, NO_SUCH_FILE);
 
         try (var stream = resource.open()) {
             return stream.readAllBytes();
         }
     }
 
-    protected static class FileEntry extends ArchiveMount.FileEntry<FileEntry> {
+    protected static final class FileEntry extends ArchiveMount.FileEntry<FileEntry> {
         final ResourceLocation identifier;
 
-        FileEntry(String path, ResourceLocation identifier) {
-            super(path);
+        FileEntry(ResourceLocation identifier) {
             this.identifier = identifier;
         }
     }

projects/common/src/main/java/dan200/computercraft/shared/computer/items/AbstractComputerItem.java

@@ -64,13 +64,7 @@ public abstract class AbstractComputerItem extends BlockItem implements ICompute
 
     @Override
     public @Nullable Mount createDataMount(ItemStack stack, ServerLevel level) {
-        var family = getFamily();
-        if (family != ComputerFamily.COMMAND) {
-            var id = getComputerID(stack);
-            if (id >= 0) {
-                return ComputerCraftAPI.createSaveDirMount(level.getServer(), "computer/" + id, Config.computerSpaceLimit);
-            }
-        }
-        return null;
+        var id = getComputerID(stack);
+        return id >= 0 ? ComputerCraftAPI.createSaveDirMount(level.getServer(), "computer/" + id, Config.computerSpaceLimit) : null;
     }
 }

projects/common/src/main/java/dan200/computercraft/shared/computer/items/CommandComputerItem.java

@@ -0,0 +1,38 @@
+// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.shared.computer.items;
+
+import dan200.computercraft.api.filesystem.Mount;
+import dan200.computercraft.shared.computer.blocks.ComputerBlock;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.context.BlockPlaceContext;
+import net.minecraft.world.level.block.state.BlockState;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A {@link ComputerItem} which prevents players placing it without permission.
+ *
+ * @see net.minecraft.world.item.GameMasterBlockItem
+ * @see dan200.computercraft.shared.computer.blocks.CommandComputerBlock
+ */
+public class CommandComputerItem extends ComputerItem {
+    public CommandComputerItem(ComputerBlock<?> block, Properties settings) {
+        super(block, settings);
+    }
+
+    @Override
+    protected @Nullable BlockState getPlacementState(BlockPlaceContext context) {
+        // Prohibit players placing this block in survival or when not opped.
+        var player = context.getPlayer();
+        return player != null && !player.canUseGameMasterBlocks() ? null : super.getPlacementState(context);
+    }
+
+    @Override
+    public @Nullable Mount createDataMount(ItemStack stack, ServerLevel level) {
+        // Don't allow command computers to be mounted in disk drives.
+        return null;
+    }
+}

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

@@ -4,7 +4,12 @@
 
 package dan200.computercraft.shared.computer.menu;
 
-import dan200.computercraft.shared.computer.upload.*;
+import dan200.computercraft.core.apis.handles.ByteBufferChannel;
+import dan200.computercraft.core.apis.transfer.TransferredFile;
+import dan200.computercraft.core.apis.transfer.TransferredFiles;
+import dan200.computercraft.shared.computer.upload.FileSlice;
+import dan200.computercraft.shared.computer.upload.FileUpload;
+import dan200.computercraft.shared.computer.upload.UploadResult;
 import dan200.computercraft.shared.network.client.UploadResultMessage;
 import dan200.computercraft.shared.platform.PlatformHelper;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
@@ -18,7 +23,6 @@ import org.slf4j.LoggerFactory;
 import javax.annotation.Nullable;
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 /**
  * The default concrete implementation of {@link ServerInputHandler}.
@@ -150,8 +154,14 @@ public class ServerInputState<T extends AbstractContainerMenu & ComputerMenu> im
             }
         }
 
-        computer.queueEvent("file_transfer", new Object[]{
-            new TransferredFiles(player, owner, toUpload.stream().map(x -> new TransferredFile(x.getName(), x.getBytes())).collect(Collectors.toList())),
+        computer.queueEvent(TransferredFiles.EVENT, new Object[]{
+            new TransferredFiles(
+                toUpload.stream().map(x -> new TransferredFile(x.getName(), new ByteBufferChannel(x.getBytes()))).toList(),
+                () -> {
+                    if (player.isAlive() && player.containerMenu == owner) {
+                        PlatformHelper.get().sendToPlayer(UploadResultMessage.consumed(owner), player);
+                    }
+                }),
         });
         return UploadResultMessage.queued(owner);
     }

projects/common/src/main/java/dan200/computercraft/shared/computer/metrics/ComputerMBean.java

@@ -141,7 +141,7 @@ public final class ComputerMBean implements DynamicMBean, ComputerMetricsObserve
         }
     }
 
-    private static class Counter {
+    private static final class Counter {
         final AtomicLong value = new AtomicLong();
         final AtomicLong count = new AtomicLong();
     }

projects/common/src/main/java/dan200/computercraft/shared/computer/recipe/ComputerConvertRecipe.java

@@ -5,31 +5,20 @@
 package dan200.computercraft.shared.computer.recipe;
 
 import dan200.computercraft.shared.computer.items.IComputerItem;
-import net.minecraft.core.NonNullList;
+import dan200.computercraft.shared.recipe.CustomShapedRecipe;
+import dan200.computercraft.shared.recipe.ShapedRecipeSpec;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.inventory.CraftingContainer;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.CraftingBookCategory;
-import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraft.world.item.crafting.ShapedRecipe;
 import net.minecraft.world.level.Level;
 
 /**
- * Represents a recipe which converts a computer from one form into another.
+ * A recipe which converts a computer from one form into another.
  */
-public abstract class ComputerConvertRecipe extends ShapedRecipe {
-    private final String group;
-    private final ItemStack result;
-
-    public ComputerConvertRecipe(ResourceLocation identifier, String group, CraftingBookCategory category, int width, int height, NonNullList<Ingredient> ingredients, ItemStack result) {
-        super(identifier, group, category, width, height, ingredients, result);
-        this.group = group;
-        this.result = result;
-    }
-
-    public ItemStack getResultItem() {
-        return result;
+public abstract class ComputerConvertRecipe extends CustomShapedRecipe {
+    public ComputerConvertRecipe(ResourceLocation identifier, ShapedRecipeSpec recipe) {
+        super(identifier, recipe);
     }
 
     protected abstract ItemStack convert(IComputerItem item, ItemStack stack);
@@ -55,9 +44,4 @@ public abstract class ComputerConvertRecipe extends ShapedRecipe {
 
         return ItemStack.EMPTY;
     }
-
-    @Override
-    public String getGroup() {
-        return group;
-    }
 }

projects/common/src/main/java/dan200/computercraft/shared/computer/recipe/ComputerFamilyRecipe.java

@@ -1,72 +0,0 @@
-// SPDX-FileCopyrightText: 2018 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.shared.computer.recipe;
-
-import com.google.gson.JsonObject;
-import dan200.computercraft.shared.computer.core.ComputerFamily;
-import dan200.computercraft.shared.util.RecipeUtil;
-import net.minecraft.core.NonNullList;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.GsonHelper;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.CraftingBookCategory;
-import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraft.world.item.crafting.RecipeSerializer;
-
-public abstract class ComputerFamilyRecipe extends ComputerConvertRecipe {
-    private final ComputerFamily family;
-
-    public ComputerFamilyRecipe(ResourceLocation identifier, String group, CraftingBookCategory category, int width, int height, NonNullList<Ingredient> ingredients, ItemStack result, ComputerFamily family) {
-        super(identifier, group, category, width, height, ingredients, result);
-        this.family = family;
-    }
-
-    public ComputerFamily getFamily() {
-        return family;
-    }
-
-    public abstract static class Serializer<T extends ComputerFamilyRecipe> implements RecipeSerializer<T> {
-        protected abstract T create(ResourceLocation identifier, String group, CraftingBookCategory category, int width, int height, NonNullList<Ingredient> ingredients, ItemStack result, ComputerFamily family);
-
-        @Override
-        public T fromJson(ResourceLocation identifier, JsonObject json) {
-            var group = GsonHelper.getAsString(json, "group", "");
-            var category = CraftingBookCategory.CODEC.byName(GsonHelper.getAsString(json, "category", null), CraftingBookCategory.MISC);
-            var family = RecipeUtil.getFamily(json, "family");
-
-            var template = RecipeUtil.getTemplate(json);
-            var result = itemStackFromJson(GsonHelper.getAsJsonObject(json, "result"));
-
-            return create(identifier, group, category, template.width(), template.height(), template.ingredients(), result, family);
-        }
-
-        @Override
-        public T fromNetwork(ResourceLocation identifier, FriendlyByteBuf buf) {
-            var width = buf.readVarInt();
-            var height = buf.readVarInt();
-            var group = buf.readUtf();
-            var category = buf.readEnum(CraftingBookCategory.class);
-
-            var ingredients = NonNullList.withSize(width * height, Ingredient.EMPTY);
-            for (var i = 0; i < ingredients.size(); i++) ingredients.set(i, Ingredient.fromNetwork(buf));
-
-            var result = buf.readItem();
-            var family = buf.readEnum(ComputerFamily.class);
-            return create(identifier, group, category, width, height, ingredients, result, family);
-        }
-
-        @Override
-        public void toNetwork(FriendlyByteBuf buf, T recipe) {
-            buf.writeVarInt(recipe.getWidth());
-            buf.writeVarInt(recipe.getHeight());
-            buf.writeUtf(recipe.getGroup());
-            buf.writeEnum(recipe.category());
-            for (var ingredient : recipe.getIngredients()) ingredient.toNetwork(buf);
-            buf.writeItem(recipe.getResultItem());
-            buf.writeEnum(recipe.getFamily());
-        }
-    }
-}

projects/common/src/main/java/dan200/computercraft/shared/computer/recipe/ComputerUpgradeRecipe.java

@@ -4,35 +4,57 @@
 
 package dan200.computercraft.shared.computer.recipe;
 
+import com.google.gson.JsonObject;
 import dan200.computercraft.shared.ModRegistry;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.items.IComputerItem;
-import net.minecraft.core.NonNullList;
+import dan200.computercraft.shared.recipe.ShapedRecipeSpec;
+import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.CraftingBookCategory;
-import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 
-public final class ComputerUpgradeRecipe extends ComputerFamilyRecipe {
-    private ComputerUpgradeRecipe(ResourceLocation identifier, String group, CraftingBookCategory category, int width, int height, NonNullList<Ingredient> ingredients, ItemStack result, ComputerFamily family) {
-        super(identifier, group, category, width, height, ingredients, result, family);
+/**
+ * A recipe which "upgrades" a {@linkplain IComputerItem computer}, converting it from one {@linkplain ComputerFamily
+ * family} to another.
+ */
+public final class ComputerUpgradeRecipe extends ComputerConvertRecipe {
+    private final ComputerFamily family;
+
+    private ComputerUpgradeRecipe(ResourceLocation identifier, ShapedRecipeSpec recipe, ComputerFamily family) {
+        super(identifier, recipe);
+        this.family = family;
     }
 
     @Override
     protected ItemStack convert(IComputerItem item, ItemStack stack) {
-        return item.withFamily(stack, getFamily());
+        return item.withFamily(stack, family);
     }
 
     @Override
-    public RecipeSerializer<?> getSerializer() {
+    public RecipeSerializer<ComputerUpgradeRecipe> getSerializer() {
         return ModRegistry.RecipeSerializers.COMPUTER_UPGRADE.get();
     }
 
-    public static class Serializer extends ComputerFamilyRecipe.Serializer<ComputerUpgradeRecipe> {
+    public static class Serializer implements RecipeSerializer<ComputerUpgradeRecipe> {
         @Override
-        protected ComputerUpgradeRecipe create(ResourceLocation identifier, String group, CraftingBookCategory category, int width, int height, NonNullList<Ingredient> ingredients, ItemStack result, ComputerFamily family) {
-            return new ComputerUpgradeRecipe(identifier, group, category, width, height, ingredients, result, family);
+        public ComputerUpgradeRecipe fromJson(ResourceLocation identifier, JsonObject json) {
+            var recipe = ShapedRecipeSpec.fromJson(json);
+            var family = ComputerFamily.getFamily(json, "family");
+            return new ComputerUpgradeRecipe(identifier, recipe, family);
+        }
+
+        @Override
+        public ComputerUpgradeRecipe fromNetwork(ResourceLocation identifier, FriendlyByteBuf buf) {
+            var recipe = ShapedRecipeSpec.fromNetwork(buf);
+            var family = buf.readEnum(ComputerFamily.class);
+            return new ComputerUpgradeRecipe(identifier, recipe, family);
+        }
+
+        @Override
+        public void toNetwork(FriendlyByteBuf buf, ComputerUpgradeRecipe recipe) {
+            recipe.toSpec().toNetwork(buf);
+            buf.writeEnum(recipe.family);
         }
     }
 }

projects/common/src/main/java/dan200/computercraft/shared/details/ItemDetails.java

@@ -61,7 +61,7 @@ public class ItemDetails {
 
         /*
          * Used to hide some data from ItemStack tooltip.
-         * @see https://minecraft.gamepedia.com/Tutorials/Command_NBT_tags
+         * @see https://minecraft.wiki/w/Tutorials/Command_NBT_tags
          * @see ItemStack#getTooltip
          */
         var hideFlags = tag != null ? tag.getInt("HideFlags") : 0;
@@ -116,6 +116,7 @@ public class ItemDetails {
      * @param enchants    The enchantment map to add it to.
      * @see EnchantmentHelper
      */
+    @SuppressWarnings("NonApiType")
     private static void addEnchantments(ListTag rawEnchants, ArrayList<Map<String, Object>> enchants) {
         if (rawEnchants.isEmpty()) return;
 

projects/common/src/main/java/dan200/computercraft/shared/integration/PermissionRegistry.java

@@ -69,7 +69,7 @@ public abstract class PermissionRegistry {
             .orElseGet(DefaultPermissionRegistry::new);
     }
 
-    private static class DefaultPermissionRegistry extends PermissionRegistry {
+    private static final class DefaultPermissionRegistry extends PermissionRegistry {
         @Override
         public Predicate<CommandSourceStack> registerCommand(String command, UserLevel fallback) {
             checkNotFrozen();

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

@@ -35,7 +35,7 @@ import java.util.concurrent.atomic.AtomicReference;
 public final class DiskDriveBlockEntity extends AbstractContainerBlockEntity {
     private static final String NBT_ITEM = "Item";
 
-    private static class MountInfo {
+    private static final class MountInfo {
         @Nullable
         String mountPath;
     }

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

@@ -36,7 +36,7 @@ import java.util.Collections;
 public class CableBlockEntity extends BlockEntity {
     private static final String NBT_PERIPHERAL_ENABLED = "PeripheralAccess";
 
-    private class CableElement extends WiredModemElement {
+    private final class CableElement extends WiredModemElement {
         @Override
         public Level getLevel() {
             return CableBlockEntity.this.getLevel();

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

@@ -4,8 +4,8 @@
 
 package dan200.computercraft.shared.peripheral.modem.wired;
 
+import dan200.computercraft.api.ComputerCraftTags;
 import dan200.computercraft.api.peripheral.IPeripheral;
-import dan200.computercraft.shared.ModRegistry;
 import dan200.computercraft.shared.computer.core.ServerContext;
 import dan200.computercraft.shared.platform.ComponentAccess;
 import dan200.computercraft.shared.platform.PlatformHelper;
@@ -124,8 +124,7 @@ public final class WiredModemLocalPeripheral {
     private IPeripheral getPeripheralFrom(Level world, BlockPos pos, Direction direction) {
         var offset = pos.relative(direction);
 
-        var block = world.getBlockState(offset).getBlock();
-        if (block == ModRegistry.Blocks.WIRED_MODEM_FULL.get() || block == ModRegistry.Blocks.CABLE.get()) return null;
+        if (world.getBlockState(offset).is(ComputerCraftTags.Blocks.PERIPHERAL_HUB_IGNORE)) return null;
 
         var peripheral = peripherals.get((ServerLevel) world, pos, direction);
         return peripheral instanceof WiredModemPeripheral ? null : peripheral;

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

@@ -349,13 +349,15 @@ public class MonitorBlockEntity extends BlockEntity {
         // Either delete the current monitor or sync a new one.
         if (needsTerminal) {
             if (serverMonitor == null) serverMonitor = new ServerMonitor(advanced, this);
-        } else {
-            serverMonitor = null;
-        }
 
-        // Update the terminal's width and height and rebuild it. This ensures the monitor
-        // is consistent when syncing it to other monitors.
-        if (serverMonitor != null) serverMonitor.rebuild();
+            // Update the terminal's width and height and rebuild it. This ensures the monitor
+            // is consistent when syncing it to other monitors.
+            serverMonitor.rebuild();
+        } else {
+            // Remove the terminal from the serverMonitor, but keep it around - this ensures that we sync
+            // the (now blank) monitor to the client.
+            if (serverMonitor != null) serverMonitor.reset();
+        }
 
         // Update the other monitors, setting coordinates, dimensions and the server terminal
         var pos = getBlockPos();

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

@@ -55,6 +55,12 @@ public class ServerMonitor {
         }
     }
 
+    synchronized void reset() {
+        if (terminal == null) return;
+        terminal = null;
+        markChanged();
+    }
+
     private void markChanged() {
         if (!changed.getAndSet(true)) TickScheduler.schedule(origin.tickToken);
     }

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

@@ -188,7 +188,7 @@ public abstract class SpeakerPeripheral implements IPeripheral {
      * {@literal false}.
      * <p>
      * ### Valid instruments
-     * The speaker supports [all of Minecraft's noteblock instruments](https://minecraft.fandom.com/wiki/Note_Block#Instruments).
+     * The speaker supports [all of Minecraft's noteblock instruments](https://minecraft.wiki/w/Note_Block#Instruments).
      * These are:
      * <p>
      * {@code "harp"}, {@code "basedrum"}, {@code "snare"}, {@code "hat"}, {@code "bass"}, {@code "flute"},
@@ -228,7 +228,7 @@ public abstract class SpeakerPeripheral implements IPeripheral {
     /**
      * Plays a Minecraft sound through the speaker.
      * <p>
-     * This takes the [name of a Minecraft sound](https://minecraft.fandom.com/wiki/Sounds.json), such as
+     * This takes the [name of a Minecraft sound](https://minecraft.wiki/w/Sounds.json), such as
      * {@code "minecraft:block.note_block.harp"}, as well as an optional volume and pitch.
      * <p>
      * Only one sound can be played at once. This function will return {@literal false} if another sound was started

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

@@ -19,7 +19,7 @@ public record SpeakerPosition(@Nullable Level level, Vec3 position, @Nullable En
     }
 
     public static SpeakerPosition of(Entity entity) {
-        return new SpeakerPosition(entity.level, entity.getEyePosition(1), entity);
+        return new SpeakerPosition(entity.level(), entity.getEyePosition(1), entity);
     }
 
     public boolean withinDistance(SpeakerPosition other, double distanceSq) {

projects/common/src/main/java/dan200/computercraft/shared/platform/PlatformHelper.java

@@ -33,6 +33,7 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.CraftingContainer;
 import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -279,6 +280,13 @@ public interface PlatformHelper extends dan200.computercraft.impl.PlatformHelper
      */
     int getBurnTime(ItemStack stack);
 
+    /**
+     * Create a builder for a new creative tab.
+     *
+     * @return The creative tab builder.
+     */
+    CreativeModeTab.Builder newCreativeModeTab();
+
     /**
      * Get the "container" item to be returned after crafting. For instance, crafting with a lava bucket should return
      * an empty bucket.

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

@@ -153,7 +153,7 @@ public class PocketServerComputer extends ServerComputer implements IPocketAcces
         super.tickServer();
 
         // Find any players which have gone missing and remove them from the tracking list.
-        tracking.removeIf(player -> !player.isAlive() || player.level != getLevel());
+        tracking.removeIf(player -> !player.isAlive() || player.level() != getLevel());
 
         // And now find any new players, add them to the tracking list, and broadcast state where appropriate.
         var sendState = hasOutputChanged() || lightChanged;

projects/common/src/main/java/dan200/computercraft/shared/pocket/inventory/PocketComputerMenuProvider.java

@@ -48,7 +48,7 @@ public class PocketComputerMenuProvider implements MenuProvider {
             isTypingOnly ? ModRegistry.Menus.POCKET_COMPUTER_NO_TERM.get() : ModRegistry.Menus.POCKET_COMPUTER.get(), id, inventory,
             p -> {
                 var stack = p.getItemInHand(hand);
-                return stack.getItem() == item && PocketComputerItem.getServerComputer(assertNonNull(entity.level.getServer()), stack) == computer;
+                return stack.getItem() == item && PocketComputerItem.getServerComputer(assertNonNull(entity.level().getServer()), stack) == computer;
             },
             computer, item.getFamily()
         );

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

@@ -127,10 +127,11 @@ public class PocketComputerItem extends Item implements IComputerItem, IMedia, I
 
     @ForgeOverride
     public boolean onEntityItemUpdate(ItemStack stack, ItemEntity entity) {
-        if (entity.level.isClientSide || entity.level.getServer() == null) return false;
+        var level = entity.level();
+        if (level.isClientSide || level.getServer() == null) return false;
 
-        var computer = getServerComputer(entity.level.getServer(), stack);
-        if (computer != null && tick(stack, entity.level, entity, computer)) entity.setItem(stack.copy());
+        var computer = getServerComputer(level.getServer(), stack);
+        if (computer != null && tick(stack, entity.level(), entity, computer)) entity.setItem(stack.copy());
         return false;
     }
 

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

@@ -37,7 +37,7 @@ public class PocketSpeakerPeripheral extends UpgradeSpeakerPeripheral {
     public void update() {
         var entity = access.getEntity();
         if (entity != null) {
-            level = entity.level;
+            level = entity.level();
             position = entity.position();
         }
 

projects/common/src/main/java/dan200/computercraft/shared/recipe/CustomShapedRecipe.java

@@ -0,0 +1,86 @@
+// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.shared.recipe;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.mojang.serialization.DataResult;
+import dan200.computercraft.shared.ModRegistry;
+import net.minecraft.Util;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.RecipeSerializer;
+import net.minecraft.world.item.crafting.ShapedRecipe;
+
+/**
+ * A custom version of {@link ShapedRecipe}, which can be converted to and from a {@link ShapedRecipeSpec}.
+ * <p>
+ * This recipe may both be used as a normal recipe (behaving mostly the same as {@link ShapedRecipe}, with
+ * {@linkplain RecipeUtil#itemStackFromJson(JsonObject) support for putting nbt on the result}), or subclassed to
+ * customise the crafting behaviour.
+ */
+public class CustomShapedRecipe extends ShapedRecipe {
+    private final ItemStack result;
+
+    public CustomShapedRecipe(ResourceLocation id, ShapedRecipeSpec recipe) {
+        super(
+            id,
+            recipe.properties().group(), recipe.properties().category(),
+            recipe.template().width(), recipe.template().height(), recipe.template().ingredients(),
+            recipe.result()
+        );
+        this.result = recipe.result();
+    }
+
+    public final ShapedRecipeSpec toSpec() {
+        return new ShapedRecipeSpec(RecipeProperties.of(this), ShapedTemplate.of(this), result);
+    }
+
+    @Override
+    public RecipeSerializer<? extends CustomShapedRecipe> getSerializer() {
+        return ModRegistry.RecipeSerializers.SHAPED.get();
+    }
+
+    public interface Factory<R> {
+        R create(ResourceLocation id, ShapedRecipeSpec recipe);
+    }
+
+    public static <T extends CustomShapedRecipe> RecipeSerializer<T> serialiser(CustomShapedRecipe.Factory<T> factory) {
+        return new Serialiser<>((id, r) -> DataResult.success(factory.create(id, r)));
+    }
+
+    public static <T extends CustomShapedRecipe> RecipeSerializer<T> validatingSerialiser(CustomShapedRecipe.Factory<DataResult<T>> factory) {
+        return new Serialiser<>(factory);
+    }
+
+    private record Serialiser<T extends CustomShapedRecipe>(
+        Factory<DataResult<T>> factory
+    ) implements RecipeSerializer<T> {
+        private Serialiser(Factory<DataResult<T>> factory) {
+            this.factory = (id, r) -> factory.create(id, r).flatMap(x -> {
+                if (x.getSerializer() != this) {
+                    return DataResult.error(() -> "Expected serialiser to be " + this + ", but was " + x.getSerializer());
+                }
+                return DataResult.success(x);
+            });
+        }
+
+        @Override
+        public T fromJson(ResourceLocation id, JsonObject json) {
+            return Util.getOrThrow(factory.create(id, ShapedRecipeSpec.fromJson(json)), JsonParseException::new);
+        }
+
+        @Override
+        public T fromNetwork(ResourceLocation id, FriendlyByteBuf buffer) {
+            return Util.getOrThrow(factory.create(id, ShapedRecipeSpec.fromNetwork(buffer)), IllegalStateException::new);
+        }
+
+        @Override
+        public void toNetwork(FriendlyByteBuf buffer, T recipe) {
+            recipe.toSpec().toNetwork(buffer);
+        }
+    }
+}

projects/common/src/main/java/dan200/computercraft/shared/recipe/CustomShapelessRecipe.java

@@ -0,0 +1,81 @@
+// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.shared.recipe;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.mojang.serialization.DataResult;
+import dan200.computercraft.shared.ModRegistry;
+import net.minecraft.Util;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.RecipeSerializer;
+import net.minecraft.world.item.crafting.ShapelessRecipe;
+
+/**
+ * A custom version of {@link ShapelessRecipe}, which can be converted to and from a {@link ShapelessRecipeSpec}.
+ * <p>
+ * This recipe may both be used as a normal recipe (behaving mostly the same as {@link ShapelessRecipe}, with
+ * {@linkplain RecipeUtil#itemStackFromJson(JsonObject) support for putting nbt on the result}), or subclassed to
+ * customise the crafting behaviour.
+ */
+public class CustomShapelessRecipe extends ShapelessRecipe {
+    private final ItemStack result;
+
+    public CustomShapelessRecipe(ResourceLocation id, ShapelessRecipeSpec recipe) {
+        super(id, recipe.properties().group(), recipe.properties().category(), recipe.result(), recipe.ingredients());
+        this.result = recipe.result();
+    }
+
+    public final ShapelessRecipeSpec toSpec() {
+        return new ShapelessRecipeSpec(RecipeProperties.of(this), getIngredients(), result);
+    }
+
+    @Override
+    public RecipeSerializer<? extends CustomShapelessRecipe> getSerializer() {
+        return ModRegistry.RecipeSerializers.SHAPELESS.get();
+    }
+
+    public interface Factory<R> {
+        R create(ResourceLocation id, ShapelessRecipeSpec recipe);
+    }
+
+    public static <T extends CustomShapelessRecipe> RecipeSerializer<T> serialiser(Factory<T> factory) {
+        return new CustomShapelessRecipe.Serialiser<>((id, r) -> DataResult.success(factory.create(id, r)));
+    }
+
+    public static <T extends CustomShapelessRecipe> RecipeSerializer<T> validatingSerialiser(Factory<DataResult<T>> factory) {
+        return new CustomShapelessRecipe.Serialiser<>(factory);
+    }
+
+    private record Serialiser<T extends CustomShapelessRecipe>(
+        Factory<DataResult<T>> factory
+    ) implements RecipeSerializer<T> {
+        private Serialiser(Factory<DataResult<T>> factory) {
+            this.factory = (id, r) -> factory.create(id, r).flatMap(x -> {
+                if (x.getSerializer() != this) {
+                    return DataResult.error(() -> "Expected serialiser to be " + this + ", but was " + x.getSerializer());
+                }
+                return DataResult.success(x);
+            });
+        }
+
+        @Override
+        public T fromJson(ResourceLocation id, JsonObject json) {
+            return Util.getOrThrow(factory.create(id, ShapelessRecipeSpec.fromJson(json)), JsonParseException::new);
+        }
+
+        @Override
+        public T fromNetwork(ResourceLocation id, FriendlyByteBuf buffer) {
+            return Util.getOrThrow(factory.create(id, ShapelessRecipeSpec.fromNetwork(buffer)), IllegalStateException::new);
+        }
+
+        @Override
+        public void toNetwork(FriendlyByteBuf buffer, T recipe) {
+            recipe.toSpec().toNetwork(buffer);
+        }
+    }
+}

projects/common/src/main/java/dan200/computercraft/shared/recipe/ImpostorShapedRecipe.java

@@ -0,0 +1,41 @@
+// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+//
+// SPDX-License-Identifier: LicenseRef-CCPL
+
+package dan200.computercraft.shared.recipe;
+
+import dan200.computercraft.shared.ModRegistry;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.inventory.CraftingContainer;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.CustomRecipe;
+import net.minecraft.world.item.crafting.RecipeSerializer;
+import net.minecraft.world.item.crafting.ShapedRecipe;
+import net.minecraft.world.level.Level;
+
+/**
+ * A fake {@link ShapedRecipe}, which appears in the recipe book (and other recipe mods), but cannot be crafted.
+ * <p>
+ * This is used to represent examples for our {@link CustomRecipe}s.
+ */
+public final class ImpostorShapedRecipe extends CustomShapedRecipe {
+    public ImpostorShapedRecipe(ResourceLocation id, ShapedRecipeSpec recipe) {
+        super(id, recipe);
+    }
+
+    @Override
+    public boolean matches(CraftingContainer inv, Level world) {
+        return false;
+    }
+
+    @Override
+    public ItemStack assemble(CraftingContainer inventory, RegistryAccess registryAccess) {
+        return ItemStack.EMPTY;
+    }
+
+    @Override
+    public RecipeSerializer<ImpostorShapedRecipe> getSerializer() {
+        return ModRegistry.RecipeSerializers.IMPOSTOR_SHAPED.get();
+    }
+}

projects/common/src/main/java/dan200/computercraft/shared/recipe/ImpostorShapelessRecipe.java

@@ -0,0 +1,41 @@
+// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+//
+// SPDX-License-Identifier: LicenseRef-CCPL
+
+package dan200.computercraft.shared.recipe;
+
+import dan200.computercraft.shared.ModRegistry;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.inventory.CraftingContainer;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.CustomRecipe;
+import net.minecraft.world.item.crafting.RecipeSerializer;
+import net.minecraft.world.item.crafting.ShapelessRecipe;
+import net.minecraft.world.level.Level;
+
+/**
+ * A fake {@link ShapelessRecipe}, which appears in the recipe book (and other recipe mods), but cannot be crafted.
+ * <p>
+ * This is used to represent examples for our {@link CustomRecipe}s.
+ */
+public final class ImpostorShapelessRecipe extends CustomShapelessRecipe {
+    public ImpostorShapelessRecipe(ResourceLocation id, ShapelessRecipeSpec recipe) {
+        super(id, recipe);
+    }
+
+    @Override
+    public boolean matches(CraftingContainer inv, Level world) {
+        return false;
+    }
+
+    @Override
+    public ItemStack assemble(CraftingContainer inventory, RegistryAccess access) {
+        return ItemStack.EMPTY;
+    }
+
+    @Override
+    public RecipeSerializer<ImpostorShapelessRecipe> getSerializer() {
+        return ModRegistry.RecipeSerializers.IMPOSTOR_SHAPELESS.get();
+    }
+}

projects/common/src/main/java/dan200/computercraft/shared/recipe/MoreCodecs.java

@@ -0,0 +1,33 @@
+// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.shared.recipe;
+
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.datafixers.util.Either;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.DataResult;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.TagParser;
+
+/**
+ * Additional codecs for working with recipes.
+ */
+public class MoreCodecs {
+    /**
+     * A codec for {@link CompoundTag}s, which either accepts a NBT-string or a JSON object.
+     */
+    public static final Codec<CompoundTag> TAG = Codec.either(Codec.STRING, CompoundTag.CODEC).flatXmap(
+        either -> either.map(MoreCodecs::parseTag, DataResult::success),
+        nbtCompound -> DataResult.success(Either.left(nbtCompound.getAsString()))
+    );
+
+    private static DataResult<CompoundTag> parseTag(String contents) {
+        try {
+            return DataResult.success(TagParser.parseTag(contents));
+        } catch (CommandSyntaxException e) {
+            return DataResult.error(e::getMessage);
+        }
+    }
+}

projects/common/src/main/java/dan200/computercraft/shared/recipe/RecipeProperties.java

@@ -0,0 +1,40 @@
+// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.shared.recipe;
+
+import com.google.gson.JsonObject;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.util.GsonHelper;
+import net.minecraft.world.item.crafting.CraftingBookCategory;
+import net.minecraft.world.item.crafting.CraftingRecipe;
+
+/**
+ * Common properties that appear in all {@link CraftingRecipe}s.
+ *
+ * @param group    The (optional) group of the recipe, see {@link CraftingRecipe#getGroup()}.
+ * @param category The category the recipe appears in, see {@link CraftingRecipe#category()}.
+ */
+public record RecipeProperties(String group, CraftingBookCategory category) {
+    public static RecipeProperties of(CraftingRecipe recipe) {
+        return new RecipeProperties(recipe.getGroup(), recipe.category());
+    }
+
+    public static RecipeProperties fromJson(JsonObject json) {
+        var group = GsonHelper.getAsString(json, "group", "");
+        var category = CraftingBookCategory.CODEC.byName(GsonHelper.getAsString(json, "category", null), CraftingBookCategory.MISC);
+        return new RecipeProperties(group, category);
+    }
+
+    public static RecipeProperties fromNetwork(FriendlyByteBuf buffer) {
+        var group = buffer.readUtf();
+        var category = buffer.readEnum(CraftingBookCategory.class);
+        return new RecipeProperties(group, category);
+    }
+
+    public void toNetwork(FriendlyByteBuf buffer) {
+        buffer.writeUtf(group());
+        buffer.writeEnum(category());
+    }
+}

projects/common/src/main/java/dan200/computercraft/shared/recipe/RecipeUtil.java

@@ -0,0 +1,73 @@
+// SPDX-FileCopyrightText: 2017 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.shared.recipe;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonSyntaxException;
+import com.mojang.serialization.JsonOps;
+import net.minecraft.Util;
+import net.minecraft.core.NonNullList;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.util.GsonHelper;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.Ingredient;
+import net.minecraft.world.item.crafting.ShapedRecipe;
+
+public final class RecipeUtil {
+    private RecipeUtil() {
+    }
+
+    public static NonNullList<Ingredient> readIngredients(FriendlyByteBuf buffer) {
+        var count = buffer.readVarInt();
+        var ingredients = NonNullList.withSize(count, Ingredient.EMPTY);
+        for (var i = 0; i < ingredients.size(); i++) ingredients.set(i, Ingredient.fromNetwork(buffer));
+        return ingredients;
+    }
+
+    public static void writeIngredients(FriendlyByteBuf buffer, NonNullList<Ingredient> ingredients) {
+        buffer.writeCollection(ingredients, (a, b) -> b.toNetwork(a));
+    }
+
+    public static NonNullList<Ingredient> readShapelessIngredients(JsonObject json) {
+        NonNullList<Ingredient> ingredients = NonNullList.create();
+
+        var ingredientsList = GsonHelper.getAsJsonArray(json, "ingredients");
+        for (var i = 0; i < ingredientsList.size(); ++i) {
+            var ingredient = Ingredient.fromJson(ingredientsList.get(i));
+            if (!ingredient.isEmpty()) ingredients.add(ingredient);
+        }
+
+        if (ingredients.isEmpty()) throw new JsonParseException("No ingredients for shapeless recipe");
+        if (ingredients.size() > 9) {
+            throw new JsonParseException("Too many ingredients for shapeless recipe the max is 9");
+        }
+
+        return ingredients;
+    }
+
+    /**
+     * Extends {@link ShapedRecipe#itemStackFromJson(JsonObject)} with support for the {@code nbt} field.
+     *
+     * @param json The json to extract the item from.
+     * @return The parsed item stack.
+     */
+    public static ItemStack itemStackFromJson(JsonObject json) {
+        var item = ShapedRecipe.itemFromJson(json);
+        if (json.has("data")) throw new JsonParseException("Disallowed data tag found");
+
+        var count = GsonHelper.getAsInt(json, "count", 1);
+        if (count < 1) throw new JsonSyntaxException("Invalid output count: " + count);
+
+        var stack = new ItemStack(item, count);
+
+        var nbt = json.get("nbt");
+        if (nbt != null) {
+            stack.setTag(Util.getOrThrow(MoreCodecs.TAG.parse(JsonOps.INSTANCE, nbt), JsonParseException::new));
+        }
+        return stack;
+    }
+
+}

projects/common/src/main/java/dan200/computercraft/shared/recipe/ShapedRecipeSpec.java

@@ -0,0 +1,43 @@
+// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.shared.recipe;
+
+import com.google.gson.JsonObject;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.util.GsonHelper;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.ShapedRecipe;
+
+/**
+ * A description of a {@link ShapedRecipe}.
+ * <p>
+ * This is meant to be used in conjunction with {@link CustomShapedRecipe} for more reusable serialisation and
+ * deserialisation of {@link ShapedRecipe}-like recipes.
+ *
+ * @param properties The common properties of this recipe.
+ * @param template   The shaped template of the recipe.
+ * @param result     The result of the recipe.
+ */
+public record ShapedRecipeSpec(RecipeProperties properties, ShapedTemplate template, ItemStack result) {
+    public static ShapedRecipeSpec fromJson(JsonObject json) {
+        var properties = RecipeProperties.fromJson(json);
+        var template = ShapedTemplate.fromJson(json);
+        var result = RecipeUtil.itemStackFromJson(GsonHelper.getAsJsonObject(json, "result"));
+        return new ShapedRecipeSpec(properties, template, result);
+    }
+
+    public static ShapedRecipeSpec fromNetwork(FriendlyByteBuf buffer) {
+        var properties = RecipeProperties.fromNetwork(buffer);
+        var template = ShapedTemplate.fromNetwork(buffer);
+        var result = buffer.readItem();
+        return new ShapedRecipeSpec(properties, template, result);
+    }
+
+    public void toNetwork(FriendlyByteBuf buffer) {
+        properties().toNetwork(buffer);
+        template().toNetwork(buffer);
+        buffer.writeItem(result());
+    }
+}

projects/common/src/main/java/dan200/computercraft/shared/recipe/ShapedTemplate.java

@@ -0,0 +1,99 @@
+// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.shared.recipe;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSyntaxException;
+import net.minecraft.core.NonNullList;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.util.GsonHelper;
+import net.minecraft.world.item.crafting.Ingredient;
+import net.minecraft.world.item.crafting.ShapedRecipe;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * The template for {@linkplain ShapedRecipe shaped recipes}. This largely exists for parsing shaped recipes from JSON.
+ *
+ * @param width       The width of the recipe, see {@link ShapedRecipe#getWidth()}.
+ * @param height      The height of the recipe, see {@link ShapedRecipe#getHeight()}.
+ * @param ingredients The ingredients in the recipe, see {@link ShapedRecipe#getIngredients()}
+ */
+public record ShapedTemplate(int width, int height, NonNullList<Ingredient> ingredients) {
+    public static ShapedTemplate of(ShapedRecipe recipe) {
+        return new ShapedTemplate(recipe.getWidth(), recipe.getHeight(), recipe.getIngredients());
+    }
+
+    public static ShapedTemplate fromJson(JsonObject json) {
+        Map<Character, Ingredient> key = new HashMap<>();
+        for (var entry : GsonHelper.getAsJsonObject(json, "key").entrySet()) {
+            if (entry.getKey().length() != 1) {
+                throw new JsonSyntaxException("Invalid key entry: '" + entry.getKey() + "' is an invalid symbol (must be 1 character only).");
+            }
+            if (" ".equals(entry.getKey())) {
+                throw new JsonSyntaxException("Invalid key entry: ' ' is a reserved symbol.");
+            }
+
+            key.put(entry.getKey().charAt(0), Ingredient.fromJson(entry.getValue()));
+        }
+
+        var patternList = GsonHelper.getAsJsonArray(json, "pattern");
+        if (patternList.size() == 0) {
+            throw new JsonSyntaxException("Invalid pattern: empty pattern not allowed");
+        }
+
+        var pattern = new String[patternList.size()];
+        for (var x = 0; x < pattern.length; x++) {
+            var line = GsonHelper.convertToString(patternList.get(x), "pattern[" + x + "]");
+            if (x > 0 && pattern[0].length() != line.length()) {
+                throw new JsonSyntaxException("Invalid pattern: each row must  be the same width");
+            }
+            pattern[x] = line;
+        }
+
+        var width = pattern[0].length();
+        var height = pattern.length;
+        var ingredients = NonNullList.withSize(width * height, Ingredient.EMPTY);
+
+        Set<Character> missingKeys = new HashSet<>(key.keySet());
+
+        var ingredientIdx = 0;
+        for (var line : pattern) {
+            for (var x = 0; x < line.length(); x++) {
+                var chr = line.charAt(x);
+                var ing = chr == ' ' ? Ingredient.EMPTY : key.get(chr);
+                if (ing == null) {
+                    throw new JsonSyntaxException("Pattern references symbol '" + chr + "' but it's not defined in the key");
+                }
+                ingredients.set(ingredientIdx++, ing);
+                missingKeys.remove(chr);
+            }
+        }
+
+        if (!missingKeys.isEmpty()) {
+            throw new JsonSyntaxException("Key defines symbols that aren't used in pattern: " + missingKeys);
+        }
+
+        return new ShapedTemplate(width, height, ingredients);
+    }
+
+    public static ShapedTemplate fromNetwork(FriendlyByteBuf buffer) {
+        var width = buffer.readVarInt();
+        var height = buffer.readVarInt();
+        var ingredients = NonNullList.withSize(width * height, Ingredient.EMPTY);
+        for (var i = 0; i < ingredients.size(); ++i) ingredients.set(i, Ingredient.fromNetwork(buffer));
+        return new ShapedTemplate(width, height, ingredients);
+    }
+
+    public void toNetwork(FriendlyByteBuf buffer) {
+        buffer.writeVarInt(width());
+        buffer.writeVarInt(height());
+        for (var ingredient : ingredients) ingredient.toNetwork(buffer);
+    }
+
+}

projects/common/src/main/java/dan200/computercraft/shared/recipe/ShapelessRecipeSpec.java

@@ -0,0 +1,46 @@
+// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.shared.recipe;
+
+import com.google.gson.JsonObject;
+import net.minecraft.core.NonNullList;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.util.GsonHelper;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.Ingredient;
+import net.minecraft.world.item.crafting.ShapelessRecipe;
+
+/**
+ * A description of a {@link ShapelessRecipe}.
+ * <p>
+ * This is meant to be used in conjunction with {@link CustomShapelessRecipe} for more reusable serialisation and
+ * deserialisation of {@link ShapelessRecipe}-like recipes.
+ *
+ * @param properties  The common properties of this recipe.
+ * @param ingredients The ingredients of the recipe.
+ * @param result      The result of the recipe.
+ */
+public record ShapelessRecipeSpec(RecipeProperties properties, NonNullList<Ingredient> ingredients, ItemStack result) {
+    public static ShapelessRecipeSpec fromJson(JsonObject json) {
+        var properties = RecipeProperties.fromJson(json);
+        var ingredients = RecipeUtil.readShapelessIngredients(json);
+        var result = RecipeUtil.itemStackFromJson(GsonHelper.getAsJsonObject(json, "result"));
+        return new ShapelessRecipeSpec(properties, ingredients, result);
+    }
+
+    public static ShapelessRecipeSpec fromNetwork(FriendlyByteBuf buffer) {
+        var properties = RecipeProperties.fromNetwork(buffer);
+        var ingredients = RecipeUtil.readIngredients(buffer);
+        var result = buffer.readItem();
+
+        return new ShapelessRecipeSpec(properties, ingredients, result);
+    }
+
+    public void toNetwork(FriendlyByteBuf buffer) {
+        properties().toNetwork(buffer);
+        RecipeUtil.writeIngredients(buffer, ingredients());
+        buffer.writeItem(result());
+    }
+}

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

@@ -317,7 +317,6 @@ public class TurtleBrain implements TurtleAccessInternal {
         return false;
     }
 
-    @Override
     public Vec3 getVisualPosition(float f) {
         var offset = getRenderOffset(f);
         var pos = owner.getBlockPos();
@@ -328,7 +327,6 @@ public class TurtleBrain implements TurtleAccessInternal {
         );
     }
 
-    @Override
     public float getVisualYaw(float f) {
         var yaw = getDirection().toYRot();
         switch (animation) {

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

@@ -44,7 +44,7 @@ public class TurtleMoveCommand implements TurtleCommand {
         var state = oldWorld.getBlockState(newPosition);
         if (!oldWorld.isEmptyBlock(newPosition) &&
             !WorldUtil.isLiquidBlock(oldWorld, newPosition) &&
-            !state.getMaterial().isReplaceable()) {
+            !state.canBeReplaced()) {
             return TurtleCommandResult.failure("Movement obstructed");
         }
 

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

@@ -29,6 +29,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.SignBlockEntity;
+import net.minecraft.world.level.block.entity.SignText;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.EntityHitResult;
@@ -208,7 +209,7 @@ public class TurtlePlaceCommand implements TurtleCommand {
         );
         if (result != InteractionResult.PASS) return result;
 
-        var level = turtlePlayer.player().level;
+        var level = turtlePlayer.player().level();
 
         // We special case some items which we allow to place "normally". Yes, this is very ugly.
         var item = stack.getItem();
@@ -223,22 +224,22 @@ public class TurtlePlaceCommand implements TurtleCommand {
         var signTile = (SignBlockEntity) tile;
         var split = Splitter.on('\n').splitToList(message);
         var firstLine = split.size() <= 2 ? 1 : 0;
+
+        var signText = new SignText();
         for (var i = 0; i < 4; i++) {
             if (i >= firstLine && i < firstLine + split.size()) {
                 var line = split.get(i - firstLine);
-                signTile.setMessage(i, line.length() > 15
+                signText.setMessage(i, line.length() > 15
                     ? Component.literal(line.substring(0, 15))
                     : Component.literal(line)
                 );
-            } else {
-                signTile.setMessage(i, Component.literal(""));
             }
         }
-        signTile.setChanged();
+        signTile.setText(signText, true);
         world.sendBlockUpdated(tile.getBlockPos(), tile.getBlockState(), tile.getBlockState(), Block.UPDATE_ALL);
     }
 
-    private static class ErrorMessage {
+    private static final class ErrorMessage {
         @Nullable
         String message;
     }

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

@@ -4,32 +4,30 @@
 
 package dan200.computercraft.shared.turtle.recipes;
 
-import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.shared.ModRegistry;
+import dan200.computercraft.shared.recipe.CustomShapelessRecipe;
+import dan200.computercraft.shared.recipe.ShapelessRecipeSpec;
 import dan200.computercraft.shared.turtle.items.TurtleItem;
-import net.minecraft.core.NonNullList;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.GsonHelper;
 import net.minecraft.world.inventory.CraftingContainer;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.*;
+import net.minecraft.world.item.crafting.RecipeSerializer;
+import net.minecraft.world.item.crafting.ShapelessRecipe;
 
 /**
  * A {@link ShapelessRecipe} which sets the {@linkplain TurtleItem#getOverlay(ItemStack)} turtle's overlay} instead.
  */
-public class TurtleOverlayRecipe extends ShapelessRecipe {
+public class TurtleOverlayRecipe extends CustomShapelessRecipe {
     private final ResourceLocation overlay;
-    private final ItemStack result;
 
-    public TurtleOverlayRecipe(ResourceLocation id, String group, CraftingBookCategory category, ItemStack result, NonNullList<Ingredient> ingredients, ResourceLocation overlay) {
-        super(id, group, category, result, ingredients);
+    public TurtleOverlayRecipe(ResourceLocation id, ShapelessRecipeSpec spec, ResourceLocation overlay) {
+        super(id, spec);
         this.overlay = overlay;
-        this.result = result;
     }
 
     private static ItemStack make(ItemStack stack, ResourceLocation overlay) {
@@ -56,63 +54,29 @@ public class TurtleOverlayRecipe extends ShapelessRecipe {
     }
 
     @Override
-    public RecipeSerializer<?> getSerializer() {
+    public RecipeSerializer<TurtleOverlayRecipe> getSerializer() {
         return ModRegistry.RecipeSerializers.TURTLE_OVERLAY.get();
     }
 
     public static class Serializer implements RecipeSerializer<TurtleOverlayRecipe> {
         @Override
         public TurtleOverlayRecipe fromJson(ResourceLocation id, JsonObject json) {
-            var group = GsonHelper.getAsString(json, "group", "");
-            var category = CraftingBookCategory.CODEC.byName(GsonHelper.getAsString(json, "category", null), CraftingBookCategory.MISC);
-            var ingredients = readIngredients(GsonHelper.getAsJsonArray(json, "ingredients"));
-
-            if (ingredients.isEmpty()) throw new JsonParseException("No ingredients for shapeless recipe");
-            if (ingredients.size() > 9) {
-                throw new JsonParseException("Too many ingredients for shapeless recipe the max is 9");
-            }
-
+            var recipe = ShapelessRecipeSpec.fromJson(json);
             var overlay = new ResourceLocation(GsonHelper.getAsString(json, "overlay"));
 
-            // We could derive this from the ingredients, but we want to avoid evaluating the ingredients too early, so
-            // it's easier to do this.
-            var result = make(ShapedRecipe.itemStackFromJson(GsonHelper.getAsJsonObject(json, "result")), overlay);
-
-            return new TurtleOverlayRecipe(id, group, category, result, ingredients, overlay);
-        }
-
-        private NonNullList<Ingredient> readIngredients(JsonArray arrays) {
-            NonNullList<Ingredient> items = NonNullList.create();
-            for (var i = 0; i < arrays.size(); ++i) {
-                var ingredient = Ingredient.fromJson(arrays.get(i));
-                if (!ingredient.isEmpty()) items.add(ingredient);
-            }
-
-            return items;
+            return new TurtleOverlayRecipe(id, recipe, overlay);
         }
 
         @Override
         public TurtleOverlayRecipe fromNetwork(ResourceLocation id, FriendlyByteBuf buffer) {
-            var group = buffer.readUtf();
-            var category = buffer.readEnum(CraftingBookCategory.class);
-            var count = buffer.readVarInt();
-            var items = NonNullList.withSize(count, Ingredient.EMPTY);
-
-            for (var j = 0; j < items.size(); j++) items.set(j, Ingredient.fromNetwork(buffer));
-            var result = buffer.readItem();
+            var recipe = ShapelessRecipeSpec.fromNetwork(buffer);
             var overlay = buffer.readResourceLocation();
-
-            return new TurtleOverlayRecipe(id, group, category, result, items, overlay);
+            return new TurtleOverlayRecipe(id, recipe, overlay);
         }
 
         @Override
         public void toNetwork(FriendlyByteBuf buffer, TurtleOverlayRecipe recipe) {
-            buffer.writeUtf(recipe.getGroup());
-            buffer.writeEnum(recipe.category());
-            buffer.writeVarInt(recipe.getIngredients().size());
-
-            for (var ingredient : recipe.getIngredients()) ingredient.toNetwork(buffer);
-            buffer.writeItem(recipe.result);
+            recipe.toSpec().toNetwork(buffer);
             buffer.writeResourceLocation(recipe.overlay);
         }
     }

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

@@ -4,26 +4,33 @@
 
 package dan200.computercraft.shared.turtle.recipes;
 
+import com.mojang.serialization.DataResult;
 import dan200.computercraft.shared.ModRegistry;
-import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.items.IComputerItem;
-import dan200.computercraft.shared.computer.recipe.ComputerFamilyRecipe;
+import dan200.computercraft.shared.computer.recipe.ComputerConvertRecipe;
+import dan200.computercraft.shared.recipe.ShapedRecipeSpec;
 import dan200.computercraft.shared.turtle.items.TurtleItem;
-import net.minecraft.core.NonNullList;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.CraftingBookCategory;
-import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 
-public final class TurtleRecipe extends ComputerFamilyRecipe {
-    public TurtleRecipe(ResourceLocation identifier, String group, CraftingBookCategory category, int width, int height, NonNullList<Ingredient> ingredients, ItemStack result, ComputerFamily family) {
-        super(identifier, group, category, width, height, ingredients, result, family);
+/**
+ * The recipe which crafts a turtle from an existing computer item.
+ */
+public final class TurtleRecipe extends ComputerConvertRecipe {
+    private final TurtleItem turtle;
+
+    private TurtleRecipe(ResourceLocation id, ShapedRecipeSpec recipe, TurtleItem turtle) {
+        super(id, recipe);
+        this.turtle = turtle;
     }
 
-    @Override
-    public RecipeSerializer<?> getSerializer() {
-        return ModRegistry.RecipeSerializers.TURTLE.get();
+    public static DataResult<TurtleRecipe> of(ResourceLocation id, ShapedRecipeSpec recipe) {
+        if (!(recipe.result().getItem() instanceof TurtleItem turtle)) {
+            return DataResult.error(() -> recipe.result().getItem() + " is not a turtle item");
+        }
+
+        return DataResult.success(new TurtleRecipe(id, recipe, turtle));
     }
 
     @Override
@@ -31,13 +38,11 @@ public final class TurtleRecipe extends ComputerFamilyRecipe {
         var computerID = item.getComputerID(stack);
         var label = item.getLabel(stack);
 
-        return TurtleItem.create(computerID, label, -1, getFamily(), null, null, 0, null);
+        return turtle.create(computerID, label, -1, null, null, 0, null);
     }
 
-    public static class Serializer extends ComputerFamilyRecipe.Serializer<TurtleRecipe> {
-        @Override
-        protected TurtleRecipe create(ResourceLocation identifier, String group, CraftingBookCategory category, int width, int height, NonNullList<Ingredient> ingredients, ItemStack result, ComputerFamily family) {
-            return new TurtleRecipe(identifier, group, category, width, height, ingredients, result, family);
-        }
+    @Override
+    public RecipeSerializer<TurtleRecipe> getSerializer() {
+        return ModRegistry.RecipeSerializers.TURTLE.get();
     }
 }

projects/common/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleInventoryCrafting.java

@@ -10,6 +10,7 @@ import dan200.computercraft.shared.turtle.blocks.TurtleBlockEntity;
 import dan200.computercraft.shared.turtle.core.TurtlePlayer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.player.StackedContents;
 import net.minecraft.world.inventory.CraftingContainer;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Recipe;
@@ -17,20 +18,22 @@ import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.level.Level;
 
 import javax.annotation.Nullable;
+import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-public class TurtleInventoryCrafting extends CraftingContainer {
+public class TurtleInventoryCrafting implements CraftingContainer {
+    public static final int WIDTH = 3;
+    public static final int HEIGHT = 3;
+    public static final int SIZE = WIDTH * HEIGHT;
+
     private final ITurtleAccess turtle;
     private int xStart = 0;
     private int yStart = 0;
 
     @SuppressWarnings("ConstantConditions")
     public TurtleInventoryCrafting(ITurtleAccess turtle) {
-        // Passing null in here is evil, but we don't have a container present. We override most methods in order to
-        // avoid throwing any NPEs.
-        super(null, 0, 0);
         this.turtle = turtle;
     }
 
@@ -96,7 +99,7 @@ public class TurtleInventoryCrafting extends CraftingContainer {
                 // afterwards).
                 if (existing.isEmpty()) {
                     setItem(slot, remainder);
-                } else if (ItemStack.isSame(existing, remainder) && ItemStack.tagMatches(existing, remainder)) {
+                } else if (ItemStack.isSameItemSameTags(existing, remainder)) {
                     remainder.grow(existing.getCount());
                     setItem(slot, remainder);
                 } else {
@@ -110,12 +113,12 @@ public class TurtleInventoryCrafting extends CraftingContainer {
 
     @Override
     public int getWidth() {
-        return 3;
+        return WIDTH;
     }
 
     @Override
     public int getHeight() {
-        return 3;
+        return HEIGHT;
     }
 
     private int modifyIndex(int index) {
@@ -126,35 +129,37 @@ public class TurtleInventoryCrafting extends CraftingContainer {
             : -1;
     }
 
-    // IInventory implementation
+    @Override
+    public boolean isEmpty() {
+        for (int i = 0; i < SIZE; i++) {
+            if (!getItem(i).isEmpty()) return false;
+        }
+        return true;
+    }
 
     @Override
     public int getContainerSize() {
-        return getWidth() * getHeight();
+        return SIZE;
     }
 
     @Override
     public ItemStack getItem(int i) {
-        i = modifyIndex(i);
-        return turtle.getInventory().getItem(i);
+        return turtle.getInventory().getItem(modifyIndex(i));
     }
 
     @Override
     public ItemStack removeItemNoUpdate(int i) {
-        i = modifyIndex(i);
-        return turtle.getInventory().removeItemNoUpdate(i);
+        return turtle.getInventory().removeItemNoUpdate(modifyIndex(i));
     }
 
     @Override
     public ItemStack removeItem(int i, int size) {
-        i = modifyIndex(i);
-        return turtle.getInventory().removeItem(i, size);
+        return turtle.getInventory().removeItem(modifyIndex(i), size);
     }
 
     @Override
     public void setItem(int i, ItemStack stack) {
-        i = modifyIndex(i);
-        turtle.getInventory().setItem(i, stack);
+        turtle.getInventory().setItem(modifyIndex(i), stack);
     }
 
     @Override
@@ -174,15 +179,34 @@ public class TurtleInventoryCrafting extends CraftingContainer {
 
     @Override
     public boolean canPlaceItem(int i, ItemStack stack) {
-        i = modifyIndex(i);
-        return turtle.getInventory().canPlaceItem(i, stack);
+        return turtle.getInventory().canPlaceItem(modifyIndex(i), stack);
     }
 
     @Override
     public void clearContent() {
-        for (var i = 0; i < getContainerSize(); i++) {
+        for (var i = 0; i < SIZE; i++) {
             var j = modifyIndex(i);
             turtle.getInventory().setItem(j, ItemStack.EMPTY);
         }
     }
+
+    @Override
+    public void fillStackedContents(StackedContents contents) {
+        for (int i = 0; i < SIZE; i++) contents.accountSimpleStack(getItem(i));
+    }
+
+    @Override
+    public List<ItemStack> getItems() {
+        return new AbstractList<>() {
+            @Override
+            public ItemStack get(int index) {
+                return getItem(index);
+            }
+
+            @Override
+            public int size() {
+                return SIZE;
+            }
+        };
+    }
 }

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

@@ -33,7 +33,7 @@ public final class DropConsumer {
         dropConsumer = consumer;
         remainingDrops = new ArrayList<>();
         dropEntity = entity;
-        dropWorld = entity.level;
+        dropWorld = entity.level();
         dropBounds = new AABB(entity.blockPosition()).inflate(2, 2, 2);
     }
 
@@ -70,7 +70,7 @@ public final class DropConsumer {
 
     public static boolean onEntitySpawn(Entity entity) {
         // Capture any nearby item spawns
-        if (dropWorld == entity.getLevel() && entity instanceof ItemEntity
+        if (dropWorld == entity.level() && entity instanceof ItemEntity
             && assertNonNull(dropBounds).contains(entity.position())) {
             handleDrops(((ItemEntity) entity).getItem());
             return true;

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

@@ -1,88 +0,0 @@
-// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
-//
-// SPDX-License-Identifier: LicenseRef-CCPL
-
-package dan200.computercraft.shared.util;
-
-import com.google.gson.JsonObject;
-import dan200.computercraft.shared.ModRegistry;
-import net.minecraft.core.NonNullList;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.GsonHelper;
-import net.minecraft.world.inventory.CraftingContainer;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.CraftingBookCategory;
-import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraft.world.item.crafting.RecipeSerializer;
-import net.minecraft.world.item.crafting.ShapedRecipe;
-import net.minecraft.world.level.Level;
-
-public final class ImpostorRecipe extends ShapedRecipe {
-    private final String group;
-    private final ItemStack result;
-
-    private ImpostorRecipe(ResourceLocation id, String group, CraftingBookCategory category, int width, int height, NonNullList<Ingredient> ingredients, ItemStack result) {
-        super(id, group, category, width, height, ingredients, result);
-        this.group = group;
-        this.result = result;
-    }
-
-    @Override
-    public String getGroup() {
-        return group;
-    }
-
-    ItemStack getResultItem() {
-        return result;
-    }
-
-    @Override
-    public boolean matches(CraftingContainer inv, Level world) {
-        return false;
-    }
-
-    @Override
-    public ItemStack assemble(CraftingContainer inventory, RegistryAccess registryAccess) {
-        return ItemStack.EMPTY;
-    }
-
-    @Override
-    public RecipeSerializer<?> getSerializer() {
-        return ModRegistry.RecipeSerializers.IMPOSTOR_SHAPED.get();
-    }
-
-    public static class Serializer implements RecipeSerializer<ImpostorRecipe> {
-        @Override
-        public ImpostorRecipe fromJson(ResourceLocation identifier, JsonObject json) {
-            var group = GsonHelper.getAsString(json, "group", "");
-            var category = CraftingBookCategory.CODEC.byName(GsonHelper.getAsString(json, "category", null), CraftingBookCategory.MISC);
-            var recipe = RecipeSerializer.SHAPED_RECIPE.fromJson(identifier, json);
-            var result = ShapedRecipe.itemStackFromJson(GsonHelper.getAsJsonObject(json, "result"));
-            return new ImpostorRecipe(identifier, group, category, recipe.getWidth(), recipe.getHeight(), recipe.getIngredients(), result);
-        }
-
-        @Override
-        public ImpostorRecipe fromNetwork(ResourceLocation identifier, FriendlyByteBuf buf) {
-            var width = buf.readVarInt();
-            var height = buf.readVarInt();
-            var group = buf.readUtf(Short.MAX_VALUE);
-            var category = buf.readEnum(CraftingBookCategory.class);
-            var items = NonNullList.withSize(width * height, Ingredient.EMPTY);
-            for (var k = 0; k < items.size(); k++) items.set(k, Ingredient.fromNetwork(buf));
-            var result = buf.readItem();
-            return new ImpostorRecipe(identifier, group, category, width, height, items, result);
-        }
-
-        @Override
-        public void toNetwork(FriendlyByteBuf buf, ImpostorRecipe recipe) {
-            buf.writeVarInt(recipe.getWidth());
-            buf.writeVarInt(recipe.getHeight());
-            buf.writeUtf(recipe.getGroup());
-            buf.writeEnum(recipe.category());
-            for (var ingredient : recipe.getIngredients()) ingredient.toNetwork(buf);
-            buf.writeItem(recipe.getResultItem());
-        }
-    }
-}

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

@@ -1,104 +0,0 @@
-// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
-//
-// SPDX-License-Identifier: LicenseRef-CCPL
-
-package dan200.computercraft.shared.util;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import dan200.computercraft.shared.ModRegistry;
-import net.minecraft.core.NonNullList;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.GsonHelper;
-import net.minecraft.world.inventory.CraftingContainer;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.*;
-import net.minecraft.world.level.Level;
-
-public final class ImpostorShapelessRecipe extends ShapelessRecipe {
-    private final String group;
-    private final ItemStack result;
-
-    private ImpostorShapelessRecipe(ResourceLocation id, String group, CraftingBookCategory category, ItemStack result, NonNullList<Ingredient> ingredients) {
-        super(id, group, category, result, ingredients);
-        this.group = group;
-        this.result = result;
-    }
-
-    @Override
-    public String getGroup() {
-        return group;
-    }
-
-    ItemStack getResultItem() {
-        return result;
-    }
-
-    @Override
-    public boolean matches(CraftingContainer inv, Level world) {
-        return false;
-    }
-
-    @Override
-    public ItemStack assemble(CraftingContainer inventory, RegistryAccess access) {
-        return ItemStack.EMPTY;
-    }
-
-    @Override
-    public RecipeSerializer<?> getSerializer() {
-        return ModRegistry.RecipeSerializers.IMPOSTOR_SHAPELESS.get();
-    }
-
-    public static final class Serializer implements RecipeSerializer<ImpostorShapelessRecipe> {
-        @Override
-        public ImpostorShapelessRecipe fromJson(ResourceLocation id, JsonObject json) {
-            var group = GsonHelper.getAsString(json, "group", "");
-            var category = CraftingBookCategory.CODEC.byName(GsonHelper.getAsString(json, "category", null), CraftingBookCategory.MISC);
-            var ingredients = readIngredients(GsonHelper.getAsJsonArray(json, "ingredients"));
-
-            if (ingredients.isEmpty()) throw new JsonParseException("No ingredients for shapeless recipe");
-            if (ingredients.size() > 9) {
-                throw new JsonParseException("Too many ingredients for shapeless recipe the max is 9");
-            }
-
-            var result = ShapedRecipe.itemStackFromJson(GsonHelper.getAsJsonObject(json, "result"));
-            return new ImpostorShapelessRecipe(id, group, category, result, ingredients);
-        }
-
-        private NonNullList<Ingredient> readIngredients(JsonArray arrays) {
-            NonNullList<Ingredient> items = NonNullList.create();
-            for (var i = 0; i < arrays.size(); ++i) {
-                var ingredient = Ingredient.fromJson(arrays.get(i));
-                if (!ingredient.isEmpty()) items.add(ingredient);
-            }
-
-            return items;
-        }
-
-        @Override
-        public ImpostorShapelessRecipe fromNetwork(ResourceLocation id, FriendlyByteBuf buffer) {
-            var group = buffer.readUtf();
-            var category = buffer.readEnum(CraftingBookCategory.class);
-            var count = buffer.readVarInt();
-            var items = NonNullList.withSize(count, Ingredient.EMPTY);
-
-            for (var j = 0; j < items.size(); j++) items.set(j, Ingredient.fromNetwork(buffer));
-            var result = buffer.readItem();
-
-            return new ImpostorShapelessRecipe(id, group, category, result, items);
-        }
-
-        @Override
-        public void toNetwork(FriendlyByteBuf buffer, ImpostorShapelessRecipe recipe) {
-            buffer.writeUtf(recipe.getGroup());
-            buffer.writeEnum(recipe.category());
-            buffer.writeVarInt(recipe.getIngredients().size());
-
-            for (var ingredient : recipe.getIngredients()) ingredient.toNetwork(buffer);
-            buffer.writeItem(recipe.getResultItem());
-        }
-    }
-}

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

@@ -90,6 +90,6 @@ public final class InventoryUtil {
         if (stack1.getItem() != stack2.getItem()) return false;
         if (stack1.getDamageValue() != stack2.getDamageValue()) return false;
         if (stack1.getCount() > stack1.getMaxStackSize()) return false;
-        return ItemStack.tagMatches(stack1, stack2);
+        return ItemStack.isSameItemSameTags(stack1, stack2);
     }
 }

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

@@ -1,94 +0,0 @@
-// SPDX-FileCopyrightText: 2017 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.shared.util;
-
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
-import dan200.computercraft.shared.computer.core.ComputerFamily;
-import net.minecraft.core.NonNullList;
-import net.minecraft.util.GsonHelper;
-import net.minecraft.world.item.crafting.Ingredient;
-
-import java.util.Map;
-import java.util.Set;
-
-// TODO: Replace some things with Forge??
-
-public final class RecipeUtil {
-    private RecipeUtil() {
-    }
-
-    public record ShapedTemplate(int width, int height, NonNullList<Ingredient> ingredients) {
-    }
-
-    public static ShapedTemplate getTemplate(JsonObject json) {
-        Map<Character, Ingredient> ingMap = Maps.newHashMap();
-        for (var entry : GsonHelper.getAsJsonObject(json, "key").entrySet()) {
-            if (entry.getKey().length() != 1) {
-                throw new JsonSyntaxException("Invalid key entry: '" + entry.getKey() + "' is an invalid symbol (must be 1 character only).");
-            }
-            if (" ".equals(entry.getKey())) {
-                throw new JsonSyntaxException("Invalid key entry: ' ' is a reserved symbol.");
-            }
-
-            ingMap.put(entry.getKey().charAt(0), Ingredient.fromJson(entry.getValue()));
-        }
-
-        ingMap.put(' ', Ingredient.EMPTY);
-
-        var patternJ = GsonHelper.getAsJsonArray(json, "pattern");
-
-        if (patternJ.size() == 0) {
-            throw new JsonSyntaxException("Invalid pattern: empty pattern not allowed");
-        }
-
-        var pattern = new String[patternJ.size()];
-        for (var x = 0; x < pattern.length; x++) {
-            var line = GsonHelper.convertToString(patternJ.get(x), "pattern[" + x + "]");
-            if (x > 0 && pattern[0].length() != line.length()) {
-                throw new JsonSyntaxException("Invalid pattern: each row must  be the same width");
-            }
-            pattern[x] = line;
-        }
-
-        var width = pattern[0].length();
-        var height = pattern.length;
-        var ingredients = NonNullList.withSize(width * height, Ingredient.EMPTY);
-
-        Set<Character> missingKeys = Sets.newHashSet(ingMap.keySet());
-        missingKeys.remove(' ');
-
-        var ingredientIdx = 0;
-        for (var line : pattern) {
-            for (var i = 0; i < line.length(); i++) {
-                var chr = line.charAt(i);
-
-                var ing = ingMap.get(chr);
-                if (ing == null) {
-                    throw new JsonSyntaxException("Pattern references symbol '" + chr + "' but it's not defined in the key");
-                }
-                ingredients.set(ingredientIdx++, ing);
-                missingKeys.remove(chr);
-            }
-        }
-
-        if (!missingKeys.isEmpty()) {
-            throw new JsonSyntaxException("Key defines symbols that aren't used in pattern: " + missingKeys);
-        }
-
-        return new ShapedTemplate(width, height, ingredients);
-    }
-
-    public static ComputerFamily getFamily(JsonObject json, String name) {
-        var familyName = GsonHelper.getAsString(json, name);
-        for (var family : ComputerFamily.values()) {
-            if (family.name().equalsIgnoreCase(familyName)) return family;
-        }
-
-        throw new JsonSyntaxException("Unknown computer family '" + familyName + "' for field " + name);
-    }
-}

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

@@ -35,7 +35,7 @@ public final class WorldUtil {
 
     public static boolean isLiquidBlock(Level world, BlockPos pos) {
         if (!world.isInWorldBounds(pos)) return false;
-        return world.getBlockState(pos).getMaterial().isLiquid();
+        return world.getBlockState(pos).liquid();
     }
 
     public static boolean isVecInside(VoxelShape shape, Vec3 vec) {

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

@@ -47,8 +47,6 @@
     "commands.computercraft.synopsis": "Různé příkazy pro ovládání počítačů.",
     "commands.computercraft.tp.action": "Teleportovat se k počítači",
     "commands.computercraft.tp.desc": "Teleportovat se na místo počítače. Můžeš specifikovat ID počítačové instance (tř. 123) nebo ID počítače (tř. #123).",
-    "commands.computercraft.tp.not_player": "Nelze otevřít terminál pro nehráče",
-    "commands.computercraft.tp.not_there": "Nelze najít počítač ve světě",
     "commands.computercraft.tp.synopsis": "Teleportovat se ke specifickému počítači.",
     "commands.computercraft.track.desc": "Sledovat jak dlouho se počítače spustí, a také kolik událostí zpracují. Toto uvádí informace v podobné cestě jako /forge track a může být dobré pro diagnostiku lagu.",
     "commands.computercraft.track.dump.computer": "Počítač",

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

@@ -46,8 +46,6 @@
     "commands.computercraft.synopsis": "Verschiedene Befehle um Computer zu kontrollieren.",
     "commands.computercraft.tp.action": "Teleportiert dich zum Computer",
     "commands.computercraft.tp.desc": "Teleportiert dich zum Standort eines Computers. Der Computer kann entweder über seine Instanz ID (z.B. 123), seine Computer ID (z.B. #123) oder seinen Namen (z.B. \"@Mein Computer\") angegeben werden.",
-    "commands.computercraft.tp.not_player": "Konnte Terminal für Nicht-Spieler nicht öffnen",
-    "commands.computercraft.tp.not_there": "Konnte Computer in der Welt nicht finden",
     "commands.computercraft.tp.synopsis": "Teleportiert dich zum angegebenen Computer.",
     "commands.computercraft.track.desc": "Zeichnet die Laufzeiten von Computern und wie viele Events ausgelöst werden auf. Die Ausgabe der Informationen ist ähnlich zu /forge track, was beim aufspüren von Lags sehr hilfreich sein kann.",
     "commands.computercraft.track.dump.computer": "Computer",