Bump CC:T to 1.111.1

- Rename ToolActions to ItemAbilities. Closes #1881.
 - Remove our source set helper, as NG has built-in support for this
   now.
 - Remove our code to generate new JavaExec tasks from runs, as NG now
   generates JavaExec tasks normally.

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -8,10 +8,8 @@ body:
     label: Minecraft Version
     description: What version of Minecraft are you using?
     options:
-      - 1.16.x
-      - 1.18.x
-      - 1.19.x
-      - 1.20.x
+      - 1.20.1
+      - 1.21.x
   validations:
     required: true
 - type: input

.github/workflows/main-ci.yml

@@ -9,16 +9,16 @@ jobs:
 
     steps:
     - name: 📥 Clone repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: 📥 Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'temurin'
 
     - name: 📥 Setup Gradle
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/actions/setup-gradle@v3
       with:
         cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/mc-') }}
 
@@ -58,13 +58,13 @@ jobs:
         find projects/forge/build/libs projects/fabric/build/libs -type f -regex '.*[0-9.]+\(-SNAPSHOT\)?\.jar$' -exec bash -c 'cp {} "jars/$(basename {} .jar)-$(git rev-parse HEAD).jar"' \;
 
     - name: 📤 Upload Jar
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: CC-Tweaked
         path: ./jars
 
     - name: 📤 Upload coverage
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
 
   build-core:
     strategy:
@@ -81,24 +81,28 @@ jobs:
     runs-on: ${{ matrix.uses }}
 
     steps:
-    - name: Clone repository
-      uses: actions/checkout@v3
+    - name: 📥 Clone repository
+      uses: actions/checkout@v4
 
-    - name: Set up Java
-      uses: actions/setup-java@v3
+    - name: 📥 Set up Java
+      uses: actions/setup-java@v4
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'temurin'
 
-    - name: Setup Gradle
-      uses: gradle/gradle-build-action@v2
+    - name: 📥 Setup Gradle
+      uses: gradle/actions/setup-gradle@v3
       with:
         cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/mc-') }}
 
-    - name: Run tests
+    - name: ⚒️ Build
+      run: |
+        ./gradlew --configure-on-demand :core:assemble
+
+    - name: 🧪 Run tests
       run: |
         ./gradlew --configure-on-demand :core:test
 
-    - name: Parse test reports
+    - name: 🧪 Parse test reports
       run: python3 ./tools/parse-reports.py
       if: ${{ failure() }}

.github/workflows/make-doc.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-DEST="${GITHUB_REF#refs/*/}"
-echo "Uploading docs to https://tweaked.cc/$DEST"
-
-# Setup ssh key
-mkdir -p "$HOME/.ssh/"
-echo "$SSH_KEY" > "$HOME/.ssh/key"
-chmod 600 "$HOME/.ssh/key"
-
-# And upload
-rsync -avc -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no -p $SSH_PORT" \
-      "$GITHUB_WORKSPACE/projects/web/build/site/" \
-      "$SSH_USER@$SSH_HOST:/$DEST"
-rsync -avc -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no -p $SSH_PORT" \
-      "$GITHUB_WORKSPACE/projects/common-api/build/docs/javadoc/" \
-      "$SSH_USER@$SSH_HOST:/$DEST/javadoc"

.github/workflows/make-doc.yml

@@ -3,8 +3,7 @@ name: Build documentation
 on:
   push:
     branches:
-    - mc-1.19.x
-    - mc-1.20.x
+    - mc-*
 
 jobs:
   make_doc:
@@ -12,30 +11,25 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Clone repository
-      uses: actions/checkout@v3
+    - name: 📥 Clone repository
+      uses: actions/checkout@v4
 
-    - name: Set up Java
-      uses: actions/setup-java@v1
+    - name: 📥 Set up Java
+      uses: actions/setup-java@v4
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'temurin'
 
-    - name: Setup Gradle
-      uses: gradle/gradle-build-action@v2
+    - name: 📥 Setup Gradle
+      uses: gradle/actions/setup-gradle@v3
       with:
         cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/mc-') }}
 
-    - name: Build with Gradle
-      run: ./gradlew compileJava --no-daemon || ./gradlew compileJava --no-daemon
+    - name: ⚒️ Generate documentation
+      run: ./gradlew docWebsite --no-daemon
 
-    - name: Generate documentation
-      run: ./gradlew docWebsite :common-api:javadoc  --no-daemon
-
-    - name: Upload documentation
-      run: .github/workflows/make-doc.sh 2> /dev/null
-      env:
-        SSH_KEY:  ${{ secrets.SSH_KEY  }}
-        SSH_USER: ${{ secrets.SSH_USER }}
-        SSH_HOST: ${{ secrets.SSH_HOST }}
-        SSH_PORT: ${{ secrets.SSH_PORT }}
+    - name: 📤 Upload Jar
+      uses: actions/upload-artifact@v4
+      with:
+        name: Documentation
+        path: ./projects/web/build/site/

.gitignore

@@ -9,6 +9,7 @@
 /projects/*/logs
 /projects/fabric/fabricloader.log
 /projects/*/build
+/projects/*/src/test/generated_tests/
 /buildSrc/build
 /out
 /buildSrc/out

.gitpod.yml

@@ -1,26 +0,0 @@
-# SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
-#
-# SPDX-License-Identifier: MPL-2.0
-
-image:
-  file: config/gitpod/Dockerfile
-
-ports:
-  - port: 25565
-    onOpen: notify
-
-vscode:
-  extensions:
-    - eamodio.gitlens
-    - github.vscode-pull-request-github
-    - ms-azuretools.vscode-docker
-    - redhat.java
-    - richardwillis.vscode-gradle
-    - vscjava.vscode-java-debug
-    - vscode.github
-
-tasks:
-  - name: Setup pre-commit hool
-    init: pre-commit install --allow-missing-config
-  - name: Install npm packages
-    init: npm ci

.reuse/dep5

@@ -6,10 +6,9 @@ Upstream-Contact: Jonathan Coates <git@squiddev.cc>
 Files:
   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_upgrades/*
+  projects/common/src/testMod/resources/data/cctest/computercraft/turtle_upgrade/*
   projects/common/src/testMod/resources/data/cctest/structures/*
-  projects/fabric/src/generated/*
-  projects/forge/src/generated/*
+  projects/*/src/generated/*
   projects/web/src/htmlTransform/export/index.json
   projects/web/src/htmlTransform/export/items/minecraft/*
 Comment: Generated/data files are CC0.
@@ -37,6 +36,7 @@ Files:
   projects/fabric/src/testMod/resources/computercraft-gametest.fabric.mixins.json
   projects/fabric/src/testMod/resources/fabric.mod.json
   projects/forge/src/client/resources/computercraft-client.forge.mixins.json
+  projects/forge/src/main/resources/computercraft.forge.mixins.json
   projects/web/src/frontend/mount/.settings
   projects/web/src/frontend/mount/example.nfp
   projects/web/src/frontend/mount/example.nft

CONTRIBUTING.md

@@ -29,9 +29,9 @@ automatically with GitHub, so please don't submit PRs adding/changing translatio
 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 (JDK) installed. This can be downloaded from [Adoptium].
+   - Java Development Kit (JDK). This can be downloaded from [Adoptium].
    - [Git](https://git-scm.com/).
-   - If you want to work on documentation, [NodeJS][node].
+   - [NodeJS][node].
 
  - Download CC: Tweaked's source code:
    ```

README.md

@@ -39,7 +39,7 @@ on is present.
 ```groovy
 repositories {
   maven {
-    url "https://squiddev.cc/maven/"
+    url "https://maven.squiddev.cc"
     content {
       includeGroup("cc.tweaked")
     }

build.gradle.kts

@@ -5,9 +5,8 @@
 import cc.tweaked.gradle.JUnitExt
 import net.fabricmc.loom.api.LoomGradleExtensionAPI
 import net.fabricmc.loom.util.gradle.SourceSetHelper
-import org.jetbrains.gradle.ext.compiler
-import org.jetbrains.gradle.ext.runConfigurations
-import org.jetbrains.gradle.ext.settings
+import org.jetbrains.gradle.ext.*
+import org.jetbrains.gradle.ext.Application
 
 plugins {
     publishing
@@ -86,6 +85,19 @@ idea.project.settings.runConfigurations {
         moduleName = "${idea.project.name}.forge.test"
         packageName = ""
     }
+
+    register<Application>("Standalone") {
+        moduleName = "${idea.project.name}.standalone.main"
+        mainClass = "cc.tweaked.standalone.Main"
+        programParameters = "--resources=projects/core/src/main/resources --term=80x30 --allow-local-domains"
+    }
+}
+
+// Build with the IntelliJ, rather than through Gradle. This may require setting the "Compiler Output" option in
+// "Project Structure".
+idea.project.settings.delegateActions {
+    delegateBuildRunToGradle = false
+    testRunner = ActionDelegationConfig.TestRunner.PLATFORM
 }
 
 idea.project.settings.compiler.javac {

buildSrc/build.gradle.kts

@@ -32,7 +32,7 @@ repositories {
         }
     }
 
-    maven("https://squiddev.cc/maven") {
+    maven("https://maven.squiddev.cc") {
         name = "SquidDev"
         content {
             includeGroup("cc.tweaked.vanilla-extract")

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

@@ -30,11 +30,6 @@ subsystems {
     }
 }
 
-dependencies {
-    val libs = project.extensions.getByType<VersionCatalogsExtension>().named("libs")
-    implementation("net.neoforged:neoforge:${libs.findVersion("neoForge").get()}")
-}
-
 MinecraftConfigurations.setup(project)
 
 extensions.configure(CCTweakedExtension::class.java) {

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

@@ -38,7 +38,7 @@ java {
 repositories {
     mavenCentral()
 
-    val mainMaven = maven("https://squiddev.cc/maven") {
+    val mainMaven = maven("https://maven.squiddev.cc/mirror") {
         name = "SquidDev"
     }
 
@@ -56,7 +56,6 @@ repositories {
             includeGroup("mezz.jei")
             includeGroup("org.teavm")
             includeModule("com.terraformersmc", "modmenu")
-            includeModule("me.lucko", "fabric-permissions-api")
         }
     }
 }
@@ -78,8 +77,16 @@ dependencies {
 // Configure default JavaCompile tasks with our arguments.
 sourceSets.all {
     tasks.named(compileJavaTaskName, JavaCompile::class.java) {
-        // Processing just gives us "No processor claimed any of these annotations", so skip that!
-        options.compilerArgs.addAll(listOf("-Xlint", "-Xlint:-processing"))
+
+        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",
+            ),
+        )
 
         options.errorprone {
             check("InvalidBlockTag", CheckSeverity.OFF) // Broken by @cc.xyz
@@ -87,9 +94,8 @@ sourceSets.all {
             check("InlineMeSuggester", CheckSeverity.OFF) // Minecraft uses @Deprecated liberally
             // Too many false positives right now. Maybe we need an indirection for it later on.
             check("ReferenceEquality", CheckSeverity.OFF)
-            check("UnusedVariable", CheckSeverity.OFF) // Too many false positives with records.
+            check("EnumOrdinal", CheckSeverity.OFF) // For now. We could replace most of these with EnumMap.
             check("OperatorPrecedence", CheckSeverity.OFF) // For now.
-            check("AlreadyChecked", CheckSeverity.OFF) // Seems to be broken?
             check("NonOverridingEquals", CheckSeverity.OFF) // Peripheral.equals makes this hard to avoid
             check("FutureReturnValueIgnored", CheckSeverity.OFF) // Too many false positives with Netty
 
@@ -102,6 +108,8 @@ sourceSets.all {
             option("NullAway:CastToNonNullMethod", "dan200.computercraft.core.util.Nullability.assertNonNull")
             option("NullAway:CheckOptionalEmptiness")
             option("NullAway:AcknowledgeRestrictiveAnnotations")
+
+            excludedPaths = ".*/jmh_generated/.*"
         }
     }
 }
@@ -125,8 +133,8 @@ tasks.processResources {
 tasks.withType(AbstractArchiveTask::class.java).configureEach {
     isPreserveFileTimestamps = false
     isReproducibleFileOrder = true
-    dirMode = Integer.valueOf("755", 8)
-    fileMode = Integer.valueOf("664", 8)
+    filePermissions {}
+    dirPermissions {}
 }
 
 tasks.jar {
@@ -146,7 +154,7 @@ tasks.javadoc {
     options {
         val stdOptions = this as StandardJavadocDocletOptions
         stdOptions.addBooleanOption("Xdoclint:all,-missing", true)
-        stdOptions.links("https://docs.oracle.com/en/java/javase/17/docs/api/")
+        stdOptions.links("https://docs.oracle.com/en/java/javase/21/docs/api/")
     }
 }
 

buildSrc/src/main/kotlin/cc-tweaked.mod-publishing.gradle.kts

@@ -32,7 +32,7 @@ val publishCurseForge by tasks.registering(TaskPublishCurseForge::class) {
     apiToken = findProperty("curseForgeApiKey") ?: ""
     enabled = apiToken != ""
 
-    val mainFile = upload("282001", modPublishing.output.get().archiveFile)
+    val mainFile = upload("282001", modPublishing.output)
     mainFile.changelog =
         "Release notes can be found on the [GitHub repository](https://github.com/cc-tweaked/CC-Tweaked/releases/tag/v$mcVersion-$modVersion)."
     mainFile.changelogType = "markdown"

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

@@ -38,7 +38,7 @@ publishing {
     }
 
     repositories {
-        maven("https://squiddev.cc/maven") {
+        maven("https://maven.squiddev.cc") {
             name = "SquidDev"
 
             credentials(PasswordCredentials::class)

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

@@ -35,7 +35,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.File
 import java.io.IOException
 import java.net.URI
-import java.net.URL
 import java.util.regex.Pattern
 
 abstract class CCTweakedExtension(
@@ -226,12 +225,12 @@ abstract class CCTweakedExtension(
      * where possible.
      */
     fun downloadFile(label: String, url: String): File {
-        val url = URL(url)
-        val path = File(url.path)
+        val uri = URI(url)
+        val path = File(uri.path)
 
         project.repositories.ivy {
             name = label
-            setUrl(URI(url.protocol, url.userInfo, url.host, url.port, path.parent, null, null))
+            setUrl(URI(uri.scheme, uri.userInfo, uri.host, uri.port, path.parent, null, null))
             patternLayout {
                 artifact("[artifact].[ext]")
             }

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

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

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

@@ -9,6 +9,7 @@ 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
@@ -46,6 +47,21 @@ 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/ForgeExtensions.kt

@@ -1,62 +0,0 @@
-// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package cc.tweaked.gradle
-
-import net.neoforged.gradle.common.runs.run.RunImpl
-import net.neoforged.gradle.common.runs.tasks.RunExec
-import net.neoforged.gradle.dsl.common.extensions.RunnableSourceSet
-import net.neoforged.gradle.dsl.common.runs.run.Run
-import org.gradle.api.plugins.JavaPluginExtension
-import org.gradle.api.tasks.JavaExec
-import org.gradle.api.tasks.SourceSet
-import org.gradle.jvm.toolchain.JavaToolchainService
-import org.gradle.kotlin.dsl.assign
-import org.gradle.kotlin.dsl.create
-import org.gradle.kotlin.dsl.findByType
-import java.nio.file.Files
-
-/**
- * Set [JavaExec] task to run a given [RunConfig].
- *
- * See also [RunExec].
- */
-fun JavaExec.setRunConfig(config: Run) {
-    mainClass.set(config.mainClass)
-    workingDir = config.workingDirectory.get().asFile
-    argumentProviders.add { config.programArguments.get() }
-    jvmArgumentProviders.add { config.jvmArguments.get() }
-
-    environment(config.environmentVariables.get())
-    systemProperties(config.systemProperties.get())
-
-    config.modSources.get().forEach { classpath(it.runtimeClasspath) }
-    classpath(config.classpath)
-    classpath(config.dependencies.get().configuration)
-
-    (config as RunImpl).taskDependencies.forEach { dependsOn(it) }
-
-    javaLauncher.set(
-        project.extensions.getByType(JavaToolchainService::class.java)
-            .launcherFor(project.extensions.getByType(JavaPluginExtension::class.java).toolchain),
-    )
-
-    doFirst("Create working directory") { Files.createDirectories(workingDir.toPath()) }
-}
-
-/**
- * Add a new [Run.modSource] with a specific mod id.
- */
-fun Run.modSourceAs(sourceSet: SourceSet, mod: String) {
-    // NeoGradle requires a RunnableSourceSet to be present, so we inject it into other project's source sets.
-    val runnable = sourceSet.extensions.findByType<RunnableSourceSet>() ?: run {
-        val extension = sourceSet.extensions.create<RunnableSourceSet>(RunnableSourceSet.NAME, project)
-        extension.modIdentifier = mod
-        extension.modIdentifier.finalizeValueOnRead()
-        extension
-    }
-    if (runnable.modIdentifier.get() != mod) throw IllegalArgumentException("Multiple mod identifiers")
-
-    modSource(sourceSet)
-}

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

@@ -0,0 +1,120 @@
+// SPDX-FileCopyrightText: 2024 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package cc.tweaked.gradle
+
+import cc.tweaked.vanillaextract.core.util.MoreFiles
+import org.gradle.api.Action
+import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
+import org.gradle.api.file.*
+import org.gradle.api.model.ObjectFactory
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.tasks.*
+import javax.inject.Inject
+
+/**
+ * Merge common files across multiple directories into one destination directory.
+ *
+ * This is intended for merging the generated resources from the Forge and Fabric projects. Files common between the two
+ * are written to the global [output] directory, while distinct files are written to the per-source
+ * [MergeTrees.Source.output] directory.
+ */
+abstract class MergeTrees : DefaultTask() {
+    /**
+     * A source directory to read from.
+     */
+    interface Source {
+        /**
+         * The folder contianing all input files.
+         */
+        @get:InputFiles
+        @get:PathSensitive(PathSensitivity.RELATIVE)
+        val input: ConfigurableFileTree
+
+        fun input(configure: Action<ConfigurableFileTree>) {
+            configure.execute(input)
+        }
+
+        /**
+         * The folder to write files unique to this folder to.
+         */
+        @get:OutputDirectory
+        val output: DirectoryProperty
+    }
+
+    /**
+     * The list of sources.
+     */
+    @get:Nested
+    abstract val sources: ListProperty<Source>
+
+    /**
+     * Add and configure a new source.
+     */
+    fun source(configure: Action<Source>) {
+        val instance = objectFactory.newInstance(Source::class.java)
+        configure.execute(instance)
+        instance.output.disallowChanges()
+        sources.add(instance)
+    }
+
+    /**
+     * The directory to write common files to.
+     */
+    @get:OutputDirectory
+    abstract val output: DirectoryProperty
+
+    @get:Inject
+    protected abstract val objectFactory: ObjectFactory
+
+    @get:Inject
+    protected abstract val fsOperations: FileSystemOperations
+
+    @TaskAction
+    fun run() {
+        val sources = this.sources.get()
+        if (sources.isEmpty()) throw GradleException("Cannot have an empty list of sources")
+
+        val files = mutableMapOf<String, SharedFile>()
+        for (source in sources) {
+            source.input.visit(
+                object : FileVisitor {
+                    override fun visitDir(dirDetails: FileVisitDetails) = Unit
+                    override fun visitFile(fileDetails: FileVisitDetails) {
+                        val path = fileDetails.file.toRelativeString(source.input.dir)
+                        val hash = MoreFiles.computeSha1(fileDetails.file.toPath())
+
+                        val existing = files[path]
+                        if (existing == null) {
+                            files[path] = SharedFile(hash, 1)
+                        } else if (existing.hash == hash) {
+                            existing.found++
+                        }
+                    }
+                },
+            )
+        }
+
+        val sharedFiles = files.entries.asSequence().filter { (_, v) -> v.found == sources.size }.map { (k, _) -> k }.toList()
+
+        // Copy shared files to the common directory
+        fsOperations.sync {
+            from(sources[0].input)
+            into(output)
+            include(sharedFiles)
+        }
+
+        // And all other files to their per-source directory
+        for (source in sources) {
+            fsOperations.sync {
+                from(source.input)
+                into(source.output)
+                exclude(sharedFiles)
+            }
+        }
+    }
+
+    class SharedFile(val hash: String, var found: Int)
+}

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

@@ -46,7 +46,7 @@ abstract class NpmInstall : DefaultTask() {
     @TaskAction
     fun install() {
         project.exec {
-            commandLine("npm", "ci")
+            commandLine(ProcessHelpers.getExecutable("npm"), "ci")
             workingDir = projectRoot.get().asFile
         }
     }
@@ -59,6 +59,6 @@ abstract class NpmInstall : DefaultTask() {
 abstract class NpxExecToDir : ExecToDir() {
     init {
         dependsOn(NpmInstall.TASK_NAME)
-        executable = "npx"
+        executable = ProcessHelpers.getExecutable("npx")
     }
 }

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

@@ -9,6 +9,7 @@ import org.gradle.api.GradleException
 import java.io.BufferedReader
 import java.io.File
 import java.io.InputStreamReader
+import java.nio.charset.StandardCharsets
 
 internal object ProcessHelpers {
     fun startProcess(vararg command: String): Process {
@@ -34,7 +35,7 @@ internal object ProcessHelpers {
         val process = startProcess(*command)
         process.outputStream.close()
 
-        val out = BufferedReader(InputStreamReader(process.inputStream)).use { reader ->
+        val out = BufferedReader(InputStreamReader(process.inputStream, StandardCharsets.UTF_8)).use { reader ->
             reader.lines().filter { it.isNotEmpty() }.toList()
         }
         ProcessGroovyMethods.closeStreams(process)
@@ -46,6 +47,28 @@ internal object ProcessHelpers {
         val path = System.getenv("PATH") ?: return false
         return path.splitToSequence(File.pathSeparator).any { File(it, name).exists() }
     }
+
+    /**
+     * Search for an executable on the `PATH` if required.
+     *
+     * [Process]/[ProcessBuilder] does not handle all executable file extensions on Windows (such as `.com). When on
+     * Windows, this function searches `PATH` and `PATHEXT` for an executable matching [name].
+     */
+    fun getExecutable(name: String): String {
+        if (!System.getProperty("os.name").lowercase().contains("windows")) return name
+
+        val path = (System.getenv("PATH") ?: return name).split(File.pathSeparator)
+        val pathExt = (System.getenv("PATHEXT") ?: return name).split(File.pathSeparator)
+
+        for (pathEntry in path) {
+            for (ext in pathExt) {
+                val resolved = File(pathEntry, name + ext)
+                if (resolved.exists()) return resolved.getAbsolutePath()
+            }
+        }
+
+        return name
+    }
 }
 
 internal fun Process.waitForOrThrow(message: String) {

config/checkstyle/checkstyle.xml

@@ -13,8 +13,12 @@ SPDX-License-Identifier: MPL-2.0
     <property name="tabWidth" value="4"/>
     <property name="charset" value="UTF-8" />
 
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="module\-info\.java$"/>
+    </module>
+
     <module name="SuppressionFilter">
-	<property name="file" value="${config_loc}/suppressions.xml" />
+        <property name="file" value="${config_loc}/suppressions.xml" />
     </module>
 
     <module name="BeforeExecutionExclusionFileFilter">

config/checkstyle/suppressions.xml

@@ -21,5 +21,8 @@ SPDX-License-Identifier: MPL-2.0
     <suppress checks="PackageName" files=".*[\\/]T[A-Za-z]+.java" />
 
     <!-- Allow underscores in our test classes. -->
-    <suppress checks="MethodName" files=".*Contract.java" />
+    <suppress checks="MethodName" files=".*(Contract|Test).java" />
+
+    <!-- Allow underscores in Mixin classes -->
+    <suppress checks="TypeName" files=".*[\\/]mixin[\\/].*.java" />
 </suppressions>

config/gitpod/Dockerfile

@@ -1,12 +0,0 @@
-# SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
-#
-# SPDX-License-Identifier: MPL-2.0
-
-FROM gitpod/workspace-base
-
-USER gitpod
-
-RUN sudo apt-get -q update \
- && sudo apt-get install -yq openjdk-16-jdk python3-pip npm \
- && sudo pip3 install pre-commit \
- && sudo update-java-alternatives --set java-1.16.0-openjdk-amd64

doc/guides/gps_setup.md

@@ -19,7 +19,7 @@ In order to give the best results, a GPS constellation needs at least four compu
 constellation is redundant, but it does not cause problems.
 
 ## Building a GPS constellation
-<img alt="An example GPS constellation." src="/images/gps-constellation-example.png" class="big-image" />
+<img alt="An example GPS constellation." src="../images/gps-constellation-example.png" class="big-image" />
 
 We are going to build our GPS constellation as shown in the image above. You will need 4 computers and either 4 wireless
 modems or 4 ender modems. Try not to mix ender and wireless modems together as you might get some odd behavior when your

doc/guides/speaker_audio.md

@@ -131,7 +131,7 @@ different.
 First, we require the dfpwm module and call [`cc.audio.dfpwm.make_decoder`] to construct a new decoder. This decoder
 accepts blocks of DFPWM data and converts it to a list of 8-bit amplitudes, which we can then play with our speaker.
 
-As mentioned above, [`speaker.playAudio`] accepts at most 128×1024 samples in one go. DFPMW uses a single bit for each
+As mentioned above, [`speaker.playAudio`] accepts at most 128×1024 samples in one go. DFPWM uses a single bit for each
 sample, which means we want to process our audio in chunks of 16×1024 bytes (16KiB). In order to do this, we use
 [`io.lines`], which provides a nice way to loop over chunks of a file. You can of course just use [`fs.open`] and
 [`fs.ReadHandle.read`] if you prefer.

doc/index.md

@@ -4,7 +4,14 @@ SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers
 SPDX-License-Identifier: MPL-2.0
 -->
 
-# ![CC: Tweaked](logo.png)
+<h1>
+    <picture>
+        <source media="(prefers-color-scheme: dark)" srcset="logo-darkmode.png">
+        <source media="(prefers-color-scheme: light)" srcset="logo.png">
+        <img alt="CC: Tweaked" src="logo.png">
+    </picture>
+</h1>
+
 CC: Tweaked is a mod for Minecraft which adds programmable computers, turtles and more to the game. A fork of the
 much-beloved [ComputerCraft], it continues its legacy with improved performance and stability, along with a wealth of
 new features.
@@ -38,7 +45,7 @@ little daunting getting started. Thankfully, there's several fantastic tutorials
 
  - [Direwolf20's ComputerCraft tutorials](https://www.youtube.com/watch?v=wrUHUhfCY5A "ComputerCraft Tutorial Episode 1 - HELP! and Hello World")
  - [Sethbling's ComputerCraft series](https://www.youtube.com/watch?v=DSsx4VSe-Uk "Programming Tutorial with Minecraft Turtles -- Ep. 1: Intro to Turtles and If-Then-Else_End")
- - [Lyqyd's Computer Basics 1](http://www.computercraft.info/forums2/index.php?/topic/15033-computer-basics-i/ "Computer Basics I")
+ - [Lyqyd's Computer Basics 1](https://ccf.squiddev.cc/forums2/index.php?/topic/15033-computer-basics-i/ "Computer Basics I")
 
 Once you're a little more familiar with the mod, the sidebar and links below provide more detailed documentation on the
 various APIs and peripherals provided by the mod.

doc/mod-page.md

@@ -45,7 +45,7 @@ little daunting getting started. Thankfully, there's several fantastic tutorials
 
  - [Direwolf20's ComputerCraft tutorials](https://www.youtube.com/watch?v=wrUHUhfCY5A "ComputerCraft Tutorial Episode 1 - HELP! and Hello World")
  - [Sethbling's ComputerCraft series](https://www.youtube.com/watch?v=DSsx4VSe-Uk "Programming Tutorial with Minecraft Turtles -- Ep. 1: Intro to Turtles and If-Then-Else_End")
- - [Lyqyd's Computer Basics 1](http://www.computercraft.info/forums2/index.php?/topic/15033-computer-basics-i/ "Computer Basics I")
+ - [Lyqyd's Computer Basics 1](https://ccf.squiddev.cc/forums2/index.php?/topic/15033-computer-basics-i/ "Computer Basics I")
 
 Once you're a little more familiar with the mod, the [wiki](https://tweaked.cc/) provides more detailed documentation on the
 various APIs and peripherals provided by the mod.

doc/reference/breaking_changes.md

@@ -25,13 +25,13 @@ as documentation for breaking changes and "gotchas" one should look out for betw
 
  - Update to Lua 5.2:
    - Support for Lua 5.0's pseudo-argument `arg` has been removed. You should always use `...` for varargs.
-   - Environments are no longer baked into the runtime, and instead use the `_ENV` local or upvalue. `getfenv`/`setfenv`
-     now only work on Lua functions with an `_ENV` upvalue. `getfenv` will return the global environment when called
-     with other functions, and `setfenv` will have no effect.
-   - `load`/`loadstring` defaults to using the global environment (`_G`) rather than the current coroutine's
+   - Environments are no longer baked into the runtime, and instead use the `_ENV` local or upvalue. [`getfenv`]/[`setfenv`]
+     now only work on Lua functions with an `_ENV` upvalue. [`getfenv`] will return the global environment when called
+     with other functions, and [`setfenv`] will have no effect.
+   - [`load`]/[`loadstring`] defaults to using the global environment (`_G`) rather than the current coroutine's
      environment.
-   - Support for dumping functions (`string.dump`) and loading binary chunks has been removed.
-   - `math.random` now uses Lua 5.4's random number generator.
+   - Support for dumping functions ([`string.dump`]) and loading binary chunks has been removed.
+   - [`math.random`] now uses Lua 5.4's random number generator.
 
  - File handles, HTTP requests and websockets now always use the original bytes rather than encoding/decoding to UTF-8.
 
@@ -44,7 +44,7 @@ as documentation for breaking changes and "gotchas" one should look out for betw
    `keys.enter` constant was queued when the key was pressed)
 
  - Minecraft 1.13 removed the concept of item damage and block metadata (see ["The Flattening"][flattening]). As a
-   result `turtle.inspect` no longer provides block metadata, and `turtle.getItemDetail` no longer provides damage.
+   result [`turtle.inspect`] no longer provides block metadata, and [`turtle.getItemDetail`] no longer provides damage.
 
    - Block states (`turtle.inspect().state`) should provide all the same information as block metadata, but in a much
      more understandable format.
@@ -70,12 +70,12 @@ as documentation for breaking changes and "gotchas" one should look out for betw
  - Unlabelled computers and turtles now keep their ID when broken, meaning that unlabelled computers/items do not stack.
 
 ## ComputerCraft 1.80pr1 {#cc-1.80}
- - Programs run via `shell.run` are now started in their own isolated environment. This means globals set by programs
+ - Programs run via [`shell.run`] are now started in their own isolated environment. This means globals set by programs
    will not be accessible outside of this program.
 
  - Programs containing `/` are looked up in the current directory and are no longer looked up on the path. For instance,
    you can no longer type `turtle/excavate` to run `/rom/programs/turtle/excavate.lua`.
 
 [flattening]: https://minecraft.wiki/w/Java_Edition_1.13/Flattening
-[legal_data_pack]: https://minecraft.gamepedia.com/Tutorials/Creating_a_data_pack#Legal_characters
+[legal_data_pack]: https://minecraft.wiki/w/Tutorials/Creating_a_data_pack#Legal_characters
 [datapack-example]: https://github.com/cc-tweaked/datapack-example "An example datapack for CC: Tweaked"

doc/reference/command.md

@@ -0,0 +1,140 @@
+---
+module: [kind=reference] computercraft_command
+---
+
+<!--
+SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
+
+SPDX-License-Identifier: MPL-2.0
+-->
+
+# The `/computercraft` command
+CC: Tweaked provides a `/computercraft` command for server owners to manage running computers on a server.
+
+## Permissions {#permissions}
+As the `/computercraft` command is mostly intended for debugging and administrative purposes, its sub-commands typically
+require you to have op (or similar).
+
+ - All players have access to the [`queue`] sub-command.
+ - On a multi-player server, all other commands require op.
+ - On a single-player world, the player can run the [`dump`], [`turn-on`]/[`shutdown`], and [`track`] sub-commands, even
+   when cheats are not enabled. The [`tp`] and [`view`] commands require cheats.
+
+If a permission mod such as [LuckPerms] is installed[^permission], you can configure access to the individual
+sub-commands. Each sub-command creates a `computercraft.command.NAME` permission node to control which players can
+execute it.
+
+[LuckPerms]: https://github.com/LuckPerms/LuckPerms/ "A permissions plugin for Minecraft servers."
+[fabric-permission-api]: https://github.com/lucko/fabric-permissions-api "A simple permissions API for Fabric"
+
+[^permission]: This supports any mod which uses Forge's permission API or [fabric-permission-api].
+
+## Computer selectors {#computer-selectors}
+Some commands (such as [`tp`] or [`turn-on`]) target a specific computer, or a list of computers. To specify which
+computers to operate on, you must use "computer selectors".
+
+Computer selectors are similar to Minecraft's [entity target selectors], but targeting computers instead. They allow
+you to select one or more computers, based on a set of predicates.
+
+The following predicates are supported:
+ - `id=<id>`: Select computer(s) with a specific id.
+ - `instance=<id>`: Select the computer with the given instance id.
+ - `family=<normal|advanced|command>`: Select computers based on their type.
+ - `label=<label>`: Select computers with the given label.
+ - `distance=<distance>`: Select computers within a specific distance of the player executing the command. This uses
+   Minecraft's [float range] syntax.
+
+`#<id>` may also be used as a shorthand for `@c[id=<id>]`, to select computer(s) with a specific id.
+
+### Examples:
+ - `/computercraft turn-on #12`: Turn on the computer(s) with an id of 12.
+ - `/computercraft shutdown @c[distance=..100]`: Shut down all computers with 100 blocks of the player.
+
+[entity target selectors]: https://minecraft.wiki/w/Target_selectors "Target Selectors on the Minecraft wiki"
+[Float range]: https://minecraft.wiki/w/Argument_types#minecraft:float_range
+
+## Commands {#commands}
+### `/computercraft dump` {#dump}
+`/computercraft dump` prints a table of currently loaded computers, including their id, position, and whether they're
+running. It can also be run with a single computer argument to dump more detailed information about a computer.
+
+![A screenshot of a Minecraft world. In the chat box, there is a table listing 5 computers, with columns labelled
+"Computer", "On" and "Position". Below that, is a more detailed list of information about Computer 0, including its
+label ("My computer") and that it has a monitor on the right hand side](../images/computercraft-dump.png "An example of
+running '/computercraft dump'")
+
+Next to the computer id, there are several buttons to either [teleport][`tp`] to the computer, or [open its terminal
+][`view`].
+
+ Computers are sorted by distance to the player, so nearby computers will appear earlier.
+
+### `/computercraft turn-on [computers...]` {#turn-on}
+Turn on one or more computers or, if no run with no arguments, all loaded computers.
+
+#### Examples
+ - `/computercraft turn-on #0 #2`: Turn on computers with id 0 and 2.
+ - `/computercraft turn-on @c[family=command]`: Turn on all command computers.
+
+### `/computercraft shutdown [computers...]` {#shutdown}
+Shutdown one or more computers or, if no run with no arguments, all loaded computers.
+
+This is sometimes useful when dealing with lag, as a way to ensure that ComputerCraft is not causing problems.
+
+#### Examples
+ - `/computercraft shutdown`: Shut down all loaded computers.
+ - `/computercraft shutdown @c[distance=..10]`: Shut down all computers in a block radius.
+
+### `/computercraft tp [computer]` {#tp}
+Teleport to the given computer.
+
+This is normally used from via the [`dump`] command interface rather than being invoked directly.
+
+### `/computercraft view [computer]` {#view}
+Open a terminal for the specified computer. This allows remotely viewing computers without having to interact with the
+block.
+
+This is normally used from via the [`dump`] command interface rather than being invoked directly.
+
+### `/computercraft track` {#track}
+The `/computercraft track` command allows you to enable profiling of computers. When a computer runs code, or interacts
+with the Minecraft world, we time how long that takes. This timing information may then be queried, and used to find
+computers which may be causing lag.
+
+To enable the profiler, run `/computercraft track start`. Computers will then start recording metrics. Once enough data
+has been gathered, run `/computercraft track stop` to stop profiling and display the recorded data.
+
+![](../images/computercraft-track.png)
+
+The table by default shows the number of times each computer has run, and how long it ran for (in total, and on
+average). In the above screenshot, we can see one computer was particularly badly behaved, and ran for 7 seconds. The
+buttons may be used to [teleport][`tp`] to the computer, or [open its terminal ][`view`], and inspect it further.
+
+`/computercraft track dump` can be used to display this table at any point (including while profiling is still running).
+
+Computers also record other information, such as how much server-thread time they consume, or their HTTP bandwidth
+usage. The `dump` subcommand accepts a list of other fields to display, instead of the default timings.
+
+#### Examples
+ - `/computercraft track dump server_tasks_count server_tasks`: Print the number of server-thread tasks each computer
+   executed, and how long they took in total.
+ - `/computercraft track dump http_upload http_download`: Print the number of bytes uploaded and downloaded by each
+   computer.
+
+
+### `/computercraft queue` {#queue}
+The queue subcommand allows non-operator players to queue a `computer_command` event on *command* computers.
+
+This has a similar purpose to vanilla's [`/trigger`] command. Command computers may choose to listen to this event, and
+then perform some action.
+
+[`/trigger`]: https://minecraft.wiki/w/Commands/trigger "/trigger on the Minecraft wiki"
+
+
+[`dump`]: #dump "/computercraft dump"
+[`queue`]: #queue "/computercraft queue"
+[`shutdown`]: #shutdown "/computercraft shutdown"
+[`tp`]: #tp "/computercraft tp"
+[`track`]: #track "/computercraft track"
+[`turn-on`]: #turn-on "/computercraft turn-on"
+[`view`]: #view "/computercraft view"
+[computer selectors]: #computer-selectors "Computer selectors"

gradle.properties

@@ -2,15 +2,17 @@
 #
 # SPDX-License-Identifier: MPL-2.0
 
-org.gradle.jvmargs=-Xmx3G
+org.gradle.jvmargs=-Xmx3G -Dfile.encoding=UTF-8
 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
-modVersion=1.109.5
+modVersion=1.111.1
 
 # Minecraft properties: We want to configure this here so we can read it in settings.gradle
-mcVersion=1.20.4
+mcVersion=1.21

gradle/libs.versions.toml

@@ -6,27 +6,27 @@
 
 # Minecraft
 # MC version is specified in gradle.properties, as we need that in settings.gradle.
-# Remember to update corresponding versions in fabric.mod.json/mods.toml
-fabric-api = "0.93.1+1.20.4"
-fabric-loader = "0.15.3"
-neoForge = "20.4.142-beta"
+# Remember to update corresponding versions in fabric.mod.json/neoforge.mods.toml
+fabric-api = "0.100.3+1.21"
+fabric-loader = "0.15.11"
+neoForge = "21.0.42-beta"
 neoForgeSpi = "8.0.1"
 mixin = "0.8.5"
-parchment = "2023.12.31"
-parchmentMc = "1.20.3"
-yarn = "1.20.4+build.3"
+parchment = "2024.06.16"
+parchmentMc = "1.20.6"
+yarn = "1.21+build.1"
 
 # Core dependencies (these versions are tied to the version Minecraft uses)
 fastutil = "8.5.12"
 guava = "32.1.2-jre"
 netty = "4.1.97.Final"
-slf4j = "2.0.7"
+slf4j = "2.0.9"
 
 # Core dependencies (independent of Minecraft)
 asm = "9.6"
 autoService = "1.1.1"
 checkerFramework = "3.42.0"
-cobalt = "0.9.0"
+cobalt = { strictly = "0.9.3" }
 commonsCli = "1.6.0"
 jetbrainsAnnotations = "24.1.0"
 jsr305 = "3.0.2"
@@ -36,41 +36,43 @@ kotlin-coroutines = "1.7.3"
 nightConfig = "3.6.7"
 
 # Minecraft mods
-emi = "1.0.30+1.20.4"
-fabricPermissions = "0.3.20230723"
+emi = "1.1.7+1.21"
+fabricPermissions = "0.3.1"
 iris = "1.6.14+1.20.4"
-jei = "16.0.0.28"
-modmenu = "9.0.0"
+jei = "19.0.0.1"
+modmenu = "11.0.0-rc.4"
 moreRed = "4.0.0.4"
 oculus = "1.2.5"
-rei = "14.0.688"
+rei = "16.0.729"
 rubidium = "0.6.1"
 sodium = "mc1.20-0.4.10"
+mixinExtra = "0.3.5"
 
 # Testing
 hamcrest = "2.2"
 jqwik = "1.8.2"
 junit = "5.10.1"
+jmh = "1.37"
 
 # Build tools
 cctJavadoc = "1.8.2"
-checkstyle = "10.12.6"
+checkstyle = "10.14.1"
 curseForgeGradle = "1.1.18"
-errorProne-core = "2.23.0"
+errorProne-core = "2.27.0"
 errorProne-plugin = "3.1.0"
-fabric-loom = "1.5.7"
+fabric-loom = "1.7.1"
 githubRelease = "2.5.2"
 gradleVersions = "0.50.0"
 ideaExt = "1.1.7"
-illuaminate = "0.1.0-44-g9ee0055"
+illuaminate = "0.1.0-73-g43ee16c"
 lwjgl = "3.3.3"
 minotaur = "2.8.7"
-neoGradle = "7.0.85"
-nullAway = "0.9.9"
+neoGradle = "7.0.152"
+nullAway = "0.10.25"
 spotless = "6.23.3"
 taskTree = "2.1.1"
-teavm = "0.10.0-SQUID.2"
-vanillaExtract = "0.1.1"
+teavm = "0.11.0-SQUID.1"
+vanillaExtract = "0.1.3"
 versionCatalogUpdate = "0.8.1"
 
 [libraries]
@@ -104,10 +106,11 @@ fabric-junit = { module = "net.fabricmc:fabric-loader-junit", version.ref = "fab
 fabricPermissions = { module = "me.lucko:fabric-permissions-api", version.ref = "fabricPermissions" }
 emi = { module = "dev.emi:emi-xplat-mojmap", version.ref = "emi" }
 iris = { module = "maven.modrinth:iris", version.ref = "iris" }
-jei-api = { module = "mezz.jei:jei-1.20.2-common-api", version.ref = "jei" }
-jei-fabric = { module = "mezz.jei:jei-1.20.2-fabric", version.ref = "jei" }
-jei-forge = { module = "mezz.jei:jei-1.20.2-forge", version.ref = "jei" }
+jei-api = { module = "mezz.jei:jei-1.21-common-api", version.ref = "jei" }
+jei-fabric = { module = "mezz.jei:jei-1.21-fabric", version.ref = "jei" }
+jei-forge = { module = "mezz.jei:jei-1.21-neoforge", 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 = "commoble.morered:morered-1.20.1", version.ref = "moreRed" }
 oculus = { module = "maven.modrinth:oculus", version.ref = "oculus" }
@@ -125,6 +128,8 @@ junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.re
 junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
 junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
 slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
+jmh = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
+jmh-processor = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
 
 # LWJGL
 lwjgl-bom = { module = "org.lwjgl:lwjgl-bom", version.ref = "lwjgl" }
@@ -149,6 +154,7 @@ neoGradle-userdev = { module = "net.neoforged.gradle:userdev", version.ref = "ne
 nullAway = { module = "com.uber.nullaway:nullaway", version.ref = "nullAway" }
 spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }
 teavm-classlib = { module = "org.teavm:teavm-classlib", version.ref = "teavm" }
+teavm-core = { module = "org.teavm:teavm-core", version.ref = "teavm" }
 teavm-jso = { module = "org.teavm:teavm-jso", version.ref = "teavm" }
 teavm-jso-apis = { module = "org.teavm:teavm-jso-apis", version.ref = "teavm" }
 teavm-jso-impl = { module = "org.teavm:teavm-jso-impl", version.ref = "teavm" }
@@ -173,9 +179,9 @@ kotlin = ["kotlin-stdlib", "kotlin-coroutines"]
 # Minecraft
 externalMods-common = ["jei-api", "nightConfig-core", "nightConfig-toml"]
 externalMods-forge-compile = ["moreRed", "oculus", "jei-api"]
-externalMods-forge-runtime = []
+externalMods-forge-runtime = ["jei-forge"]
 externalMods-fabric-compile = ["fabricPermissions", "iris", "jei-api", "rei-api", "rei-builtin"]
-externalMods-fabric-runtime = []
+externalMods-fabric-runtime = ["jei-fabric", "modmenu"]
 
 # Testing
 test = ["junit-jupiter-api", "junit-jupiter-params", "hamcrest", "jqwik-api"]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

illuaminate.sexp

@@ -105,6 +105,10 @@
    /projects/core/src/main/resources/data/computercraft/lua/rom/apis/turtle/turtle.lua)
   (linters -var:deprecated))
 
+;; Suppress unused variable warnings in the parser.
+(at /projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/internal/syntax/parser.lua
+  (linters -var:unused))
+
 (at /projects/core/src/test/resources/test-rom
   ; We should still be able to test deprecated members.
   (linters -var:deprecated)

projects/common-api/build.gradle.kts

@@ -21,4 +21,16 @@ tasks.javadoc {
 
     // 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/ModelLocation.java

@@ -0,0 +1,84 @@
+// SPDX-FileCopyrightText: 2024 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.impl.client.ClientPlatformHelper;
+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.Nullable;
+
+import java.util.stream.Stream;
+
+/**
+ * The location of a model to load. This may either be:
+ *
+ * <ul>
+ *     <li>A {@link ModelResourceLocation}, referencing an already baked model (such as {@code minecraft:dirt#inventory}).</li>
+ *     <li>
+ *         A {@link ResourceLocation}, referencing a path to a model resource (such as {@code minecraft:item/dirt}.
+ *         These models will be baked and stored in the {@link ModelManager} in a loader-specific way.
+ *     </li>
+ * </ul>
+ */
+public final class ModelLocation {
+    /**
+     * The location of the model.
+     * <p>
+     * When {@link #resourceLocation} is null, this is the location of the model to load. When {@link #resourceLocation}
+     * is non-null, this is the "standalone" variant of the model resource — this is used by NeoForge's implementation
+     * of {@link ClientPlatformHelper#getModel(ModelManager, ModelResourceLocation, ResourceLocation)} to fetch the
+     * model from the model manger. It is not used on Fabric.
+     */
+    private final ModelResourceLocation modelLocation;
+    private final @Nullable ResourceLocation resourceLocation;
+
+    private ModelLocation(ModelResourceLocation modelLocation, @Nullable ResourceLocation resourceLocation) {
+        this.modelLocation = modelLocation;
+        this.resourceLocation = resourceLocation;
+    }
+
+    /**
+     * Create a {@link ModelLocation} from model in the model manager.
+     *
+     * @param location The name of the model to load.
+     * @return The new {@link ModelLocation} instance.
+     */
+    public static ModelLocation ofModel(ModelResourceLocation location) {
+        return new ModelLocation(location, null);
+    }
+
+    /**
+     * Create a {@link ModelLocation} from a resource.
+     *
+     * @param location The location of the model resource, such as {@code minecraft:item/dirt}.
+     * @return The new {@link ModelLocation} instance.
+     */
+    public static ModelLocation ofResource(ResourceLocation location) {
+        return new ModelLocation(new ModelResourceLocation(location, "standalone"), location);
+    }
+
+    /**
+     * Get this model from the provided model manager.
+     *
+     * @param manager The model manger.
+     * @return This model, or the missing model if it could not be found.
+     */
+    public BakedModel getModel(ModelManager manager) {
+        return ClientPlatformHelper.get().getModel(manager, modelLocation, resourceLocation);
+    }
+
+    /**
+     * Get the models this model location depends on.
+     *
+     * @return A list of models that this model location depends on.
+     * @see TurtleUpgradeModeller#getDependencies()
+     */
+    public Stream<ResourceLocation> getDependencies() {
+        return resourceLocation == null ? Stream.empty() : Stream.of(resourceLocation);
+    }
+}

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

@@ -13,30 +13,47 @@ 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.
+ *
+ * @param model  The model.
+ * @param matrix The transformation matrix.
  */
-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 record TransformedModel(BakedModel model, Transformation matrix) {
     public TransformedModel(BakedModel model) {
-        this.model = Objects.requireNonNull(model);
-        matrix = Transformation.identity();
+        this(model, Transformation.identity());
     }
 
+    /**
+     * Look up a model in the model bakery and construct a {@link TransformedModel} with no transformation.
+     *
+     * @param location The location of the model to load.
+     * @return The new {@link TransformedModel} instance.
+     */
+    public static TransformedModel of(ModelLocation location) {
+        var modelManager = Minecraft.getInstance().getModelManager();
+        return new TransformedModel(location.getModel(modelManager));
+    }
+
+    /**
+     * Look up a model in the model bakery and construct a {@link TransformedModel} with no transformation.
+     *
+     * @param location The location of the model to load.
+     * @return The new {@link TransformedModel} instance.
+     * @see ModelLocation#ofModel(ModelResourceLocation)
+     */
     public static TransformedModel of(ModelResourceLocation location) {
         var modelManager = Minecraft.getInstance().getModelManager();
         return new TransformedModel(modelManager.getModel(location));
     }
 
+    /**
+     * Look up a model in the model bakery and construct a {@link TransformedModel} with no transformation.
+     *
+     * @param location The location of the model to load.
+     * @return The new {@link TransformedModel} instance.
+     * @see ModelLocation#ofResource(ResourceLocation)
+     */
     public static TransformedModel of(ResourceLocation location) {
         var modelManager = Minecraft.getInstance().getModelManager();
         return new TransformedModel(ClientPlatformHelper.get().getModel(modelManager, location));
@@ -46,12 +63,4 @@ public final class TransformedModel {
         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/RegisterTurtleUpgradeModeller.java

@@ -5,7 +5,7 @@
 package dan200.computercraft.api.client.turtle;
 
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import dan200.computercraft.api.upgrades.UpgradeSerialiser;
+import dan200.computercraft.api.upgrades.UpgradeType;
 
 /**
  * A functional interface to register a {@link TurtleUpgradeModeller} for a class of turtle upgrades.
@@ -18,9 +18,9 @@ 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.
+     * @param type     The turtle upgrade type.
+     * @param modeller The upgrade modeller.
+     * @param <T>      The type of the turtle upgrade.
      */
-    <T extends ITurtleUpgrade> void register(UpgradeSerialiser<T> serialiser, TurtleUpgradeModeller<T> modeller);
+    <T extends ITurtleUpgrade> void register(UpgradeType<T> type, TurtleUpgradeModeller<T> modeller);
 }

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

@@ -4,17 +4,17 @@
 
 package dan200.computercraft.api.client.turtle;
 
+import dan200.computercraft.api.client.ModelLocation;
 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.UnbakedModel;
-import net.minecraft.nbt.CompoundTag;
+import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.resources.ResourceLocation;
 
 import javax.annotation.Nullable;
-import java.util.Collection;
-import java.util.List;
+import java.util.stream.Stream;
 
 /**
  * Provides models for a {@link ITurtleUpgrade}.
@@ -38,24 +38,24 @@ public interface TurtleUpgradeModeller<T extends ITurtleUpgrade> {
      * @param data    Upgrade data instance for current turtle side.
      * @return The model that you wish to be used to render your upgrade.
      */
-    TransformedModel getModel(T upgrade, @Nullable ITurtleAccess turtle, TurtleSide side, CompoundTag data);
+    TransformedModel getModel(T upgrade, @Nullable ITurtleAccess turtle, TurtleSide side, DataComponentPatch data);
 
     /**
-     * Get a list of models that this turtle modeller depends on.
+     * Get the 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
+     * Models included in this stream 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();
+    default Stream<ResourceLocation> getDependencies() {
+        return Stream.of();
     }
 
     /**
-     * A basic {@link TurtleUpgradeModeller} which renders using the upgrade's {@linkplain ITurtleUpgrade#getUpgradeItem(CompoundTag)}
+     * A basic {@link TurtleUpgradeModeller} which renders using 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}
@@ -78,15 +78,27 @@ public interface TurtleUpgradeModeller<T extends ITurtleUpgrade> {
      * @return The constructed modeller.
      */
     static <T extends ITurtleUpgrade> TurtleUpgradeModeller<T> sided(ResourceLocation left, ResourceLocation right) {
+        return sided(ModelLocation.ofResource(left), ModelLocation.ofResource(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(ModelLocation left, ModelLocation right) {
         return new TurtleUpgradeModeller<>() {
             @Override
-            public TransformedModel getModel(T upgrade, @Nullable ITurtleAccess turtle, TurtleSide side, CompoundTag data) {
+            public TransformedModel getModel(T upgrade, @Nullable ITurtleAccess turtle, TurtleSide side, DataComponentPatch data) {
                 return TransformedModel.of(side == TurtleSide.LEFT ? left : right);
             }
 
             @Override
-            public Collection<ResourceLocation> getDependencies() {
-                return List.of(left, right);
+            public Stream<ResourceLocation> getDependencies() {
+                return Stream.of(left, right).flatMap(ModelLocation::getDependencies);
             }
         };
     }

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

@@ -11,7 +11,7 @@ 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.core.component.DataComponentPatch;
 import org.joml.Matrix4f;
 
 import javax.annotation.Nullable;
@@ -36,7 +36,7 @@ final class TurtleUpgradeModellers {
 
     private static final class UpgradeItemModeller implements TurtleUpgradeModeller<ITurtleUpgrade> {
         @Override
-        public TransformedModel getModel(ITurtleUpgrade upgrade, @Nullable ITurtleAccess turtle, TurtleSide side, CompoundTag data) {
+        public TransformedModel getModel(ITurtleUpgrade upgrade, @Nullable ITurtleAccess turtle, TurtleSide side, DataComponentPatch data) {
             var stack = upgrade.getUpgradeItem(data);
             var model = Minecraft.getInstance().getItemRenderer().getItemModelShaper().getItemModel(stack);
             if (stack.hasFoil()) model = ClientPlatformHelper.get().createdFoiledModel(model);

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

@@ -4,6 +4,7 @@
 
 package dan200.computercraft.impl.client;
 
+import dan200.computercraft.api.client.ModelLocation;
 import dan200.computercraft.impl.Services;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.resources.model.BakedModel;
@@ -17,13 +18,28 @@ import javax.annotation.Nullable;
 @ApiStatus.Internal
 public interface ClientPlatformHelper {
     /**
-     * Equivalent to {@link ModelManager#getModel(ModelResourceLocation)} but for arbitrary {@link ResourceLocation}s.
+     * Get a model from a resource.
      *
-     * @param manager  The model manager.
-     * @param location The model location.
+     * @param manager          The model manager.
+     * @param resourceLocation The model resourceLocation.
      * @return The baked model.
+     * @see ModelLocation
      */
-    BakedModel getModel(ModelManager manager, ResourceLocation location);
+    BakedModel getModel(ModelManager manager, ResourceLocation resourceLocation);
+
+    /**
+     * Set a model from a {@link ModelResourceLocation} or {@link ResourceLocation}.
+     * <p>
+     * This is largely equivalent to {@code resourceLocation == null ? manager.getModel(modelLocation) : getModel(manager, resourceLocation)},
+     * but allows pre-computing {@code modelLocation} (if needed).
+     *
+     * @param manager          The model manager.
+     * @param modelLocation    The location of the model to load.
+     * @param resourceLocation The location of the resource, if trying to load from a resource.
+     * @return The baked model.
+     * @see ModelLocation
+     */
+    BakedModel getModel(ModelManager manager, ModelResourceLocation modelLocation, @Nullable ResourceLocation resourceLocation);
 
     /**
      * Wrap this model in a version which renders a foil/enchantment glint.

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

@@ -6,10 +6,12 @@ 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;
@@ -35,8 +37,16 @@ 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, new ResourceLocation(ComputerCraftAPI.MOD_ID, name));
+            return TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, name));
         }
     }
 
@@ -75,13 +85,13 @@ public class ComputerCraftTags {
         public static final TagKey<Block> TURTLE_HOE_BREAKABLE = make("turtle_hoe_harvestable");
 
         /**
-         * Block which can be {@linkplain BlockState#use(Level, Player, InteractionHand, BlockHitResult) used} when
-         * calling {@code turtle.place()}.
+         * Block which can be {@linkplain BlockState#useItemOn(ItemStack, 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, new ResourceLocation(ComputerCraftAPI.MOD_ID, name));
+            return TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, name));
         }
     }
 }

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

@@ -7,11 +7,13 @@ 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 javax.annotation.Nullable;
 
@@ -25,11 +27,12 @@ public interface IMedia {
     /**
      * Get a string representing the label of this item. Will be called via {@code disk.getLabel()} in lua.
      *
-     * @param stack The {@link ItemStack} to inspect.
+     * @param registries The currently loaded registries.
+     * @param stack      The {@link ItemStack} to inspect.
      * @return The label. ie: "Dan's Programs".
      */
     @Nullable
-    String getLabel(ItemStack stack);
+    String getLabel(HolderLookup.Provider registries, ItemStack stack);
 
     /**
      * Set a string representing the label of this item. Will be called vi {@code disk.setLabel()} in lua.
@@ -43,26 +46,15 @@ public interface IMedia {
     }
 
     /**
-     * If this disk represents an item with audio (like a record), get the readable name of the audio track. ie:
-     * "Jonathan Coulton - Still Alive"
+     * If this disk represents an item with audio (like a record), get the corresponding {@link JukeboxSong}.
      *
-     * @param stack The {@link ItemStack} to modify.
-     * @return The name, or null if this item does not represent an item with audio.
+     * @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.
      */
     @Nullable
-    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;
+    default Holder<JukeboxSong> getAudio(HolderLookup.Provider registries, ItemStack stack) {
+        return JukeboxSong.fromStack(registries, stack).orElse(null);
     }
 
     /**

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

@@ -1,82 +0,0 @@
-// 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 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()
- */
-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)
-     */
-    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)
-     */
-    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()
-     */
-    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)
-     */
-    void updatePeripherals(WiredNode node, Map<String, IPeripheral> peripherals);
-}

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

@@ -6,11 +6,12 @@ package dan200.computercraft.api.network.wired;
 
 import dan200.computercraft.api.network.PacketNetwork;
 import dan200.computercraft.api.peripheral.IPeripheral;
+import org.jetbrains.annotations.ApiStatus;
 
 import java.util.Map;
 
 /**
- * Wired nodes act as a layer between {@link WiredElement}s and {@link WiredNetwork}s.
+ * A single node on a wired network.
  * <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.
@@ -22,6 +23,7 @@ import java.util.Map;
  * Wired nodes also provide several convenience methods for interacting with a wired network. These should only ever
  * be used on the main server thread.
  */
+@ApiStatus.NonExtendable
 public interface WiredNode extends PacketNetwork {
     /**
      * The associated element for this network node.
@@ -30,16 +32,6 @@ 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.
-     */
-    WiredNetwork getNetwork();
-
     /**
      * Create a connection from this node to another.
      * <p>
@@ -47,12 +39,9 @@ public interface WiredNode extends PacketNetwork {
      *
      * @param node The other node to connect to.
      * @return {@code true} if a connection was created or {@code false} if the connection already exists.
-     * @see WiredNetwork#connect(WiredNode, WiredNode)
      * @see WiredNode#disconnectFrom(WiredNode)
      */
-    default boolean connectTo(WiredNode node) {
-        return getNetwork().connect(this, node);
-    }
+    boolean connectTo(WiredNode node);
 
     /**
      * Destroy a connection between this node and another.
@@ -61,13 +50,9 @@ public interface WiredNode extends PacketNetwork {
      *
      * @param node The other node to disconnect from.
      * @return {@code true} if a connection was destroyed or {@code false} if no connection exists.
-     * @throws IllegalArgumentException If {@code node} is not on the same network.
-     * @see WiredNetwork#disconnect(WiredNode, WiredNode)
      * @see WiredNode#connectTo(WiredNode)
      */
-    default boolean disconnectFrom(WiredNode node) {
-        return getNetwork().disconnect(this, node);
-    }
+    boolean disconnectFrom(WiredNode node);
 
     /**
      * Sever all connections this node has, removing it from this network.
@@ -78,11 +63,8 @@ public interface WiredNode extends PacketNetwork {
      * @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 WiredNetwork#remove(WiredNode)
      */
-    default boolean remove() {
-        return getNetwork().remove(this);
-    }
+    boolean remove();
 
     /**
      * Mark this node's peripherals as having changed.
@@ -91,9 +73,6 @@ public interface WiredNode extends PacketNetwork {
      * that your network element owns.
      *
      * @param peripherals The new peripherals for this node.
-     * @see WiredNetwork#updatePeripherals(WiredNode, Map)
      */
-    default void updatePeripherals(Map<String, IPeripheral> peripherals) {
-        getNetwork().updatePeripherals(this, peripherals);
-    }
+    void updatePeripherals(Map<String, IPeripheral> peripherals);
 }

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

@@ -8,10 +8,12 @@ import dan200.computercraft.api.network.PacketSender;
 
 
 /**
- * An object on a {@link WiredNetwork} capable of sending packets.
+ * An object on a wired network 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,8 +4,7 @@
 
 package dan200.computercraft.api.pocket;
 
-import dan200.computercraft.api.upgrades.UpgradeBase;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ItemStack;
 
 
@@ -15,27 +14,20 @@ 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 ResourceLocation id;
-    private final String adjective;
+    private final Component adjective;
     private final ItemStack stack;
 
-    protected AbstractPocketUpgrade(ResourceLocation id, String adjective, ItemStack stack) {
-        this.id = id;
+    protected AbstractPocketUpgrade(Component adjective, ItemStack stack) {
         this.adjective = adjective;
         this.stack = stack;
     }
 
-    protected AbstractPocketUpgrade(ResourceLocation id, ItemStack stack) {
-        this(id, UpgradeBase.getDefaultAdjective(id), stack);
+    protected AbstractPocketUpgrade(String adjective, ItemStack stack) {
+        this(Component.translatable(adjective), stack);
     }
 
     @Override
-    public final ResourceLocation getUpgradeID() {
-        return id;
-    }
-
-    @Override
-    public final String getUnlocalisedAdjective() {
+    public final Component getAdjective() {
         return adjective;
     }
 

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

@@ -5,7 +5,7 @@
 package dan200.computercraft.api.pocket;
 
 import dan200.computercraft.api.upgrades.UpgradeBase;
-import net.minecraft.nbt.CompoundTag;
+import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.item.ItemStack;
 
@@ -67,18 +67,19 @@ public interface IPocketAccess {
      * This is persisted between computer reboots and chunk loads.
      *
      * @return The upgrade's NBT.
-     * @see #updateUpgradeNBTData()
-     * @see UpgradeBase#getUpgradeItem(CompoundTag)
+     * @see #setUpgradeData(DataComponentPatch)
+     * @see UpgradeBase#getUpgradeItem(DataComponentPatch)
      * @see UpgradeBase#getUpgradeData(ItemStack)
      */
-    CompoundTag getUpgradeNBTData();
+    DataComponentPatch getUpgradeData();
 
     /**
-     * Mark the upgrade-specific NBT as dirty.
+     * Update the upgrade-specific data.
      *
-     * @see #getUpgradeNBTData()
+     * @param data The new upgrade data.
+     * @see #getUpgradeData()
      */
-    void updateUpgradeNBTData();
+    void setUpgradeData(DataComponentPatch data);
 
     /**
      * Remove the current peripheral and create a new one.

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

@@ -4,12 +4,14 @@
 
 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.UpgradeSerialiser;
+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.world.level.Level;
 
 import javax.annotation.Nullable;
@@ -18,45 +20,53 @@ import javax.annotation.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 UpgradeSerialiser} instance, which are then registered in a registry.
+ * {@link UpgradeType} instance, which are then registered in a 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. It is recommended this is done via {@linkplain PocketUpgradeDataProvider data
- * generators}.
+ * the upgrade automatically registered. It is recommended this is done via
+ * <a href="../upgrades/UpgradeType.html#datagen">data generators</a>.
  *
  * <h2>Example</h2>
- * <pre>{@code
- * // We use Forge's DeferredRegister to register our serialiser. Fabric mods may register their serialiser directly.
- * static final DeferredRegister<UpgradeSerialiser<? extends IPocketUpgrade>> SERIALISERS = DeferredRegister.create(IPocketUpgrade.serialiserRegistryKey(), "my_mod");
+ * {@snippet lang="java" :
+ * // We use Forge's DeferredRegister to register our upgrade type. Fabric mods may register their type directly.
+ * static final DeferredRegister<UpgradeType<? extends IPocketUpgrade>> POCKET_UPGRADES = DeferredRegister.create(IPocketUpgrade.typeRegistry(), "my_mod");
  *
- * // Register a new upgrade serialiser called "my_upgrade".
- * public static final RegistryObject<UpgradeSerialiser<MyUpgrade>> MY_UPGRADE =
- *     SERIALISERS.register("my_upgrade", () -> UpgradeSerialiser.simple(MyUpgrade::new));
+ * // Register a new upgrade upgrade type called "my_upgrade".
+ * public static final RegistryObject<UpgradeType<MyUpgrade>> MY_UPGRADE =
+ *     POCKET_UPGRADES.register("my_upgrade", () -> UpgradeType.simple(new MyUpgrade()));
  *
  * // Then in your constructor
- * SERIALISERS.register(bus);
- * }</pre>
+ * POCKET_UPGRADES.register(bus);
+ * }
  * <p>
  * We can then define a new upgrade using JSON by placing the following in
- * {@code data/<my_mod>/computercraft/pocket_upgrades/<my_upgrade_id>.json}.
- * <pre>{@code
+ * {@code data/<my_mod>/computercraft/pocket_upgrade/<my_upgrade_id>.json}.
+ * {@snippet lang="json" :
  * {
- *     "type": my_mod:my_upgrade",
+ *     "type": "my_mod:my_upgrade"
+ * }
  * }
- * }</pre>
- * <p>
- * {@link PocketUpgradeDataProvider} provides a data provider to aid with generating these JSON files.
  */
 public interface IPocketUpgrade extends UpgradeBase {
+    ResourceKey<Registry<IPocketUpgrade>> REGISTRY = ResourceKey.createRegistryKey(ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "pocket_upgrade"));
+
     /**
-     * The registry key for upgrade serialisers.
+     * The registry key for pocket upgrade types.
      *
      * @return The registry key.
      */
-    static ResourceKey<Registry<UpgradeSerialiser<? extends IPocketUpgrade>>> serialiserRegistryKey() {
+    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>

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

@@ -1,28 +0,0 @@
-// 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 dan200.computercraft.api.upgrades.UpgradeSerialiser;
-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 IPocketUpgrade
- * @see UpgradeSerialiser
- */
-public abstract class PocketUpgradeDataProvider extends UpgradeDataProvider<IPocketUpgrade> {
-    public PocketUpgradeDataProvider(PackOutput output) {
-        super(output, "Pocket Computer Upgrades", "computercraft/pocket_upgrades", IPocketUpgrade.serialiserRegistryKey());
-    }
-}

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

@@ -4,8 +4,7 @@
 
 package dan200.computercraft.api.turtle;
 
-import dan200.computercraft.api.upgrades.UpgradeBase;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ItemStack;
 
 
@@ -15,34 +14,27 @@ 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 String adjective;
+    private final Component adjective;
     private final ItemStack stack;
 
-    protected AbstractTurtleUpgrade(ResourceLocation id, TurtleUpgradeType type, String adjective, ItemStack stack) {
-        this.id = id;
+    protected AbstractTurtleUpgrade(TurtleUpgradeType type, Component adjective, ItemStack stack) {
         this.type = type;
         this.adjective = adjective;
         this.stack = stack;
     }
 
-    protected AbstractTurtleUpgrade(ResourceLocation id, TurtleUpgradeType type, ItemStack stack) {
-        this(id, type, UpgradeBase.getDefaultAdjective(id), stack);
+    protected AbstractTurtleUpgrade(TurtleUpgradeType type, String adjective, ItemStack stack) {
+        this(type, Component.translatable(adjective), stack);
     }
 
     @Override
-    public final ResourceLocation getUpgradeID() {
-        return id;
-    }
-
-    @Override
-    public final String getUnlocalisedAdjective() {
+    public final Component getAdjective() {
         return adjective;
     }
 
     @Override
-    public final TurtleUpgradeType getType() {
+    public final TurtleUpgradeType getUpgradeType() {
         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.nbt.CompoundTag;
+import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.world.Container;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
@@ -229,37 +229,22 @@ 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 #setUpgradeWithData(TurtleSide, UpgradeData)
+     * @see #setUpgrade(TurtleSide, UpgradeData)
      */
     @Nullable
     ITurtleUpgrade getUpgrade(TurtleSide side);
 
     /**
-     * Returns the upgrade on the specified side of the turtle, along with its {@linkplain #getUpgradeNBTData(TurtleSide)
+     * Returns the upgrade on the specified side of the turtle, along with its {@linkplain #getUpgradeData(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 #setUpgradeWithData(TurtleSide, UpgradeData)
+     * @see #setUpgrade(TurtleSide, UpgradeData)
      */
-    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));
-    }
+    @Nullable
+    UpgradeData<ITurtleUpgrade> getUpgradeWithData(TurtleSide side);
 
     /**
      * Set the upgrade for a given side and its upgrade data.
@@ -268,7 +253,7 @@ public interface ITurtleAccess {
      * @param upgrade The upgrade to set, may be {@code null} to clear.
      * @see #getUpgradeWithData(TurtleSide)
      */
-    void setUpgradeWithData(TurtleSide side, @Nullable UpgradeData<ITurtleUpgrade> upgrade);
+    void setUpgrade(TurtleSide side, @Nullable UpgradeData<ITurtleUpgrade> upgrade);
 
     /**
      * Returns the peripheral created by the upgrade on the specified side of the turtle, if there is one.
@@ -282,23 +267,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 must
-     * call {@link #updateUpgradeNBTData(TurtleSide)} after modifying it.
+     * 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.
      *
      * @param side The side to get the upgrade data for.
      * @return The upgrade-specific data.
-     * @see #updateUpgradeNBTData(TurtleSide)
-     * @see UpgradeBase#getUpgradeItem(CompoundTag)
+     * @see #setUpgradeData(TurtleSide, DataComponentPatch)
+     * @see UpgradeBase#getUpgradeItem(DataComponentPatch)
      * @see UpgradeBase#getUpgradeData(ItemStack)
      */
-    CompoundTag getUpgradeNBTData(TurtleSide side);
+    DataComponentPatch getUpgradeData(TurtleSide side);
 
     /**
-     * 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.
+     * Update the upgrade-specific data.
      *
-     * @param side The side to mark dirty.
-     * @see #updateUpgradeNBTData(TurtleSide)
+     * @param side The side to set the upgrade data for.
+     * @param data The new upgrade data.
+     * @see #getUpgradeData(TurtleSide)
      */
-    void updateUpgradeNBTData(TurtleSide side);
+    void setUpgradeData(TurtleSide side, DataComponentPatch data);
 }

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

@@ -4,14 +4,16 @@
 
 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.UpgradeSerialiser;
+import dan200.computercraft.api.upgrades.UpgradeType;
 import dan200.computercraft.impl.ComputerCraftAPIService;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Registry;
-import net.minecraft.nbt.CompoundTag;
+import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
 
 import javax.annotation.Nullable;
 
@@ -20,61 +22,79 @@ import javax.annotation.Nullable;
  * peripheral.
  * <p>
  * Turtle upgrades are defined in two stages. First, one creates a {@link ITurtleUpgrade} subclass and corresponding
- * {@link UpgradeSerialiser} instance, which are then registered in a registry.
+ * {@link UpgradeType} instance, which are then registered in a 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. It is recommended this is done via {@linkplain TurtleUpgradeDataProvider data
- * generators}.
+ * the upgrade automatically registered. It is recommended this is done via
+ * <a href="../upgrades/UpgradeType.html#datagen">data generators</a>.
  *
  * <h2>Example</h2>
- * <pre>{@code
- * // We use Forge's DeferredRegister to register our serialiser. Fabric mods may register their serialiser directly.
- * static final DeferredRegister<UpgradeSerialiser<? extends ITurtleUpgrade>> SERIALISERS = DeferredRegister.create(ITurtleUpgrade.serialiserRegistryKey(), "my_mod");
+ * {@snippet lang="java" :
+ * // We use Forge's DeferredRegister to register our upgrade type. Fabric mods may register their type directly.
+ * static final DeferredRegister<UpgradeType<? extends ITurtleUpgrade>> TURTLE_UPGRADES = DeferredRegister.create(ITurtleUpgrade.typeRegistry(), "my_mod");
  *
- * // Register a new upgrade serialiser called "my_upgrade".
- * public static final RegistryObject<UpgradeSerialiser<MyUpgrade>> MY_UPGRADE =
- *     SERIALISERS.register( "my_upgrade", () -> TurtleUpgradeSerialiser.simple( MyUpgrade::new ) );
+ * // Register a new upgrade type called "my_upgrade".
+ * public static final RegistryObject<UpgradeType<MyUpgrade>> MY_UPGRADE =
+ *     TURTLE_UPGRADES.register("my_upgrade", () -> UpgradeType.simple(MyUpgrade::new));
  *
  * // Then in your constructor
- * SERIALISERS.register( bus );
- * }</pre>
+ * TURTLE_UPGRADES.register(bus);
+ * }
  * <p>
  * We can then define a new upgrade using JSON by placing the following in
- * {@literal data/<my_mod>/computercraft/turtle_upgrades/<my_upgrade_id>.json}}.
- *
- * <pre>{@code
- * {
- *     "type": my_mod:my_upgrade",
- * }
- * }</pre>
+ * {@code data/<my_mod>/computercraft/turtle_upgrade/<my_upgrade_id>.json}.
  * <p>
- * {@link TurtleUpgradeDataProvider} provides a data provider to aid with generating these JSON files.
+ * {@snippet lang="json" :
+ * {
+ *     "type": "my_mod:my_upgrade"
+ * }
+ * }
  * <p>
  * Finally, we need to register a model for our upgrade, see
  * {@link dan200.computercraft.api.client.turtle.TurtleUpgradeModeller} for more information.
- *
- * <pre>{@code
- * // Register our model inside FMLClientSetupEvent
- * ComputerCraftAPIClient.registerTurtleUpgradeModeller(MY_UPGRADE.get(), TurtleUpgradeModeller.flatItem())
- * }</pre>
  */
 public interface ITurtleUpgrade extends UpgradeBase {
     /**
-     * The registry key for upgrade serialisers.
+     * 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<UpgradeSerialiser<? extends ITurtleUpgrade>>> serialiserRegistryKey() {
+    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 getType();
+    TurtleUpgradeType getUpgradeType();
 
     /**
      * Will only be called for peripheral upgrades. Creates a peripheral for a turtle being placed using this upgrade.
@@ -133,7 +153,7 @@ public interface ITurtleUpgrade extends UpgradeBase {
      * @param upgradeData Data that currently stored for this upgrade
      * @return Filtered version of this data.
      */
-    default CompoundTag getPersistedData(CompoundTag upgradeData) {
+    default DataComponentPatch getPersistedData(DataComponentPatch upgradeData) {
         return upgradeData;
     }
 }

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

@@ -0,0 +1,157 @@
+// 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 javax.annotation.Nullable;
+import java.util.Optional;
+
+/**
+ * A builder for custom turtle tool upgrades.
+ * <p>
+ * This can be used from your <a href="../upgrades/UpgradeType.html#datagen">data generator</a> code in order to
+ * register turtle tools for your mod's tools.
+ *
+ * <h2>Example:</h2>
+ * {@snippet lang = "java":
+ * import net.minecraft.data.worldgen.BootstrapContext;
+ * import net.minecraft.resources.ResourceLocation;
+ * import net.minecraft.world.item.Items;
+ *
+ * public void registerTool(BootstrapContext<ITurtleUpgrade> upgrades) {
+ *   TurtleToolBuilder.tool(ResourceLocation.fromNamespaceAndPath("my_mod", "wooden_pickaxe"), Items.WOODEN_PICKAXE).register(upgrades);
+ * }
+ *}
+ */
+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 TurtleUpgradeDataProvider.ToolBuilder#consumeDurability(TurtleToolDurability)
+ * @see TurtleToolBuilder#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 ItemStack#getAttributeModifiers(EquipmentSlot) custom attribute modifiers}.
+     * {@linkplain DataComponents#ATTRIBUTE_MODIFIERS custom attribute modifiers}.
      */
     WHEN_ENCHANTED("when_enchanted"),
 

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

@@ -1,169 +0,0 @@
-// 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.api.upgrades.UpgradeSerialiser;
-import dan200.computercraft.impl.RegistryHelper;
-import net.minecraft.core.registries.BuiltInRegistries;
-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 javax.annotation.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.
- *
- * @see ITurtleUpgrade
- */
-public abstract class TurtleUpgradeDataProvider extends UpgradeDataProvider<ITurtleUpgrade> {
-    private static final ResourceLocation TOOL_ID = new ResourceLocation(ComputerCraftAPI.MOD_ID, "tool");
-
-    public TurtleUpgradeDataProvider(PackOutput output) {
-        super(output, "Turtle Upgrades", "computercraft/turtle_upgrades", ITurtleUpgrade.serialiserRegistryKey());
-    }
-
-    /**
-     * 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 UpgradeSerialiser<? extends ITurtleUpgrade> 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, UpgradeSerialiser<? extends ITurtleUpgrade> 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<UpgradeSerialiser<? extends ITurtleUpgrade>>> add) {
-            add.accept(new Upgrade<>(id, serialiser, s -> {
-                s.addProperty("item", RegistryHelper.getKeyOrThrow(BuiltInRegistries.ITEM, toolItem).toString());
-                if (adjective != null) s.addProperty("adjective", adjective);
-                if (craftingItem != null) {
-                    s.addProperty("craftItem", RegistryHelper.getKeyOrThrow(BuiltInRegistries.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/upgrades/UpgradeBase.java

@@ -10,35 +10,33 @@ import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
 import net.minecraft.Util;
-import net.minecraft.nbt.CompoundTag;
+import net.minecraft.core.component.DataComponentPatch;
+import net.minecraft.network.chat.Component;
 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 {
     /**
-     * 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.
+     * Get the type of this upgrade.
      *
-     * @return The unique ID for this upgrade.
+     * @return The type of this upgrade.
      */
-    ResourceLocation getUpgradeID();
+    UpgradeType<?> getType();
 
     /**
-     * Return an unlocalised string to describe this type of computer in item names.
+     * 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.
      * <p>
      * Examples of built-in adjectives are "Wireless", "Mining" and "Crafty".
      *
-     * @return The localisation key for this upgrade's adjective.
+     * @return The text component for this upgrade's adjective.
      */
-    String getUnlocalisedAdjective();
+    Component getAdjective();
 
     /**
      * Return an item stack representing the type of item that a computer must be crafted
@@ -56,8 +54,8 @@ public interface UpgradeBase {
     /**
      * Returns the item stack representing a currently equipped turtle upgrade.
      * <p>
-     * 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,
+     * 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,
      * and the original item stack is returned.
      * <p>
      * By overriding this method, you can create a new {@link ItemStack} which contains enough data to
@@ -69,24 +67,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(CompoundTag upgradeData) {
+    default ItemStack getUpgradeItem(DataComponentPatch upgradeData) {
         return getCraftingItem();
     }
 
     /**
      * Extract upgrade data from an {@link ItemStack}.
      * <p>
-     * This upgrade data will be available with {@link ITurtleAccess#getUpgradeNBTData(TurtleSide)} or
-     * {@link IPocketAccess#getUpgradeNBTData()}.
+     * This upgrade data will be available with {@link ITurtleAccess#getUpgradeData(TurtleSide)} or
+     * {@link IPocketAccess#getUpgradeData()}.
      * <p>
-     * This should be an inverse to {@link #getUpgradeItem(CompoundTag)}.
+     * This should be an inverse to {@link #getUpgradeItem(DataComponentPatch)}.
      *
      * @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 CompoundTag getUpgradeData(ItemStack stack) {
-        return new CompoundTag();
+    default DataComponentPatch getUpgradeData(ItemStack stack) {
+        return DataComponentPatch.EMPTY;
     }
 
     /**
@@ -96,26 +94,15 @@ 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 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.neoforged.common.crafting.StrictNBTIngredient}'s check.
+     * The default check requires that any NBT is exactly the same as the crafting item,
+     * but this may be relaxed for your upgrade.
      *
      * @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) {
-        var crafting = getCraftingItem();
-
-        // A more expanded form of ItemStack.areShareTagsEqual, but allowing an empty tag to be equal to a
-        // null one.
-        var tag = stack.getTag();
-        var craftingTag = crafting.getTag();
-        if (tag == craftingTag) return true;
-        if (tag == null) return Objects.requireNonNull(craftingTag).isEmpty();
-        if (craftingTag == null) return tag.isEmpty();
-        return tag.equals(craftingTag);
+        return ItemStack.isSameItemSameComponents(getCraftingItem(), stack);
     }
 
     /**
@@ -124,7 +111,7 @@ public interface UpgradeBase {
      *
      * @param id The upgrade ID.
      * @return The  generated adjective.
-     * @see #getUnlocalisedAdjective()
+     * @see #getAdjective()
      */
     static String getDefaultAdjective(ResourceLocation id) {
         return Util.makeDescriptionId("upgrade", id) + ".adjective";

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

@@ -6,60 +6,57 @@ package dan200.computercraft.api.upgrades;
 
 import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import net.minecraft.nbt.CompoundTag;
+import net.minecraft.core.Holder;
+import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.world.item.ItemStack;
-import org.jetbrains.annotations.Contract;
-
-import javax.annotation.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 upgrade The current upgrade.
- * @param data    The upgrade's data.
- * @param <T>     The type of upgrade, either {@link ITurtleUpgrade} or {@link IPocketUpgrade}.
+ * @param holder The current upgrade holder.
+ * @param data   The upgrade's data.
+ * @param <T>    The type of upgrade, either {@link ITurtleUpgrade} or {@link IPocketUpgrade}.
  */
-public record UpgradeData<T extends UpgradeBase>(T upgrade, CompoundTag data) {
+public record UpgradeData<T extends UpgradeBase>(Holder.Reference<T> holder, DataComponentPatch data) {
     /**
      * A utility method to construct a new {@link UpgradeData} instance.
      *
-     * @param upgrade An upgrade.
-     * @param data    The upgrade's data.
-     * @param <T>     The type of upgrade.
+     * @param holder 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(T upgrade, CompoundTag data) {
-        return new UpgradeData<>(upgrade, data);
+    public static <T extends UpgradeBase> UpgradeData<T> of(Holder.Reference<T> holder, DataComponentPatch data) {
+        return new UpgradeData<>(holder, data);
     }
 
     /**
      * Create an {@link UpgradeData} containing the default {@linkplain #data() data} for an upgrade.
      *
-     * @param upgrade The upgrade instance.
-     * @param <T>     The type of upgrade.
+     * @param holder The upgrade instance.
+     * @param <T>    The type of upgrade.
      * @return The default upgrade data.
      */
-    public static <T extends UpgradeBase> UpgradeData<T> ofDefault(T upgrade) {
-        return of(upgrade, upgrade.getUpgradeData(upgrade.getCraftingItem()));
+    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");
     }
 
     /**
-     * Take a copy of a (possibly {@code null}) {@link UpgradeData} instance.
+     * Get the current upgrade.
      *
-     * @param upgrade The copied upgrade data.
-     * @param <T>     The type of upgrade.
-     * @return The newly created upgrade data.
+     * @return The current upgrade.
      */
-    @Contract("!null -> !null; null -> null")
-    public static <T extends UpgradeBase> @Nullable UpgradeData<T> copyOf(@Nullable UpgradeData<T> upgrade) {
-        return upgrade == null ? null : upgrade.copy();
+    public T upgrade() {
+        return holder().value();
     }
 
     /**
-     * Get the {@linkplain UpgradeBase#getUpgradeItem(CompoundTag) upgrade item} for this upgrade.
+     * Get the {@linkplain UpgradeBase#getUpgradeItem(DataComponentPatch) 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}.
@@ -67,16 +64,6 @@ public record UpgradeData<T extends UpgradeBase>(T upgrade, CompoundTag data) {
      * @return This upgrade's item.
      */
     public ItemStack getUpgradeItem() {
-        return upgrade.getUpgradeItem(data).copy();
-    }
-
-    /**
-     * Take a copy of this {@link UpgradeData}. This returns a new instance with the same upgrade and a fresh copy of
-     * the upgrade data.
-     *
-     * @return A copy of the current instance.
-     */
-    public UpgradeData<T> copy() {
-        return new UpgradeData<>(upgrade(), data().copy());
+        return upgrade().getUpgradeItem(data).copy();
     }
 }

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

@@ -1,180 +0,0 @@
-// 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.impl.PlatformHelper;
-import dan200.computercraft.impl.RegistryHelper;
-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.BuiltInRegistries;
-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.jetbrains.annotations.ApiStatus;
-
-import javax.annotation.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.
- */
-public abstract class UpgradeDataProvider<T extends UpgradeBase> implements DataProvider {
-    private final PackOutput output;
-    private final String name;
-    private final String folder;
-    private final Registry<UpgradeSerialiser<? extends T>> registry;
-
-    private @Nullable List<T> upgrades;
-
-    @ApiStatus.Internal
-    protected UpgradeDataProvider(PackOutput output, String name, String folder, ResourceKey<Registry<UpgradeSerialiser<? extends T>>> registry) {
-        this.output = output;
-        this.name = name;
-        this.folder = folder;
-        this.registry = RegistryHelper.getRegistry(registry);
-    }
-
-    /**
-     * Register an upgrade using a {@linkplain UpgradeSerialiser#simple(Function) "simple" serialiser}.
-     *
-     * @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<UpgradeSerialiser<? extends T>> simple(ResourceLocation id, UpgradeSerialiser<? extends T> 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 {@linkplain UpgradeSerialiser#simple(Function) simple serialiser}.
-     *
-     * @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<UpgradeSerialiser<? extends T>> simpleWithCustomItem(ResourceLocation id, UpgradeSerialiser<? extends T> 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", RegistryHelper.getKeyOrThrow(BuiltInRegistries.ITEM, item).toString())
-        );
-    }
-
-    /**
-     * Add all turtle or pocket computer upgrades.
-     * <p>
-     * <strong>Example usage:</strong>
-     * <pre>{@code
-     * protected void addUpgrades(Consumer<Upgrade<TurtleUpgradeSerialiser<?>>> addUpgrade) {
-     *     simple(new ResourceLocation("mymod", "speaker"), SPEAKER_SERIALISER.get()).add(addUpgrade);
-     * }
-     * }</pre>
-     *
-     * @param addUpgrade A callback used to register an upgrade.
-     */
-    protected abstract void addUpgrades(Consumer<Upgrade<UpgradeSerialiser<? extends T>>> 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", RegistryHelper.getKeyOrThrow(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 UpgradeSerialiser<? extends T> existingSerialiser(ResourceLocation id) {
-        var result = registry.get(id);
-        if (result == null) throw new IllegalArgumentException("No such serialiser " + id);
-        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

@@ -1,97 +0,0 @@
-// 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.IPocketUpgrade;
-import dan200.computercraft.api.pocket.PocketUpgradeDataProvider;
-import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import dan200.computercraft.api.turtle.TurtleUpgradeDataProvider;
-import dan200.computercraft.impl.upgrades.SerialiserWithCraftingItem;
-import dan200.computercraft.impl.upgrades.SimpleSerialiser;
-import net.minecraft.core.Registry;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.RecipeSerializer;
-import net.minecraft.world.item.crafting.SimpleCraftingRecipeSerializer;
-
-import java.util.function.BiFunction;
-import java.util.function.Function;
-
-/**
- * A serialiser for {@link ITurtleUpgrade} or {@link IPocketUpgrade}s.
- * <p>
- * These should be registered in a {@link Registry} while the game is loading, much like {@link RecipeSerializer}s.
- * <p>
- * This interface is very similar to {@link RecipeSerializer}; each serialiser should correspond to a specific upgrade
- * class. Upgrades are then read from JSON files in datapacks, allowing multiple instances of the upgrade to be
- * registered.
- * <p>
- * If your 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.
- * <p>
- * Upgrades may be data generated via a {@link UpgradeDataProvider} (see {@link TurtleUpgradeDataProvider} and
- * {@link PocketUpgradeDataProvider}).
- *
- * @param <T> The upgrade that this class can serialise and deserialise.
- * @see ITurtleUpgrade
- * @see IPocketUpgrade
- */
-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);
-
-    /**
-     * 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 UpgradeBase> UpgradeSerialiser<T> simple(Function<ResourceLocation, T> factory) {
-        return new SimpleSerialiser<>(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 UpgradeBase> UpgradeSerialiser<T> simpleWithCustomItem(BiFunction<ResourceLocation, ItemStack, T> factory) {
-        return new SerialiserWithCraftingItem<>(factory);
-    }
-}

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

@@ -0,0 +1,115 @@
+// 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 dan200.computercraft.impl.upgrades.UpgradeTypeImpl;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.data.registries.RegistryPatchGenerator;
+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>
+ * First, one adds a new class implementing {@link ITurtleUpgrade} or {@link IPocketUpgrade}). This is responsible for
+ * handling all the logic of your upgrade.
+ * <p>
+ * However, the upgrades are not registered directly. Instead, each upgrade class should have 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>
+ * This can typically be done by extending vanilla's built-in registries using {@link RegistryPatchGenerator}, and then
+ * writing out the new registries using {@code net.fabricmc.fabric.api.datagen.v1.provider.FabricDynamicRegistryProvider}
+ * on Fabric or {@code net.neoforged.neoforge.common.data.DatapackBuiltinEntriesProvider} on Forge.
+ * <p>
+ * {@snippet lang="java" :
+ * import dan200.computercraft.api.turtle.ITurtleUpgrade;
+ * import net.minecraft.Util;
+ * import net.minecraft.core.HolderLookup;
+ * import net.minecraft.core.RegistrySetBuilder;
+ * import net.minecraft.data.DataGenerator;
+ * import net.neoforged.neoforge.common.data.DatapackBuiltinEntriesProvider;
+ *
+ * import java.util.concurrent.CompletableFuture;
+ *
+ * public void generate(DataGenerator.PackGenerator output, CompletableFuture<HolderLookup.Provider> registries) {
+ *     var newRegistries = RegistryPatchGenerator.createLookup(registries, Util.make(new RegistrySetBuilder(), builder -> {
+ *         builder.add(ITurtleUpgrade.REGISTRY, upgrades -> {
+ *             upgrades.register(ITurtleUpgrade.createKey(ResourceLocation.fromNamespaceAndPath("my_mod", "my_upgrade")), new MyUpgrade());
+ *         });
+ *     }));
+ *     output.addProvider(o -> new DatapackBuiltinEntriesProvider(o, newRegistries, Set.of("my_mod")));
+ * }
+ * }
+ *
+ * @param <T> The upgrade subclass that this upgrade type represents.
+ * @see ITurtleUpgrade
+ * @see IPocketUpgrade
+ */
+public interface UpgradeType<T extends UpgradeBase> {
+    /**
+     * 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/impl/ComputerCraftAPIService.java

@@ -4,6 +4,7 @@
 
 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;
@@ -19,7 +20,8 @@ import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.redstone.BundledRedstoneProvider;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleRefuelHandler;
-import dan200.computercraft.api.upgrades.UpgradeSerialiser;
+import dan200.computercraft.api.upgrades.UpgradeType;
+import dan200.computercraft.impl.upgrades.TurtleToolSpec;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Registry;
@@ -68,9 +70,15 @@ public interface ComputerCraftAPIService {
 
     void registerRefuelHandler(TurtleRefuelHandler handler);
 
-    ResourceKey<Registry<UpgradeSerialiser<? extends ITurtleUpgrade>>> turtleUpgradeRegistryId();
+    ResourceKey<Registry<UpgradeType<? extends ITurtleUpgrade>>> turtleUpgradeRegistryId();
 
-    ResourceKey<Registry<UpgradeSerialiser<? extends IPocketUpgrade>>> pocketUpgradeRegistryId();
+    Codec<ITurtleUpgrade> turtleUpgradeCodec();
+
+    ResourceKey<Registry<UpgradeType<? extends IPocketUpgrade>>> pocketUpgradeRegistryId();
+
+    ITurtleUpgrade createTurtleTool(TurtleToolSpec spec);
+
+    Codec<IPocketUpgrade> pocketUpgradeCodec();
 
     DetailRegistry<ItemStack> getItemStackDetailRegistry();
 

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

@@ -1,54 +0,0 @@
-// 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 org.jetbrains.annotations.ApiStatus;
-
-import javax.annotation.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;
-    }
-
-    /**
-     * 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/Services.java

@@ -29,7 +29,7 @@ public final class Services {
      * @throws IllegalStateException When the service cannot be loaded.
      */
     public static <T> T load(Class<T> klass) {
-        var services = ServiceLoader.load(klass).stream().toList();
+        var services = ServiceLoader.load(klass, klass.getClassLoader()).stream().toList();
         return switch (services.size()) {
             case 1 -> services.get(0).get();
             case 0 -> throw new IllegalStateException("Cannot find service for " + klass.getName());

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

@@ -1,49 +0,0 @@
-// 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 final class SerialiserWithCraftingItem<T extends UpgradeBase> implements UpgradeSerialiser<T> {
-    private final BiFunction<ResourceLocation, ItemStack, T> factory;
-
-    public SerialiserWithCraftingItem(BiFunction<ResourceLocation, ItemStack, T> factory) {
-        this.factory = factory;
-    }
-
-    @Override
-    public T fromJson(ResourceLocation id, JsonObject object) {
-        var item = GsonHelper.getAsItem(object, "item");
-        return factory.apply(id, new ItemStack(item));
-    }
-
-    @Override
-    public T fromNetwork(ResourceLocation id, FriendlyByteBuf buffer) {
-        var item = buffer.readItem();
-        return factory.apply(id, item);
-    }
-
-    @Override
-    public void toNetwork(FriendlyByteBuf buffer, T upgrade) {
-        buffer.writeItem(upgrade.getCraftingItem());
-    }
-}

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

@@ -1,44 +0,0 @@
-// 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 final 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 T fromJson(ResourceLocation id, JsonObject object) {
-        return constructor.apply(id);
-    }
-
-    @Override
-    public T fromNetwork(ResourceLocation id, FriendlyByteBuf buffer) {
-        return constructor.apply(id);
-    }
-
-    @Override
-    public void toNetwork(FriendlyByteBuf buffer, T upgrade) {
-    }
-}

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

@@ -0,0 +1,49 @@
+// 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/main/java/dan200/computercraft/impl/upgrades/UpgradeTypeImpl.java

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

projects/common/build.gradle.kts

@@ -11,6 +11,12 @@ plugins {
     id("cc-tweaked.publishing")
 }
 
+sourceSets {
+    main {
+        resources.srcDir("src/generated/resources")
+    }
+}
+
 minecraft {
     accessWideners(
         "src/main/resources/computercraft.accesswidener",
@@ -23,7 +29,7 @@ configurations {
 }
 
 repositories {
-    maven("https://maven.minecraftforge.net/") {
+    maven("https://maven.neoforged.net/") {
         content {
             includeModule("org.spongepowered", "mixin")
         }
@@ -36,6 +42,8 @@ dependencies {
     implementation(commonClasses(project(":common-api")))
     clientImplementation(clientClasses(project(":common-api")))
 
+    compileOnly(libs.mixin)
+    compileOnly(libs.mixinExtra)
     compileOnly(libs.bundles.externalMods.common)
     clientCompileOnly(variantOf(libs.emi) { classifier("api") })
 
@@ -46,6 +54,9 @@ dependencies {
     testImplementation(libs.bundles.test)
     testRuntimeOnly(libs.bundles.testRuntime)
 
+    testImplementation(libs.jmh)
+    testAnnotationProcessor(libs.jmh.processor)
+
     testModCompileOnly(libs.mixin)
     testModImplementation(testFixtures(project(":core")))
     testModImplementation(testFixtures(project(":common")))
@@ -102,3 +113,21 @@ val lintLua by tasks.registering(IlluaminateExec::class) {
     doFirst { if (System.getenv("GITHUB_ACTIONS") != null) println("::add-matcher::.github/matchers/illuaminate.json") }
     doLast { if (System.getenv("GITHUB_ACTIONS") != null) println("::remove-matcher owner=illuaminate::") }
 }
+
+val runData by tasks.registering(MergeTrees::class) {
+    output = layout.projectDirectory.dir("src/generated/resources")
+
+    for (loader in listOf("forge", "fabric")) {
+        mustRunAfter(":$loader:runData")
+        source {
+            input {
+                from(project(":$loader").layout.buildDirectory.dir("generatedResources"))
+                exclude(".cache")
+            }
+
+            output = project(":$loader").layout.projectDirectory.dir("src/generated/resources")
+        }
+    }
+}
+
+tasks.withType(GenerateModuleMetadata::class).configureEach { isEnabled = false }

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

@@ -128,8 +128,8 @@ public final class ClientHooks {
     }
 
     private static void addTurtleUpgrade(Consumer<String> out, TurtleBlockEntity turtle, TurtleSide side) {
-        var upgrade = turtle.getUpgrade(side);
-        if (upgrade != null) out.accept(String.format("Upgrade[%s]: %s", side, upgrade.getUpgradeID()));
+        var upgrade = turtle.getAccess().getUpgradeWithData(side);
+        if (upgrade != null) out.accept(String.format("Upgrade[%s]: %s", side, upgrade.holder().key().location()));
     }
 
     /**

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

@@ -21,12 +21,11 @@ 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 dan200.computercraft.shared.computer.inventory.ViewComputerMenu;
 import dan200.computercraft.shared.media.items.DiskItem;
-import dan200.computercraft.shared.media.items.TreasureDiskItem;
+import dan200.computercraft.shared.turtle.TurtleOverlay;
 import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.color.item.ItemColor;
@@ -43,16 +42,19 @@ import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.PreparableReloadListener;
 import net.minecraft.server.packs.resources.ResourceProvider;
+import net.minecraft.util.FastColor;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.component.DyedItemColor;
 import net.minecraft.world.level.ItemLike;
 
 import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -81,29 +83,31 @@ public final class ClientRegistry {
 
     /**
      * 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("state",
-            new UnclampedPropertyFunction((stack, world, player, random) -> ClientPocketComputers.get(stack).getState().ordinal()),
+    public static void registerMainThread(RegisterItemProperty itemProperties) {
+        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("coloured",
-            (stack, world, player, random) -> IColouredItem.getColourBasic(stack) != -1 ? 1 : 0,
+        registerItemProperty(itemProperties, "coloured",
+            (stack, world, player, random) -> DyedItemColor.getOrDefault(stack, -1) != -1 ? 1 : 0,
             ModRegistry.Items.POCKET_COMPUTER_NORMAL, ModRegistry.Items.POCKET_COMPUTER_ADVANCED
         );
     }
 
     public static void registerMenuScreens(RegisterMenuScreen register) {
         register.<AbstractComputerMenu, ComputerScreen<AbstractComputerMenu>>register(ModRegistry.Menus.COMPUTER.get(), ComputerScreen::new);
-        register.<AbstractComputerMenu, ComputerScreen<AbstractComputerMenu>>register(ModRegistry.Menus.POCKET_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.register(ModRegistry.Menus.PRINTER.get(), PrinterScreen::new);
         register.register(ModRegistry.Menus.DISK_DRIVE.get(), DiskDriveScreen::new);
         register.register(ModRegistry.Menus.PRINTOUT.get(), PrintoutScreen::new);
-
-        register.<ViewComputerMenu, ComputerScreen<ViewComputerMenu>>register(ModRegistry.Menus.VIEW_COMPUTER.get(), ComputerScreen::new);
     }
 
     public interface RegisterMenuScreen {
@@ -111,49 +115,55 @@ public final class ClientRegistry {
     }
 
     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.TurtleUpgradeTypes.SPEAKER.get(), TurtleUpgradeModeller.sided(
+            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "block/turtle_speaker_left"),
+            ResourceLocation.fromNamespaceAndPath(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.TurtleUpgradeTypes.WORKBENCH.get(), TurtleUpgradeModeller.sided(
+            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "block/turtle_crafting_table_left"),
+            ResourceLocation.fromNamespaceAndPath(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());
+        register.register(ModRegistry.TurtleUpgradeTypes.WIRELESS_MODEM.get(), new TurtleModemModeller());
+        register.register(ModRegistry.TurtleUpgradeTypes.TOOL.get(), TurtleUpgradeModeller.flatItem());
     }
 
     @SafeVarargs
-    private static void registerItemProperty(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 void registerItemProperty(RegisterItemProperty itemProperties, String name, ClampedItemPropertyFunction getter, Supplier<? extends Item>... items) {
+        var id = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, name);
+        for (var item : items) itemProperties.register(item.get(), id, getter);
+    }
+
+    /**
+     * 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",
+    private static final ResourceLocation[] EXTRA_MODELS = {
+        TurtleOverlay.ELF_MODEL,
+        TurtleBlockEntityRenderer.COLOUR_TURTLE_MODEL,
     };
 
-    public static void registerExtraModels(Consumer<ResourceLocation> register) {
-        for (var model : EXTRA_MODELS) register.accept(new ResourceLocation(ComputerCraftAPI.MOD_ID, model));
+    public static void registerExtraModels(Consumer<ResourceLocation> register, Collection<ResourceLocation> extraModels) {
+        for (var model : EXTRA_MODELS) register.accept(model);
+        extraModels.forEach(register);
         TurtleUpgradeModellers.getDependencies().forEach(register);
     }
 
     public static void registerItemColours(BiConsumer<ItemColor, ItemLike> register) {
         register.accept(
-            (stack, layer) -> layer == 1 ? ((DiskItem) stack.getItem()).getColour(stack) : 0xFFFFFF,
+            (stack, layer) -> layer == 1 ? DiskItem.getColour(stack) : -1,
             ModRegistry.Items.DISK.get()
         );
 
         register.accept(
-            (stack, layer) -> layer == 1 ? TreasureDiskItem.getColour(stack) : 0xFFFFFF,
+            (stack, layer) -> layer == 1 ? DyedItemColor.getOrDefault(stack, Colour.BLUE.getARGB()) : -1,
             ModRegistry.Items.TREASURE_DISK.get()
         );
 
@@ -165,21 +175,18 @@ public final class ClientRegistry {
     }
 
     private static int getPocketColour(ItemStack stack, int layer) {
-        switch (layer) {
-            case 0:
-            default:
-                return 0xFFFFFF;
-            case 1: // Frame colour
-                return IColouredItem.getColourBasic(stack);
-            case 2: { // Light colour
-                var light = ClientPocketComputers.get(stack).getLightState();
-                return light == -1 ? Colour.BLACK.getHex() : light;
+        return switch (layer) {
+            default -> -1;
+            case 1 -> DyedItemColor.getOrDefault(stack, -1); // Frame colour
+            case 2 -> { // Light colour
+                var computer = ClientPocketComputers.get(stack);
+                yield computer == null || computer.getLightState() == -1 ? Colour.BLACK.getARGB() : FastColor.ARGB32.opaque(computer.getLightState());
             }
-        }
+        };
     }
 
     private static int getTurtleColour(ItemStack stack, int layer) {
-        return layer == 0 ? ((IColouredItem) stack.getItem()).getColour(stack) : 0xFFFFFF;
+        return layer == 0 ? DyedItemColor.getOrDefault(stack, -1) : -1;
     }
 
     public static void registerShaders(ResourceProvider resources, BiConsumer<ShaderInstance, Consumer<ShaderInstance>> load) throws IOException {

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.refreshTrimmedMessage();
+            chat.rescaleChat();
         }
 
         TableFormatter.super.display(table);

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

@@ -9,6 +9,7 @@ import dan200.computercraft.client.gui.widgets.DynamicImageButton;
 import dan200.computercraft.client.gui.widgets.TerminalWidget;
 import dan200.computercraft.client.network.ClientNetworking;
 import dan200.computercraft.core.terminal.Terminal;
+import dan200.computercraft.core.util.Nullability;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.core.InputHandler;
 import dan200.computercraft.shared.computer.inventory.AbstractComputerMenu;
@@ -18,6 +19,7 @@ import dan200.computercraft.shared.config.Config;
 import dan200.computercraft.shared.network.server.UploadFileMessage;
 import net.minecraft.ChatFormatting;
 import net.minecraft.Util;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
@@ -96,8 +98,8 @@ public abstract class AbstractComputerScreen<T extends AbstractComputerMenu> ext
         getTerminal().update();
 
         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.getToasts());
+            new ItemToast(minecraft(), displayStack, NO_RESPONSE_TITLE, NO_RESPONSE_MSG, ItemToast.TRANSFER_NO_RESPONSE_TOKEN)
+                .showOrReplace(minecraft().getToasts());
             uploadNagDeadline = Long.MAX_VALUE;
         }
     }
@@ -206,7 +208,7 @@ public abstract class AbstractComputerScreen<T extends AbstractComputerMenu> ext
             return;
         }
 
-        if (toUpload.size() > 0) UploadFileMessage.send(menu, toUpload, ClientNetworking::sendToServer);
+        if (!toUpload.isEmpty()) UploadFileMessage.send(menu, toUpload, ClientNetworking::sendToServer);
     }
 
     public void uploadResult(UploadResult result, @Nullable Component message) {
@@ -222,9 +224,13 @@ public abstract class AbstractComputerScreen<T extends AbstractComputerMenu> ext
     }
 
     private void alert(Component title, Component message) {
-        OptionScreen.show(minecraft, title, message,
-            List.of(OptionScreen.newButton(OK, b -> minecraft.setScreen(this))),
-            () -> minecraft.setScreen(this)
+        OptionScreen.show(minecraft(), title, message,
+            List.of(OptionScreen.newButton(OK, b -> minecraft().setScreen(this))),
+            () -> minecraft().setScreen(this)
         );
     }
+
+    private Minecraft minecraft() {
+        return Nullability.assertNonNull(minecraft);
+    }
 }

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

@@ -49,31 +49,31 @@ public final class ClientInputHandler implements InputHandler {
 
     @Override
     public void keyDown(int key, boolean repeat) {
-        ClientNetworking.sendToServer(new KeyEventServerMessage(menu, repeat ? KeyEventServerMessage.TYPE_REPEAT : KeyEventServerMessage.TYPE_DOWN, key));
+        ClientNetworking.sendToServer(new KeyEventServerMessage(menu, repeat ? KeyEventServerMessage.Action.REPEAT : KeyEventServerMessage.Action.DOWN, key));
     }
 
     @Override
     public void keyUp(int key) {
-        ClientNetworking.sendToServer(new KeyEventServerMessage(menu, KeyEventServerMessage.TYPE_UP, key));
+        ClientNetworking.sendToServer(new KeyEventServerMessage(menu, KeyEventServerMessage.Action.UP, key));
     }
 
     @Override
     public void mouseClick(int button, int x, int y) {
-        ClientNetworking.sendToServer(new MouseEventServerMessage(menu, MouseEventServerMessage.TYPE_CLICK, button, x, y));
+        ClientNetworking.sendToServer(new MouseEventServerMessage(menu, MouseEventServerMessage.Action.CLICK, button, x, y));
     }
 
     @Override
     public void mouseUp(int button, int x, int y) {
-        ClientNetworking.sendToServer(new MouseEventServerMessage(menu, MouseEventServerMessage.TYPE_UP, button, x, y));
+        ClientNetworking.sendToServer(new MouseEventServerMessage(menu, MouseEventServerMessage.Action.UP, button, x, y));
     }
 
     @Override
     public void mouseDrag(int button, int x, int y) {
-        ClientNetworking.sendToServer(new MouseEventServerMessage(menu, MouseEventServerMessage.TYPE_DRAG, button, x, y));
+        ClientNetworking.sendToServer(new MouseEventServerMessage(menu, MouseEventServerMessage.Action.DRAG, button, x, y));
     }
 
     @Override
     public void mouseScroll(int direction, int x, int y) {
-        ClientNetworking.sendToServer(new MouseEventServerMessage(menu, MouseEventServerMessage.TYPE_SCROLL, direction, x, y));
+        ClientNetworking.sendToServer(new MouseEventServerMessage(menu, MouseEventServerMessage.Action.SCROLL, direction, x, y));
     }
 }

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

@@ -15,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 = new ResourceLocation("computercraft", "textures/gui/disk_drive.png");
+    private static final ResourceLocation BACKGROUND = ResourceLocation.fromNamespaceAndPath("computercraft", "textures/gui/disk_drive.png");
 
     public DiskDriveScreen(DiskDriveMenu container, Inventory player, Component title) {
         super(container, player, title);

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

@@ -21,7 +21,7 @@ import java.util.stream.Stream;
  * Sprite sheet for all GUI texutres in the mod.
  */
 public final class GuiSprites extends TextureAtlasHolder {
-    public static final ResourceLocation SPRITE_SHEET = new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui");
+    public static final ResourceLocation SPRITE_SHEET = ResourceLocation.fromNamespaceAndPath(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");
@@ -35,16 +35,16 @@ public final class GuiSprites extends TextureAtlasHolder {
 
     private static ButtonTextures button(String name) {
         return new ButtonTextures(
-            new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui/buttons/" + name),
-            new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui/buttons/" + name + "_hover")
+            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "gui/buttons/" + name),
+            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "gui/buttons/" + name + "_hover")
         );
     }
 
     private static ComputerTextures computer(String name, boolean pocket, boolean sidebar) {
         return new ComputerTextures(
-            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
+            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
         );
     }
 

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

@@ -19,7 +19,7 @@ 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 = new ResourceLocation("toast/recipe");
+    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;

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

@@ -6,8 +6,10 @@ package dan200.computercraft.client.gui;
 
 import dan200.computercraft.client.gui.widgets.TerminalWidget;
 import dan200.computercraft.core.terminal.Terminal;
+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.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.MenuAccess;
@@ -16,6 +18,7 @@ import net.minecraft.world.entity.player.Inventory;
 import org.lwjgl.glfw.GLFW;
 
 import javax.annotation.Nullable;
+import java.util.Objects;
 
 import static dan200.computercraft.core.util.Nullability.assertNonNull;
 
@@ -44,8 +47,8 @@ public class NoTermComputerScreen<T extends AbstractComputerMenu> extends Screen
     protected void init() {
         // First ensure we're still grabbing the mouse, so the user can look around. Then reset bits of state that
         // grabbing unsets.
-        minecraft.mouseHandler.grabMouse();
-        minecraft.screen = this;
+        minecraft().mouseHandler.grabMouse();
+        minecraft().screen = this;
         KeyMapping.releaseAll();
 
         super.init();
@@ -64,13 +67,13 @@ public class NoTermComputerScreen<T extends AbstractComputerMenu> extends Screen
 
     @Override
     public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) {
-        minecraft.player.getInventory().swapPaint(scrollX);
+        Objects.requireNonNull(minecraft().player).getInventory().swapPaint(scrollY);
         return super.mouseScrolled(mouseX, mouseY, scrollX, scrollY);
     }
 
     @Override
     public void onClose() {
-        minecraft.player.closeContainer();
+        Objects.requireNonNull(minecraft().player).closeContainer();
         super.onClose();
     }
 
@@ -93,12 +96,21 @@ public class NoTermComputerScreen<T extends AbstractComputerMenu> extends Screen
     public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
         super.render(graphics, mouseX, mouseY, partialTicks);
 
-        var font = minecraft.font;
+        var font = minecraft().font;
         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) - (minecraft.font.width(line) / 2), y, 0xFFFFFF, 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

@@ -24,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 = new ResourceLocation("computercraft", "textures/gui/blank_screen.png");
+    private static final ResourceLocation BACKGROUND = ResourceLocation.fromNamespaceAndPath("computercraft", "textures/gui/blank_screen.png");
 
     public static final int BUTTON_WIDTH = 100;
     public static final int BUTTON_HEIGHT = 20;

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

@@ -15,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 = new ResourceLocation("computercraft", "textures/gui/printer.png");
+    private static final ResourceLocation BACKGROUND = ResourceLocation.fromNamespaceAndPath("computercraft", "textures/gui/printer.png");
 
     public PrinterScreen(PrinterMenu container, Inventory player, Component title) {
         super(container, player, title);

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

@@ -4,13 +4,13 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.vertex.Tesselator;
 import dan200.computercraft.core.terminal.TextBuffer;
+import dan200.computercraft.shared.ModRegistry;
 import dan200.computercraft.shared.common.HeldItemMenu;
+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.screens.inventory.AbstractContainerScreen;
-import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import org.lwjgl.glfw.GLFW;
@@ -35,16 +35,17 @@ public class PrintoutScreen extends AbstractContainerScreen<HeldItemMenu> {
 
         imageHeight = Y_SIZE;
 
-        var text = PrintoutItem.getText(container.getStack());
-        this.text = new TextBuffer[text.length];
-        for (var i = 0; i < this.text.length; i++) this.text[i] = new TextBuffer(text[i]);
-
-        var colours = PrintoutItem.getColours(container.getStack());
-        this.colours = new TextBuffer[colours.length];
-        for (var i = 0; i < this.colours.length; i++) this.colours[i] = new TextBuffer(colours[i]);
+        var printout = container.getStack().getOrDefault(ModRegistry.DataComponents.PRINTOUT.get(), PrintoutData.EMPTY);
+        this.text = new TextBuffer[printout.lines().size()];
+        this.colours = new TextBuffer[printout.lines().size()];
+        for (var i = 0; i < this.text.length; i++) {
+            var line = printout.lines().get(i);
+            this.text[i] = new TextBuffer(line.text());
+            this.colours[i] = new TextBuffer(line.foreground());
+        }
 
         page = 0;
-        pages = Math.max(this.text.length / PrintoutItem.LINES_PER_PAGE, 1);
+        pages = Math.max(this.text.length / PrintoutData.LINES_PER_PAGE, 1);
         book = ((PrintoutItem) container.getStack().getItem()).getType() == PrintoutItem.Type.BOOK;
     }
 
@@ -66,13 +67,13 @@ public class PrintoutScreen extends AbstractContainerScreen<HeldItemMenu> {
     @Override
     public boolean mouseScrolled(double x, double y, double deltaX, double deltaY) {
         if (super.mouseScrolled(x, y, deltaX, deltaY)) return true;
-        if (deltaX < 0) {
+        if (deltaY < 0) {
             // Scroll up goes to the next page
             if (page < pages - 1) page++;
             return true;
         }
 
-        if (deltaX > 0) {
+        if (deltaY > 0) {
             // Scroll down goes to the previous page
             if (page > 0) page--;
             return true;
@@ -83,19 +84,13 @@ public class PrintoutScreen extends AbstractContainerScreen<HeldItemMenu> {
 
     @Override
     protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
-        // Draw the printout
-        var renderer = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
-        drawBorder(graphics.pose(), renderer, leftPos, topPos, 0, page, pages, book, FULL_BRIGHT_LIGHTMAP);
-        drawText(graphics.pose(), renderer, leftPos + X_TEXT_MARGIN, topPos + Y_TEXT_MARGIN, PrintoutItem.LINES_PER_PAGE * page, FULL_BRIGHT_LIGHTMAP, text, colours);
-        renderer.endBatch();
-    }
-
-    @Override
-    public void renderBackground(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
-        // We must take the background further back in order to not overlap with our printed pages.
+        // Push the printout slightly forward, to avoid clipping into the background.
         graphics.pose().pushPose();
-        graphics.pose().translate(0, 0, -1);
-        super.renderBackground(graphics, mouseX, mouseY, partialTicks);
+        graphics.pose().translate(0, 0, 1);
+
+        drawBorder(graphics.pose(), graphics.bufferSource(), leftPos, topPos, 0, page, pages, book, FULL_BRIGHT_LIGHTMAP);
+        drawText(graphics.pose(), graphics.bufferSource(), leftPos + X_TEXT_MARGIN, topPos + Y_TEXT_MARGIN, PrintoutData.LINES_PER_PAGE * page, FULL_BRIGHT_LIGHTMAP, text, colours);
+
         graphics.pose().popPose();
     }
 

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

@@ -23,8 +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 = 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 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 int TEX_WIDTH = 278;
     private static final int TEX_HEIGHT = 217;

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

@@ -4,7 +4,6 @@
 
 package dan200.computercraft.client.gui.widgets;
 
-import com.mojang.blaze3d.vertex.Tesselator;
 import dan200.computercraft.client.render.RenderTypes;
 import dan200.computercraft.client.render.text.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.Terminal;
@@ -16,7 +15,6 @@ 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.screens.Screen;
-import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.network.chat.Component;
 import org.lwjgl.glfw.GLFW;
 
@@ -195,16 +193,16 @@ public class TerminalWidget extends AbstractWidget {
     }
 
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double delta, double deltaY) {
+    public boolean mouseScrolled(double mouseX, double mouseY, double deltaX, double deltaY) {
         if (!inTermRegion(mouseX, mouseY)) return false;
-        if (!hasMouseSupport() || delta == 0) return false;
+        if (!hasMouseSupport() || deltaY == 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(delta < 0 ? 1 : -1, charX + 1, charY + 1);
+        computer.mouseScroll(deltaY < 0 ? 1 : -1, charX + 1, charY + 1);
 
         lastMouseX = charX;
         lastMouseY = charY;
@@ -259,15 +257,12 @@ public class TerminalWidget extends AbstractWidget {
     public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
         if (!visible) return;
 
-        var bufferSource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
-        var emitter = FixedWidthFontRenderer.toVertexConsumer(graphics.pose(), bufferSource.getBuffer(RenderTypes.TERMINAL));
+        var emitter = FixedWidthFontRenderer.toVertexConsumer(graphics.pose(), graphics.bufferSource().getBuffer(RenderTypes.TERMINAL));
 
         FixedWidthFontRenderer.drawTerminal(
             emitter,
             (float) innerX, (float) innerY, terminal, (float) MARGIN, (float) MARGIN, (float) MARGIN, (float) MARGIN
         );
-
-        bufferSource.endBatch();
     }
 
     @Override

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

@@ -6,12 +6,15 @@ 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;
@@ -25,15 +28,17 @@ 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) ->
-        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 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 pocketComparison = compareStacks((left, right) ->
-        left.getItem() instanceof PocketComputerItem && PocketComputerItem.getUpgrade(left) == PocketComputerItem.getUpgrade(right));
+    private static final Comparison pocketComparison = compareStacks((left, right) -> 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

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-package dan200.computercraft.shared.integration.jei;
+package dan200.computercraft.client.integration.jei;
 
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.turtle.TurtleSide;
@@ -19,6 +19,8 @@ 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;
 
@@ -28,7 +30,7 @@ import java.util.List;
 public class JEIComputerCraft implements IModPlugin {
     @Override
     public ResourceLocation getPluginUid() {
-        return new ResourceLocation(ComputerCraftAPI.MOD_ID, "jei");
+        return ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "jei");
     }
 
     @Override
@@ -44,7 +46,7 @@ public class JEIComputerCraft implements IModPlugin {
 
     @Override
     public void registerAdvanced(IAdvancedRegistration registry) {
-        registry.addRecipeManagerPlugin(new RecipeResolver());
+        registry.addRecipeManagerPlugin(new RecipeResolver(getRegistryAccess()));
     }
 
     @Override
@@ -52,7 +54,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();
+        var upgradeItems = RecipeModHelpers.getExtraStacks(getRegistryAccess());
         if (!upgradeItems.isEmpty()) {
             runtime.getIngredientManager().addIngredientsAtRuntime(VanillaTypes.ITEM_STACK, upgradeItems);
         }
@@ -70,17 +72,14 @@ public class JEIComputerCraft implements IModPlugin {
      * Distinguishes turtles by upgrades and family.
      */
     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 = turtle.getUpgrade(stack, TurtleSide.LEFT);
-        var right = turtle.getUpgrade(stack, TurtleSide.RIGHT);
-        if (left != null) name.append(left.getUpgradeID());
+        var left = TurtleItem.getUpgradeWithData(stack, TurtleSide.LEFT);
+        var right = TurtleItem.getUpgradeWithData(stack, TurtleSide.RIGHT);
+        if (left != null) name.append(left.holder().key().location());
         if (left != null && right != null) name.append('|');
-        if (right != null) name.append(right.getUpgradeID());
+        if (right != null) name.append(right.holder().key().location());
 
         return name.toString();
     };
@@ -89,14 +88,11 @@ public class JEIComputerCraft implements IModPlugin {
      * Distinguishes pocket computers by upgrade and family.
      */
     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 upgrade = PocketComputerItem.getUpgrade(stack);
-        if (upgrade != null) name.append(upgrade.getUpgradeID());
+        var upgrade = PocketComputerItem.getUpgradeWithData(stack);
+        if (upgrade != null) name.append(upgrade.holder().key().location());
 
         return name.toString();
     };
@@ -104,11 +100,9 @@ public class JEIComputerCraft implements IModPlugin {
     /**
      * Distinguishes disks by colour.
      */
-    private static final IIngredientSubtypeInterpreter<ItemStack> diskSubtype = (stack, ctx) -> {
-        var item = stack.getItem();
-        if (!(item instanceof DiskItem disk)) return IIngredientSubtypeInterpreter.NONE;
+    private static final IIngredientSubtypeInterpreter<ItemStack> diskSubtype = (stack, ctx) -> Integer.toString(DiskItem.getColour(stack));
 
-        var colour = disk.getColour(stack);
-        return colour == -1 ? IIngredientSubtypeInterpreter.NONE : String.format("%06x", colour);
-    };
+    private static RegistryAccess getRegistryAccess() {
+        return Minecraft.getInstance().level.registryAccess();
+    }
 }

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

@@ -2,8 +2,9 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-package dan200.computercraft.shared.integration.jei;
+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;
@@ -12,13 +13,28 @@ 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.core.HolderLookup;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.CraftingRecipe;
+import net.minecraft.world.item.crafting.RecipeHolder;
 
 import java.util.List;
 
 class RecipeResolver implements IRecipeManagerPlugin {
-    private final UpgradeRecipeGenerator<CraftingRecipe> resolver = new UpgradeRecipeGenerator<>(x -> x);
+    private final UpgradeRecipeGenerator<RecipeHolder<CraftingRecipe>> resolver;
+
+    /**
+     * We need to generate unique ids for each recipe, as JEI will attempt to deduplicate them otherwise.
+     */
+    private int nextId = 0;
+
+    RecipeResolver(HolderLookup.Provider registries) {
+        resolver = new UpgradeRecipeGenerator<>(
+            x -> new RecipeHolder<>(ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "upgrade_" + nextId++), x),
+            registries
+        );
+    }
 
     @Override
     public <V> List<RecipeType<?>> getRecipeTypes(IFocus<V> focus) {
@@ -44,8 +60,8 @@ class RecipeResolver implements IRecipeManagerPlugin {
         }
 
         return switch (focus.getRole()) {
-            case INPUT -> cast(resolver.findRecipesWithInput(stack));
-            case OUTPUT -> cast(resolver.findRecipesWithOutput(stack));
+            case INPUT -> cast(RecipeTypes.CRAFTING, resolver.findRecipesWithInput(stack));
+            case OUTPUT -> cast(RecipeTypes.CRAFTING, resolver.findRecipesWithOutput(stack));
             default -> List.of();
         };
     }
@@ -55,8 +71,8 @@ class RecipeResolver implements IRecipeManagerPlugin {
         return List.of();
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    private static <T, U> List<T> cast(List<U> from) {
+    @SuppressWarnings({ "unchecked", "rawtypes", "UnusedVariable" })
+    private static <T, U> List<T> cast(RecipeType<U> ignoredType, List<U> from) {
         return (List) from;
     }
 }

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

@@ -0,0 +1,68 @@
+// SPDX-FileCopyrightText: 2024 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.client.model;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.JsonOps;
+import dan200.computercraft.api.ComputerCraftAPI;
+import dan200.computercraft.shared.turtle.TurtleOverlay;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.packs.resources.ResourceManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * A list of extra models to load on the client.
+ * <p>
+ * This is largely intended for use with {@linkplain TurtleOverlay turtle overlays}. As overlays are stored in a dynamic
+ * registry, they are not available when resources are loaded, and so we need a way to request the overlays' models be
+ * loaded.
+ *
+ * @param models The models to load.
+ */
+public record ExtraModels(List<ResourceLocation> models) {
+    private static final Logger LOG = LoggerFactory.getLogger(ExtraModels.class);
+    private static final Gson GSON = new Gson();
+
+    /**
+     * The path where the extra models are listed.
+     */
+    public static final ResourceLocation PATH = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "extra_models.json");
+
+    /**
+     * The coded used to store the extra model file.
+     */
+    public static final Codec<ExtraModels> CODEC = ResourceLocation.CODEC.listOf().xmap(ExtraModels::new, ExtraModels::models);
+
+    /**
+     * Get the list of all extra models to load.
+     *
+     * @param resources The current resource manager.
+     * @return A set of all resources to load.
+     */
+    public static Collection<ResourceLocation> loadAll(ResourceManager resources) {
+        Set<ResourceLocation> out = new HashSet<>();
+
+        for (var path : resources.getResourceStack(PATH)) {
+            ExtraModels models;
+            try (var stream = path.openAsReader()) {
+                models = ExtraModels.CODEC.parse(JsonOps.INSTANCE, GSON.fromJson(stream, JsonElement.class)).getOrThrow(JsonParseException::new);
+            } catch (IOException | RuntimeException e) {
+                LOG.error("Failed to load extra models from {}", path.sourcePackId());
+                continue;
+            }
+
+            out.addAll(models.models());
+        }
+
+        return Collections.unmodifiableCollection(out);
+    }
+}

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

@@ -4,11 +4,9 @@
 
 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.renderer.block.model.FaceBakery;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.Direction;
 import org.joml.Matrix4f;
@@ -29,8 +27,8 @@ import java.util.List;
 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);
+    private static final int STRIDE = FaceBakery.VERTEX_INT_SIZE;
+    private static final int POS_OFFSET = 0;
 
     protected final Matrix4f transformation;
     protected final boolean invert;
@@ -91,13 +89,4 @@ public class ModelTransformer {
 
     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

@@ -12,12 +12,15 @@ 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.TurtleOverlay;
 import dan200.computercraft.shared.turtle.items.TurtleItem;
+import dan200.computercraft.shared.util.DataComponentUtil;
 import dan200.computercraft.shared.util.Holiday;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.client.resources.model.ModelManager;
+import net.minecraft.core.component.DataComponents;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 
@@ -50,17 +53,10 @@ public final class TurtleModelParts<T> {
         boolean colour,
         @Nullable UpgradeData<ITurtleUpgrade> leftUpgrade,
         @Nullable UpgradeData<ITurtleUpgrade> rightUpgrade,
-        @Nullable ResourceLocation overlay,
+        @Nullable TurtleOverlay 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;
@@ -90,37 +86,24 @@ public final class TurtleModelParts<T> {
     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());
+        this.transformer = x -> transformer.transform(x.model(), x.matrix());
         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;
+        return modelCache.computeIfAbsent(combination, buildModel);
     }
 
     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 leftUpgrade = TurtleItem.getUpgradeWithData(stack, TurtleSide.LEFT);
+        var rightUpgrade = TurtleItem.getUpgradeWithData(stack, TurtleSide.RIGHT);
+        var overlay = TurtleItem.getOverlay(stack);
+        var label = DataComponentUtil.getCustomName(stack);
         var flip = label != null && (label.equals("Dinnerbone") || label.equals("Grumm"));
 
-        return new Combination(colour != -1, leftUpgrade, rightUpgrade, overlay, christmas, flip);
+        return new Combination(stack.has(DataComponents.DYED_COLOR), leftUpgrade, rightUpgrade, overlay, christmas, flip);
     }
 
     private List<BakedModel> buildModel(Combination combo) {
@@ -131,10 +114,10 @@ public final class TurtleModelParts<T> {
         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));
-        }
+        if (combo.overlay() != null) addPart(parts, modelManager, transformation, combo.overlay().model());
+
+        var showChristmas = TurtleOverlay.showElfOverlay(combo.overlay(), combo.christmas());
+        if (showChristmas) addPart(parts, modelManager, transformation, TurtleOverlay.ELF_MODEL);
 
         addUpgrade(parts, transformation, TurtleSide.LEFT, combo.leftUpgrade());
         addUpgrade(parts, transformation, TurtleSide.RIGHT, combo.rightUpgrade());
@@ -142,10 +125,14 @@ public final class TurtleModelParts<T> {
         return parts;
     }
 
+    private void addPart(List<BakedModel> parts, ModelManager modelManager, Transformation transformation, ResourceLocation model) {
+        parts.add(transform(ClientPlatformHelper.get().getModel(modelManager, model), transformation));
+    }
+
     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())));
+        parts.add(transform(model.model(), transformation.compose(model.matrix())));
     }
 
     private 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(ClientPlatformHelper.get().createPacket(message));
+        if (connection != null) connection.send(new ServerboundCustomPayloadPacket(message));
     }
 }

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

@@ -17,17 +17,18 @@ import dan200.computercraft.shared.computer.terminal.TerminalState;
 import dan200.computercraft.shared.computer.upload.UploadResult;
 import dan200.computercraft.shared.network.client.ClientNetworkContext;
 import dan200.computercraft.shared.peripheral.monitor.MonitorBlockEntity;
+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.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 javax.annotation.Nullable;
-import java.nio.ByteBuffer;
 import java.util.UUID;
 
 /**
@@ -49,7 +50,7 @@ public final class ClientNetworkContextImpl implements ClientNetworkContext {
     }
 
     @Override
-    public void handleMonitorData(BlockPos pos, TerminalState terminal) {
+    public void handleMonitorData(BlockPos pos, @Nullable TerminalState terminal) {
         var player = Minecraft.getInstance().player;
         if (player == null) return;
 
@@ -60,26 +61,26 @@ public final class ClientNetworkContextImpl implements ClientNetworkContext {
     }
 
     @Override
-    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));
+    public void handlePlayRecord(BlockPos pos, @Nullable Holder<JukeboxSong> song) {
+        if (song == null) {
+            Minecraft.getInstance().levelRenderer.stopJukeboxSongAndNotifyNearby(pos);
+        } else {
+            Minecraft.getInstance().levelRenderer.playJukeboxSong(song, pos);
+        }
     }
 
     @Override
-    public void handlePocketComputerData(int instanceId, ComputerState state, int lightState, TerminalState terminal) {
-        var computer = ClientPocketComputers.get(instanceId, terminal.colour);
-        computer.setState(state, lightState);
-        if (terminal.hasTerminal()) computer.setTerminal(terminal);
+    public void handlePocketComputerData(UUID instanceId, ComputerState state, int lightState, @Nullable TerminalState terminal) {
+        ClientPocketComputers.setState(instanceId, state, lightState, terminal);
     }
 
     @Override
-    public void handlePocketComputerDeleted(int instanceId) {
+    public void handlePocketComputerDeleted(UUID instanceId) {
         ClientPocketComputers.remove(instanceId);
     }
 
     @Override
-    public void handleSpeakerAudio(UUID source, SpeakerPosition.Message position, float volume, ByteBuffer buffer) {
+    public void handleSpeakerAudio(UUID source, SpeakerPosition.Message position, float volume, EncodedAudio buffer) {
         SpeakerManager.getSound(source).playAudio(reifyPosition(position), volume, buffer);
     }
 

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

@@ -5,14 +5,8 @@
 package dan200.computercraft.client.platform;
 
 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.common.ServerCommonPacketListener;
-import net.minecraft.sounds.SoundEvent;
 
 import javax.annotation.Nullable;
 
@@ -21,14 +15,6 @@ public interface ClientPlatformHelper extends dan200.computercraft.impl.client.C
         return (ClientPlatformHelper) dan200.computercraft.impl.client.ClientPlatformHelper.get();
     }
 
-    /**
-     * Convert a serverbound {@link NetworkMessage} to a Minecraft {@link Packet}.
-     *
-     * @param message The messsge to convert.
-     * @return The converted message.
-     */
-    Packet<ServerCommonPacketListener> createPacket(NetworkMessage<ServerNetworkContext> message);
-
     /**
      * Render a {@link BakedModel}, using any loader-specific hooks.
      *
@@ -40,13 +26,4 @@ public interface ClientPlatformHelper extends dan200.computercraft.impl.client.C
      * @param tints         Block colour tints to apply to the model.
      */
     void renderBakedModel(PoseStack transform, MultiBufferSource buffers, BakedModel model, int lightmapCoord, int overlayLight, @Nullable int[] tints);
-
-    /**
-     * 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);
 }

projects/common/src/client/java/dan200/computercraft/client/pocket/ClientPocketComputers.java

@@ -4,21 +4,25 @@
 
 package dan200.computercraft.client.pocket;
 
-import dan200.computercraft.shared.computer.core.ComputerFamily;
+import dan200.computercraft.shared.ModRegistry;
+import dan200.computercraft.shared.computer.core.ComputerState;
 import dan200.computercraft.shared.computer.core.ServerComputer;
+import dan200.computercraft.shared.computer.terminal.TerminalState;
 import dan200.computercraft.shared.network.client.PocketComputerDataMessage;
-import dan200.computercraft.shared.pocket.items.PocketComputerItem;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import net.minecraft.world.item.ItemStack;
 
+import javax.annotation.Nullable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
 /**
- * Maps {@link ServerComputer#getInstanceID()} to locals {@link PocketComputerData}.
+ * Maps {@link ServerComputer#getInstanceUUID()} to locals {@link PocketComputerData}.
  * <p>
  * This is populated by {@link PocketComputerDataMessage} and accessed when rendering pocket computers
  */
 public final class ClientPocketComputers {
-    private static final Int2ObjectMap<PocketComputerData> instances = new Int2ObjectOpenHashMap<>();
+    private static final Map<UUID, PocketComputerData> instances = new HashMap<>();
 
     private ClientPocketComputers() {
     }
@@ -27,25 +31,29 @@ public final class ClientPocketComputers {
         instances.clear();
     }
 
-    public static void remove(int id) {
+    public static void remove(UUID id) {
         instances.remove(id);
     }
 
     /**
-     * Get or create a pocket computer.
+     * Set the state of a pocket computer.
      *
-     * @param instanceId The instance ID of the pocket computer.
-     * @param advanced   Whether this computer has an advanced terminal.
-     * @return The pocket computer data.
+     * @param instanceId   The instance ID of the pocket computer.
+     * @param state        The computer state of the pocket computer.
+     * @param lightColour  The current colour of the modem light.
+     * @param terminalData The current terminal contents.
      */
-    public static PocketComputerData get(int instanceId, boolean advanced) {
+    public static void setState(UUID instanceId, ComputerState state, int lightColour, @Nullable TerminalState terminalData) {
         var computer = instances.get(instanceId);
-        if (computer == null) instances.put(instanceId, computer = new PocketComputerData(advanced));
-        return computer;
+        if (computer == null) {
+            instances.put(instanceId, new PocketComputerData(state, lightColour, terminalData));
+        } else {
+            computer.setState(state, lightColour, terminalData);
+        }
     }
 
-    public static PocketComputerData get(ItemStack stack) {
-        var family = stack.getItem() instanceof PocketComputerItem computer ? computer.getFamily() : ComputerFamily.NORMAL;
-        return get(PocketComputerItem.getInstanceID(stack), family != ComputerFamily.NORMAL);
+    public static @Nullable PocketComputerData get(ItemStack stack) {
+        var id = stack.get(ModRegistry.DataComponents.COMPUTER.get());
+        return id == null ? null : instances.get(id.instance());
     }
 }

projects/common/src/client/java/dan200/computercraft/client/pocket/PocketComputerData.java

@@ -4,13 +4,13 @@
 
 package dan200.computercraft.client.pocket;
 
-import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.shared.computer.core.ComputerState;
 import dan200.computercraft.shared.computer.terminal.NetworkedTerminal;
 import dan200.computercraft.shared.computer.terminal.TerminalState;
-import dan200.computercraft.shared.config.Config;
 import dan200.computercraft.shared.pocket.core.PocketServerComputer;
 
+import javax.annotation.Nullable;
+
 /**
  * Clientside data about a pocket computer.
  * <p>
@@ -21,20 +21,22 @@ import dan200.computercraft.shared.pocket.core.PocketServerComputer;
  * @see ClientPocketComputers The registry which holds pocket computers.
  * @see PocketServerComputer The server-side pocket computer.
  */
-public class PocketComputerData {
-    private final NetworkedTerminal terminal;
-    private ComputerState state = ComputerState.OFF;
-    private int lightColour = -1;
+public final class PocketComputerData {
+    private @Nullable NetworkedTerminal terminal;
+    private ComputerState state;
+    private int lightColour;
 
-    public PocketComputerData(boolean colour) {
-        terminal = new NetworkedTerminal(Config.pocketTermWidth, Config.pocketTermHeight, colour);
+    PocketComputerData(ComputerState state, int lightColour, @Nullable TerminalState terminalData) {
+        this.state = state;
+        this.lightColour = lightColour;
+        if (terminalData != null) terminal = terminalData.create();
     }
 
     public int getLightState() {
         return state != ComputerState.OFF ? lightColour : -1;
     }
 
-    public Terminal getTerminal() {
+    public @Nullable NetworkedTerminal getTerminal() {
         return terminal;
     }
 
@@ -42,12 +44,16 @@ public class PocketComputerData {
         return state;
     }
 
-    public void setState(ComputerState state, int lightColour) {
+    void setState(ComputerState state, int lightColour, @Nullable TerminalState terminalData) {
         this.state = state;
         this.lightColour = lightColour;
-    }
 
-    public void setTerminal(TerminalState state) {
-        state.apply(terminal);
+        if (terminalData != null) {
+            if (terminal == null) {
+                terminal = terminalData.create();
+            } else {
+                terminalData.apply(terminal);
+            }
+        }
     }
 }