Fix some isues in SNBT parsing

- Accept the full range of unquoted strings
 - Fix error when failing to parse an unquoted string

See #2277. This is not sufficient to close the issue (wow, there's so
much more wrong with the code), but at least stops unserialiseJSON
crashing.

.github/workflows/main-ci.yml

@@ -14,7 +14,7 @@ jobs:
     - name: 📥 Set up Java
       uses: actions/setup-java@v4
       with:
-        java-version: 21
+        java-version: 17
         distribution: 'temurin'
 
     - name: 📥 Setup Gradle
@@ -87,7 +87,7 @@ jobs:
     - name: 📥 Set up Java
       uses: actions/setup-java@v4
       with:
-        java-version: 21
+        java-version: 17
         distribution: 'temurin'
 
     - name: 📥 Setup Gradle

.github/workflows/make-doc.yml

@@ -17,7 +17,7 @@ jobs:
     - name: 📥 Set up Java
       uses: actions/setup-java@v4
       with:
-        java-version: 21
+        java-version: 17
         distribution: 'temurin'
 
     - name: 📥 Setup Gradle

CONTRIBUTING.md

@@ -28,7 +28,7 @@ Translations are managed through [CrowdIn], an online interface for managing lan
 In order to develop CC: Tweaked, you'll need to download the source code and then run it.
 
  - Make sure you've got the following software installed:
-   - Java Development Kit 21 (JDK). This can be downloaded from [Adoptium].
+   - Java Development Kit 17 (JDK). This can be downloaded from [Adoptium].
    - [Git](https://git-scm.com/).
    - [NodeJS 20 or later][node].
 

README.md

@@ -51,8 +51,9 @@ dependencies {
   compileOnly("cc.tweaked:cc-tweaked-$mcVersion-common-api:$cctVersion")
 
   // Forge Gradle
-  compileOnly("cc.tweaked:cc-tweaked-$mcVersion-forge-api:$cctVersion")
-  runtimeOnly("cc.tweaked:cc-tweaked-$mcVersion-forge:$cctVersion")
+  compileOnly("cc.tweaked:cc-tweaked-$mcVersion-core-api:$cctVersion")
+  compileOnly(fg.deobf("cc.tweaked:cc-tweaked-$mcVersion-forge-api:$cctVersion"))
+  runtimeOnly(fg.deobf("cc.tweaked:cc-tweaked-$mcVersion-forge:$cctVersion"))
 
   // Fabric Loom
   modCompileOnly("cc.tweaked:cc-tweaked-$mcVersion-fabric-api:$cctVersion")

REUSE.toml

@@ -15,7 +15,7 @@ path = [
     "gradle/gradle-daemon-jvm.properties",
     "projects/common/src/main/resources/assets/computercraft/sounds.json",
     "projects/common/src/main/resources/assets/computercraft/sounds/empty.ogg",
-    "projects/common/src/testMod/resources/data/cctest/computercraft/turtle_upgrade/**",
+    "projects/common/src/testMod/resources/data/cctest/computercraft/turtle_upgrades/**",
     "projects/common/src/testMod/resources/data/cctest/structures/**",
     "projects/*/src/generated/**",
     "projects/web/src/htmlTransform/export/index.json",

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

@@ -4,7 +4,10 @@
 
 /** Default configuration for Fabric projects. */
 
-import cc.tweaked.gradle.*
+import cc.tweaked.gradle.CCTweakedExtension
+import cc.tweaked.gradle.CCTweakedPlugin
+import cc.tweaked.gradle.IdeaRunConfigurations
+import cc.tweaked.gradle.MinecraftConfigurations
 
 plugins {
     `java-library`
@@ -64,9 +67,3 @@ dependencies {
 tasks.ideaSyncTask {
     doLast { IdeaRunConfigurations(project).patch() }
 }
-
-tasks.named("checkDependencyConsistency", DependencyCheck::class.java) {
-    val libs = project.extensions.getByType<VersionCatalogsExtension>().named("libs")
-    // Minecraft depends on asm, but Fabric forces it to a more recent version
-    override(libs.findLibrary("asm").get(), "9.8")
-}

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

@@ -10,16 +10,16 @@ import cc.tweaked.gradle.MinecraftConfigurations
 
 plugins {
     id("cc-tweaked.java-convention")
-    id("net.neoforged.moddev")
+    id("net.neoforged.moddev.legacyforge")
 }
 
 plugins.apply(CCTweakedPlugin::class.java)
 
 val mcVersion: String by extra
 
-neoForge {
+legacyForge {
     val libs = project.extensions.getByType<VersionCatalogsExtension>().named("libs")
-    version = libs.findVersion("neoForge").get().toString()
+    version = "$mcVersion-${libs.findVersion("forge").get()}"
 
     parchment {
         minecraftVersion = libs.findVersion("parchmentMc").get().toString()

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

@@ -48,7 +48,7 @@ repositories {
             includeGroup("cc.tweaked")
             // Things we mirror
             includeGroup("com.simibubi.create")
-            includeGroup("net.commoble.morered")
+            includeGroup("commoble.morered")
             includeGroup("dev.architectury")
             includeGroup("dev.emi")
             includeGroup("maven.modrinth")
@@ -57,6 +57,7 @@ repositories {
             includeGroup("mezz.jei")
             includeGroup("org.teavm")
             includeModule("com.terraformersmc", "modmenu")
+            includeModule("me.lucko", "fabric-permissions-api")
         }
     }
 }
@@ -78,16 +79,8 @@ dependencies {
 // Configure default JavaCompile tasks with our arguments.
 sourceSets.all {
     tasks.named(compileJavaTaskName, JavaCompile::class.java) {
-
-        options.compilerArgs.addAll(
-            listOf(
-                "-Xlint",
-                // Processing just gives us "No processor claimed any of these annotations", so skip that!
-                "-Xlint:-processing",
-                // We violate this pattern too often for it to be a helpful warning. Something to improve one day!
-                "-Xlint:-this-escape",
-            ),
-        )
+        // Processing just gives us "No processor claimed any of these annotations", so skip that!
+        options.compilerArgs.addAll(listOf("-Xlint", "-Xlint:-processing"))
 
         options.errorprone {
             check("InvalidBlockTag", CheckSeverity.OFF) // Broken by @cc.xyz
@@ -155,7 +148,7 @@ tasks.javadoc {
     options {
         val stdOptions = this as StandardJavadocDocletOptions
         stdOptions.addBooleanOption("Xdoclint:all,-missing", true)
-        stdOptions.links("https://docs.oracle.com/en/java/javase/21/docs/api/")
+        stdOptions.links("https://docs.oracle.com/en/java/javase/17/docs/api/")
     }
 }
 

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

@@ -42,6 +42,6 @@ class CCTweakedPlugin : Plugin<Project> {
     }
 
     companion object {
-        val JAVA_VERSION = JavaLanguageVersion.of(21)
+        val JAVA_VERSION = JavaLanguageVersion.of(17)
     }
 }

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

@@ -9,7 +9,6 @@ import org.gradle.api.file.FileSystemLocation
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.JavaExec
-import org.gradle.kotlin.dsl.getByName
 import org.gradle.process.BaseExecSpec
 import org.gradle.process.JavaExecSpec
 import org.gradle.process.ProcessForkOptions
@@ -47,21 +46,6 @@ fun JavaExec.copyToFull(spec: JavaExec) {
     copyToExec(spec)
 }
 
-/**
- * Base this [JavaExec] task on an existing task.
- */
-fun JavaExec.copyFromTask(task: JavaExec) {
-    for (dep in task.dependsOn) dependsOn(dep)
-    task.copyToFull(this)
-}
-
-/**
- * Base this [JavaExec] task on an existing task.
- */
-fun JavaExec.copyFromTask(task: String) {
-    copyFromTask(project.tasks.getByName<JavaExec>(task))
-}
-
 /**
  * Copy additional [BaseExecSpec] options which aren't handled by [ProcessForkOptions.copyTo].
  */

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

@@ -19,7 +19,6 @@ import java.nio.file.Files
 import java.util.concurrent.TimeUnit
 import java.util.function.Supplier
 import javax.inject.Inject
-import kotlin.collections.set
 import kotlin.random.Random
 
 /**
@@ -126,23 +125,6 @@ abstract class ClientJavaExec : JavaExec() {
         }
     }
 
-    /**
-     * Configure Iris to use Complementary Shaders.
-     */
-    fun withComplementaryShaders() {
-        val cct = project.extensions.getByType(CCTweakedExtension::class.java)
-
-        withFileFrom(workingDir.resolve("shaderpacks/ComplementaryShaders_v4.6.zip")) {
-            cct.downloadFile("Complementary Shaders", "https://edge.forgecdn.net/files/3951/170/ComplementaryShaders_v4.6.zip")
-        }
-        withFileContents(workingDir.resolve("config/iris.properties")) {
-            """
-            enableShaders=true
-            shaderPack=ComplementaryShaders_v4.6.zip
-            """.trimIndent()
-        }
-    }
-
     @TaskAction
     override fun exec() {
         Files.createDirectories(workingDir.toPath())

config/checkstyle/checkstyle.xml

@@ -21,15 +21,6 @@ SPDX-License-Identifier: MPL-2.0
         <property name="file" value="${config_loc}/suppressions.xml" />
     </module>
 
-    <!--
-        Checkstyle doesn't support @snippet (https://github.com/checkstyle/checkstyle/issues/11455),
-        so suppress warnings nearby
-    -->
-    <module name="SuppressWithNearbyTextFilter">
-        <property name="nearbyTextPattern" value="@snippet" />
-        <property name="lineRange" value="20" />
-    </module>
-
     <module name="BeforeExecutionExclusionFileFilter">
         <property name="fileNamePattern" value="render_old"/>
     </module>
@@ -129,7 +120,7 @@ SPDX-License-Identifier: MPL-2.0
         <module name="LocalFinalVariableName" />
         <module name="LocalVariableName" />
         <module name="MemberName">
-            <property name="format" value="^(computercraft\$|\$)?[a-z][a-zA-Z0-9]*$" />
+            <property name="format" value="^\$?[a-z][a-zA-Z0-9]*$" />
         </module>
         <module name="MethodName">
             <property name="format" value="^(computercraft\$)?[a-z][a-zA-Z0-9]*$" />

config/checkstyle/suppressions.xml

@@ -22,7 +22,4 @@ SPDX-License-Identifier: MPL-2.0
 
     <!-- Allow underscores in our test classes. -->
     <suppress checks="MethodName" files=".*(Contract|Test).java" />
-
-    <!-- Allow underscores in Mixin classes -->
-    <suppress checks="TypeName" files=".*[\\/]mixin[\\/].*.java" />
 </suppressions>

gradle.properties

@@ -8,11 +8,9 @@ org.gradle.parallel=true
 kotlin.stdlib.default.dependency=false
 kotlin.jvm.target.validation.mode=error
 
-neogradle.subsystems.conventions.runs.enabled=false
-
 # Mod properties
-isUnstable=true
+isUnstable=false
 modVersion=1.116.1
 
 # Minecraft properties: We want to configure this here so we can read it in settings.gradle
-mcVersion=1.21.7
+mcVersion=1.20.1

gradle/gradle-daemon-jvm.properties

@@ -1,2 +1,2 @@
 #This file is generated by updateDaemonJvm
-toolchainVersion=21
+toolchainVersion=17

gradle/libs.versions.toml

@@ -6,24 +6,24 @@
 
 # Minecraft
 # MC version is specified in gradle.properties, as we need that in settings.gradle.
-# Remember to update corresponding versions in fabric.mod.json/neoforge.mods.toml
-fabric-api = "0.128.0+1.21.7"
-fabric-loader = "0.16.14"
-neoForge = "21.7.19-beta"
-neoMergeTool = "2.0.0"
+# Remember to update corresponding versions in fabric.mod.json/mods.toml
+fabric-api = "0.86.1+1.20.1"
+fabric-loader = "0.14.21"
+forge = "47.1.0"
+forgeSpi = "7.0.1"
 mixin = "0.8.5"
-parchment = "2025.06.29"
-parchmentMc = "1.21.6"
-yarn = "1.21.7+build.1"
+parchment = "2023.08.20"
+parchmentMc = "1.20.1"
+yarn = "1.20.1+build.10"
 
 # Core dependencies (these versions are tied to the version Minecraft uses)
-fastutil = "8.5.15"
-guava = "33.3.1-jre"
-netty = "4.1.118.Final"
-slf4j = "2.0.16"
+fastutil = "8.5.9"
+guava = "31.1-jre"
+netty = "4.1.82.Final"
+slf4j = "2.0.1"
 
 # Core dependencies (independent of Minecraft)
-asm = "9.7.1"
+asm = "9.6"
 autoService = "1.1.1"
 checkerFramework = "3.42.0"
 cobalt = { strictly = "0.9.6" }
@@ -36,18 +36,17 @@ kotlin-coroutines = "1.10.1"
 nightConfig = "3.8.1"
 
 # Minecraft mods
-emi = "1.1.7+1.21"
-fabricPermissions = "0.3.3"
-iris-fabric = "1.9.1+1.21.7-fabric"
-iris-forge = "1.9.1+1.21.7-neoforge"
-jei = "23.1.0.4"
-modmenu = "13.0.2"
-moreRed = "6.0.0.3"
-rei = "18.0.800"
-sodium-fabric = "mc1.21.6-0.6.13-fabric"
-sodium-forge = "mc1.21.6-0.6.13-neoforge"
-mixinExtra = "0.3.5"
-create-forge = "6.0.0-6"
+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 = "12.0.626"
+rubidium = "0.6.1"
+sodium = "mc1.20-0.4.10"
+create-forge = "6.0.0-9"
 create-fabric = "0.5.1-f-build.1467+mc1.20.1"
 
 # Testing
@@ -58,7 +57,7 @@ junitPlatform = "1.11.4"
 jmh = "1.37"
 
 # Build tools
-cctJavadoc = "1.8.5"
+cctJavadoc = "1.8.4"
 checkstyle = "10.23.1"
 errorProne-core = "2.38.0"
 errorProne-plugin = "4.1.0"
@@ -69,7 +68,7 @@ ideaExt = "1.1.7"
 illuaminate = "0.1.0-83-g1131f68"
 lwjgl = "3.3.3"
 minotaur = "2.8.7"
-modDevGradle = "2.0.99"
+modDevGradle = "2.0.95"
 nullAway = "0.12.7"
 shadow = "8.3.1"
 spotless = "7.0.2"
@@ -87,7 +86,7 @@ checkerFramework = { module = "org.checkerframework:checker-qual", version.ref =
 cobalt = { module = "cc.tweaked:cobalt", version.ref = "cobalt" }
 commonsCli = { module = "commons-cli:commons-cli", version.ref = "commonsCli" }
 fastutil = { module = "it.unimi.dsi:fastutil", version.ref = "fastutil" }
-neoMergeTool = { module = "net.neoforged:mergetool", version.ref = "neoMergeTool" }
+forgeSpi = { module = "net.minecraftforge:forgespi", version.ref = "forgeSpi" }
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
 jetbrainsAnnotations = { module = "org.jetbrains:annotations", version.ref = "jetbrainsAnnotations" }
 jspecify = { module = "org.jspecify:jspecify", version.ref = "jspecify" }
@@ -105,26 +104,25 @@ slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 
 # Minecraft mods
 create-fabric = { module = "com.simibubi.create:create-fabric-1.20.1", version.ref = "create-fabric" }
-create-forge = { module = "com.simibubi.create:create-1.21.1", version.ref = "create-forge" }
+create-forge = { module = "com.simibubi.create:create-1.20.1", version.ref = "create-forge" }
 emi = { module = "dev.emi:emi-xplat-mojmap", version.ref = "emi" }
 fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric-api" }
 fabric-junit = { module = "net.fabricmc:fabric-loader-junit", version.ref = "fabric-loader" }
 fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-loader" }
 fabricPermissions = { module = "me.lucko:fabric-permissions-api", version.ref = "fabricPermissions" }
-iris-fabric = { module = "maven.modrinth:iris", version.ref = "iris-fabric" }
-iris-forge = { module = "maven.modrinth:iris", version.ref = "iris-forge" }
-jei-api = { module = "mezz.jei:jei-1.21.7-common-api", version.ref = "jei" }
-jei-fabric = { module = "mezz.jei:jei-1.21.7-fabric", version.ref = "jei" }
-jei-forge = { module = "mezz.jei:jei-1.21.7-neoforge", version.ref = "jei" }
+iris = { module = "maven.modrinth:iris", version.ref = "iris" }
+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" }
-mixinExtra = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixinExtra" }
 modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
-moreRed = { module = "net.commoble.morered:morered-1.21.1", version.ref = "moreRed" }
+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" }
 rei-fabric = { module = "me.shedaniel:RoughlyEnoughItems-fabric", version.ref = "rei" }
-sodium-fabric = { module = "maven.modrinth:sodium", version.ref = "sodium.fabric" }
-sodium-forge = { module = "maven.modrinth:sodium", version.ref = "sodium.forge" }
+rubidium = { module = "maven.modrinth:rubidium", version.ref = "rubidium" }
+sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" }
 
 # Testing
 hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" }
@@ -184,11 +182,11 @@ annotations = ["checkerFramework", "jetbrainsAnnotations", "jspecify"]
 kotlin = ["kotlin-stdlib", "kotlin-coroutines"]
 
 # Minecraft
-externalMods-common = ["iris-forge", "jei-api", "nightConfig-core", "nightConfig-toml"]
-externalMods-forge-compile = ["moreRed", "iris-forge", "jei-api"]
+externalMods-common = ["jei-api", "nightConfig-core", "nightConfig-toml"]
+externalMods-forge-compile = ["moreRed", "oculus", "jei-api"]
 externalMods-forge-runtime = ["jei-forge"]
-externalMods-fabric-compile = ["fabricPermissions", "iris-fabric", "jei-api", "rei-api", "rei-builtin"]
-externalMods-fabric-runtime = []
+externalMods-fabric-compile = ["fabricPermissions", "iris", "jei-api", "rei-api", "rei-builtin"]
+externalMods-fabric-runtime = ["jei-fabric", "modmenu"]
 
 # Testing
 test = ["junit-jupiter-api", "junit-jupiter-params", "hamcrest", "jqwik-api"]

projects/common-api/build.gradle.kts

@@ -63,25 +63,16 @@ tasks.javadoc {
             """.trimIndent(),
         )
 
+        taglets("cc.tweaked.javadoc.SnippetTaglet")
+        tagletPath(configurations.detachedConfiguration(dependencies.project(":lints")).toList())
+
         val snippetSources = listOf(":common", ":fabric", ":forge").flatMap {
             project(it).sourceSets["examples"].allSource.sourceDirectories
         }
         inputs.files(snippetSources)
-        addPathOption("-snippet-path").value = snippetSources
+        jFlags("-Dcc.snippet-path=" + snippetSources.joinToString(File.pathSeparator) { it.absolutePath })
     }
 
     // Include the core-api in our javadoc export. This is wrong, but it means we can export a single javadoc dump.
     source(project(":core-api").sourceSets.main.map { it.allJava })
-
-    options {
-        this as StandardJavadocDocletOptions
-        addBooleanOption("-allow-script-in-comments", true)
-        bottom(
-            """
-            <script src="https://cdn.jsdelivr.net/npm/prismjs@v1.29.0/components/prism-core.min.js"></script>
-            <script src="https://cdn.jsdelivr.net/npm/prismjs@v1.29.0/plugins/autoloader/prism-autoloader.min.js"></script>
-            <link href=" https://cdn.jsdelivr.net/npm/prismjs@1.29.0/themes/prism.min.css " rel="stylesheet">
-            """.trimIndent(),
-        )
-    }
 }

projects/common-api/src/client/java/dan200/computercraft/api/client/ComputerCraftAPIClient.java

@@ -0,0 +1,43 @@
+// SPDX-FileCopyrightText: 2022 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.api.client;
+
+import dan200.computercraft.api.client.turtle.TurtleUpgradeModeller;
+import dan200.computercraft.api.turtle.ITurtleUpgrade;
+import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser;
+import dan200.computercraft.impl.client.ComputerCraftAPIClientService;
+
+/**
+ * The public API for client-only code.
+ *
+ * @see dan200.computercraft.api.ComputerCraftAPI The main API
+ */
+public final class ComputerCraftAPIClient {
+    private ComputerCraftAPIClient() {
+    }
+
+    /**
+     * Register a {@link TurtleUpgradeModeller} for a class of turtle upgrades.
+     * <p>
+     * This may be called at any point after registry creation, though it is recommended to call it within your client
+     * setup step.
+     *
+     * @param serialiser The turtle upgrade serialiser.
+     * @param modeller   The upgrade modeller.
+     * @param <T>        The type of the turtle upgrade.
+     * @deprecated This method can lead to confusing load behaviour on Forge. Use
+     * {@code dan200.computercraft.api.client.FabricComputerCraftAPIClient#registerTurtleUpgradeModeller} on Fabric, or
+     * {@code dan200.computercraft.api.client.turtle.RegisterTurtleModellersEvent} on Forge.
+     */
+    @Deprecated(forRemoval = true)
+    public static <T extends ITurtleUpgrade> void registerTurtleUpgradeModeller(TurtleUpgradeSerialiser<T> serialiser, TurtleUpgradeModeller<T> modeller) {
+        // TODO(1.20.4): Remove this
+        getInstance().registerTurtleUpgradeModeller(serialiser, modeller);
+    }
+
+    private static ComputerCraftAPIClientService getInstance() {
+        return ComputerCraftAPIClientService.get();
+    }
+}

projects/common-api/src/client/java/dan200/computercraft/api/client/StandaloneModel.java

@@ -1,166 +0,0 @@
-// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.api.client;
-
-import com.google.common.base.Suppliers;
-import com.mojang.blaze3d.vertex.PoseStack;
-import dan200.computercraft.api.client.turtle.TurtleUpgradeModel;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.Sheets;
-import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.client.renderer.item.BlockModelWrapper;
-import net.minecraft.client.renderer.item.ItemModel;
-import net.minecraft.client.renderer.item.ItemModelResolver;
-import net.minecraft.client.renderer.item.ItemStackRenderState;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.resources.model.BlockModelRotation;
-import net.minecraft.client.resources.model.ModelBaker;
-import net.minecraft.client.resources.model.ResolvedModel;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.ARGB;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.item.ItemDisplayContext;
-import net.minecraft.world.item.ItemStack;
-import org.joml.Vector3f;
-import org.jspecify.annotations.Nullable;
-
-import java.util.List;
-import java.util.function.Supplier;
-
-/**
- * A standalone model.
- * <p>
- * This is very similar to vanilla's {@link BlockModelWrapper}, but suitable for use in both {@link ItemModel}s and
- * block models. This is primarily intended for use with {@link TurtleUpgradeModel}s.
- */
-public final class StandaloneModel {
-    private final List<BakedQuad> quads;
-    private final boolean useBlockLight;
-    private final TextureAtlasSprite particleIcon;
-    private final RenderType renderType;
-    private final Supplier<Vector3f[]> extents;
-
-    /**
-     * Construct a new {@link StandaloneModel}.
-     *
-     * @param quads          The list of quads which form this model.
-     * @param usesBlockLight Whether this uses block lighting. See {@link ItemStackRenderState.LayerRenderState#setUsesBlockLight(boolean)}.
-     * @param particleIcon   The sprite for the model's particles. See {@link ItemStackRenderState.LayerRenderState#setParticleIcon(TextureAtlasSprite)}.
-     * @param renderType     The render type for this model.
-     */
-    public StandaloneModel(List<BakedQuad> quads, boolean usesBlockLight, TextureAtlasSprite particleIcon, RenderType renderType) {
-        this.quads = quads;
-        this.useBlockLight = usesBlockLight;
-        this.particleIcon = particleIcon;
-        this.renderType = renderType;
-        this.extents = Suppliers.memoize(() -> BlockModelWrapper.computeExtents(quads));
-    }
-
-    /**
-     * Load a model from a {@link ModelBaker} and bake it.
-     *
-     * @param model The model id to load.
-     * @param baker The model baker.
-     * @return The baked {@link StandaloneModel}.
-     */
-    public static StandaloneModel of(ResourceLocation model, ModelBaker baker) {
-        return of(baker.getModel(model), baker);
-    }
-
-    /**
-     * Bake a {@link ResolvedModel} into a {@link StandaloneModel}.
-     *
-     * @param model The resolved model.
-     * @param baker The model baker.
-     * @return The baked {@link StandaloneModel}.
-     */
-    public static StandaloneModel of(ResolvedModel model, ModelBaker baker) {
-        return baker.compute(new CacheKey(model));
-    }
-
-    private record CacheKey(ResolvedModel model) implements ModelBaker.SharedOperationKey<StandaloneModel> {
-        @Override
-        public StandaloneModel compute(ModelBaker baker) {
-            return ofUncached(model(), baker);
-        }
-
-        @Override
-        public boolean equals(Object other) {
-            return other instanceof CacheKey(var otherModel) && model() == otherModel;
-        }
-
-        @Override
-        public int hashCode() {
-            return System.identityHashCode(model());
-        }
-    }
-
-    private static StandaloneModel ofUncached(ResolvedModel model, ModelBaker baker) {
-        var slots = model.getTopTextureSlots();
-        return new StandaloneModel(
-            model.bakeTopGeometry(slots, baker, BlockModelRotation.X0_Y0).getAll(),
-            model.getTopGuiLight().lightLikeBlock(),
-            model.resolveParticleSprite(slots, baker),
-            Sheets.translucentItemSheet()
-        );
-    }
-
-    /**
-     * Set up an {@link ItemStackRenderState.LayerRenderState} to render this model.
-     *
-     * @param layer The layer to set up.
-     * @see ItemModel#update(ItemStackRenderState, ItemStack, ItemModelResolver, ItemDisplayContext, ClientLevel, LivingEntity, int)
-     */
-    public void setupItemLayer(ItemStackRenderState.LayerRenderState layer) {
-        layer.setExtents(extents);
-        layer.setRenderType(renderType);
-        layer.setUsesBlockLight(useBlockLight);
-        layer.setParticleIcon(particleIcon);
-        layer.prepareQuadList().addAll(quads);
-    }
-
-    /**
-     * Render the model directly.
-     *
-     * @param transform The current pose stack transformations.
-     * @param buffers   The buffer source to use for rendering.
-     * @param light     The current light texture coordinate.
-     * @param overlay   The current overlay texture coordinate.
-     */
-    public void render(PoseStack transform, MultiBufferSource buffers, int light, int overlay) {
-        render(transform, buffers, light, overlay, null);
-    }
-
-    /**
-     * Render the model directly.
-     *
-     * @param transform The current pose stack transformations.
-     * @param buffers   The buffer source to use for rendering.
-     * @param light     The current light texture coordinate.
-     * @param overlay   The current overlay texture coordinate.
-     * @param tints     The tints for this model.
-     */
-    public void render(PoseStack transform, MultiBufferSource buffers, int light, int overlay, int @Nullable [] tints) {
-        var pose = transform.last();
-        var buffer = buffers.getBuffer(renderType);
-        for (var quad : quads) {
-            float r, g, b, a;
-            var idx = quad.tintIndex();
-            if (tints != null && idx >= 0 && idx < tints.length) {
-                var tint = tints[idx];
-                r = ARGB.red(tint) / 255.0f;
-                g = ARGB.green(tint) / 255.0f;
-                b = ARGB.blue(tint) / 255.0f;
-                a = ARGB.alpha(tint) / 255.0f;
-            } else {
-                r = g = b = a = 1.0f;
-            }
-
-            buffer.putBulkData(pose, quad, r, g, b, a, light, overlay);
-        }
-    }
-}

projects/common-api/src/client/java/dan200/computercraft/api/client/TransformedModel.java

@@ -0,0 +1,57 @@
+// SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+
+package dan200.computercraft.api.client;
+
+import com.mojang.math.Transformation;
+import dan200.computercraft.impl.client.ClientPlatformHelper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemStack;
+
+import java.util.Objects;
+
+/**
+ * A model to render, combined with a transformation matrix to apply.
+ */
+public final class TransformedModel {
+    private final BakedModel model;
+    private final Transformation matrix;
+
+    public TransformedModel(BakedModel model, Transformation matrix) {
+        this.model = Objects.requireNonNull(model);
+        this.matrix = Objects.requireNonNull(matrix);
+    }
+
+    public TransformedModel(BakedModel model) {
+        this.model = Objects.requireNonNull(model);
+        matrix = Transformation.identity();
+    }
+
+    public static TransformedModel of(ModelResourceLocation location) {
+        var modelManager = Minecraft.getInstance().getModelManager();
+        return new TransformedModel(modelManager.getModel(location));
+    }
+
+    public static TransformedModel of(ResourceLocation location) {
+        var modelManager = Minecraft.getInstance().getModelManager();
+        return new TransformedModel(ClientPlatformHelper.get().getModel(modelManager, location));
+    }
+
+    public static TransformedModel of(ItemStack item, Transformation transform) {
+        var model = Minecraft.getInstance().getItemRenderer().getItemModelShaper().getItemModel(item);
+        return new TransformedModel(model, transform);
+    }
+
+    public BakedModel getModel() {
+        return model;
+    }
+
+    public Transformation getMatrix() {
+        return matrix;
+    }
+}

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

@@ -1,95 +0,0 @@
-// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.api.client.turtle;
-
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.api.client.StandaloneModel;
-import dan200.computercraft.api.turtle.ITurtleAccess;
-import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.api.upgrades.UpgradeData;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.block.model.ItemTransform;
-import net.minecraft.client.renderer.item.BlockModelWrapper;
-import net.minecraft.client.renderer.item.ItemModelResolver;
-import net.minecraft.client.renderer.item.ItemStackRenderState;
-import net.minecraft.client.resources.model.ModelBaker;
-import net.minecraft.resources.ResourceLocation;
-
-/**
- * A {@link TurtleUpgradeModel} that renders a basic model.
- * <p>
- * This is the {@link TurtleUpgradeModel} equivalent of {@link BlockModelWrapper}.
- */
-public final class BasicUpgradeModel implements TurtleUpgradeModel {
-    public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "sided");
-    public static final MapCodec<? extends TurtleUpgradeModel.Unbaked> CODEC = RecordCodecBuilder.<Unbaked>mapCodec(instance -> instance.group(
-        ResourceLocation.CODEC.fieldOf("left").forGetter(Unbaked::left),
-        ResourceLocation.CODEC.fieldOf("right").forGetter(Unbaked::right)
-    ).apply(instance, Unbaked::new));
-
-    private final StandaloneModel left;
-    private final StandaloneModel right;
-
-    private BasicUpgradeModel(StandaloneModel left, StandaloneModel right) {
-        this.left = left;
-        this.right = right;
-    }
-
-    /**
-     * Create an unbaked {@link BasicUpgradeModel}.
-     *
-     * @param left  The model when equipped on the left.
-     * @param right The model when equipped on the right.
-     * @return The unbaked turtle upgrade model.
-     */
-    public static TurtleUpgradeModel.Unbaked unbaked(ResourceLocation left, ResourceLocation right) {
-        return new Unbaked(left, right);
-    }
-
-    private StandaloneModel getModel(TurtleSide side) {
-        return switch (side) {
-            case LEFT -> left;
-            case RIGHT -> right;
-        };
-    }
-
-    @Override
-    public void renderForItem(UpgradeData<ITurtleUpgrade> upgrade, TurtleSide side, ItemStackRenderState renderer, ItemModelResolver resolver, ItemTransform transform, int seed) {
-        renderer.appendModelIdentityElement(this);
-        renderer.appendModelIdentityElement(side);
-        renderer.appendModelIdentityElement(transform);
-
-        var layer = renderer.newLayer();
-        layer.setTransform(transform);
-        getModel(side).setupItemLayer(layer);
-    }
-
-    @Override
-    public void renderForLevel(UpgradeData<ITurtleUpgrade> upgrade, TurtleSide side, ITurtleAccess turtle, PoseStack transform, MultiBufferSource buffers, int light, int overlay) {
-        getModel(side).render(transform, buffers, light, overlay);
-    }
-
-    private record Unbaked(ResourceLocation left, ResourceLocation right) implements TurtleUpgradeModel.Unbaked {
-        @Override
-        public MapCodec<? extends TurtleUpgradeModel.Unbaked> type() {
-            return CODEC;
-        }
-
-        @Override
-        public TurtleUpgradeModel bake(ModelBaker baker) {
-            return new BasicUpgradeModel(StandaloneModel.of(left(), baker), StandaloneModel.of(right(), baker));
-        }
-
-        @Override
-        public void resolveDependencies(Resolver resolver) {
-            resolver.markDependency(left());
-            resolver.markDependency(right());
-        }
-    }
-}

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

@@ -1,143 +0,0 @@
-// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.api.client.turtle;
-
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Axis;
-import com.mojang.math.Transformation;
-import com.mojang.serialization.MapCodec;
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.api.turtle.ITurtleAccess;
-import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.api.upgrades.UpgradeData;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.block.model.ItemTransform;
-import net.minecraft.client.renderer.item.ItemModelResolver;
-import net.minecraft.client.renderer.item.ItemStackRenderState;
-import net.minecraft.client.renderer.item.TrackingItemStackRenderState;
-import net.minecraft.client.renderer.special.SpecialModelRenderer;
-import net.minecraft.client.resources.model.ModelBaker;
-import net.minecraft.core.component.DataComponentPatch;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.Mth;
-import net.minecraft.world.item.ItemDisplayContext;
-import net.minecraft.world.item.ItemStack;
-import org.joml.Matrix4f;
-import org.joml.Vector3f;
-import org.jspecify.annotations.Nullable;
-
-import java.util.Set;
-
-/**
- * A sic {@link TurtleUpgradeModel} that renders the upgrade's {@linkplain ITurtleUpgrade#getUpgradeItem(DataComponentPatch)
- * upgrade item}.
- * <p>
- * This uses appropriate transformations for "flat" items, namely those extending the {@literal minecraft:item/generated}
- * model type. It will not appear correct for 3D models with additional depth, such as blocks.
- */
-public final class ItemUpgradeModel implements TurtleUpgradeModel {
-    private static final TurtleUpgradeModel.Unbaked UNBAKED = new Unbaked();
-    private static final TurtleUpgradeModel INSTANCE = new ItemUpgradeModel();
-
-    public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "item");
-    public static final MapCodec<TurtleUpgradeModel.Unbaked> CODEC = MapCodec.unit(UNBAKED);
-
-    private static final TransformedRenderer LEFT = computeRenderer(TurtleSide.LEFT);
-    private static final TransformedRenderer RIGHT = computeRenderer(TurtleSide.RIGHT);
-
-    private ItemUpgradeModel() {
-    }
-
-    /**
-     * Get the unbaked {@link ItemUpgradeModel}.
-     *
-     * @return The unbaked item upgrade model.
-     */
-    public static TurtleUpgradeModel.Unbaked unbaked() {
-        return UNBAKED;
-    }
-
-    @Override
-    public void renderForItem(UpgradeData<ITurtleUpgrade> upgrade, TurtleSide side, ItemStackRenderState renderer, ItemModelResolver resolver, ItemTransform transform, int seed) {
-        renderer.appendModelIdentityElement(this);
-
-        var childState = new TrackingItemStackRenderState();
-        resolver.updateForTopItem(childState, upgrade.getUpgradeItem(), ItemDisplayContext.NONE, null, null, seed);
-        if (!childState.isEmpty()) {
-            renderer.appendModelIdentityElement(childState.getModelIdentity());
-            renderer.appendModelIdentityElement(transform);
-
-            var layer = renderer.newLayer();
-            layer.setTransform(transform);
-            layer.setupSpecialModel(getRenderer(side), childState);
-        }
-    }
-
-    @Override
-    public void renderForLevel(UpgradeData<ITurtleUpgrade> upgrade, TurtleSide side, ITurtleAccess turtle, PoseStack transform, MultiBufferSource buffers, int light, int overlay) {
-        transform.mulPose(getRenderer(side).transform().getMatrix());
-        transform.mulPose(Axis.YP.rotation(Mth.PI));
-        Minecraft.getInstance().getItemRenderer().renderStatic(
-            upgrade.getUpgradeItem(), ItemDisplayContext.FIXED, light, overlay, transform, buffers, turtle.getLevel(), 0
-        );
-    }
-
-    private static final class Unbaked implements TurtleUpgradeModel.Unbaked {
-        @Override
-        public MapCodec<? extends TurtleUpgradeModel.Unbaked> type() {
-            return CODEC;
-        }
-
-        @Override
-        public TurtleUpgradeModel bake(ModelBaker baker) {
-            return INSTANCE;
-        }
-
-        @Override
-        public void resolveDependencies(Resolver resolver) {
-        }
-    }
-
-    private static TransformedRenderer computeRenderer(TurtleSide side) {
-        var pose = new Matrix4f();
-        pose.translate(0.5f, 0.5f, 0.5f);
-        pose.rotate(Axis.YN.rotationDegrees(90f));
-        pose.rotate(Axis.ZP.rotationDegrees(90f));
-        pose.translate(0.0f, 0.0f, side == TurtleSide.RIGHT ? -0.4065f : 0.4065f);
-        return new TransformedRenderer(new Transformation(pose));
-    }
-
-    private static TransformedRenderer getRenderer(TurtleSide side) {
-        return switch (side) {
-            case LEFT -> LEFT;
-            case RIGHT -> RIGHT;
-        };
-    }
-
-    private record TransformedRenderer(Transformation transform) implements SpecialModelRenderer<ItemStackRenderState> {
-        @Override
-        public void render(
-            @Nullable ItemStackRenderState state, ItemDisplayContext itemDisplayContext, PoseStack poseStack,
-            MultiBufferSource multiBufferSource, int overlay, int light, boolean bl
-        ) {
-            if (state == null) return;
-            poseStack.pushPose();
-            poseStack.mulPose(transform.getMatrix());
-            state.render(poseStack, multiBufferSource, overlay, light);
-            poseStack.popPose();
-        }
-
-        @Override
-        public void getExtents(Set<Vector3f> set) {
-        }
-
-        @Override
-        public @Nullable ItemStackRenderState extractArgument(ItemStack itemStack) {
-            return null;
-        }
-    }
-}

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

@@ -1,25 +0,0 @@
-// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.api.client.turtle;
-
-import com.mojang.serialization.MapCodec;
-import net.minecraft.resources.ResourceLocation;
-
-/**
- * A functional interface to register a {@link TurtleUpgradeModel}.
- * <p>
- * This interface is largely intended to be used from multi-loader code, to allow sharing registration code between
- * multiple loaders.
- */
-@FunctionalInterface
-public interface RegisterTurtleUpgradeModel {
-    /**
-     * Register a {@link TurtleUpgradeModel}.
-     *
-     * @param id    The id used for this type of upgrade model.
-     * @param model The codec used to read/decode an upgrade model.
-     */
-    void register(ResourceLocation id, MapCodec<? extends TurtleUpgradeModel.Unbaked> model);
-}

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

@@ -0,0 +1,26 @@
+// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.api.client.turtle;
+
+import dan200.computercraft.api.turtle.ITurtleUpgrade;
+import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser;
+
+/**
+ * A functional interface to register a {@link TurtleUpgradeModeller} for a class of turtle upgrades.
+ * <p>
+ * This interface is largely intended to be used from multi-loader code, to allow sharing registration code between
+ * multiple loaders.
+ */
+@FunctionalInterface
+public interface RegisterTurtleUpgradeModeller {
+    /**
+     * Register a {@link TurtleUpgradeModeller}.
+     *
+     * @param serialiser The turtle upgrade serialiser.
+     * @param modeller   The upgrade modeller.
+     * @param <T>        The type of the turtle upgrade.
+     */
+    <T extends ITurtleUpgrade> void register(TurtleUpgradeSerialiser<T> serialiser, TurtleUpgradeModeller<T> modeller);
+}

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

@@ -1,209 +0,0 @@
-// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.api.client.turtle;
-
-import com.google.common.collect.HashMultiset;
-import com.google.common.collect.Multiset;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.datafixers.util.Pair;
-import com.mojang.serialization.Codec;
-import com.mojang.serialization.DataResult;
-import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.api.turtle.ITurtleAccess;
-import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.api.upgrades.UpgradeData;
-import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import net.minecraft.Util;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.block.model.ItemTransform;
-import net.minecraft.client.renderer.item.ItemModelResolver;
-import net.minecraft.client.renderer.item.ItemStackRenderState;
-import net.minecraft.client.renderer.item.SelectItemModel;
-import net.minecraft.client.resources.model.MissingBlockModel;
-import net.minecraft.client.resources.model.ModelBaker;
-import net.minecraft.core.component.DataComponentType;
-import net.minecraft.resources.ResourceLocation;
-import org.jspecify.annotations.Nullable;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * A {@link TurtleUpgradeModel} which selects between different models based on the value of a component in
- * {@linkplain UpgradeData#data() the upgrade's data}.
- * <p>
- * This is the {@link TurtleUpgradeModel} equivalent of {@link SelectItemModel}.
- *
- * @param <T> The type of value to switch on.
- */
-public final class SelectUpgradeModel<T> implements TurtleUpgradeModel {
-    public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "select");
-    public static final MapCodec<? extends TurtleUpgradeModel.Unbaked> CODEC = RecordCodecBuilder.<Unbaked<?>>mapCodec(instance -> instance.group(
-        Cases.CODEC.forGetter(Unbaked::cases),
-        TurtleUpgradeModel.CODEC.optionalFieldOf("fallback").forGetter(Unbaked::fallback)
-    ).apply(instance, Unbaked::new));
-
-    private final DataComponentType<T> component;
-    private final Map<T, TurtleUpgradeModel> cases;
-    private final TurtleUpgradeModel fallback;
-
-    private SelectUpgradeModel(DataComponentType<T> component, Map<T, TurtleUpgradeModel> cases, TurtleUpgradeModel fallback) {
-        this.component = component;
-        this.cases = cases;
-        this.fallback = fallback;
-    }
-
-    private TurtleUpgradeModel getModel(UpgradeData<ITurtleUpgrade> upgrade) {
-        var value = upgrade.get(component);
-        if (value == null) return fallback;
-
-        var model = cases.get(value);
-        return model != null ? model : fallback;
-    }
-
-    @Override
-    public void renderForItem(UpgradeData<ITurtleUpgrade> upgrade, TurtleSide side, ItemStackRenderState renderer, ItemModelResolver resolver, ItemTransform transform, int seed) {
-        getModel(upgrade).renderForItem(upgrade, side, renderer, resolver, transform, seed);
-    }
-
-    @Override
-    public void renderForLevel(UpgradeData<ITurtleUpgrade> upgrade, TurtleSide side, ITurtleAccess turtle, PoseStack transform, MultiBufferSource buffers, int light, int overlay) {
-        getModel(upgrade).renderForLevel(upgrade, side, turtle, transform, buffers, light, overlay);
-    }
-
-    private record Unbaked<T>(
-        Cases<T> cases,
-        Optional<TurtleUpgradeModel.Unbaked> fallback
-    ) implements TurtleUpgradeModel.Unbaked {
-        private static final TurtleUpgradeModel.Unbaked MISSING = BasicUpgradeModel.unbaked(MissingBlockModel.LOCATION, MissingBlockModel.LOCATION);
-
-        @Override
-        public MapCodec<? extends TurtleUpgradeModel.Unbaked> type() {
-            return CODEC;
-        }
-
-        @Override
-        public TurtleUpgradeModel bake(ModelBaker baker) {
-            Map<T, TurtleUpgradeModel> cases = new Object2ObjectOpenHashMap<>();
-            for (var condition : cases().cases()) {
-                var model = condition.getSecond().bake(baker);
-                for (var when : condition.getFirst()) cases.put(when, model);
-            }
-
-            return new SelectUpgradeModel<>(cases().component(), cases, fallback().orElse(MISSING).bake(baker));
-        }
-
-        @Override
-        public void resolveDependencies(Resolver resolver) {
-            cases().cases().forEach(x -> x.getSecond().resolveDependencies(resolver));
-            fallback().orElse(MISSING).resolveDependencies(resolver);
-        }
-    }
-
-    private record Cases<T>(DataComponentType<T> component, List<Pair<List<T>, TurtleUpgradeModel.Unbaked>> cases) {
-        private static final MapCodec<Cases<?>> CODEC = DataComponentType.CODEC.dispatchMap("property", Cases::component, Util.memoize(Cases::codec));
-
-        private static <T> MapCodec<Cases<T>> codec(DataComponentType<T> component) {
-            return RecordCodecBuilder.mapCodec(instance -> instance.group(
-                MapCodec.unit(component).forGetter(Cases::component),
-                caseCodec(component.codecOrThrow()).listOf().fieldOf("cases").validate(Cases::validate).forGetter(Cases::cases)
-            ).apply(instance, Cases<T>::new));
-        }
-
-        private static <T> Codec<Pair<List<T>, TurtleUpgradeModel.Unbaked>> caseCodec(Codec<T> codec) {
-            return RecordCodecBuilder.create(instance -> instance.group(
-                codec.listOf().fieldOf("when").forGetter(Pair::getFirst),
-                TurtleUpgradeModel.CODEC.fieldOf("model").forGetter(Pair::getSecond)
-            ).apply(instance, Pair::new));
-        }
-
-        private static <T> DataResult<List<Pair<List<T>, TurtleUpgradeModel.Unbaked>>> validate(List<Pair<List<T>, TurtleUpgradeModel.Unbaked>> cases) {
-            Multiset<T> multiset = HashMultiset.create();
-            for (var condition : cases) multiset.addAll(condition.getFirst());
-
-            if (multiset.isEmpty()) return DataResult.error(() -> "Empty cases");
-            if (multiset.size() != multiset.entrySet().size()) {
-                return DataResult.error(() -> "Duplicate case conditions: " + multiset.entrySet().stream()
-                    .filter(x -> x.getCount() > 1)
-                    .map(x -> Objects.toString(x.getElement()))
-                    .collect(Collectors.joining(", ")));
-            }
-
-            return DataResult.success(cases);
-        }
-    }
-
-    /**
-     * Create a {@link SelectUpgradeModel} that selects a model based on a component.
-     *
-     * @param component The component to select.
-     * @param <T>       The type the component stores.
-     * @return A {@link Builder}.
-     */
-    public static <T> Builder<T> onComponent(DataComponentType<T> component) {
-        return new Builder<>(component);
-    }
-
-    /**
-     * A builder for constructing {@link SelectUpgradeModel}s.
-     *
-     * @param <T> The type of value to switch on.
-     */
-    public static final class Builder<T> {
-        private final DataComponentType<T> component;
-        private final List<Pair<List<T>, TurtleUpgradeModel.Unbaked>> cases = new ArrayList<>();
-        private TurtleUpgradeModel.@Nullable Unbaked fallback;
-
-        private Builder(DataComponentType<T> component) {
-            this.component = component;
-        }
-
-        /**
-         * Add a case to our model.
-         *
-         * @param value The value for this case.
-         * @param model The model to use.
-         * @return {@code this}, for chaining.
-         */
-        public Builder<T> when(T value, TurtleUpgradeModel.Unbaked model) {
-            return when(List.of(value), model);
-        }
-
-        /**
-         * Add a case to our model.
-         *
-         * @param values The value(s) for this case.
-         * @param model  The model to use.
-         * @return {@code this}, for chaining.
-         */
-        public Builder<T> when(List<T> values, TurtleUpgradeModel.Unbaked model) {
-            cases.add(Pair.of(values, model));
-            return this;
-        }
-
-        /**
-         * Add a fallback value, when no previous value matches or the component is not present.
-         *
-         * @param model The fallback model.
-         * @return {@code this}, for chaining.
-         */
-        public Builder<T> fallback(TurtleUpgradeModel.Unbaked model) {
-            this.fallback = model;
-            return this;
-        }
-
-        /**
-         * Convert this builder into an unbaked model.
-         *
-         * @return The unbaked {@link SelectUpgradeModel}.
-         */
-        public TurtleUpgradeModel.Unbaked create() {
-            return new Unbaked<>(new Cases<>(component, cases), Optional.ofNullable(fallback));
-        }
-    }
-}

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

@@ -1,110 +0,0 @@
-// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.api.client.turtle;
-
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.serialization.Codec;
-import com.mojang.serialization.MapCodec;
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.api.turtle.ITurtleAccess;
-import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.api.upgrades.UpgradeData;
-import dan200.computercraft.impl.client.ComputerCraftAPIClientService;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.block.model.ItemTransform;
-import net.minecraft.client.renderer.item.ItemModel;
-import net.minecraft.client.renderer.item.ItemModelResolver;
-import net.minecraft.client.renderer.item.ItemStackRenderState;
-import net.minecraft.client.resources.model.ModelBaker;
-import net.minecraft.client.resources.model.ResolvableModel;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.item.ItemDisplayContext;
-import net.minecraft.world.item.ItemStack;
-
-/**
- * The model for a {@link ITurtleUpgrade}.
- * <p>
- * Turtle upgrade models are very similar to vanilla's {@link ItemModel}. Each upgrade's model is defined in JSON, and
- * loaded from resource packs with other assets.
- * <p>
- * In most cases, upgrades can use one of the existing implementations of {@link TurtleUpgradeModel} (e.g.
- * {@link BasicUpgradeModel} or {@link ItemUpgradeModel}), and do not need to subclass it. However, in the cases where
- * a custom model is required, one should use
- * {@code dan200.computercraft.api.client.FabricComputerCraftAPIClient#registerTurtleUpgradeModel} to register a
- * model on Fabric and {@code dan200.computercraft.api.client.turtle.RegisterTurtleModelEvent} to register one
- * on Forge.
- * <p>
- * See {@link ITurtleUpgrade} for a full example of registering turtle upgrades and their models.
- *
- * @see RegisterTurtleUpgradeModel For multi-loader registration support.
- * @see ItemUpgradeModel A {@code TurtleUpgradeModel} which uses the upgrade's item.
- * @see BasicUpgradeModel A {@code TurtleUpgradeModel} which renders a simple model.
- */
-public interface TurtleUpgradeModel {
-    /**
-     * The directory from which turtle upgrade models are loaded. This may be used by data generators.
-     */
-    String SOURCE = ComputerCraftAPI.MOD_ID + "/turtle_upgrade";
-
-    /**
-     * The codec used to read/write {@linkplain TurtleUpgradeModel.Unbaked unbaked upgrade models}.
-     */
-    Codec<TurtleUpgradeModel.Unbaked> CODEC = Codec.lazyInitialized(() -> ComputerCraftAPIClientService.get().getTurtleUpgradeModelCodec());
-
-    /**
-     * Render this upgrade to an {@link ItemStackRenderState}. This is used for rendering the item form of the upgrade.
-     * <p>
-     * Like with {@link ItemModel}, implementations must be careful to call {@link ItemStackRenderState#appendModelIdentityElement}
-     * where appropriate.
-     *
-     * @param upgrade   The upgrade being rendered.
-     * @param side      Which side of the turtle (left or right) the upgrade is equipped on.
-     * @param renderer  The render state to draw to.
-     * @param resolver  The model resolver.
-     * @param transform The root model's transformation.
-     * @param seed      The current model seed.
-     * @see ItemModel#update(ItemStackRenderState, ItemStack, ItemModelResolver, ItemDisplayContext, ClientLevel, LivingEntity, int)
-     */
-    void renderForItem(UpgradeData<ITurtleUpgrade> upgrade, TurtleSide side, ItemStackRenderState renderer, ItemModelResolver resolver, ItemTransform transform, int seed);
-
-    /**
-     * Render this upgrade to a {@link MultiBufferSource}. This is used for rendering the block-entity form of the
-     * upgrade.
-     *
-     * @param upgrade   The upgrade being rendered.
-     * @param side      Which side of the turtle (left or right) the upgrade is equipped on.
-     * @param turtle    Access to the turtle that the upgrade resides on.
-     * @param transform The current pose stack.
-     * @param buffers   The buffers to render to.
-     * @param light     The lightmap coordinate.
-     * @param overlay   The overlay coordinate.
-     */
-    void renderForLevel(UpgradeData<ITurtleUpgrade> upgrade, TurtleSide side, ITurtleAccess turtle, PoseStack transform, MultiBufferSource buffers, int light, int overlay);
-
-    /**
-     * An unbaked turtle model. Much like other unbaked models (e.g. {@link ItemModel.Unbaked}), this should resolve
-     * any dependencies and returned the fully-resolved model.
-     */
-    interface Unbaked extends ResolvableModel {
-        /**
-         * The {@link MapCodec} used to read/write this unbaked model.
-         *
-         * @return The codec used to read/write this model.
-         * @see ItemModel.Unbaked#type()
-         */
-        MapCodec<? extends Unbaked> type();
-
-        /**
-         * Bake this turtle model.
-         *
-         * @param baker The current model baker
-         * @return The baked upgrade model.
-         * @see ItemModel.Unbaked#bake(ItemModel.BakingContext)
-         */
-        TurtleUpgradeModel bake(ModelBaker baker);
-    }
-}

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

@@ -0,0 +1,129 @@
+// SPDX-FileCopyrightText: 2022 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.api.client.turtle;
+
+import dan200.computercraft.api.client.TransformedModel;
+import dan200.computercraft.api.turtle.ITurtleAccess;
+import dan200.computercraft.api.turtle.ITurtleUpgrade;
+import dan200.computercraft.api.turtle.TurtleSide;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.client.resources.model.UnbakedModel;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.resources.ResourceLocation;
+import org.jspecify.annotations.Nullable;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Provides models for a {@link ITurtleUpgrade}.
+ * <p>
+ * Use {@code dan200.computercraft.api.client.FabricComputerCraftAPIClient#registerTurtleUpgradeModeller} to register a
+ * modeller on Fabric and {@code dan200.computercraft.api.client.turtle.RegisterTurtleModellersEvent} to register one
+ * on Forge.
+ *
+ * <h2>Example</h2>
+ * <h3>Fabric</h3>
+ * {@snippet class=com.example.examplemod.FabricExampleModClient region=turtle_modellers}
+ *
+ * <h3>Forge</h3>
+ * {@snippet class=com.example.examplemod.FabricExampleModClient region=turtle_modellers}
+ *
+ * @param <T> The type of turtle upgrade this modeller applies to.
+ * @see RegisterTurtleUpgradeModeller For multi-loader registration support.
+ */
+public interface TurtleUpgradeModeller<T extends ITurtleUpgrade> {
+    /**
+     * Obtain the model to be used when rendering a turtle peripheral.
+     * <p>
+     * When the current turtle is {@literal null}, this function should be constant for a given upgrade and side.
+     *
+     * @param upgrade The upgrade that you're getting the model for.
+     * @param turtle  Access to the turtle that the upgrade resides on. This will be null when getting item models, unless
+     *                {@link #getModel(ITurtleUpgrade, CompoundTag, TurtleSide)} is overriden.
+     * @param side    Which side of the turtle (left or right) the upgrade resides on.
+     * @return The model that you wish to be used to render your upgrade.
+     */
+    TransformedModel getModel(T upgrade, @Nullable ITurtleAccess turtle, TurtleSide side);
+
+    /**
+     * Obtain the model to be used when rendering a turtle peripheral.
+     * <p>
+     * This is used when rendering the turtle's item model, and so no {@link ITurtleAccess} is available.
+     *
+     * @param upgrade The upgrade that you're getting the model for.
+     * @param data    Upgrade data instance for current turtle side.
+     * @param side    Which side of the turtle (left or right) the upgrade resides on.
+     * @return The model that you wish to be used to render your upgrade.
+     */
+    default TransformedModel getModel(T upgrade, CompoundTag data, TurtleSide side) {
+        return getModel(upgrade, (ITurtleAccess) null, side);
+    }
+
+
+    /**
+     * Get a list of models that this turtle modeller depends on.
+     * <p>
+     * Models included in this list will be loaded and baked alongside item and block models, and so may be referenced
+     * by {@link TransformedModel#of(ResourceLocation)}. You do not need to override this method if you will load models
+     * by other means.
+     *
+     * @return A list of models that this modeller depends on.
+     * @see UnbakedModel#getDependencies()
+     */
+    default Collection<ResourceLocation> getDependencies() {
+        return List.of();
+    }
+
+    /**
+     * A basic {@link TurtleUpgradeModeller} which renders using the upgrade's {@linkplain ITurtleUpgrade#getUpgradeItem(CompoundTag)}
+     * upgrade item}.
+     * <p>
+     * This uses appropriate transformations for "flat" items, namely those extending the {@literal minecraft:item/generated}
+     * model type. It will not appear correct for 3D models with additional depth, such as blocks.
+     *
+     * @param <T> The type of the turtle upgrade.
+     * @return The constructed modeller.
+     */
+    @SuppressWarnings("unchecked")
+    static <T extends ITurtleUpgrade> TurtleUpgradeModeller<T> flatItem() {
+        return (TurtleUpgradeModeller<T>) TurtleUpgradeModellers.UPGRADE_ITEM;
+    }
+
+    /**
+     * Construct a {@link TurtleUpgradeModeller} which has a single model for the left and right side.
+     *
+     * @param left  The model to use on the left.
+     * @param right The model to use on the right.
+     * @param <T>   The type of the turtle upgrade.
+     * @return The constructed modeller.
+     */
+    static <T extends ITurtleUpgrade> TurtleUpgradeModeller<T> sided(ModelResourceLocation left, ModelResourceLocation right) {
+        // TODO(1.21.0): Remove this.
+        return sided((ResourceLocation) left, right);
+    }
+
+    /**
+     * Construct a {@link TurtleUpgradeModeller} which has a single model for the left and right side.
+     *
+     * @param left  The model to use on the left.
+     * @param right The model to use on the right.
+     * @param <T>   The type of the turtle upgrade.
+     * @return The constructed modeller.
+     */
+    static <T extends ITurtleUpgrade> TurtleUpgradeModeller<T> sided(ResourceLocation left, ResourceLocation right) {
+        return new TurtleUpgradeModeller<>() {
+            @Override
+            public TransformedModel getModel(T upgrade, @Nullable ITurtleAccess turtle, TurtleSide side) {
+                return TransformedModel.of(side == TurtleSide.LEFT ? left : right);
+            }
+
+            @Override
+            public Collection<ResourceLocation> getDependencies() {
+                return List.of(left, right);
+            }
+        };
+    }
+}

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

@@ -0,0 +1,54 @@
+// SPDX-FileCopyrightText: 2022 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.api.client.turtle;
+
+import com.mojang.math.Transformation;
+import dan200.computercraft.api.client.TransformedModel;
+import dan200.computercraft.api.turtle.ITurtleAccess;
+import dan200.computercraft.api.turtle.ITurtleUpgrade;
+import dan200.computercraft.api.turtle.TurtleSide;
+import dan200.computercraft.impl.client.ClientPlatformHelper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.item.ItemStack;
+import org.joml.Matrix4f;
+import org.jspecify.annotations.Nullable;
+
+final class TurtleUpgradeModellers {
+    private static final Transformation leftTransform = getMatrixFor(-0.4065f);
+    private static final Transformation rightTransform = getMatrixFor(0.4065f);
+
+    private static Transformation getMatrixFor(float offset) {
+        var matrix = new Matrix4f();
+        matrix.set(new float[]{
+            0.0f, 0.0f, -1.0f, 1.0f + offset,
+            1.0f, 0.0f, 0.0f, 0.0f,
+            0.0f, -1.0f, 0.0f, 1.0f,
+            0.0f, 0.0f, 0.0f, 1.0f,
+        });
+        matrix.transpose();
+        return new Transformation(matrix);
+    }
+
+    static final TurtleUpgradeModeller<ITurtleUpgrade> UPGRADE_ITEM = new UpgradeItemModeller();
+
+    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);
+        }
+
+        @Override
+        public TransformedModel getModel(ITurtleUpgrade upgrade, CompoundTag data, TurtleSide side) {
+            return getModel(upgrade.getUpgradeItem(data), side);
+        }
+
+        private TransformedModel getModel(ItemStack stack, TurtleSide side) {
+            var model = Minecraft.getInstance().getItemRenderer().getItemModelShaper().getItemModel(stack);
+            if (stack.hasFoil()) model = ClientPlatformHelper.get().createdFoiledModel(model);
+            return new TransformedModel(model, side == TurtleSide.LEFT ? leftTransform : rightTransform);
+        }
+    }
+}

projects/common-api/src/client/java/dan200/computercraft/impl/client/ClientPlatformHelper.java

@@ -0,0 +1,54 @@
+// SPDX-FileCopyrightText: 2022 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.impl.client;
+
+import dan200.computercraft.impl.Services;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.client.resources.model.ModelManager;
+import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.resources.ResourceLocation;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.Nullable;
+
+@ApiStatus.Internal
+public interface ClientPlatformHelper {
+    /**
+     * Equivalent to {@link ModelManager#getModel(ModelResourceLocation)} but for arbitrary {@link ResourceLocation}s.
+     *
+     * @param manager  The model manager.
+     * @param location The model location.
+     * @return The baked model.
+     */
+    BakedModel getModel(ModelManager manager, ResourceLocation location);
+
+    /**
+     * Wrap this model in a version which renders a foil/enchantment glint.
+     *
+     * @param model The model to wrap.
+     * @return The wrapped model.
+     * @see RenderType#glint()
+     */
+    BakedModel createdFoiledModel(BakedModel model);
+
+    static ClientPlatformHelper get() {
+        var instance = Instance.INSTANCE;
+        return instance == null ? Services.raise(ClientPlatformHelper.class, Instance.ERROR) : instance;
+    }
+
+    final class Instance {
+        static final @Nullable ClientPlatformHelper INSTANCE;
+        static final @Nullable Throwable ERROR;
+
+        static {
+            var helper = Services.tryLoad(ClientPlatformHelper.class);
+            INSTANCE = helper.instance();
+            ERROR = helper.error();
+        }
+
+        private Instance() {
+        }
+    }
+}

projects/common-api/src/client/java/dan200/computercraft/impl/client/ComputerCraftAPIClientService.java

@@ -1,17 +1,19 @@
-// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
+// SPDX-FileCopyrightText: 2022 The CC: Tweaked Developers
 //
 // SPDX-License-Identifier: MPL-2.0
 
 package dan200.computercraft.impl.client;
 
-import com.mojang.serialization.Codec;
-import dan200.computercraft.api.client.turtle.TurtleUpgradeModel;
+import dan200.computercraft.api.client.ComputerCraftAPIClient;
+import dan200.computercraft.api.client.turtle.TurtleUpgradeModeller;
+import dan200.computercraft.api.turtle.ITurtleUpgrade;
+import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser;
 import dan200.computercraft.impl.Services;
 import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.Nullable;
 
 /**
- * Bridge between implementation
+ * Backing interface for {@link ComputerCraftAPIClient}
  * <p>
  * Do <strong>NOT</strong> directly reference this class. It exists for internal use by the API.
  */
@@ -22,7 +24,7 @@ public interface ComputerCraftAPIClientService {
         return instance == null ? Services.raise(ComputerCraftAPIClientService.class, Instance.ERROR) : instance;
     }
 
-    Codec<TurtleUpgradeModel.Unbaked> getTurtleUpgradeModelCodec();
+    <T extends ITurtleUpgrade> void registerTurtleUpgradeModeller(TurtleUpgradeSerialiser<T> serialiser, TurtleUpgradeModeller<T> modeller);
 
     final class Instance {
         static final @Nullable ComputerCraftAPIClientService INSTANCE;

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

@@ -11,6 +11,8 @@ import dan200.computercraft.api.lua.GenericSource;
 import dan200.computercraft.api.lua.IComputerSystem;
 import dan200.computercraft.api.lua.ILuaAPI;
 import dan200.computercraft.api.lua.ILuaAPIFactory;
+import dan200.computercraft.api.media.IMedia;
+import dan200.computercraft.api.media.MediaProvider;
 import dan200.computercraft.api.network.PacketNetwork;
 import dan200.computercraft.api.network.wired.WiredElement;
 import dan200.computercraft.api.network.wired.WiredNode;
@@ -140,6 +142,16 @@ public final class ComputerCraftAPI {
         return getInstance().getBundledRedstoneOutput(world, pos, side);
     }
 
+    /**
+     * Registers a media provider to provide {@link IMedia} implementations for Items.
+     *
+     * @param provider The media provider to register.
+     * @see MediaProvider
+     */
+    public static void registerMediaProvider(MediaProvider provider) {
+        getInstance().registerMediaProvider(provider);
+    }
+
     /**
      * Attempt to get the game-wide wireless network.
      *

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

@@ -6,12 +6,10 @@ package dan200.computercraft.api;
 
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.ItemTags;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
@@ -51,16 +49,8 @@ public class ComputerCraftTags {
          */
         public static final TagKey<Item> TURTLE_CAN_PLACE = make("turtle_can_place");
 
-        /**
-         * Items which can be dyed.
-         * <p>
-         * This is similar to {@link ItemTags#DYEABLE}, but allows cleaning the item with a sponge, rather than in a
-         * cauldron.
-         */
-        public static final TagKey<Item> DYEABLE = make("dyeable");
-
         private static TagKey<Item> make(String name) {
-            return TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, name));
+            return TagKey.create(Registries.ITEM, new ResourceLocation(ComputerCraftAPI.MOD_ID, name));
         }
     }
 
@@ -99,13 +89,13 @@ public class ComputerCraftTags {
         public static final TagKey<Block> TURTLE_HOE_BREAKABLE = make("turtle_hoe_harvestable");
 
         /**
-         * Block which can be {@linkplain BlockState#useItemOn(ItemStack, Level, Player, InteractionHand, BlockHitResult) used}
-         * when calling {@code turtle.place()}.
+         * Block which can be {@linkplain BlockState#use(Level, Player, InteractionHand, BlockHitResult) used} when
+         * calling {@code turtle.place()}.
          */
         public static final TagKey<Block> TURTLE_CAN_USE = make("turtle_can_use");
 
         private static TagKey<Block> make(String name) {
-            return TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, name));
+            return TagKey.create(Registries.BLOCK, new ResourceLocation(ComputerCraftAPI.MOD_ID, name));
         }
     }
 }

projects/common-api/src/main/java/dan200/computercraft/api/component/ComputerComponents.java

@@ -6,7 +6,6 @@ package dan200.computercraft.api.component;
 
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.pocket.IPocketAccess;
-import dan200.computercraft.api.pocket.PocketComputer;
 import dan200.computercraft.api.turtle.ITurtleAccess;
 
 /**
@@ -21,7 +20,7 @@ public class ComputerComponents {
     /**
      * The {@link IPocketAccess} associated with a pocket computer.
      */
-    public static final ComputerComponent<PocketComputer> POCKET = ComputerComponent.create(ComputerCraftAPI.MOD_ID, "pocket");
+    public static final ComputerComponent<IPocketAccess> POCKET = ComputerComponent.create(ComputerCraftAPI.MOD_ID, "pocket");
 
     /**
      * This component is only present on "command computers", and other computers with admin capabilities.

projects/common-api/src/main/java/dan200/computercraft/api/detail/ComponentDetailProvider.java

@@ -1,72 +0,0 @@
-// SPDX-FileCopyrightText: 2024 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.api.detail;
-
-import net.minecraft.core.component.DataComponentHolder;
-import net.minecraft.core.component.DataComponentType;
-import net.minecraft.world.item.ItemStack;
-import org.jspecify.annotations.Nullable;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * An item detail provider for a specific {@linkplain DataComponentType data component} on {@link ItemStack}s or
- * other {@link DataComponentHolder}.
- *
- * @param <T> The type of the component's contents.
- */
-public abstract class ComponentDetailProvider<T> implements DetailProvider<DataComponentHolder> {
-    private final DataComponentType<T> component;
-    private final @Nullable String namespace;
-
-    /**
-     * Create a new component detail provider. Details will be inserted into a new sub-map named as per {@code namespace}.
-     *
-     * @param component The data component to provide details for.
-     * @param namespace The namespace to use for this provider.
-     */
-    public ComponentDetailProvider(@Nullable String namespace, DataComponentType<T> component) {
-        Objects.requireNonNull(component);
-        this.component = component;
-        this.namespace = namespace;
-    }
-
-    /**
-     * Create a new component detail provider. Details will be inserted directly into the results.
-     *
-     * @param component The data component to provide details for.
-     */
-    public ComponentDetailProvider(DataComponentType<T> component) {
-        this(null, component);
-    }
-
-    /**
-     * Provide additional details for the given data component. This method is called by {@code turtle.getItemDetail()}.
-     * New properties should be added to the given {@link Map}, {@code data}.
-     * <p>
-     * This method is always called on the server thread, so it is safe to interact with the world here, but you should
-     * take care to avoid long blocking operations as this will stall the server and other computers.
-     *
-     * @param data      The full details to be returned for this item stack. New properties should be added to this map.
-     * @param component The component to provide details for.
-     */
-    public abstract void provideComponentDetails(Map<? super String, Object> data, T component);
-
-    @Override
-    public final void provideDetails(Map<? super String, Object> data, DataComponentHolder holder) {
-        var value = holder.get(component);
-        if (value == null) return;
-
-        if (namespace == null) {
-            provideComponentDetails(data, value);
-        } else {
-            Map<? super String, Object> child = new HashMap<>();
-            provideComponentDetails(child, value);
-            data.put(namespace, child);
-        }
-    }
-}

projects/common-api/src/main/java/dan200/computercraft/api/media/IMedia.java

@@ -7,32 +7,28 @@ package dan200.computercraft.api.media;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.filesystem.Mount;
 import dan200.computercraft.api.filesystem.WritableMount;
-import net.minecraft.core.Holder;
-import net.minecraft.core.HolderLookup;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.JukeboxSong;
 import org.jspecify.annotations.Nullable;
 
 /**
  * Represents an item that can be placed in a disk drive and used by a Computer.
  * <p>
- * Implement this interface on your {@link Item} class to allow it to be used in the drive, or register via
- * {@code dan200.computercraft.api.media.MediaLookup} (Fabric) or {@code dan200.computercraft.api.media.MediaCapability}
- * (NeoForge).
+ * Implement this interface on your {@link Item} class to allow it to be used in the drive. Alternatively, register
+ * a {@link MediaProvider}.
  */
 public interface IMedia {
     /**
      * Get a string representing the label of this item. Will be called via {@code disk.getLabel()} in lua.
      *
-     * @param registries The currently loaded registries.
-     * @param stack      The {@link ItemStack} to inspect.
+     * @param stack The {@link ItemStack} to inspect.
      * @return The label. ie: "Dan's Programs".
      */
     @Nullable
-    String getLabel(HolderLookup.Provider registries, ItemStack stack);
+    String getLabel(ItemStack stack);
 
     /**
      * Set a string representing the label of this item. Will be called vi {@code disk.setLabel()} in lua.
@@ -46,15 +42,26 @@ public interface IMedia {
     }
 
     /**
-     * If this disk represents an item with audio (like a record), get the corresponding {@link JukeboxSong}.
+     * If this disk represents an item with audio (like a record), get the readable name of the audio track. ie:
+     * "Jonathan Coulton - Still Alive"
      *
-     * @param registries The currently loaded registries.
-     * @param stack      The {@link ItemStack} to query.
-     * @return The song, or null if this item does not represent an item with audio.
+     * @param stack The {@link ItemStack} to modify.
+     * @return The name, or null if this item does not represent an item with audio.
      */
     @Nullable
-    default Holder<JukeboxSong> getAudio(HolderLookup.Provider registries, ItemStack stack) {
-        return JukeboxSong.fromStack(registries, stack).orElse(null);
+    default String getAudioTitle(ItemStack stack) {
+        return null;
+    }
+
+    /**
+     * If this disk represents an item with audio (like a record), get the resource name of the audio track to play.
+     *
+     * @param stack The {@link ItemStack} to modify.
+     * @return The name, or null if this item does not represent an item with audio.
+     */
+    @Nullable
+    default SoundEvent getAudio(ItemStack stack) {
+        return null;
     }
 
     /**

projects/common-api/src/main/java/dan200/computercraft/api/media/MediaProvider.java

@@ -0,0 +1,26 @@
+// Copyright Daniel Ratcliffe, 2011-2022. This API may be redistributed unmodified and in full only.
+//
+// SPDX-License-Identifier: LicenseRef-CCPL
+
+package dan200.computercraft.api.media;
+
+import net.minecraft.world.item.ItemStack;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * This interface is used to provide {@link IMedia} implementations for {@link ItemStack}.
+ *
+ * @see dan200.computercraft.api.ComputerCraftAPI#registerMediaProvider(MediaProvider)
+ */
+@FunctionalInterface
+public interface MediaProvider {
+    /**
+     * Produce an IMedia implementation from an ItemStack.
+     *
+     * @param stack The stack from which to extract the media information.
+     * @return An {@link IMedia} implementation, or {@code null} if the item is not something you wish to handle
+     * @see dan200.computercraft.api.ComputerCraftAPI#registerMediaProvider(MediaProvider)
+     */
+    @Nullable
+    IMedia getMedia(ItemStack stack);
+}

projects/common-api/src/main/java/dan200/computercraft/api/network/wired/WiredNetwork.java

@@ -0,0 +1,92 @@
+// SPDX-FileCopyrightText: 2018 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.api.network.wired;
+
+import dan200.computercraft.api.peripheral.IPeripheral;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.util.Map;
+
+/**
+ * A wired network is composed of one of more {@link WiredNode}s, a set of connections between them, and a series
+ * of peripherals.
+ * <p>
+ * Networks from a connected graph. This means there is some path between all nodes on the network. Further more, if
+ * there is some path between two nodes then they must be on the same network. {@link WiredNetwork} will automatically
+ * handle the merging and splitting of networks (and thus changing of available nodes and peripherals) as connections
+ * change.
+ * <p>
+ * This does mean one can not rely on the network remaining consistent between subsequent operations. Consequently,
+ * it is generally preferred to use the methods provided by {@link WiredNode}.
+ *
+ * @see WiredNode#getNetwork()
+ */
+@ApiStatus.NonExtendable
+public interface WiredNetwork {
+    /**
+     * Create a connection between two nodes.
+     * <p>
+     * This should only be used on the server thread.
+     *
+     * @param left  The first node to connect
+     * @param right The second node to connect
+     * @return {@code true} if a connection was created or {@code false} if the connection already exists.
+     * @throws IllegalStateException    If neither node is on the network.
+     * @throws IllegalArgumentException If {@code left} and {@code right} are equal.
+     * @see WiredNode#connectTo(WiredNode)
+     * @see WiredNetwork#connect(WiredNode, WiredNode)
+     * @deprecated Use {@link WiredNode#connectTo(WiredNode)}
+     */
+    @Deprecated
+    boolean connect(WiredNode left, WiredNode right);
+
+    /**
+     * Destroy a connection between this node and another.
+     * <p>
+     * This should only be used on the server thread.
+     *
+     * @param left  The first node in the connection.
+     * @param right The second node in the connection.
+     * @return {@code true} if a connection was destroyed or {@code false} if no connection exists.
+     * @throws IllegalArgumentException If either node is not on the network.
+     * @throws IllegalArgumentException If {@code left} and {@code right} are equal.
+     * @see WiredNode#disconnectFrom(WiredNode)
+     * @see WiredNetwork#connect(WiredNode, WiredNode)
+     * @deprecated Use {@link WiredNode#disconnectFrom(WiredNode)}
+     */
+    @Deprecated
+    boolean disconnect(WiredNode left, WiredNode right);
+
+    /**
+     * Sever all connections this node has, removing it from this network.
+     * <p>
+     * This should only be used on the server thread. You should only call this on nodes
+     * that your network element owns.
+     *
+     * @param node The node to remove
+     * @return Whether this node was removed from the network. One cannot remove a node from a network where it is the
+     * only element.
+     * @throws IllegalArgumentException If the node is not in the network.
+     * @see WiredNode#remove()
+     * @deprecated Use {@link WiredNode#remove()}
+     */
+    @Deprecated
+    boolean remove(WiredNode node);
+
+    /**
+     * Update the peripherals a node provides.
+     * <p>
+     * This should only be used on the server thread. You should only call this on nodes
+     * that your network element owns.
+     *
+     * @param node        The node to attach peripherals for.
+     * @param peripherals The new peripherals for this node.
+     * @throws IllegalArgumentException If the node is not in the network.
+     * @see WiredNode#updatePeripherals(Map)
+     * @deprecated Use {@link WiredNode#updatePeripherals(Map)}
+     */
+    @Deprecated
+    void updatePeripherals(WiredNode node, Map<String, IPeripheral> peripherals);
+}

projects/common-api/src/main/java/dan200/computercraft/api/network/wired/WiredNode.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import java.util.Map;
 
 /**
- * A single node on a wired network.
+ * Wired nodes act as a layer between {@link WiredElement}s and {@link WiredNetwork}s.
  * <p>
  * Firstly, a node acts as a packet network, capable of sending and receiving modem messages to connected nodes. These
  * methods may be safely used on any thread.
@@ -32,6 +32,18 @@ public interface WiredNode extends PacketNetwork {
      */
     WiredElement getElement();
 
+    /**
+     * The network this node is currently connected to. Note that this may change
+     * after any network operation, so it should not be cached.
+     * <p>
+     * This should only be used on the server thread.
+     *
+     * @return This node's network.
+     * @deprecated Use the connect/disconnect/remove methods on {@link WiredNode}.
+     */
+    @Deprecated
+    WiredNetwork getNetwork();
+
     /**
      * Create a connection from this node to another.
      * <p>

projects/common-api/src/main/java/dan200/computercraft/api/network/wired/WiredSender.java

@@ -8,12 +8,10 @@ import dan200.computercraft.api.network.PacketSender;
 
 
 /**
- * An object on a wired network capable of sending packets.
+ * An object on a {@link WiredNetwork} capable of sending packets.
  * <p>
  * Unlike a regular {@link PacketSender}, this must be associated with the node you are attempting to
  * to send the packet from.
- *
- * @see WiredElement
  */
 public interface WiredSender extends PacketSender {
     /**

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

@@ -4,7 +4,8 @@
 
 package dan200.computercraft.api.pocket;
 
-import net.minecraft.network.chat.Component;
+import dan200.computercraft.api.upgrades.UpgradeBase;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 
 
@@ -14,20 +15,27 @@ import net.minecraft.world.item.ItemStack;
  * One does not have to use this, but it does provide a convenient template.
  */
 public abstract class AbstractPocketUpgrade implements IPocketUpgrade {
-    private final Component adjective;
+    private final ResourceLocation id;
+    private final String adjective;
     private final ItemStack stack;
 
-    protected AbstractPocketUpgrade(Component adjective, ItemStack stack) {
+    protected AbstractPocketUpgrade(ResourceLocation id, String adjective, ItemStack stack) {
+        this.id = id;
         this.adjective = adjective;
         this.stack = stack;
     }
 
-    protected AbstractPocketUpgrade(String adjective, ItemStack stack) {
-        this(Component.translatable(adjective), stack);
+    protected AbstractPocketUpgrade(ResourceLocation id, ItemStack stack) {
+        this(id, UpgradeBase.getDefaultAdjective(id), stack);
     }
 
     @Override
-    public final Component getAdjective() {
+    public final ResourceLocation getUpgradeID() {
+        return id;
+    }
+
+    @Override
+    public final String getUnlocalisedAdjective() {
         return adjective;
     }
 

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

@@ -4,18 +4,67 @@
 
 package dan200.computercraft.api.pocket;
 
+import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.upgrades.UpgradeBase;
 import dan200.computercraft.api.upgrades.UpgradeData;
-import net.minecraft.core.component.DataComponentPatch;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.Nullable;
 
+import java.util.Map;
+
 /**
- * Access to a pocket computer for {@linkplain IPocketUpgrade pocket upgrades}.
+ * Wrapper class for pocket computers.
  */
 @ApiStatus.NonExtendable
-public interface IPocketAccess extends PocketComputer {
+public interface IPocketAccess {
+    /**
+     * Get the level in which the pocket computer exists.
+     *
+     * @return The pocket computer's level.
+     */
+    ServerLevel getLevel();
+
+    /**
+     * Get the position of the pocket computer.
+     *
+     * @return The pocket computer's position.
+     */
+    Vec3 getPosition();
+
+    /**
+     * Gets the entity holding this item.
+     * <p>
+     * This must be called on the server thread.
+     *
+     * @return The holding entity, or {@code null} if none exists.
+     */
+    @Nullable
+    Entity getEntity();
+
+    /**
+     * Get the colour of this pocket computer as a RGB number.
+     *
+     * @return The colour this pocket computer is. This will be a RGB colour between {@code 0x000000} and
+     * {@code 0xFFFFFF} or -1 if it has no colour.
+     * @see #setColour(int)
+     */
+    int getColour();
+
+    /**
+     * Set the colour of the pocket computer to a RGB number.
+     *
+     * @param colour The colour this pocket computer should be changed to. This should be a RGB colour between
+     *               {@code 0x000000} and {@code 0xFFFFFF} or -1 to reset to the default colour.
+     * @see #getColour()
+     */
+    void setColour(int colour);
+
     /**
      * Get the colour of this pocket computer's light as a RGB number.
      *
@@ -38,7 +87,7 @@ public interface IPocketAccess extends PocketComputer {
      * Get the currently equipped upgrade.
      *
      * @return The currently equipped upgrade.
-     * @see #getUpgradeData()
+     * @see #getUpgradeNBTData()
      * @see #setUpgrade(UpgradeData)
      */
     @Nullable
@@ -47,8 +96,7 @@ public interface IPocketAccess extends PocketComputer {
     /**
      * Set the upgrade for this pocket computer, also updating the item stack.
      * <p>
-     * This method can only be called from the main server thread, when this computer is {@linkplain #isActive() is
-     * active}.
+     * Note this method is not thread safe - it must be called from the server thread.
      *
      * @param upgrade The new upgrade to set it to, may be {@code null}.
      * @see #getUpgrade()
@@ -61,23 +109,19 @@ public interface IPocketAccess extends PocketComputer {
      * This is persisted between computer reboots and chunk loads.
      *
      * @return The upgrade's NBT.
-     * @see #setUpgradeData(DataComponentPatch)
-     * @see UpgradeBase#getUpgradeItem(DataComponentPatch)
+     * @see #updateUpgradeNBTData()
+     * @see UpgradeBase#getUpgradeItem(CompoundTag)
      * @see UpgradeBase#getUpgradeData(ItemStack)
      * @see #getUpgrade()
      */
-    DataComponentPatch getUpgradeData();
+    CompoundTag getUpgradeNBTData();
 
     /**
-     * Update the upgrade-specific data.
-     * <p>
-     * This method can only be called from the main server thread, when this computer is {@linkplain #isActive() is
-     * active}.
+     * Mark the upgrade-specific NBT as dirty.
      *
-     * @param data The new upgrade data.
-     * @see #getUpgradeData()
+     * @see #getUpgradeNBTData()
      */
-    void setUpgradeData(DataComponentPatch data);
+    void updateUpgradeNBTData();
 
     /**
      * Remove the current peripheral and create a new one.
@@ -86,4 +130,13 @@ public interface IPocketAccess extends PocketComputer {
      * entity} changes.
      */
     void invalidatePeripheral();
+
+    /**
+     * Get a list of all upgrades for the pocket computer.
+     *
+     * @return A collection of all upgrade names.
+     * @deprecated This is a relic of a previous API, which no longer makes sense with newer versions of ComputerCraft.
+     */
+    @Deprecated(forRemoval = true)
+    Map<ResourceLocation, IPeripheral> getUpgrades();
 }

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

@@ -4,46 +4,21 @@
 
 package dan200.computercraft.api.pocket;
 
-import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.upgrades.UpgradeBase;
-import dan200.computercraft.api.upgrades.UpgradeType;
-import dan200.computercraft.impl.ComputerCraftAPIService;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.Level;
 import org.jspecify.annotations.Nullable;
 
 /**
  * A peripheral which can be equipped to the back side of a pocket computer.
  * <p>
- * Pocket upgrades are defined in two stages. First, one creates a {@link IPocketUpgrade} subclass and corresponding
- * {@link UpgradeType} instance, which are then registered in a Minecraft registry.
+ * Pocket upgrades are defined in two stages. First, on creates a {@link IPocketUpgrade} subclass and corresponding
+ * {@link PocketUpgradeSerialiser} instance, which are then registered in a Minecraft registry.
  * <p>
  * You then write a JSON file in your mod's {@literal data/} folder. This is then parsed when the world is loaded, and
  * the upgrade registered internally.
  */
 public interface IPocketUpgrade extends UpgradeBase {
-    ResourceKey<Registry<IPocketUpgrade>> REGISTRY = ResourceKey.createRegistryKey(ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "pocket_upgrade"));
-
-    /**
-     * The registry key for pocket upgrade types.
-     *
-     * @return The registry key.
-     */
-    static ResourceKey<Registry<UpgradeType<? extends IPocketUpgrade>>> typeRegistry() {
-        return ComputerCraftAPIService.get().pocketUpgradeRegistryId();
-    }
-
-    /**
-     * Get the type of this upgrade.
-     *
-     * @return The type of this upgrade.
-     */
-    @Override
-    UpgradeType<? extends IPocketUpgrade> getType();
-
     /**
      * Creates a peripheral for the pocket computer.
      * <p>
@@ -71,7 +46,7 @@ public interface IPocketUpgrade extends UpgradeBase {
     /**
      * Called when the pocket computer is right clicked.
      *
-     * @param level      The world the computer is in.
+     * @param world      The world the computer is in.
      * @param access     The access object for the pocket item stack.
      * @param peripheral The peripheral for this upgrade.
      * @return {@code true} to stop the GUI from opening, otherwise false. You should always provide some code path
@@ -79,7 +54,7 @@ public interface IPocketUpgrade extends UpgradeBase {
      * access the GUI.
      * @see #createPeripheral(IPocketAccess)
      */
-    default boolean onRightClick(ServerLevel level, IPocketAccess access, @Nullable IPeripheral peripheral) {
+    default boolean onRightClick(Level world, IPocketAccess access, @Nullable IPeripheral peripheral) {
         return false;
     }
 }

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

@@ -1,81 +0,0 @@
-// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.api.pocket;
-
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.phys.Vec3;
-import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.Nullable;
-
-/**
- * A pocket computer.
- *
- * @see IPocketAccess
- * @see dan200.computercraft.api.component.ComputerComponents#POCKET
- */
-@ApiStatus.NonExtendable
-public interface PocketComputer {
-    /**
-     * Get the level in which the pocket computer exists.
-     *
-     * @return The pocket computer's level.
-     */
-    ServerLevel getLevel();
-
-    /**
-     * Get the position of the pocket computer.
-     *
-     * @return The pocket computer's position.
-     */
-    Vec3 getPosition();
-
-    /**
-     * Gets the entity holding this item.
-     * <p>
-     * This must be called on the server thread.
-     *
-     * @return The holding entity, or {@code null} if none exists.
-     */
-    @Nullable
-    Entity getEntity();
-
-    /**
-     * Check whether this pocket computer is currently being held by a player, lectern, or other valid entity.
-     * <p>
-     * As pocket computers are backed by item stacks, you must check for validity before updating the computer.
-     * <p>
-     * This must be called on the server thread.
-     *
-     * @return Whether this computer is active.
-     */
-    boolean isActive();
-
-    /**
-     * Get the colour of this pocket computer as an RGB number.
-     *
-     * <p>
-     * This method can only be called from the main server thread, when this computer is {@linkplain #isActive() is
-     * active}.
-     *
-     * @return The colour this pocket computer is. This will be a RGB colour between {@code 0x000000} and
-     * {@code 0xFFFFFF} or -1 if it has no colour.
-     * @see #setColour(int)
-     */
-    int getColour();
-
-    /**
-     * Set the colour of the pocket computer to an RGB number.
-     * <p>
-     * This method can only be called from the main server thread, when this computer is {@linkplain #isActive() is
-     * active}.
-     *
-     * @param colour The colour this pocket computer should be changed to. This should be a RGB colour between
-     *               {@code 0x000000} and {@code 0xFFFFFF} or -1 to reset to the default colour.
-     * @see #getColour()
-     */
-    void setColour(int colour);
-
-}

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

@@ -0,0 +1,26 @@
+// SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.api.pocket;
+
+import dan200.computercraft.api.upgrades.UpgradeDataProvider;
+import net.minecraft.data.DataGenerator;
+import net.minecraft.data.PackOutput;
+
+import java.util.function.Consumer;
+
+/**
+ * A data provider to generate pocket computer upgrades.
+ * <p>
+ * This should be subclassed and registered to a {@link DataGenerator.PackGenerator}. Override the
+ * {@link #addUpgrades(Consumer)} function, construct each upgrade, and pass them off to the provided consumer to
+ * generate them.
+ *
+ * @see PocketUpgradeSerialiser
+ */
+public abstract class PocketUpgradeDataProvider extends UpgradeDataProvider<IPocketUpgrade, PocketUpgradeSerialiser<?>> {
+    public PocketUpgradeDataProvider(PackOutput output) {
+        super(output, "Pocket Computer Upgrades", "computercraft/pocket_upgrades", PocketUpgradeSerialiser.registryId());
+    }
+}

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

@@ -0,0 +1,79 @@
+// SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.api.pocket;
+
+import dan200.computercraft.api.upgrades.UpgradeBase;
+import dan200.computercraft.api.upgrades.UpgradeSerialiser;
+import dan200.computercraft.impl.ComputerCraftAPIService;
+import dan200.computercraft.impl.upgrades.SerialiserWithCraftingItem;
+import dan200.computercraft.impl.upgrades.SimpleSerialiser;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.SimpleCraftingRecipeSerializer;
+
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+/**
+ * Reads a {@link IPocketUpgrade} from disk and reads/writes it to a network packet.
+ * <p>
+ * This follows the same format as {@link dan200.computercraft.api.turtle.TurtleUpgradeSerialiser} - consult the
+ * documentation there for more information.
+ *
+ * @param <T> The type of pocket computer upgrade this is responsible for serialising.
+ * @see IPocketUpgrade
+ * @see PocketUpgradeDataProvider
+ */
+public interface PocketUpgradeSerialiser<T extends IPocketUpgrade> extends UpgradeSerialiser<T> {
+    /**
+     * The ID for the associated registry.
+     *
+     * @return The registry key.
+     */
+    static ResourceKey<Registry<PocketUpgradeSerialiser<?>>> registryId() {
+        return ComputerCraftAPIService.get().pocketUpgradeRegistryId();
+    }
+
+    /**
+     * Create an upgrade serialiser for a simple upgrade. This is similar to a {@link SimpleCraftingRecipeSerializer},
+     * but for upgrades.
+     * <p>
+     * If you might want to vary the item, it's suggested you use {@link #simpleWithCustomItem(BiFunction)} instead.
+     *
+     * @param factory Generate a new upgrade with a specific ID.
+     * @param <T>     The type of the generated upgrade.
+     * @return The serialiser for this upgrade
+     */
+    static <T extends IPocketUpgrade> PocketUpgradeSerialiser<T> simple(Function<ResourceLocation, T> factory) {
+        final class Impl extends SimpleSerialiser<T> implements PocketUpgradeSerialiser<T> {
+            private Impl(Function<ResourceLocation, T> constructor) {
+                super(constructor);
+            }
+        }
+
+        return new Impl(factory);
+    }
+
+    /**
+     * Create an upgrade serialiser for a simple upgrade whose crafting item can be specified.
+     *
+     * @param factory Generate a new upgrade with a specific ID and crafting item. The returned upgrade's
+     *                {@link UpgradeBase#getCraftingItem()} <strong>MUST</strong> equal the provided item.
+     * @param <T>     The type of the generated upgrade.
+     * @return The serialiser for this upgrade.
+     * @see #simple(Function)  For upgrades whose crafting stack should not vary.
+     */
+    static <T extends IPocketUpgrade> PocketUpgradeSerialiser<T> simpleWithCustomItem(BiFunction<ResourceLocation, ItemStack, T> factory) {
+        final class Impl extends SerialiserWithCraftingItem<T> implements PocketUpgradeSerialiser<T> {
+            private Impl(BiFunction<ResourceLocation, ItemStack, T> factory) {
+                super(factory);
+            }
+        }
+
+        return new Impl(factory);
+    }
+}

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

@@ -4,7 +4,8 @@
 
 package dan200.computercraft.api.turtle;
 
-import net.minecraft.network.chat.Component;
+import dan200.computercraft.api.upgrades.UpgradeBase;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 
 
@@ -14,27 +15,34 @@ import net.minecraft.world.item.ItemStack;
  * One does not have to use this, but it does provide a convenient template.
  */
 public abstract class AbstractTurtleUpgrade implements ITurtleUpgrade {
+    private final ResourceLocation id;
     private final TurtleUpgradeType type;
-    private final Component adjective;
+    private final String adjective;
     private final ItemStack stack;
 
-    protected AbstractTurtleUpgrade(TurtleUpgradeType type, Component adjective, ItemStack stack) {
+    protected AbstractTurtleUpgrade(ResourceLocation id, TurtleUpgradeType type, String adjective, ItemStack stack) {
+        this.id = id;
         this.type = type;
         this.adjective = adjective;
         this.stack = stack;
     }
 
-    protected AbstractTurtleUpgrade(TurtleUpgradeType type, String adjective, ItemStack stack) {
-        this(type, Component.translatable(adjective), stack);
+    protected AbstractTurtleUpgrade(ResourceLocation id, TurtleUpgradeType type, ItemStack stack) {
+        this(id, type, UpgradeBase.getDefaultAdjective(id), stack);
     }
 
     @Override
-    public final Component getAdjective() {
+    public final ResourceLocation getUpgradeID() {
+        return id;
+    }
+
+    @Override
+    public final String getUnlocalisedAdjective() {
         return adjective;
     }
 
     @Override
-    public final TurtleUpgradeType getUpgradeType() {
+    public final TurtleUpgradeType getType() {
         return type;
     }
 

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

@@ -12,7 +12,7 @@ import dan200.computercraft.api.upgrades.UpgradeBase;
 import dan200.computercraft.api.upgrades.UpgradeData;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.core.component.DataComponentPatch;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.Container;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
@@ -228,22 +228,37 @@ public interface ITurtleAccess {
      * @param side The side to get the upgrade from.
      * @return The upgrade on the specified side of the turtle, if there is one.
      * @see #getUpgradeWithData(TurtleSide)
-     * @see #setUpgrade(TurtleSide, UpgradeData)
+     * @see #setUpgradeWithData(TurtleSide, UpgradeData)
      */
     @Nullable
     ITurtleUpgrade getUpgrade(TurtleSide side);
 
     /**
-     * Returns the upgrade on the specified side of the turtle, along with its {@linkplain #getUpgradeData(TurtleSide)
+     * Returns the upgrade on the specified side of the turtle, along with its {@linkplain #getUpgradeNBTData(TurtleSide)
      * update data}.
      *
      * @param side The side to get the upgrade from.
      * @return The upgrade on the specified side of the turtle, along with its upgrade data, if there is one.
      * @see #getUpgradeWithData(TurtleSide)
-     * @see #setUpgrade(TurtleSide, UpgradeData)
+     * @see #setUpgradeWithData(TurtleSide, UpgradeData)
      */
-    @Nullable
-    UpgradeData<ITurtleUpgrade> getUpgradeWithData(TurtleSide side);
+    default @Nullable UpgradeData<ITurtleUpgrade> getUpgradeWithData(TurtleSide side) {
+        var upgrade = getUpgrade(side);
+        return upgrade == null ? null : UpgradeData.of(upgrade, getUpgradeNBTData(side));
+    }
+
+    /**
+     * Set the upgrade for a given side, resetting peripherals and clearing upgrade specific data.
+     *
+     * @param side    The side to set the upgrade on.
+     * @param upgrade The upgrade to set, may be {@code null} to clear.
+     * @see #getUpgrade(TurtleSide)
+     * @deprecated Use {@link #setUpgradeWithData(TurtleSide, UpgradeData)}
+     */
+    @Deprecated
+    default void setUpgrade(TurtleSide side, @Nullable ITurtleUpgrade upgrade) {
+        setUpgradeWithData(side, upgrade == null ? null : UpgradeData.ofDefault(upgrade));
+    }
 
     /**
      * Set the upgrade for a given side and its upgrade data.
@@ -252,7 +267,7 @@ public interface ITurtleAccess {
      * @param upgrade The upgrade to set, may be {@code null} to clear.
      * @see #getUpgradeWithData(TurtleSide)
      */
-    void setUpgrade(TurtleSide side, @Nullable UpgradeData<ITurtleUpgrade> upgrade);
+    void setUpgradeWithData(TurtleSide side, @Nullable UpgradeData<ITurtleUpgrade> upgrade);
 
     /**
      * Returns the peripheral created by the upgrade on the specified side of the turtle, if there is one.
@@ -266,23 +281,23 @@ public interface ITurtleAccess {
     /**
      * Get an upgrade-specific NBT compound, which can be used to store arbitrary data.
      * <p>
-     * This will be persisted across turtle restarts and chunk loads, as well as being synced to the client. You can
-     * call {@link #setUpgrade(TurtleSide, UpgradeData)} to modify it.
+     * This will be persisted across turtle restarts and chunk loads, as well as being synced to the client. You must
+     * call {@link #updateUpgradeNBTData(TurtleSide)} after modifying it.
      *
      * @param side The side to get the upgrade data for.
      * @return The upgrade-specific data.
-     * @see #setUpgradeData(TurtleSide, DataComponentPatch)
-     * @see UpgradeBase#getUpgradeItem(DataComponentPatch)
+     * @see #updateUpgradeNBTData(TurtleSide)
+     * @see UpgradeBase#getUpgradeItem(CompoundTag)
      * @see UpgradeBase#getUpgradeData(ItemStack)
      */
-    DataComponentPatch getUpgradeData(TurtleSide side);
+    CompoundTag getUpgradeNBTData(TurtleSide side);
 
     /**
-     * Update the upgrade-specific data.
+     * Mark the upgrade-specific data as dirty on a specific side. This is required for the data to be synced to the
+     * client and persisted.
      *
-     * @param side The side to set the upgrade data for.
-     * @param data The new upgrade data.
-     * @see #getUpgradeData(TurtleSide)
+     * @param side The side to mark dirty.
+     * @see #updateUpgradeNBTData(TurtleSide)
      */
-    void setUpgradeData(TurtleSide side, DataComponentPatch data);
+    void updateUpgradeNBTData(TurtleSide side);
 }

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

@@ -4,45 +4,38 @@
 
 package dan200.computercraft.api.turtle;
 
-import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.upgrades.UpgradeBase;
-import dan200.computercraft.api.upgrades.UpgradeType;
-import dan200.computercraft.impl.ComputerCraftAPIService;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Registry;
-import net.minecraft.core.RegistrySetBuilder.PatchedRegistries;
-import net.minecraft.core.component.DataComponentPatch;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.Items;
 import org.jspecify.annotations.Nullable;
 
-import java.util.function.Function;
+import java.util.function.BiFunction;
 
 /**
  * The primary interface for defining an update for Turtles. A turtle update can either be a new tool, or a new
  * peripheral.
  * <p>
  * Turtle upgrades are defined in two stages. First, one creates a {@link ITurtleUpgrade} subclass and corresponding
- * {@link UpgradeType} instance, which are then registered in a Minecraft registry.
+ * {@link TurtleUpgradeSerialiser} instance, which are then registered in a Minecraft registry.
  * <p>
  * You then write a JSON file in your mod's {@literal data/} folder. This is then parsed when the world is loaded, and
  * the upgrade automatically registered.
  *
  * <h2>Example</h2>
- * <h3>Registering the upgrade type</h3>
+ * <h3>Registering the upgrade serialiser</h3>
  * First, let's create a new class that implements {@link ITurtleUpgrade}. It is recommended to subclass
  * {@link AbstractTurtleUpgrade}, as that provides a default implementation of most methods.
- *
+ * <p>
  * {@snippet class=com.example.examplemod.ExampleTurtleUpgrade region=body}
- *
- * Now we must construct a new upgrade type. In most cases, you can use one of the helper methods (e.g.
- * {@link UpgradeType#simpleWithCustomItem(Function)}), rather than defining your own implementation.
+ * <p>
+ * Now we must construct a new upgrade serialiser. In most cases, you can use one of the helper methods
+ * (e.g. {@link TurtleUpgradeSerialiser#simpleWithCustomItem(BiFunction)}), rather than defining your own implementation.
  *
  * {@snippet class=com.example.examplemod.ExampleMod region=turtle_upgrades}
  *
- * We now must register this upgrade type. This is done the same way as you'd register blocks, items, or other
+ * We now must register this upgrade serialiser. This is done the same way as you'd register blocks, items, or other
  * Minecraft objects. The approach to do this will depend on mod-loader.
  *
  * <h4>Fabric</h4>
@@ -51,79 +44,42 @@ import java.util.function.Function;
  * <h4>Forge</h4>
  * {@snippet class=com.example.examplemod.ForgeExampleMod region=turtle_upgrades}
  *
- * <h3 id="datagen">Registering the upgrade itself</h3>
- * Upgrades themselves are loaded from datapacks when a level is loaded. In order to register our new upgrade, we must
- * create a new JSON file at {@code data/<my_mod>/computercraft/turtle_upgrade/<my_upgrade_id>.json}.
- *
- * {@snippet file=data/examplemod/computercraft/turtle_upgrade/example_turtle_upgrade.json}
- *
- * The {@code "type"} field points to the ID of the upgrade type we've just registered, while the other fields are read
- * by the type itself. As our upgrade was defined with {@link UpgradeType#simpleWithCustomItem(Function)}, the
- * {@code "item"} field will construct our upgrade with {@link Items#COMPASS}.
- * <p>
- * Similarly, {@linkplain dan200.computercraft.api.client.turtle.TurtleUpgradeModel the upgrade's model} is loaded from
- * a resource pack, and so we must also create a new JSON file at
- * {@code assets/<my_mod>/computercraft/turtle_upgrade/<my_upgrade_id>.json}.
- *
- * {@snippet file=assets/examplemod/computercraft/turtle_upgrade/example_turtle_upgrade.json}
- *
- * Rather than manually creating these file, it is recommended to use data-generators to generate this file. First, we
- * register our new upgrades into a {@linkplain PatchedRegistries patched registry}. Models must similarly be
- * registered.
- *
- * {@snippet class=com.example.examplemod.data.TurtleUpgradeProvider region=body}
- *
- * Next, we must write these upgrades to disk. Vanilla does not have complete support for this yet, so this must be done
- * with mod-loader-specific APIs.
+ * <h3>Rendering the upgrade</h3>
+ * Next, we need to register a model for our upgrade. This is done by registering a
+ * {@link dan200.computercraft.api.client.turtle.TurtleUpgradeModeller} for your upgrade serialiser.
  *
  * <h4>Fabric</h4>
- * {@snippet class=com.example.examplemod.FabricExampleModDataGenerator region=turtle_upgrades}
+ * {@snippet class=com.example.examplemod.FabricExampleModClient region=turtle_modellers}
+ *
  *
  * <h4>Forge</h4>
- * {@snippet class=com.example.examplemod.ForgeExampleModDataGenerator region=turtle_upgrades}
+ * {@snippet class=com.example.examplemod.FabricExampleModClient region=turtle_modellers}
+ *
+ * <h3>Registering the upgrade itself</h3>
+ * Upgrades themselves are loaded from datapacks when a level is loaded. In order to register our new upgrade, we must
+ * create a new JSON file at {@code data/<my_mod>/computercraft/turtle_upgrades/<my_upgrade_id>.json}.
+ *
+ * {@snippet file = data/examplemod/computercraft/turtle_upgrades/example_turtle_upgrade.json}
+ *
+ * The {@code "type"} field points to the ID of the upgrade serialiser we've just registered, while the other fields
+ * are read by the serialiser itself. As our upgrade was defined with {@link TurtleUpgradeSerialiser#simpleWithCustomItem(BiFunction)}, the
+ * {@code "item"} field will construct our upgrade with {@link Items#COMPASS}.
+ * <p>
+ * Rather than manually creating the file, it is recommended to data-generators to generate this file. This can be done
+ * with {@link TurtleUpgradeDataProvider}.
+ *
+ * {@snippet class=com.example.examplemod.data.TurtleDataProvider region=body}
+ *
+ * @see TurtleUpgradeSerialiser Registering a turtle upgrade.
  */
 public interface ITurtleUpgrade extends UpgradeBase {
-    /**
-     * The registry in which turtle upgrades are stored.
-     */
-    ResourceKey<Registry<ITurtleUpgrade>> REGISTRY = ResourceKey.createRegistryKey(ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "turtle_upgrade"));
-
-    /**
-     * Create a {@link ResourceKey} for a turtle upgrade given a {@link ResourceLocation}.
-     * <p>
-     * This should only be called from within data generation code. Do not hard code references to your upgrades!
-     *
-     * @param id The id of the turtle upgrade.
-     * @return The upgrade registry key.
-     */
-    static ResourceKey<ITurtleUpgrade> createKey(ResourceLocation id) {
-        return ResourceKey.create(REGISTRY, id);
-    }
-
-    /**
-     * The registry key for turtle upgrade types.
-     *
-     * @return The registry key.
-     */
-    static ResourceKey<Registry<UpgradeType<? extends ITurtleUpgrade>>> typeRegistry() {
-        return ComputerCraftAPIService.get().turtleUpgradeRegistryId();
-    }
-
-    /**
-     * Get the type of this upgrade.
-     *
-     * @return The type of this upgrade.
-     */
-    @Override
-    UpgradeType<? extends ITurtleUpgrade> getType();
-
     /**
      * Return whether this turtle adds a tool or a peripheral to the turtle.
      *
      * @return The type of upgrade this is.
      * @see TurtleUpgradeType for the differences between them.
      */
-    TurtleUpgradeType getUpgradeType();
+    TurtleUpgradeType getType();
 
     /**
      * Will only be called for peripheral upgrades. Creates a peripheral for a turtle being placed using this upgrade.
@@ -182,7 +138,7 @@ public interface ITurtleUpgrade extends UpgradeBase {
      * @param upgradeData Data that currently stored for this upgrade
      * @return Filtered version of this data.
      */
-    default DataComponentPatch getPersistedData(DataComponentPatch upgradeData) {
+    default CompoundTag getPersistedData(CompoundTag upgradeData) {
         return upgradeData;
     }
 }

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

@@ -4,33 +4,17 @@
 
 package dan200.computercraft.api.turtle;
 
-import com.mojang.serialization.Codec;
-import net.minecraft.util.StringRepresentable;
-
 /**
  * An enum representing the two sides of the turtle that a turtle upgrade might reside.
  */
-public enum TurtleSide implements StringRepresentable {
+public enum TurtleSide {
     /**
      * The turtle's left side (where the pickaxe usually is on a Wireless Mining Turtle).
      */
-    LEFT("left"),
+    LEFT,
 
     /**
      * The turtle's right side (where the modem usually is on a Wireless Mining Turtle).
      */
-    RIGHT("right");
-
-    public static final Codec<TurtleSide> CODEC = StringRepresentable.fromEnum(TurtleSide::values);
-
-    private final String name;
-
-    TurtleSide(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String getSerializedName() {
-        return name;
-    }
+    RIGHT,
 }

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

@@ -1,149 +0,0 @@
-// SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.api.turtle;
-
-import dan200.computercraft.api.ComputerCraftTags;
-import dan200.computercraft.api.upgrades.UpgradeBase;
-import dan200.computercraft.impl.ComputerCraftAPIService;
-import dan200.computercraft.impl.upgrades.TurtleToolSpec;
-import net.minecraft.core.component.DataComponents;
-import net.minecraft.data.worldgen.BootstrapContext;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.TagKey;
-import net.minecraft.world.entity.ai.attributes.Attributes;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.Block;
-import org.jspecify.annotations.Nullable;
-
-import java.util.Optional;
-
-/**
- * A builder for custom turtle tool upgrades.
- * <p>
- * This can be used from your <a href="./ITurtleUpgrade.html#datagen">data generator</a> code in order to
- * register turtle tools for your mod's tools.
- *
- * <h2>Example</h2>
- * {@snippet class=com.example.examplemod.data.TurtleToolProvider region=body}
- */
-public final class TurtleToolBuilder {
-    private final ResourceKey<ITurtleUpgrade> id;
-    private final Item item;
-    private Component adjective;
-    private float damageMultiplier = TurtleToolSpec.DEFAULT_DAMAGE_MULTIPLIER;
-    private @Nullable TagKey<Block> breakable;
-    private boolean allowEnchantments = false;
-    private TurtleToolDurability consumeDurability = TurtleToolDurability.NEVER;
-
-    private TurtleToolBuilder(ResourceKey<ITurtleUpgrade> id, Item item) {
-        this.id = id;
-        adjective = Component.translatable(UpgradeBase.getDefaultAdjective(id.location()));
-        this.item = item;
-    }
-
-    public static TurtleToolBuilder tool(ResourceLocation id, Item item) {
-        return new TurtleToolBuilder(ITurtleUpgrade.createKey(id), item);
-    }
-
-    public static TurtleToolBuilder tool(ResourceKey<ITurtleUpgrade> id, Item item) {
-        return new TurtleToolBuilder(id, item);
-    }
-
-    /**
-     * Get the id for this turtle tool.
-     *
-     * @return The upgrade id.
-     */
-    public ResourceKey<ITurtleUpgrade> id() {
-        return id;
-    }
-
-    /**
-     * Specify a custom adjective for this tool. By default this takes its adjective from the upgrade id.
-     *
-     * @param adjective The new adjective to use.
-     * @return The tool builder, for further use.
-     */
-    public TurtleToolBuilder adjective(Component adjective) {
-        this.adjective = adjective;
-        return this;
-    }
-
-    /**
-     * The amount of damage a swing of this tool will do. This is multiplied by {@link Attributes#ATTACK_DAMAGE} to
-     * get the final damage.
-     *
-     * @param damageMultiplier The damage multiplier.
-     * @return The tool builder, for further use.
-     */
-    public TurtleToolBuilder damageMultiplier(float damageMultiplier) {
-        this.damageMultiplier = damageMultiplier;
-        return this;
-    }
-
-    /**
-     * Indicate that this upgrade allows items which have been {@linkplain ItemStack#isEnchanted() enchanted} or have
-     * {@linkplain DataComponents#ATTRIBUTE_MODIFIERS custom attribute modifiers}.
-     *
-     * @return The tool builder, for further use.
-     */
-    public TurtleToolBuilder allowEnchantments() {
-        allowEnchantments = true;
-        return this;
-    }
-
-    /**
-     * Set when the tool will consume durability.
-     *
-     * @param durability The durability predicate.
-     * @return The tool builder, for further use.
-     */
-    public TurtleToolBuilder consumeDurability(TurtleToolDurability durability) {
-        consumeDurability = durability;
-        return this;
-    }
-
-    /**
-     * Provide a list of breakable blocks. If not given, the tool can break all blocks. If given, only blocks
-     * in this tag, those in {@link ComputerCraftTags.Blocks#TURTLE_ALWAYS_BREAKABLE} and "insta-mine" ones can
-     * be broken.
-     *
-     * @param breakable The tag containing all blocks breakable by this item.
-     * @return The tool builder, for further use.
-     * @see ComputerCraftTags.Blocks
-     */
-    public TurtleToolBuilder breakable(TagKey<Block> breakable) {
-        this.breakable = breakable;
-        return this;
-    }
-
-    /**
-     * Build the turtle tool upgrade.
-     *
-     * @return The constructed upgrade.
-     */
-    public ITurtleUpgrade build() {
-        return ComputerCraftAPIService.get().createTurtleTool(new TurtleToolSpec(
-            adjective,
-            item,
-            damageMultiplier,
-            allowEnchantments,
-            consumeDurability,
-            Optional.ofNullable(breakable)
-        ));
-    }
-
-    /**
-     * Build this upgrade and register it for datagen.
-     *
-     * @param upgrades The registry this upgrade should be added to.
-     */
-    public void register(BootstrapContext<ITurtleUpgrade> upgrades) {
-        upgrades.register(id(), build());
-    }
-}

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

@@ -4,14 +4,14 @@
 
 package dan200.computercraft.api.turtle;
 
-import net.minecraft.core.component.DataComponents;
 import net.minecraft.util.StringRepresentable;
+import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.item.ItemStack;
 
 /**
  * Indicates if an equipped turtle item will consume durability.
  *
- * @see TurtleToolBuilder#consumeDurability(TurtleToolDurability)
+ * @see TurtleUpgradeDataProvider.ToolBuilder#consumeDurability(TurtleToolDurability)
  */
 public enum TurtleToolDurability implements StringRepresentable {
     /**
@@ -21,7 +21,7 @@ public enum TurtleToolDurability implements StringRepresentable {
 
     /**
      * The equipped tool consumes durability if it is {@linkplain ItemStack#isEnchanted() enchanted} or has
-     * {@linkplain DataComponents#ATTRIBUTE_MODIFIERS custom attribute modifiers}.
+     * {@linkplain ItemStack#getAttributeModifiers(EquipmentSlot) custom attribute modifiers}.
      */
     WHEN_ENCHANTED("when_enchanted"),
 

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

@@ -0,0 +1,171 @@
+// SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.api.turtle;
+
+import dan200.computercraft.api.ComputerCraftAPI;
+import dan200.computercraft.api.ComputerCraftTags;
+import dan200.computercraft.api.upgrades.UpgradeDataProvider;
+import dan200.computercraft.impl.PlatformHelper;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.data.DataGenerator;
+import net.minecraft.data.PackOutput;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.Block;
+import org.jspecify.annotations.Nullable;
+
+import java.util.function.Consumer;
+
+/**
+ * A data provider to generate turtle upgrades.
+ * <p>
+ * This should be subclassed and registered to a {@link DataGenerator.PackGenerator}. Override the
+ * {@link #addUpgrades(Consumer)} function, construct each upgrade, and pass them off to the provided consumer to
+ * generate them.
+ *
+ * <h2>Example</h2>
+ * {@snippet class=com.example.examplemod.data.TurtleDataProvider region=body}
+ *
+ * @see TurtleUpgradeSerialiser
+ */
+public abstract class TurtleUpgradeDataProvider extends UpgradeDataProvider<ITurtleUpgrade, TurtleUpgradeSerialiser<?>> {
+    private static final ResourceLocation TOOL_ID = new ResourceLocation(ComputerCraftAPI.MOD_ID, "tool");
+
+    public TurtleUpgradeDataProvider(PackOutput output) {
+        super(output, "Turtle Upgrades", "computercraft/turtle_upgrades", TurtleUpgradeSerialiser.registryId());
+    }
+
+    /**
+     * Create a new turtle tool upgrade, such as a pickaxe or shovel.
+     *
+     * @param id   The ID of this tool.
+     * @param item The item used for tool actions. Note, this doesn't inherit all properties of the tool, you may need
+     *             to specify {@link ToolBuilder#damageMultiplier(float)} and {@link ToolBuilder#breakable(TagKey)}.
+     * @return A tool builder,
+     */
+    public final ToolBuilder tool(ResourceLocation id, Item item) {
+        return new ToolBuilder(id, existingSerialiser(TOOL_ID), item);
+    }
+
+    /**
+     * A builder for custom turtle tool upgrades.
+     *
+     * @see #tool(ResourceLocation, Item)
+     */
+    public static class ToolBuilder {
+        private final ResourceLocation id;
+        private final TurtleUpgradeSerialiser<?> serialiser;
+        private final Item toolItem;
+        private @Nullable String adjective;
+        private @Nullable Item craftingItem;
+        private @Nullable Float damageMultiplier = null;
+        private @Nullable TagKey<Block> breakable;
+        private boolean allowEnchantments = false;
+        private TurtleToolDurability consumeDurability = TurtleToolDurability.NEVER;
+
+        ToolBuilder(ResourceLocation id, TurtleUpgradeSerialiser<?> serialiser, Item toolItem) {
+            this.id = id;
+            this.serialiser = serialiser;
+            this.toolItem = toolItem;
+            craftingItem = null;
+        }
+
+        /**
+         * Specify a custom adjective for this tool. By default this takes its adjective from the tool item.
+         *
+         * @param adjective The new adjective to use.
+         * @return The tool builder, for further use.
+         */
+        public ToolBuilder adjective(String adjective) {
+            this.adjective = adjective;
+            return this;
+        }
+
+        /**
+         * Specify a custom item which is used to craft this upgrade. By default this is the same as the provided tool
+         * item, but you may wish to override it.
+         *
+         * @param craftingItem The item used to craft this upgrade.
+         * @return The tool builder, for further use.
+         */
+        public ToolBuilder craftingItem(Item craftingItem) {
+            this.craftingItem = craftingItem;
+            return this;
+        }
+
+        /**
+         * The amount of damage a swing of this tool will do. This is multiplied by {@link Attributes#ATTACK_DAMAGE} to
+         * get the final damage.
+         *
+         * @param damageMultiplier The damage multiplier.
+         * @return The tool builder, for further use.
+         */
+        public ToolBuilder damageMultiplier(float damageMultiplier) {
+            this.damageMultiplier = damageMultiplier;
+            return this;
+        }
+
+        /**
+         * Indicate that this upgrade allows items which have been {@linkplain ItemStack#isEnchanted() enchanted} or have
+         * {@linkplain ItemStack#getAttributeModifiers(EquipmentSlot) custom attribute modifiers}.
+         *
+         * @return The tool builder, for further use.
+         */
+        public ToolBuilder allowEnchantments() {
+            allowEnchantments = true;
+            return this;
+        }
+
+        /**
+         * Set when the tool will consume durability.
+         *
+         * @param durability The durability predicate.
+         * @return The tool builder, for further use.
+         */
+        public ToolBuilder consumeDurability(TurtleToolDurability durability) {
+            consumeDurability = durability;
+            return this;
+        }
+
+        /**
+         * Provide a list of breakable blocks. If not given, the tool can break all blocks. If given, only blocks
+         * in this tag, those in {@link ComputerCraftTags.Blocks#TURTLE_ALWAYS_BREAKABLE} and "insta-mine" ones can
+         * be broken.
+         *
+         * @param breakable The tag containing all blocks breakable by this item.
+         * @return The tool builder, for further use.
+         * @see ComputerCraftTags.Blocks
+         */
+        public ToolBuilder breakable(TagKey<Block> breakable) {
+            this.breakable = breakable;
+            return this;
+        }
+
+        /**
+         * Register this as an upgrade.
+         *
+         * @param add The callback given to {@link #addUpgrades(Consumer)}.
+         */
+        public void add(Consumer<Upgrade<TurtleUpgradeSerialiser<?>>> add) {
+            add.accept(new Upgrade<>(id, serialiser, s -> {
+                s.addProperty("item", PlatformHelper.get().getRegistryKey(Registries.ITEM, toolItem).toString());
+                if (adjective != null) s.addProperty("adjective", adjective);
+                if (craftingItem != null) {
+                    s.addProperty("craftItem", PlatformHelper.get().getRegistryKey(Registries.ITEM, craftingItem).toString());
+                }
+                if (damageMultiplier != null) s.addProperty("damageMultiplier", damageMultiplier);
+                if (breakable != null) s.addProperty("breakable", breakable.location().toString());
+                if (allowEnchantments) s.addProperty("allowEnchantments", true);
+                if (consumeDurability != TurtleToolDurability.NEVER) {
+                    s.addProperty("consumeDurability", consumeDurability.getSerializedName());
+                }
+            }));
+        }
+    }
+}

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

@@ -0,0 +1,83 @@
+// SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.api.turtle;
+
+import dan200.computercraft.api.upgrades.UpgradeBase;
+import dan200.computercraft.api.upgrades.UpgradeSerialiser;
+import dan200.computercraft.impl.ComputerCraftAPIService;
+import dan200.computercraft.impl.upgrades.SerialiserWithCraftingItem;
+import dan200.computercraft.impl.upgrades.SimpleSerialiser;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.RecipeSerializer;
+import net.minecraft.world.item.crafting.SimpleCraftingRecipeSerializer;
+
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+/**
+ * Reads a {@link ITurtleUpgrade} from disk and reads/writes it to a network packet.
+ * <p>
+ * These should be registered in a {@link Registry} while the game is loading, much like {@link RecipeSerializer}s.
+ * <p>
+ * If your turtle upgrade doesn't have any associated configurable parameters (like most upgrades), you can use
+ * {@link #simple(Function)} or {@link #simpleWithCustomItem(BiFunction)} to create a basic upgrade serialiser.
+ *
+ * @param <T> The type of turtle upgrade this is responsible for serialising.
+ * @see ITurtleUpgrade
+ * @see TurtleUpgradeDataProvider
+ * @see dan200.computercraft.api.client.turtle.TurtleUpgradeModeller
+ */
+public interface TurtleUpgradeSerialiser<T extends ITurtleUpgrade> extends UpgradeSerialiser<T> {
+    /**
+     * The ID for the associated registry.
+     *
+     * @return The registry key.
+     */
+    static ResourceKey<Registry<TurtleUpgradeSerialiser<?>>> registryId() {
+        return ComputerCraftAPIService.get().turtleUpgradeRegistryId();
+    }
+
+    /**
+     * Create an upgrade serialiser for a simple upgrade. This is similar to a {@link SimpleCraftingRecipeSerializer},
+     * but for upgrades.
+     * <p>
+     * If you might want to vary the item, it's suggested you use {@link #simpleWithCustomItem(BiFunction)} instead.
+     *
+     * @param factory Generate a new upgrade with a specific ID.
+     * @param <T>     The type of the generated upgrade.
+     * @return The serialiser for this upgrade
+     */
+    static <T extends ITurtleUpgrade> TurtleUpgradeSerialiser<T> simple(Function<ResourceLocation, T> factory) {
+        final class Impl extends SimpleSerialiser<T> implements TurtleUpgradeSerialiser<T> {
+            private Impl(Function<ResourceLocation, T> constructor) {
+                super(constructor);
+            }
+        }
+
+        return new Impl(factory);
+    }
+
+    /**
+     * Create an upgrade serialiser for a simple upgrade whose crafting item can be specified.
+     *
+     * @param factory Generate a new upgrade with a specific ID and crafting item. The returned upgrade's
+     *                {@link UpgradeBase#getCraftingItem()} <strong>MUST</strong> equal the provided item.
+     * @param <T>     The type of the generated upgrade.
+     * @return The serialiser for this upgrade.
+     * @see #simple(Function)  For upgrades whose crafting stack should not vary.
+     */
+    static <T extends ITurtleUpgrade> TurtleUpgradeSerialiser<T> simpleWithCustomItem(BiFunction<ResourceLocation, ItemStack, T> factory) {
+        final class Impl extends SerialiserWithCraftingItem<T> implements TurtleUpgradeSerialiser<T> {
+            private Impl(BiFunction<ResourceLocation, ItemStack, T> factory) {
+                super(factory);
+            }
+        }
+
+        return new Impl(factory);
+    }
+}

projects/common-api/src/main/java/dan200/computercraft/api/upgrades/UpgradeBase.java

@@ -9,34 +9,37 @@ import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
+import dan200.computercraft.impl.PlatformHelper;
 import net.minecraft.Util;
-import net.minecraft.core.component.DataComponentPatch;
-import net.minecraft.network.chat.Component;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 
+import java.util.Objects;
+
 /**
  * Common functionality between {@link ITurtleUpgrade} and {@link IPocketUpgrade}.
  */
 public interface UpgradeBase {
     /**
-     * Get the type of this upgrade.
+     * Gets a unique identifier representing this type of turtle upgrade. eg: "computercraft:wireless_modem"
+     * or "my_mod:my_upgrade".
+     * <p>
+     * You should use a unique resource domain to ensure this upgrade is uniquely identified.
+     * The upgrade will fail registration if an already used ID is specified.
      *
-     * @return The type of this upgrade.
+     * @return The unique ID for this upgrade.
      */
-    UpgradeType<?> getType();
+    ResourceLocation getUpgradeID();
 
     /**
-     * A description of this upgrade for use in item names.
-     * <p>
-     * This should typically be a {@linkplain Component#translatable(String) translation key}, rather than a hard coded
-     * string.
+     * Return an unlocalised string to describe this type of computer in item names.
      * <p>
      * Examples of built-in adjectives are "Wireless", "Mining" and "Crafty".
      *
-     * @return The text component for this upgrade's adjective.
+     * @return The localisation key for this upgrade's adjective.
      */
-    Component getAdjective();
+    String getUnlocalisedAdjective();
 
     /**
      * Return an item stack representing the type of item that a computer must be crafted
@@ -54,8 +57,8 @@ public interface UpgradeBase {
     /**
      * Returns the item stack representing a currently equipped turtle upgrade.
      * <p>
-     * While upgrades can store upgrade data ({@link ITurtleAccess#getUpgradeData(TurtleSide)} and
-     * {@link IPocketAccess#getUpgradeData()}}, by default this data is discarded when an upgrade is unequipped,
+     * While upgrades can store upgrade data ({@link ITurtleAccess#getUpgradeNBTData(TurtleSide)} and
+     * {@link IPocketAccess#getUpgradeNBTData()}}, by default this data is discarded when an upgrade is unequipped,
      * and the original item stack is returned.
      * <p>
      * By overriding this method, you can create a new {@link ItemStack} which contains enough data to
@@ -67,24 +70,24 @@ public interface UpgradeBase {
      * @param upgradeData The current upgrade data. This should <strong>NOT</strong> be mutated.
      * @return The item stack returned when unequipping.
      */
-    default ItemStack getUpgradeItem(DataComponentPatch upgradeData) {
+    default ItemStack getUpgradeItem(CompoundTag upgradeData) {
         return getCraftingItem();
     }
 
     /**
      * Extract upgrade data from an {@link ItemStack}.
      * <p>
-     * This upgrade data will be available with {@link ITurtleAccess#getUpgradeData(TurtleSide)} or
-     * {@link IPocketAccess#getUpgradeData()}.
+     * This upgrade data will be available with {@link ITurtleAccess#getUpgradeNBTData(TurtleSide)} or
+     * {@link IPocketAccess#getUpgradeNBTData()}.
      * <p>
-     * This should be an inverse to {@link #getUpgradeItem(DataComponentPatch)}.
+     * This should be an inverse to {@link #getUpgradeItem(CompoundTag)}.
      *
      * @param stack The stack that was equipped by the turtle or pocket computer. This will have the same item as
      *              {@link #getCraftingItem()}.
      * @return The upgrade data that should be set on the turtle or pocket computer.
      */
-    default DataComponentPatch getUpgradeData(ItemStack stack) {
-        return DataComponentPatch.EMPTY;
+    default CompoundTag getUpgradeData(ItemStack stack) {
+        return new CompoundTag();
     }
 
     /**
@@ -94,15 +97,26 @@ public interface UpgradeBase {
      * the original stack. In order to prevent people losing items with enchantments (or
      * repairing items with non-0 damage), we impose additional checks on the item.
      * <p>
-     * The default check requires that any NBT is exactly the same as the crafting item,
-     * but this may be relaxed for your upgrade.
+     * The default check requires that any non-capability NBT is exactly the same as the
+     * crafting item, but this may be relaxed for your upgrade.
+     * <p>
+     * This is based on {@code net.minecraftforge.common.crafting.StrictNBTIngredient}'s check.
      *
      * @param stack The stack to check. This is guaranteed to be non-empty and have the same item as
      *              {@link #getCraftingItem()}.
      * @return If this stack may be used to equip this upgrade.
      */
     default boolean isItemSuitable(ItemStack stack) {
-        return ItemStack.isSameItemSameComponents(getCraftingItem(), stack);
+        var crafting = getCraftingItem();
+
+        // A more expanded form of ItemStack.areShareTagsEqual, but allowing an empty tag to be equal to a
+        // null one.
+        var shareTag = PlatformHelper.get().getShareTag(stack);
+        var craftingShareTag = PlatformHelper.get().getShareTag(crafting);
+        if (shareTag == craftingShareTag) return true;
+        if (shareTag == null) return Objects.requireNonNull(craftingShareTag).isEmpty();
+        if (craftingShareTag == null) return shareTag.isEmpty();
+        return shareTag.equals(craftingShareTag);
     }
 
     /**
@@ -111,7 +125,7 @@ public interface UpgradeBase {
      *
      * @param id The upgrade ID.
      * @return The  generated adjective.
-     * @see #getAdjective()
+     * @see #getUnlocalisedAdjective()
      */
     static String getDefaultAdjective(ResourceLocation id) {
         return Util.makeDescriptionId("upgrade", id) + ".adjective";

projects/common-api/src/main/java/dan200/computercraft/api/upgrades/UpgradeData.java

@@ -6,62 +6,59 @@ package dan200.computercraft.api.upgrades;
 
 import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import net.minecraft.core.Holder;
-import net.minecraft.core.component.DataComponentGetter;
-import net.minecraft.core.component.DataComponentPatch;
-import net.minecraft.core.component.DataComponentType;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.Contract;
 import org.jspecify.annotations.Nullable;
 
 /**
  * An upgrade (i.e. a {@link ITurtleUpgrade}) and its current upgrade data.
+ * <p>
+ * <strong>IMPORTANT:</strong> The {@link #data()} in an upgrade data is often a reference to the original upgrade data.
+ * Be careful to take a {@linkplain #copy() defensive copy} if you plan to use the data in this upgrade.
  *
- * @param holder The current upgrade holder.
- * @param data   The upgrade's data.
- * @param <T>    The type of upgrade, either {@link ITurtleUpgrade} or {@link IPocketUpgrade}.
+ * @param upgrade The current upgrade.
+ * @param data    The upgrade's data.
+ * @param <T>     The type of upgrade, either {@link ITurtleUpgrade} or {@link IPocketUpgrade}.
  */
-public record UpgradeData<T extends UpgradeBase>(
-    Holder.Reference<T> holder, DataComponentPatch data
-) implements DataComponentGetter {
+public record UpgradeData<T extends UpgradeBase>(T upgrade, CompoundTag data) {
     /**
      * A utility method to construct a new {@link UpgradeData} instance.
      *
-     * @param holder An upgrade.
-     * @param data   The upgrade's data.
-     * @param <T>    The type of upgrade.
+     * @param upgrade An upgrade.
+     * @param data    The upgrade's data.
+     * @param <T>     The type of upgrade.
      * @return The new {@link UpgradeData} instance.
      */
-    public static <T extends UpgradeBase> UpgradeData<T> of(Holder.Reference<T> holder, DataComponentPatch data) {
-        return new UpgradeData<>(holder, data);
+    public static <T extends UpgradeBase> UpgradeData<T> of(T upgrade, CompoundTag data) {
+        return new UpgradeData<>(upgrade, data);
     }
 
     /**
      * Create an {@link UpgradeData} containing the default {@linkplain #data() data} for an upgrade.
      *
-     * @param holder The upgrade instance.
-     * @param <T>    The type of upgrade.
+     * @param upgrade The upgrade instance.
+     * @param <T>     The type of upgrade.
      * @return The default upgrade data.
      */
-    public static <T extends UpgradeBase> UpgradeData<T> ofDefault(Holder.Reference<T> holder) {
-        var upgrade = holder.value();
-        return of(holder, upgrade.getUpgradeData(upgrade.getCraftingItem()));
-    }
-
-    public UpgradeData {
-        if (!holder.isBound()) throw new IllegalArgumentException("Holder is not bound");
+    public static <T extends UpgradeBase> UpgradeData<T> ofDefault(T upgrade) {
+        return of(upgrade, upgrade.getUpgradeData(upgrade.getCraftingItem()));
     }
 
     /**
-     * Get the current upgrade.
+     * Take a copy of a (possibly {@code null}) {@link UpgradeData} instance.
      *
-     * @return The current upgrade.
+     * @param upgrade The copied upgrade data.
+     * @param <T>     The type of upgrade.
+     * @return The newly created upgrade data.
      */
-    public T upgrade() {
-        return holder().value();
+    @Contract("!null -> !null; null -> null")
+    public static <T extends UpgradeBase> @Nullable UpgradeData<T> copyOf(@Nullable UpgradeData<T> upgrade) {
+        return upgrade == null ? null : upgrade.copy();
     }
 
     /**
-     * Get the {@linkplain UpgradeBase#getUpgradeItem(DataComponentPatch) upgrade item} for this upgrade.
+     * Get the {@linkplain UpgradeBase#getUpgradeItem(CompoundTag) upgrade item} for this upgrade.
      * <p>
      * This returns a defensive copy of the item, to prevent accidental mutation of the upgrade data or original
      * {@linkplain UpgradeBase#getCraftingItem() upgrade stack}.
@@ -69,19 +66,16 @@ public record UpgradeData<T extends UpgradeBase>(
      * @return This upgrade's item.
      */
     public ItemStack getUpgradeItem() {
-        return upgrade().getUpgradeItem(data).copy();
+        return upgrade.getUpgradeItem(data).copy();
     }
 
     /**
-     * Get a component from the upgrade's {@link #data()} .
+     * Take a copy of this {@link UpgradeData}. This returns a new instance with the same upgrade and a fresh copy of
+     * the upgrade data.
      *
-     * @param component The component get.
-     * @param <U>       The type of the component's value.
-     * @return The component, or {@code null} if not present.
+     * @return A copy of the current instance.
      */
-    @Override
-    public <U> @Nullable U get(DataComponentType<? extends U> component) {
-        var result = data().get(component);
-        return result == null ? null : result.orElse(null);
+    public UpgradeData<T> copy() {
+        return new UpgradeData<>(upgrade(), data().copy());
     }
 }

projects/common-api/src/main/java/dan200/computercraft/api/upgrades/UpgradeDataProvider.java

@@ -0,0 +1,177 @@
+// SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.api.upgrades;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser;
+import dan200.computercraft.impl.PlatformHelper;
+import dan200.computercraft.impl.upgrades.SerialiserWithCraftingItem;
+import dan200.computercraft.impl.upgrades.SimpleSerialiser;
+import net.minecraft.Util;
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.data.CachedOutput;
+import net.minecraft.data.DataProvider;
+import net.minecraft.data.PackOutput;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Item;
+import org.jspecify.annotations.Nullable;
+
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/**
+ * A data generator/provider for turtle and pocket computer upgrades. This should not be extended directly, instead see
+ * the other subclasses.
+ *
+ * @param <T> The base class of upgrades.
+ * @param <R> The upgrade serialiser to register for.
+ * @see dan200.computercraft.api.turtle.TurtleUpgradeDataProvider
+ * @see dan200.computercraft.api.pocket.PocketUpgradeDataProvider
+ */
+public abstract class UpgradeDataProvider<T extends UpgradeBase, R extends UpgradeSerialiser<? extends T>> implements DataProvider {
+    private final PackOutput output;
+    private final String name;
+    private final String folder;
+    private final ResourceKey<Registry<R>> registry;
+
+    private @Nullable List<T> upgrades;
+
+    protected UpgradeDataProvider(PackOutput output, String name, String folder, ResourceKey<Registry<R>> registry) {
+        this.output = output;
+        this.name = name;
+        this.folder = folder;
+        this.registry = registry;
+    }
+
+    /**
+     * Register an upgrade using a "simple" serialiser (e.g. {@link TurtleUpgradeSerialiser#simple(Function)}).
+     *
+     * @param id         The ID of the upgrade to create.
+     * @param serialiser The simple serialiser.
+     * @return The constructed upgrade, ready to be passed off to {@link #addUpgrades(Consumer)}'s consumer.
+     */
+    public final Upgrade<R> simple(ResourceLocation id, R serialiser) {
+        if (!(serialiser instanceof SimpleSerialiser)) {
+            throw new IllegalStateException(serialiser + " must be a simple() seriaiser.");
+        }
+
+        return new Upgrade<>(id, serialiser, s -> {
+        });
+    }
+
+    /**
+     * Register an upgrade using a "simple" serialiser (e.g. {@link TurtleUpgradeSerialiser#simple(Function)}).
+     *
+     * @param id         The ID of the upgrade to create.
+     * @param serialiser The simple serialiser.
+     * @param item       The crafting upgrade for this item.
+     * @return The constructed upgrade, ready to be passed off to {@link #addUpgrades(Consumer)}'s consumer.
+     */
+    public final Upgrade<R> simpleWithCustomItem(ResourceLocation id, R serialiser, Item item) {
+        if (!(serialiser instanceof SerialiserWithCraftingItem)) {
+            throw new IllegalStateException(serialiser + " must be a simpleWithCustomItem() serialiser.");
+        }
+
+        return new Upgrade<>(id, serialiser, s ->
+            s.addProperty("item", PlatformHelper.get().getRegistryKey(Registries.ITEM, item).toString())
+        );
+    }
+
+    /**
+     * Add all turtle or pocket computer upgrades.
+     *
+     * <h4>Example</h4>
+     * {@snippet class=com.example.examplemod.data.TurtleDataProvider region=body}
+     *
+     * @param addUpgrade A callback used to register an upgrade.
+     */
+    protected abstract void addUpgrades(Consumer<Upgrade<R>> addUpgrade);
+
+    @Override
+    public CompletableFuture<?> run(CachedOutput cache) {
+        var base = output.getOutputFolder().resolve("data");
+
+        Set<ResourceLocation> seen = new HashSet<>();
+        List<T> upgrades = new ArrayList<>();
+        List<CompletableFuture<?>> futures = new ArrayList<>();
+        addUpgrades(upgrade -> {
+            if (!seen.add(upgrade.id())) throw new IllegalStateException("Duplicate upgrade " + upgrade.id());
+
+            var json = new JsonObject();
+            json.addProperty("type", PlatformHelper.get().getRegistryKey(registry, upgrade.serialiser()).toString());
+            upgrade.serialise().accept(json);
+
+            futures.add(DataProvider.saveStable(cache, json, base.resolve(upgrade.id().getNamespace() + "/" + folder + "/" + upgrade.id().getPath() + ".json")));
+
+            try {
+                var result = upgrade.serialiser().fromJson(upgrade.id(), json);
+                upgrades.add(result);
+            } catch (IllegalArgumentException | JsonParseException e) {
+                LOGGER.error("Failed to parse {} {}", name, upgrade.id(), e);
+            }
+        });
+
+        this.upgrades = Collections.unmodifiableList(upgrades);
+        return Util.sequenceFailFast(futures);
+    }
+
+    @Override
+    public final String getName() {
+        return name;
+    }
+
+    public final R existingSerialiser(ResourceLocation id) {
+        var result = PlatformHelper.get().getRegistryObject(registry, id);
+        if (result == null) throw new IllegalArgumentException("No such serialiser " + registry);
+        return result;
+    }
+
+    public List<T> getGeneratedUpgrades() {
+        if (upgrades == null) throw new IllegalStateException("Upgrades have not been generated yet");
+        return upgrades;
+    }
+
+    /**
+     * A constructed upgrade instance, produced {@link #addUpgrades(Consumer)}.
+     *
+     * @param id         The ID for this upgrade.
+     * @param serialiser The serialiser which reads and writes this upgrade.
+     * @param serialise  Augment the generated JSON with additional fields.
+     * @param <R>        The type of upgrade serialiser.
+     */
+    public record Upgrade<R extends UpgradeSerialiser<?>>(
+        ResourceLocation id, R serialiser, Consumer<JsonObject> serialise
+    ) {
+        /**
+         * Convenience method for registering an upgrade.
+         *
+         * @param add The callback given to {@link #addUpgrades(Consumer)}
+         */
+        public void add(Consumer<Upgrade<R>> add) {
+            add.accept(this);
+        }
+
+        /**
+         * Return a new {@link Upgrade} which requires the given mod to be present.
+         * <p>
+         * This uses mod-loader-specific hooks (Forge's crafting conditions and Fabric's resource conditions). If using
+         * this in a multi-loader setup, you must generate resources separately for the two loaders.
+         *
+         * @param modId The id of the mod.
+         * @return A new upgrade instance.
+         */
+        public Upgrade<R> requireMod(String modId) {
+            return new Upgrade<>(id, serialiser, json -> {
+                PlatformHelper.get().addRequiredModCondition(json, modId);
+                serialise.accept(json);
+            });
+        }
+    }
+}

projects/common-api/src/main/java/dan200/computercraft/api/upgrades/UpgradeSerialiser.java

@@ -0,0 +1,52 @@
+// SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.api.upgrades;
+
+import com.google.gson.JsonObject;
+import dan200.computercraft.api.pocket.PocketUpgradeSerialiser;
+import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.resources.ResourceLocation;
+
+
+/**
+ * Base interface for upgrade serialisers. This should generally not be implemented directly, instead implementing one
+ * of {@link TurtleUpgradeSerialiser} or {@link PocketUpgradeSerialiser}.
+ * <p>
+ * However, it may sometimes be useful to implement this if you have some shared logic between upgrade types.
+ *
+ * @param <T> The upgrade that this class can serialise and deserialise.
+ * @see TurtleUpgradeSerialiser
+ * @see PocketUpgradeSerialiser
+ */
+public interface UpgradeSerialiser<T extends UpgradeBase> {
+    /**
+     * Read this upgrade from a JSON file in a datapack.
+     *
+     * @param id     The ID of this upgrade.
+     * @param object The JSON object to load this upgrade from.
+     * @return The constructed upgrade, with a {@link UpgradeBase#getUpgradeID()} equal to {@code id}.
+     * @see net.minecraft.util.GsonHelper For additional JSON helper methods.
+     */
+    T fromJson(ResourceLocation id, JsonObject object);
+
+    /**
+     * Read this upgrade from a network packet, sent from the server.
+     *
+     * @param id     The ID of this upgrade.
+     * @param buffer The buffer object to read this upgrade from.
+     * @return The constructed upgrade, with a {@link UpgradeBase#getUpgradeID()} equal to {@code id}.
+     */
+    T fromNetwork(ResourceLocation id, FriendlyByteBuf buffer);
+
+    /**
+     * Write this upgrade to a network packet, to be sent to the client.
+     *
+     * @param buffer  The buffer object to write this upgrade to
+     * @param upgrade The upgrade to write.
+     */
+    void toNetwork(FriendlyByteBuf buffer, T upgrade);
+
+}

projects/common-api/src/main/java/dan200/computercraft/api/upgrades/UpgradeType.java

@@ -1,88 +0,0 @@
-// SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.api.upgrades;
-
-import com.mojang.serialization.MapCodec;
-import dan200.computercraft.api.pocket.IPocketUpgrade;
-import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.Recipe;
-import net.minecraft.world.level.storage.loot.functions.LootItemFunction;
-
-import java.util.function.Function;
-
-/**
- * The type of a {@linkplain ITurtleUpgrade turtle} or {@linkplain IPocketUpgrade pocket} upgrade.
- * <p>
- * Turtle and pocket computer upgrades are registered using Minecraft's dynamic registry system. As a result, they
- * follow a similar design to other dynamic content, such as {@linkplain Recipe recipes} or {@link LootItemFunction
- * loot functions}.
- * <p>
- * While the {@link ITurtleUpgrade}/{@link IPocketUpgrade} class should contain the core logic of the upgrade, they are
- * not registered directly. Instead, each upgrade class has a corresponding {@link UpgradeType}, which is responsible
- * for loading the upgrade from a datapack. The upgrade type should then be registered in its appropriate registry
- * ({@link ITurtleUpgrade#typeRegistry()}, {@link IPocketUpgrade#typeRegistry()}).
- * <p>
- * In order to register the actual upgrade, a JSON file referencing your upgrade type should be added to a datapack. It
- * is recommended to do this via the data generators.
- *
- * <h2 id="datagen">Data Generation</h2>
- * As turtle and pocket upgrades are just loaded using vanilla's dynamic loaders, one may use the same data generation
- * tools as you would for any other dynamic registry.
- * <p>
- * See <a href="../turtle/ITurtleUpgrade.html#datagen">the turtle upgrade docs</a> for a concrete example.
- *
- * @param <T> The upgrade subclass that this upgrade type represents.
- * @see ITurtleUpgrade
- * @see IPocketUpgrade
- */
-public sealed interface UpgradeType<T extends UpgradeBase> permits UpgradeTypeImpl {
-    /**
-     * The codec to read and write this upgrade from a datapack.
-     *
-     * @return The codec for this upgrade.
-     */
-    MapCodec<T> codec();
-
-    /**
-     * Create a new upgrade type.
-     *
-     * @param codec The codec
-     * @param <T>   The type of the generated upgrade.
-     * @return The newly created upgrade type.
-     */
-    static <T extends UpgradeBase> UpgradeType<T> create(MapCodec<T> codec) {
-        return new UpgradeTypeImpl<>(codec);
-    }
-
-    /**
-     * Create an upgrade type for an upgrade that takes no arguments.
-     * <p>
-     * If you might want to vary the item, it's suggested you use {@link #simpleWithCustomItem(Function)} instead.
-     *
-     * @param instance Generate a new upgrade with a specific ID.
-     * @param <T>      The type of the generated upgrade.
-     * @return A new upgrade type.
-     */
-    static <T extends UpgradeBase> UpgradeType<T> simple(T instance) {
-        return create(MapCodec.unit(instance));
-    }
-
-    /**
-     * Create an upgrade type for a simple upgrade whose crafting item can be specified.
-     *
-     * @param factory Generate a new upgrade with a specific ID and crafting item. The returned upgrade's
-     *                {@link UpgradeBase#getCraftingItem()} <strong>MUST</strong> equal the provided item.
-     * @param <T>     The type of the generated upgrade.
-     * @return A new upgrade type.
-     * @see #simple(UpgradeBase)  For upgrades whose crafting stack should not vary.
-     */
-    static <T extends UpgradeBase> UpgradeType<T> simpleWithCustomItem(Function<ItemStack, T> factory) {
-        return create(BuiltInRegistries.ITEM.byNameCodec()
-            .xmap(x -> factory.apply(new ItemStack(x)), x -> x.getCraftingItem().getItem())
-            .fieldOf("item"));
-    }
-}

projects/common-api/src/main/java/dan200/computercraft/api/upgrades/UpgradeTypeImpl.java

@@ -1,16 +0,0 @@
-// SPDX-FileCopyrightText: 2024 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.api.upgrades;
-
-import com.mojang.serialization.MapCodec;
-
-/**
- * Simple implementation of {@link UpgradeType}.
- *
- * @param codec The codec to read/write upgrades with.
- * @param <T>   The upgrade subclass that this upgrade type represents.
- */
-record UpgradeTypeImpl<T extends UpgradeBase>(MapCodec<T> codec) implements UpgradeType<T> {
-}

projects/common-api/src/main/java/dan200/computercraft/impl/ComputerCraftAPIService.java

@@ -4,7 +4,6 @@
 
 package dan200.computercraft.impl;
 
-import com.mojang.serialization.Codec;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.detail.BlockReference;
 import dan200.computercraft.api.detail.DetailRegistry;
@@ -12,16 +11,15 @@ import dan200.computercraft.api.filesystem.Mount;
 import dan200.computercraft.api.filesystem.WritableMount;
 import dan200.computercraft.api.lua.GenericSource;
 import dan200.computercraft.api.lua.ILuaAPIFactory;
+import dan200.computercraft.api.media.MediaProvider;
 import dan200.computercraft.api.media.PrintoutContents;
 import dan200.computercraft.api.network.PacketNetwork;
 import dan200.computercraft.api.network.wired.WiredElement;
 import dan200.computercraft.api.network.wired.WiredNode;
-import dan200.computercraft.api.pocket.IPocketUpgrade;
+import dan200.computercraft.api.pocket.PocketUpgradeSerialiser;
 import dan200.computercraft.api.redstone.BundledRedstoneProvider;
-import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleRefuelHandler;
-import dan200.computercraft.api.upgrades.UpgradeType;
-import dan200.computercraft.impl.upgrades.TurtleToolSpec;
+import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Registry;
@@ -59,6 +57,8 @@ public interface ComputerCraftAPIService {
 
     int getBundledRedstoneOutput(Level world, BlockPos pos, Direction side);
 
+    void registerMediaProvider(MediaProvider provider);
+
     PacketNetwork getWirelessNetwork(MinecraftServer server);
 
     void registerAPIFactory(ILuaAPIFactory factory);
@@ -67,15 +67,9 @@ public interface ComputerCraftAPIService {
 
     void registerRefuelHandler(TurtleRefuelHandler handler);
 
-    ResourceKey<Registry<UpgradeType<? extends ITurtleUpgrade>>> turtleUpgradeRegistryId();
+    ResourceKey<Registry<TurtleUpgradeSerialiser<?>>> turtleUpgradeRegistryId();
 
-    Codec<ITurtleUpgrade> turtleUpgradeCodec();
-
-    ResourceKey<Registry<UpgradeType<? extends IPocketUpgrade>>> pocketUpgradeRegistryId();
-
-    ITurtleUpgrade createTurtleTool(TurtleToolSpec spec);
-
-    Codec<IPocketUpgrade> pocketUpgradeCodec();
+    ResourceKey<Registry<PocketUpgradeSerialiser<?>>> pocketUpgradeRegistryId();
 
     DetailRegistry<ItemStack> getItemStackDetailRegistry();
 

projects/common-api/src/main/java/dan200/computercraft/impl/PlatformHelper.java

@@ -0,0 +1,91 @@
+// SPDX-FileCopyrightText: 2022 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.impl;
+
+import com.google.gson.JsonObject;
+import dan200.computercraft.api.upgrades.UpgradeDataProvider;
+import net.minecraft.core.Registry;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Abstraction layer for Forge and Fabric. See implementations for more details.
+ * <p>
+ * Do <strong>NOT</strong> directly reference this class. It exists for internal use by the API.
+ */
+@ApiStatus.Internal
+public interface PlatformHelper {
+    /**
+     * Get the current {@link PlatformHelper} instance.
+     *
+     * @return The current instance.
+     */
+    static PlatformHelper get() {
+        var instance = Instance.INSTANCE;
+        return instance == null ? Services.raise(PlatformHelper.class, Instance.ERROR) : instance;
+    }
+
+    /**
+     * Get the unique ID for a registered object.
+     *
+     * @param registry The registry to look up this object in.
+     * @param object   The object to look up.
+     * @param <T>      The type of object the registry stores.
+     * @return The registered object's ID.
+     * @throws IllegalArgumentException If the registry or object are not registered.
+     */
+    <T> ResourceLocation getRegistryKey(ResourceKey<Registry<T>> registry, T object);
+
+    /**
+     * Look up an ID in a registry, returning the registered object.
+     *
+     * @param registry The registry to look up this object in.
+     * @param id       The ID to look up.
+     * @param <T>      The type of object the registry stores.
+     * @return The resolved registry object.
+     * @throws IllegalArgumentException If the registry or object are not registered.
+     */
+    <T> T getRegistryObject(ResourceKey<Registry<T>> registry, ResourceLocation id);
+
+    /**
+     * Get the subset of an {@link ItemStack}'s {@linkplain ItemStack#getTag() tag} which is synced to the client.
+     *
+     * @param item The stack.
+     * @return The item's tag.
+     */
+    @Nullable
+    default CompoundTag getShareTag(ItemStack item) {
+        return item.getTag();
+    }
+
+    /**
+     * Add a resource condition which requires a mod to be loaded. This should be used by data providers such as
+     * {@link UpgradeDataProvider}.
+     *
+     * @param object The JSON object we're generating.
+     * @param modId  The mod ID that we require.
+     */
+    void addRequiredModCondition(JsonObject object, String modId);
+
+    final class Instance {
+        static final @Nullable PlatformHelper INSTANCE;
+        static final @Nullable Throwable ERROR;
+
+        static {
+            // We don't want class initialisation to fail here (as that results in confusing errors). Instead, capture
+            // the error and rethrow it when accessing. This should be JITted away in the common case.
+            var helper = Services.tryLoad(PlatformHelper.class);
+            INSTANCE = helper.instance();
+            ERROR = helper.error();
+        }
+
+        private Instance() {
+        }
+    }
+}

projects/common-api/src/main/java/dan200/computercraft/impl/upgrades/SerialiserWithCraftingItem.java

@@ -0,0 +1,49 @@
+// SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.impl.upgrades;
+
+import com.google.gson.JsonObject;
+import dan200.computercraft.api.upgrades.UpgradeBase;
+import dan200.computercraft.api.upgrades.UpgradeSerialiser;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.GsonHelper;
+import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.util.function.BiFunction;
+
+/**
+ * Simple serialiser which returns a constant upgrade with a custom crafting item.
+ * <p>
+ * Do <strong>NOT</strong> directly reference this class. It exists for internal use by the API.
+ *
+ * @param <T> The upgrade that this class can serialise and deserialise.
+ */
+@ApiStatus.Internal
+public abstract class SerialiserWithCraftingItem<T extends UpgradeBase> implements UpgradeSerialiser<T> {
+    private final BiFunction<ResourceLocation, ItemStack, T> factory;
+
+    protected SerialiserWithCraftingItem(BiFunction<ResourceLocation, ItemStack, T> factory) {
+        this.factory = factory;
+    }
+
+    @Override
+    public final T fromJson(ResourceLocation id, JsonObject object) {
+        var item = GsonHelper.getAsItem(object, "item");
+        return factory.apply(id, new ItemStack(item));
+    }
+
+    @Override
+    public final T fromNetwork(ResourceLocation id, FriendlyByteBuf buffer) {
+        var item = buffer.readItem();
+        return factory.apply(id, item);
+    }
+
+    @Override
+    public final void toNetwork(FriendlyByteBuf buffer, T upgrade) {
+        buffer.writeItem(upgrade.getCraftingItem());
+    }
+}

projects/common-api/src/main/java/dan200/computercraft/impl/upgrades/SimpleSerialiser.java

@@ -0,0 +1,44 @@
+// SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.impl.upgrades;
+
+import com.google.gson.JsonObject;
+import dan200.computercraft.api.upgrades.UpgradeBase;
+import dan200.computercraft.api.upgrades.UpgradeSerialiser;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.resources.ResourceLocation;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.util.function.Function;
+
+/**
+ * Simple serialiser which returns a constant upgrade.
+ * <p>
+ * Do <strong>NOT</strong> directly reference this class. It exists for internal use by the API.
+ *
+ * @param <T> The upgrade that this class can serialise and deserialise.
+ */
+@ApiStatus.Internal
+public abstract class SimpleSerialiser<T extends UpgradeBase> implements UpgradeSerialiser<T> {
+    private final Function<ResourceLocation, T> constructor;
+
+    public SimpleSerialiser(Function<ResourceLocation, T> constructor) {
+        this.constructor = constructor;
+    }
+
+    @Override
+    public final T fromJson(ResourceLocation id, JsonObject object) {
+        return constructor.apply(id);
+    }
+
+    @Override
+    public final T fromNetwork(ResourceLocation id, FriendlyByteBuf buffer) {
+        return constructor.apply(id);
+    }
+
+    @Override
+    public final void toNetwork(FriendlyByteBuf buffer, T upgrade) {
+    }
+}

projects/common-api/src/main/java/dan200/computercraft/impl/upgrades/TurtleToolSpec.java

@@ -1,49 +0,0 @@
-// SPDX-FileCopyrightText: 2024 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.impl.upgrades;
-
-import com.mojang.serialization.Codec;
-import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import dan200.computercraft.api.turtle.TurtleToolDurability;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.ComponentSerialization;
-import net.minecraft.tags.TagKey;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
-
-import java.util.Optional;
-
-/**
- * The template for a turtle tool.
- *
- * @param adjective         The adjective for this tool.
- * @param item              The tool used.
- * @param damageMultiplier  The damage multiplier for this tool.
- * @param allowEnchantments Whether to allow enchantments.
- * @param consumeDurability When to consume durability.
- * @param breakable         The items breakable by this tool.
- */
-public record TurtleToolSpec(
-    Component adjective,
-    Item item,
-    float damageMultiplier,
-    boolean allowEnchantments,
-    TurtleToolDurability consumeDurability,
-    Optional<TagKey<Block>> breakable
-) {
-    public static final float DEFAULT_DAMAGE_MULTIPLIER = 3.0f;
-
-    public static final MapCodec<TurtleToolSpec> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(
-        ComponentSerialization.CODEC.fieldOf("adjective").forGetter(TurtleToolSpec::adjective),
-        BuiltInRegistries.ITEM.byNameCodec().fieldOf("item").forGetter(TurtleToolSpec::item),
-        Codec.FLOAT.optionalFieldOf("damageMultiplier", DEFAULT_DAMAGE_MULTIPLIER).forGetter(TurtleToolSpec::damageMultiplier),
-        Codec.BOOL.optionalFieldOf("allowEnchantments", false).forGetter(TurtleToolSpec::allowEnchantments),
-        TurtleToolDurability.CODEC.optionalFieldOf("consumeDurability", TurtleToolDurability.NEVER).forGetter(TurtleToolSpec::consumeDurability),
-        TagKey.codec(Registries.BLOCK).optionalFieldOf("breakable").forGetter(TurtleToolSpec::breakable)
-    ).apply(instance, TurtleToolSpec::new));
-}

projects/common-api/src/overview.html

@@ -64,65 +64,5 @@ dependencies {
     CC:T), please <a href="https://github.com/cc-tweaked/CC-Tweaked/discussions/new/choose">start a discussion</a> to
     let me know!
 
-
-<h1>Updating from Minecraft 1.20.1 to 1.21.1</h1>
-
-<h2>Peripherals</h2>
-<ul>
-    <li>
-        <p>
-            On NeoForge, the peripheral capability has migrated to NeoForge's new capability system.
-            <code>dan200.computercraft.api.peripheral.PeripheralCapability</code> can be used to register a peripheral.
-            <code>IPeripheralProvider</code> has also been removed, as capabilities can now be used for arbitrary
-            blocks.
-</ul>
-
-<p>
-    {@linkplain dan200.computercraft.api.peripheral Read more on registering peripherals}.
-
-<h2>Turtle and pocket upgrades</h2>
-Turtle and pocket upgrades have been migrated to use Minecraft's dynamic registries. While upgrades themselves have not
-changed much, the interface for registering them is dramatically different.
-
-<ul>
-    <li>
-        <p>
-            <code>TurtleUpgradeSerialiser</code> and <code>PocketUpgradeSerialiser</code> have been unified into a
-            single {@link dan200.computercraft.api.upgrades.UpgradeType} class
-        <ul>
-            <li>
-                Replace <code>TurtleUpgradeSerialiser.registryId()</code> with
-                {@link dan200.computercraft.api.turtle.ITurtleUpgrade#typeRegistry()} and <code>PocketUpgradeSerialiser.registryId()</code>
-                with {@link dan200.computercraft.api.pocket.IPocketUpgrade#typeRegistry()}.
-            <li>
-                Replace all other usages of <code>TurtleUpgradeSerialiser</code> and <code>PocketUpgradeSerialiser</code>
-                with {@link dan200.computercraft.api.upgrades.UpgradeType}.
-        </ul>
-
-    <li>
-        Upgrades are now (de)serialised using codecs, rather than manually reading from JSON and encoding/decoding
-        network packets. Instead of subclassing {@link dan200.computercraft.api.upgrades.UpgradeType}, it is recommended
-        you use {@link dan200.computercraft.api.upgrades.UpgradeType#create} to create a new type from a
-        <code>MapCodec</code>.
-
-    <li>
-        Upgrades are no longer aware of their ID, and so cannot compute their adjective. The adjective must now either
-        be hard-coded, or read as part of the codec.
-
-    <li>
-        The upgrade data providers have been removed, in favour of mod-loaders built-in support for dynamic registries.
-        I'm afraid it's probably easier if you delete your existing upgrade datagen code and start from scratch. See
-        <a href="./dan200/computercraft/api/turtle/ITurtleUpgrade.html#datagen">the <code>ITurtleUpgrade</code>
-        documentation for an example</a>.
-
-    <li>
-        Upgrades now store their additional data ({@link dan200.computercraft.api.turtle.ITurtleAccess#getUpgradeData},
-        {@link dan200.computercraft.api.pocket.IPocketAccess#getUpgradeData()}) as an immutable component map, rather
-        than a compound tag.
-</ul>
-
-<p>
-    {@linkplain dan200.computercraft.api.turtle.ITurtleUpgrade Read more on registering turtle upgrades}.
-
 </body>
 </html>

projects/common/build.gradle.kts

@@ -11,12 +11,6 @@ plugins {
     id("cc-tweaked.publishing")
 }
 
-sourceSets.client {
-    java {
-        exclude("dan200/computercraft/client/integration/emi")
-    }
-}
-
 minecraft {
     accessWideners(
         "src/main/resources/computercraft.accesswidener",
@@ -29,7 +23,7 @@ configurations {
 }
 
 repositories {
-    maven("https://maven.neoforged.net/") {
+    maven("https://maven.minecraftforge.net/") {
         content {
             includeModule("org.spongepowered", "mixin")
         }
@@ -42,8 +36,6 @@ dependencies {
     api(commonClasses(project(":common-api")))
     clientApi(clientClasses(project(":common-api")))
 
-    compileOnly(libs.mixin)
-    compileOnly(libs.mixinExtra)
     compileOnly(libs.bundles.externalMods.common)
     clientCompileOnly(variantOf(libs.emi) { classifier("api") })
 

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

@@ -6,13 +6,12 @@ package dan200.computercraft.client;
 
 import com.mojang.blaze3d.audio.Channel;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Axis;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.client.pocket.ClientPocketComputers;
 import dan200.computercraft.client.render.CableHighlightRenderer;
-import dan200.computercraft.client.render.ExtendedItemFrameRenderState;
 import dan200.computercraft.client.render.PocketItemRenderer;
 import dan200.computercraft.client.render.PrintoutItemRenderer;
+import dan200.computercraft.client.render.monitor.MonitorBlockEntityRenderer;
 import dan200.computercraft.client.render.monitor.MonitorHighlightRenderer;
 import dan200.computercraft.client.render.monitor.MonitorRenderState;
 import dan200.computercraft.client.sound.SpeakerManager;
@@ -30,15 +29,16 @@ import dan200.computercraft.shared.util.WorldUtil;
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.entity.state.ItemFrameRenderState;
 import net.minecraft.client.sounds.AudioStream;
 import net.minecraft.client.sounds.SoundEngine;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.decoration.ItemFrame;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
+import org.jspecify.annotations.Nullable;
 
 import java.util.function.Consumer;
 
@@ -91,10 +91,9 @@ public final class ClientHooks {
         return false;
     }
 
-    public static boolean onRenderItemFrame(PoseStack transform, MultiBufferSource render, ItemFrameRenderState frame, ExtendedItemFrameRenderState state, int light) {
-        if (state.printoutData != null) {
-            transform.mulPose(Axis.ZP.rotationDegrees(frame.rotation * 360.0f / 8.0f));
-            PrintoutItemRenderer.onRenderInFrame(transform, render, frame, state.printoutData, state.isBook, light);
+    public static boolean onRenderItemFrame(PoseStack transform, MultiBufferSource render, ItemFrame frame, ItemStack stack, int light) {
+        if (stack.getItem() instanceof PrintoutItem) {
+            PrintoutItemRenderer.onRenderInFrame(transform, render, frame, stack, light);
             return true;
         }
 
@@ -112,7 +111,7 @@ public final class ClientHooks {
      */
     public static void addBlockDebugInfo(Consumer<String> addText) {
         var minecraft = Minecraft.getInstance();
-        if (!minecraft.getDebugOverlay().showDebugScreen() || minecraft.level == null) return;
+        if (!minecraft.options.renderDebug || minecraft.level == null) return;
         if (minecraft.hitResult == null || minecraft.hitResult.getType() != HitResult.Type.BLOCK) return;
 
         var tile = minecraft.level.getBlockEntity(((BlockHitResult) minecraft.hitResult).getBlockPos());
@@ -132,24 +131,35 @@ public final class ClientHooks {
     }
 
     private static void addTurtleUpgrade(Consumer<String> out, TurtleBlockEntity turtle, TurtleSide side) {
-        var upgrade = turtle.getAccess().getUpgradeWithData(side);
-        if (upgrade != null) out.accept(String.format("Upgrade[%s]: %s", side, upgrade.holder().key().location()));
+        var upgrade = turtle.getUpgrade(side);
+        if (upgrade != null) out.accept(String.format("Upgrade[%s]: %s", side, upgrade.getUpgradeID()));
     }
 
-    public static BlockState getBlockBreakingState(BlockState state, BlockPos pos) {
+    /**
+     * Add additional information about the game to the debug screen.
+     *
+     * @param addText A callback which adds a single line of text.
+     */
+    public static void addGameDebugInfo(Consumer<String> addText) {
+        if (MonitorBlockEntityRenderer.hasRenderedThisFrame() && Minecraft.getInstance().options.renderDebug) {
+            addText.accept("[CC:T] Monitor renderer: " + MonitorBlockEntityRenderer.currentRenderer());
+        }
+    }
+
+    public static @Nullable BlockState getBlockBreakingState(BlockState state, BlockPos pos) {
         // Only apply to cables which have both a cable and modem
         if (state.getBlock() != ModRegistry.Blocks.CABLE.get()
             || !state.getValue(CableBlock.CABLE)
             || state.getValue(CableBlock.MODEM) == CableModemVariant.None
         ) {
-            return state;
+            return null;
         }
 
         var hit = Minecraft.getInstance().hitResult;
-        if (hit == null || hit.getType() != HitResult.Type.BLOCK) return state;
+        if (hit == null || hit.getType() != HitResult.Type.BLOCK) return null;
         var hitPos = ((BlockHitResult) hit).getBlockPos();
 
-        if (!hitPos.equals(pos)) return state;
+        if (!hitPos.equals(pos)) return null;
 
         return WorldUtil.isVecInside(CableShapes.getModemShape(state), hit.getLocation().subtract(pos.getX(), pos.getY(), pos.getZ()))
             ? state.getBlock().defaultBlockState().setValue(CableBlock.MODEM, state.getValue(CableBlock.MODEM))

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

@@ -4,53 +4,57 @@
 
 package dan200.computercraft.client;
 
-import com.mojang.serialization.MapCodec;
-import dan200.computercraft.api.client.StandaloneModel;
-import dan200.computercraft.api.client.turtle.*;
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.arguments.IntegerArgumentType;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import dan200.computercraft.api.ComputerCraftAPI;
+import dan200.computercraft.api.client.turtle.RegisterTurtleUpgradeModeller;
+import dan200.computercraft.api.client.turtle.TurtleUpgradeModeller;
 import dan200.computercraft.client.gui.*;
-import dan200.computercraft.client.item.colour.PocketComputerLight;
-import dan200.computercraft.client.item.model.TurtleOverlayModel;
-import dan200.computercraft.client.item.properties.PocketComputerStateProperty;
-import dan200.computercraft.client.item.properties.TurtleShowElfOverlay;
-import dan200.computercraft.client.platform.ClientPlatformHelper;
-import dan200.computercraft.client.platform.ModelKey;
+import dan200.computercraft.client.pocket.ClientPocketComputers;
 import dan200.computercraft.client.render.CustomLecternRenderer;
+import dan200.computercraft.client.render.RenderTypes;
 import dan200.computercraft.client.render.TurtleBlockEntityRenderer;
 import dan200.computercraft.client.render.monitor.MonitorBlockEntityRenderer;
-import dan200.computercraft.client.turtle.TurtleOverlay;
-import dan200.computercraft.client.turtle.TurtleOverlayManager;
-import dan200.computercraft.client.turtle.TurtleUpgradeModelManager;
+import dan200.computercraft.client.turtle.TurtleModemModeller;
+import dan200.computercraft.client.turtle.TurtleUpgradeModellers;
+import dan200.computercraft.core.util.Colour;
 import dan200.computercraft.shared.ModRegistry;
+import dan200.computercraft.shared.command.CommandComputerCraft;
+import dan200.computercraft.shared.common.IColouredItem;
+import dan200.computercraft.shared.computer.core.ComputerState;
+import dan200.computercraft.shared.computer.core.ServerContext;
 import dan200.computercraft.shared.computer.inventory.AbstractComputerMenu;
-import net.minecraft.client.color.item.ItemTintSource;
-import net.minecraft.client.gui.render.pip.PictureInPictureRenderer;
-import net.minecraft.client.gui.render.state.pip.PictureInPictureRenderState;
+import dan200.computercraft.shared.media.items.DiskItem;
+import dan200.computercraft.shared.media.items.TreasureDiskItem;
+import net.minecraft.Util;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.color.item.ItemColor;
 import net.minecraft.client.gui.screens.MenuScreens;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.inventory.MenuAccess;
-import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.renderer.ShaderInstance;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
-import net.minecraft.client.renderer.item.ItemModel;
-import net.minecraft.client.renderer.item.properties.conditional.ConditionalItemModelProperty;
-import net.minecraft.client.renderer.item.properties.select.SelectItemModelProperty;
-import net.minecraft.client.resources.model.MissingBlockModel;
-import net.minecraft.client.resources.model.ModelBaker;
-import net.minecraft.client.resources.model.ModelManager;
-import net.minecraft.client.resources.model.ResolvableModel;
+import net.minecraft.client.renderer.item.ClampedItemPropertyFunction;
+import net.minecraft.client.renderer.item.ItemProperties;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.resources.ResourceManager;
-import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.inventory.MenuType;
+import net.minecraft.server.packs.resources.PreparableReloadListener;
+import net.minecraft.server.packs.resources.ResourceProvider;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.ItemLike;
+import org.jspecify.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executor;
+import java.io.File;
+import java.io.IOException;
 import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-import java.util.function.Function;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 /**
  * Registers client-side objects, such as {@link BlockEntityRendererProvider}s and
@@ -61,22 +65,11 @@ import java.util.function.Function;
  * @see ModRegistry The common registry for actual game objects.
  */
 public final class ClientRegistry {
+    private static final Logger LOG = LoggerFactory.getLogger(ClientRegistry.class);
+
     private ClientRegistry() {
     }
 
-    private static final Map<ResourceLocation, ModelKey<StandaloneModel>> models = new ConcurrentHashMap<>();
-
-    public static ModelKey<StandaloneModel> getModel(ResourceLocation model) {
-        return models.computeIfAbsent(model, m -> ClientPlatformHelper.get().createModelKey(m::toString));
-    }
-
-    public static StandaloneModel getModel(ModelManager manager, ResourceLocation modelId) {
-        var model = getModel(modelId).get(manager);
-        if (model != null) return model;
-
-        return Objects.requireNonNull(getModel(MissingBlockModel.LOCATION).get(manager));
-    }
-
     /**
      * Register any client-side objects which don't have to be done on the main thread.
      */
@@ -88,116 +81,178 @@ public final class ClientRegistry {
         BlockEntityRenderers.register(ModRegistry.BlockEntities.LECTERN.get(), CustomLecternRenderer::new);
     }
 
-    public static void registerMenuScreens(RegisterMenuScreen register) {
-        register.<AbstractComputerMenu, ComputerScreen<AbstractComputerMenu>>register(ModRegistry.Menus.COMPUTER.get(), ComputerScreen::new);
-        register.<AbstractComputerMenu, NoTermComputerScreen<AbstractComputerMenu>>register(ModRegistry.Menus.POCKET_COMPUTER_NO_TERM.get(), NoTermComputerScreen::new);
-        register.register(ModRegistry.Menus.TURTLE.get(), TurtleScreen::new);
+    /**
+     * Register any client-side objects which must be done on the main thread.
+     *
+     * @param itemProperties Callback to register item properties.
+     */
+    public static void registerMainThread(RegisterItemProperty itemProperties) {
+        MenuScreens.<AbstractComputerMenu, ComputerScreen<AbstractComputerMenu>>register(ModRegistry.Menus.COMPUTER.get(), ComputerScreen::new);
+        MenuScreens.<AbstractComputerMenu, NoTermComputerScreen<AbstractComputerMenu>>register(ModRegistry.Menus.POCKET_COMPUTER_NO_TERM.get(), NoTermComputerScreen::new);
+        MenuScreens.register(ModRegistry.Menus.TURTLE.get(), TurtleScreen::new);
 
-        register.register(ModRegistry.Menus.PRINTER.get(), PrinterScreen::new);
-        register.register(ModRegistry.Menus.DISK_DRIVE.get(), DiskDriveScreen::new);
-        register.register(ModRegistry.Menus.PRINTOUT.get(), PrintoutScreen::new);
+        MenuScreens.register(ModRegistry.Menus.PRINTER.get(), PrinterScreen::new);
+        MenuScreens.register(ModRegistry.Menus.DISK_DRIVE.get(), DiskDriveScreen::new);
+        MenuScreens.register(ModRegistry.Menus.PRINTOUT.get(), PrintoutScreen::new);
+
+        registerItemProperty(itemProperties, "state",
+            new UnclampedPropertyFunction((stack, world, player, random) -> {
+                var computer = ClientPocketComputers.get(stack);
+                return (computer == null ? ComputerState.OFF : computer.getState()).ordinal();
+            }),
+            ModRegistry.Items.POCKET_COMPUTER_NORMAL, ModRegistry.Items.POCKET_COMPUTER_ADVANCED
+        );
+        registerItemProperty(itemProperties, "coloured",
+            (stack, world, player, random) -> IColouredItem.getColourBasic(stack) != -1 ? 1 : 0,
+            ModRegistry.Items.POCKET_COMPUTER_NORMAL, ModRegistry.Items.POCKET_COMPUTER_ADVANCED
+        );
     }
 
-    public interface RegisterMenuScreen {
-        <M extends AbstractContainerMenu, U extends Screen & MenuAccess<M>> void register(MenuType<? extends M> type, MenuScreens.ScreenConstructor<M, U> factory);
+    public static void registerTurtleModellers(RegisterTurtleUpgradeModeller register) {
+        register.register(ModRegistry.TurtleSerialisers.SPEAKER.get(), TurtleUpgradeModeller.sided(
+            new ResourceLocation(ComputerCraftAPI.MOD_ID, "block/turtle_speaker_left"),
+            new ResourceLocation(ComputerCraftAPI.MOD_ID, "block/turtle_speaker_right")
+        ));
+        register.register(ModRegistry.TurtleSerialisers.WORKBENCH.get(), TurtleUpgradeModeller.sided(
+            new ResourceLocation(ComputerCraftAPI.MOD_ID, "block/turtle_crafting_table_left"),
+            new ResourceLocation(ComputerCraftAPI.MOD_ID, "block/turtle_crafting_table_right")
+        ));
+        register.register(ModRegistry.TurtleSerialisers.WIRELESS_MODEM_NORMAL.get(), new TurtleModemModeller(false));
+        register.register(ModRegistry.TurtleSerialisers.WIRELESS_MODEM_ADVANCED.get(), new TurtleModemModeller(true));
+        register.register(ModRegistry.TurtleSerialisers.TOOL.get(), TurtleUpgradeModeller.flatItem());
     }
 
-    public static void registerTurtleModels(RegisterTurtleUpgradeModel register) {
-        register.register(BasicUpgradeModel.ID, BasicUpgradeModel.CODEC);
-        register.register(ItemUpgradeModel.ID, ItemUpgradeModel.CODEC);
-        register.register(SelectUpgradeModel.ID, SelectUpgradeModel.CODEC);
+    @SafeVarargs
+    private static void registerItemProperty(RegisterItemProperty itemProperties, String name, ClampedItemPropertyFunction getter, Supplier<? extends Item>... items) {
+        var id = new ResourceLocation(ComputerCraftAPI.MOD_ID, name);
+        for (var item : items) itemProperties.register(item.get(), id, getter);
     }
 
-    private static final ResourceLocation[] EXTRA_MODELS = {
-        TurtleOverlay.ELF_MODEL,
-        TurtleBlockEntityRenderer.NORMAL_TURTLE_MODEL,
-        TurtleBlockEntityRenderer.ADVANCED_TURTLE_MODEL,
-        TurtleBlockEntityRenderer.COLOUR_TURTLE_MODEL,
-        MissingBlockModel.LOCATION,
+    /**
+     * Register an item property via {@link ItemProperties#register}. Forge and Fabric expose different methods, so we
+     * supply this via mod-loader-specific code.
+     */
+    public interface RegisterItemProperty {
+        void register(Item item, ResourceLocation name, ClampedItemPropertyFunction property);
+    }
+
+    public static void registerReloadListeners(Consumer<PreparableReloadListener> register, Minecraft minecraft) {
+        register.accept(GuiSprites.initialise(minecraft.getTextureManager()));
+    }
+
+    private static final String[] EXTRA_MODELS = new String[]{
+        "block/turtle_colour",
+        "block/turtle_elf_overlay",
+        "block/turtle_rainbow_overlay",
+        "block/turtle_trans_overlay",
     };
 
-    /**
-     * Additional models to load.
-     *
-     * @param turtleOverlays The unbaked turtle models.
-     * @param turtleUpgrades The unbaked turtle upgrades.
-     * @see #gatherExtraModels(ResourceManager, Executor)
-     * @see #registerExtraModels(RegisterExtraModels, ExtraModels)
-     */
-    public record ExtraModels(
-        Map<ResourceLocation, TurtleOverlay.Unbaked> turtleOverlays,
-        Map<ResourceLocation, TurtleUpgradeModel.Unbaked> turtleUpgrades
-    ) {
+    public static void registerExtraModels(Consumer<ResourceLocation> register) {
+        for (var model : EXTRA_MODELS) register.accept(new ResourceLocation(ComputerCraftAPI.MOD_ID, model));
+        TurtleUpgradeModellers.getDependencies().forEach(register);
     }
 
-    /**
-     * Gather the list of extra models to load.
-     *
-     * @param resources The current resource manager.
-     * @param executor  The executor to schedule loading on.
-     * @return A promise which contains our extra models.
-     */
-    public static CompletableFuture<ExtraModels> gatherExtraModels(ResourceManager resources, Executor executor) {
-        var turtleOverlays = TurtleOverlayManager.loader().load(resources, executor);
-        var turtleUpgrades = TurtleUpgradeModelManager.loader().load(resources, executor);
-        return turtleOverlays.thenCombine(turtleUpgrades, ExtraModels::new);
+    public static void registerItemColours(BiConsumer<ItemColor, ItemLike> register) {
+        register.accept(
+            (stack, layer) -> layer == 1 ? ((DiskItem) stack.getItem()).getColour(stack) : 0xFFFFFF,
+            ModRegistry.Items.DISK.get()
+        );
+
+        register.accept(
+            (stack, layer) -> layer == 1 ? TreasureDiskItem.getColour(stack) : 0xFFFFFF,
+            ModRegistry.Items.TREASURE_DISK.get()
+        );
+
+        register.accept(ClientRegistry::getPocketColour, ModRegistry.Items.POCKET_COMPUTER_NORMAL.get());
+        register.accept(ClientRegistry::getPocketColour, ModRegistry.Items.POCKET_COMPUTER_ADVANCED.get());
+
+        register.accept(ClientRegistry::getTurtleColour, ModRegistry.Blocks.TURTLE_NORMAL.get());
+        register.accept(ClientRegistry::getTurtleColour, ModRegistry.Blocks.TURTLE_ADVANCED.get());
     }
 
-    /**
-     * A callback used to register a model for a {@link ModelKey}.
-     */
-    public interface RegisterExtraModels {
-        default <U extends ResolvableModel, T> void register(ModelKey<T> key, U unbaked, BiFunction<U, ModelBaker, T> bake) {
-            register(key, unbaked, ResolvableModel::resolveDependencies, bake);
+    private static int getPocketColour(ItemStack stack, int layer) {
+        return switch (layer) {
+            default -> 0xFFFFFF;
+            case 1 -> IColouredItem.getColourBasic(stack); // Frame colour
+            case 2 -> { // Light colour
+                var computer = ClientPocketComputers.get(stack);
+                yield computer == null || computer.getLightState() == -1 ? Colour.BLACK.getHex() : computer.getLightState();
+            }
+        };
+    }
+
+    private static int getTurtleColour(ItemStack stack, int layer) {
+        return layer == 0 ? ((IColouredItem) stack.getItem()).getColour(stack) : 0xFFFFFF;
+    }
+
+    public static void registerShaders(ResourceProvider resources, BiConsumer<ShaderInstance, Consumer<ShaderInstance>> load) throws IOException {
+        RenderTypes.registerShaders(resources, (name, create, onLoaded) -> {
+            ShaderInstance shader;
+            try {
+                shader = create.get();
+            } catch (Exception e) {
+                LOG.error("Failed to load {}", name, e);
+                onLoaded.accept(null);
+                return;
+            }
+
+            load.accept(shader, onLoaded);
+        });
+    }
+
+    private record UnclampedPropertyFunction(
+        ClampedItemPropertyFunction function
+    ) implements ClampedItemPropertyFunction {
+        @Override
+        public float unclampedCall(ItemStack stack, @Nullable ClientLevel level, @Nullable LivingEntity entity, int layer) {
+            return function.unclampedCall(stack, level, entity, layer);
         }
 
-        /**
-         * Register an extra model.
-         * <p>
-         * This accepts functions to resolve dependencies and bake the model. While this would be conceptually nicer as
-         * an interface, it would require multiple adaptors to convert between "upgrade model", "a"bstract model" and
-         * "platform-specific model", so working with functions is cleaner.
-         *
-         * @param key     The model key for this model.
-         * @param unbaked The unbaked model.
-         * @param resolve The function to resolve dependencies for this model.
-         * @param bake    The function to bake this model.
-         * @param <U>     The type of unbaked model.
-         * @param <T>     The type of baked model.
-         */
-        <U, T> void register(ModelKey<T> key, U unbaked, BiConsumer<U, ResolvableModel.Resolver> resolve, BiFunction<U, ModelBaker, T> bake);
-    }
-
-    public static void registerExtraModels(RegisterExtraModels register, ExtraModels models) {
-        for (var model : EXTRA_MODELS) {
-            register.register(getModel(model), model, (id, r) -> r.markDependency(id), StandaloneModel::of);
+        @Deprecated
+        @Override
+        public float call(ItemStack stack, @Nullable ClientLevel level, @Nullable LivingEntity entity, int layer) {
+            return function.unclampedCall(stack, level, entity, layer);
         }
-        TurtleOverlayManager.loader().register(register, models.turtleOverlays());
-        TurtleUpgradeModelManager.loader().register(register, models.turtleUpgrades());
     }
 
-    public static void registerItemModels(BiConsumer<ResourceLocation, MapCodec<? extends ItemModel.Unbaked>> register) {
-        register.accept(TurtleOverlayModel.ID, TurtleOverlayModel.CODEC);
-        register.accept(dan200.computercraft.client.item.model.TurtleUpgradeModel.ID, dan200.computercraft.client.item.model.TurtleUpgradeModel.CODEC);
+    /**
+     * Register client-side commands.
+     *
+     * @param dispatcher The dispatcher to register the commands to.
+     * @param sendError  A function to send an error message.
+     * @param <T>        The type of the client-side command context.
+     */
+    public static <T> void registerClientCommands(CommandDispatcher<T> dispatcher, BiConsumer<T, Component> sendError) {
+        dispatcher.register(LiteralArgumentBuilder.<T>literal(CommandComputerCraft.CLIENT_OPEN_FOLDER)
+            .requires(x -> Minecraft.getInstance().getSingleplayerServer() != null)
+            .then(RequiredArgumentBuilder.<T, Integer>argument("computer_id", IntegerArgumentType.integer(0))
+                .executes(c -> handleOpenComputerCommand(c.getSource(), sendError, c.getArgument("computer_id", Integer.class)))
+            ));
     }
 
-    public static void registerItemColours(BiConsumer<ResourceLocation, MapCodec<? extends ItemTintSource>> register) {
-        register.accept(PocketComputerLight.ID, PocketComputerLight.CODEC);
-    }
+    /**
+     * Handle the {@link CommandComputerCraft#CLIENT_OPEN_FOLDER} command.
+     *
+     * @param context   The command context.
+     * @param sendError A function to send an error message.
+     * @param id        The computer's id.
+     * @param <T>       The type of the client-side command context.
+     * @return {@code 1} if a folder was opened, {@code 0} otherwise.
+     */
+    private static <T> int handleOpenComputerCommand(T context, BiConsumer<T, Component> sendError, int id) {
+        var server = Minecraft.getInstance().getSingleplayerServer();
+        if (server == null) {
+            sendError.accept(context, Component.literal("Not on a single-player server"));
+            return 0;
+        }
 
-    public static void registerSelectItemProperties(BiConsumer<ResourceLocation, SelectItemModelProperty.Type<?, ?>> register) {
-        register.accept(PocketComputerStateProperty.ID, PocketComputerStateProperty.TYPE);
-    }
+        var file = new File(ServerContext.get(server).storageDir().toFile(), "computer/" + id);
+        if (!file.isDirectory()) {
+            sendError.accept(context, Component.literal("Computer's folder does not exist"));
+            return 0;
+        }
 
-    public static void registerConditionalItemProperties(BiConsumer<ResourceLocation, MapCodec<? extends ConditionalItemModelProperty>> register) {
-        register.accept(TurtleShowElfOverlay.ID, TurtleShowElfOverlay.CODEC);
-    }
-
-    public interface RegisterPictureInPictureRenderer {
-        <T extends PictureInPictureRenderState> void register(Class<T> state, Function<MultiBufferSource.BufferSource, PictureInPictureRenderer<T>> factory);
-    }
-
-    public static void registerPictureInPictureRenderers(RegisterPictureInPictureRenderer register) {
-        register.register(PrintoutScreen.PrintoutRenderState.class, PrintoutScreen.PrintoutPictureRenderer::new);
+        Util.getPlatform().openFile(file);
+        return 1;
     }
 }

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

@@ -75,7 +75,7 @@ public class ClientTableFormatter implements TableFormatter {
 
         var tag = createTag(table.getId());
         if (chat.allMessages.removeIf(guiMessage -> guiMessage.tag() != null && Objects.equals(guiMessage.tag().logTag(), tag.logTag()))) {
-            chat.rescaleChat();
+            chat.refreshTrimmedMessage();
         }
 
         TableFormatter.super.display(table);

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

@@ -0,0 +1,20 @@
+// SPDX-FileCopyrightText: 2022 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.client;
+
+import com.google.auto.service.AutoService;
+import dan200.computercraft.api.client.turtle.TurtleUpgradeModeller;
+import dan200.computercraft.api.turtle.ITurtleUpgrade;
+import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser;
+import dan200.computercraft.client.turtle.TurtleUpgradeModellers;
+import dan200.computercraft.impl.client.ComputerCraftAPIClientService;
+
+@AutoService(ComputerCraftAPIClientService.class)
+public final class ComputerCraftAPIClientImpl implements ComputerCraftAPIClientService {
+    @Override
+    public <T extends ITurtleUpgrade> void registerTurtleUpgradeModeller(TurtleUpgradeSerialiser<T> serialiser, TurtleUpgradeModeller<T> modeller) {
+        TurtleUpgradeModellers.register(serialiser, modeller);
+    }
+}

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

@@ -1,95 +0,0 @@
-// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.client;
-
-import com.mojang.serialization.Codec;
-import com.mojang.serialization.JsonOps;
-import dan200.computercraft.client.platform.ClientPlatformHelper;
-import dan200.computercraft.client.platform.ModelKey;
-import dan200.computercraft.shared.util.ResourceUtils;
-import net.minecraft.client.resources.model.ModelBaker;
-import net.minecraft.client.resources.model.ModelManager;
-import net.minecraft.client.resources.model.ResolvableModel;
-import net.minecraft.resources.FileToIdConverter;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.resources.ResourceManager;
-
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executor;
-import java.util.function.BiFunction;
-
-/**
- * A manager for loading custom models. This is responsible for {@linkplain #load(ResourceManager, Executor) loading
- * models from resource packs}, {@linkplain #register(ClientRegistry.RegisterExtraModels, Map) registering them as
- * extra models}, and then {@linkplain #get(ModelManager, ResourceLocation) looking them up}.
- *
- * @param <U> The type of unbaked model.
- * @param <T> The type of baked model.
- */
-public class CustomModelManager<U extends ResolvableModel, T> {
-    private final String kind;
-    private final FileToIdConverter lister;
-    private final Codec<U> codec;
-    private final BiFunction<U, ModelBaker, T> bake;
-
-    private final ModelKey<T> missingModelKey;
-    private final U missingModel;
-
-    private final Map<ResourceLocation, ModelKey<T>> modelKeys = new ConcurrentHashMap<>();
-
-    public CustomModelManager(String kind, FileToIdConverter lister, Codec<U> codec, BiFunction<U, ModelBaker, T> bake, U missingModel) {
-        this.kind = kind;
-        this.lister = lister;
-        this.codec = codec;
-        this.bake = bake;
-
-        this.missingModelKey = ClientPlatformHelper.get().createModelKey(() -> "Missing " + kind);
-        this.missingModel = missingModel;
-    }
-
-    private ModelKey<T> getModelKey(ResourceLocation id) {
-        return modelKeys.computeIfAbsent(id, o -> ClientPlatformHelper.get().createModelKey(() -> kind + " " + o));
-    }
-
-    /**
-     * Load our models from resources.
-     *
-     * @param resources The current resource manager.
-     * @param executor  The executor to schedule work on.
-     * @return The map of unbaked models.
-     */
-    public CompletableFuture<Map<ResourceLocation, U>> load(ResourceManager resources, Executor executor) {
-        return ResourceUtils.load(resources, executor, kind, lister, JsonOps.INSTANCE, codec);
-    }
-
-    /**
-     * Register our unbaked models.
-     *
-     * @param register The callback to register models with.
-     * @param models   The models to register.
-     */
-    public void register(ClientRegistry.RegisterExtraModels register, Map<ResourceLocation, U> models) {
-        models.forEach((id, model) -> register.register(getModelKey(id), model, bake));
-        register.register(missingModelKey, missingModel, bake);
-    }
-
-    /**
-     * Find the model with the given id. If the model does not exist, then the missing model is returned instead.
-     *
-     * @param modelManager The model manager.
-     * @param id           The model id.
-     * @return The loaded model.
-     */
-    public T get(ModelManager modelManager, ResourceLocation id) {
-        var model = getModelKey(id).get(modelManager);
-        if (model != null) return model;
-
-        var missing = missingModelKey.get(modelManager);
-        if (missing == null) throw new IllegalStateException("Models have not yet been loaded.");
-        return missing;
-    }
-}

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

@@ -99,7 +99,7 @@ public abstract class AbstractComputerScreen<T extends AbstractComputerMenu> ext
 
         if (uploadNagDeadline != Long.MAX_VALUE && Util.getNanos() >= uploadNagDeadline) {
             new ItemToast(minecraft(), displayStack, NO_RESPONSE_TITLE, NO_RESPONSE_MSG, ItemToast.TRANSFER_NO_RESPONSE_TOKEN)
-                .showOrReplace(minecraft().getToastManager());
+                .showOrReplace(minecraft().getToasts());
             uploadNagDeadline = Long.MAX_VALUE;
         }
     }
@@ -127,6 +127,7 @@ public abstract class AbstractComputerScreen<T extends AbstractComputerMenu> ext
 
     @Override
     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/ComputerScreen.java

@@ -6,10 +6,11 @@ package dan200.computercraft.client.gui;
 
 import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.client.gui.widgets.TerminalWidget;
-import dan200.computercraft.core.util.Nullability;
+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.gui.GuiGraphics;
-import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 
@@ -39,16 +40,14 @@ public final class ComputerScreen<T extends AbstractComputerMenu> extends Abstra
     public void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
         // Draw a border around the terminal
         var terminal = getTerminal();
+        var spriteRenderer = SpriteRenderer.createForGui(graphics, RenderTypes.GUI_SPRITES);
         var computerTextures = GuiSprites.getComputerTextures(family);
 
-        graphics.blitSprite(
-            RenderPipelines.GUI_TEXTURED, computerTextures.border(),
-            terminal.getX() - BORDER, terminal.getY() - BORDER, terminal.getWidth() + BORDER * 2, terminal.getHeight() + BORDER * 2
-        );
-
-        graphics.blitSprite(
-            RenderPipelines.GUI_TEXTURED, Nullability.assertNonNull(computerTextures.sidebar()),
-            leftPos, topPos + sidebarYOffset, AbstractComputerMenu.SIDEBAR_WIDTH, ComputerSidebar.HEIGHT
+        ComputerBorderRenderer.render(
+            spriteRenderer, computerTextures,
+            terminal.getX(), terminal.getY(), terminal.getWidth(), terminal.getHeight(), false
         );
+        ComputerSidebar.renderBackground(spriteRenderer, computerTextures, leftPos, topPos + sidebarYOffset);
+        graphics.flush(); // Flush to ensure background textures are drawn before foreground.
     }
 }

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

@@ -7,7 +7,6 @@ package dan200.computercraft.client.gui;
 import dan200.computercraft.shared.peripheral.diskdrive.DiskDriveMenu;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
-import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
@@ -16,7 +15,7 @@ import net.minecraft.world.entity.player.Inventory;
  * The GUI for disk drives.
  */
 public class DiskDriveScreen extends AbstractContainerScreen<DiskDriveMenu> {
-    private static final ResourceLocation BACKGROUND = ResourceLocation.fromNamespaceAndPath("computercraft", "textures/gui/disk_drive.png");
+    private static final ResourceLocation BACKGROUND = new ResourceLocation("computercraft", "textures/gui/disk_drive.png");
 
     public DiskDriveScreen(DiskDriveMenu container, Inventory player, Component title) {
         super(container, player, title);
@@ -24,11 +23,12 @@ public class DiskDriveScreen extends AbstractContainerScreen<DiskDriveMenu> {
 
     @Override
     protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
-        graphics.blit(RenderPipelines.GUI_TEXTURED, BACKGROUND, leftPos, topPos, 0, 0, imageWidth, imageHeight, 256, 256);
+        graphics.blit(BACKGROUND, leftPos, topPos, 0, 0, imageWidth, imageHeight);
     }
 
     @Override
     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/GuiSprites.java

@@ -7,6 +7,9 @@ package dan200.computercraft.client.gui;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.client.render.ComputerBorderRenderer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.resources.TextureAtlasHolder;
 import net.minecraft.resources.ResourceLocation;
 import org.jspecify.annotations.Nullable;
 
@@ -16,7 +19,10 @@ import java.util.stream.Stream;
 /**
  * Sprite sheet for all GUI texutres in the mod.
  */
-public final class GuiSprites {
+public final class GuiSprites extends TextureAtlasHolder {
+    public static final ResourceLocation SPRITE_SHEET = new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui");
+    public static final ResourceLocation TEXTURE = SPRITE_SHEET.withPath(x -> "textures/atlas/" + x + ".png");
+
     public static final ButtonTextures TURNED_OFF = button("turned_off");
     public static final ButtonTextures TURNED_ON = button("turned_on");
     public static final ButtonTextures TERMINATE = button("terminate");
@@ -26,24 +32,52 @@ public final class GuiSprites {
     public static final ComputerTextures COMPUTER_COMMAND = computer("command", false, true);
     public static final ComputerTextures COMPUTER_COLOUR = computer("colour", true, false);
 
-    private GuiSprites() {
-    }
+    public static final ResourceLocation TURTLE_NORMAL_SELECTED_SLOT = new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui/sprites/turtle_normal_selected_slot");
+    public static final ResourceLocation TURTLE_ADVANCED_SELECTED_SLOT = new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui/sprites/turtle_advanced_selected_slot");
 
     private static ButtonTextures button(String name) {
         return new ButtonTextures(
-            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "buttons/" + name),
-            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "buttons/" + name + "_hover")
+            new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui/sprites/buttons/" + name),
+            new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui/sprites/buttons/" + name + "_hover")
         );
     }
 
     private static ComputerTextures computer(String name, boolean pocket, boolean sidebar) {
         return new ComputerTextures(
-            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "gui/border_" + name),
-            pocket ? ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "gui/pocket_bottom_" + name) : null,
-            sidebar ? ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "gui/sidebar_" + name) : null
+            new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui/border_" + name),
+            pocket ? new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui/pocket_bottom_" + name) : null,
+            sidebar ? new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui/sidebar_" + name) : null
         );
     }
 
+    private static @Nullable GuiSprites instance;
+
+    private GuiSprites(TextureManager textureManager) {
+        super(textureManager, TEXTURE, SPRITE_SHEET);
+    }
+
+    /**
+     * Initialise the singleton {@link GuiSprites} instance.
+     *
+     * @param textureManager The current texture manager.
+     * @return The singleton {@link GuiSprites} instance, to register as resource reload listener.
+     */
+    public static GuiSprites initialise(TextureManager textureManager) {
+        if (instance != null) throw new IllegalStateException("GuiSprites has already been initialised");
+        return instance = new GuiSprites(textureManager);
+    }
+
+    /**
+     * Lookup a texture on the atlas.
+     *
+     * @param texture The texture to find.
+     * @return The sprite on the atlas.
+     */
+    public static TextureAtlasSprite get(ResourceLocation texture) {
+        if (instance == null) throw new IllegalStateException("GuiSprites has not been initialised");
+        return instance.getSprite(texture);
+    }
+
     /**
      * Get the appropriate textures to use for a particular computer family.
      *
@@ -65,8 +99,12 @@ public final class GuiSprites {
      * @param active The texture for the button when it is active (hovered or focused).
      */
     public record ButtonTextures(ResourceLocation normal, ResourceLocation active) {
-        public ResourceLocation get(boolean isActive) {
-            return isActive ? active : normal;
+        public TextureAtlasSprite get(boolean active) {
+            return GuiSprites.get(active ? this.active : normal);
+        }
+
+        public Stream<ResourceLocation> textures() {
+            return Stream.of(normal, active);
         }
     }
 

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

@@ -5,13 +5,10 @@
 package dan200.computercraft.client.gui;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.toasts.Toast;
-import net.minecraft.client.gui.components.toasts.ToastManager;
-import net.minecraft.client.renderer.RenderPipelines;
+import net.minecraft.client.gui.components.toasts.ToastComponent;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.world.item.ItemStack;
 
@@ -21,7 +18,6 @@ import java.util.List;
  * A {@link Toast} implementation which displays an arbitrary message along with an optional {@link ItemStack}.
  */
 public class ItemToast implements Toast {
-    private static final ResourceLocation TEXTURE = ResourceLocation.withDefaultNamespace("toast/recipe");
     public static final Object TRANSFER_NO_RESPONSE_TOKEN = new Object();
 
     private static final long DISPLAY_TIME = 7000L;
@@ -37,9 +33,8 @@ public class ItemToast implements Toast {
     private final Object token;
     private final int width;
 
-    private boolean changed = true;
-    private long lastChanged;
-    private Visibility visibility = Visibility.HIDE;
+    private boolean isNew = true;
+    private long firstDisplay;
 
     public ItemToast(Minecraft minecraft, ItemStack stack, Component title, Component message, Object token) {
         this.stack = stack;
@@ -51,10 +46,10 @@ public class ItemToast implements Toast {
         width = Math.max(MAX_LINE_SIZE, this.message.stream().mapToInt(font::width).max().orElse(MAX_LINE_SIZE)) + MARGIN * 3 + IMAGE_SIZE;
     }
 
-    public void showOrReplace(ToastManager toasts) {
+    public void showOrReplace(ToastComponent toasts) {
         var existing = toasts.getToast(ItemToast.class, getToken());
         if (existing != null) {
-            existing.changed = true;
+            existing.isNew = true;
         } else {
             toasts.addToast(this);
         }
@@ -76,22 +71,28 @@ public class ItemToast implements Toast {
     }
 
     @Override
-    public Visibility getWantedVisibility() {
-        return visibility;
-    }
+    public Visibility render(GuiGraphics graphics, ToastComponent component, long time) {
+        if (isNew) {
 
-    @Override
-    public void update(ToastManager toastManager, long time) {
-        if (changed) {
-            lastChanged = time;
-            changed = false;
+            firstDisplay = time;
+            isNew = false;
         }
-        visibility = time - lastChanged < DISPLAY_TIME * toastManager.getNotificationDisplayTimeMultiplier() ? Visibility.SHOW : Visibility.HIDE;
-    }
 
-    @Override
-    public void render(GuiGraphics graphics, Font font, long time) {
-        graphics.blitSprite(RenderPipelines.GUI_TEXTURED, TEXTURE, 0, 0, width(), height());
+        if (width == 160 && message.size() <= 1) {
+            graphics.blit(TEXTURE, 0, 0, 0, 64, width, height());
+        } else {
+
+            var height = height();
+
+            var bottom = Math.min(4, height - 28);
+            renderBackgroundRow(graphics, width, 0, 0, 28);
+
+            for (var i = 28; i < height - bottom; i += 10) {
+                renderBackgroundRow(graphics, width, 16, i, Math.min(16, height - i - bottom));
+            }
+
+            renderBackgroundRow(graphics, width, 32 - bottom, height - bottom, bottom);
+        }
 
         var textX = MARGIN;
         if (!stack.isEmpty()) {
@@ -99,9 +100,23 @@ public class ItemToast implements Toast {
             graphics.renderFakeItem(stack, MARGIN, MARGIN + height() / 2 - IMAGE_SIZE);
         }
 
-        graphics.drawString(font, title, textX, MARGIN, 0xff500050, false);
+        graphics.drawString(component.getMinecraft().font, title, textX, MARGIN, 0xff500050, false);
         for (var i = 0; i < message.size(); ++i) {
-            graphics.drawString(font, message.get(i), textX, LINE_SPACING + (i + 1) * LINE_SPACING, 0xff000000, false);
+            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(GuiGraphics graphics, int x, int u, int y, int height) {
+        var leftOffset = 5;
+        var rightOffset = Math.min(60, x - leftOffset);
+
+        graphics.blit(TEXTURE, 0, y, 0, 32 + u, leftOffset, height);
+        for (var k = leftOffset; k < x - rightOffset; k += 64) {
+            graphics.blit(TEXTURE, k, y, 32, 32 + u, Math.min(64, x - k - 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

@@ -10,7 +10,6 @@ import dan200.computercraft.core.util.Nullability;
 import dan200.computercraft.shared.computer.inventory.AbstractComputerMenu;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.ScrollWheelHandler;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.MenuAccess;
@@ -33,8 +32,6 @@ public class NoTermComputerScreen<T extends AbstractComputerMenu> extends Screen
     private final Terminal terminalData;
     private @Nullable TerminalWidget terminal;
 
-    private final ScrollWheelHandler scrollHandler = new ScrollWheelHandler();
-
     public NoTermComputerScreen(T menu, Inventory player, Component title) {
         super(title);
         this.menu = menu;
@@ -69,14 +66,9 @@ public class NoTermComputerScreen<T extends AbstractComputerMenu> extends Screen
     }
 
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) {
-        var direction = scrollHandler.onMouseScroll(scrollX, scrollY);
-        var inventory = Objects.requireNonNull(minecraft().player).getInventory();
-        inventory.setSelectedSlot(ScrollWheelHandler.getNextScrollWheelSelection(
-            direction.y == 0 ? -direction.x : direction.y, inventory.getSelectedSlot(), Inventory.getSelectionSize()
-        ));
-
-        return super.mouseScrolled(mouseX, mouseY, scrollX, scrollY);
+    public boolean mouseScrolled(double pMouseX, double pMouseY, double pDelta) {
+        Objects.requireNonNull(minecraft().player).getInventory().swapPaint(pDelta);
+        return super.mouseScrolled(pMouseX, pMouseY, pDelta);
     }
 
     @Override
@@ -108,16 +100,11 @@ public class NoTermComputerScreen<T extends AbstractComputerMenu> extends Screen
         var lines = font.split(Component.translatable("gui.computercraft.pocket_computer_overlay"), (int) (width * 0.8));
         var y = 10;
         for (var line : lines) {
-            graphics.drawString(font, line, (width / 2) - (font.width(line) / 2), y, 0xFFFFFFFF, true);
+            graphics.drawString(font, line, (width / 2) - (font.width(line) / 2), y, 0xFFFFFF, true);
             y += 9;
         }
     }
 
-    @Override
-    public void renderBackground(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) {
-        // Skip rendering the background.
-    }
-
     private Minecraft minecraft() {
         return Nullability.assertNonNull(minecraft);
     }

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

@@ -10,7 +10,6 @@ import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.MultiLineLabel;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import org.jspecify.annotations.Nullable;
@@ -25,7 +24,7 @@ import static dan200.computercraft.core.util.Nullability.assertNonNull;
  * When closed, it returns to the previous screen.
  */
 public final class OptionScreen extends Screen {
-    private static final ResourceLocation BACKGROUND = ResourceLocation.fromNamespaceAndPath("computercraft", "textures/gui/blank_screen.png");
+    private static final ResourceLocation BACKGROUND = new ResourceLocation("computercraft", "textures/gui/blank_screen.png");
 
     public static final int BUTTON_WIDTH = 100;
     public static final int BUTTON_HEIGHT = 20;
@@ -87,14 +86,15 @@ public final class OptionScreen extends Screen {
 
     @Override
     public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
+        renderBackground(graphics);
+
         // Render the actual texture.
-        graphics.blit(RenderPipelines.GUI_TEXTURED, BACKGROUND, x, y, 0, 0, innerWidth, PADDING, 256, 256);
-        graphics.blit(RenderPipelines.GUI_TEXTURED, BACKGROUND,
+        graphics.blit(BACKGROUND, x, y, 0, 0, innerWidth, PADDING);
+        graphics.blit(BACKGROUND,
             x, y + PADDING, 0, PADDING, innerWidth, innerHeight - PADDING * 2,
-            innerWidth, PADDING,
-            256, 256
+            innerWidth, PADDING
         );
-        graphics.blit(RenderPipelines.GUI_TEXTURED, BACKGROUND, x, y + innerHeight - PADDING, 0, 256 - PADDING, innerWidth, PADDING, 256, 256);
+        graphics.blit(BACKGROUND, x, y + innerHeight - PADDING, 0, 256 - PADDING, innerWidth, PADDING);
 
         assertNonNull(messageRenderer).renderLeftAlignedNoShadow(graphics, x + PADDING, y + PADDING, FONT_HEIGHT, 0x404040);
         super.render(graphics, mouseX, mouseY, partialTicks);

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

@@ -7,7 +7,6 @@ package dan200.computercraft.client.gui;
 import dan200.computercraft.shared.peripheral.printer.PrinterMenu;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
-import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
@@ -16,7 +15,7 @@ import net.minecraft.world.entity.player.Inventory;
  * The GUI for printers.
  */
 public class PrinterScreen extends AbstractContainerScreen<PrinterMenu> {
-    private static final ResourceLocation BACKGROUND = ResourceLocation.fromNamespaceAndPath("computercraft", "textures/gui/printer.png");
+    private static final ResourceLocation BACKGROUND = new ResourceLocation("computercraft", "textures/gui/printer.png");
 
     public PrinterScreen(PrinterMenu container, Inventory player, Component title) {
         super(container, player, title);
@@ -24,15 +23,14 @@ public class PrinterScreen extends AbstractContainerScreen<PrinterMenu> {
 
     @Override
     protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
-        graphics.blit(RenderPipelines.GUI_TEXTURED, BACKGROUND, leftPos, topPos, 0, 0, imageWidth, imageHeight, 256, 256);
+        graphics.blit(BACKGROUND, leftPos, topPos, 0, 0, imageWidth, imageHeight);
 
-        if (getMenu().isPrinting()) {
-            graphics.blit(RenderPipelines.GUI_TEXTURED, BACKGROUND, leftPos + 34, topPos + 21, 176, 0, 25, 45, 256, 256);
-        }
+        if (getMenu().isPrinting()) graphics.blit(BACKGROUND, leftPos + 34, topPos + 21, 176, 0, 25, 45);
     }
 
     @Override
     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,37 +4,31 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.vertex.PoseStack;
-import dan200.computercraft.client.render.PrintoutRenderer;
+import com.mojang.blaze3d.vertex.Tesselator;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.ModRegistry;
 import dan200.computercraft.shared.media.PrintoutMenu;
-import dan200.computercraft.shared.media.items.PrintoutData;
+import dan200.computercraft.shared.media.items.PrintoutItem;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.navigation.ScreenRectangle;
-import net.minecraft.client.gui.render.pip.PictureInPictureRenderer;
-import net.minecraft.client.gui.render.state.GuiElementRenderState;
-import net.minecraft.client.gui.render.state.pip.PictureInPictureRenderState;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
-import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.ContainerListener;
 import net.minecraft.world.item.ItemStack;
-import org.joml.Matrix3x2f;
-import org.jspecify.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 
+import java.util.Arrays;
 import java.util.Objects;
 
 import static dan200.computercraft.client.render.PrintoutRenderer.*;
+import static dan200.computercraft.client.render.RenderTypes.FULL_BRIGHT_LIGHTMAP;
 
 /**
  * The GUI for printed pages and books.
  *
- * @see PrintoutRenderer
+ * @see dan200.computercraft.client.render.PrintoutRenderer
  */
 public final class PrintoutScreen extends AbstractContainerScreen<PrintoutMenu> implements ContainerListener {
     private PrintoutInfo printout = PrintoutInfo.DEFAULT;
@@ -46,8 +40,18 @@ public final class PrintoutScreen extends AbstractContainerScreen<PrintoutMenu>
     }
 
     private void setPrintout(ItemStack stack) {
-        page = 0;
-        printout = PrintoutInfo.of(PrintoutData.getOrEmpty(stack), stack.is(ModRegistry.Items.PRINTED_BOOK.get()));
+        var text = PrintoutItem.getText(stack);
+        var textBuffers = new TextBuffer[text.length];
+        for (var i = 0; i < textBuffers.length; i++) textBuffers[i] = new TextBuffer(text[i]);
+
+        var colours = PrintoutItem.getColours(stack);
+        var colourBuffers = new TextBuffer[colours.length];
+        for (var i = 0; i < colours.length; i++) colourBuffers[i] = new TextBuffer(colours[i]);
+
+        var pages = Math.max(text.length / PrintoutItem.LINES_PER_PAGE, 1);
+        var book = stack.is(ModRegistry.Items.PRINTED_BOOK.get());
+
+        printout = new PrintoutInfo(pages, book, textBuffers, colourBuffers);
     }
 
     @Override
@@ -102,15 +106,15 @@ public final class PrintoutScreen extends AbstractContainerScreen<PrintoutMenu>
     }
 
     @Override
-    public boolean mouseScrolled(double x, double y, double deltaX, double deltaY) {
-        if (super.mouseScrolled(x, y, deltaX, deltaY)) return true;
-        if (deltaY < 0) {
+    public boolean mouseScrolled(double x, double y, double delta) {
+        if (super.mouseScrolled(x, y, delta)) return true;
+        if (delta < 0) {
             // Scroll up goes to the next page
             nextPage();
             return true;
         }
 
-        if (deltaY > 0) {
+        if (delta > 0) {
             // Scroll down goes to the previous page
             previousPage();
             return true;
@@ -121,12 +125,23 @@ public final class PrintoutScreen extends AbstractContainerScreen<PrintoutMenu>
 
     @Override
     protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
-        // Push the printout slightly forward, to avoid clipping into the background.
-        graphics.guiRenderState.submitPicturesInPictureState(new PrintoutRenderState(
-            leftPos - COVER_SIZE - 32, leftPos + X_SIZE + COVER_SIZE + 32,
-            topPos - COVER_SIZE, topPos + Y_SIZE + COVER_SIZE,
-            printout, page, new Matrix3x2f(graphics.pose()), graphics.scissorStack.peek()
-        ));
+        // Draw the printout
+        var renderer = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
+
+        drawBorder(graphics.pose(), renderer, leftPos, topPos, 0, page, printout.pages(), printout.book(), FULL_BRIGHT_LIGHTMAP);
+        drawText(graphics.pose(), renderer, leftPos + X_TEXT_MARGIN, topPos + Y_TEXT_MARGIN, PrintoutItem.LINES_PER_PAGE * page, FULL_BRIGHT_LIGHTMAP, printout.text(), printout.colour());
+        renderer.endBatch();
+    }
+
+    @Override
+    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.
+        graphics.pose().pushPose();
+        graphics.pose().translate(0, 0, -1);
+        renderBackground(graphics);
+        graphics.pose().popPose();
+
+        super.render(graphics, mouseX, mouseY, partialTicks);
     }
 
     @Override
@@ -136,71 +151,16 @@ public final class PrintoutScreen extends AbstractContainerScreen<PrintoutMenu>
 
     @SuppressWarnings("ArrayRecordComponent")
     record PrintoutInfo(int pages, boolean book, TextBuffer[] text, TextBuffer[] colour) {
-        public static final PrintoutInfo DEFAULT = of(PrintoutData.EMPTY, false);
+        public static final PrintoutInfo DEFAULT;
 
-        public static PrintoutInfo of(PrintoutData printout, boolean book) {
-            var text = new TextBuffer[printout.lines().size()];
-            var colours = new TextBuffer[printout.lines().size()];
-            for (var i = 0; i < text.length; i++) {
-                var line = printout.lines().get(i);
-                text[i] = new TextBuffer(line.text());
-                colours[i] = new TextBuffer(line.foreground());
-            }
+        static {
+            var textLines = new TextBuffer[PrintoutItem.LINES_PER_PAGE];
+            Arrays.fill(textLines, new TextBuffer(" ".repeat(PrintoutItem.LINE_MAX_LENGTH)));
 
-            var pages = Math.max(text.length / PrintoutData.LINES_PER_PAGE, 1);
-            return new PrintoutInfo(pages, book, text, colours);
-        }
-    }
+            var colourLines = new TextBuffer[PrintoutItem.LINES_PER_PAGE];
+            Arrays.fill(colourLines, new TextBuffer("f".repeat(PrintoutItem.LINE_MAX_LENGTH)));
 
-    public record PrintoutRenderState(
-        int x0, int x1, int y0, int y1, PrintoutInfo printout, int page, Matrix3x2f pose,
-        @Nullable ScreenRectangle scissorArea, @Nullable ScreenRectangle bounds
-    ) implements PictureInPictureRenderState {
-        private PrintoutRenderState(
-            int x0, int x1, int y0, int y1, PrintoutInfo printout, int page, Matrix3x2f pose, @Nullable ScreenRectangle scissorArea
-        ) {
-            this(x0, x1, y0, y1, printout, page, pose, scissorArea, PictureInPictureRenderState.getBounds(x0, x1, y0, y1, scissorArea));
-        }
-
-        @Override
-        public float scale() {
-            return 1.0f;
-        }
-    }
-
-    /**
-     * PIP renderer for printouts.
-     * <p>
-     * We prefer using a PIP (rather than a {@link GuiElementRenderState}), as {@link PrintoutRenderer} renders with
-     * multiple z-levels.
-     */
-    public static final class PrintoutPictureRenderer extends PictureInPictureRenderer<PrintoutRenderState> {
-        public PrintoutPictureRenderer(MultiBufferSource.BufferSource bufferSource) {
-            super(bufferSource);
-        }
-
-        @Override
-        protected void renderToTexture(PrintoutRenderState state, PoseStack pose) {
-            pose.pushPose();
-            pose.translate(-0.5f * X_SIZE, -(Y_SIZE + COVER_SIZE), 0);
-            pose.scale(1.0f, 1.0f, -1.0f);
-
-            drawBorder(pose, bufferSource, 0, 0, 0, state.page(), state.printout().pages(), state.printout().book(), LightTexture.FULL_BRIGHT);
-            drawText(
-                pose, bufferSource, X_TEXT_MARGIN, Y_TEXT_MARGIN, PrintoutData.LINES_PER_PAGE * state.page(), LightTexture.FULL_BRIGHT,
-                state.printout().text(), state.printout().colour()
-            );
-            pose.popPose();
-        }
-
-        @Override
-        public Class<PrintoutRenderState> getRenderStateClass() {
-            return PrintoutRenderState.class;
-        }
-
-        @Override
-        protected String getTextureLabel() {
-            return "Printout";
+            DEFAULT = new PrintoutInfo(1, false, textLines, colourLines);
         }
     }
 }

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

@@ -7,12 +7,12 @@ package dan200.computercraft.client.gui;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.client.gui.widgets.TerminalWidget;
-import dan200.computercraft.core.util.Nullability;
+import dan200.computercraft.client.render.RenderTypes;
+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.gui.GuiGraphics;
-import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
@@ -23,11 +23,8 @@ import static dan200.computercraft.shared.turtle.inventory.TurtleMenu.*;
  * The GUI for turtles.
  */
 public class TurtleScreen extends AbstractComputerScreen<TurtleMenu> {
-    private static final ResourceLocation BACKGROUND_NORMAL = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "textures/gui/turtle_normal.png");
-    private static final ResourceLocation BACKGROUND_ADVANCED = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "textures/gui/turtle_advanced.png");
-
-    private static final ResourceLocation SELECTED_NORMAL = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "turtle_normal_selected_slot");
-    private static final ResourceLocation SELECTED_ADVANCED = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "turtle_advanced_selected_slot");
+    private static final ResourceLocation BACKGROUND_NORMAL = new ResourceLocation(ComputerCraftAPI.MOD_ID, "textures/gui/turtle_normal.png");
+    private static final ResourceLocation BACKGROUND_ADVANCED = new ResourceLocation(ComputerCraftAPI.MOD_ID, "textures/gui/turtle_advanced.png");
 
     private static final int TEX_WIDTH = 278;
     private static final int TEX_HEIGHT = 217;
@@ -49,27 +46,23 @@ public class TurtleScreen extends AbstractComputerScreen<TurtleMenu> {
     @Override
     protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
         var advanced = family == ComputerFamily.ADVANCED;
-        graphics.blit(
-            RenderPipelines.GUI_TEXTURED, advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL,
-            leftPos + AbstractComputerMenu.SIDEBAR_WIDTH, topPos, 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;
-            graphics.blitSprite(
-                RenderPipelines.GUI_TEXTURED, advanced ? SELECTED_ADVANCED : SELECTED_NORMAL,
-                leftPos + TURTLE_START_X - 2 + slotX * 18, topPos + PLAYER_START_Y - 2 + slotY * 18, 22, 22
+            graphics.blit(
+                leftPos + TURTLE_START_X - 2 + slotX * 18, topPos + PLAYER_START_Y - 2 + slotY * 18, 0, 22, 22,
+                GuiSprites.get(advanced ? GuiSprites.TURTLE_ADVANCED_SELECTED_SLOT : GuiSprites.TURTLE_NORMAL_SELECTED_SLOT)
             );
         }
 
         // Render sidebar
-        graphics.blitSprite(
-            RenderPipelines.GUI_TEXTURED, Nullability.assertNonNull(GuiSprites.getComputerTextures(family).sidebar()),
-            leftPos, topPos + sidebarYOffset, AbstractComputerMenu.SIDEBAR_WIDTH, ComputerSidebar.HEIGHT
-        );
+        var spriteRenderer = SpriteRenderer.createForGui(graphics, RenderTypes.GUI_SPRITES);
+        ComputerSidebar.renderBackground(spriteRenderer, GuiSprites.getComputerTextures(family), leftPos, topPos + sidebarYOffset);
+        graphics.flush(); // Flush to ensure background textures are drawn before foreground.
     }
 }

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

@@ -6,7 +6,9 @@ package dan200.computercraft.client.gui.widgets;
 
 import dan200.computercraft.client.gui.GuiSprites;
 import dan200.computercraft.client.gui.widgets.DynamicImageButton.HintedMessage;
+import dan200.computercraft.client.render.SpriteRenderer;
 import dan200.computercraft.shared.computer.core.InputHandler;
+import dan200.computercraft.shared.computer.inventory.AbstractComputerMenu;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.network.chat.Component;
 
@@ -22,9 +24,12 @@ public final class ComputerSidebar {
     private static final int ICON_MARGIN = 2;
 
     private static final int CORNERS_BORDER = 3;
+    private static final int FULL_BORDER = CORNERS_BORDER + ICON_MARGIN;
 
     private static final int BUTTONS = 2;
-    public static final int HEIGHT = (ICON_HEIGHT + ICON_MARGIN * 2) * BUTTONS + CORNERS_BORDER * 2;
+    private static final int HEIGHT = (ICON_HEIGHT + ICON_MARGIN * 2) * BUTTONS + CORNERS_BORDER * 2;
+
+    private static final int TEX_HEIGHT = 14;
 
     private ComputerSidebar() {
     }
@@ -58,6 +63,14 @@ public final class ComputerSidebar {
         ));
     }
 
+    public static void renderBackground(SpriteRenderer renderer, GuiSprites.ComputerTextures textures, int x, int y) {
+        var texture = textures.sidebar();
+        if (texture == null) throw new NullPointerException(textures + " has no sidebar texture");
+        var sprite = GuiSprites.get(texture);
+
+        renderer.blitVerticalSliced(sprite, x, y, AbstractComputerMenu.SIDEBAR_WIDTH, HEIGHT, FULL_BORDER, FULL_BORDER, TEX_HEIGHT);
+    }
+
     private static void toggleComputer(BooleanSupplier isOn, InputHandler input) {
         if (isOn.getAsBoolean()) {
             input.shutdown();

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

@@ -4,14 +4,14 @@
 
 package dan200.computercraft.client.gui.widgets;
 
+import com.mojang.blaze3d.systems.RenderSystem;
 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.RenderPipelines;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
 import org.jspecify.annotations.Nullable;
 
 import java.util.function.Supplier;
@@ -21,11 +21,11 @@ import java.util.function.Supplier;
  * dynamically.
  */
 public class DynamicImageButton extends Button {
-    private final Boolean2ObjectFunction<ResourceLocation> texture;
+    private final Boolean2ObjectFunction<TextureAtlasSprite> texture;
     private final Supplier<HintedMessage> message;
 
     public DynamicImageButton(
-        int x, int y, int width, int height, Boolean2ObjectFunction<ResourceLocation> texture, OnPress onPress,
+        int x, int y, int width, int height, Boolean2ObjectFunction<TextureAtlasSprite> texture, OnPress onPress,
         HintedMessage message
     ) {
         this(x, y, width, height, texture, onPress, () -> message);
@@ -33,7 +33,7 @@ public class DynamicImageButton extends Button {
 
     public DynamicImageButton(
         int x, int y, int width, int height,
-        Boolean2ObjectFunction<ResourceLocation> texture,
+        Boolean2ObjectFunction<TextureAtlasSprite> texture,
         OnPress onPress, Supplier<HintedMessage> message
     ) {
         super(x, y, width, height, Component.empty(), onPress, DEFAULT_NARRATION);
@@ -43,12 +43,19 @@ public class DynamicImageButton extends Button {
 
     @Override
     public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
+        var texture = this.texture.get(isHoveredOrFocused());
+
+        RenderSystem.disableDepthTest();
+        graphics.blit(getX(), getY(), 0, width, height, texture);
+        RenderSystem.enableDepthTest();
+    }
+
+    @Override
+    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
         var message = this.message.get();
         setMessage(message.message());
         setTooltip(message.tooltip());
-
-        var texture = this.texture.get(isHoveredOrFocused());
-        graphics.blitSprite(RenderPipelines.GUI_TEXTURED, texture, getX(), getY(), width, height);
+        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,9 +4,9 @@
 
 package dan200.computercraft.client.gui.widgets;
 
-import com.mojang.blaze3d.pipeline.RenderPipeline;
-import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.mojang.blaze3d.vertex.Tesselator;
 import dan200.computercraft.client.gui.KeyConverter;
+import dan200.computercraft.client.render.RenderTypes;
 import dan200.computercraft.client.render.text.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.core.util.StringUtil;
@@ -16,16 +16,9 @@ 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;
-import net.minecraft.client.gui.navigation.ScreenRectangle;
-import net.minecraft.client.gui.render.TextureSetup;
-import net.minecraft.client.gui.render.state.GuiElementRenderState;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.renderer.LightTexture;
-import net.minecraft.client.renderer.RenderPipelines;
+import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.network.chat.Component;
-import org.joml.Matrix3x2f;
-import org.joml.Matrix4f;
-import org.jspecify.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 
 import java.util.BitSet;
@@ -200,16 +193,16 @@ public class TerminalWidget extends AbstractWidget {
     }
 
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double deltaX, double deltaY) {
+    public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
         if (!inTermRegion(mouseX, mouseY)) return false;
-        if (!hasMouseSupport() || deltaY == 0) return false;
+        if (!hasMouseSupport() || delta == 0) return false;
 
         var charX = (int) ((mouseX - innerX) / FONT_WIDTH);
         var charY = (int) ((mouseY - innerY) / FONT_HEIGHT);
         charX = Math.min(Math.max(charX, 0), terminal.getWidth() - 1);
         charY = Math.min(Math.max(charY, 0), terminal.getHeight() - 1);
 
-        computer.mouseScroll(deltaY < 0 ? 1 : -1, charX + 1, charY + 1);
+        computer.mouseScroll(delta < 0 ? 1 : -1, charX + 1, charY + 1);
 
         lastMouseX = charX;
         lastMouseY = charY;
@@ -264,23 +257,15 @@ public class TerminalWidget extends AbstractWidget {
     public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
         if (!visible) return;
 
-        var scissor = graphics.scissorStack.peek();
-        var terminalPose = new Matrix3x2f(graphics.pose());
-        var terminalTextures = TextureSetup.singleTextureWithLightmap(graphics.minecraft.getTextureManager().getTexture(FixedWidthFontRenderer.FONT).getTextureView());
+        var bufferSource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
+        var emitter = FixedWidthFontRenderer.toVertexConsumer(graphics.pose(), bufferSource.getBuffer(RenderTypes.TERMINAL));
 
-        graphics.guiRenderState.submitGuiElement(new TerminalBackgroundRenderState(
-            innerX, innerY, terminal, terminalPose, terminalTextures,
-            maybeIntersect(scissor, new ScreenRectangle(
-                innerX, innerY, terminal.getWidth() * FONT_WIDTH, terminal.getHeight() * FONT_HEIGHT).transformMaxBounds(graphics.pose())
-            ),
-            scissor
-        ));
+        FixedWidthFontRenderer.drawTerminal(
+            emitter,
+            (float) innerX, (float) innerY, terminal, (float) MARGIN, (float) MARGIN, (float) MARGIN, (float) MARGIN
+        );
 
-        graphics.guiRenderState.submitGuiElement(new TerminalTextRenderState(
-            innerX, innerY, terminal, terminalPose, terminalTextures,
-            maybeIntersect(scissor, new ScreenRectangle(getX(), getY(), getWidth(), getHeight()).transformMaxBounds(graphics.pose())),
-            scissor
-        ));
+        bufferSource.endBatch();
     }
 
     @Override
@@ -295,49 +280,4 @@ public class TerminalWidget extends AbstractWidget {
     public static int getHeight(int termHeight) {
         return termHeight * FONT_HEIGHT + MARGIN * 2;
     }
-
-    private static @Nullable ScreenRectangle maybeIntersect(@Nullable ScreenRectangle scissor, ScreenRectangle bounds) {
-        return scissor == null ? bounds : bounds.intersection(scissor);
-    }
-
-    private record TerminalBackgroundRenderState(
-        int x, int y, Terminal terminal,
-        Matrix3x2f pose,
-        TextureSetup textureSetup,
-        @Nullable ScreenRectangle bounds,
-        @Nullable ScreenRectangle scissorArea
-    ) implements GuiElementRenderState {
-        @Override
-        public void buildVertices(VertexConsumer vertexConsumer, float z) {
-            var quads = new FixedWidthFontRenderer.QuadEmitter(new Matrix4f().mul(pose).translate(0, 0, z), vertexConsumer);
-            FixedWidthFontRenderer.drawTerminalBackground(quads, x, y, terminal, MARGIN, MARGIN, MARGIN, MARGIN);
-        }
-
-        @Override
-        public RenderPipeline pipeline() {
-            return RenderPipelines.TEXT;
-        }
-    }
-
-    private record TerminalTextRenderState(
-        int x, int y, Terminal terminal, Matrix3x2f pose, TextureSetup textureSetup,
-        @Nullable ScreenRectangle bounds, @Nullable ScreenRectangle scissorArea
-    ) implements GuiElementRenderState {
-        @Override
-        public void buildVertices(VertexConsumer vertexConsumer, float z) {
-            var quads = new FixedWidthFontRenderer.QuadEmitter(new Matrix4f().mul(pose).translate(0, 0, z), vertexConsumer);
-            FixedWidthFontRenderer.drawTerminalForeground(quads, x, y, terminal);
-            FixedWidthFontRenderer.drawCursor(quads, x, y, terminal);
-
-            // The GUI renderer requires that the buffer is non-empty. Add a zero-size vertex so we always have something.
-            for (var i = 0; i < 4; i++) {
-                vertexConsumer.addVertex(0, 0, z).setColor(0x00ffffff).setUv(0, 0).setLight(LightTexture.FULL_BRIGHT);
-            }
-        }
-
-        @Override
-        public RenderPipeline pipeline() {
-            return RenderPipelines.TEXT;
-        }
-    }
 }

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

@@ -4,15 +4,15 @@
 
 package dan200.computercraft.client.integration;
 
+import dan200.computercraft.client.render.RenderTypes;
 import dan200.computercraft.client.render.text.DirectFixedWidthFontRenderer;
+import dan200.computercraft.client.render.vbo.DirectVertexBuffer;
 
 import java.nio.ByteBuffer;
 import java.util.Optional;
 import java.util.ServiceLoader;
 import java.util.function.IntFunction;
 
-import static dan200.computercraft.client.render.text.FixedWidthFontRenderer.TERMINAL_TEXT;
-
 /**
  * Find the currently loaded shader mod (if present) and provides utilities for interacting with it.
  */
@@ -31,14 +31,16 @@ public class ShaderMod {
     }
 
     /**
-     * Get an appropriate quad emitter for use with a vertex buffer and {@link DirectFixedWidthFontRenderer} .
+     * Get an appropriate quad emitter for use with {@link DirectVertexBuffer} and {@link DirectFixedWidthFontRenderer} .
      *
-     * @param quadCount  The number of quads.
-     * @param makeBuffer A function to allocate a temporary buffer.
+     * @param vertexCount The number of vertices.
+     * @param makeBuffer  A function to allocate a temporary buffer.
      * @return The quad emitter.
      */
-    public DirectFixedWidthFontRenderer.QuadEmitter getQuadEmitter(int quadCount, IntFunction<ByteBuffer> makeBuffer) {
-        return new DirectFixedWidthFontRenderer.ByteBufferEmitter(makeBuffer.apply(TERMINAL_TEXT.format().getVertexSize() * quadCount * 4));
+    public DirectFixedWidthFontRenderer.QuadEmitter getQuadEmitter(int vertexCount, IntFunction<ByteBuffer> makeBuffer) {
+        return new DirectFixedWidthFontRenderer.ByteBufferEmitter(
+            makeBuffer.apply(RenderTypes.TERMINAL.format().getVertexSize() * vertexCount * 4)
+        );
     }
 
     public interface Provider {

projects/common/src/client/java/dan200/computercraft/client/integration/emi/EMIComputerCraft.java

@@ -6,15 +6,12 @@ package dan200.computercraft.client.integration.emi;
 
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.shared.ModRegistry;
-import dan200.computercraft.shared.integration.RecipeModHelpers;
 import dan200.computercraft.shared.pocket.items.PocketComputerItem;
 import dan200.computercraft.shared.turtle.items.TurtleItem;
 import dev.emi.emi.api.EmiEntrypoint;
 import dev.emi.emi.api.EmiPlugin;
 import dev.emi.emi.api.EmiRegistry;
 import dev.emi.emi.api.stack.Comparison;
-import dev.emi.emi.api.stack.EmiStack;
-import net.minecraft.client.Minecraft;
 import net.minecraft.world.item.ItemStack;
 
 import java.util.function.BiPredicate;
@@ -28,17 +25,15 @@ public class EMIComputerCraft implements EmiPlugin {
 
         registry.setDefaultComparison(ModRegistry.Items.POCKET_COMPUTER_NORMAL.get(), pocketComparison);
         registry.setDefaultComparison(ModRegistry.Items.POCKET_COMPUTER_ADVANCED.get(), pocketComparison);
-
-        for (var stack : RecipeModHelpers.getExtraStacks(Minecraft.getInstance().level.registryAccess())) {
-            registry.addEmiStack(EmiStack.of(stack));
-        }
     }
 
-    private static final Comparison turtleComparison = compareStacks((left, right)
-        -> TurtleItem.getUpgrade(left, TurtleSide.LEFT) == TurtleItem.getUpgrade(right, TurtleSide.LEFT)
-        && TurtleItem.getUpgrade(left, TurtleSide.RIGHT) == TurtleItem.getUpgrade(right, TurtleSide.RIGHT));
+    private static final Comparison turtleComparison = compareStacks((left, right) ->
+        left.getItem() instanceof TurtleItem turtle
+            && turtle.getUpgrade(left, TurtleSide.LEFT) == turtle.getUpgrade(right, TurtleSide.LEFT)
+            && turtle.getUpgrade(left, TurtleSide.RIGHT) == turtle.getUpgrade(right, TurtleSide.RIGHT));
 
-    private static final Comparison pocketComparison = compareStacks((left, right) -> PocketComputerItem.getUpgrade(left) == PocketComputerItem.getUpgrade(right));
+    private static final Comparison pocketComparison = compareStacks((left, right) ->
+        left.getItem() instanceof PocketComputerItem && PocketComputerItem.getUpgrade(left) == PocketComputerItem.getUpgrade(right));
 
     private static Comparison compareStacks(BiPredicate<ItemStack, ItemStack> test) {
         return Comparison.of((left, right) -> {

projects/common/src/client/java/dan200/computercraft/client/integration/jei/JEIComputerCraft.java

@@ -8,22 +8,19 @@ import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.shared.ModRegistry;
 import dan200.computercraft.shared.integration.RecipeModHelpers;
-import dan200.computercraft.shared.pocket.core.PocketSide;
+import dan200.computercraft.shared.media.items.DiskItem;
 import dan200.computercraft.shared.pocket.items.PocketComputerItem;
 import dan200.computercraft.shared.turtle.items.TurtleItem;
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.JeiPlugin;
 import mezz.jei.api.constants.RecipeTypes;
 import mezz.jei.api.constants.VanillaTypes;
-import mezz.jei.api.ingredients.subtypes.ISubtypeInterpreter;
+import mezz.jei.api.ingredients.subtypes.IIngredientSubtypeInterpreter;
 import mezz.jei.api.registration.IAdvancedRegistration;
 import mezz.jei.api.registration.ISubtypeRegistration;
 import mezz.jei.api.runtime.IJeiRuntime;
-import net.minecraft.client.Minecraft;
-import net.minecraft.core.RegistryAccess;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.component.DyedItemColor;
 
 import java.util.List;
 
@@ -31,7 +28,7 @@ import java.util.List;
 public class JEIComputerCraft implements IModPlugin {
     @Override
     public ResourceLocation getPluginUid() {
-        return ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "jei");
+        return new ResourceLocation(ComputerCraftAPI.MOD_ID, "jei");
     }
 
     @Override
@@ -47,7 +44,7 @@ public class JEIComputerCraft implements IModPlugin {
 
     @Override
     public void registerAdvanced(IAdvancedRegistration registry) {
-        registry.addSimpleRecipeManagerPlugin(RecipeTypes.CRAFTING, new RecipeResolver(getRegistryAccess()));
+        registry.addRecipeManagerPlugin(new RecipeResolver());
     }
 
     @Override
@@ -55,7 +52,7 @@ public class JEIComputerCraft implements IModPlugin {
         var registry = runtime.getRecipeManager();
 
         // Register all turtles/pocket computers (not just vanilla upgrades) as upgrades on JEI.
-        var upgradeItems = RecipeModHelpers.getExtraStacks(getRegistryAccess());
+        var upgradeItems = RecipeModHelpers.getExtraStacks();
         if (!upgradeItems.isEmpty()) {
             runtime.getIngredientManager().addIngredientsAtRuntime(VanillaTypes.ITEM_STACK, upgradeItems);
         }
@@ -63,7 +60,7 @@ public class JEIComputerCraft implements IModPlugin {
         // Hide all upgrade recipes
         var category = registry.createRecipeLookup(RecipeTypes.CRAFTING);
         category.get().forEach(wrapper -> {
-            if (RecipeModHelpers.shouldRemoveRecipe(wrapper.id().location())) {
+            if (RecipeModHelpers.shouldRemoveRecipe(wrapper.getId())) {
                 registry.hideRecipes(RecipeTypes.CRAFTING, List.of(wrapper));
             }
         });
@@ -72,15 +69,18 @@ public class JEIComputerCraft implements IModPlugin {
     /**
      * Distinguishes turtles by upgrades and family.
      */
-    private static final ISubtypeInterpreter<ItemStack> turtleSubtype = (stack, ctx) -> {
+    private static final IIngredientSubtypeInterpreter<ItemStack> turtleSubtype = (stack, ctx) -> {
+        var item = stack.getItem();
+        if (!(item instanceof TurtleItem turtle)) return IIngredientSubtypeInterpreter.NONE;
+
         var name = new StringBuilder("turtle:");
 
         // Add left and right upgrades to the identifier
-        var left = TurtleItem.getUpgradeWithData(stack, TurtleSide.LEFT);
-        var right = TurtleItem.getUpgradeWithData(stack, TurtleSide.RIGHT);
-        if (left != null) name.append(left.holder().key().location());
+        var left = turtle.getUpgrade(stack, TurtleSide.LEFT);
+        var right = turtle.getUpgrade(stack, TurtleSide.RIGHT);
+        if (left != null) name.append(left.getUpgradeID());
         if (left != null && right != null) name.append('|');
-        if (right != null) name.append(right.holder().key().location());
+        if (right != null) name.append(right.getUpgradeID());
 
         return name.toString();
     };
@@ -88,15 +88,15 @@ public class JEIComputerCraft implements IModPlugin {
     /**
      * Distinguishes pocket computers by upgrade and family.
      */
-    private static final ISubtypeInterpreter<ItemStack> pocketSubtype = (stack, ctx) -> {
+    private static final IIngredientSubtypeInterpreter<ItemStack> pocketSubtype = (stack, ctx) -> {
+        var item = stack.getItem();
+        if (!(item instanceof PocketComputerItem)) return IIngredientSubtypeInterpreter.NONE;
+
         var name = new StringBuilder("pocket:");
 
         // Add the upgrade to the identifier
-        var back = PocketComputerItem.getUpgradeWithData(stack, PocketSide.BACK);
-        var bottom = PocketComputerItem.getUpgradeWithData(stack, PocketSide.BOTTOM);
-        if (back != null) name.append(back.holder().key().location());
-        if (back != null && bottom != null) name.append('|');
-        if (bottom != null) name.append(bottom.holder().key().location());
+        var upgrade = PocketComputerItem.getUpgrade(stack);
+        if (upgrade != null) name.append(upgrade.getUpgradeID());
 
         return name.toString();
     };
@@ -104,9 +104,11 @@ public class JEIComputerCraft implements IModPlugin {
     /**
      * Distinguishes disks by colour.
      */
-    private static final ISubtypeInterpreter<ItemStack> diskSubtype = (stack, ctx) -> Integer.toString(DyedItemColor.getOrDefault(stack, -1));
+    private static final IIngredientSubtypeInterpreter<ItemStack> diskSubtype = (stack, ctx) -> {
+        var item = stack.getItem();
+        if (!(item instanceof DiskItem disk)) return IIngredientSubtypeInterpreter.NONE;
 
-    private static RegistryAccess getRegistryAccess() {
-        return Minecraft.getInstance().level.registryAccess();
-    }
+        var colour = disk.getColour(stack);
+        return colour == -1 ? IIngredientSubtypeInterpreter.NONE : String.format("%06x", colour);
+    };
 }

projects/common/src/client/java/dan200/computercraft/client/integration/jei/RecipeResolver.java

@@ -4,94 +4,59 @@
 
 package dan200.computercraft.client.integration.jei;
 
-import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.shared.integration.UpgradeRecipeGenerator;
 import dan200.computercraft.shared.pocket.items.PocketComputerItem;
 import dan200.computercraft.shared.turtle.items.TurtleItem;
-import mezz.jei.api.ingredients.ITypedIngredient;
-import mezz.jei.api.recipe.advanced.ISimpleRecipeManagerPlugin;
-import net.minecraft.core.HolderLookup;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
+import mezz.jei.api.constants.RecipeTypes;
+import mezz.jei.api.recipe.IFocus;
+import mezz.jei.api.recipe.RecipeType;
+import mezz.jei.api.recipe.advanced.IRecipeManagerPlugin;
+import mezz.jei.api.recipe.category.IRecipeCategory;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.*;
-import net.minecraft.world.item.crafting.display.RecipeDisplay;
-import net.minecraft.world.level.Level;
+import net.minecraft.world.item.crafting.CraftingRecipe;
 
 import java.util.List;
 
-class RecipeResolver implements ISimpleRecipeManagerPlugin<RecipeHolder<CraftingRecipe>> {
-    /**
-     * We need to generate unique ids for each recipe, as JEI will attempt to deduplicate them otherwise.
-     */
-    private int nextId = 0;
+class RecipeResolver implements IRecipeManagerPlugin {
+    private final UpgradeRecipeGenerator<CraftingRecipe> resolver = new UpgradeRecipeGenerator<>(x -> x);
 
-    private final UpgradeRecipeGenerator<RecipeHolder<CraftingRecipe>> resolver;
+    @Override
+    public <V> List<RecipeType<?>> getRecipeTypes(IFocus<V> focus) {
+        var value = focus.getTypedValue().getIngredient();
+        if (!(value instanceof ItemStack stack)) return List.of();
 
-    RecipeResolver(HolderLookup.Provider registries) {
-        resolver = new UpgradeRecipeGenerator<>(x -> new RecipeHolder<>(
-            ResourceKey.create(Registries.RECIPE, ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "upgrade_" + nextId++)),
-            new CraftingWrapper(x)
-        ), registries);
+        return switch (focus.getRole()) {
+            case INPUT ->
+                stack.getItem() instanceof TurtleItem || stack.getItem() instanceof PocketComputerItem || resolver.isUpgrade(stack)
+                    ? List.of(RecipeTypes.CRAFTING)
+                    : List.of();
+            case OUTPUT -> stack.getItem() instanceof TurtleItem || stack.getItem() instanceof PocketComputerItem
+                ? List.of(RecipeTypes.CRAFTING)
+                : List.of();
+            default -> List.of();
+        };
     }
 
     @Override
-    public boolean isHandledInput(ITypedIngredient<?> input) {
-        return input.getIngredient() instanceof ItemStack stack
-            && (stack.getItem() instanceof TurtleItem || stack.getItem() instanceof PocketComputerItem || resolver.isUpgrade(stack));
+    public <T, V> List<T> getRecipes(IRecipeCategory<T> recipeCategory, IFocus<V> focus) {
+        if (!(focus.getTypedValue().getIngredient() instanceof ItemStack stack) || recipeCategory.getRecipeType() != RecipeTypes.CRAFTING) {
+            return List.of();
+        }
+
+        return switch (focus.getRole()) {
+            case INPUT -> cast(resolver.findRecipesWithInput(stack));
+            case OUTPUT -> cast(resolver.findRecipesWithOutput(stack));
+            default -> List.of();
+        };
     }
 
     @Override
-    public boolean isHandledOutput(ITypedIngredient<?> output) {
-        return output.getIngredient() instanceof ItemStack stack
-            && (stack.getItem() instanceof TurtleItem || stack.getItem() instanceof PocketComputerItem);
-    }
-
-    @Override
-    public List<RecipeHolder<CraftingRecipe>> getRecipesForInput(ITypedIngredient<?> input) {
-        return input.getIngredient() instanceof ItemStack stack ? resolver.findRecipesWithInput(stack) : List.of();
-    }
-
-    @Override
-    public List<RecipeHolder<CraftingRecipe>> getRecipesForOutput(ITypedIngredient<?> output) {
-        return output.getIngredient() instanceof ItemStack stack ? resolver.findRecipesWithOutput(stack) : List.of();
-    }
-
-    @Override
-    public List<RecipeHolder<CraftingRecipe>> getAllRecipes() {
+    public <T> List<T> getRecipes(IRecipeCategory<T> recipeCategory) {
         return List.of();
     }
 
-    private record CraftingWrapper(RecipeDisplay recipes) implements CraftingRecipe {
-        @Override
-        public RecipeSerializer<? extends CraftingRecipe> getSerializer() {
-            throw new IllegalStateException("Should not serialise CraftingWrapper");
-        }
-
-        @Override
-        public CraftingBookCategory category() {
-            return CraftingBookCategory.MISC;
-        }
-
-        @Override
-        public boolean matches(CraftingInput input, Level level) {
-            return false;
-        }
-
-        @Override
-        public ItemStack assemble(CraftingInput input, HolderLookup.Provider registries) {
-            return ItemStack.EMPTY;
-        }
-
-        @Override
-        public PlacementInfo placementInfo() {
-            return PlacementInfo.NOT_PLACEABLE;
-        }
-
-        @Override
-        public List<RecipeDisplay> display() {
-            return List.of(recipes);
-        }
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    private static <T, U> List<T> cast(List<U> from) {
+        return (List) from;
     }
 }

projects/common/src/client/java/dan200/computercraft/client/item/colour/PocketComputerLight.java

@@ -1,43 +0,0 @@
-// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.client.item.colour;
-
-import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.client.pocket.ClientPocketComputers;
-import dan200.computercraft.client.pocket.PocketComputerData;
-import net.minecraft.client.color.item.ItemTintSource;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.ARGB;
-import net.minecraft.util.ExtraCodecs;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.item.ItemStack;
-import org.jspecify.annotations.Nullable;
-
-/**
- * An {@link ItemTintSource} that returns the pocket computer's {@linkplain PocketComputerData#getLightState() light
- * colour}.
- *
- * @param defaultColour The default colour, if the light is not currently on.
- */
-public record PocketComputerLight(int defaultColour) implements ItemTintSource {
-    public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "pocket_computer_light");
-    public static final MapCodec<PocketComputerLight> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(
-        ExtraCodecs.RGB_COLOR_CODEC.fieldOf("default").forGetter(PocketComputerLight::defaultColour)
-    ).apply(instance, PocketComputerLight::new));
-
-    @Override
-    public int calculate(ItemStack stack, @Nullable ClientLevel level, @Nullable LivingEntity holder) {
-        var computer = ClientPocketComputers.get(stack);
-        return computer == null || computer.getLightState() == -1 ? defaultColour : ARGB.opaque(computer.getLightState());
-    }
-
-    @Override
-    public MapCodec<? extends ItemTintSource> type() {
-        return CODEC;
-    }
-}

projects/common/src/client/java/dan200/computercraft/client/item/model/TurtleOverlayModel.java

@@ -1,65 +0,0 @@
-// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.client.item.model;
-
-import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.client.turtle.TurtleOverlay;
-import dan200.computercraft.client.turtle.TurtleOverlayManager;
-import dan200.computercraft.shared.turtle.items.TurtleItem;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.renderer.block.model.ItemTransforms;
-import net.minecraft.client.renderer.item.ItemModel;
-import net.minecraft.client.renderer.item.ItemModelResolver;
-import net.minecraft.client.renderer.item.ItemStackRenderState;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.item.ItemDisplayContext;
-import net.minecraft.world.item.ItemStack;
-import org.jspecify.annotations.Nullable;
-
-/**
- * An {@link ItemModel} that renders the {@linkplain TurtleOverlay turtle overlay}.
- *
- * @param transforms The item transformations from the base model.
- * @see TurtleOverlay#model()
- */
-public record TurtleOverlayModel(ItemTransforms transforms) implements ItemModel {
-    public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "turtle/overlay");
-    public static final MapCodec<Unbaked> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(
-        ResourceLocation.CODEC.fieldOf("transforms").forGetter(Unbaked::base)
-    ).apply(instance, Unbaked::new));
-
-    @Override
-    public void update(ItemStackRenderState state, ItemStack stack, ItemModelResolver resolver, ItemDisplayContext context, @Nullable ClientLevel level, @Nullable LivingEntity holder, int light) {
-        var overlay = TurtleItem.getOverlay(stack);
-        if (overlay == null) return;
-
-        state.appendModelIdentityElement(this);
-        state.appendModelIdentityElement(overlay);
-
-        var layer = state.newLayer();
-        TurtleOverlayManager.get(Minecraft.getInstance().getModelManager(), overlay).model().setupItemLayer(layer);
-        layer.setTransform(transforms().getTransform(context));
-    }
-
-    public record Unbaked(ResourceLocation base) implements ItemModel.Unbaked {
-        @Override
-        public MapCodec<Unbaked> type() {
-            return CODEC;
-        }
-
-        @Override
-        public ItemModel bake(BakingContext bakingContext) {
-            return new TurtleOverlayModel(bakingContext.blockModelBaker().getModel(base).getTopTransforms());
-        }
-
-        @Override
-        public void resolveDependencies(Resolver resolver) {
-        }
-    }
-}

projects/common/src/client/java/dan200/computercraft/client/item/model/TurtleUpgradeModel.java

@@ -1,63 +0,0 @@
-// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.client.item.model;
-
-import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.client.turtle.TurtleUpgradeModelManager;
-import dan200.computercraft.shared.turtle.items.TurtleItem;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.renderer.block.model.ItemTransforms;
-import net.minecraft.client.renderer.item.ItemModel;
-import net.minecraft.client.renderer.item.ItemModelResolver;
-import net.minecraft.client.renderer.item.ItemStackRenderState;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.item.ItemDisplayContext;
-import net.minecraft.world.item.ItemStack;
-import org.jspecify.annotations.Nullable;
-
-/**
- * An {@link ItemModel} that renders a turtle upgrade, using its {@link dan200.computercraft.api.client.turtle.TurtleUpgradeModel}.
- *
- * @param side The side the upgrade resides on.
- * @param base The base model. Only used to provide item transforms.
- */
-public record TurtleUpgradeModel(TurtleSide side, ItemTransforms base) implements ItemModel {
-    public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "turtle/upgrade");
-    public static final MapCodec<Unbaked> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(
-        TurtleSide.CODEC.fieldOf("side").forGetter(Unbaked::side),
-        ResourceLocation.CODEC.fieldOf("transforms").forGetter(Unbaked::base)
-    ).apply(instance, Unbaked::new));
-
-    @Override
-    public void update(ItemStackRenderState state, ItemStack stack, ItemModelResolver resolver, ItemDisplayContext context, @Nullable ClientLevel level, @Nullable LivingEntity holder, int seed) {
-        var upgrade = TurtleItem.getUpgradeWithData(stack, side);
-        if (upgrade == null) return;
-
-        TurtleUpgradeModelManager.get(Minecraft.getInstance().getModelManager(), upgrade.holder())
-            .renderForItem(upgrade, side, state, resolver, base.getTransform(context), seed);
-    }
-
-    public record Unbaked(TurtleSide side, ResourceLocation base) implements ItemModel.Unbaked {
-        @Override
-        public MapCodec<Unbaked> type() {
-            return CODEC;
-        }
-
-        @Override
-        public ItemModel bake(BakingContext bakingContext) {
-            return new TurtleUpgradeModel(side, bakingContext.blockModelBaker().getModel(base).getTopTransforms());
-        }
-
-        @Override
-        public void resolveDependencies(Resolver resolver) {
-            resolver.markDependency(base);
-        }
-    }
-}

projects/common/src/client/java/dan200/computercraft/client/item/properties/PocketComputerStateProperty.java

@@ -1,51 +0,0 @@
-// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.client.item.properties;
-
-import com.mojang.serialization.Codec;
-import com.mojang.serialization.MapCodec;
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.client.pocket.ClientPocketComputers;
-import dan200.computercraft.shared.computer.core.ComputerState;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.renderer.item.properties.select.SelectItemModelProperty;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.item.ItemDisplayContext;
-import net.minecraft.world.item.ItemStack;
-import org.jspecify.annotations.Nullable;
-
-/**
- * A {@link SelectItemModelProperty} that returns the pocket computer's current state.
- */
-public final class PocketComputerStateProperty implements SelectItemModelProperty<ComputerState> {
-    public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "pocket_computer_state");
-    private static final PocketComputerStateProperty INSTANCE = new PocketComputerStateProperty();
-    public static final MapCodec<PocketComputerStateProperty> CODEC = MapCodec.unit(INSTANCE);
-    public static final Type<PocketComputerStateProperty, ComputerState> TYPE = Type.create(CODEC, ComputerState.CODEC);
-
-    private PocketComputerStateProperty() {
-    }
-
-    public static PocketComputerStateProperty create() {
-        return INSTANCE;
-    }
-
-    @Override
-    public ComputerState get(ItemStack stack, @Nullable ClientLevel level, @Nullable LivingEntity holder, int i, ItemDisplayContext context) {
-        var computer = ClientPocketComputers.get(stack);
-        return computer == null ? ComputerState.OFF : computer.getState();
-    }
-
-    @Override
-    public Codec<ComputerState> valueCodec() {
-        return ComputerState.CODEC;
-    }
-
-    @Override
-    public Type<? extends SelectItemModelProperty<ComputerState>, ComputerState> type() {
-        return TYPE;
-    }
-}

projects/common/src/client/java/dan200/computercraft/client/item/properties/TurtleShowElfOverlay.java

@@ -1,46 +0,0 @@
-// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.client.item.properties;
-
-import com.mojang.serialization.MapCodec;
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.client.turtle.TurtleOverlay;
-import dan200.computercraft.client.turtle.TurtleOverlayManager;
-import dan200.computercraft.shared.turtle.items.TurtleItem;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.renderer.item.properties.conditional.ConditionalItemModelProperty;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.item.ItemDisplayContext;
-import net.minecraft.world.item.ItemStack;
-import org.jspecify.annotations.Nullable;
-
-/**
- * An item property that determines whether the turtle's current {@linkplain TurtleOverlay overlay} is compatible
- * with the Christmas overlay.
- *
- * @see TurtleOverlay#showElfOverlay()
- */
-public class TurtleShowElfOverlay implements ConditionalItemModelProperty {
-    public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "turtle/show_elf_overlay");
-    private static final TurtleShowElfOverlay INSTANCE = new TurtleShowElfOverlay();
-    public static final MapCodec<TurtleShowElfOverlay> CODEC = MapCodec.unit(INSTANCE);
-
-    @Override
-    public boolean get(ItemStack stack, @Nullable ClientLevel level, @Nullable LivingEntity holder, int i, ItemDisplayContext context) {
-        var overlay = TurtleOverlayManager.get(Minecraft.getInstance().getModelManager(), TurtleItem.getOverlay(stack));
-        return overlay == null || overlay.showElfOverlay();
-    }
-
-    public static TurtleShowElfOverlay create() {
-        return INSTANCE;
-    }
-
-    @Override
-    public MapCodec<? extends ConditionalItemModelProperty> type() {
-        return CODEC;
-    }
-}

projects/common/src/client/java/dan200/computercraft/client/model/LecternPocketModel.java

@@ -5,6 +5,7 @@
 package dan200.computercraft.client.model;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.client.pocket.PocketComputerData;
 import dan200.computercraft.client.render.CustomLecternRenderer;
@@ -17,10 +18,11 @@ import net.minecraft.client.model.geom.builders.MeshDefinition;
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.client.resources.model.Material;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.component.DyedItemColor;
+import net.minecraft.util.FastColor;
+import net.minecraft.world.inventory.InventoryMenu;
+import net.minecraft.world.item.ItemStack;
 
 /**
  * A model for {@linkplain PocketComputerItem pocket computers} placed on a lectern.
@@ -28,17 +30,17 @@ import net.minecraft.world.item.component.DyedItemColor;
  * @see CustomLecternRenderer
  */
 public class LecternPocketModel {
-    public static final ResourceLocation TEXTURE_NORMAL = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "entity/pocket_computer_normal");
-    public static final ResourceLocation TEXTURE_ADVANCED = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "entity/pocket_computer_advanced");
-    public static final ResourceLocation TEXTURE_COLOUR = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "entity/pocket_computer_colour");
-    public static final ResourceLocation TEXTURE_FRAME = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "entity/pocket_computer_frame");
-    public static final ResourceLocation TEXTURE_LIGHT = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "entity/pocket_computer_light");
+    public static final ResourceLocation TEXTURE_NORMAL = new ResourceLocation(ComputerCraftAPI.MOD_ID, "entity/pocket_computer_normal");
+    public static final ResourceLocation TEXTURE_ADVANCED = new ResourceLocation(ComputerCraftAPI.MOD_ID, "entity/pocket_computer_advanced");
+    public static final ResourceLocation TEXTURE_COLOUR = new ResourceLocation(ComputerCraftAPI.MOD_ID, "entity/pocket_computer_colour");
+    public static final ResourceLocation TEXTURE_FRAME = new ResourceLocation(ComputerCraftAPI.MOD_ID, "entity/pocket_computer_frame");
+    public static final ResourceLocation TEXTURE_LIGHT = new ResourceLocation(ComputerCraftAPI.MOD_ID, "entity/pocket_computer_light");
 
-    private static final Material MATERIAL_NORMAL = new Material(TextureAtlas.LOCATION_BLOCKS, TEXTURE_NORMAL);
-    private static final Material MATERIAL_ADVANCED = new Material(TextureAtlas.LOCATION_BLOCKS, TEXTURE_ADVANCED);
-    private static final Material MATERIAL_COLOUR = new Material(TextureAtlas.LOCATION_BLOCKS, TEXTURE_COLOUR);
-    private static final Material MATERIAL_FRAME = new Material(TextureAtlas.LOCATION_BLOCKS, TEXTURE_FRAME);
-    private static final Material MATERIAL_LIGHT = new Material(TextureAtlas.LOCATION_BLOCKS, TEXTURE_LIGHT);
+    private static final Material MATERIAL_NORMAL = new Material(InventoryMenu.BLOCK_ATLAS, TEXTURE_NORMAL);
+    private static final Material MATERIAL_ADVANCED = new Material(InventoryMenu.BLOCK_ATLAS, TEXTURE_ADVANCED);
+    private static final Material MATERIAL_COLOUR = new Material(InventoryMenu.BLOCK_ATLAS, TEXTURE_COLOUR);
+    private static final Material MATERIAL_FRAME = new Material(InventoryMenu.BLOCK_ATLAS, TEXTURE_FRAME);
+    private static final Material MATERIAL_LIGHT = new Material(InventoryMenu.BLOCK_ATLAS, TEXTURE_LIGHT);
 
     // The size of the terminal within the model.
     public static final float TERM_WIDTH = 12.0f / 32.0f;
@@ -65,6 +67,11 @@ public class LecternPocketModel {
         return mesh.getRoot().bake(TEXTURE_WIDTH, TEXTURE_HEIGHT);
     }
 
+    private void render(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, int colour) {
+        int red = FastColor.ARGB32.red(colour), green = FastColor.ARGB32.green(colour), blue = FastColor.ARGB32.blue(colour), alpha = FastColor.ARGB32.alpha(colour);
+        root.render(poseStack, buffer, packedLight, packedOverlay, red / 255.0f, green / 255.0f, blue / 255.0f, alpha / 255.0f);
+    }
+
     /**
      * Render the pocket computer model.
      *
@@ -73,18 +80,18 @@ public class LecternPocketModel {
      * @param packedLight   The current light level.
      * @param packedOverlay The overlay texture (used for entity hurt animation).
      * @param family        The computer family.
-     * @param frameColour   The pocket computer's {@linkplain DyedItemColor colour}.
+     * @param frameColour   The pocket computer's {@linkplain PocketComputerItem#getColour(ItemStack) colour}.
      * @param lightColour   The pocket computer's {@linkplain PocketComputerData#getLightState() light colour}.
      */
     public void render(PoseStack poseStack, MultiBufferSource bufferSource, int packedLight, int packedOverlay, ComputerFamily family, int frameColour, int lightColour) {
         if (frameColour != -1) {
-            root.render(poseStack, MATERIAL_FRAME.buffer(bufferSource, RenderType::entityCutout), packedLight, packedOverlay);
-            root.render(poseStack, MATERIAL_COLOUR.buffer(bufferSource, RenderType::entityCutout), packedLight, packedOverlay, frameColour);
+            root.render(poseStack, MATERIAL_FRAME.buffer(bufferSource, RenderType::entityCutout), packedLight, packedOverlay, 1, 1, 1, 1);
+            render(poseStack, MATERIAL_COLOUR.buffer(bufferSource, RenderType::entityCutout), packedLight, packedOverlay, frameColour);
         } else {
             var buffer = (family == ComputerFamily.ADVANCED ? MATERIAL_ADVANCED : MATERIAL_NORMAL).buffer(bufferSource, RenderType::entityCutout);
-            root.render(poseStack, buffer, packedLight, packedOverlay);
+            root.render(poseStack, buffer, packedLight, packedOverlay, 1, 1, 1, 1);
         }
 
-        root.render(poseStack, MATERIAL_LIGHT.buffer(bufferSource, RenderType::entityCutout), LightTexture.FULL_BRIGHT, packedOverlay, lightColour);
+        render(poseStack, MATERIAL_LIGHT.buffer(bufferSource, RenderType::entityCutout), LightTexture.FULL_BRIGHT, packedOverlay, lightColour);
     }
 }

projects/common/src/client/java/dan200/computercraft/client/model/LecternPrintoutModel.java

@@ -13,9 +13,9 @@ import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.model.geom.PartPose;
 import net.minecraft.client.model.geom.builders.CubeListBuilder;
 import net.minecraft.client.model.geom.builders.MeshDefinition;
-import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.client.resources.model.Material;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.inventory.InventoryMenu;
 
 import java.util.List;
 
@@ -28,8 +28,8 @@ import java.util.List;
  * @see CustomLecternRenderer
  */
 public class LecternPrintoutModel {
-    public static final ResourceLocation TEXTURE = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "entity/printout");
-    public static final Material MATERIAL = new Material(TextureAtlas.LOCATION_BLOCKS, TEXTURE);
+    public static final ResourceLocation TEXTURE = new ResourceLocation(ComputerCraftAPI.MOD_ID, "entity/printout");
+    public static final Material MATERIAL = new Material(InventoryMenu.BLOCK_ATLAS, TEXTURE);
 
     private static final int TEXTURE_WIDTH = 32;
     private static final int TEXTURE_HEIGHT = 32;
@@ -103,7 +103,7 @@ public class LecternPrintoutModel {
     }
 
     public void renderBook(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay) {
-        bookRoot.render(poseStack, buffer, packedLight, packedOverlay);
+        bookRoot.render(poseStack, buffer, packedLight, packedOverlay, 1, 1, 1, 1);
     }
 
     public void renderPages(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, int pageCount) {
@@ -112,6 +112,6 @@ public class LecternPrintoutModel {
         for (; i < pageCount; i++) pages[i].visible = true;
         for (; i < pages.length; i++) pages[i].visible = false;
 
-        pagesRoot.render(poseStack, buffer, packedLight, packedOverlay);
+        pagesRoot.render(poseStack, buffer, packedLight, packedOverlay, 1, 1, 1, 1);
     }
 }

projects/common/src/client/java/dan200/computercraft/client/model/turtle/ModelTransformer.java

@@ -0,0 +1,103 @@
+// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.client.model.turtle;
+
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.vertex.VertexFormat;
+import com.mojang.blaze3d.vertex.VertexFormatElement;
+import com.mojang.math.Transformation;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.core.Direction;
+import org.joml.Matrix4f;
+import org.joml.Vector4f;
+import org.jspecify.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Applies a {@link Transformation} (or rather a {@link Matrix4f}) to a list of {@link BakedQuad}s.
+ * <p>
+ * This does a little bit of magic compared with other system (i.e. Forge's {@code QuadTransformers}), as it needs to
+ * handle flipping models upside down.
+ * <p>
+ * This is typically used with a {@link BakedModel} subclass - see the loader-specific projects.
+ */
+public class ModelTransformer {
+    private static final int[] INVERSE_ORDER = new int[]{ 3, 2, 1, 0 };
+
+    private static final int STRIDE = DefaultVertexFormat.BLOCK.getIntegerSize();
+    private static final int POS_OFFSET = findOffset(DefaultVertexFormat.BLOCK, DefaultVertexFormat.ELEMENT_POSITION);
+
+    protected final Matrix4f transformation;
+    protected final boolean invert;
+    private @Nullable TransformedQuads cache;
+
+    public ModelTransformer(Transformation transformation) {
+        this.transformation = transformation.getMatrix();
+        invert = transformation.getMatrix().determinant() < 0;
+    }
+
+    public List<BakedQuad> transform(List<BakedQuad> quads) {
+        if (quads.isEmpty()) return List.of();
+
+        // We do some basic caching here to avoid recomputing every frame. Most turtle models don't have culled faces,
+        // so it's not worth being smarter here.
+        var cache = this.cache;
+        if (cache != null && quads.equals(cache.original())) return cache.transformed();
+
+        List<BakedQuad> transformed = new ArrayList<>(quads.size());
+        for (var quad : quads) transformed.add(transformQuad(quad));
+        this.cache = new TransformedQuads(quads, transformed);
+        return transformed;
+    }
+
+    private BakedQuad transformQuad(BakedQuad quad) {
+        var inputData = quad.getVertices();
+        var outputData = new int[inputData.length];
+        for (var i = 0; i < 4; i++) {
+            var inStart = STRIDE * i;
+            // Reverse the order of the quads if we're inverting
+            var outStart = getVertexOffset(i, invert);
+            System.arraycopy(inputData, inStart, outputData, outStart, STRIDE);
+
+            // Apply the matrix to our position
+            var inPosStart = inStart + POS_OFFSET;
+            var outPosStart = outStart + POS_OFFSET;
+
+            var x = Float.intBitsToFloat(inputData[inPosStart]);
+            var y = Float.intBitsToFloat(inputData[inPosStart + 1]);
+            var z = Float.intBitsToFloat(inputData[inPosStart + 2]);
+
+            // Transform the position
+            var pos = new Vector4f(x, y, z, 1);
+            transformation.transformProject(pos);
+
+            outputData[outPosStart] = Float.floatToRawIntBits(pos.x());
+            outputData[outPosStart + 1] = Float.floatToRawIntBits(pos.y());
+            outputData[outPosStart + 2] = Float.floatToRawIntBits(pos.z());
+        }
+
+        var direction = Direction.rotate(transformation, quad.getDirection());
+        return new BakedQuad(outputData, quad.getTintIndex(), direction, quad.getSprite(), quad.isShade());
+    }
+
+    public static int getVertexOffset(int vertex, boolean invert) {
+        return (invert ? ModelTransformer.INVERSE_ORDER[vertex] : vertex) * ModelTransformer.STRIDE;
+    }
+
+    private record TransformedQuads(List<BakedQuad> original, List<BakedQuad> transformed) {
+    }
+
+    private static int findOffset(VertexFormat format, VertexFormatElement element) {
+        var offset = 0;
+        for (var other : format.getElements()) {
+            if (other == element) return offset / Integer.BYTES;
+            offset += element.getByteSize();
+        }
+        throw new IllegalArgumentException("Cannot find " + element + " in " + format);
+    }
+}

projects/common/src/client/java/dan200/computercraft/client/model/turtle/TurtleModelParts.java

@@ -0,0 +1,159 @@
+// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+//
+// SPDX-License-Identifier: LicenseRef-CCPL
+
+package dan200.computercraft.client.model.turtle;
+
+import com.google.common.cache.CacheBuilder;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Transformation;
+import dan200.computercraft.api.client.TransformedModel;
+import dan200.computercraft.api.turtle.ITurtleUpgrade;
+import dan200.computercraft.api.turtle.TurtleSide;
+import dan200.computercraft.api.upgrades.UpgradeData;
+import dan200.computercraft.client.platform.ClientPlatformHelper;
+import dan200.computercraft.client.render.TurtleBlockEntityRenderer;
+import dan200.computercraft.client.turtle.TurtleUpgradeModellers;
+import dan200.computercraft.shared.turtle.items.TurtleItem;
+import dan200.computercraft.shared.util.Holiday;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemStack;
+import org.jspecify.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+
+/**
+ * Combines several individual models together to form a turtle.
+ *
+ * @param <T> The type of the resulting "baked model".
+ */
+public final class TurtleModelParts<T> {
+    private static final Transformation identity, flip;
+
+    static {
+        var stack = new PoseStack();
+        stack.translate(0.5f, 0.5f, 0.5f);
+        stack.scale(1, -1, 1);
+        stack.translate(-0.5f, -0.5f, -0.5f);
+
+        identity = Transformation.identity();
+        flip = new Transformation(stack.last().pose());
+    }
+
+    private record Combination(
+        boolean colour,
+        @Nullable UpgradeData<ITurtleUpgrade> leftUpgrade,
+        @Nullable UpgradeData<ITurtleUpgrade> rightUpgrade,
+        @Nullable ResourceLocation overlay,
+        boolean christmas,
+        boolean flip
+    ) {
+        Combination copy() {
+            if (leftUpgrade == null && rightUpgrade == null) return this;
+            return new Combination(
+                colour, UpgradeData.copyOf(leftUpgrade), UpgradeData.copyOf(rightUpgrade),
+                overlay, christmas, flip
+            );
+        }
+    }
+
+    private final BakedModel familyModel;
+    private final BakedModel colourModel;
+    private final Function<TransformedModel, BakedModel> transformer;
+    private final Function<Combination, T> buildModel;
+
+    /**
+     * A cache of {@link TransformedModel} to the transformed {@link BakedModel}. This helps us pool the transformed
+     * instances, reducing memory usage and hopefully ensuring their caches are hit more often!
+     */
+    private final Map<TransformedModel, BakedModel> transformCache = CacheBuilder.newBuilder()
+        .concurrencyLevel(1)
+        .expireAfterAccess(30, TimeUnit.SECONDS)
+        .<TransformedModel, BakedModel>build()
+        .asMap();
+
+    /**
+     * A cache of {@link Combination}s to the combined model.
+     */
+    private final Map<Combination, T> modelCache = CacheBuilder.newBuilder()
+        .concurrencyLevel(1)
+        .expireAfterAccess(30, TimeUnit.SECONDS)
+        .<Combination, T>build()
+        .asMap();
+
+    public TurtleModelParts(BakedModel familyModel, BakedModel colourModel, ModelTransformer transformer, Function<List<BakedModel>, T> combineModel) {
+        this.familyModel = familyModel;
+        this.colourModel = colourModel;
+        this.transformer = x -> transformer.transform(x.getModel(), x.getMatrix());
+        buildModel = x -> combineModel.apply(buildModel(x));
+    }
+
+    public T getModel(ItemStack stack) {
+        var combination = getCombination(stack);
+        var existing = modelCache.get(combination);
+        if (existing != null) return existing;
+
+        // Take a defensive copy of the upgrade data, and add it to the cache.
+        var newCombination = combination.copy();
+        var newModel = buildModel.apply(newCombination);
+        modelCache.put(newCombination, newModel);
+        return newModel;
+    }
+
+    private Combination getCombination(ItemStack stack) {
+        var christmas = Holiday.getCurrent() == Holiday.CHRISTMAS;
+
+        if (!(stack.getItem() instanceof TurtleItem turtle)) {
+            return new Combination(false, null, null, null, christmas, false);
+        }
+
+        var colour = turtle.getColour(stack);
+        var leftUpgrade = turtle.getUpgradeWithData(stack, TurtleSide.LEFT);
+        var rightUpgrade = turtle.getUpgradeWithData(stack, TurtleSide.RIGHT);
+        var overlay = turtle.getOverlay(stack);
+        var label = turtle.getLabel(stack);
+        var flip = label != null && (label.equals("Dinnerbone") || label.equals("Grumm"));
+
+        return new Combination(colour != -1, leftUpgrade, rightUpgrade, overlay, christmas, flip);
+    }
+
+    private List<BakedModel> buildModel(Combination combo) {
+        var mc = Minecraft.getInstance();
+        var modelManager = mc.getItemRenderer().getItemModelShaper().getModelManager();
+
+        var transformation = combo.flip ? flip : identity;
+        var parts = new ArrayList<BakedModel>(4);
+        parts.add(transform(combo.colour() ? colourModel : familyModel, transformation));
+
+        var overlayModelLocation = TurtleBlockEntityRenderer.getTurtleOverlayModel(combo.overlay(), combo.christmas());
+        if (overlayModelLocation != null) {
+            parts.add(transform(ClientPlatformHelper.get().getModel(modelManager, overlayModelLocation), transformation));
+        }
+
+        addUpgrade(parts, transformation, TurtleSide.LEFT, combo.leftUpgrade());
+        addUpgrade(parts, transformation, TurtleSide.RIGHT, combo.rightUpgrade());
+
+        return parts;
+    }
+
+    private void addUpgrade(List<BakedModel> parts, Transformation transformation, TurtleSide side, @Nullable UpgradeData<ITurtleUpgrade> upgrade) {
+        if (upgrade == null) return;
+        var model = TurtleUpgradeModellers.getModel(upgrade.upgrade(), upgrade.data(), side);
+        parts.add(transform(model.getModel(), transformation.compose(model.getMatrix())));
+    }
+
+    private BakedModel transform(BakedModel model, Transformation transformation) {
+        if (transformation.equals(Transformation.identity())) return model;
+        return transformCache.computeIfAbsent(new TransformedModel(model, transformation), transformer);
+    }
+
+    public interface ModelTransformer {
+        BakedModel transform(BakedModel model, Transformation transformation);
+    }
+}

projects/common/src/client/java/dan200/computercraft/client/network/ClientNetworking.java

@@ -4,10 +4,10 @@
 
 package dan200.computercraft.client.network;
 
+import dan200.computercraft.client.platform.ClientPlatformHelper;
 import dan200.computercraft.shared.network.NetworkMessage;
 import dan200.computercraft.shared.network.server.ServerNetworkContext;
 import net.minecraft.client.Minecraft;
-import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
 
 /**
  * Methods for sending packets from clients to the server.
@@ -23,6 +23,6 @@ public final class ClientNetworking {
      */
     public static void sendToServer(NetworkMessage<ServerNetworkContext> message) {
         var connection = Minecraft.getInstance().getConnection();
-        if (connection != null) connection.send(new ServerboundCustomPayloadPacket(message));
+        if (connection != null) connection.send(ClientPlatformHelper.get().createPacket(message));
     }
 }

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

@@ -4,6 +4,7 @@
 
 package dan200.computercraft.client.platform;
 
+import com.google.auto.service.AutoService;
 import dan200.computercraft.client.ClientTableFormatter;
 import dan200.computercraft.client.gui.AbstractComputerScreen;
 import dan200.computercraft.client.gui.OptionScreen;
@@ -20,14 +21,11 @@ import dan200.computercraft.shared.peripheral.speaker.EncodedAudio;
 import dan200.computercraft.shared.peripheral.speaker.SpeakerPosition;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Holder;
-import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.JukeboxSong;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.LevelEvent;
 import org.jspecify.annotations.Nullable;
 
 import java.util.UUID;
@@ -35,6 +33,7 @@ import java.util.UUID;
 /**
  * The client-side implementation of {@link ClientNetworkContext}.
  */
+@AutoService(ClientNetworkContext.class)
 public final class ClientNetworkContextImpl implements ClientNetworkContext {
     @Override
     public void handleChatTable(TableBuilder table) {
@@ -61,16 +60,10 @@ public final class ClientNetworkContextImpl implements ClientNetworkContext {
     }
 
     @Override
-    public void handlePlayRecord(BlockPos pos, @Nullable Holder<JukeboxSong> song) {
-        var level = Minecraft.getInstance().level;
-        if (level == null) return;
-
-        if (song == null) {
-            level.levelEvent(LevelEvent.SOUND_STOP_JUKEBOX_SONG, pos, 0);
-        } else {
-            var id = level.registryAccess().lookupOrThrow(Registries.JUKEBOX_SONG).getIdOrThrow(song.value());
-            level.levelEvent(LevelEvent.SOUND_PLAY_JUKEBOX_SONG, pos, id);
-        }
+    public void handlePlayRecord(BlockPos pos, @Nullable SoundEvent sound, @Nullable String name) {
+        var mc = Minecraft.getInstance();
+        ClientPlatformHelper.get().playStreamingMusic(pos, sound);
+        if (name != null) mc.gui.setNowPlaying(Component.literal(name));
     }
 
     @Override

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

@@ -4,38 +4,48 @@
 
 package dan200.computercraft.client.platform;
 
-import dan200.computercraft.impl.Services;
-import net.minecraft.client.resources.model.ModelDebugName;
-import org.jetbrains.annotations.Contract;
+import com.mojang.blaze3d.vertex.PoseStack;
+import dan200.computercraft.shared.network.NetworkMessage;
+import dan200.computercraft.shared.network.server.ServerNetworkContext;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ServerGamePacketListener;
+import net.minecraft.sounds.SoundEvent;
 import org.jspecify.annotations.Nullable;
 
-public interface ClientPlatformHelper {
+public interface ClientPlatformHelper extends dan200.computercraft.impl.client.ClientPlatformHelper {
     static ClientPlatformHelper get() {
-        var instance = Instance.INSTANCE;
-        return instance == null ? Services.raise(ClientPlatformHelper.class, Instance.ERROR) : instance;
+        return (ClientPlatformHelper) dan200.computercraft.impl.client.ClientPlatformHelper.get();
     }
 
     /**
-     * Create a new unique {@link ModelKey}.
+     * Convert a serverbound {@link NetworkMessage} to a Minecraft {@link Packet}.
      *
-     * @param name The debug name for this model key.
-     * @param <T>  The type of baked model.
-     * @return The newly created model key.
+     * @param message The messsge to convert.
+     * @return The converted message.
      */
-    @Contract("_ -> new")
-    <T> ModelKey<T> createModelKey(ModelDebugName name);
+    Packet<ServerGamePacketListener> createPacket(NetworkMessage<ServerNetworkContext> message);
 
-    final class Instance {
-        static final @Nullable ClientPlatformHelper INSTANCE;
-        static final @Nullable Throwable ERROR;
+    /**
+     * Render a {@link BakedModel}, using any loader-specific hooks.
+     *
+     * @param transform     The current matrix transformation to apply.
+     * @param buffers       The current pool of render buffers.
+     * @param model         The model to draw.
+     * @param lightmapCoord The current packed lightmap coordinate.
+     * @param overlayLight  The current overlay light.
+     * @param tints         Block colour tints to apply to the model.
+     */
+    void renderBakedModel(PoseStack transform, MultiBufferSource buffers, BakedModel model, int lightmapCoord, int overlayLight, int @Nullable [] tints);
 
-        static {
-            var helper = Services.tryLoad(ClientPlatformHelper.class);
-            INSTANCE = helper.instance();
-            ERROR = helper.error();
-        }
-
-        private Instance() {
-        }
-    }
+    /**
+     * Play a record at a particular position.
+     *
+     * @param pos   The position to play this record.
+     * @param sound The record to play, or {@code null} to stop it.
+     * @see net.minecraft.client.renderer.LevelRenderer#playStreamingMusic(SoundEvent, BlockPos)
+     */
+    void playStreamingMusic(BlockPos pos, @Nullable SoundEvent sound);
 }