Update NF and NG

Trying to rebuild after this OOM killed all my windows. I hate NeoGradle
so much.

.github/ISSUE_TEMPLATE/bug_report.yaml

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

.github/workflows/main-ci.yml

@@ -9,16 +9,16 @@ jobs:
 
     steps:
     - name: 📥 Clone repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
 
     - name: 📥 Set up Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v3
       with:
         java-version: 17
         distribution: 'temurin'
 
     - name: 📥 Setup Gradle
-      uses: gradle/actions/setup-gradle@v3
+      uses: gradle/gradle-build-action@v2
       with:
         cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/mc-') }}
 
@@ -30,16 +30,8 @@ jobs:
     - name: ⚒️ Build
       run: ./gradlew assemble || ./gradlew assemble
 
-    - name: Cache pre-commit
-      uses: actions/cache@v4
-      with:
-        path: ~/.cache/pre-commit
-        key: pre-commit-3|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
-
     - name: 💡 Lint
-      run: |
-        pipx install pre-commit
-        pre-commit run --show-diff-on-failure --color=always
+      uses: pre-commit/action@v3.0.0
 
     - name: 🧪 Run tests
       run: ./gradlew test validateMixinNames checkChangelog
@@ -66,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@v4
+      uses: actions/upload-artifact@v3
       with:
         name: CC-Tweaked
         path: ./jars
 
     - name: 📤 Upload coverage
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v3
 
   build-core:
     strategy:
@@ -89,28 +81,24 @@ jobs:
     runs-on: ${{ matrix.uses }}
 
     steps:
-    - name: 📥 Clone repository
-      uses: actions/checkout@v4
+    - name: Clone repository
+      uses: actions/checkout@v3
 
-    - name: 📥 Set up Java
-      uses: actions/setup-java@v4
+    - name: Set up Java
+      uses: actions/setup-java@v3
       with:
         java-version: 17
         distribution: 'temurin'
 
-    - name: 📥 Setup Gradle
-      uses: gradle/actions/setup-gradle@v3
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
       with:
         cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/mc-') }}
 
-    - name: ⚒️ Build
-      run: |
-        ./gradlew --configure-on-demand :core:assemble
-
-    - name: 🧪 Run tests
+    - 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

@@ -0,0 +1,19 @@
+#!/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,7 +3,8 @@ name: Build documentation
 on:
   push:
     branches:
-    - mc-*
+    - mc-1.19.x
+    - mc-1.20.x
 
 jobs:
   make_doc:
@@ -11,25 +12,30 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: 📥 Clone repository
-      uses: actions/checkout@v4
+    - name: Clone repository
+      uses: actions/checkout@v3
 
-    - name: 📥 Set up Java
-      uses: actions/setup-java@v4
+    - name: Set up Java
+      uses: actions/setup-java@v1
       with:
         java-version: 17
         distribution: 'temurin'
 
-    - name: 📥 Setup Gradle
-      uses: gradle/actions/setup-gradle@v3
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
       with:
         cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/mc-') }}
 
-    - name: ⚒️ Generate documentation
-      run: ./gradlew docWebsite --no-daemon
+    - name: Build with Gradle
+      run: ./gradlew compileJava --no-daemon || ./gradlew compileJava --no-daemon
 
-    - name: 📤 Upload Jar
-      uses: actions/upload-artifact@v4
-      with:
-        name: Documentation
-        path: ./projects/web/build/site/
+    - 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 }}

.gitignore

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

.gitpod.yml

@@ -0,0 +1,26 @@
+# 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

.pre-commit-config.yaml

@@ -27,7 +27,7 @@ repos:
     exclude: "^(.*\\.(bat)|LICENSE)$"
 
 - repo: https://github.com/fsfe/reuse-tool
-  rev: v4.0.3
+  rev: v2.1.0
   hooks:
   - id: reuse
 

.reuse/dep5

@@ -0,0 +1,100 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://github.com/cc-tweaked/cc-tweaked
+Upstream-Name: CC: Tweaked
+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/structures/*
+  projects/fabric/src/generated/*
+  projects/forge/src/generated/*
+  projects/web/src/htmlTransform/export/index.json
+  projects/web/src/htmlTransform/export/items/minecraft/*
+Comment: Generated/data files are CC0.
+Copyright: The CC: Tweaked Developers
+License: CC0-1.0
+
+Files:
+  doc/images/*
+  package.json
+  package-lock.json
+  projects/common/src/client/resources/computercraft-client.mixins.json
+  projects/common/src/main/resources/assets/minecraft/shaders/core/computercraft/monitor_tbo.json
+  projects/common/src/main/resources/computercraft.mixins.json
+  projects/common/src/testMod/resources/computercraft-gametest.mixins.json
+  projects/common/src/testMod/resources/data/computercraft/loot_tables/treasure_disk.json
+  projects/common/src/testMod/resources/pack.mcmeta
+  projects/core/src/main/resources/data/computercraft/lua/rom/modules/command/.ignoreme
+  projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/.ignoreme
+  projects/core/src/main/resources/data/computercraft/lua/rom/modules/turtle/.ignoreme
+  projects/core/src/main/resources/data/computercraft/lua/rom/motd.txt
+  projects/fabric-api/src/main/modJson/fabric.mod.json
+  projects/fabric/src/client/resources/computercraft-client.fabric.mixins.json
+  projects/fabric/src/main/resources/computercraft.fabric.mixins.json
+  projects/fabric/src/main/resources/fabric.mod.json
+  projects/fabric/src/testMod/resources/computercraft-gametest.fabric.mixins.json
+  projects/fabric/src/testMod/resources/fabric.mod.json
+  projects/forge/src/client/resources/computercraft-client.forge.mixins.json
+  projects/web/src/frontend/mount/.settings
+  projects/web/src/frontend/mount/example.nfp
+  projects/web/src/frontend/mount/example.nft
+  projects/web/src/frontend/mount/expr_template.lua
+  projects/web/tsconfig.json
+Comment: Several assets where it's inconvenient to create a .license file.
+Copyright: The CC: Tweaked Developers
+License: MPL-2.0
+
+Files:
+  doc/logo.png
+  doc/logo-darkmode.png
+  projects/common/src/main/resources/assets/computercraft/models/*
+  projects/common/src/main/resources/assets/computercraft/textures/*
+  projects/common/src/main/resources/pack.mcmeta
+  projects/common/src/main/resources/pack.png
+  projects/core/src/main/resources/assets/computercraft/textures/gui/term_font.png
+  projects/core/src/main/resources/data/computercraft/lua/rom/autorun/.ignoreme
+  projects/core/src/main/resources/data/computercraft/lua/rom/help/*
+  projects/core/src/main/resources/data/computercraft/lua/rom/programs/fun/advanced/levels/*
+  projects/web/src/htmlTransform/export/items/computercraft/*
+Comment: Bulk-license original assets as CCPL.
+Copyright: 2011 Daniel Ratcliffe
+License: LicenseRef-CCPL
+
+Files:
+  projects/common/src/main/resources/assets/computercraft/lang/cs_cz.json
+  projects/common/src/main/resources/assets/computercraft/lang/ko_kr.json
+  projects/common/src/main/resources/assets/computercraft/lang/pl_pl.json
+  projects/common/src/main/resources/assets/computercraft/lang/pt_br.json
+  projects/common/src/main/resources/assets/computercraft/lang/ru_ru.json
+  projects/common/src/main/resources/assets/computercraft/lang/uk_ua.json
+  projects/common/src/main/resources/assets/computercraft/lang/zh_cn.json
+Comment: Community-contributed license files
+Copyright: 2017 The CC: Tweaked Developers
+License: LicenseRef-CCPL
+
+Files:
+  projects/common/src/main/resources/assets/computercraft/lang/*
+Comment: Community-contributed license files
+Copyright: 2017 The CC: Tweaked Developers
+License: MPL-2.0
+
+Files:
+  .github/*
+Comment:
+  GitHub build scripts are CC0. While we could add a header to each file,
+  it's unclear if it will break actions or issue templates in some way.
+Copyright: Jonathan Coates <git@squiddev.cc>
+License: CC0-1.0
+
+Files:
+  gradle/wrapper/*
+  gradlew
+  gradlew.bat
+Copyright: Gradle Inc
+License: Apache-2.0
+
+Files: projects/core/src/test/resources/test-rom/data/json-parsing/*
+Copyright: 2016 Nicolas Seriot
+License: MIT

CONTRIBUTING.md

@@ -22,16 +22,16 @@ If you have a bug, suggestion, or other feedback, the best thing to do is [file
 use the issue templates - they provide a useful hint on what information to provide.
 
 ## Translations
-Translations are managed through [CrowdIn], an online interface for managing language strings. Translations may either
-be contributed there, or directly via a pull request.
+Translations are managed through [Weblate], an online interface for managing language strings. This is synced
+automatically with GitHub, so please don't submit PRs adding/changing translations!
 
 ## Setting up a development environment
 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 17 (JDK). This can be downloaded from [Adoptium].
+   - Java Development Kit (JDK) installed. This can be downloaded from [Adoptium].
    - [Git](https://git-scm.com/).
-   - [NodeJS 20 or later][node].
+   - If you want to work on documentation, [NodeJS][node].
 
  - Download CC: Tweaked's source code:
    ```
@@ -101,10 +101,10 @@ about how you can build on that until you've covered everything!
 [community]: README.md#community "Get in touch with the community."
 [Adoptium]: https://adoptium.net/temurin/releases?version=17 "Download OpenJDK 17"
 [illuaminate]: https://github.com/SquidDev/illuaminate/ "Illuaminate on GitHub"
+[weblate]: https://i18n.tweaked.cc/projects/cc-tweaked/minecraft/ "CC: Tweaked weblate instance"
 [docs]: https://tweaked.cc/ "CC: Tweaked documentation"
 [ldoc]: http://stevedonovan.github.io/ldoc/ "ldoc, a Lua documentation generator."
 [mc-test]: https://www.youtube.com/watch?v=vXaWOJTCYNg
 [busted]: https://github.com/Olivine-Labs/busted "busted: Elegant Lua unit testing."
 [node]: https://nodejs.org/en/ "Node.js"
 [architecture]: projects/ARCHITECTURE.md
-[Crowdin]: https://crowdin.com/project/cc-tweaked/

README.md

@@ -26,9 +26,8 @@ developing the mod, [check out the instructions here](CONTRIBUTING.md#developing
 
 ## Community
 If you need help getting started with CC: Tweaked, want to show off your latest project, or just want to chat about
-ComputerCraft, do check out our [GitHub discussions page][GitHub discussions]! There's also a fairly populated,
-albeit quiet IRC channel on [EsperNet], if that's more your cup of tea. You can join `#computercraft` through your
-desktop client, or online using [KiwiIRC].
+ComputerCraft, do check out our [forum] and [GitHub discussions page][GitHub discussions]! There's also a fairly
+populated, albeit quiet [IRC channel][irc], if that's more your cup of tea.
 
 We also host fairly comprehensive documentation at [tweaked.cc](https://tweaked.cc/ "The CC: Tweaked website").
 
@@ -40,7 +39,7 @@ on is present.
 ```groovy
 repositories {
   maven {
-    url "https://maven.squiddev.cc"
+    url "https://squiddev.cc/maven/"
     content {
       includeGroup("cc.tweaked")
     }
@@ -52,9 +51,8 @@ dependencies {
   compileOnly("cc.tweaked:cc-tweaked-$mcVersion-common-api:$cctVersion")
 
   // Forge Gradle
-  compileOnly("cc.tweaked:cc-tweaked-$mcVersion-core-api:$cctVersion")
-  compileOnly(fg.deobf("cc.tweaked:cc-tweaked-$mcVersion-forge-api:$cctVersion"))
-  runtimeOnly(fg.deobf("cc.tweaked:cc-tweaked-$mcVersion-forge:$cctVersion"))
+  compileOnly("cc.tweaked:cc-tweaked-$mcVersion-forge-api:$cctVersion")
+  runtimeOnly("cc.tweaked:cc-tweaked-$mcVersion-forge:$cctVersion")
 
   // Fabric Loom
   modCompileOnly("cc.tweaked:cc-tweaked-$mcVersion-fabric-api:$cctVersion")
@@ -87,6 +85,6 @@ the generated documentation [can be browsed online](https://tweaked.cc/javadoc/)
 [modrinth]: https://modrinth.com/mod/gu7yAYhd "Download CC: Tweaked from Modrinth"
 [Minecraft Forge]: https://files.minecraftforge.net/ "Download Minecraft Forge."
 [Fabric]: https://fabricmc.net/use/installer/ "Download Fabric."
+[forum]: https://forums.computercraft.cc/
 [GitHub Discussions]: https://github.com/cc-tweaked/CC-Tweaked/discussions
-[EsperNet]: https://www.esper.net/
-[KiwiIRC]: https://kiwiirc.com/nextclient/#irc://irc.esper.net:+6697/#computercraft "#computercraft on EsperNet"
+[IRC]: https://webchat.esper.net/?channels=computercraft "#computercraft on EsperNet"

REUSE.toml

@@ -1,110 +0,0 @@
-# SPDX-FileCopyrightText: 2017 The CC: Tweaked Developers
-#
-# SPDX-License-Identifier: MPL-2.0
-
-version = 1
-SPDX-PackageName = "CC: Tweaked"
-SPDX-PackageSupplier = "Jonathan Coates <git@squiddev.cc>"
-SPDX-PackageDownloadLocation = "https://github.com/cc-tweaked/cc-tweaked"
-
-[[annotations]]
-# Generated/data files are CC0.
-SPDX-FileCopyrightText = "The CC: Tweaked Developers"
-SPDX-License-Identifier = "CC0-1.0"
-path = [
-    "gradle/gradle-daemon-jvm.properties",
-    "projects/common/src/main/resources/assets/computercraft/sounds.json",
-    "projects/common/src/main/resources/assets/computercraft/sounds/empty.ogg",
-    "projects/common/src/testMod/resources/data/cctest/computercraft/turtle_upgrades/**",
-    "projects/common/src/testMod/resources/data/cctest/structures/**",
-    "projects/**/src/generated/**",
-    "projects/web/src/htmlTransform/export/index.json",
-    "projects/web/src/htmlTransform/export/items/minecraft/**",
-]
-
-[[annotations]]
-# Several assets where it's inconvenient to create a .license file.
-SPDX-FileCopyrightText = "The CC: Tweaked Developers"
-SPDX-License-Identifier = "MPL-2.0"
-path = [
-    "doc/images/**",
-    "package.json",
-    "package-lock.json",
-    "projects/common/src/client/resources/computercraft-client.mixins.json",
-    "projects/common/src/main/resources/assets/minecraft/shaders/core/computercraft/monitor_tbo.json",
-    "projects/common/src/main/resources/computercraft.mixins.json",
-    "projects/common/src/testMod/resources/computercraft-gametest.mixins.json",
-    "projects/common/src/testMod/resources/data/computercraft/loot_tables/treasure_disk.json",
-    "projects/common/src/testMod/resources/pack.mcmeta",
-    "projects/core/src/main/resources/data/computercraft/lua/rom/modules/command/.ignoreme",
-    "projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/.ignoreme",
-    "projects/core/src/main/resources/data/computercraft/lua/rom/modules/turtle/.ignoreme",
-    "projects/core/src/main/resources/data/computercraft/lua/rom/motd.txt",
-    "projects/fabric-api/src/main/modJson/fabric.mod.json",
-    "projects/fabric/src/client/resources/computercraft-client.fabric.mixins.json",
-    "projects/fabric/src/main/resources/computercraft.fabric.mixins.json",
-    "projects/fabric/src/main/resources/fabric.mod.json",
-    "projects/fabric/src/testMod/resources/computercraft-gametest.fabric.mixins.json",
-    "projects/fabric/src/testMod/resources/fabric.mod.json",
-    "projects/forge/src/client/resources/computercraft-client.forge.mixins.json",
-    "projects/web/src/frontend/mount/.settings",
-    "projects/web/src/frontend/mount/example.nfp",
-    "projects/web/src/frontend/mount/example.nft",
-    "projects/web/src/frontend/mount/expr_template.lua",
-    "projects/web/tsconfig.json",
-]
-
-[[annotations]]
-# Bulk-license original assets as CCPL.
-SPDX-FileCopyrightText = "2011 Daniel Ratcliffe"
-SPDX-License-Identifier = "LicenseRef-CCPL"
-path = [
-    "doc/logo.png",
-    "doc/logo-darkmode.png",
-    "projects/common/src/main/resources/assets/computercraft/models/**",
-    "projects/common/src/main/resources/assets/computercraft/textures/**",
-    "projects/common/src/main/resources/pack.mcmeta",
-    "projects/common/src/main/resources/pack.png",
-    "projects/core/src/main/resources/assets/computercraft/textures/gui/term_font.png",
-    "projects/core/src/main/resources/data/computercraft/lua/rom/autorun/.ignoreme",
-    "projects/core/src/main/resources/data/computercraft/lua/rom/help/**",
-    "projects/core/src/main/resources/data/computercraft/lua/rom/programs/fun/advanced/levels/**",
-    "projects/web/src/htmlTransform/export/items/computercraft/**",
-]
-
-[[annotations]]
-# Community-contributed license files
-SPDX-FileCopyrightText = "2017 The CC: Tweaked Developers"
-SPDX-License-Identifier = "LicenseRef-CCPL"
-path = [
-    "projects/common/src/main/resources/assets/computercraft/lang/cs_cz.json",
-    "projects/common/src/main/resources/assets/computercraft/lang/ko_kr.json",
-    "projects/common/src/main/resources/assets/computercraft/lang/pl_pl.json",
-    "projects/common/src/main/resources/assets/computercraft/lang/pt_br.json",
-    "projects/common/src/main/resources/assets/computercraft/lang/ru_ru.json",
-    "projects/common/src/main/resources/assets/computercraft/lang/uk_ua.json",
-    "projects/common/src/main/resources/assets/computercraft/lang/zh_cn.json",
-]
-
-[[annotations]]
-# Community-contributed license files
-SPDX-FileCopyrightText = "2017 The CC: Tweaked Developers"
-SPDX-License-Identifier = "MPL-2.0"
-path = "projects/common/src/main/resources/assets/computercraft/lang/**"
-
-[[annotations]]
-# GitHub build scripts are CC0. While we could add a header to each file,
-# it's unclear if it will break actions or issue templates in some way.
-SPDX-FileCopyrightText = "Jonathan Coates <git@squiddev.cc>"
-SPDX-License-Identifier = "CC0-1.0"
-path = ".github/**"
-
-[[annotations]]
-path = ["gradle/wrapper/**"]
-SPDX-FileCopyrightText = "Gradle Inc"
-SPDX-License-Identifier = "Apache-2.0"
-
-[[annotations]]
-path = "projects/core/src/test/resources/test-rom/data/json-parsing/**"
-SPDX-FileCopyrightText = "2016 Nicolas Seriot"
-SPDX-License-Identifier = "MIT"

build.gradle.kts

@@ -5,8 +5,9 @@
 import cc.tweaked.gradle.JUnitExt
 import net.fabricmc.loom.api.LoomGradleExtensionAPI
 import net.fabricmc.loom.util.gradle.SourceSetHelper
-import org.jetbrains.gradle.ext.*
-import org.jetbrains.gradle.ext.Application
+import org.jetbrains.gradle.ext.compiler
+import org.jetbrains.gradle.ext.runConfigurations
+import org.jetbrains.gradle.ext.settings
 
 plugins {
     publishing
@@ -85,19 +86,6 @@ 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

@@ -14,18 +14,14 @@ repositories {
     mavenCentral()
     gradlePluginPortal()
 
-    maven("https://maven.minecraftforge.net") {
-        name = "Forge"
+    maven("https://maven.neoforged.net/releases") {
+        name = "NeoForge"
         content {
             includeGroup("net.minecraftforge")
-            includeGroup("net.minecraftforge.gradle")
-        }
-    }
-
-    maven("https://maven.parchmentmc.org") {
-        name = "Librarian"
-        content {
-            includeGroupByRegex("^org\\.parchmentmc.*")
+            includeGroup("net.neoforged")
+            includeGroup("net.neoforged.gradle")
+            includeModule("codechicken", "DiffPatch")
+            includeModule("net.covers1624", "Quack")
         }
     }
 
@@ -36,7 +32,7 @@ repositories {
         }
     }
 
-    maven("https://maven.squiddev.cc") {
+    maven("https://squiddev.cc/maven") {
         name = "SquidDev"
         content {
             includeGroup("cc.tweaked.vanilla-extract")
@@ -51,10 +47,9 @@ dependencies {
 
     implementation(libs.curseForgeGradle)
     implementation(libs.fabric.loom)
-    implementation(libs.forgeGradle)
     implementation(libs.ideaExt)
-    implementation(libs.librarian)
     implementation(libs.minotaur)
+    implementation(libs.neoGradle.userdev)
     implementation(libs.vanillaExtract)
 }
 

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

@@ -10,10 +10,8 @@ import cc.tweaked.gradle.IdeaRunConfigurations
 import cc.tweaked.gradle.MinecraftConfigurations
 
 plugins {
-    id("net.minecraftforge.gradle")
-    // We must apply java-convention after Forge, as we need the fg extension to be present.
     id("cc-tweaked.java-convention")
-    id("org.parchmentmc.librarian.forgegradle")
+    id("net.neoforged.gradle.userdev")
 }
 
 plugins.apply(CCTweakedPlugin::class.java)
@@ -21,10 +19,20 @@ plugins.apply(CCTweakedPlugin::class.java)
 val mcVersion: String by extra
 
 minecraft {
-    val libs = project.extensions.getByType<VersionCatalogsExtension>().named("libs")
-    mappings("parchment", "${libs.findVersion("parchmentMc").get()}-${libs.findVersion("parchment").get()}-$mcVersion")
+    modIdentifier("computercraft")
+}
 
-    accessTransformer(project(":forge").file("src/main/resources/META-INF/accesstransformer.cfg"))
+subsystems {
+    parchment {
+        val libs = project.extensions.getByType<VersionCatalogsExtension>().named("libs")
+        minecraftVersion = libs.findVersion("parchmentMc").get().toString()
+        mappingsVersion = libs.findVersion("parchment").get().toString()
+    }
+}
+
+dependencies {
+    val libs = project.extensions.getByType<VersionCatalogsExtension>().named("libs")
+    implementation("net.neoforged:neoforge:${libs.findVersion("neoForge").get()}")
 }
 
 MinecraftConfigurations.setup(project)
@@ -32,13 +40,3 @@ MinecraftConfigurations.setup(project)
 extensions.configure(CCTweakedExtension::class.java) {
     linters(minecraft = true, loader = "forge")
 }
-
-dependencies {
-    val libs = project.extensions.getByType<VersionCatalogsExtension>().named("libs")
-    "minecraft"("net.minecraftforge:forge:$mcVersion-${libs.findVersion("forge").get()}")
-}
-
-tasks.configureEach {
-    // genIntellijRuns isn't registered until much later, so we need this silly hijinks.
-    if (name == "genIntellijRuns") doLast { IdeaRunConfigurations(project).patch() }
-}

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

@@ -38,23 +38,15 @@ java {
 repositories {
     mavenCentral()
 
-    val mainMaven = maven("https://maven.squiddev.cc/mirror") {
+    val mainMaven = maven("https://squiddev.cc/maven") {
         name = "SquidDev"
     }
 
     exclusiveContent {
         forRepositories(mainMaven)
-
-        // Include the ForgeGradle repository if present. This requires that ForgeGradle is already present, which we
-        // enforce in our Forge overlay.
-        val fg =
-            project.extensions.findByType(net.minecraftforge.gradle.userdev.DependencyManagementExtension::class.java)
-        if (fg != null) forRepositories(fg.repository)
-
         filter {
             includeGroup("cc.tweaked")
             // Things we mirror
-            includeGroup("com.simibubi.create")
             includeGroup("commoble.morered")
             includeGroup("dev.architectury")
             includeGroup("dev.emi")
@@ -95,8 +87,9 @@ 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("EnumOrdinal", CheckSeverity.OFF) // For now. We could replace most of these with EnumMap.
+            check("UnusedVariable", CheckSeverity.OFF) // Too many false positives with records.
             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
 
@@ -109,8 +102,6 @@ sourceSets.all {
             option("NullAway:CastToNonNullMethod", "dan200.computercraft.core.util.Nullability.assertNonNull")
             option("NullAway:CheckOptionalEmptiness")
             option("NullAway:AcknowledgeRestrictiveAnnotations")
-
-            excludedPaths = ".*/jmh_generated/.*"
         }
     }
 }
@@ -134,8 +125,8 @@ tasks.processResources {
 tasks.withType(AbstractArchiveTask::class.java).configureEach {
     isPreserveFileTimestamps = false
     isReproducibleFileOrder = true
-    filePermissions {}
-    dirPermissions {}
+    dirMode = Integer.valueOf("755", 8)
+    fileMode = Integer.valueOf("664", 8)
 }
 
 tasks.jar {

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)
+    val mainFile = upload("282001", modPublishing.output.get().archiveFile)
     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://maven.squiddev.cc") {
+        maven("https://squiddev.cc/maven") {
             name = "SquidDev"
 
             credentials(PasswordCredentials::class)

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

@@ -22,6 +22,7 @@ import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.bundling.Jar
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.javadoc.Javadoc
+import org.gradle.configurationcache.extensions.capitalized
 import org.gradle.language.base.plugins.LifecycleBasePlugin
 import org.gradle.language.jvm.tasks.ProcessResources
 import org.gradle.process.JavaForkOptions
@@ -34,6 +35,7 @@ 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(
@@ -180,7 +182,7 @@ abstract class CCTweakedExtension(
 
     fun <T> jacoco(task: NamedDomainObjectProvider<T>) where T : Task, T : JavaForkOptions {
         val classDump = project.layout.buildDirectory.dir("jacocoClassDump/${task.name}")
-        val reportTaskName = "jacoco${task.name.capitalise()}Report"
+        val reportTaskName = "jacoco${task.name.capitalized()}Report"
 
         val jacoco = project.extensions.getByType(JacocoPluginExtension::class.java)
         task.configure {
@@ -224,12 +226,12 @@ abstract class CCTweakedExtension(
      * where possible.
      */
     fun downloadFile(label: String, url: String): File {
-        val uri = URI(url)
-        val path = File(uri.path)
+        val url = URL(url)
+        val path = File(url.path)
 
         project.repositories.ivy {
             name = label
-            setUrl(URI(uri.scheme, uri.userInfo, uri.host, uri.port, path.parent, null, null))
+            setUrl(URI(url.protocol, url.userInfo, url.host, url.port, path.parent, null, null))
             patternLayout {
                 artifact("[artifact].[ext]")
             }

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

@@ -143,7 +143,7 @@ fun getNextVersion(version: String): String {
     val lastIndex = mainVersion.lastIndexOf('.')
     if (lastIndex < 0) throw IllegalArgumentException("Cannot parse version format \"$version\"")
     val lastVersion = try {
-        mainVersion.substring(lastIndex + 1).toInt()
+        version.substring(lastIndex + 1).toInt()
     } catch (e: NumberFormatException) {
         throw IllegalArgumentException("Cannot parse version format \"$version\"", e)
     }
@@ -155,15 +155,3 @@ fun getNextVersion(version: String): String {
     if (dashIndex >= 0) out.append(version, dashIndex, version.length)
     return out.toString()
 }
-
-/**
- * Capitalise the first letter of the string.
- *
- * This is a replacement for the now deprecated [String.capitalize].
- */
-fun String.capitalise(): String {
-    if (isEmpty()) return this
-    val first = this[0]
-    val firstTitle = first.titlecaseChar()
-    return if (first == firstTitle) this else firstTitle + substring(1)
-}

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

@@ -4,23 +4,59 @@
 
 package cc.tweaked.gradle
 
-import net.minecraftforge.gradle.common.util.RunConfig
-import net.minecraftforge.gradle.common.util.runs.setRunConfigInternal
+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: RunConfig) {
-    dependsOn("prepareRuns")
-    setRunConfigInternal(project, this, config)
-    doFirst("Create working directory") { Files.createDirectories(workingDir.toPath()) }
+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

@@ -1,120 +0,0 @@
-// 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/MinecraftExec.kt

@@ -4,7 +4,6 @@
 
 package cc.tweaked.gradle
 
-import net.minecraftforge.gradle.common.util.RunConfig
 import org.gradle.api.GradleException
 import org.gradle.api.file.FileSystemOperations
 import org.gradle.api.invocation.Gradle
@@ -65,14 +64,6 @@ abstract class ClientJavaExec : JavaExec() {
         setTestProperties()
     }
 
-    /**
-     * Set this task to run a given [RunConfig].
-     */
-    fun setRunConfig(config: RunConfig) {
-        (this as JavaExec).setRunConfig(config)
-        setTestProperties() // setRunConfig may clobber some properties, ensure everything is set.
-    }
-
     /**
      * Copy configuration from a task with the given name.
      */

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

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

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

@@ -9,7 +9,6 @@ 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 {
@@ -35,7 +34,7 @@ internal object ProcessHelpers {
         val process = startProcess(*command)
         process.outputStream.close()
 
-        val out = BufferedReader(InputStreamReader(process.inputStream, StandardCharsets.UTF_8)).use { reader ->
+        val out = BufferedReader(InputStreamReader(process.inputStream)).use { reader ->
             reader.lines().filter { it.isNotEmpty() }.toList()
         }
         ProcessGroovyMethods.closeStreams(process)
@@ -47,28 +46,6 @@ 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) {

buildSrc/src/main/kotlin/net/minecraftforge/gradle/common/util/runs/RunConfigSetup.kt

@@ -1,51 +0,0 @@
-// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package net.minecraftforge.gradle.common.util.runs
-
-import net.minecraftforge.gradle.common.util.RunConfig
-import org.gradle.api.Project
-import org.gradle.process.CommandLineArgumentProvider
-import org.gradle.process.JavaExecSpec
-import java.io.File
-import java.util.function.Supplier
-import java.util.stream.Collectors
-import java.util.stream.Stream
-
-/**
- * Set up a [JavaExecSpec] to execute a [RunConfig].
- *
- * [MinecraftRunTask] sets up all its properties when the task is executed, rather than when configured. As such, it's
- * not possible to use [cc.tweaked.gradle.copyToFull] like we do for Fabric. Instead, we set up the task manually.
- *
- * Unfortunately most of the functionality we need is package-private, and so we have to put our code into the package.
- */
-internal fun setRunConfigInternal(project: Project, spec: JavaExecSpec, config: RunConfig) {
-    spec.workingDir = File(config.workingDirectory)
-
-    spec.mainClass.set(config.main)
-    for (source in config.allSources) spec.classpath(source.runtimeClasspath)
-
-    val originalTask = project.tasks.named(config.taskName, MinecraftRunTask::class.java)
-
-    // Add argument and JVM argument via providers, to be as lazy as possible with fetching artifacts.
-    val lazyTokens = RunConfigGenerator.configureTokensLazy(
-        project, config, RunConfigGenerator.mapModClassesToGradle(project, config),
-        originalTask.get().minecraftArtifacts,
-        originalTask.get().runtimeClasspathArtifacts,
-    )
-    spec.argumentProviders.add(
-        CommandLineArgumentProvider {
-            RunConfigGenerator.getArgsStream(config, lazyTokens, false).toList()
-        },
-    )
-    spec.jvmArgumentProviders.add(
-        CommandLineArgumentProvider {
-            (if (config.isClient) config.jvmArgs + originalTask.get().additionalClientArgs.get() else config.jvmArgs).map { config.replace(lazyTokens, it) } +
-                config.properties.map { (k, v) -> "-D${k}=${config.replace(lazyTokens, v)}" }
-        },
-    )
-
-    for ((key, value) in config.environment) spec.environment(key, config.replace(lazyTokens, value))
-}

config/checkstyle/checkstyle.xml

@@ -13,12 +13,8 @@ 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,5 @@ 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|Test).java" />
+    <suppress checks="MethodName" files=".*Contract.java" />
 </suppressions>

config/gitpod/Dockerfile

@@ -0,0 +1,12 @@
+# 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

crowdin.yml

@@ -1,27 +0,0 @@
-# SPDX-FileCopyrightText: 2017 The CC: Tweaked Developers
-#
-# SPDX-License-Identifier: MPL-2.0
-files:
-  - source: projects/common/src/generated/resources/assets/computercraft/lang/en_us.json
-    translation: /projects/common/src/main/resources/assets/computercraft/lang/%locale_with_underscore%.json
-    languages_mapping:
-      locale_with_underscore:
-        cs: cs_cs    # Czech
-        da: da_dk    # Danish
-        de: de_de    # German
-        es-ES: es_es # Spanish
-        fr: fr_fr    # French
-        it: it_it    # Italian
-        ja: ja_jp    # Japanese
-        ko: ko_kr    # Korean
-        nb: nb_no    # Norwegian Bokmal
-        nl: nl_nl    # Dutch
-        pl: pl_pl    # Polish
-        pt-BR: pt_br # Portuguese, Brazilian
-        ru: ru_ru    # Russian
-        sv-SE: sv_se # Sweedish
-        tok: tok     # Toki Pona
-        tr: tr_tr    # Turkish
-        uk: uk_ua    # Ukraine
-        vi: vi_vn    # Vietnamese
-        zh-CN: zh_cn # Chinese Simplified

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. DFPWM uses a single bit for each
+As mentioned above, [`speaker.playAudio`] accepts at most 128×1024 samples in one go. DFPMW 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.
@@ -191,7 +191,7 @@ end
 
 > [Confused?][!NOTE]
 > Don't worry if you don't understand this example. It's quite advanced, and does use some ideas that this guide doesn't
-> cover. That said, don't be afraid to ask [the community for help][community].
+> cover. That said, don't be afraid to ask on [GitHub Discussions] or [IRC] either!
 
 It's worth noting that the examples of audio processing we've mentioned here are about manipulating the _amplitude_ of
 the wave. If you wanted to modify the _frequency_ (for instance, shifting the pitch), things get rather more complex.
@@ -205,4 +205,5 @@ This is, I'm afraid, left as an exercise to the reader.
 [PCM]: https://en.wikipedia.org/wiki/Pulse-code_modulation "Pulse-code Modulation - Wikipedia"
 [Ring Buffer]: https://en.wikipedia.org/wiki/Circular_buffer "Circular buffer - Wikipedia"
 [Sine Wave]: https://en.wikipedia.org/wiki/Sine_wave "Sine wave - Wikipedia"
-[Community]: /#community
+[GitHub Discussions]: https://github.com/cc-tweaked/CC-Tweaked/discussions
+[IRC]: https://webchat.esper.net/?channels=computercraft "#computercraft on EsperNet"

doc/index.md

@@ -4,14 +4,7 @@ SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers
 SPDX-License-Identifier: MPL-2.0
 -->
 
-<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](logo.png)
 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.
@@ -45,16 +38,12 @@ 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](https://ccf.squiddev.cc/forums2/index.php?/topic/15033-computer-basics-i/ "Computer Basics I")
+ - [Lyqyd's Computer Basics 1](http://www.computercraft.info/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.
 
-<h2 id="community">Community</h2>
-If you need help getting started with CC: Tweaked, want to show off your latest project, or just want to chat about
-ComputerCraft, do check out our [GitHub discussions page][GitHub discussions]! There's also a fairly populated,
-albeit quiet IRC channel on [EsperNet], if that's more your cup of tea. You can join `#computercraft` through your
-desktop client, or online using [KiwiIRC].
+If you get stuck, do [ask a question on GitHub][GitHub Discussions] or pop in to the ComputerCraft's [IRC channel][IRC].
 
 ## Get Involved
 CC: Tweaked lives on [GitHub]. If you've got any ideas, feedback or bugs please do [create an issue][bug].
@@ -69,5 +58,4 @@ CC: Tweaked lives on [GitHub]. If you've got any ideas, feedback or bugs please
 [Fabric]: https://fabricmc.net/use/installer/ "Download Fabric."
 [lua]: https://www.lua.org/ "Lua's main website"
 [GitHub Discussions]: https://github.com/cc-tweaked/CC-Tweaked/discussions
-[EsperNet]: https://www.esper.net/
-[KiwiIRC]: https://kiwiirc.com/nextclient/#irc://irc.esper.net:+6697/#computercraft "#computercraft on EsperNet"
+[IRC]: https://webchat.esper.net/?channels=computercraft "#computercraft on EsperNet"

doc/mod-page.md

@@ -45,16 +45,12 @@ 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](https://ccf.squiddev.cc/forums2/index.php?/topic/15033-computer-basics-i/ "Computer Basics I")
+ - [Lyqyd's Computer Basics 1](http://www.computercraft.info/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.
 
-## Community
-If you need help getting started with CC: Tweaked, want to show off your latest project, or just want to chat about
-ComputerCraft, do check out our [GitHub discussions page][GitHub discussions]! There's also a fairly populated,
-albeit quiet IRC channel on [EsperNet], if that's more your cup of tea. You can join `#computercraft` through your
-desktop client, or online using [KiwiIRC].
+If you get stuck, do [ask a question on GitHub][GitHub Discussions] or pop in to the ComputerCraft's [IRC channel][IRC].
 
 ## Get Involved
 CC: Tweaked lives on [GitHub]. If you've got any ideas, feedback or bugs please do [create an issue][bug].
@@ -64,5 +60,4 @@ CC: Tweaked lives on [GitHub]. If you've got any ideas, feedback or bugs please
 [computercraft]: https://github.com/dan200/ComputerCraft "ComputerCraft on GitHub"
 [lua]: https://www.lua.org/ "Lua's main website"
 [GitHub Discussions]: https://github.com/cc-tweaked/CC-Tweaked/discussions
-[EsperNet]: https://www.esper.net/
-[KiwiIRC]: https://kiwiirc.com/nextclient/#irc://irc.esper.net:+6697/#computercraft "#computercraft on EsperNet"
+[IRC]: http://webchat.esper.net/?channels=computercraft "#computercraft on EsperNet"

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.wiki/w/Tutorials/Creating_a_data_pack#Legal_characters
+[legal_data_pack]: https://minecraft.gamepedia.com/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

@@ -1,140 +0,0 @@
----
-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"

doc/reference/feature_compat.md

@@ -81,7 +81,7 @@ compatibility for these newer versions.
 | `string.dump` strip argument                                                          | ✔          |                           |
 | `string.pack`/`string.unpack`/`string.packsize`                                       | ✔          |                           |
 | `table.move`                                                                          | ✔          |                           |
-| `math.atan2` -> `math.atan`                                                           | 🔶         | `math.atan` supports its two argument form. |
+| `math.atan2` -> `math.atan`                                                           | ❌         |                           |
 | Removed `math.frexp`, `math.ldexp`, `math.pow`, `math.cosh`, `math.sinh`, `math.tanh` | ❌         |                           |
 | `math.maxinteger`/`math.mininteger`                                                   | ❌         |                           |
 | `math.tointeger`                                                                      | ❌         |                           |

gradle.properties

@@ -2,15 +2,15 @@
 #
 # SPDX-License-Identifier: MPL-2.0
 
-org.gradle.jvmargs=-Xmx3G -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx3G
 org.gradle.parallel=true
 
 kotlin.stdlib.default.dependency=false
 kotlin.jvm.target.validation.mode=error
 
 # Mod properties
-isUnstable=false
-modVersion=1.113.1
+isUnstable=true
+modVersion=1.109.6
 
 # Minecraft properties: We want to configure this here so we can read it in settings.gradle
-mcVersion=1.20.1
+mcVersion=1.20.4

gradle/gradle-daemon-jvm.properties

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

gradle/libs.versions.toml

@@ -7,26 +7,26 @@
 # Minecraft
 # MC version is specified in gradle.properties, as we need that in settings.gradle.
 # Remember to update corresponding versions in fabric.mod.json/mods.toml
-fabric-api = "0.86.1+1.20.1"
-fabric-loader = "0.14.21"
-forge = "47.1.0"
-forgeSpi = "7.0.1"
+fabric-api = "0.93.1+1.20.4"
+fabric-loader = "0.15.3"
+neoForge = "20.4.161-beta"
+neoForgeSpi = "8.0.1"
 mixin = "0.8.5"
-parchment = "2023.08.20"
-parchmentMc = "1.20.1"
-yarn = "1.20.1+build.10"
+parchment = "2023.12.31"
+parchmentMc = "1.20.3"
+yarn = "1.20.4+build.3"
 
 # Core dependencies (these versions are tied to the version Minecraft uses)
-fastutil = "8.5.9"
-guava = "31.1-jre"
-netty = "4.1.82.Final"
-slf4j = "2.0.1"
+fastutil = "8.5.12"
+guava = "32.1.2-jre"
+netty = "4.1.97.Final"
+slf4j = "2.0.7"
 
 # Core dependencies (independent of Minecraft)
 asm = "9.6"
 autoService = "1.1.1"
 checkerFramework = "3.42.0"
-cobalt = "0.9.4"
+cobalt = "0.9.1"
 commonsCli = "1.6.0"
 jetbrainsAnnotations = "24.1.0"
 jsr305 = "3.0.2"
@@ -36,46 +36,41 @@ kotlin-coroutines = "1.7.3"
 nightConfig = "3.6.7"
 
 # Minecraft mods
-emi = "1.0.8+1.20.1"
+emi = "1.0.30+1.20.4"
 fabricPermissions = "0.3.20230723"
-iris = "1.6.4+1.20"
-jei = "15.2.0.22"
-modmenu = "7.1.0"
+iris = "1.6.14+1.20.4"
+jei = "17.3.0.48"
+modmenu = "9.0.0"
 moreRed = "4.0.0.4"
 oculus = "1.2.5"
-rei = "12.0.626"
+rei = "14.0.688"
 rubidium = "0.6.1"
 sodium = "mc1.20-0.4.10"
-create-forge = "0.5.1.f-33"
-create-fabric = "0.5.1-f-build.1467+mc1.20.1"
 
 # Testing
 hamcrest = "2.2"
 jqwik = "1.8.2"
 junit = "5.10.1"
-jmh = "1.37"
 
 # Build tools
 cctJavadoc = "1.8.2"
-checkstyle = "10.14.1"
-curseForgeGradle = "1.0.14"
-errorProne-core = "2.27.0"
+checkstyle = "10.12.6"
+curseForgeGradle = "1.1.18"
+errorProne-core = "2.23.0"
 errorProne-plugin = "3.1.0"
-fabric-loom = "1.7.1"
-forgeGradle = "6.0.21"
+fabric-loom = "1.5.7"
 githubRelease = "2.5.2"
 gradleVersions = "0.50.0"
 ideaExt = "1.1.7"
-illuaminate = "0.1.0-73-g43ee16c"
-librarian = "1.+"
+illuaminate = "0.1.0-44-g9ee0055"
 lwjgl = "3.3.3"
-minotaur = "2.+"
-nullAway = "0.10.25"
-shadow = "8.3.1"
+minotaur = "2.8.7"
+neoGradle = "7.0.93"
+nullAway = "0.9.9"
 spotless = "6.23.3"
 taskTree = "2.1.1"
-teavm = "0.11.0-SQUID.1"
-vanillaExtract = "0.1.3"
+teavm = "0.10.0-SQUID.2"
+vanillaExtract = "0.1.1"
 versionCatalogUpdate = "0.8.1"
 
 [libraries]
@@ -87,7 +82,7 @@ checkerFramework = { module = "org.checkerframework:checker-qual", version.ref =
 cobalt = { module = "cc.tweaked:cobalt", version.ref = "cobalt" }
 commonsCli = { module = "commons-cli:commons-cli", version.ref = "commonsCli" }
 fastutil = { module = "it.unimi.dsi:fastutil", version.ref = "fastutil" }
-forgeSpi = { module = "net.minecraftforge:forgespi", version.ref = "forgeSpi" }
+neoForgeSpi = { module = "net.neoforged:neoforgespi", version.ref = "neoForgeSpi" }
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
 jetbrainsAnnotations = { module = "org.jetbrains:annotations", version.ref = "jetbrainsAnnotations" }
 jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" }
@@ -95,26 +90,23 @@ jzlib = { module = "com.jcraft:jzlib", version.ref = "jzlib" }
 kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" }
 kotlin-platform = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
-netty-codec = { module = "io.netty:netty-codec", version.ref = "netty" }
 netty-http = { module = "io.netty:netty-codec-http", version.ref = "netty" }
-netty-proxy = { module = "io.netty:netty-handler-proxy", version.ref = "netty" }
 netty-socks = { module = "io.netty:netty-codec-socks", version.ref = "netty" }
+netty-proxy = { module = "io.netty:netty-handler-proxy", version.ref = "netty" }
 nightConfig-core = { module = "com.electronwill.night-config:core", version.ref = "nightConfig" }
 nightConfig-toml = { module = "com.electronwill.night-config:toml", version.ref = "nightConfig" }
 slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 
 # Minecraft mods
-create-fabric = { module = "com.simibubi.create:create-fabric-1.20.1", version.ref = "create-fabric" }
-create-forge = { module = "com.simibubi.create:create-1.20.1", version.ref = "create-forge" }
-emi = { module = "dev.emi:emi-xplat-mojmap", version.ref = "emi" }
 fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric-api" }
-fabric-junit = { module = "net.fabricmc:fabric-loader-junit", version.ref = "fabric-loader" }
 fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-loader" }
+fabric-junit = { module = "net.fabricmc:fabric-loader-junit", version.ref = "fabric-loader" }
 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.1-common-api", version.ref = "jei" }
-jei-fabric = { module = "mezz.jei:jei-1.20.1-fabric", version.ref = "jei" }
-jei-forge = { module = "mezz.jei:jei-1.20.1-forge", version.ref = "jei" }
+jei-api = { module = "mezz.jei:jei-1.20.4-common-api", version.ref = "jei" }
+jei-fabric = { module = "mezz.jei:jei-1.20.4-fabric", version.ref = "jei" }
+jei-forge = { module = "mezz.jei:jei-1.20.4-forge", version.ref = "jei" }
 mixin = { module = "org.spongepowered:mixin", version.ref = "mixin" }
 modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
 moreRed = { module = "commoble.morered:morered-1.20.1", version.ref = "moreRed" }
@@ -133,8 +125,6 @@ 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" }
@@ -152,15 +142,13 @@ errorProne-core = { module = "com.google.errorprone:error_prone_core", version.r
 errorProne-plugin = { module = "net.ltgt.gradle:gradle-errorprone-plugin", version.ref = "errorProne-plugin" }
 errorProne-testHelpers = { module = "com.google.errorprone:error_prone_test_helpers", version.ref = "errorProne-core" }
 fabric-loom = { module = "net.fabricmc:fabric-loom", version.ref = "fabric-loom" }
-forgeGradle = { module = "net.minecraftforge.gradle:ForgeGradle", version.ref = "forgeGradle" }
 ideaExt = { module = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext", version.ref = "ideaExt" }
 kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
-librarian = { module = "org.parchmentmc:librarian", version.ref = "librarian" }
 minotaur = { module = "com.modrinth.minotaur:Minotaur", version.ref = "minotaur" }
+neoGradle-userdev = { module = "net.neoforged.gradle:userdev", version.ref = "neoGradle" }
 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" }
@@ -172,12 +160,9 @@ vanillaExtract = { module = "cc.tweaked.vanilla-extract:plugin", version.ref = "
 yarn = { module = "net.fabricmc:yarn", version.ref = "yarn" }
 
 [plugins]
-forgeGradle = { id = "net.minecraftforge.gradle", version.ref = "forgeGradle" }
 githubRelease = { id = "com.github.breadmoirai.github-release", version.ref = "githubRelease" }
 gradleVersions = { id = "com.github.ben-manes.versions", version.ref = "gradleVersions" }
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-librarian = { id = "org.parchmentmc.librarian.forgegradle", version.ref = "librarian" }
-shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
 taskTree = { id = "com.dorongold.task-tree", version.ref = "taskTree" }
 versionCatalogUpdate = { id = "nl.littlerobots.version-catalog-update", version.ref = "versionCatalogUpdate" }
 
@@ -188,7 +173,7 @@ kotlin = ["kotlin-stdlib", "kotlin-coroutines"]
 # Minecraft
 externalMods-common = ["jei-api", "nightConfig-core", "nightConfig-toml"]
 externalMods-forge-compile = ["moreRed", "oculus", "jei-api"]
-externalMods-forge-runtime = ["jei-forge"]
+externalMods-forge-runtime = []
 externalMods-fabric-compile = ["fabricPermissions", "iris", "jei-api", "rei-api", "rei-builtin"]
 externalMods-fabric-runtime = ["jei-fabric", "modmenu"]
 

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,8 +84,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -45,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-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
+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.
 
 goto fail
 
@@ -59,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-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
+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.
 
 goto fail
 

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

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

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

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

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

@@ -8,7 +8,6 @@ import dan200.computercraft.api.client.TransformedModel;
 import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
-import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
@@ -31,30 +30,15 @@ public interface TurtleUpgradeModeller<T extends ITurtleUpgrade> {
     /**
      * Obtain the model to be used when rendering a turtle peripheral.
      * <p>
-     * When the current turtle is {@literal null}, this function should be constant for a given upgrade and side.
+     * When the current turtle is {@literal null}, this function should be constant for a given upgrade, side and data.
      *
      * @param upgrade The upgrade that you're getting the model for.
-     * @param turtle  Access to the turtle that the upgrade resides on. This will be null when getting item models, unless
-     *                {@link #getModel(ITurtleUpgrade, CompoundTag, TurtleSide)} is overriden.
+     * @param turtle  Access to the turtle that the upgrade resides on. This will be null when getting item models.
      * @param side    Which side of the turtle (left or right) the upgrade resides on.
-     * @return The model that you wish to be used to render your upgrade.
-     */
-    TransformedModel getModel(T upgrade, @Nullable ITurtleAccess turtle, TurtleSide side);
-
-    /**
-     * Obtain the model to be used when rendering a turtle peripheral.
-     * <p>
-     * This is used when rendering the turtle's item model, and so no {@link ITurtleAccess} is available.
-     *
-     * @param upgrade The upgrade that you're getting the model for.
      * @param data    Upgrade data instance for current turtle side.
-     * @param side    Which side of the turtle (left or right) the upgrade resides on.
      * @return The model that you wish to be used to render your upgrade.
      */
-    default TransformedModel getModel(T upgrade, CompoundTag data, TurtleSide side) {
-        return getModel(upgrade, (ITurtleAccess) null, side);
-    }
-
+    TransformedModel getModel(T upgrade, @Nullable ITurtleAccess turtle, TurtleSide side, CompoundTag data);
 
     /**
      * Get a list of models that this turtle modeller depends on.
@@ -85,19 +69,6 @@ public interface TurtleUpgradeModeller<T extends ITurtleUpgrade> {
         return (TurtleUpgradeModeller<T>) TurtleUpgradeModellers.UPGRADE_ITEM;
     }
 
-    /**
-     * Construct a {@link TurtleUpgradeModeller} which has a single model for the left and right side.
-     *
-     * @param left  The model to use on the left.
-     * @param right The model to use on the right.
-     * @param <T>   The type of the turtle upgrade.
-     * @return The constructed modeller.
-     */
-    static <T extends ITurtleUpgrade> TurtleUpgradeModeller<T> sided(ModelResourceLocation left, ModelResourceLocation right) {
-        // TODO(1.21.0): Remove this.
-        return sided((ResourceLocation) left, right);
-    }
-
     /**
      * Construct a {@link TurtleUpgradeModeller} which has a single model for the left and right side.
      *
@@ -109,7 +80,7 @@ public interface TurtleUpgradeModeller<T extends ITurtleUpgrade> {
     static <T extends ITurtleUpgrade> TurtleUpgradeModeller<T> sided(ResourceLocation left, ResourceLocation right) {
         return new TurtleUpgradeModeller<>() {
             @Override
-            public TransformedModel getModel(T upgrade, @Nullable ITurtleAccess turtle, TurtleSide side) {
+            public TransformedModel getModel(T upgrade, @Nullable ITurtleAccess turtle, TurtleSide side, CompoundTag data) {
                 return TransformedModel.of(side == TurtleSide.LEFT ? left : right);
             }
 

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

@@ -12,7 +12,6 @@ import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.impl.client.ClientPlatformHelper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.item.ItemStack;
 import org.joml.Matrix4f;
 
 import javax.annotation.Nullable;
@@ -37,16 +36,8 @@ final class TurtleUpgradeModellers {
 
     private static final class UpgradeItemModeller implements TurtleUpgradeModeller<ITurtleUpgrade> {
         @Override
-        public TransformedModel getModel(ITurtleUpgrade upgrade, @Nullable ITurtleAccess turtle, TurtleSide side) {
-            return getModel(turtle == null ? upgrade.getCraftingItem() : upgrade.getUpgradeItem(turtle.getUpgradeNBTData(side)), side);
-        }
-
-        @Override
-        public TransformedModel getModel(ITurtleUpgrade upgrade, CompoundTag data, TurtleSide side) {
-            return getModel(upgrade.getUpgradeItem(data), side);
-        }
-
-        private TransformedModel getModel(ItemStack stack, TurtleSide side) {
+        public TransformedModel getModel(ITurtleUpgrade upgrade, @Nullable ITurtleAccess turtle, TurtleSide side, CompoundTag data) {
+            var stack = upgrade.getUpgradeItem(data);
             var model = Minecraft.getInstance().getItemRenderer().getItemModelShaper().getItemModel(stack);
             if (stack.hasFoil()) model = ClientPlatformHelper.get().createdFoiledModel(model);
             return new TransformedModel(model, side == TurtleSide.LEFT ? leftTransform : rightTransform);

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

@@ -4,11 +4,9 @@
 
 package dan200.computercraft.api;
 
-import dan200.computercraft.api.component.ComputerComponent;
 import dan200.computercraft.api.filesystem.Mount;
 import dan200.computercraft.api.filesystem.WritableMount;
 import dan200.computercraft.api.lua.GenericSource;
-import dan200.computercraft.api.lua.IComputerSystem;
 import dan200.computercraft.api.lua.ILuaAPI;
 import dan200.computercraft.api.lua.ILuaAPIFactory;
 import dan200.computercraft.api.media.IMedia;
@@ -167,20 +165,7 @@ public final class ComputerCraftAPI {
      * Register a custom {@link ILuaAPI}, which may be added onto all computers without requiring a peripheral.
      * <p>
      * Before implementing this interface, consider alternative methods of providing methods. It is generally preferred
-     * to use peripherals to provide functionality to users. If an API is <em>required</em>, you may want to consider
-     * using {@link ILuaAPI#getModuleName()} to expose this library as a module instead of as a global.
-     * <p>
-     * This may be used with {@link IComputerSystem#getComponent(ComputerComponent)} to only attach APIs to specific
-     * computers. For example, one can add an additional API just to turtles with the following code:
-     *
-     * <pre>{@code
-     * ComputerCraftAPI.registerAPIFactory(computer -> {
-     *   // Read the turtle component.
-     *   var turtle = computer.getComponent(ComputerComponents.TURTLE);
-     *   // If present then add our API.
-     *   return turtle == null ? null : new MyCustomTurtleApi(turtle);
-     * });
-     * }</pre>
+     * to use peripherals to provide functionality to users.
      *
      * @param factory The factory for your API subclass.
      * @see ILuaAPIFactory

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

@@ -1,24 +0,0 @@
-// SPDX-FileCopyrightText: 2024 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.api.component;
-
-import net.minecraft.commands.CommandSourceStack;
-import org.jetbrains.annotations.ApiStatus;
-
-/**
- * A computer which has permission to perform administrative/op commands, such as the command computer.
- */
-@ApiStatus.NonExtendable
-public interface AdminComputer {
-    /**
-     * The permission level that this computer can operate at.
-     *
-     * @return The permission level for this computer.
-     * @see CommandSourceStack#hasPermission(int)
-     */
-    default int permissionLevel() {
-        return 2;
-    }
-}

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

@@ -1,48 +0,0 @@
-// SPDX-FileCopyrightText: 2024 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.api.component;
-
-import dan200.computercraft.api.lua.IComputerSystem;
-import dan200.computercraft.api.lua.ILuaAPIFactory;
-
-/**
- * A component attached to a computer.
- * <p>
- * Components provide a mechanism to attach additional data to a computer, that can then be queried with
- * {@link IComputerSystem#getComponent(ComputerComponent)}.
- * <p>
- * This is largely designed for {@linkplain ILuaAPIFactory custom APIs}, allowing APIs to read additional properties
- * of the computer, such as its position.
- *
- * @param <T> The type of this component.
- * @see ComputerComponents The built-in components.
- */
-@SuppressWarnings("UnusedTypeParameter")
-public final class ComputerComponent<T> {
-    private final String id;
-
-    private ComputerComponent(String id) {
-        this.id = id;
-    }
-
-    /**
-     * Create a new computer component.
-     * <p>
-     * Mods typically will not need to create their own components.
-     *
-     * @param namespace The namespace of this component. This should be the mod id.
-     * @param id        The unique id of this component.
-     * @param <T>       The component
-     * @return The newly created component.
-     */
-    public static <T> ComputerComponent<T> create(String namespace, String id) {
-        return new ComputerComponent<>(namespace + ":" + id);
-    }
-
-    @Override
-    public String toString() {
-        return "ComputerComponent(" + id + ")";
-    }
-}

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

@@ -1,29 +0,0 @@
-// SPDX-FileCopyrightText: 2024 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.api.component;
-
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.api.pocket.IPocketAccess;
-import dan200.computercraft.api.turtle.ITurtleAccess;
-
-/**
- * The {@link ComputerComponent}s provided by ComputerCraft.
- */
-public class ComputerComponents {
-    /**
-     * The {@link ITurtleAccess} associated with a turtle.
-     */
-    public static final ComputerComponent<ITurtleAccess> TURTLE = ComputerComponent.create(ComputerCraftAPI.MOD_ID, "turtle");
-
-    /**
-     * The {@link IPocketAccess} associated with a pocket computer.
-     */
-    public static final ComputerComponent<IPocketAccess> POCKET = ComputerComponent.create(ComputerCraftAPI.MOD_ID, "pocket");
-
-    /**
-     * This component is only present on "command computers", and other computers with admin capabilities.
-     */
-    public static final ComputerComponent<AdminComputer> ADMIN_COMPUTER = ComputerComponent.create(ComputerCraftAPI.MOD_ID, "admin_computer");
-}

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

@@ -13,7 +13,7 @@ import java.util.Map;
 import java.util.Objects;
 
 /**
- * An item detail provider for {@link ItemStack}s whose {@link Item} has a specific type.
+ * An item detail provider for {@link ItemStack}'s whose {@link Item} has a specific type.
  *
  * @param <T> The type the stack's item must have.
  */
@@ -22,7 +22,7 @@ public abstract class BasicItemDetailProvider<T> implements DetailProvider<ItemS
     private final @Nullable String namespace;
 
     /**
-     * Create a new item detail provider. Details will be inserted into a new sub-map named as per {@code namespace}.
+     * Create a new item detail provider. Meta will be inserted into a new sub-map named as per {@code namespace}.
      *
      * @param itemType  The type the stack's item must have.
      * @param namespace The namespace to use for this provider.
@@ -34,7 +34,7 @@ public abstract class BasicItemDetailProvider<T> implements DetailProvider<ItemS
     }
 
     /**
-     * Create a new item detail provider. Details will be inserted directly into the results.
+     * Create a new item detail provider. Meta will be inserted directly into the results.
      *
      * @param itemType The type the stack's item must have.
      */
@@ -53,18 +53,21 @@ public abstract class BasicItemDetailProvider<T> implements DetailProvider<ItemS
      * @param stack The item stack to provide details for.
      * @param item  The item to provide details for.
      */
-    public abstract void provideDetails(Map<? super String, Object> data, ItemStack stack, T item);
+    public abstract void provideDetails(
+        Map<? super String, Object> data, ItemStack stack, T item
+    );
 
     @Override
-    public final void provideDetails(Map<? super String, Object> data, ItemStack stack) {
+    public void provideDetails(Map<? super String, Object> data, ItemStack stack) {
         var item = stack.getItem();
         if (!itemType.isInstance(item)) return;
 
-        if (namespace == null) {
-            provideDetails(data, stack, itemType.cast(item));
-        } else {
-            Map<? super String, Object> child = new HashMap<>();
-            provideDetails(child, stack, itemType.cast(item));
+        // If `namespace` is specified, insert into a new data map instead of the existing one.
+        Map<? super String, Object> child = namespace == null ? data : new HashMap<>();
+
+        provideDetails(child, stack, itemType.cast(item));
+
+        if (namespace != null) {
             data.put(namespace, child);
         }
     }

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

@@ -26,7 +26,7 @@ public interface DetailRegistry<T> {
      * @param provider The detail provider to register.
      * @see DetailProvider
      */
-    void addProvider(DetailProvider<? super T> provider);
+    void addProvider(DetailProvider<T> provider);
 
     /**
      * Compute basic details about an object. This is cheaper than computing all details operation, and so is suitable

projects/common-api/src/main/java/dan200/computercraft/api/lua/IComputerSystem.java

@@ -1,59 +0,0 @@
-// SPDX-FileCopyrightText: 2017 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.api.lua;
-
-import dan200.computercraft.api.component.ComputerComponent;
-import dan200.computercraft.api.peripheral.IComputerAccess;
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
-import org.jetbrains.annotations.ApiStatus;
-
-import javax.annotation.Nullable;
-
-/**
- * An interface passed to {@link ILuaAPIFactory} in order to provide additional information
- * about a computer.
- */
-@ApiStatus.NonExtendable
-public interface IComputerSystem extends IComputerAccess {
-    /**
-     * Get the level this computer is currently in.
-     * <p>
-     * This method is not guaranteed to remain the same (even for stationary computers).
-     *
-     * @return The computer's current level.
-     */
-    ServerLevel getLevel();
-
-    /**
-     * Get the position this computer is currently at.
-     * <p>
-     * This method is not guaranteed to remain the same (even for stationary computers).
-     *
-     * @return The computer's current position.
-     */
-    BlockPos getPosition();
-
-    /**
-     * Get the label for this computer.
-     *
-     * @return This computer's label, or {@code null} if it is not set.
-     */
-    @Nullable
-    String getLabel();
-
-    /**
-     * Get a component attached to this computer.
-     * <p>
-     * No component is guaranteed to be on a computer, and so this method should always be guarded with a null check.
-     * <p>
-     * This method will always return the same value for a given component, and so may be cached.
-     *
-     * @param component The component to query.
-     * @param <T>       The type of the component.
-     * @return The component, if present.
-     */
-    <T> @Nullable T getComponent(ComputerComponent<T> component);
-}

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

@@ -5,7 +5,6 @@
 package dan200.computercraft.api.network.wired;
 
 import dan200.computercraft.api.peripheral.IPeripheral;
-import org.jetbrains.annotations.ApiStatus;
 
 import java.util.Map;
 
@@ -23,7 +22,6 @@ import java.util.Map;
  *
  * @see WiredNode#getNetwork()
  */
-@ApiStatus.NonExtendable
 public interface WiredNetwork {
     /**
      * Create a connection between two nodes.
@@ -37,9 +35,7 @@ public interface WiredNetwork {
      * @throws IllegalArgumentException If {@code left} and {@code right} are equal.
      * @see WiredNode#connectTo(WiredNode)
      * @see WiredNetwork#connect(WiredNode, WiredNode)
-     * @deprecated Use {@link WiredNode#connectTo(WiredNode)}
      */
-    @Deprecated
     boolean connect(WiredNode left, WiredNode right);
 
     /**
@@ -54,9 +50,7 @@ public interface WiredNetwork {
      * @throws IllegalArgumentException If {@code left} and {@code right} are equal.
      * @see WiredNode#disconnectFrom(WiredNode)
      * @see WiredNetwork#connect(WiredNode, WiredNode)
-     * @deprecated Use {@link WiredNode#disconnectFrom(WiredNode)}
      */
-    @Deprecated
     boolean disconnect(WiredNode left, WiredNode right);
 
     /**
@@ -70,9 +64,7 @@ public interface WiredNetwork {
      * only element.
      * @throws IllegalArgumentException If the node is not in the network.
      * @see WiredNode#remove()
-     * @deprecated Use {@link WiredNode#remove()}
      */
-    @Deprecated
     boolean remove(WiredNode node);
 
     /**
@@ -85,8 +77,6 @@ public interface WiredNetwork {
      * @param peripherals The new peripherals for this node.
      * @throws IllegalArgumentException If the node is not in the network.
      * @see WiredNode#updatePeripherals(Map)
-     * @deprecated Use {@link WiredNode#updatePeripherals(Map)}
      */
-    @Deprecated
     void updatePeripherals(WiredNode node, Map<String, IPeripheral> peripherals);
 }

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

@@ -6,7 +6,6 @@ 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;
 
@@ -23,7 +22,6 @@ 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.
@@ -39,9 +37,7 @@ public interface WiredNode extends PacketNetwork {
      * This should only be used on the server thread.
      *
      * @return This node's network.
-     * @deprecated Use the connect/disconnect/remove methods on {@link WiredNode}.
      */
-    @Deprecated
     WiredNetwork getNetwork();
 
     /**
@@ -51,9 +47,12 @@ 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)
      */
-    boolean connectTo(WiredNode node);
+    default boolean connectTo(WiredNode node) {
+        return getNetwork().connect(this, node);
+    }
 
     /**
      * Destroy a connection between this node and another.
@@ -62,9 +61,13 @@ 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)
      */
-    boolean disconnectFrom(WiredNode node);
+    default boolean disconnectFrom(WiredNode node) {
+        return getNetwork().disconnect(this, node);
+    }
 
     /**
      * Sever all connections this node has, removing it from this network.
@@ -75,8 +78,11 @@ 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)
      */
-    boolean remove();
+    default boolean remove() {
+        return getNetwork().remove(this);
+    }
 
     /**
      * Mark this node's peripherals as having changed.
@@ -85,6 +91,9 @@ public interface WiredNode extends PacketNetwork {
      * that your network element owns.
      *
      * @param peripherals The new peripherals for this node.
+     * @see WiredNetwork#updatePeripherals(WiredNode, Map)
      */
-    void updatePeripherals(Map<String, IPeripheral> peripherals);
+    default void updatePeripherals(Map<String, IPeripheral> peripherals) {
+        getNetwork().updatePeripherals(this, peripherals);
+    }
 }

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

@@ -4,39 +4,17 @@
 
 package dan200.computercraft.api.pocket;
 
-import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.upgrades.UpgradeBase;
-import dan200.computercraft.api.upgrades.UpgradeData;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.phys.Vec3;
-import org.jetbrains.annotations.ApiStatus;
 
 import javax.annotation.Nullable;
-import java.util.Map;
 
 /**
  * Wrapper class for pocket computers.
  */
-@ApiStatus.NonExtendable
 public interface IPocketAccess {
-    /**
-     * Get the level in which the pocket computer exists.
-     *
-     * @return The pocket computer's level.
-     */
-    ServerLevel getLevel();
-
-    /**
-     * Get the position of the pocket computer.
-     *
-     * @return The pocket computer's position.
-     */
-    Vec3 getPosition();
-
     /**
      * Gets the entity holding this item.
      * <p>
@@ -83,26 +61,6 @@ public interface IPocketAccess {
      */
     void setLight(int colour);
 
-    /**
-     * Get the currently equipped upgrade.
-     *
-     * @return The currently equipped upgrade.
-     * @see #getUpgradeNBTData()
-     * @see #setUpgrade(UpgradeData)
-     */
-    @Nullable
-    UpgradeData<IPocketUpgrade> getUpgrade();
-
-    /**
-     * Set the upgrade for this pocket computer, also updating the item stack.
-     * <p>
-     * Note this method is not thread safe - it must be called from the server thread.
-     *
-     * @param upgrade The new upgrade to set it to, may be {@code null}.
-     * @see #getUpgrade()
-     */
-    void setUpgrade(@Nullable UpgradeData<IPocketUpgrade> upgrade);
-
     /**
      * Get the upgrade-specific NBT.
      * <p>
@@ -112,7 +70,6 @@ public interface IPocketAccess {
      * @see #updateUpgradeNBTData()
      * @see UpgradeBase#getUpgradeItem(CompoundTag)
      * @see UpgradeBase#getUpgradeData(ItemStack)
-     * @see #getUpgrade()
      */
     CompoundTag getUpgradeNBTData();
 
@@ -130,13 +87,4 @@ public interface IPocketAccess {
      * entity} changes.
      */
     void invalidatePeripheral();
-
-    /**
-     * Get a list of all upgrades for the pocket computer.
-     *
-     * @return A collection of all upgrade names.
-     * @deprecated This is a relic of a previous API, which no longer makes sense with newer versions of ComputerCraft.
-     */
-    @Deprecated(forRemoval = true)
-    Map<ResourceLocation, IPeripheral> getUpgrades();
 }

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

@@ -6,6 +6,10 @@ package dan200.computercraft.api.pocket;
 
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.upgrades.UpgradeBase;
+import dan200.computercraft.api.upgrades.UpgradeSerialiser;
+import dan200.computercraft.impl.ComputerCraftAPIService;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.Level;
 
 import javax.annotation.Nullable;
@@ -13,16 +17,46 @@ 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, on creates a {@link IPocketUpgrade} subclass and corresponding
- * {@link PocketUpgradeSerialiser} instance, which are then registered in a Forge registry.
+ * 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.
  * <p>
  * You then write a JSON file in your mod's {@literal data/} folder. This is then parsed when the world is loaded, and
- * the upgrade registered internally. See the documentation in {@link PocketUpgradeSerialiser} for details on this process
- * and where files should be located.
+ * the upgrade automatically registered. It is recommended this is done via {@linkplain PocketUpgradeDataProvider data
+ * generators}.
  *
- * @see PocketUpgradeSerialiser For how to register a pocket computer upgrade.
+ * <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");
+ *
+ * // Register a new upgrade serialiser called "my_upgrade".
+ * public static final RegistryObject<UpgradeSerialiser<MyUpgrade>> MY_UPGRADE =
+ *     SERIALISERS.register("my_upgrade", () -> UpgradeSerialiser.simple(MyUpgrade::new));
+ *
+ * // Then in your constructor
+ * SERIALISERS.register(bus);
+ * }</pre>
+ * <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
+ * {
+ *     "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 {
+    /**
+     * The registry key for upgrade serialisers.
+     *
+     * @return The registry key.
+     */
+    static ResourceKey<Registry<UpgradeSerialiser<? extends IPocketUpgrade>>> serialiserRegistryKey() {
+        return ComputerCraftAPIService.get().pocketUpgradeRegistryId();
+    }
+
     /**
      * Creates a peripheral for the pocket computer.
      * <p>

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

@@ -5,6 +5,7 @@
 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;
 
@@ -17,10 +18,11 @@ import java.util.function.Consumer;
  * {@link #addUpgrades(Consumer)} function, construct each upgrade, and pass them off to the provided consumer to
  * generate them.
  *
- * @see PocketUpgradeSerialiser
+ * @see IPocketUpgrade
+ * @see UpgradeSerialiser
  */
-public abstract class PocketUpgradeDataProvider extends UpgradeDataProvider<IPocketUpgrade, PocketUpgradeSerialiser<?>> {
+public abstract class PocketUpgradeDataProvider extends UpgradeDataProvider<IPocketUpgrade> {
     public PocketUpgradeDataProvider(PackOutput output) {
-        super(output, "Pocket Computer Upgrades", "computercraft/pocket_upgrades", PocketUpgradeSerialiser.registryId());
+        super(output, "Pocket Computer Upgrades", "computercraft/pocket_upgrades", IPocketUpgrade.serialiserRegistryKey());
     }
 }

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

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

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

@@ -6,8 +6,12 @@ package dan200.computercraft.api.turtle;
 
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.upgrades.UpgradeBase;
+import dan200.computercraft.api.upgrades.UpgradeSerialiser;
+import dan200.computercraft.impl.ComputerCraftAPIService;
 import net.minecraft.core.Direction;
+import net.minecraft.core.Registry;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.resources.ResourceKey;
 
 import javax.annotation.Nullable;
 
@@ -16,15 +20,54 @@ import javax.annotation.Nullable;
  * peripheral.
  * <p>
  * Turtle upgrades are defined in two stages. First, one creates a {@link ITurtleUpgrade} subclass and corresponding
- * {@link TurtleUpgradeSerialiser} instance, which are then registered in a Forge registry.
+ * {@link UpgradeSerialiser} 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 registered internally. See the documentation in {@link TurtleUpgradeSerialiser} for details on this process
- * and where files should be located.
+ * the upgrade automatically registered. It is recommended this is done via {@linkplain TurtleUpgradeDataProvider data
+ * generators}.
  *
- * @see TurtleUpgradeSerialiser For how to register a turtle upgrade.
+ * <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");
+ *
+ * // Register a new upgrade serialiser called "my_upgrade".
+ * public static final RegistryObject<UpgradeSerialiser<MyUpgrade>> MY_UPGRADE =
+ *     SERIALISERS.register( "my_upgrade", () -> TurtleUpgradeSerialiser.simple( MyUpgrade::new ) );
+ *
+ * // Then in your constructor
+ * SERIALISERS.register( bus );
+ * }</pre>
+ * <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>
+ * <p>
+ * {@link TurtleUpgradeDataProvider} provides a data provider to aid with generating these JSON files.
+ * <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.
+     *
+     * @return The registry key.
+     */
+    static ResourceKey<Registry<UpgradeSerialiser<? extends ITurtleUpgrade>>> serialiserRegistryKey() {
+        return ComputerCraftAPIService.get().turtleUpgradeRegistryId();
+    }
+
     /**
      * Return whether this turtle adds a tool or a peripheral to the turtle.
      *

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

@@ -5,7 +5,7 @@
 package dan200.computercraft.api.turtle;
 
 /**
- * An enum representing the two sides of the turtle that a turtle upgrade might reside.
+ * An enum representing the two sides of the turtle that a turtle turtle might reside.
  */
 public enum TurtleSide {
     /**

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

@@ -7,8 +7,9 @@ package dan200.computercraft.api.turtle;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.ComputerCraftTags;
 import dan200.computercraft.api.upgrades.UpgradeDataProvider;
-import dan200.computercraft.impl.PlatformHelper;
-import net.minecraft.core.registries.Registries;
+import 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;
@@ -29,13 +30,13 @@ import java.util.function.Consumer;
  * {@link #addUpgrades(Consumer)} function, construct each upgrade, and pass them off to the provided consumer to
  * generate them.
  *
- * @see TurtleUpgradeSerialiser
+ * @see ITurtleUpgrade
  */
-public abstract class TurtleUpgradeDataProvider extends UpgradeDataProvider<ITurtleUpgrade, TurtleUpgradeSerialiser<?>> {
+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", TurtleUpgradeSerialiser.registryId());
+        super(output, "Turtle Upgrades", "computercraft/turtle_upgrades", ITurtleUpgrade.serialiserRegistryKey());
     }
 
     /**
@@ -57,7 +58,7 @@ public abstract class TurtleUpgradeDataProvider extends UpgradeDataProvider<ITur
      */
     public static class ToolBuilder {
         private final ResourceLocation id;
-        private final TurtleUpgradeSerialiser<?> serialiser;
+        private final UpgradeSerialiser<? extends ITurtleUpgrade> serialiser;
         private final Item toolItem;
         private @Nullable String adjective;
         private @Nullable Item craftingItem;
@@ -66,7 +67,7 @@ public abstract class TurtleUpgradeDataProvider extends UpgradeDataProvider<ITur
         private boolean allowEnchantments = false;
         private TurtleToolDurability consumeDurability = TurtleToolDurability.NEVER;
 
-        ToolBuilder(ResourceLocation id, TurtleUpgradeSerialiser<?> serialiser, Item toolItem) {
+        ToolBuilder(ResourceLocation id, UpgradeSerialiser<? extends ITurtleUpgrade> serialiser, Item toolItem) {
             this.id = id;
             this.serialiser = serialiser;
             this.toolItem = toolItem;
@@ -149,12 +150,12 @@ public abstract class TurtleUpgradeDataProvider extends UpgradeDataProvider<ITur
          *
          * @param add The callback given to {@link #addUpgrades(Consumer)}.
          */
-        public void add(Consumer<Upgrade<TurtleUpgradeSerialiser<?>>> add) {
+        public void add(Consumer<Upgrade<UpgradeSerialiser<? extends ITurtleUpgrade>>> add) {
             add.accept(new Upgrade<>(id, serialiser, s -> {
-                s.addProperty("item", PlatformHelper.get().getRegistryKey(Registries.ITEM, toolItem).toString());
+                s.addProperty("item", RegistryHelper.getKeyOrThrow(BuiltInRegistries.ITEM, toolItem).toString());
                 if (adjective != null) s.addProperty("adjective", adjective);
                 if (craftingItem != null) {
-                    s.addProperty("craftItem", PlatformHelper.get().getRegistryKey(Registries.ITEM, craftingItem).toString());
+                    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());

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

@@ -1,109 +0,0 @@
-// SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.api.turtle;
-
-import dan200.computercraft.api.upgrades.UpgradeBase;
-import dan200.computercraft.api.upgrades.UpgradeSerialiser;
-import dan200.computercraft.impl.ComputerCraftAPIService;
-import dan200.computercraft.impl.upgrades.SerialiserWithCraftingItem;
-import dan200.computercraft.impl.upgrades.SimpleSerialiser;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.RecipeSerializer;
-import net.minecraft.world.item.crafting.SimpleCraftingRecipeSerializer;
-
-import java.util.function.BiFunction;
-import java.util.function.Function;
-
-/**
- * Reads a {@link ITurtleUpgrade} from disk and reads/writes it to a network packet.
- * <p>
- * These should be registered in a {@link Registry} while the game is loading, much like {@link RecipeSerializer}s.
- * <p>
- * If your turtle upgrade doesn't have any associated configurable parameters (like most upgrades), you can use
- * {@link #simple(Function)} or {@link #simpleWithCustomItem(BiFunction)} to create a basic upgrade serialiser.
- *
- * <h2>Example (Forge)</h2>
- * <pre>{@code
- * static final DeferredRegister<TurtleUpgradeSerialiser<?>> SERIALISERS = DeferredRegister.create( TurtleUpgradeSerialiser.TYPE, "my_mod" );
- *
- * // Register a new upgrade serialiser called "my_upgrade".
- * public static final RegistryObject<TurtleUpgradeSerialiser<MyUpgrade>> MY_UPGRADE =
- *     SERIALISERS.register( "my_upgrade", () -> TurtleUpgradeSerialiser.simple( MyUpgrade::new ) );
- *
- * // Then in your constructor
- * SERIALISERS.register( bus );
- * }</pre>
- * <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>
- * <p>
- * Finally, we need to register a model for our upgrade. The way to do this varies on mod loader, see
- * {@link dan200.computercraft.api.client.turtle.TurtleUpgradeModeller} for more information.
- * <p>
- * {@link TurtleUpgradeDataProvider} provides a data provider to aid with generating these JSON files.
- *
- * @param <T> The type of turtle upgrade this is responsible for serialising.
- * @see ITurtleUpgrade
- * @see TurtleUpgradeDataProvider
- * @see dan200.computercraft.api.client.turtle.TurtleUpgradeModeller
- */
-public interface TurtleUpgradeSerialiser<T extends ITurtleUpgrade> extends UpgradeSerialiser<T> {
-    /**
-     * The ID for the associated registry.
-     *
-     * @return The registry key.
-     */
-    static ResourceKey<Registry<TurtleUpgradeSerialiser<?>>> registryId() {
-        return ComputerCraftAPIService.get().turtleUpgradeRegistryId();
-    }
-
-    /**
-     * Create an upgrade serialiser for a simple upgrade. This is similar to a {@link SimpleCraftingRecipeSerializer},
-     * but for upgrades.
-     * <p>
-     * If you might want to vary the item, it's suggested you use {@link #simpleWithCustomItem(BiFunction)} instead.
-     *
-     * @param factory Generate a new upgrade with a specific ID.
-     * @param <T>     The type of the generated upgrade.
-     * @return The serialiser for this upgrade
-     */
-    static <T extends ITurtleUpgrade> TurtleUpgradeSerialiser<T> simple(Function<ResourceLocation, T> factory) {
-        final class Impl extends SimpleSerialiser<T> implements TurtleUpgradeSerialiser<T> {
-            private Impl(Function<ResourceLocation, T> constructor) {
-                super(constructor);
-            }
-        }
-
-        return new Impl(factory);
-    }
-
-    /**
-     * Create an upgrade serialiser for a simple upgrade whose crafting item can be specified.
-     *
-     * @param factory Generate a new upgrade with a specific ID and crafting item. The returned upgrade's
-     *                {@link UpgradeBase#getCraftingItem()} <strong>MUST</strong> equal the provided item.
-     * @param <T>     The type of the generated upgrade.
-     * @return The serialiser for this upgrade.
-     * @see #simple(Function)  For upgrades whose crafting stack should not vary.
-     */
-    static <T extends ITurtleUpgrade> TurtleUpgradeSerialiser<T> simpleWithCustomItem(BiFunction<ResourceLocation, ItemStack, T> factory) {
-        final class Impl extends SerialiserWithCraftingItem<T> implements TurtleUpgradeSerialiser<T> {
-            private Impl(BiFunction<ResourceLocation, ItemStack, T> factory) {
-                super(factory);
-            }
-        }
-
-        return new Impl(factory);
-    }
-}

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

@@ -9,7 +9,6 @@ import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.impl.PlatformHelper;
 import net.minecraft.Util;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
@@ -100,7 +99,7 @@ public interface UpgradeBase {
      * The default check requires that any non-capability NBT is exactly the same as the
      * crafting item, but this may be relaxed for your upgrade.
      * <p>
-     * This is based on {@code net.minecraftforge.common.crafting.StrictNBTIngredient}'s check.
+     * This is based on {@code net.neoforged.common.crafting.StrictNBTIngredient}'s check.
      *
      * @param stack The stack to check. This is guaranteed to be non-empty and have the same item as
      *              {@link #getCraftingItem()}.
@@ -111,12 +110,12 @@ public interface UpgradeBase {
 
         // A more expanded form of ItemStack.areShareTagsEqual, but allowing an empty tag to be equal to a
         // null one.
-        var shareTag = PlatformHelper.get().getShareTag(stack);
-        var craftingShareTag = PlatformHelper.get().getShareTag(crafting);
-        if (shareTag == craftingShareTag) return true;
-        if (shareTag == null) return Objects.requireNonNull(craftingShareTag).isEmpty();
-        if (craftingShareTag == null) return shareTag.isEmpty();
-        return shareTag.equals(craftingShareTag);
+        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);
     }
 
     /**

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

@@ -6,19 +6,20 @@ package dan200.computercraft.api.upgrades;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser;
 import dan200.computercraft.impl.PlatformHelper;
+import dan200.computercraft.impl.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.Registries;
+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.*;
@@ -31,31 +32,31 @@ import java.util.function.Function;
  * the other subclasses.
  *
  * @param <T> The base class of upgrades.
- * @param <R> The upgrade serialiser to register for.
  */
-public abstract class UpgradeDataProvider<T extends UpgradeBase, R extends UpgradeSerialiser<? extends T>> implements DataProvider {
+public abstract class UpgradeDataProvider<T extends UpgradeBase> implements DataProvider {
     private final PackOutput output;
     private final String name;
     private final String folder;
-    private final ResourceKey<Registry<R>> registry;
+    private final Registry<UpgradeSerialiser<? extends T>> registry;
 
     private @Nullable List<T> upgrades;
 
-    protected UpgradeDataProvider(PackOutput output, String name, String folder, ResourceKey<Registry<R>> registry) {
+    @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 = registry;
+        this.registry = RegistryHelper.getRegistry(registry);
     }
 
     /**
-     * Register an upgrade using a "simple" serialiser (e.g. {@link TurtleUpgradeSerialiser#simple(Function)}).
+     * 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<R> simple(ResourceLocation id, R serialiser) {
+    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.");
         }
@@ -65,20 +66,20 @@ public abstract class UpgradeDataProvider<T extends UpgradeBase, R extends Upgra
     }
 
     /**
-     * Register an upgrade using a "simple" serialiser (e.g. {@link TurtleUpgradeSerialiser#simple(Function)}).
+     * 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<R> simpleWithCustomItem(ResourceLocation id, R serialiser, Item item) {
+    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", PlatformHelper.get().getRegistryKey(Registries.ITEM, item).toString())
+            s.addProperty("item", RegistryHelper.getKeyOrThrow(BuiltInRegistries.ITEM, item).toString())
         );
     }
 
@@ -94,7 +95,7 @@ public abstract class UpgradeDataProvider<T extends UpgradeBase, R extends Upgra
      *
      * @param addUpgrade A callback used to register an upgrade.
      */
-    protected abstract void addUpgrades(Consumer<Upgrade<R>> addUpgrade);
+    protected abstract void addUpgrades(Consumer<Upgrade<UpgradeSerialiser<? extends T>>> addUpgrade);
 
     @Override
     public CompletableFuture<?> run(CachedOutput cache) {
@@ -107,7 +108,7 @@ public abstract class UpgradeDataProvider<T extends UpgradeBase, R extends Upgra
             if (!seen.add(upgrade.id())) throw new IllegalStateException("Duplicate upgrade " + upgrade.id());
 
             var json = new JsonObject();
-            json.addProperty("type", PlatformHelper.get().getRegistryKey(registry, upgrade.serialiser()).toString());
+            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")));
@@ -129,9 +130,9 @@ public abstract class UpgradeDataProvider<T extends UpgradeBase, R extends Upgra
         return name;
     }
 
-    public final R existingSerialiser(ResourceLocation id) {
-        var result = PlatformHelper.get().getRegistryObject(registry, id);
-        if (result == null) throw new IllegalArgumentException("No such serialiser " + registry);
+    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;
     }
 

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

@@ -5,21 +5,40 @@
 package dan200.computercraft.api.upgrades;
 
 import com.google.gson.JsonObject;
-import dan200.computercraft.api.pocket.PocketUpgradeSerialiser;
-import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser;
+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;
 
 /**
- * Base interface for upgrade serialisers. This should generally not be implemented directly, instead implementing one
- * of {@link TurtleUpgradeSerialiser} or {@link PocketUpgradeSerialiser}.
+ * A serialiser for {@link ITurtleUpgrade} or {@link IPocketUpgrade}s.
  * <p>
- * However, it may sometimes be useful to implement this if you have some shared logic between upgrade types.
+ * 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 TurtleUpgradeSerialiser
- * @see PocketUpgradeSerialiser
+ * @see ITurtleUpgrade
+ * @see IPocketUpgrade
  */
 public interface UpgradeSerialiser<T extends UpgradeBase> {
     /**
@@ -49,4 +68,30 @@ public interface UpgradeSerialiser<T extends UpgradeBase> {
      */
     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/impl/ComputerCraftAPIService.java

@@ -15,10 +15,11 @@ import dan200.computercraft.api.media.MediaProvider;
 import dan200.computercraft.api.network.PacketNetwork;
 import dan200.computercraft.api.network.wired.WiredElement;
 import dan200.computercraft.api.network.wired.WiredNode;
-import dan200.computercraft.api.pocket.PocketUpgradeSerialiser;
+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.turtle.TurtleUpgradeSerialiser;
+import dan200.computercraft.api.upgrades.UpgradeSerialiser;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Registry;
@@ -67,9 +68,9 @@ public interface ComputerCraftAPIService {
 
     void registerRefuelHandler(TurtleRefuelHandler handler);
 
-    ResourceKey<Registry<TurtleUpgradeSerialiser<?>>> turtleUpgradeRegistryId();
+    ResourceKey<Registry<UpgradeSerialiser<? extends ITurtleUpgrade>>> turtleUpgradeRegistryId();
 
-    ResourceKey<Registry<PocketUpgradeSerialiser<?>>> pocketUpgradeRegistryId();
+    ResourceKey<Registry<UpgradeSerialiser<? extends IPocketUpgrade>>> pocketUpgradeRegistryId();
 
     DetailRegistry<ItemStack> getItemStackDetailRegistry();
 

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

@@ -6,11 +6,6 @@ package dan200.computercraft.impl;
 
 import com.google.gson.JsonObject;
 import dan200.computercraft.api.upgrades.UpgradeDataProvider;
-import net.minecraft.core.Registry;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
 
 import javax.annotation.Nullable;
@@ -32,39 +27,6 @@ public interface PlatformHelper {
         return instance == null ? Services.raise(PlatformHelper.class, Instance.ERROR) : instance;
     }
 
-    /**
-     * Get the unique ID for a registered object.
-     *
-     * @param registry The registry to look up this object in.
-     * @param object   The object to look up.
-     * @param <T>      The type of object the registry stores.
-     * @return The registered object's ID.
-     * @throws IllegalArgumentException If the registry or object are not registered.
-     */
-    <T> ResourceLocation getRegistryKey(ResourceKey<Registry<T>> registry, T object);
-
-    /**
-     * Look up an ID in a registry, returning the registered object.
-     *
-     * @param registry The registry to look up this object in.
-     * @param id       The ID to look up.
-     * @param <T>      The type of object the registry stores.
-     * @return The resolved registry object.
-     * @throws IllegalArgumentException If the registry or object are not registered.
-     */
-    <T> T getRegistryObject(ResourceKey<Registry<T>> registry, ResourceLocation id);
-
-    /**
-     * Get the subset of an {@link ItemStack}'s {@linkplain ItemStack#getTag() tag} which is synced to the client.
-     *
-     * @param item The stack.
-     * @return The item's tag.
-     */
-    @Nullable
-    default CompoundTag getShareTag(ItemStack item) {
-        return item.getTag();
-    }
-
     /**
      * Add a resource condition which requires a mod to be loaded. This should be used by data providers such as
      * {@link UpgradeDataProvider}.

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

@@ -0,0 +1,49 @@
+// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.impl;
+
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import org.jetbrains.annotations.ApiStatus;
+
+/**
+ * Additioanl functions for working with {@linkplain Registry registries}.
+ */
+@ApiStatus.Internal
+public final class RegistryHelper {
+    private RegistryHelper() {
+    }
+
+    /**
+     * Find a registry from a {@link ResourceKey}, throwing if it does not exist.
+     *
+     * @param id  The id of the registry.
+     * @param <T> The contents of the registry
+     * @return The associated registry.
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Registry<T> getRegistry(ResourceKey<Registry<T>> id) {
+        var registry = (Registry<T>) BuiltInRegistries.REGISTRY.get(id.location());
+        if (registry == null) throw new IllegalArgumentException("Unknown registry " + id);
+        return registry;
+    }
+
+    /**
+     * Get the key of a registry entry, throwing if it is not registered.
+     *
+     * @param registry The registry to look up in.
+     * @param object   The object to look up.
+     * @param <T>      The type of this registry.
+     * @return The ID of this object
+     * @see Registry#getResourceKey(Object)
+     */
+    public static <T> ResourceLocation getKeyOrThrow(Registry<T> registry, T object) {
+        var key = registry.getResourceKey(object);
+        if (key.isEmpty()) throw new IllegalArgumentException(object + " was not registered in " + registry.key());
+        return key.get().location();
+    }
+}

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, klass.getClassLoader()).stream().toList();
+        var services = ServiceLoader.load(klass).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

@@ -23,27 +23,27 @@ import java.util.function.BiFunction;
  * @param <T> The upgrade that this class can serialise and deserialise.
  */
 @ApiStatus.Internal
-public abstract class SerialiserWithCraftingItem<T extends UpgradeBase> implements UpgradeSerialiser<T> {
+public final class SerialiserWithCraftingItem<T extends UpgradeBase> implements UpgradeSerialiser<T> {
     private final BiFunction<ResourceLocation, ItemStack, T> factory;
 
-    protected SerialiserWithCraftingItem(BiFunction<ResourceLocation, ItemStack, T> factory) {
+    public SerialiserWithCraftingItem(BiFunction<ResourceLocation, ItemStack, T> factory) {
         this.factory = factory;
     }
 
     @Override
-    public final T fromJson(ResourceLocation id, JsonObject object) {
+    public T fromJson(ResourceLocation id, JsonObject object) {
         var item = GsonHelper.getAsItem(object, "item");
         return factory.apply(id, new ItemStack(item));
     }
 
     @Override
-    public final T fromNetwork(ResourceLocation id, FriendlyByteBuf buffer) {
+    public T fromNetwork(ResourceLocation id, FriendlyByteBuf buffer) {
         var item = buffer.readItem();
         return factory.apply(id, item);
     }
 
     @Override
-    public final void toNetwork(FriendlyByteBuf buffer, T upgrade) {
+    public void toNetwork(FriendlyByteBuf buffer, T upgrade) {
         buffer.writeItem(upgrade.getCraftingItem());
     }
 }

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

@@ -21,7 +21,7 @@ import java.util.function.Function;
  * @param <T> The upgrade that this class can serialise and deserialise.
  */
 @ApiStatus.Internal
-public abstract class SimpleSerialiser<T extends UpgradeBase> implements UpgradeSerialiser<T> {
+public final class SimpleSerialiser<T extends UpgradeBase> implements UpgradeSerialiser<T> {
     private final Function<ResourceLocation, T> constructor;
 
     public SimpleSerialiser(Function<ResourceLocation, T> constructor) {
@@ -29,16 +29,16 @@ public abstract class SimpleSerialiser<T extends UpgradeBase> implements Upgrade
     }
 
     @Override
-    public final T fromJson(ResourceLocation id, JsonObject object) {
+    public T fromJson(ResourceLocation id, JsonObject object) {
         return constructor.apply(id);
     }
 
     @Override
-    public final T fromNetwork(ResourceLocation id, FriendlyByteBuf buffer) {
+    public T fromNetwork(ResourceLocation id, FriendlyByteBuf buffer) {
         return constructor.apply(id);
     }
 
     @Override
-    public final void toNetwork(FriendlyByteBuf buffer, T upgrade) {
+    public void toNetwork(FriendlyByteBuf buffer, T upgrade) {
     }
 }

projects/common/build.gradle.kts

@@ -11,12 +11,6 @@ plugins {
     id("cc-tweaked.publishing")
 }
 
-sourceSets {
-    main {
-        resources.srcDir("src/generated/resources")
-    }
-}
-
 minecraft {
     accessWideners(
         "src/main/resources/computercraft.accesswidener",
@@ -38,12 +32,11 @@ repositories {
 
 dependencies {
     // Pull in our other projects. See comments in MinecraftConfigurations on this nastiness.
-    api(project(":core"))
-    api(commonClasses(project(":common-api")))
-    clientApi(clientClasses(project(":common-api")))
+    implementation(project(":core"))
+    implementation(commonClasses(project(":common-api")))
+    clientImplementation(clientClasses(project(":common-api")))
 
     compileOnly(libs.bundles.externalMods.common)
-    compileOnly(variantOf(libs.create.forge) { classifier("slim") }) { isTransitive = false }
     clientCompileOnly(variantOf(libs.emi) { classifier("api") })
 
     annotationProcessorEverywhere(libs.autoService)
@@ -53,9 +46,6 @@ 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")))
@@ -112,21 +102,3 @@ 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

@@ -108,7 +108,7 @@ public final class ClientHooks {
      */
     public static void addBlockDebugInfo(Consumer<String> addText) {
         var minecraft = Minecraft.getInstance();
-        if (!minecraft.options.renderDebug || minecraft.level == null) return;
+        if (!minecraft.getDebugOverlay().showDebugScreen() || minecraft.level == null) return;
         if (minecraft.hitResult == null || minecraft.hitResult.getType() != HitResult.Type.BLOCK) return;
 
         var tile = minecraft.level.getBlockEntity(((BlockHitResult) minecraft.hitResult).getBlockPos());
@@ -138,7 +138,7 @@ public final class ClientHooks {
      * @param addText A callback which adds a single line of text.
      */
     public static void addGameDebugInfo(Consumer<String> addText) {
-        if (MonitorBlockEntityRenderer.hasRenderedThisFrame() && Minecraft.getInstance().options.renderDebug) {
+        if (MonitorBlockEntityRenderer.hasRenderedThisFrame() && Minecraft.getInstance().getDebugOverlay().showDebugScreen()) {
             addText.accept("[CC:T] Monitor renderer: " + MonitorBlockEntityRenderer.currentRenderer());
         }
     }

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

@@ -13,7 +13,6 @@ import dan200.computercraft.api.client.turtle.RegisterTurtleUpgradeModeller;
 import dan200.computercraft.api.client.turtle.TurtleUpgradeModeller;
 import dan200.computercraft.client.gui.*;
 import dan200.computercraft.client.pocket.ClientPocketComputers;
-import dan200.computercraft.client.render.CustomLecternRenderer;
 import dan200.computercraft.client.render.RenderTypes;
 import dan200.computercraft.client.render.TurtleBlockEntityRenderer;
 import dan200.computercraft.client.render.monitor.MonitorBlockEntityRenderer;
@@ -23,15 +22,17 @@ 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 net.minecraft.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.color.item.ItemColor;
 import net.minecraft.client.gui.screens.MenuScreens;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.inventory.MenuAccess;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.ShaderInstance;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
@@ -43,6 +44,8 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.PreparableReloadListener;
 import net.minecraft.server.packs.resources.ResourceProvider;
 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.level.ItemLike;
@@ -74,36 +77,39 @@ public final class ClientRegistry {
         BlockEntityRenderers.register(ModRegistry.BlockEntities.MONITOR_ADVANCED.get(), MonitorBlockEntityRenderer::new);
         BlockEntityRenderers.register(ModRegistry.BlockEntities.TURTLE_NORMAL.get(), TurtleBlockEntityRenderer::new);
         BlockEntityRenderers.register(ModRegistry.BlockEntities.TURTLE_ADVANCED.get(), TurtleBlockEntityRenderer::new);
-        BlockEntityRenderers.register(ModRegistry.BlockEntities.LECTERN.get(), CustomLecternRenderer::new);
     }
 
     /**
      * Register any client-side objects which must be done on the main thread.
-     *
-     * @param itemProperties Callback to register item properties.
      */
-    public static void registerMainThread(RegisterItemProperty itemProperties) {
-        MenuScreens.<AbstractComputerMenu, ComputerScreen<AbstractComputerMenu>>register(ModRegistry.Menus.COMPUTER.get(), ComputerScreen::new);
-        MenuScreens.<AbstractComputerMenu, NoTermComputerScreen<AbstractComputerMenu>>register(ModRegistry.Menus.POCKET_COMPUTER_NO_TERM.get(), NoTermComputerScreen::new);
-        MenuScreens.register(ModRegistry.Menus.TURTLE.get(), TurtleScreen::new);
-
-        MenuScreens.register(ModRegistry.Menus.PRINTER.get(), PrinterScreen::new);
-        MenuScreens.register(ModRegistry.Menus.DISK_DRIVE.get(), DiskDriveScreen::new);
-        MenuScreens.register(ModRegistry.Menus.PRINTOUT.get(), PrintoutScreen::new);
-
-        registerItemProperty(itemProperties, "state",
-            new UnclampedPropertyFunction((stack, world, player, random) -> {
-                var computer = ClientPocketComputers.get(stack);
-                return (computer == null ? ComputerState.OFF : computer.getState()).ordinal();
-            }),
+    public static void registerMainThread() {
+        registerItemProperty("state",
+            new UnclampedPropertyFunction((stack, world, player, random) -> ClientPocketComputers.get(stack).getState().ordinal()),
             ModRegistry.Items.POCKET_COMPUTER_NORMAL, ModRegistry.Items.POCKET_COMPUTER_ADVANCED
         );
-        registerItemProperty(itemProperties, "coloured",
+        registerItemProperty("coloured",
             (stack, world, player, random) -> IColouredItem.getColourBasic(stack) != -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 {
+        <M extends AbstractContainerMenu, U extends Screen & MenuAccess<M>> void register(MenuType<? extends M> type, MenuScreens.ScreenConstructor<M, U> factory);
+    }
+
     public static void registerTurtleModellers(RegisterTurtleUpgradeModeller register) {
         register.register(ModRegistry.TurtleSerialisers.SPEAKER.get(), TurtleUpgradeModeller.sided(
             new ResourceLocation(ComputerCraftAPI.MOD_ID, "block/turtle_speaker_left"),
@@ -119,17 +125,9 @@ public final class ClientRegistry {
     }
 
     @SafeVarargs
-    private static void registerItemProperty(RegisterItemProperty itemProperties, String name, ClampedItemPropertyFunction getter, Supplier<? extends Item>... items) {
+    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);
-    }
-
-    /**
-     * 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);
+        for (var item : items) ItemProperties.register(item.get(), id, getter);
     }
 
     public static void registerReloadListeners(Consumer<PreparableReloadListener> register, Minecraft minecraft) {
@@ -167,14 +165,17 @@ public final class ClientRegistry {
     }
 
     private static int getPocketColour(ItemStack stack, int layer) {
-        return switch (layer) {
-            default -> 0xFFFFFF;
-            case 1 -> IColouredItem.getColourBasic(stack); // Frame colour
-            case 2 -> { // Light colour
-                var computer = ClientPocketComputers.get(stack);
-                yield computer == null || computer.getLightState() == -1 ? Colour.BLACK.getHex() : computer.getLightState();
+        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;
             }
-        };
+        }
     }
 
     private static int getTurtleColour(ItemStack stack, int layer) {

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

@@ -9,7 +9,6 @@ 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;
@@ -19,7 +18,6 @@ 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;
@@ -98,8 +96,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;
         }
     }
@@ -127,7 +125,6 @@ public abstract class AbstractComputerScreen<T extends AbstractComputerMenu> ext
 
     @Override
     public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
-        renderBackground(graphics);
         super.render(graphics, mouseX, mouseY, partialTicks);
         renderTooltip(graphics, mouseX, mouseY);
     }
@@ -209,7 +206,7 @@ public abstract class AbstractComputerScreen<T extends AbstractComputerMenu> ext
             return;
         }
 
-        if (!toUpload.isEmpty()) UploadFileMessage.send(menu, toUpload, ClientNetworking::sendToServer);
+        if (toUpload.size() > 0) UploadFileMessage.send(menu, toUpload, ClientNetworking::sendToServer);
     }
 
     public void uploadResult(UploadResult result, @Nullable Component message) {
@@ -225,13 +222,9 @@ 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.Action.REPEAT : KeyEventServerMessage.Action.DOWN, key));
+        ClientNetworking.sendToServer(new KeyEventServerMessage(menu, repeat ? KeyEventServerMessage.TYPE_REPEAT : KeyEventServerMessage.TYPE_DOWN, key));
     }
 
     @Override
     public void keyUp(int key) {
-        ClientNetworking.sendToServer(new KeyEventServerMessage(menu, KeyEventServerMessage.Action.UP, key));
+        ClientNetworking.sendToServer(new KeyEventServerMessage(menu, KeyEventServerMessage.TYPE_UP, key));
     }
 
     @Override
     public void mouseClick(int button, int x, int y) {
-        ClientNetworking.sendToServer(new MouseEventServerMessage(menu, MouseEventServerMessage.Action.CLICK, button, x, y));
+        ClientNetworking.sendToServer(new MouseEventServerMessage(menu, MouseEventServerMessage.TYPE_CLICK, button, x, y));
     }
 
     @Override
     public void mouseUp(int button, int x, int y) {
-        ClientNetworking.sendToServer(new MouseEventServerMessage(menu, MouseEventServerMessage.Action.UP, button, x, y));
+        ClientNetworking.sendToServer(new MouseEventServerMessage(menu, MouseEventServerMessage.TYPE_UP, button, x, y));
     }
 
     @Override
     public void mouseDrag(int button, int x, int y) {
-        ClientNetworking.sendToServer(new MouseEventServerMessage(menu, MouseEventServerMessage.Action.DRAG, button, x, y));
+        ClientNetworking.sendToServer(new MouseEventServerMessage(menu, MouseEventServerMessage.TYPE_DRAG, button, x, y));
     }
 
     @Override
     public void mouseScroll(int direction, int x, int y) {
-        ClientNetworking.sendToServer(new MouseEventServerMessage(menu, MouseEventServerMessage.Action.SCROLL, direction, x, y));
+        ClientNetworking.sendToServer(new MouseEventServerMessage(menu, MouseEventServerMessage.TYPE_SCROLL, direction, x, y));
     }
 }

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

@@ -28,7 +28,6 @@ public class DiskDriveScreen extends AbstractContainerScreen<DiskDriveMenu> {
 
     @Override
     public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
-        renderBackground(graphics);
         super.render(graphics, mouseX, mouseY, partialTicks);
         renderTooltip(graphics, mouseX, mouseY);
     }

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

@@ -9,6 +9,7 @@ import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.toasts.Toast;
 import net.minecraft.client.gui.components.toasts.ToastComponent;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.world.item.ItemStack;
 
@@ -18,6 +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");
     public static final Object TRANSFER_NO_RESPONSE_TOKEN = new Object();
 
     private static final long DISPLAY_TIME = 7000L;
@@ -79,7 +81,7 @@ public class ItemToast implements Toast {
         }
 
         if (width == 160 && message.size() <= 1) {
-            graphics.blit(TEXTURE, 0, 0, 0, 64, width, height());
+            graphics.blitSprite(TEXTURE, 0, 0, width, height());
         } else {
 
             var height = height();
@@ -109,14 +111,14 @@ public class ItemToast implements Toast {
     }
 
     private static void renderBackgroundRow(GuiGraphics graphics, int x, int u, int y, int height) {
-        var leftOffset = 5;
+        var leftOffset = u == 0 ? 20 : 5;
         var rightOffset = Math.min(60, x - leftOffset);
 
-        graphics.blit(TEXTURE, 0, y, 0, 32 + u, leftOffset, height);
+        graphics.blitSprite(TEXTURE, 160, 32, 0, u, 0, y, leftOffset, height);
         for (var k = leftOffset; k < x - rightOffset; k += 64) {
-            graphics.blit(TEXTURE, k, y, 32, 32 + u, Math.min(64, x - k - rightOffset), height);
+            graphics.blitSprite(TEXTURE, 160, 32, 32, u, k, y, Math.min(64, x - k - rightOffset), height);
         }
 
-        graphics.blit(TEXTURE, x - rightOffset, y, 160 - rightOffset, 32 + u, rightOffset, height);
+        graphics.blitSprite(TEXTURE, 160, 32, 160 - rightOffset, u, x - rightOffset, y, rightOffset, height);
     }
 }

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

@@ -6,10 +6,8 @@ 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;
@@ -18,7 +16,6 @@ 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;
 
@@ -47,8 +44,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();
@@ -66,14 +63,14 @@ public class NoTermComputerScreen<T extends AbstractComputerMenu> extends Screen
     }
 
     @Override
-    public boolean mouseScrolled(double pMouseX, double pMouseY, double pDelta) {
-        Objects.requireNonNull(minecraft().player).getInventory().swapPaint(pDelta);
-        return super.mouseScrolled(pMouseX, pMouseY, pDelta);
+    public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) {
+        minecraft.player.getInventory().swapPaint(scrollX);
+        return super.mouseScrolled(mouseX, mouseY, scrollX, scrollY);
     }
 
     @Override
     public void onClose() {
-        Objects.requireNonNull(minecraft().player).closeContainer();
+        minecraft.player.closeContainer();
         super.onClose();
     }
 
@@ -96,16 +93,12 @@ 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) - (font.width(line) / 2), y, 0xFFFFFF, true);
+            graphics.drawString(font, line, (width / 2) - (minecraft.font.width(line) / 2), y, 0xFFFFFF, true);
             y += 9;
         }
     }
-
-    private Minecraft minecraft() {
-        return Nullability.assertNonNull(minecraft);
-    }
 }

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

@@ -86,8 +86,6 @@ public final class OptionScreen extends Screen {
 
     @Override
     public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
-        renderBackground(graphics);
-
         // Render the actual texture.
         graphics.blit(BACKGROUND, x, y, 0, 0, innerWidth, PADDING);
         graphics.blit(BACKGROUND,

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

@@ -30,7 +30,6 @@ public class PrinterScreen extends AbstractContainerScreen<PrinterMenu> {
 
     @Override
     public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
-        renderBackground(graphics);
         super.render(graphics, mouseX, mouseY, partialTicks);
         renderTooltip(graphics, mouseX, mouseY);
     }

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

@@ -6,22 +6,15 @@ 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.media.PrintoutMenu;
+import dan200.computercraft.shared.common.HeldItemMenu;
 import dan200.computercraft.shared.media.items.PrintoutItem;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.inventory.ContainerListener;
-import net.minecraft.world.item.ItemStack;
 import org.lwjgl.glfw.GLFW;
 
-import java.util.Arrays;
-import java.util.Objects;
-
 import static dan200.computercraft.client.render.PrintoutRenderer.*;
 import static dan200.computercraft.client.render.RenderTypes.FULL_BRIGHT_LIGHTMAP;
 
@@ -30,75 +23,40 @@ import static dan200.computercraft.client.render.RenderTypes.FULL_BRIGHT_LIGHTMA
  *
  * @see dan200.computercraft.client.render.PrintoutRenderer
  */
-public final class PrintoutScreen extends AbstractContainerScreen<PrintoutMenu> implements ContainerListener {
-    private PrintoutInfo printout = PrintoutInfo.DEFAULT;
-    private int page = 0;
+public class PrintoutScreen extends AbstractContainerScreen<HeldItemMenu> {
+    private final boolean book;
+    private final int pages;
+    private final TextBuffer[] text;
+    private final TextBuffer[] colours;
+    private int page;
 
-    public PrintoutScreen(PrintoutMenu container, Inventory player, Component title) {
+    public PrintoutScreen(HeldItemMenu container, Inventory player, Component title) {
         super(container, player, title);
+
         imageHeight = Y_SIZE;
-    }
 
-    private void setPrintout(ItemStack stack) {
-        var text = PrintoutItem.getText(stack);
-        var textBuffers = new TextBuffer[text.length];
-        for (var i = 0; i < textBuffers.length; i++) textBuffers[i] = new TextBuffer(text[i]);
+        var 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(stack);
-        var colourBuffers = new TextBuffer[colours.length];
-        for (var i = 0; i < colours.length; i++) colourBuffers[i] = new TextBuffer(colours[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 pages = Math.max(text.length / PrintoutItem.LINES_PER_PAGE, 1);
-        var book = stack.is(ModRegistry.Items.PRINTED_BOOK.get());
-
-        printout = new PrintoutInfo(pages, book, textBuffers, colourBuffers);
-    }
-
-    @Override
-    protected void init() {
-        super.init();
-        menu.addSlotListener(this);
-    }
-
-    @Override
-    public void removed() {
-        menu.removeSlotListener(this);
-    }
-
-    @Override
-    public void slotChanged(AbstractContainerMenu menu, int slot, ItemStack stack) {
-        if (slot == 0) setPrintout(stack);
-    }
-
-    @Override
-    public void dataChanged(AbstractContainerMenu menu, int slot, int data) {
-        if (slot == PrintoutMenu.DATA_CURRENT_PAGE) page = data;
-    }
-
-    private void setPage(int page) {
-        this.page = page;
-
-        var gameMode = Objects.requireNonNull(Objects.requireNonNull(minecraft).gameMode);
-        gameMode.handleInventoryButtonClick(menu.containerId, PrintoutMenu.PAGE_BUTTON_OFFSET + page);
-    }
-
-    private void previousPage() {
-        if (page > 0) setPage(page - 1);
-    }
-
-    private void nextPage() {
-        if (page < printout.pages() - 1) setPage(page + 1);
+        page = 0;
+        pages = Math.max(this.text.length / PrintoutItem.LINES_PER_PAGE, 1);
+        book = ((PrintoutItem) container.getStack().getItem()).getType() == PrintoutItem.Type.BOOK;
     }
 
     @Override
     public boolean keyPressed(int key, int scancode, int modifiers) {
         if (key == GLFW.GLFW_KEY_RIGHT) {
-            nextPage();
+            if (page < pages - 1) page++;
             return true;
         }
 
         if (key == GLFW.GLFW_KEY_LEFT) {
-            previousPage();
+            if (page > 0) page--;
             return true;
         }
 
@@ -106,17 +64,17 @@ public final class PrintoutScreen extends AbstractContainerScreen<PrintoutMenu>
     }
 
     @Override
-    public boolean mouseScrolled(double x, double y, double delta) {
-        if (super.mouseScrolled(x, y, delta)) return true;
-        if (delta < 0) {
+    public boolean mouseScrolled(double x, double y, double deltaX, double deltaY) {
+        if (super.mouseScrolled(x, y, deltaX, deltaY)) return true;
+        if (deltaX < 0) {
             // Scroll up goes to the next page
-            nextPage();
+            if (page < pages - 1) page++;
             return true;
         }
 
-        if (delta > 0) {
+        if (deltaX > 0) {
             // Scroll down goes to the previous page
-            previousPage();
+            if (page > 0) page--;
             return true;
         }
 
@@ -127,39 +85,22 @@ public final class PrintoutScreen extends AbstractContainerScreen<PrintoutMenu>
     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, printout.pages(), printout.book(), FULL_BRIGHT_LIGHTMAP);
-        drawText(graphics.pose(), renderer, leftPos + X_TEXT_MARGIN, topPos + Y_TEXT_MARGIN, PrintoutItem.LINES_PER_PAGE * page, FULL_BRIGHT_LIGHTMAP, printout.text(), printout.colour());
+        drawBorder(graphics.pose(), renderer, leftPos, topPos, 0, page, pages, book, FULL_BRIGHT_LIGHTMAP);
+        drawText(graphics.pose(), renderer, leftPos + X_TEXT_MARGIN, topPos + Y_TEXT_MARGIN, PrintoutItem.LINES_PER_PAGE * page, FULL_BRIGHT_LIGHTMAP, text, colours);
         renderer.endBatch();
     }
 
     @Override
-    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
+    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.
         graphics.pose().pushPose();
         graphics.pose().translate(0, 0, -1);
-        renderBackground(graphics);
+        super.renderBackground(graphics, mouseX, mouseY, partialTicks);
         graphics.pose().popPose();
-
-        super.render(graphics, mouseX, mouseY, partialTicks);
     }
 
     @Override
     protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY) {
         // Skip rendering labels.
     }
-
-    record PrintoutInfo(int pages, boolean book, TextBuffer[] text, TextBuffer[] colour) {
-        public static final PrintoutInfo DEFAULT;
-
-        static {
-            var textLines = new TextBuffer[PrintoutItem.LINES_PER_PAGE];
-            Arrays.fill(textLines, new TextBuffer(" ".repeat(PrintoutItem.LINE_MAX_LENGTH)));
-
-            var colourLines = new TextBuffer[PrintoutItem.LINES_PER_PAGE];
-            Arrays.fill(colourLines, new TextBuffer("f".repeat(PrintoutItem.LINE_MAX_LENGTH)));
-
-            DEFAULT = new PrintoutInfo(1, false, textLines, colourLines);
-        }
-    }
 }

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

@@ -43,6 +43,10 @@ public class DynamicImageButton extends Button {
 
     @Override
     public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
+        var message = this.message.get();
+        setMessage(message.message());
+        setTooltip(message.tooltip());
+
         var texture = this.texture.get(isHoveredOrFocused());
 
         RenderSystem.disableDepthTest();
@@ -50,14 +54,6 @@ public class DynamicImageButton extends Button {
         RenderSystem.enableDepthTest();
     }
 
-    @Override
-    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
-        var message = this.message.get();
-        setMessage(message.message());
-        setTooltip(message.tooltip());
-        super.render(graphics, mouseX, mouseY, partialTicks);
-    }
-
     public record HintedMessage(Component message, Tooltip tooltip) {
         public HintedMessage(Component message, @Nullable Component hint) {
             this(

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

@@ -195,7 +195,7 @@ public class TerminalWidget extends AbstractWidget {
     }
 
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
+    public boolean mouseScrolled(double mouseX, double mouseY, double delta, double deltaY) {
         if (!inTermRegion(mouseX, mouseY)) return false;
         if (!hasMouseSupport() || delta == 0) return false;
 

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

@@ -1,117 +0,0 @@
-// SPDX-FileCopyrightText: 2024 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.client.model;
-
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.client.render.CustomLecternRenderer;
-import dan200.computercraft.shared.media.items.PrintoutItem;
-import net.minecraft.client.model.geom.ModelPart;
-import net.minecraft.client.model.geom.PartPose;
-import net.minecraft.client.model.geom.builders.CubeListBuilder;
-import net.minecraft.client.model.geom.builders.MeshDefinition;
-import net.minecraft.client.resources.model.Material;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.inventory.InventoryMenu;
-
-import java.util.List;
-
-/**
- * A model for {@linkplain PrintoutItem printouts} placed on a lectern.
- * <p>
- * This provides two models, {@linkplain #renderPages(PoseStack, VertexConsumer, int, int, int) one for a variable
- * number of pages}, and {@linkplain #renderBook(PoseStack, VertexConsumer, int, int) one for books}.
- *
- * @see CustomLecternRenderer
- */
-public class LecternPrintoutModel {
-    public static final ResourceLocation TEXTURE = new ResourceLocation(ComputerCraftAPI.MOD_ID, "entity/printout");
-    public static final Material MATERIAL = new Material(InventoryMenu.BLOCK_ATLAS, TEXTURE);
-
-    private static final int TEXTURE_WIDTH = 32;
-    private static final int TEXTURE_HEIGHT = 32;
-
-    private static final String PAGE_1 = "page_1";
-    private static final String PAGE_2 = "page_2";
-    private static final String PAGE_3 = "page_3";
-    private static final List<String> PAGES = List.of(PAGE_1, PAGE_2, PAGE_3);
-
-    private final ModelPart pagesRoot;
-    private final ModelPart bookRoot;
-    private final ModelPart[] pages;
-
-    public LecternPrintoutModel() {
-        pagesRoot = buildPages();
-        bookRoot = buildBook();
-        pages = PAGES.stream().map(pagesRoot::getChild).toArray(ModelPart[]::new);
-    }
-
-    private static ModelPart buildPages() {
-        var mesh = new MeshDefinition();
-        var parts = mesh.getRoot();
-        parts.addOrReplaceChild(
-            PAGE_1,
-            CubeListBuilder.create().texOffs(0, 0).addBox(-0.005f, -4.0f, -2.5f, 1f, 8.0f, 5.0f),
-            PartPose.ZERO
-        );
-
-        parts.addOrReplaceChild(
-            PAGE_2,
-            CubeListBuilder.create().texOffs(12, 0).addBox(-0.005f, -4.0f, -2.5f, 1f, 8.0f, 5.0f),
-            PartPose.offsetAndRotation(-0.125f, 0, 1.5f, (float) Math.PI * (1f / 16), 0, 0)
-        );
-        parts.addOrReplaceChild(
-            PAGE_3,
-            CubeListBuilder.create().texOffs(12, 0).addBox(-0.005f, -4.0f, -2.5f, 1f, 8.0f, 5.0f),
-            PartPose.offsetAndRotation(-0.25f, 0, -1.5f, (float) -Math.PI * (2f / 16), 0, 0)
-        );
-
-        return mesh.getRoot().bake(TEXTURE_WIDTH, TEXTURE_HEIGHT);
-    }
-
-    private static ModelPart buildBook() {
-        var mesh = new MeshDefinition();
-        var parts = mesh.getRoot();
-
-        parts.addOrReplaceChild(
-            "spine",
-            CubeListBuilder.create().texOffs(12, 15).addBox(-0.005f, -5.0f, -0.5f, 0, 10, 1.0f),
-            PartPose.ZERO
-        );
-
-        var angle = (float) Math.toRadians(5);
-        parts.addOrReplaceChild(
-            "left",
-            CubeListBuilder.create()
-                .texOffs(0, 10).addBox(0, -5.0f, -6.0f, 0, 10, 6.0f)
-                .texOffs(0, 0).addBox(0.005f, -4.0f, -5.0f, 1.0f, 8.0f, 5.0f),
-            PartPose.offsetAndRotation(-0.005f, 0, -0.5f, 0, -angle, 0)
-        );
-
-        parts.addOrReplaceChild(
-            "right",
-            CubeListBuilder.create()
-                .texOffs(14, 10).addBox(0, -5.0f, 0, 0, 10, 6.0f)
-                .texOffs(0, 0).addBox(0.005f, -4.0f, 0, 1.0f, 8.0f, 5.0f),
-            PartPose.offsetAndRotation(-0.005f, 0, 0.5f, 0, angle, 0)
-        );
-
-        return mesh.getRoot().bake(TEXTURE_WIDTH, TEXTURE_HEIGHT);
-    }
-
-    public void renderBook(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay) {
-        bookRoot.render(poseStack, buffer, packedLight, packedOverlay, 1, 1, 1, 1);
-    }
-
-    public void renderPages(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, int pageCount) {
-        if (pageCount > pages.length) pageCount = pages.length;
-        var i = 0;
-        for (; i < pageCount; i++) pages[i].visible = true;
-        for (; i < pages.length; i++) pages[i].visible = false;
-
-        pagesRoot.render(poseStack, buffer, packedLight, packedOverlay, 1, 1, 1, 1);
-    }
-}

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

@@ -17,7 +17,6 @@ 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;
@@ -28,6 +27,7 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 
 import javax.annotation.Nullable;
+import java.nio.ByteBuffer;
 import java.util.UUID;
 
 /**
@@ -49,7 +49,7 @@ public final class ClientNetworkContextImpl implements ClientNetworkContext {
     }
 
     @Override
-    public void handleMonitorData(BlockPos pos, @Nullable TerminalState terminal) {
+    public void handleMonitorData(BlockPos pos, TerminalState terminal) {
         var player = Minecraft.getInstance().player;
         if (player == null) return;
 
@@ -67,17 +67,19 @@ public final class ClientNetworkContextImpl implements ClientNetworkContext {
     }
 
     @Override
-    public void handlePocketComputerData(UUID instanceId, ComputerState state, int lightState, @Nullable TerminalState terminal) {
-        ClientPocketComputers.setState(instanceId, state, lightState, terminal);
+    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);
     }
 
     @Override
-    public void handlePocketComputerDeleted(UUID instanceId) {
+    public void handlePocketComputerDeleted(int instanceId) {
         ClientPocketComputers.remove(instanceId);
     }
 
     @Override
-    public void handleSpeakerAudio(UUID source, SpeakerPosition.Message position, float volume, EncodedAudio buffer) {
+    public void handleSpeakerAudio(UUID source, SpeakerPosition.Message position, float volume, ByteBuffer buffer) {
         SpeakerManager.getSound(source).playAudio(reifyPosition(position), volume, buffer);
     }
 

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

@@ -11,7 +11,7 @@ import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.game.ServerGamePacketListener;
+import net.minecraft.network.protocol.common.ServerCommonPacketListener;
 import net.minecraft.sounds.SoundEvent;
 
 import javax.annotation.Nullable;
@@ -27,7 +27,7 @@ public interface ClientPlatformHelper extends dan200.computercraft.impl.client.C
      * @param message The messsge to convert.
      * @return The converted message.
      */
-    Packet<ServerGamePacketListener> createPacket(NetworkMessage<ServerNetworkContext> message);
+    Packet<ServerCommonPacketListener> createPacket(NetworkMessage<ServerNetworkContext> message);
 
     /**
      * Render a {@link BakedModel}, using any loader-specific hooks.

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

@@ -4,25 +4,21 @@
 
 package dan200.computercraft.client.pocket;
 
-import dan200.computercraft.shared.computer.core.ComputerState;
+import dan200.computercraft.shared.computer.core.ComputerFamily;
 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#getInstanceUUID()} to locals {@link PocketComputerData}.
+ * Maps {@link ServerComputer#getInstanceID()} to locals {@link PocketComputerData}.
  * <p>
  * This is populated by {@link PocketComputerDataMessage} and accessed when rendering pocket computers
  */
 public final class ClientPocketComputers {
-    private static final Map<UUID, PocketComputerData> instances = new HashMap<>();
+    private static final Int2ObjectMap<PocketComputerData> instances = new Int2ObjectOpenHashMap<>();
 
     private ClientPocketComputers() {
     }
@@ -31,33 +27,25 @@ public final class ClientPocketComputers {
         instances.clear();
     }
 
-    public static void remove(UUID id) {
+    public static void remove(int id) {
         instances.remove(id);
     }
 
     /**
-     * Set the state of a pocket computer.
+     * Get or create a pocket computer.
      *
-     * @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.
+     * @param instanceId The instance ID of the pocket computer.
+     * @param advanced   Whether this computer has an advanced terminal.
+     * @return The pocket computer data.
      */
-    public static void setState(UUID instanceId, ComputerState state, int lightColour, @Nullable TerminalState terminalData) {
+    public static PocketComputerData get(int instanceId, boolean advanced) {
         var computer = instances.get(instanceId);
-        if (computer == null) {
-            instances.put(instanceId, new PocketComputerData(state, lightColour, terminalData));
-        } else {
-            computer.setState(state, lightColour, terminalData);
-        }
+        if (computer == null) instances.put(instanceId, computer = new PocketComputerData(advanced));
+        return computer;
     }
 
-    public static @Nullable PocketComputerData get(ItemStack stack) {
-        var id = PocketComputerItem.getInstanceID(stack);
-        return id == null ? null : instances.get(id);
-    }
-
-    static @Nullable PocketComputerData get(UUID id) {
-        return instances.get(id);
+    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);
     }
 }

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

@@ -1,101 +0,0 @@
-// SPDX-FileCopyrightText: 2024 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.client.pocket;
-
-import com.mojang.blaze3d.vertex.PoseStack;
-import dan200.computercraft.client.gui.GuiSprites;
-import dan200.computercraft.client.render.ComputerBorderRenderer;
-import dan200.computercraft.client.render.RenderTypes;
-import dan200.computercraft.client.render.SpriteRenderer;
-import dan200.computercraft.client.render.text.FixedWidthFontRenderer;
-import dan200.computercraft.core.terminal.Terminal;
-import dan200.computercraft.shared.computer.core.ComputerFamily;
-import dan200.computercraft.shared.computer.terminal.NetworkedTerminal;
-import dan200.computercraft.shared.pocket.items.PocketTooltipComponent;
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
-import net.minecraft.client.renderer.MultiBufferSource;
-
-import javax.annotation.Nullable;
-import java.util.UUID;
-
-import static dan200.computercraft.client.render.ComputerBorderRenderer.BORDER;
-import static dan200.computercraft.client.render.ComputerBorderRenderer.MARGIN;
-import static dan200.computercraft.client.render.text.FixedWidthFontRenderer.FONT_HEIGHT;
-import static dan200.computercraft.client.render.text.FixedWidthFontRenderer.FONT_WIDTH;
-
-/**
- * Renders the pocket computer's terminal in the item's tooltip.
- * <p>
- * The rendered terminal is downscaled by a factor of {@link #SCALE}.
- */
-public class PocketClientTooltipComponent implements ClientTooltipComponent {
-    private static final float SCALE = 0.5f;
-
-    private final UUID id;
-    private final ComputerFamily family;
-
-    public PocketClientTooltipComponent(PocketTooltipComponent component) {
-        this.id = component.id();
-        this.family = component.family();
-    }
-
-    private @Nullable PocketComputerData computer() {
-        return ClientPocketComputers.get(id);
-    }
-
-    private @Nullable NetworkedTerminal terminal() {
-        var computer = computer();
-        return computer == null ? null : computer.getTerminal();
-    }
-
-    @Override
-    public int getHeight() {
-        var terminal = terminal();
-        if (terminal == null) return 0;
-
-        return (int) Math.ceil(
-            (terminal.getHeight() * FixedWidthFontRenderer.FONT_HEIGHT + ComputerBorderRenderer.BORDER * 2 + ComputerBorderRenderer.MARGIN * 2) * SCALE
-        );
-    }
-
-    @Override
-    public int getWidth(Font font) {
-        var terminal = terminal();
-        if (terminal == null) return 0;
-
-        return (int) Math.ceil(
-            (terminal.getWidth() * FixedWidthFontRenderer.FONT_WIDTH + ComputerBorderRenderer.BORDER * 2 + ComputerBorderRenderer.MARGIN * 2) * SCALE
-        );
-    }
-
-    @Override
-    public void renderImage(Font font, int x, int y, GuiGraphics guiGraphics) {
-        var terminal = terminal();
-        if (terminal == null) return;
-
-        var pose = guiGraphics.pose();
-        pose.pushPose();
-        pose.translate(x, y, 0);
-        pose.scale(SCALE, SCALE, 1);
-
-
-        render(pose, guiGraphics.bufferSource(), terminal);
-
-        pose.popPose();
-    }
-
-    private void render(PoseStack stack, MultiBufferSource buffers, Terminal terminal) {
-        var width = terminal.getWidth() * FONT_WIDTH + MARGIN * 2;
-        var height = terminal.getHeight() * FONT_HEIGHT + MARGIN * 2;
-
-        var renderer = SpriteRenderer.createForGui(stack.last().pose(), buffers.getBuffer(RenderTypes.GUI_SPRITES));
-        ComputerBorderRenderer.render(renderer, GuiSprites.getComputerTextures(family), BORDER, BORDER, width, height, false);
-
-        var quadEmitter = FixedWidthFontRenderer.toVertexConsumer(stack, buffers.getBuffer(RenderTypes.TERMINAL));
-        FixedWidthFontRenderer.drawTerminal(quadEmitter, BORDER + MARGIN, BORDER + MARGIN, terminal, MARGIN, MARGIN, MARGIN, MARGIN);
-    }
-}

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,22 +21,20 @@ import javax.annotation.Nullable;
  * @see ClientPocketComputers The registry which holds pocket computers.
  * @see PocketServerComputer The server-side pocket computer.
  */
-public final class PocketComputerData {
-    private @Nullable NetworkedTerminal terminal;
-    private ComputerState state;
-    private int lightColour;
+public class PocketComputerData {
+    private final NetworkedTerminal terminal;
+    private ComputerState state = ComputerState.OFF;
+    private int lightColour = -1;
 
-    PocketComputerData(ComputerState state, int lightColour, @Nullable TerminalState terminalData) {
-        this.state = state;
-        this.lightColour = lightColour;
-        if (terminalData != null) terminal = terminalData.create();
+    public PocketComputerData(boolean colour) {
+        terminal = new NetworkedTerminal(Config.pocketTermWidth, Config.pocketTermHeight, colour);
     }
 
     public int getLightState() {
         return state != ComputerState.OFF ? lightColour : -1;
     }
 
-    public @Nullable NetworkedTerminal getTerminal() {
+    public Terminal getTerminal() {
         return terminal;
     }
 
@@ -44,16 +42,12 @@ public final class PocketComputerData {
         return state;
     }
 
-    void setState(ComputerState state, int lightColour, @Nullable TerminalState terminalData) {
+    public void setState(ComputerState state, int lightColour) {
         this.state = state;
         this.lightColour = lightColour;
+    }
 
-        if (terminalData != null) {
-            if (terminal == null) {
-                terminal = terminalData.create();
-            } else {
-                terminalData.apply(terminal);
-            }
-        }
+    public void setTerminal(TerminalState state) {
+        state.apply(terminal);
     }
 }

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

@@ -1,51 +0,0 @@
-// SPDX-FileCopyrightText: 2024 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.client.render;
-
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Axis;
-import dan200.computercraft.client.model.LecternPrintoutModel;
-import dan200.computercraft.shared.lectern.CustomLecternBlockEntity;
-import dan200.computercraft.shared.media.items.PrintoutItem;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
-import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
-import net.minecraft.client.renderer.blockentity.LecternRenderer;
-import net.minecraft.world.level.block.LecternBlock;
-
-/**
- * A block entity renderer for our {@linkplain CustomLecternBlockEntity lectern}.
- * <p>
- * This largely follows {@link LecternRenderer}, but with support for multiple types of item.
- */
-public class CustomLecternRenderer implements BlockEntityRenderer<CustomLecternBlockEntity> {
-    private final LecternPrintoutModel printoutModel;
-
-    public CustomLecternRenderer(BlockEntityRendererProvider.Context context) {
-        printoutModel = new LecternPrintoutModel();
-    }
-
-    @Override
-    public void render(CustomLecternBlockEntity lectern, float partialTick, PoseStack poseStack, MultiBufferSource buffer, int packedLight, int packedOverlay) {
-        poseStack.pushPose();
-        poseStack.translate(0.5f, 1.0625f, 0.5f);
-        poseStack.mulPose(Axis.YP.rotationDegrees(-lectern.getBlockState().getValue(LecternBlock.FACING).getClockWise().toYRot()));
-        poseStack.mulPose(Axis.ZP.rotationDegrees(67.5f));
-        poseStack.translate(0, -0.125f, 0);
-
-        var item = lectern.getItem();
-        if (item.getItem() instanceof PrintoutItem printout) {
-            var vertexConsumer = LecternPrintoutModel.MATERIAL.buffer(buffer, RenderType::entitySolid);
-            if (printout.getType() == PrintoutItem.Type.BOOK) {
-                printoutModel.renderBook(poseStack, vertexConsumer, packedLight, packedOverlay);
-            } else {
-                printoutModel.renderPages(poseStack, vertexConsumer, packedLight, packedOverlay, PrintoutItem.getPageCount(item));
-            }
-        }
-
-        poseStack.popPose();
-    }
-}

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

@@ -17,8 +17,6 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 
-import java.util.Objects;
-
 /**
  * A base class for items which have map-like rendering when held in the hand.
  *
@@ -37,7 +35,7 @@ public abstract class ItemMapLikeRenderer {
     protected abstract void renderItem(PoseStack transform, MultiBufferSource render, ItemStack stack, int light);
 
     public void renderItemFirstPerson(PoseStack transform, MultiBufferSource render, int lightTexture, InteractionHand hand, float pitch, float equipProgress, float swingProgress, ItemStack stack) {
-        Player player = Objects.requireNonNull(Minecraft.getInstance().player);
+        Player player = Minecraft.getInstance().player;
 
         transform.pushPose();
         if (hand == InteractionHand.MAIN_HAND && player.getOffhandItem().isEmpty()) {

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

@@ -11,9 +11,7 @@ import dan200.computercraft.client.pocket.ClientPocketComputers;
 import dan200.computercraft.client.render.text.FixedWidthFontRenderer;
 import dan200.computercraft.core.util.Colour;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
-import dan200.computercraft.shared.config.Config;
 import dan200.computercraft.shared.pocket.items.PocketComputerItem;
-import dan200.computercraft.shared.util.ARGB32;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.world.item.ItemStack;
 import org.joml.Matrix4f;
@@ -34,16 +32,10 @@ public final class PocketItemRenderer extends ItemMapLikeRenderer {
     @Override
     protected void renderItem(PoseStack transform, MultiBufferSource bufferSource, ItemStack stack, int light) {
         var computer = ClientPocketComputers.get(stack);
-        var terminal = computer == null ? null : computer.getTerminal();
+        var terminal = computer.getTerminal();
 
-        int termWidth, termHeight;
-        if (terminal == null) {
-            termWidth = Config.pocketTermWidth;
-            termHeight = Config.pocketTermHeight;
-        } else {
-            termWidth = terminal.getWidth();
-            termHeight = terminal.getHeight();
-        }
+        var termWidth = terminal.getWidth();
+        var termHeight = terminal.getHeight();
 
         var width = termWidth * FONT_WIDTH + MARGIN * 2;
         var height = termHeight * FONT_HEIGHT + MARGIN * 2;
@@ -68,15 +60,14 @@ public final class PocketItemRenderer extends ItemMapLikeRenderer {
         renderFrame(matrix, bufferSource, family, frameColour, light, width, height);
 
         // Render the light
-        var lightColour = computer == null || computer.getLightState() == -1 ? Colour.BLACK.getHex() : computer.getLightState();
+        var lightColour = ClientPocketComputers.get(stack).getLightState();
+        if (lightColour == -1) lightColour = Colour.BLACK.getHex();
         renderLight(transform, bufferSource, lightColour, width, height);
 
-        var quadEmitter = FixedWidthFontRenderer.toVertexConsumer(transform, bufferSource.getBuffer(RenderTypes.TERMINAL));
-        if (terminal == null) {
-            FixedWidthFontRenderer.drawEmptyTerminal(quadEmitter, 0, 0, width, height);
-        } else {
-            FixedWidthFontRenderer.drawTerminal(quadEmitter, MARGIN, MARGIN, terminal, MARGIN, MARGIN, MARGIN, MARGIN);
-        }
+        FixedWidthFontRenderer.drawTerminal(
+            FixedWidthFontRenderer.toVertexConsumer(transform, bufferSource.getBuffer(RenderTypes.TERMINAL)),
+            MARGIN, MARGIN, terminal, MARGIN, MARGIN, MARGIN, MARGIN
+        );
 
         transform.popPose();
     }
@@ -93,11 +84,16 @@ public final class PocketItemRenderer extends ItemMapLikeRenderer {
     }
 
     private static void renderLight(PoseStack transform, MultiBufferSource render, int colour, int width, int height) {
+        var r = (byte) ((colour >>> 16) & 0xFF);
+        var g = (byte) ((colour >>> 8) & 0xFF);
+        var b = (byte) (colour & 0xFF);
+        var c = new byte[]{ r, g, b, (byte) 255 };
+
         var buffer = render.getBuffer(RenderTypes.TERMINAL);
         FixedWidthFontRenderer.drawQuad(
             FixedWidthFontRenderer.toVertexConsumer(transform, buffer),
             width - LIGHT_HEIGHT * 2, height + BORDER / 2.0f, 0.001f, LIGHT_HEIGHT * 2, LIGHT_HEIGHT,
-            ARGB32.opaque(colour), RenderTypes.FULL_BRIGHT_LIGHTMAP
+            c, RenderTypes.FULL_BRIGHT_LIGHTMAP
         );
     }
 }

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

@@ -34,12 +34,11 @@ public class SpriteRenderer {
         this.b = b;
     }
 
-    public static SpriteRenderer createForGui(Matrix4f transform, VertexConsumer builder) {
-        return new SpriteRenderer(transform, builder, 0, RenderTypes.FULL_BRIGHT_LIGHTMAP, 255, 255, 255);
-    }
-
     public static SpriteRenderer createForGui(GuiGraphics graphics, RenderType renderType) {
-        return createForGui(graphics.pose().last().pose(), graphics.bufferSource().getBuffer(renderType));
+        return new SpriteRenderer(
+            graphics.pose().last().pose(), graphics.bufferSource().getBuffer(renderType),
+            0, RenderTypes.FULL_BRIGHT_LIGHTMAP, 255, 255, 255
+        );
     }
 
     /**
@@ -126,10 +125,10 @@ public class SpriteRenderer {
     }
 
     public static float u(TextureAtlasSprite sprite, int x, int width) {
-        return sprite.getU((double) x / width * 16);
+        return sprite.getU((float) x / width);
     }
 
     public static float v(TextureAtlasSprite sprite, int y, int height) {
-        return sprite.getV((double) y / height * 16);
+        return sprite.getV((float) y / height);
     }
 }

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

@@ -55,7 +55,7 @@ public class TurtleBlockEntityRenderer implements BlockEntityRenderer<TurtleBloc
         // Render the label
         var label = turtle.getLabel();
         var hit = renderer.cameraHitResult;
-        if (label != null && hit != null && hit.getType() == HitResult.Type.BLOCK && turtle.getBlockPos().equals(((BlockHitResult) hit).getBlockPos())) {
+        if (label != null && hit.getType() == HitResult.Type.BLOCK && turtle.getBlockPos().equals(((BlockHitResult) hit).getBlockPos())) {
             var mc = Minecraft.getInstance();
             var font = this.font;
 

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

@@ -9,6 +9,7 @@ import com.mojang.blaze3d.platform.MemoryTracker;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.*;
 import com.mojang.math.Axis;
+import dan200.computercraft.annotations.ForgeOverride;
 import dan200.computercraft.client.FrameInfo;
 import dan200.computercraft.client.integration.ShaderMod;
 import dan200.computercraft.client.render.RenderTypes;
@@ -25,6 +26,7 @@ import dan200.computercraft.shared.util.DirectionUtil;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
+import net.minecraft.world.phys.AABB;
 import org.joml.Matrix3f;
 import org.joml.Matrix4f;
 import org.lwjgl.opengl.GL11;
@@ -58,9 +60,9 @@ public class MonitorBlockEntityRenderer implements BlockEntityRenderer<MonitorBl
     @Override
     public void render(MonitorBlockEntity monitor, float partialTicks, PoseStack transform, MultiBufferSource bufferSource, int lightmapCoord, int overlayLight) {
         // Render from the origin monitor
-        var originTerminal = monitor.getOriginClientMonitor();
-        if (originTerminal == null) return;
+        var originTerminal = monitor.getClientMonitor();
 
+        if (originTerminal == null) return;
         var origin = originTerminal.getOrigin();
         var renderState = originTerminal.getRenderState(MonitorRenderState::new);
         var monitorPos = monitor.getBlockPos();
@@ -255,6 +257,11 @@ public class MonitorBlockEntityRenderer implements BlockEntityRenderer<MonitorBl
         return Config.monitorDistance;
     }
 
+    @ForgeOverride
+    public AABB getRenderBoundingBox(MonitorBlockEntity monitor) {
+        return monitor.getRenderBoundingBox();
+    }
+
     /**
      * Determine if any monitors were rendered this frame.
      *