Merge branch 'mc-1.20.x' into mc-1.21.x

Closes #2099

.editorconfig

@@ -18,11 +18,6 @@ ij_any_if_brace_force = if_multiline
 ij_any_for_brace_force = if_multiline
 ij_any_spaces_within_array_initializer_braces = true
 
-ij_kotlin_allow_trailing_comma = true
-ij_kotlin_allow_trailing_comma_on_call_site = true
-ij_kotlin_method_parameters_wrap = off
-ij_kotlin_call_parameters_wrap = off
-
 [*.md]
 trim_trailing_whitespace = false
 
@@ -31,3 +26,16 @@ indent_size = 2
 
 [*.yml]
 indent_size = 2
+
+[{*.kt,*.kts}]
+ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
+ij_kotlin_continuation_indent_size = 4
+ij_kotlin_spaces_around_equality_operators = true
+
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+
+# Prefer to handle these manually
+ij_kotlin_method_parameters_wrap = off
+ij_kotlin_call_parameters_wrap = off
+ij_kotlin_extends_list_wrap = off

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,12 +1,14 @@
 name: Bug report
 description: Report some misbehaviour in the mod
 labels: [ bug ]
+type: bug
 body:
 - type: dropdown
   id: mc-version
   attributes:
     label: Minecraft Version
-    description: What version of Minecraft are you using?
+    description: |
+        What version of Minecraft are you using? If your version is not listed, please try to reproduce on one of the supported versions.
     options:
       - 1.20.1
       - 1.21.x
@@ -26,8 +28,7 @@ body:
     label: Details
     description: |
       Description of the bug. Please include the following:
-      - Logs: These will be located in the `logs/` directory of your Minecraft
-        instance. Please upload them as a gist or directly into this editor.
-      - Detailed reproduction steps: sometimes I can spot a bug pretty easily,
-        but often it's much more obscure. The more information I have to help
-        reproduce it, the quicker it'll get fixed.
+      - Logs: These will be located in the `logs/` directory of your Minecraft instance. This is always useful, even if it doesn't include errors, so please upload this!
+      - Detailed reproduction steps: sometimes I can spot a bug pretty easily, but often it's much more obscure. The more information I have to help reproduce it, the quicker it'll get fixed.
+
+      ![A gif of burning text reading "Upload your logs!!!"](https://tweaked.cc/images/logs.gif)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,6 +2,7 @@
 name: Feature request
 about: Suggest an idea or improvement
 labels: enhancement
+type: feature
 ---
 
 <!--

.github/workflows/main-ci.yml

@@ -30,27 +30,6 @@ jobs:
     - name: ⚒️ Build
       run: ./gradlew assemble || ./gradlew assemble
 
-    - name: 💡 Lint
-      uses: pre-commit/action@v3.0.0
-
-    - name: 🧪 Run tests
-      run: ./gradlew test validateMixinNames checkChangelog
-
-    - name: 📥 Download assets for game tests
-      run: ./gradlew downloadAssets || ./gradlew downloadAssets
-
-    - name: 🧪 Run integration tests
-      run: ./gradlew runGametest
-
-    - name: 🧪 Run client tests
-      run: ./gradlew runGametestClient # Not checkClient, as no point running rendering tests.
-      # These are a little flaky on GH actions: its useful to run them, but don't break the build.
-      continue-on-error: true
-
-    - name: 🧪 Parse test reports
-      run: ./tools/parse-reports.py
-      if: ${{ failure() }}
-
     - name: 📦 Prepare Jars
       run: |
         # Find the main jar and append the git hash onto it.
@@ -63,8 +42,29 @@ jobs:
         name: CC-Tweaked
         path: ./jars
 
-    - name: 📤 Upload coverage
-      uses: codecov/codecov-action@v4
+    - 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
+
+    - name: 🧪 Run tests
+      run: ./gradlew test validateMixinNames checkChangelog
+
+    - name: 📥 Download assets for game tests
+      run: ./gradlew downloadAssets || ./gradlew downloadAssets
+
+    - name: 🧪 Run integration tests
+      run: ./gradlew runGametest
+
+    - name: 🧪 Parse test reports
+      run: ./tools/parse-reports.py
+      if: ${{ failure() }}
 
   build-core:
     strategy:

.gitignore

@@ -27,6 +27,7 @@
 *.iml
 .idea
 .gradle
+.kotlin
 *.DS_Store
 
 /.classpath

.pre-commit-config.yaml

@@ -27,7 +27,7 @@ repos:
     exclude: "^(.*\\.(bat)|LICENSE)$"
 
 - repo: https://github.com/fsfe/reuse-tool
-  rev: v2.1.0
+  rev: v5.0.2
   hooks:
   - id: reuse
 
@@ -58,6 +58,7 @@ repos:
 exclude: |
   (?x)^(
     projects/[a-z]+/src/generated|
+    projects/[a-z]+/src/examples/generatedResources|
     projects/core/src/test/resources/test-rom/data/json-parsing/|
     .*\.dfpwm
   )

.reuse/dep5

@@ -1,100 +0,0 @@
-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_upgrade/*
-  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/*
-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/forge/src/main/resources/computercraft.forge.mixins.json
-  projects/web/src/frontend/mount/.settings
-  projects/web/src/frontend/mount/example.nfp
-  projects/web/src/frontend/mount/example.nft
-  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,15 @@ 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 [Weblate], an online interface for managing language strings. This is synced
-automatically with GitHub, so please don't submit PRs adding/changing translations!
+Translations are managed through [CrowdIn], an online interface for managing language strings.
 
 ## 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 (JDK). This can be downloaded from [Adoptium].
+   - Java Development Kit 21 (JDK). This can be downloaded from [Adoptium].
    - [Git](https://git-scm.com/).
-   - [NodeJS][node].
+   - [NodeJS 20 or later][node].
 
  - Download CC: Tweaked's source code:
    ```
@@ -49,9 +48,12 @@ If you want to run CC:T in a normal Minecraft instance, run `./gradlew assemble`
 `projects/forge/build/libs` (for Forge) or `projects/fabric/build/libs` (for Fabric).
 
 ## Developing CC: Tweaked
-Before making any major changes to CC: Tweaked, I'd recommend you have a read of the [the architecture
-document][architecture] first. While it's not a comprehensive document, it gives a good hint of where you should start
-looking to make your changes. As always, if you're not sure, [do ask the community][community]!
+Before making any major changes to CC: Tweaked, I'd recommend starting opening an issue or starting a discussion on
+GitHub first. It's often helpful to discuss features before spending time developing them!
+
+Once you're ready to start programming, have a read of the [the architecture document][architecture] first. While it's
+not a comprehensive document, it gives a good hint of where you should start looking to make your changes. As always, if
+you're not sure, [do ask the community][community]!
 
 ### Testing
 When making larger changes, it may be useful to write a test to make sure your code works as expected.
@@ -101,10 +103,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

@@ -11,14 +11,13 @@ SPDX-License-Identifier: MPL-2.0
 </picture>
 
 [![Current build status](https://github.com/cc-tweaked/CC-Tweaked/workflows/Build/badge.svg)](https://github.com/cc-tweaked/CC-Tweaked/actions "Current build status")
-[![Download CC: Tweaked on CurseForge](https://img.shields.io/static/v1?label=Download&message=CC:%20Tweaked&color=E04E14&logoColor=E04E14&logo=CurseForge)][CurseForge]
 [![Download CC: Tweaked on Modrinth](https://img.shields.io/static/v1?label=Download&color=00AF5C&logoColor=00AF5C&logo=Modrinth&message=CC:%20Tweaked)][Modrinth]
 
 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.
 
-CC: Tweaked can be installed from [CurseForge] or [Modrinth]. It runs on both [Minecraft Forge] and [Fabric].
+CC: Tweaked can be installed from [Modrinth]. It runs on both [Minecraft Forge] and [Fabric].
 
 ## Contributing
 Any contribution is welcome, be that using the mod, reporting bugs or contributing code. If you want to get started
@@ -26,8 +25,9 @@ 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 [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.
+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].
 
 We also host fairly comprehensive documentation at [tweaked.cc](https://tweaked.cc/ "The CC: Tweaked website").
 
@@ -60,19 +60,6 @@ dependencies {
 }
 ```
 
-When using ForgeGradle, you may also need to add the following:
-
-```groovy
-minecraft {
-    runs {
-        configureEach {
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
-        }
-    }
-}
-```
-
 You should also be careful to only use classes within the `dan200.computercraft.api` package. Non-API classes are
 subject to change at any point. If you depend on functionality outside the API (or need to mixin to CC:T), please file
 an issue to let me know!
@@ -81,10 +68,9 @@ We bundle the API sources with the jar, so documentation should be easily viewab
 the generated documentation [can be browsed online](https://tweaked.cc/javadoc/).
 
 [computercraft]: https://github.com/dan200/ComputerCraft "ComputerCraft on GitHub"
-[curseforge]: https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked from CurseForge"
 [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
-[IRC]: https://webchat.esper.net/?channels=computercraft "#computercraft on EsperNet"
+[EsperNet]: https://www.esper.net/
+[KiwiIRC]: https://kiwiirc.com/nextclient/#irc://irc.esper.net:+6697/#computercraft "#computercraft on EsperNet"

REUSE.toml

@@ -0,0 +1,100 @@
+# 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]]
+SPDX-FileCopyrightText = "The CC: Tweaked Developers"
+SPDX-License-Identifier = "CC0-1.0"
+path = [
+    # Generated/data files are CC0.
+    "gradle/gradle-daemon-jvm.properties",
+    "projects/common/src/main/resources/assets/computercraft/sounds.json",
+    "projects/common/src/main/resources/assets/computercraft/sounds/empty.ogg",
+    "projects/common/src/testMod/resources/data/cctest/computercraft/turtle_upgrade/**",
+    "projects/common/src/testMod/resources/data/cctest/structures/**",
+    "projects/*/src/generated/**",
+    "projects/web/src/htmlTransform/export/index.json",
+    "projects/web/src/htmlTransform/export/items/minecraft/**",
+    # 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.
+    ".github/**",
+    # Example mod is CC0.
+    "projects/*/src/examples/**"
+]
+
+[[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/*/src/*/resources/*.mixins.json",
+    "projects/fabric/src/*/resources/fabric.mod.json",
+    "projects/common/src/main/resources/assets/minecraft/shaders/core/computercraft/monitor_tbo.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/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 language 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 language files
+SPDX-FileCopyrightText = "2017 The CC: Tweaked Developers"
+SPDX-License-Identifier = "MPL-2.0"
+path = "projects/common/src/main/resources/assets/computercraft/lang/**"
+
+[[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

@@ -24,21 +24,19 @@ val mcVersion: String by extra
 
 githubRelease {
     token(findProperty("githubApiKey") as String? ?: "")
-    owner.set("cc-tweaked")
-    repo.set("CC-Tweaked")
-    targetCommitish.set(cct.gitBranch)
+    owner = "cc-tweaked"
+    repo = "CC-Tweaked"
+    targetCommitish = cct.gitBranch
 
-    tagName.set("v$mcVersion-$modVersion")
-    releaseName.set("[$mcVersion] $modVersion")
-    body.set(
-        provider {
-            "## " + project(":core").file("src/main/resources/data/computercraft/lua/rom/help/whatsnew.md")
-                .readLines()
-                .takeWhile { it != "Type \"help changelog\" to see the full version history." }
-                .joinToString("\n").trim()
-        },
-    )
-    prerelease.set(isUnstable)
+    tagName = "v$mcVersion-$modVersion"
+    releaseName = "[$mcVersion] $modVersion"
+    body = provider {
+        "## " + project(":core").file("src/main/resources/data/computercraft/lua/rom/help/whatsnew.md")
+            .readLines()
+            .takeWhile { it != "Type \"help changelog\" to see the full version history." }
+            .joinToString("\n").trim()
+    }
+    prerelease = isUnstable
 }
 
 tasks.publish { dependsOn(tasks.githubRelease) }
@@ -118,7 +116,7 @@ idea.project.settings.compiler.javac {
 }
 
 versionCatalogUpdate {
-    sortByKey.set(false)
+    sortByKey = false
     pin { versions.addAll("fastutil", "guava", "netty", "slf4j") }
-    keep { keepUnusedLibraries.set(true) }
+    keep { keepUnusedLibraries = true }
 }

buildSrc/build.gradle.kts

@@ -14,14 +14,10 @@ repositories {
     mavenCentral()
     gradlePluginPortal()
 
-    maven("https://maven.neoforged.net/releases") {
+    maven("https://maven.neoforged.net") {
         name = "NeoForge"
         content {
-            includeGroup("net.minecraftforge")
             includeGroup("net.neoforged")
-            includeGroup("net.neoforged.gradle")
-            includeModule("codechicken", "DiffPatch")
-            includeModule("net.covers1624", "Quack")
         }
     }
 
@@ -45,11 +41,10 @@ dependencies {
     implementation(libs.kotlin.plugin)
     implementation(libs.spotless)
 
-    implementation(libs.curseForgeGradle)
     implementation(libs.fabric.loom)
     implementation(libs.ideaExt)
     implementation(libs.minotaur)
-    implementation(libs.neoGradle.userdev)
+    implementation(libs.modDevGradle)
     implementation(libs.vanillaExtract)
 }
 
@@ -73,7 +68,7 @@ gradlePlugin {
 }
 
 versionCatalogUpdate {
-    sortByKey.set(false)
-    keep { keepUnusedLibraries.set(true) }
-    catalogFile.set(file("../gradle/libs.versions.toml"))
+    sortByKey = false
+    keep { keepUnusedLibraries = true }
+    catalogFile = file("../gradle/libs.versions.toml")
 }

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

@@ -30,7 +30,7 @@ repositories {
 
 loom {
     splitEnvironmentSourceSets()
-    splitModDependencies.set(true)
+    splitModDependencies = true
 }
 
 MinecraftConfigurations.setup(project)

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

@@ -11,20 +11,18 @@ import cc.tweaked.gradle.MinecraftConfigurations
 
 plugins {
     id("cc-tweaked.java-convention")
-    id("net.neoforged.gradle.userdev")
+    id("net.neoforged.moddev")
 }
 
 plugins.apply(CCTweakedPlugin::class.java)
 
 val mcVersion: String by extra
 
-minecraft {
-    modIdentifier("computercraft")
-}
+neoForge {
+    val libs = project.extensions.getByType<VersionCatalogsExtension>().named("libs")
+    version = libs.findVersion("neoForge").get().toString()
 
-subsystems {
     parchment {
-        val libs = project.extensions.getByType<VersionCatalogsExtension>().named("libs")
         minecraftVersion = libs.findVersion("parchmentMc").get().toString()
         mappingsVersion = libs.findVersion("parchment").get().toString()
     }

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

@@ -29,7 +29,7 @@ base.archivesName.convention("cc-tweaked-$mcVersion-${project.name}")
 
 java {
     toolchain {
-        languageVersion.set(CCTweakedPlugin.JAVA_VERSION)
+        languageVersion= CCTweakedPlugin.JAVA_VERSION
     }
 
     withSourcesJar()
@@ -47,7 +47,8 @@ repositories {
         filter {
             includeGroup("cc.tweaked")
             // Things we mirror
-            includeGroup("commoble.morered")
+            includeGroup("com.simibubi.create")
+            includeGroup("net.commoble.morered")
             includeGroup("dev.architectury")
             includeGroup("dev.emi")
             includeGroup("maven.modrinth")
@@ -98,6 +99,7 @@ sourceSets.all {
             check("OperatorPrecedence", CheckSeverity.OFF) // For now.
             check("NonOverridingEquals", CheckSeverity.OFF) // Peripheral.equals makes this hard to avoid
             check("FutureReturnValueIgnored", CheckSeverity.OFF) // Too many false positives with Netty
+            check("InvalidInlineTag", CheckSeverity.OFF) // Triggered by @snippet. Can be removed on Java 21.
 
             check("NullAway", CheckSeverity.ERROR)
             option(
@@ -168,8 +170,8 @@ tasks.test {
 }
 
 tasks.withType(JacocoReport::class.java).configureEach {
-    reports.xml.required.set(true)
-    reports.html.required.set(true)
+    reports.xml.required = true
+    reports.html.required =true
 }
 
 project.plugins.withType(CCTweakedPlugin::class.java) {
@@ -225,6 +227,5 @@ idea.module {
 
     // Force Gradle to write to inherit the output directory from the parent, instead of writing to out/xxx/classes.
     // This is required for Loom, and we patch Forge's run configurations to work there.
-    // TODO: Submit a patch to Forge to support ProjectRootManager.
     inheritOutputDirs = true
 }

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

@@ -1,25 +0,0 @@
-// SPDX-FileCopyrightText: 2022 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-import cc.tweaked.gradle.CCTweakedPlugin
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-plugins {
-    kotlin("jvm")
-}
-
-kotlin {
-    jvmToolchain {
-        languageVersion.set(CCTweakedPlugin.JAVA_VERSION)
-    }
-}
-
-tasks.withType(KotlinCompile::class.java).configureEach {
-    // So technically we shouldn't need to do this as the toolchain sets it above. However, the option only appears
-    // to be set when the task executes, so doesn't get picked up by IDEs.
-    kotlinOptions.jvmTarget = when {
-        CCTweakedPlugin.JAVA_VERSION.asInt() > 8 -> CCTweakedPlugin.JAVA_VERSION.toString()
-        else -> "1.${CCTweakedPlugin.JAVA_VERSION.asInt()}"
-    }
-}

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

@@ -2,11 +2,9 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-import net.darkhax.curseforgegradle.TaskPublishCurseForge
 import cc.tweaked.gradle.setProvider
 
 plugins {
-    id("net.darkhax.curseforgegradle")
     id("com.modrinth.minotaur")
     id("cc-tweaked.publishing")
 }
@@ -25,34 +23,17 @@ val isUnstable = project.properties["isUnstable"] == "true"
 val modVersion: String by extra
 val mcVersion: String by extra
 
-val publishCurseForge by tasks.registering(TaskPublishCurseForge::class) {
-    group = PublishingPlugin.PUBLISH_TASK_GROUP
-    description = "Upload artifacts to CurseForge"
-
-    apiToken = findProperty("curseForgeApiKey") ?: ""
-    enabled = apiToken != ""
-
-    val mainFile = upload("282001", modPublishing.output)
-    mainFile.changelog =
-        "Release notes can be found on the [GitHub repository](https://github.com/cc-tweaked/CC-Tweaked/releases/tag/v$mcVersion-$modVersion)."
-    mainFile.changelogType = "markdown"
-    mainFile.releaseType = if (isUnstable) "alpha" else "release"
-    mainFile.gameVersions.add(mcVersion)
-}
-
-tasks.publish { dependsOn(publishCurseForge) }
-
 modrinth {
-    token.set(findProperty("modrinthApiKey") as String? ?: "")
-    projectId.set("gu7yAYhd")
-    versionNumber.set(modVersion)
-    versionName.set(modVersion)
-    versionType.set(if (isUnstable) "alpha" else "release")
+    token = findProperty("modrinthApiKey") as String? ?: ""
+    projectId = "gu7yAYhd"
+    versionNumber = modVersion
+    versionName = modVersion
+    versionType = if (isUnstable) "alpha" else "release"
     uploadFile.setProvider(modPublishing.output)
     gameVersions.add(mcVersion)
-    changelog.set("Release notes can be found on the [GitHub repository](https://github.com/cc-tweaked/CC-Tweaked/releases/tag/v$mcVersion-$modVersion).")
+    changelog = "Release notes can be found on the [GitHub repository](https://github.com/cc-tweaked/CC-Tweaked/releases/tag/v$mcVersion-$modVersion)."
 
-    syncBodyFrom.set(provider { rootProject.file("doc/mod-page.md").readText() })
+    syncBodyFrom = provider { rootProject.file("doc/mod-page.md").readText() }
 }
 
 tasks.publish { dependsOn(tasks.modrinth) }

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

@@ -2,44 +2,34 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-import cc.tweaked.gradle.clientClasses
-import cc.tweaked.gradle.commonClasses
-
 /**
  * Sets up the configurations for writing game tests.
  *
  * See notes in [cc.tweaked.gradle.MinecraftConfigurations] for the general design behind these cursed ideas.
  */
 
+import cc.tweaked.gradle.MinecraftConfigurations
+import cc.tweaked.gradle.clientClasses
+import cc.tweaked.gradle.commonClasses
+
 plugins {
-    id("cc-tweaked.kotlin-convention")
+    kotlin("jvm")
     id("cc-tweaked.java-convention")
 }
 
 val main = sourceSets["main"]
 val client = sourceSets["client"]
 
-// Both testMod and testFixtures inherit from the main and client classpath, just so we have access to Minecraft classes.
-val testMod by sourceSets.creating {
-    compileClasspath += main.compileClasspath + client.compileClasspath
-    runtimeClasspath += main.runtimeClasspath + client.runtimeClasspath
-}
+MinecraftConfigurations.createDerivedConfiguration(project, MinecraftConfigurations.DATAGEN)
+MinecraftConfigurations.createDerivedConfiguration(project, MinecraftConfigurations.EXAMPLES)
+MinecraftConfigurations.createDerivedConfiguration(project, MinecraftConfigurations.TEST_MOD)
 
-configurations {
-    named(testMod.compileClasspathConfigurationName) {
-        shouldResolveConsistentlyWith(compileClasspath.get())
-    }
+// Set up generated resources
+sourceSets.main { resources.srcDir("src/generated/resources") }
+sourceSets.named("examples") { resources.srcDir("src/examples/generatedResources") }
 
-    named(testMod.runtimeClasspathConfigurationName) {
-        shouldResolveConsistentlyWith(runtimeClasspath.get())
-    }
-}
-
-// Like the main test configurations, we're safe to depend on source set outputs.
-dependencies {
-    add(testMod.implementationConfigurationName, main.output)
-    add(testMod.implementationConfigurationName, client.output)
-}
+// Make sure our examples compile.
+tasks.check { dependsOn(tasks.named("compileExamplesJava")) }
 
 // Similar to java-test-fixtures, but tries to avoid putting the obfuscated jar on the classpath.
 

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

@@ -12,25 +12,26 @@ publishing {
         register<MavenPublication>("maven") {
             artifactId = base.archivesName.get()
             from(components["java"])
+            suppressAllPomMetadataWarnings()
 
             pom {
-                name.set("CC: Tweaked")
-                description.set("CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles and more to Minecraft.")
-                url.set("https://github.com/cc-tweaked/CC-Tweaked")
+                name = "CC: Tweaked"
+                description = "CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles and more to Minecraft."
+                url = "https://github.com/cc-tweaked/CC-Tweaked"
 
                 scm {
-                    url.set("https://github.com/cc-tweaked/CC-Tweaked.git")
+                    url = "https://github.com/cc-tweaked/CC-Tweaked.git"
                 }
 
                 issueManagement {
-                    system.set("github")
-                    url.set("https://github.com/cc-tweaked/CC-Tweaked/issues")
+                    system = "github"
+                    url = "https://github.com/cc-tweaked/CC-Tweaked/issues"
                 }
 
                 licenses {
                     license {
-                        name.set("ComputerCraft Public License, Version 1.0")
-                        url.set("https://github.com/cc-tweaked/CC-Tweaked/blob/HEAD/LICENSE")
+                        name = "ComputerCraft Public License, Version 1.0"
+                        url = "https://github.com/cc-tweaked/CC-Tweaked/blob/HEAD/LICENSE"
                     }
                 }
             }

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

@@ -10,23 +10,16 @@ import org.gradle.api.GradleException
 import org.gradle.api.NamedDomainObjectProvider
 import org.gradle.api.Project
 import org.gradle.api.Task
-import org.gradle.api.artifacts.Dependency
-import org.gradle.api.attributes.TestSuiteType
-import org.gradle.api.file.FileSystemOperations
 import org.gradle.api.plugins.JavaPluginExtension
-import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Provider
 import org.gradle.api.provider.SetProperty
-import org.gradle.api.reporting.ReportingExtension
 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
-import org.gradle.testing.jacoco.plugins.JacocoCoverageReport
 import org.gradle.testing.jacoco.plugins.JacocoPluginExtension
 import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
 import org.gradle.testing.jacoco.tasks.JacocoReport
@@ -37,54 +30,40 @@ import java.io.IOException
 import java.net.URI
 import java.util.regex.Pattern
 
-abstract class CCTweakedExtension(
-    private val project: Project,
-    private val fs: FileSystemOperations,
-) {
+abstract class CCTweakedExtension(private val project: Project) {
     /** Get the hash of the latest git commit. */
-    val gitHash: Provider<String> = gitProvider(project, "<no git hash>") {
-        ProcessHelpers.captureOut("git", "-C", project.rootProject.projectDir.absolutePath, "rev-parse", "HEAD").trim()
-    }
+    val gitHash: Provider<String> =
+        gitProvider("<no git commit>", listOf("rev-parse", "HEAD")) { it.trim() }
 
     /** Get the current git branch. */
-    val gitBranch: Provider<String> = gitProvider(project, "<no git branch>") {
-        ProcessHelpers.captureOut("git", "-C", project.rootProject.projectDir.absolutePath, "rev-parse", "--abbrev-ref", "HEAD")
-            .trim()
-    }
+    val gitBranch: Provider<String> =
+        gitProvider("<no git branch>", listOf("rev-parse", "--abbrev-ref", "HEAD")) { it.trim() }
 
     /** Get a list of all contributors to the project. */
-    val gitContributors: Provider<List<String>> = gitProvider(project, listOf()) {
-        ProcessHelpers.captureLines(
-            "git", "-C", project.rootProject.projectDir.absolutePath, "shortlog", "-ns",
-            "--group=author", "--group=trailer:co-authored-by", "HEAD",
-        )
-            .asSequence()
-            .map {
-                val matcher = COMMIT_COUNTS.matcher(it)
-                matcher.find()
-                matcher.group(1)
-            }
-            .filter { !IGNORED_USERS.contains(it) }
-            .toList()
-            .sortedWith(String.CASE_INSENSITIVE_ORDER)
-    }
+    val gitContributors: Provider<List<String>> =
+        gitProvider(listOf(), listOf("shortlog", "-ns", "--group=author", "--group=trailer:co-authored-by", "HEAD")) { input ->
+            input.lineSequence()
+                .filter { it.isNotEmpty() }
+                .map {
+                    val matcher = COMMIT_COUNTS.matcher(it)
+                    matcher.find()
+                    matcher.group(1)
+                }
+                .filter { !IGNORED_USERS.contains(it) }
+                .toList()
+                .sortedWith(String.CASE_INSENSITIVE_ORDER)
+        }
 
     /**
      * References to other sources
      */
     val sourceDirectories: SetProperty<SourceSetReference> = project.objects.setProperty(SourceSetReference::class.java)
 
-    /**
-     * Dependencies excluded from published artifacts.
-     */
-    private val excludedDeps: ListProperty<Dependency> = project.objects.listProperty(Dependency::class.java)
-
     /** All source sets referenced by this project. */
     val sourceSets = sourceDirectories.map { x -> x.map { it.sourceSet } }
 
     init {
         sourceDirectories.finalizeValueOnRead()
-        excludedDeps.finalizeValueOnRead()
         project.afterEvaluate { sourceDirectories.disallowChanges() }
     }
 
@@ -110,14 +89,13 @@ abstract class CCTweakedExtension(
         val otherJava = otherProject.extensions.getByType(JavaPluginExtension::class.java)
         val main = otherJava.sourceSets.getByName("main")
         val client = otherJava.sourceSets.getByName("client")
-        val testMod = otherJava.sourceSets.findByName("testMod")
-        val testFixtures = otherJava.sourceSets.findByName("testFixtures")
 
         // Pull in sources from the other project.
         extendSourceSet(otherProject, main)
         extendSourceSet(otherProject, client)
-        if (testMod != null) extendSourceSet(otherProject, testMod)
-        if (testFixtures != null) extendSourceSet(otherProject, testFixtures)
+        for (sourceSet in listOf(MinecraftConfigurations.DATAGEN, MinecraftConfigurations.EXAMPLES, MinecraftConfigurations.TEST_MOD, "testFixtures")) {
+            otherJava.sourceSets.findByName(sourceSet)?.let { extendSourceSet(otherProject, it) }
+        }
 
         // The extra source-processing tasks should include these files too.
         project.tasks.named(main.javadocTaskName, Javadoc::class.java) { source(main.allJava, client.allJava) }
@@ -180,23 +158,19 @@ 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.capitalized()}Report"
+        val reportTaskName = "jacoco${task.name.capitalise()}Report"
 
         val jacoco = project.extensions.getByType(JacocoPluginExtension::class.java)
         task.configure {
             finalizedBy(reportTaskName)
-
-            doFirst("Clean class dump directory") { fs.delete { delete(classDump) } }
-
             jacoco.applyTo(this)
+
             extensions.configure(JacocoTaskExtension::class.java) {
                 includes = listOf("dan200.computercraft.*")
-                classDumpDir = classDump.get().asFile
-
-                // Older versions of modlauncher don't include a protection domain (and thus no code
-                // source). Jacoco skips such classes by default, so we need to explicitly include them.
-                isIncludeNoLocationClasses = true
+                excludes = listOf(
+                    "dan200.computercraft.mixin.*", // Exclude mixins, as they're not executed at runtime.
+                    "dan200.computercraft.shared.Capabilities$*", // Exclude capability tokens, as Forge rewrites them.
+                )
             }
         }
 
@@ -205,15 +179,11 @@ abstract class CCTweakedExtension(
             description = "Generates code coverage report for the ${task.name} task."
 
             executionData(task.get())
-            classDirectories.from(classDump)
 
-            // Don't want to use sourceSets(...) here as we have a custom class directory.
-            for (ref in sourceSets.get()) sourceDirectories.from(ref.allSource.sourceDirectories)
-        }
-
-        project.extensions.configure(ReportingExtension::class.java) {
-            reports.register("${task.name}CodeCoverageReport", JacocoCoverageReport::class.java) {
-                testType.set(TestSuiteType.INTEGRATION_TEST)
+            // Don't want to use sourceSets(...) here as we don't use all class directories.
+            for (ref in this@CCTweakedExtension.sourceDirectories.get()) {
+                sourceDirectories.from(ref.sourceSet.allSource.sourceDirectories)
+                if (ref.classes) classDirectories.from(ref.sourceSet.output)
             }
         }
     }
@@ -253,40 +223,31 @@ abstract class CCTweakedExtension(
         ).resolve().single()
     }
 
-    /**
-     * Exclude a dependency from being published in Maven.
-     */
-    fun exclude(dep: Dependency) {
-        excludedDeps.add(dep)
-    }
+    private fun <T> gitProvider(default: T, command: List<String>, process: (String) -> T): Provider<T> {
+        val baseResult = project.providers.exec {
+            commandLine = listOf("git", "-C", project.rootDir.absolutePath) + command
+        }
 
-    /**
-     * Configure a [MavenDependencySpec].
-     */
-    fun configureExcludes(spec: MavenDependencySpec) {
-        for (dep in excludedDeps.get()) spec.exclude(dep)
+        return project.provider {
+            val res = try {
+                baseResult.standardOutput.asText.get()
+            } catch (e: IOException) {
+                project.logger.error("Cannot read Git repository: ${e.message}", e)
+                return@provider default
+            } catch (e: GradleException) {
+                project.logger.error("Cannot read Git repository: ${e.message}", e)
+                return@provider default
+            }
+            process(res)
+        }
     }
 
     companion object {
         private val COMMIT_COUNTS = Pattern.compile("""^\s*[0-9]+\s+(.*)$""")
         private val IGNORED_USERS = setOf(
-            "GitHub", "Daniel Ratcliffe", "Weblate",
+            "GitHub", "Daniel Ratcliffe", "NotSquidDev", "Weblate",
         )
 
-        private fun <T> gitProvider(project: Project, default: T, supplier: () -> T): Provider<T> {
-            return project.provider {
-                try {
-                    supplier()
-                } catch (e: IOException) {
-                    project.logger.error("Cannot read Git repository: ${e.message}")
-                    default
-                } catch (e: GradleException) {
-                    project.logger.error("Cannot read Git repository: ${e.message}")
-                    default
-                }
-            }
-        }
-
         private val isIdeSync: Boolean
             get() = java.lang.Boolean.parseBoolean(System.getProperty("idea.sync.active", "false"))
     }

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

@@ -22,19 +22,19 @@ import org.gradle.language.base.plugins.LifecycleBasePlugin
 
 abstract class DependencyCheck : DefaultTask() {
     @get:Input
-    abstract val configuration: ListProperty<Configuration>
+    protected abstract val dependencies: ListProperty<DependencyResult>
 
     /**
      * A mapping of module coordinates (`group:module`) to versions, overriding the requested version.
      */
     @get:Input
-    abstract val overrides: MapProperty<String, String>
+    protected abstract val overrides: MapProperty<String, String>
 
     init {
         description = "Check :core's dependencies are consistent with Minecraft's."
         group = LifecycleBasePlugin.VERIFICATION_GROUP
 
-        configuration.finalizeValueOnRead()
+        dependencies.finalizeValueOnRead()
         overrides.finalizeValueOnRead()
     }
 
@@ -45,13 +45,19 @@ abstract class DependencyCheck : DefaultTask() {
         overrides.putAll(project.provider { mutableMapOf(module.get().module.toString() to version) })
     }
 
+    /**
+     * Add a configuration to check.
+     */
+    fun configuration(configuration: Provider<Configuration>) {
+        // We can't store the Configuration in the cache, so store the resolved dependencies instead.
+        dependencies.addAll(configuration.map { it.incoming.resolutionResult.allDependencies })
+    }
+
     @TaskAction
     fun run() {
         var ok = true
-        for (configuration in configuration.get()) {
-            configuration.incoming.resolutionResult.allDependencies {
-                if (!check(this@allDependencies)) ok = false
-            }
+        for (configuration in dependencies.get()) {
+            if (!check(configuration)) ok = false
         }
 
         if (!ok) {

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

@@ -159,7 +159,7 @@ fun getNextVersion(version: String): String {
     val lastIndex = mainVersion.lastIndexOf('.')
     if (lastIndex < 0) throw IllegalArgumentException("Cannot parse version format \"$version\"")
     val lastVersion = try {
-        version.substring(lastIndex + 1).toInt()
+        mainVersion.substring(lastIndex + 1).toInt()
     } catch (e: NumberFormatException) {
         throw IllegalArgumentException("Cannot parse version format \"$version\"", e)
     }
@@ -171,3 +171,15 @@ 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/MavenDependencySpec.kt

@@ -1,73 +0,0 @@
-// SPDX-FileCopyrightText: 2022 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package cc.tweaked.gradle
-
-import org.gradle.api.artifacts.Dependency
-import org.gradle.api.artifacts.MinimalExternalModuleDependency
-import org.gradle.api.artifacts.ProjectDependency
-import org.gradle.api.plugins.BasePluginExtension
-import org.gradle.api.publish.maven.MavenPublication
-import org.gradle.api.specs.Spec
-
-/**
- * A dependency in a POM file.
- */
-data class MavenDependency(val groupId: String?, val artifactId: String?, val version: String?, val scope: String?)
-
-/**
- * A spec specifying which dependencies to include/exclude.
- */
-class MavenDependencySpec {
-    private val excludeSpecs = mutableListOf<Spec<MavenDependency>>()
-
-    fun exclude(spec: Spec<MavenDependency>) {
-        excludeSpecs.add(spec)
-    }
-
-    fun exclude(dep: Dependency) {
-        exclude {
-            // We have to cheat a little for project dependencies, as the project name doesn't match the artifact group.
-            val name = when (dep) {
-                is ProjectDependency -> dep.dependencyProject.extensions.getByType(BasePluginExtension::class.java).archivesName.get()
-                else -> dep.name
-            }
-            (dep.group.isNullOrEmpty() || dep.group == it.groupId) &&
-                (name.isNullOrEmpty() || name == it.artifactId) &&
-                (dep.version.isNullOrEmpty() || dep.version == it.version)
-        }
-    }
-
-    fun exclude(dep: MinimalExternalModuleDependency) {
-        exclude {
-            dep.module.group == it.groupId && dep.module.name == it.artifactId
-        }
-    }
-
-    fun isIncluded(dep: MavenDependency) = !excludeSpecs.any { it.isSatisfiedBy(dep) }
-}
-
-/**
- * Configure dependencies present in this publication's POM file.
- *
- * While this approach is very ugly, it's the easiest way to handle it!
- */
-fun MavenPublication.mavenDependencies(action: MavenDependencySpec.() -> Unit) {
-    val spec = MavenDependencySpec()
-    action(spec)
-
-    pom.withXml {
-        val dependencies = XmlUtil.findChild(asNode(), "dependencies") ?: return@withXml
-        dependencies.children().map { it as groovy.util.Node }.forEach {
-            val dep = MavenDependency(
-                groupId = XmlUtil.findChild(it, "groupId")?.text(),
-                artifactId = XmlUtil.findChild(it, "artifactId")?.text(),
-                version = XmlUtil.findChild(it, "version")?.text(),
-                scope = XmlUtil.findChild(it, "scope")?.text(),
-            )
-
-            if (!spec.isIncluded(dep)) it.parent().remove(it)
-        }
-    }
-}

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

@@ -24,7 +24,6 @@ class MinecraftConfigurations private constructor(private val project: Project)
     private val java = project.extensions.getByType(JavaPluginExtension::class.java)
     private val sourceSets = java.sourceSets
     private val configurations = project.configurations
-    private val objects = project.objects
 
     private val main = sourceSets[SourceSet.MAIN_SOURCE_SET_NAME]
     private val test = sourceSets[SourceSet.TEST_SOURCE_SET_NAME]
@@ -37,13 +36,7 @@ class MinecraftConfigurations private constructor(private val project: Project)
         val client = sourceSets.maybeCreate("client")
 
         // Ensure the client classpaths behave the same as the main ones.
-        configurations.named(client.compileClasspathConfigurationName) {
-            shouldResolveConsistentlyWith(configurations[main.compileClasspathConfigurationName])
-        }
-
-        configurations.named(client.runtimeClasspathConfigurationName) {
-            shouldResolveConsistentlyWith(configurations[main.runtimeClasspathConfigurationName])
-        }
+        consistentWithMain(client)
 
         // Set up an API configuration for clients (to ensure it's consistent with the main source set).
         val clientApi = configurations.maybeCreate(client.apiConfigurationName).apply {
@@ -85,6 +78,16 @@ class MinecraftConfigurations private constructor(private val project: Project)
         setupBasic()
     }
 
+    private fun consistentWithMain(sourceSet: SourceSet) {
+        configurations.named(sourceSet.compileClasspathConfigurationName) {
+            shouldResolveConsistentlyWith(configurations[main.compileClasspathConfigurationName])
+        }
+
+        configurations.named(sourceSet.runtimeClasspathConfigurationName) {
+            shouldResolveConsistentlyWith(configurations[main.runtimeClasspathConfigurationName])
+        }
+    }
+
     private fun setupBasic() {
         val client = sourceSets["client"]
 
@@ -96,13 +99,30 @@ class MinecraftConfigurations private constructor(private val project: Project)
         val checkDependencyConsistency =
             project.tasks.register("checkDependencyConsistency", DependencyCheck::class.java) {
                 // We need to check both the main and client classpath *configurations*, as the actual configuration
-                configuration.add(configurations.named(main.runtimeClasspathConfigurationName))
-                configuration.add(configurations.named(client.runtimeClasspathConfigurationName))
+                configuration(configurations.named(main.runtimeClasspathConfigurationName))
+                configuration(configurations.named(client.runtimeClasspathConfigurationName))
             }
         project.tasks.named("check") { dependsOn(checkDependencyConsistency) }
     }
 
+    /**
+     * Create a new configuration that pulls in the main and client classes from the mod.
+     */
+    private fun createDerivedConfiguration(name: String) {
+        val client = sourceSets["client"]
+        val sourceSet = sourceSets.create(name)
+        sourceSet.compileClasspath += main.compileClasspath + client.compileClasspath
+        sourceSet.runtimeClasspath += main.runtimeClasspath + client.runtimeClasspath
+        consistentWithMain(sourceSet)
+        project.dependencies.add(sourceSet.implementationConfigurationName, main.output)
+        project.dependencies.add(sourceSet.implementationConfigurationName, client.output)
+    }
+
     companion object {
+        const val DATAGEN = "datagen"
+        const val EXAMPLES = "examples"
+        const val TEST_MOD = "testMod"
+
         fun setupBasic(project: Project) {
             MinecraftConfigurations(project).setupBasic()
         }
@@ -110,6 +130,10 @@ class MinecraftConfigurations private constructor(private val project: Project)
         fun setup(project: Project) {
             MinecraftConfigurations(project).setup()
         }
+
+        fun createDerivedConfiguration(project: Project, name: String) {
+            MinecraftConfigurations(project).createDerivedConfiguration(name)
+        }
     }
 }
 

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

@@ -4,6 +4,7 @@
 
 package cc.tweaked.gradle
 
+import net.neoforged.moddevgradle.internal.RunGameTask
 import org.gradle.api.GradleException
 import org.gradle.api.file.FileSystemOperations
 import org.gradle.api.invocation.Gradle
@@ -18,6 +19,7 @@ import java.nio.file.Files
 import java.util.concurrent.TimeUnit
 import java.util.function.Supplier
 import javax.inject.Inject
+import kotlin.collections.set
 import kotlin.random.Random
 
 /**
@@ -64,6 +66,22 @@ abstract class ClientJavaExec : JavaExec() {
         setTestProperties()
     }
 
+    fun copyFromForge(path: String) = copyFromForge(project.tasks.getByName(path, RunGameTask::class))
+
+    /**
+     * Set this task to run a given [RunGameTask].
+     */
+    fun copyFromForge(task: RunGameTask) {
+        copyFrom(task)
+
+        // Eagerly evaluate the behaviour of RunGameTask.exec
+        environment.putAll(task.environmentProperty.get())
+        classpath(task.classpathProvider)
+        workingDir = task.gameDirectory.get().asFile
+
+        setTestProperties() // setRunConfig may clobber some properties, ensure everything is set.
+    }
+
     /**
      * Copy configuration from a task with the given name.
      */
@@ -108,6 +126,23 @@ abstract class ClientJavaExec : JavaExec() {
         }
     }
 
+    /**
+     * Configure Iris to use Complementary Shaders.
+     */
+    fun withComplementaryShaders() {
+        val cct = project.extensions.getByType(CCTweakedExtension::class.java)
+
+        withFileFrom(workingDir.resolve("shaderpacks/ComplementaryShaders_v4.6.zip")) {
+            cct.downloadFile("Complementary Shaders", "https://edge.forgecdn.net/files/3951/170/ComplementaryShaders_v4.6.zip")
+        }
+        withFileContents(workingDir.resolve("config/iris.properties")) {
+            """
+            enableShaders=true
+            shaderPack=ComplementaryShaders_v4.6.zip
+            """.trimIndent()
+        }
+    }
+
     @TaskAction
     override fun exec() {
         Files.createDirectories(workingDir.toPath())

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

@@ -11,7 +11,9 @@ import org.gradle.api.file.Directory
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.*
+import org.gradle.process.ExecOperations
 import java.io.File
+import javax.inject.Inject
 
 class NodePlugin : Plugin<Project> {
     override fun apply(project: Project) {
@@ -43,9 +45,12 @@ abstract class NpmInstall : DefaultTask() {
     @get:OutputDirectory
     val nodeModules: Provider<Directory> = projectRoot.dir("node_modules")
 
+    @get:Inject
+    protected abstract val execOperations: ExecOperations
+
     @TaskAction
     fun install() {
-        project.exec {
+        execOperations.exec {
             commandLine(ProcessHelpers.getExecutable("npm"), "ci")
             workingDir = projectRoot.get().asFile
         }

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

@@ -4,45 +4,10 @@
 
 package cc.tweaked.gradle
 
-import org.codehaus.groovy.runtime.ProcessGroovyMethods
 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 {
-        // Something randomly passes in "GIT_DIR=" as an environment variable which clobbers everything else. Don't
-        // inherit the environment array!
-        return ProcessBuilder()
-            .command(*command)
-            .redirectError(ProcessBuilder.Redirect.INHERIT)
-            .also { it.environment().clear() }
-            .start()
-    }
-
-    fun captureOut(vararg command: String): String {
-        val process = startProcess(*command)
-        process.outputStream.close()
-
-        val result = ProcessGroovyMethods.getText(process)
-        process.waitForOrThrow("Failed to run command")
-        return result
-    }
-
-    fun captureLines(vararg command: String): List<String> {
-        val process = startProcess(*command)
-        process.outputStream.close()
-
-        val out = BufferedReader(InputStreamReader(process.inputStream, StandardCharsets.UTF_8)).use { reader ->
-            reader.lines().filter { it.isNotEmpty() }.toList()
-        }
-        ProcessGroovyMethods.closeStreams(process)
-        process.waitForOrThrow("Failed to run command")
-        return out
-    }
-
     fun onPath(name: String): Boolean {
         val path = System.getenv("PATH") ?: return false
         return path.splitToSequence(File.pathSeparator).any { File(it, name).exists() }

config/checkstyle/checkstyle.xml

@@ -21,6 +21,15 @@ SPDX-License-Identifier: MPL-2.0
         <property name="file" value="${config_loc}/suppressions.xml" />
     </module>
 
+    <!--
+        Checkstyle doesn't support @snippet (https://github.com/checkstyle/checkstyle/issues/11455),
+        so suppress warnings nearby
+    -->
+    <module name="SuppressWithNearbyTextFilter">
+        <property name="nearbyTextPattern" value="@snippet" />
+        <property name="lineRange" value="20" />
+    </module>
+
     <module name="BeforeExecutionExclusionFileFilter">
         <property name="fileNamePattern" value="render_old"/>
     </module>
@@ -124,7 +133,7 @@ SPDX-License-Identifier: MPL-2.0
         </module>
         <module name="MethodTypeParameterName" />
         <module name="PackageName">
-            <property name="format" value="^(dan200\.computercraft|cc\.tweaked)(\.[a-z][a-z0-9]*)*" />
+            <property name="format" value="^(dan200\.computercraft|cc\.tweaked|com\.example\.examplemod)(\.[a-z][a-z0-9]*)*" />
         </module>
         <module name="ParameterName" />
         <module name="StaticVariableName">

crowdin.yml

@@ -0,0 +1,28 @@
+# 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_cz    # 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/events/monitor_resize.md

@@ -8,7 +8,7 @@ SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
 SPDX-License-Identifier: MPL-2.0
 -->
 
-The [`monitor_resize`] event is fired when an adjacent or networked monitor's size is changed.
+The [`monitor_resize`] event is fired when an adjacent or networked [monitor's][`monitor`] size is changed.
 
 ## Return Values
 1. [`string`]: The event name.

doc/events/monitor_touch.md

@@ -8,7 +8,7 @@ SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
 SPDX-License-Identifier: MPL-2.0
 -->
 
-The [`monitor_touch`] event is fired when an adjacent or networked Advanced Monitor is right-clicked.
+The [`monitor_touch`] event is fired when an adjacent or networked [Advanced Monitor][`monitor`] is right-clicked.
 
 ## Return Values
 1. [`string`]: The event name.

doc/events/redstone.md

@@ -8,7 +8,7 @@ SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
 SPDX-License-Identifier: MPL-2.0
 -->
 
-The [`event!redstone`] event is fired whenever any redstone inputs on the computer change.
+The [`event!redstone`] event is fired whenever any redstone inputs on the computer or [relay][`redstone_relay`] change.
 
 ## Return values
 1. [`string`]: The event name.
@@ -21,3 +21,7 @@ while true do
   print("A redstone input has changed!")
 end
 ```
+
+## See also
+ - [The `redstone` API on computers][`module!redstone`]
+ - [The `redstone_relay` peripheral][`redstone_relay`]

doc/guides/speaker_audio.md

@@ -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 on [GitHub Discussions] or [IRC] either!
+> cover. That said, don't be afraid to ask [the community for help][community].
 
 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,5 +205,4 @@ 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"
-[GitHub Discussions]: https://github.com/cc-tweaked/CC-Tweaked/discussions
-[IRC]: https://webchat.esper.net/?channels=computercraft "#computercraft on EsperNet"
+[Community]: /#community

doc/index.md

@@ -16,7 +16,7 @@ CC: Tweaked is a mod for Minecraft which adds programmable computers, turtles an
 much-beloved [ComputerCraft], it continues its legacy with improved performance and stability, along with a wealth of
 new features.
 
-CC: Tweaked can be installed from [CurseForge] or [Modrinth]. It runs on both [Minecraft Forge] and [Fabric].
+CC: Tweaked can be installed from [Modrinth]. It runs on both [Minecraft Forge] and [Fabric].
 
 ## Features
 Controlled using the [Lua programming language][lua], CC: Tweaked's computers provides all the tools you need to start
@@ -50,7 +50,11 @@ little daunting getting started. Thankfully, there's several fantastic tutorials
 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.
 
-If you get stuck, do [ask a question on GitHub][GitHub Discussions] or pop in to the ComputerCraft's [IRC channel][IRC].
+<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].
 
 ## Get Involved
 CC: Tweaked lives on [GitHub]. If you've got any ideas, feedback or bugs please do [create an issue][bug].
@@ -58,11 +62,11 @@ CC: Tweaked lives on [GitHub]. If you've got any ideas, feedback or bugs please
 [github]: https://github.com/cc-tweaked/CC-Tweaked/ "CC: Tweaked on GitHub"
 [bug]: https://github.com/cc-tweaked/CC-Tweaked/issues/new/choose
 [computercraft]: https://github.com/dan200/ComputerCraft "ComputerCraft on GitHub"
-[curseforge]: https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked from CurseForge"
 [modrinth]: https://modrinth.com/mod/gu7yAYhd "Download CC: Tweaked from Modrinth"
 [forge]: https://files.minecraftforge.net/ "Download Minecraft Forge."
 [Minecraft Forge]: https://files.minecraftforge.net/ "Download Minecraft Forge."
 [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
-[IRC]: https://webchat.esper.net/?channels=computercraft "#computercraft on EsperNet"
+[EsperNet]: https://www.esper.net/
+[KiwiIRC]: https://kiwiirc.com/nextclient/#irc://irc.esper.net:+6697/#computercraft "#computercraft on EsperNet"

doc/mod-page.md

@@ -50,7 +50,11 @@ little daunting getting started. Thankfully, there's several fantastic tutorials
 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.
 
-If you get stuck, do [ask a question on GitHub][GitHub Discussions] or pop in to the ComputerCraft's [IRC channel][IRC].
+## 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].
 
 ## Get Involved
 CC: Tweaked lives on [GitHub]. If you've got any ideas, feedback or bugs please do [create an issue][bug].
@@ -60,4 +64,5 @@ 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
-[IRC]: http://webchat.esper.net/?channels=computercraft "#computercraft on EsperNet"
+[EsperNet]: https://www.esper.net/
+[KiwiIRC]: https://kiwiirc.com/nextclient/#irc://irc.esper.net:+6697/#computercraft "#computercraft on EsperNet"

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.atan2` -> `math.atan`                                                           | 🔶         | `math.atan` supports its two argument form. |
 | Removed `math.frexp`, `math.ldexp`, `math.pow`, `math.cosh`, `math.sinh`, `math.tanh` | ❌         |                           |
 | `math.maxinteger`/`math.mininteger`                                                   | ❌         |                           |
 | `math.tointeger`                                                                      | ❌         |                           |

gradle.properties

@@ -12,7 +12,7 @@ neogradle.subsystems.conventions.runs.enabled=false
 
 # Mod properties
 isUnstable=true
-modVersion=1.111.1
+modVersion=1.115.0
 
 # Minecraft properties: We want to configure this here so we can read it in settings.gradle
-mcVersion=1.21
+mcVersion=1.21.1

gradle/gradle-daemon-jvm.properties

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

gradle/libs.versions.toml

@@ -7,14 +7,14 @@
 # Minecraft
 # MC version is specified in gradle.properties, as we need that in settings.gradle.
 # Remember to update corresponding versions in fabric.mod.json/neoforge.mods.toml
-fabric-api = "0.100.3+1.21"
+fabric-api = "0.102.1+1.21.1"
 fabric-loader = "0.15.11"
-neoForge = "21.0.42-beta"
+neoForge = "21.1.9"
 neoForgeSpi = "8.0.1"
 mixin = "0.8.5"
-parchment = "2024.06.16"
-parchmentMc = "1.20.6"
-yarn = "1.21+build.1"
+parchment = "2024.07.28"
+parchmentMc = "1.21"
+yarn = "1.21.1+build.1"
 
 # Core dependencies (these versions are tied to the version Minecraft uses)
 fastutil = "8.5.12"
@@ -26,53 +26,56 @@ slf4j = "2.0.9"
 asm = "9.6"
 autoService = "1.1.1"
 checkerFramework = "3.42.0"
-cobalt = { strictly = "0.9.3" }
+cobalt = { strictly = "0.9.5" }
 commonsCli = "1.6.0"
 jetbrainsAnnotations = "24.1.0"
 jsr305 = "3.0.2"
 jzlib = "1.1.3"
-kotlin = "1.9.21"
-kotlin-coroutines = "1.7.3"
-nightConfig = "3.6.7"
+kotlin = "2.1.0"
+kotlin-coroutines = "1.10.1"
+nightConfig = "3.8.1"
 
 # Minecraft mods
 emi = "1.1.7+1.21"
 fabricPermissions = "0.3.1"
-iris = "1.6.14+1.20.4"
-jei = "19.0.0.1"
+iris-fabric = "1.8.0-beta.3+1.21-fabric"
+iris-forge = "1.8.0-beta.3+1.21-neoforge"
+jei = "19.8.2.99"
 modmenu = "11.0.0-rc.4"
-moreRed = "4.0.0.4"
-oculus = "1.2.5"
+moreRed = "6.0.0.3"
 rei = "16.0.729"
-rubidium = "0.6.1"
-sodium = "mc1.20-0.4.10"
+sodium-fabric = "mc1.21-0.6.0-beta.1-fabric"
+sodium-forge = "mc1.21-0.6.0-beta.1-neoforge"
 mixinExtra = "0.3.5"
+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"
+junit = "5.11.4"
+junitPlatform = "1.11.4"
 jmh = "1.37"
 
 # Build tools
-cctJavadoc = "1.8.2"
-checkstyle = "10.14.1"
-curseForgeGradle = "1.1.18"
+cctJavadoc = "1.8.3"
+checkstyle = "10.20.1"
 errorProne-core = "2.27.0"
 errorProne-plugin = "3.1.0"
-fabric-loom = "1.7.1"
+fabric-loom = "1.9.2"
 githubRelease = "2.5.2"
 gradleVersions = "0.50.0"
 ideaExt = "1.1.7"
-illuaminate = "0.1.0-73-g43ee16c"
+illuaminate = "0.1.0-74-gf1551d5"
 lwjgl = "3.3.3"
 minotaur = "2.8.7"
-neoGradle = "7.0.152"
+modDevGradle = "2.0.74"
 nullAway = "0.10.25"
+shadow = "8.3.1"
 spotless = "6.23.3"
 taskTree = "2.1.1"
 teavm = "0.11.0-SQUID.1"
-vanillaExtract = "0.1.3"
+vanillaExtract = "0.2.0"
 versionCatalogUpdate = "0.8.1"
 
 [libraries]
@@ -92,33 +95,36 @@ 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-socks = { module = "io.netty:netty-codec-socks", 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" }
 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
-fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric-api" }
-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" }
+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" }
-iris = { module = "maven.modrinth:iris", version.ref = "iris" }
+fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric-api" }
+fabric-junit = { module = "net.fabricmc:fabric-loader-junit", version.ref = "fabric-loader" }
+fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-loader" }
+fabricPermissions = { module = "me.lucko:fabric-permissions-api", version.ref = "fabricPermissions" }
+iris-fabric = { module = "maven.modrinth:iris", version.ref = "iris-fabric" }
+iris-forge = { module = "maven.modrinth:iris", version.ref = "iris-forge" }
 jei-api = { module = "mezz.jei:jei-1.21-common-api", version.ref = "jei" }
 jei-fabric = { module = "mezz.jei:jei-1.21-fabric", version.ref = "jei" }
 jei-forge = { module = "mezz.jei:jei-1.21-neoforge", version.ref = "jei" }
 mixin = { module = "org.spongepowered:mixin", version.ref = "mixin" }
 mixinExtra = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixinExtra" }
 modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
-moreRed = { module = "commoble.morered:morered-1.20.1", version.ref = "moreRed" }
-oculus = { module = "maven.modrinth:oculus", version.ref = "oculus" }
+moreRed = { module = "net.commoble.morered:morered-1.21.1", version.ref = "moreRed" }
 rei-api = { module = "me.shedaniel:RoughlyEnoughItems-api", version.ref = "rei" }
 rei-builtin = { module = "me.shedaniel:RoughlyEnoughItems-default-plugin", version.ref = "rei" }
 rei-fabric = { module = "me.shedaniel:RoughlyEnoughItems-fabric", version.ref = "rei" }
-rubidium = { module = "maven.modrinth:rubidium", version.ref = "rubidium" }
-sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" }
+sodium-fabric = { module = "maven.modrinth:sodium", version.ref = "sodium.fabric" }
+sodium-forge = { module = "maven.modrinth:sodium", version.ref = "sodium.forge" }
 
 # Testing
 hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" }
@@ -127,6 +133,7 @@ jqwik-engine = { module = "net.jqwik:jqwik-engine", version.ref = "jqwik" }
 junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
 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" }
+junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junitPlatform" }
 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" }
@@ -140,7 +147,6 @@ lwjgl-glfw = { module = "org.lwjgl:lwjgl-glfw" }
 # Build tools
 cctJavadoc = { module = "cc.tweaked:cct-javadoc", version.ref = "cctJavadoc" }
 checkstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checkstyle" }
-curseForgeGradle = { module = "net.darkhax.curseforgegradle:CurseForgeGradle", version.ref = "curseForgeGradle" }
 errorProne-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "errorProne-core" }
 errorProne-api = { module = "com.google.errorprone:error_prone_check_api", version.ref = "errorProne-core" }
 errorProne-core = { module = "com.google.errorprone:error_prone_core", version.ref = "errorProne-core" }
@@ -150,8 +156,8 @@ fabric-loom = { module = "net.fabricmc:fabric-loom", version.ref = "fabric-loom"
 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" }
 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" }
+modDevGradle = { module = "net.neoforged:moddev-gradle", version.ref = "modDevGradle" }
 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" }
@@ -169,6 +175,7 @@ yarn = { module = "net.fabricmc:yarn", version.ref = "yarn" }
 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" }
+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" }
 
@@ -177,15 +184,15 @@ annotations = ["jsr305", "checkerFramework", "jetbrainsAnnotations"]
 kotlin = ["kotlin-stdlib", "kotlin-coroutines"]
 
 # Minecraft
-externalMods-common = ["jei-api", "nightConfig-core", "nightConfig-toml"]
-externalMods-forge-compile = ["moreRed", "oculus", "jei-api"]
+externalMods-common = ["iris-forge", "jei-api", "nightConfig-core", "nightConfig-toml"]
+externalMods-forge-compile = ["moreRed", "iris-forge", "jei-api"]
 externalMods-forge-runtime = ["jei-forge"]
-externalMods-fabric-compile = ["fabricPermissions", "iris", "jei-api", "rei-api", "rei-builtin"]
+externalMods-fabric-compile = ["fabricPermissions", "iris-fabric", "jei-api", "rei-api", "rei-builtin"]
 externalMods-fabric-runtime = ["jei-fabric", "modmenu"]
 
 # Testing
 test = ["junit-jupiter-api", "junit-jupiter-params", "hamcrest", "jqwik-api"]
-testRuntime = ["junit-jupiter-engine", "jqwik-engine"]
+testRuntime = ["junit-jupiter-engine", "junit-platform-launcher", "jqwik-engine"]
 
 # Build tools
 teavm-api = ["teavm-jso", "teavm-jso-apis", "teavm-platform", "teavm-classlib", "teavm-metaprogramming-api"]

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @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 ##########################################################################

package.json

@@ -13,10 +13,10 @@
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^15.2.1",
-    "@rollup/plugin-typescript": "^11.0.0",
+    "@rollup/plugin-typescript": "^12.0.0",
     "@rollup/plugin-url": "^8.0.1",
     "@swc/core": "^1.3.92",
-    "@types/node": "^20.8.3",
+    "@types/node": "^22.0.0",
     "lightningcss": "^1.22.0",
     "preact-render-to-string": "^6.2.1",
     "rehype": "^13.0.0",

projects/common-api/build.gradle.kts

@@ -8,6 +8,8 @@ plugins {
     id("cc-tweaked.vanilla")
 }
 
+val mcVersion: String by extra
+
 java {
     withJavadocJar()
 }
@@ -16,9 +18,58 @@ dependencies {
     api(project(":core-api"))
 }
 
+val javadocOverview by tasks.registering(Copy::class) {
+    from("src/overview.html")
+    into(layout.buildDirectory.dir(name))
+
+    expand(
+        mapOf(
+            "mcVersion" to mcVersion,
+            "modVersion" to version,
+        ),
+    )
+}
+
 tasks.javadoc {
+    title = "CC: Tweaked $version for Minecraft $mcVersion"
     include("dan200/computercraft/api/**/*.java")
 
+    options {
+        (this as StandardJavadocDocletOptions)
+
+        inputs.files(javadocOverview)
+        overview(javadocOverview.get().destinationDir.resolve("overview.html").absolutePath)
+
+        groups = mapOf(
+            "Common" to listOf(
+                "dan200.computercraft.api",
+                "dan200.computercraft.api.lua",
+                "dan200.computercraft.api.peripheral",
+            ),
+            "Upgrades" to listOf(
+                "dan200.computercraft.api.client.turtle",
+                "dan200.computercraft.api.pocket",
+                "dan200.computercraft.api.turtle",
+                "dan200.computercraft.api.upgrades",
+            ),
+        )
+
+        addBooleanOption("-allow-script-in-comments", true)
+        bottom(
+            """
+            <script src="https://cdn.jsdelivr.net/npm/prismjs@v1.29.0/components/prism-core.min.js"></script>
+            <script src="https://cdn.jsdelivr.net/npm/prismjs@v1.29.0/plugins/autoloader/prism-autoloader.min.js"></script>
+            <link href=" https://cdn.jsdelivr.net/npm/prismjs@1.29.0/themes/prism.min.css " rel="stylesheet">
+            """.trimIndent(),
+        )
+
+        val snippetSources = listOf(":common", ":fabric", ":forge").flatMap {
+            project(it).sourceSets["examples"].allSource.sourceDirectories
+        }
+        inputs.files(snippetSources)
+        addPathOption("-snippet-path").value = snippetSources
+    }
+
     // Include the core-api in our javadoc export. This is wrong, but it means we can export a single javadoc dump.
     source(project(":core-api").sourceSets.main.map { it.allJava })
 

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

@@ -21,7 +21,14 @@ import java.util.stream.Stream;
  * <p>
  * Use {@code dan200.computercraft.api.client.FabricComputerCraftAPIClient#registerTurtleUpgradeModeller} to register a
  * modeller on Fabric and {@code dan200.computercraft.api.client.turtle.RegisterTurtleModellersEvent} to register one
- * on Forge
+ * on Forge.
+ *
+ * <h2>Example</h2>
+ * <h3>Fabric</h3>
+ * {@snippet class=com.example.examplemod.FabricExampleModClient region=turtle_modellers}
+ *
+ * <h3>Forge</h3>
+ * {@snippet class=com.example.examplemod.FabricExampleModClient region=turtle_modellers}
  *
  * @param <T> The type of turtle upgrade this modeller applies to.
  * @see RegisterTurtleUpgradeModeller For multi-loader registration support.

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

@@ -4,9 +4,11 @@
 
 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;
@@ -165,7 +167,13 @@ 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.
+     * 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 a new API just to turtles with the following code:
+     *
+     * {@snippet class=com.example.examplemod.ExampleAPI region=register}
      *
      * @param factory The factory for your API subclass.
      * @see ILuaAPIFactory

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

@@ -0,0 +1,24 @@
+// 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

@@ -0,0 +1,48 @@
+// 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

@@ -0,0 +1,29 @@
+// 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. Meta will be inserted into a new sub-map named as per {@code namespace}.
+     * Create a new item detail provider. Details 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. Meta will be inserted directly into the results.
+     * Create a new item detail provider. Details will be inserted directly into the results.
      *
      * @param itemType The type the stack's item must have.
      */
@@ -53,21 +53,18 @@ 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 void provideDetails(Map<? super String, Object> data, ItemStack stack) {
+    public final void provideDetails(Map<? super String, Object> data, ItemStack stack) {
         var item = stack.getItem();
         if (!itemType.isInstance(item)) return;
 
-        // 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) {
+        if (namespace == null) {
+            provideDetails(data, stack, itemType.cast(item));
+        } else {
+            Map<? super String, Object> child = new HashMap<>();
+            provideDetails(child, stack, itemType.cast(item));
             data.put(namespace, child);
         }
     }

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

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

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

@@ -26,7 +26,7 @@ public interface DetailRegistry<T> {
      * @param provider The detail provider to register.
      * @see DetailProvider
      */
-    void addProvider(DetailProvider<T> provider);
+    void addProvider(DetailProvider<? super 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

@@ -0,0 +1,59 @@
+// 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/lua/ILuaAPIFactory.java

@@ -4,13 +4,15 @@
 
 package dan200.computercraft.api.lua;
 
+import dan200.computercraft.api.ComputerCraftAPI;
+
 import javax.annotation.Nullable;
 
 /**
- * Construct an {@link ILuaAPI} for a specific computer.
+ * Construct an {@link ILuaAPI} for a computer.
  *
  * @see ILuaAPI
- * @see dan200.computercraft.api.ComputerCraftAPI#registerAPIFactory(ILuaAPIFactory)
+ * @see ComputerCraftAPI#registerAPIFactory(ILuaAPIFactory)
  */
 @FunctionalInterface
 public interface ILuaAPIFactory {

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

@@ -0,0 +1,46 @@
+// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.api.media;
+
+import dan200.computercraft.impl.ComputerCraftAPIService;
+import net.minecraft.world.item.ItemStack;
+
+import javax.annotation.Nullable;
+import java.util.stream.Stream;
+
+/**
+ * The contents of a page (or book) created by a ComputerCraft printer.
+ *
+ * @since 1.115
+ */
+@Nullable
+public interface PrintoutContents {
+    /**
+     * Get the (possibly empty) title for this printout.
+     *
+     * @return The title of this printout.
+     */
+    String getTitle();
+
+    /**
+     * Get the text contents of this printout, as a sequence of lines.
+     * <p>
+     * The lines in the printout may include blank lines at the end of the document, as well as trailing spaces on each
+     * line.
+     *
+     * @return The text contents of this printout.
+     */
+    Stream<String> getTextLines();
+
+    /**
+     * Get the printout contents for a particular stack.
+     *
+     * @param stack The stack to get the contents for.
+     * @return The printout contents, or {@code null} if this is not a printout item.
+     */
+    static @Nullable PrintoutContents get(ItemStack stack) {
+        return ComputerCraftAPIService.get().getPrintoutContents(stack);
+    }
+}

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

@@ -14,13 +14,13 @@ import dan200.computercraft.api.ComputerCraftAPI;
  * as a proxy for all network objects. Whilst the node may change networks, an element's node should remain constant
  * for its lifespan.
  * <p>
- * Elements are generally tied to a block or tile entity in world. In such as case, one should provide the
+ * Elements are generally tied to a block or block entity in world. In such as case, one should provide the
  * {@link WiredElement} capability for the appropriate sides.
  */
 public interface WiredElement extends WiredSender {
     /**
-     * Called when objects on the network change. This may occur when network nodes are added or removed, or when
-     * peripherals change.
+     * Called when peripherals on the network change. This may occur when network nodes are added or removed, or when
+     * peripherals are attached or detached from a modem.
      *
      * @param change The change which occurred.
      * @see WiredNetworkChange

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

@@ -5,16 +5,35 @@
 package dan200.computercraft.api.pocket;
 
 import dan200.computercraft.api.upgrades.UpgradeBase;
+import dan200.computercraft.api.upgrades.UpgradeData;
 import net.minecraft.core.component.DataComponentPatch;
+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;
 
 /**
  * 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>
@@ -61,6 +80,26 @@ public interface IPocketAccess {
      */
     void setLight(int colour);
 
+    /**
+     * Get the currently equipped upgrade.
+     *
+     * @return The currently equipped upgrade.
+     * @see #getUpgradeData()
+     * @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>
@@ -70,6 +109,7 @@ public interface IPocketAccess {
      * @see #setUpgradeData(DataComponentPatch)
      * @see UpgradeBase#getUpgradeItem(DataComponentPatch)
      * @see UpgradeBase#getUpgradeData(ItemStack)
+     * @see #getUpgrade()
      */
     DataComponentPatch getUpgradeData();
 

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

@@ -20,32 +20,10 @@ import javax.annotation.Nullable;
  * A peripheral which can be equipped to the back side of a pocket computer.
  * <p>
  * Pocket upgrades are defined in two stages. First, one creates a {@link IPocketUpgrade} subclass and corresponding
- * {@link UpgradeType} instance, which are then registered in a registry.
+ * {@link UpgradeType} instance, which are then registered in a Minecraft registry.
  * <p>
  * You then write a JSON file in your mod's {@literal data/} folder. This is then parsed when the world is loaded, and
- * the upgrade automatically registered. It is recommended this is done via
- * <a href="../upgrades/UpgradeType.html#datagen">data generators</a>.
- *
- * <h2>Example</h2>
- * {@snippet lang="java" :
- * // We use Forge's DeferredRegister to register our upgrade type. Fabric mods may register their type directly.
- * static final DeferredRegister<UpgradeType<? extends IPocketUpgrade>> POCKET_UPGRADES = DeferredRegister.create(IPocketUpgrade.typeRegistry(), "my_mod");
- *
- * // Register a new upgrade upgrade type called "my_upgrade".
- * public static final RegistryObject<UpgradeType<MyUpgrade>> MY_UPGRADE =
- *     POCKET_UPGRADES.register("my_upgrade", () -> UpgradeType.simple(new MyUpgrade()));
- *
- * // Then in your constructor
- * POCKET_UPGRADES.register(bus);
- * }
- * <p>
- * We can then define a new upgrade using JSON by placing the following in
- * {@code data/<my_mod>/computercraft/pocket_upgrade/<my_upgrade_id>.json}.
- * {@snippet lang="json" :
- * {
- *     "type": "my_mod:my_upgrade"
- * }
- * }
+ * the upgrade registered internally.
  */
 public interface IPocketUpgrade extends UpgradeBase {
     ResourceKey<Registry<IPocketUpgrade>> REGISTRY = ResourceKey.createRegistryKey(ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "pocket_upgrade"));

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

@@ -11,47 +11,79 @@ import dan200.computercraft.api.upgrades.UpgradeType;
 import dan200.computercraft.impl.ComputerCraftAPIService;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Registry;
+import net.minecraft.core.RegistrySetBuilder.PatchedRegistries;
 import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Items;
 
 import javax.annotation.Nullable;
+import java.util.function.Function;
 
 /**
  * The primary interface for defining an update for Turtles. A turtle update can either be a new tool, or a new
  * peripheral.
  * <p>
  * Turtle upgrades are defined in two stages. First, one creates a {@link ITurtleUpgrade} subclass and corresponding
- * {@link UpgradeType} instance, which are then registered in a registry.
+ * {@link UpgradeType} instance, which are then registered in a Minecraft registry.
  * <p>
  * You then write a JSON file in your mod's {@literal data/} folder. This is then parsed when the world is loaded, and
- * the upgrade automatically registered. It is recommended this is done via
- * <a href="../upgrades/UpgradeType.html#datagen">data generators</a>.
+ * the upgrade automatically registered.
  *
  * <h2>Example</h2>
- * {@snippet lang="java" :
- * // We use Forge's DeferredRegister to register our upgrade type. Fabric mods may register their type directly.
- * static final DeferredRegister<UpgradeType<? extends ITurtleUpgrade>> TURTLE_UPGRADES = DeferredRegister.create(ITurtleUpgrade.typeRegistry(), "my_mod");
+ * <h3>Registering the upgrade type</h3>
+ * First, let's create a new class that implements {@link ITurtleUpgrade}. It is recommended to subclass
+ * {@link AbstractTurtleUpgrade}, as that provides a default implementation of most methods.
  *
- * // Register a new upgrade type called "my_upgrade".
- * public static final RegistryObject<UpgradeType<MyUpgrade>> MY_UPGRADE =
- *     TURTLE_UPGRADES.register("my_upgrade", () -> UpgradeType.simple(MyUpgrade::new));
+ * {@snippet class=com.example.examplemod.ExampleTurtleUpgrade region=body}
  *
- * // Then in your constructor
- * TURTLE_UPGRADES.register(bus);
- * }
+ * Now we must construct a new upgrade type. In most cases, you can use one of the helper methods (e.g.
+ * {@link UpgradeType#simpleWithCustomItem(Function)}), rather than defining your own implementation.
+ *
+ * {@snippet class=com.example.examplemod.ExampleMod region=turtle_upgrades}
+ *
+ * We now must register this upgrade type. This is done the same way as you'd register blocks, items, or other
+ * Minecraft objects. The approach to do this will depend on mod-loader.
+ *
+ * <h4>Fabric</h4>
+ * {@snippet class=com.example.examplemod.FabricExampleMod region=turtle_upgrades}
+ *
+ * <h4>Forge</h4>
+ * {@snippet class=com.example.examplemod.ForgeExampleMod region=turtle_upgrades}
+ *
+ * <h3>Rendering the upgrade</h3>
+ * Next, we need to register a model for our upgrade. This is done by registering a
+ * {@link dan200.computercraft.api.client.turtle.TurtleUpgradeModeller} for your upgrade type.
+ *
+ * <h4>Fabric</h4>
+ * {@snippet class=com.example.examplemod.FabricExampleModClient region=turtle_modellers}
+ *
+ * <h4>Forge</h4>
+ * {@snippet class=com.example.examplemod.FabricExampleModClient region=turtle_modellers}
+ *
+ * <h3 id="datagen">Registering the upgrade itself</h3>
+ * Upgrades themselves are loaded from datapacks when a level is loaded. In order to register our new upgrade, we must
+ * create a new JSON file at {@code data/<my_mod>/computercraft/turtle_upgrade/<my_upgrade_id>.json}.
+ *
+ * {@snippet file=data/examplemod/computercraft/turtle_upgrade/example_turtle_upgrade.json}
+ *
+ * The {@code "type"} field points to the ID of the upgrade type we've just registered, while the other fields are read
+ * by the type itself. As our upgrade was defined with {@link UpgradeType#simpleWithCustomItem(Function)}, the
+ * {@code "item"} field will construct our upgrade with {@link Items#COMPASS}.
  * <p>
- * We can then define a new upgrade using JSON by placing the following in
- * {@code data/<my_mod>/computercraft/turtle_upgrade/<my_upgrade_id>.json}.
- * <p>
- * {@snippet lang="json" :
- * {
- *     "type": "my_mod:my_upgrade"
- * }
- * }
- * <p>
- * Finally, we need to register a model for our upgrade, see
- * {@link dan200.computercraft.api.client.turtle.TurtleUpgradeModeller} for more information.
+ * Rather than manually creating the file, it is recommended to use data-generators to generate this file. First, we
+ * register our new upgrades into a {@linkplain PatchedRegistries patched registry}.
+ *
+ * {@snippet class=com.example.examplemod.data.TurtleUpgradeProvider region=body}
+ *
+ * Next, we must write these upgrades to disk. Vanilla does not have complete support for this yet, so this must be done
+ * with mod-loader-specific APIs.
+ *
+ * <h4>Fabric</h4>
+ * {@snippet class=com.example.examplemod.FabricExampleModDataGenerator region=turtle_upgrades}
+ *
+ * <h4>Forge</h4>
+ * {@snippet class=com.example.examplemod.ForgeExampleModDataGenerator region=turtle_upgrades}
  */
 public interface ITurtleUpgrade extends UpgradeBase {
     /**

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 turtle might reside.
+ * An enum representing the two sides of the turtle that a turtle upgrade might reside.
  */
 public enum TurtleSide {
     /**

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

@@ -25,19 +25,11 @@ import java.util.Optional;
 /**
  * A builder for custom turtle tool upgrades.
  * <p>
- * This can be used from your <a href="../upgrades/UpgradeType.html#datagen">data generator</a> code in order to
+ * This can be used from your <a href="./ITurtleUpgrade.html#datagen">data generator</a> code in order to
  * register turtle tools for your mod's tools.
  *
- * <h2>Example:</h2>
- * {@snippet lang = "java":
- * import net.minecraft.data.worldgen.BootstrapContext;
- * import net.minecraft.resources.ResourceLocation;
- * import net.minecraft.world.item.Items;
- *
- * public void registerTool(BootstrapContext<ITurtleUpgrade> upgrades) {
- *   TurtleToolBuilder.tool(ResourceLocation.fromNamespaceAndPath("my_mod", "wooden_pickaxe"), Items.WOODEN_PICKAXE).register(upgrades);
- * }
- *}
+ * <h2>Example</h2>
+ * {@snippet class=com.example.examplemod.data.TurtleToolProvider region=body}
  */
 public final class TurtleToolBuilder {
     private final ResourceKey<ITurtleUpgrade> id;

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

@@ -7,9 +7,7 @@ package dan200.computercraft.api.upgrades;
 import com.mojang.serialization.MapCodec;
 import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import dan200.computercraft.impl.upgrades.UpgradeTypeImpl;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.data.registries.RegistryPatchGenerator;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.level.storage.loot.functions.LootItemFunction;
@@ -23,13 +21,10 @@ import java.util.function.Function;
  * follow a similar design to other dynamic content, such as {@linkplain Recipe recipes} or {@link LootItemFunction
  * loot functions}.
  * <p>
- * First, one adds a new class implementing {@link ITurtleUpgrade} or {@link IPocketUpgrade}). This is responsible for
- * handling all the logic of your upgrade.
- * <p>
- * However, the upgrades are not registered directly. Instead, each upgrade class should have a corresponding
- * {@link UpgradeType}, which is responsible for loading the upgrade from a datapack. The upgrade type should then be
- * registered in its appropriate registry ({@link ITurtleUpgrade#typeRegistry()},
- * {@link IPocketUpgrade#typeRegistry()}).
+ * While the {@link ITurtleUpgrade}/{@link IPocketUpgrade} class should contain the core logic of the upgrade, they are
+ * not registered directly. Instead, each upgrade class has a corresponding {@link UpgradeType}, which is responsible
+ * for loading the upgrade from a datapack. The upgrade type should then be registered in its appropriate registry
+ * ({@link ITurtleUpgrade#typeRegistry()}, {@link IPocketUpgrade#typeRegistry()}).
  * <p>
  * In order to register the actual upgrade, a JSON file referencing your upgrade type should be added to a datapack. It
  * is recommended to do this via the data generators.
@@ -38,29 +33,7 @@ import java.util.function.Function;
  * As turtle and pocket upgrades are just loaded using vanilla's dynamic loaders, one may use the same data generation
  * tools as you would for any other dynamic registry.
  * <p>
- * This can typically be done by extending vanilla's built-in registries using {@link RegistryPatchGenerator}, and then
- * writing out the new registries using {@code net.fabricmc.fabric.api.datagen.v1.provider.FabricDynamicRegistryProvider}
- * on Fabric or {@code net.neoforged.neoforge.common.data.DatapackBuiltinEntriesProvider} on Forge.
- * <p>
- * {@snippet lang="java" :
- * import dan200.computercraft.api.turtle.ITurtleUpgrade;
- * import net.minecraft.Util;
- * import net.minecraft.core.HolderLookup;
- * import net.minecraft.core.RegistrySetBuilder;
- * import net.minecraft.data.DataGenerator;
- * import net.neoforged.neoforge.common.data.DatapackBuiltinEntriesProvider;
- *
- * import java.util.concurrent.CompletableFuture;
- *
- * public void generate(DataGenerator.PackGenerator output, CompletableFuture<HolderLookup.Provider> registries) {
- *     var newRegistries = RegistryPatchGenerator.createLookup(registries, Util.make(new RegistrySetBuilder(), builder -> {
- *         builder.add(ITurtleUpgrade.REGISTRY, upgrades -> {
- *             upgrades.register(ITurtleUpgrade.createKey(ResourceLocation.fromNamespaceAndPath("my_mod", "my_upgrade")), new MyUpgrade());
- *         });
- *     }));
- *     output.addProvider(o -> new DatapackBuiltinEntriesProvider(o, newRegistries, Set.of("my_mod")));
- * }
- * }
+ * See <a href="../turtle/ITurtleUpgrade.html#datagen">the turtle upgrade docs</a> for a concrete example.
  *
  * @param <T> The upgrade subclass that this upgrade type represents.
  * @see ITurtleUpgrade

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

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

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

@@ -13,6 +13,7 @@ import dan200.computercraft.api.filesystem.WritableMount;
 import dan200.computercraft.api.lua.GenericSource;
 import dan200.computercraft.api.lua.ILuaAPIFactory;
 import dan200.computercraft.api.media.MediaProvider;
+import dan200.computercraft.api.media.PrintoutContents;
 import dan200.computercraft.api.network.PacketNetwork;
 import dan200.computercraft.api.network.wired.WiredElement;
 import dan200.computercraft.api.network.wired.WiredNode;
@@ -84,6 +85,9 @@ public interface ComputerCraftAPIService {
 
     DetailRegistry<BlockReference> getBlockInWorldDetailRegistry();
 
+    @Nullable
+    PrintoutContents getPrintoutContents(ItemStack stack);
+
     final class Instance {
         static final @Nullable ComputerCraftAPIService INSTANCE;
         static final @Nullable Throwable ERROR;

projects/common-api/src/overview.html

@@ -0,0 +1,68 @@
+<!--
+SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
+
+SPDX-License-Identifier: MPL-2.0
+-->
+
+<!DOCTYPE HTML>
+<html lang="en">
+<body>
+<p>
+    This is the documentation for CC: Tweaked $modVersion for Minecraft $mcVersion. Documentation for other versions of
+    Minecraft are available on the CC: Tweaked website:
+
+<ul>
+    <li><a href="/mc-1.20.x/javadoc/">Minecraft 1.20.1</a>
+    <li><a href="/mc-1.21.x/javadoc/">Minecraft 1.21.1</a>
+</ul>
+
+<h1>Quick links</h1>
+<p>
+    You probably want to start in the following places:
+
+<ul>
+    <li>{@linkplain dan200.computercraft.api.peripheral Registering new peripherals}</li>
+    <li>
+        {@link dan200.computercraft.api.lua.LuaFunction} and {@link dan200.computercraft.api.lua.IArguments} for
+        adding methods to your peripheral or Lua objects.
+    </li>
+    <li>{@linkplain dan200.computercraft.api.turtle.ITurtleUpgrade Turtle upgrades}</li>
+    <li>{@linkplain dan200.computercraft.api.pocket.IPocketUpgrade Pocket upgrades}</li>
+</ul>
+
+<h1>Using</h1>
+<p>
+    CC: Tweaked is hosted on my maven repo, and so is relatively simple to depend on. You may wish to add a soft (or
+    hard) dependency in your <code>mods.toml</code> file, with the appropriate version bounds, to ensure that API
+    functionality you depend on is present.
+
+<pre class="language language-groovy"><code>repositories {
+    maven {
+        url "https://maven.squiddev.cc"
+        content { includeGroup("cc.tweaked") }
+    }
+}
+
+dependencies {
+    // Vanilla (i.e. for multi-loader systems)
+    compileOnly("cc.tweaked:cc-tweaked-$mcVersion-common-api:$modVersion")
+
+    // Forge Gradle
+    compileOnly("cc.tweaked:cc-tweaked-$mcVersion-core-api:$modVersion")
+    compileOnly(fg.deobf("cc.tweaked:cc-tweaked-$mcVersion-forge-api:$modVersion"))
+    runtimeOnly(fg.deobf("cc.tweaked:cc-tweaked-$mcVersion-forge:$modVersion"))
+
+    // Fabric Loom
+    modCompileOnly("cc.tweaked:cc-tweaked-$mcVersion-fabric-api:$modVersion")
+    modRuntimeOnly("cc.tweaked:cc-tweaked-$mcVersion-fabric:$modVersion")
+}
+</code></pre>
+
+<p>
+    You should also be careful to only use classes within the <code>dan200.computercraft.api</code> package. Non-API
+    classes are subject to change at any point. If you depend on functionality outside the API (or need to mixin to
+    CC:T), please <a href="https://github.com/cc-tweaked/CC-Tweaked/discussions/new/choose">start a discussion</a> to
+    let me know!
+
+</body>
+</html>

projects/common/build.gradle.kts

@@ -6,17 +6,11 @@ import cc.tweaked.gradle.*
 
 plugins {
     id("cc-tweaked.vanilla")
-    id("cc-tweaked.gametest")
     id("cc-tweaked.illuaminate")
+    id("cc-tweaked.mod")
     id("cc-tweaked.publishing")
 }
 
-sourceSets {
-    main {
-        resources.srcDir("src/generated/resources")
-    }
-}
-
 minecraft {
     accessWideners(
         "src/main/resources/computercraft.accesswidener",
@@ -38,13 +32,14 @@ repositories {
 
 dependencies {
     // Pull in our other projects. See comments in MinecraftConfigurations on this nastiness.
-    implementation(project(":core"))
-    implementation(commonClasses(project(":common-api")))
-    clientImplementation(clientClasses(project(":common-api")))
+    api(project(":core"))
+    api(commonClasses(project(":common-api")))
+    clientApi(clientClasses(project(":common-api")))
 
     compileOnly(libs.mixin)
     compileOnly(libs.mixinExtra)
     compileOnly(libs.bundles.externalMods.common)
+    compileOnly(variantOf(libs.create.forge) { classifier("slim") }) { isTransitive = false }
     clientCompileOnly(variantOf(libs.emi) { classifier("api") })
 
     annotationProcessorEverywhere(libs.autoService)
@@ -68,7 +63,7 @@ dependencies {
 }
 
 illuaminate {
-    version.set(libs.versions.illuaminate)
+    version = libs.versions.illuaminate
 }
 
 val luaJavadoc by tasks.registering(Javadoc::class) {
@@ -89,11 +84,7 @@ val luaJavadoc by tasks.registering(Javadoc::class) {
     options.addStringOption("project-root", rootProject.file(".").absolutePath)
     options.noTimestamp(false)
 
-    javadocTool.set(
-        javaToolchains.javadocToolFor {
-            languageVersion.set(CCTweakedPlugin.JAVA_VERSION)
-        },
-    )
+    javadocTool = javaToolchains.javadocToolFor { languageVersion = CCTweakedPlugin.JAVA_VERSION }
 }
 
 val lintLua by tasks.registering(IlluaminateExec::class) {
@@ -114,20 +105,31 @@ val lintLua by tasks.registering(IlluaminateExec::class) {
     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")
+fun MergeTrees.configureForDatagen(source: SourceSet, outputFolder: String) {
+    output = layout.projectDirectory.dir(outputFolder)
 
     for (loader in listOf("forge", "fabric")) {
-        mustRunAfter(":$loader:runData")
+        mustRunAfter(":$loader:$name")
         source {
             input {
-                from(project(":$loader").layout.buildDirectory.dir("generatedResources"))
+                from(project(":$loader").layout.buildDirectory.dir(source.getTaskName("generateResources", null)))
                 exclude(".cache")
             }
 
-            output = project(":$loader").layout.projectDirectory.dir("src/generated/resources")
+            output = project(":$loader").layout.projectDirectory.dir(outputFolder)
         }
     }
 }
 
-tasks.withType(GenerateModuleMetadata::class).configureEach { isEnabled = false }
+val runData by tasks.registering(MergeTrees::class) {
+    configureForDatagen(sourceSets.main.get(), "src/generated/resources")
+}
+
+val runExampleData by tasks.registering(MergeTrees::class) {
+    configureForDatagen(sourceSets.examples.get(), "src/examples/generatedResources")
+}
+
+// We can't create accurate module metadata for our additional capabilities, so disable it.
+project.tasks.withType(GenerateModuleMetadata::class.java).configureEach {
+    isEnabled = false
+}

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

@@ -64,6 +64,9 @@ public final class ClientHooks {
     public static void onWorldUnload() {
         MonitorRenderState.destroyAll();
         SpeakerManager.reset();
+    }
+
+    public static void onDisconnect() {
         ClientPocketComputers.reset();
     }
 

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

@@ -13,6 +13,7 @@ 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;
@@ -79,6 +80,7 @@ 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);
     }
 
     /**

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

@@ -10,10 +10,10 @@ import dan200.computercraft.shared.computer.menu.ComputerMenu;
 import dan200.computercraft.shared.network.server.ComputerActionServerMessage;
 import dan200.computercraft.shared.network.server.KeyEventServerMessage;
 import dan200.computercraft.shared.network.server.MouseEventServerMessage;
-import dan200.computercraft.shared.network.server.QueueEventServerMessage;
+import dan200.computercraft.shared.network.server.PasteEventComputerMessage;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 
-import javax.annotation.Nullable;
+import java.nio.ByteBuffer;
 
 /**
  * An {@link InputHandler} for use on the client.
@@ -27,6 +27,11 @@ public final class ClientInputHandler implements InputHandler {
         this.menu = menu;
     }
 
+    @Override
+    public void terminate() {
+        ClientNetworking.sendToServer(new ComputerActionServerMessage(menu, ComputerActionServerMessage.Action.TERMINATE));
+    }
+
     @Override
     public void turnOn() {
         ClientNetworking.sendToServer(new ComputerActionServerMessage(menu, ComputerActionServerMessage.Action.TURN_ON));
@@ -42,11 +47,6 @@ public final class ClientInputHandler implements InputHandler {
         ClientNetworking.sendToServer(new ComputerActionServerMessage(menu, ComputerActionServerMessage.Action.REBOOT));
     }
 
-    @Override
-    public void queueEvent(String event, @Nullable Object[] arguments) {
-        ClientNetworking.sendToServer(new QueueEventServerMessage(menu, event, arguments));
-    }
-
     @Override
     public void keyDown(int key, boolean repeat) {
         ClientNetworking.sendToServer(new KeyEventServerMessage(menu, repeat ? KeyEventServerMessage.Action.REPEAT : KeyEventServerMessage.Action.DOWN, key));
@@ -57,6 +57,16 @@ public final class ClientInputHandler implements InputHandler {
         ClientNetworking.sendToServer(new KeyEventServerMessage(menu, KeyEventServerMessage.Action.UP, key));
     }
 
+    @Override
+    public void charTyped(byte chr) {
+        ClientNetworking.sendToServer(new KeyEventServerMessage(menu, KeyEventServerMessage.Action.CHAR, chr));
+    }
+
+    @Override
+    public void paste(ByteBuffer contents) {
+        ClientNetworking.sendToServer(new PasteEventComputerMessage(menu, contents));
+    }
+
     @Override
     public void mouseClick(int button, int x, int y) {
         ClientNetworking.sendToServer(new MouseEventServerMessage(menu, MouseEventServerMessage.Action.CLICK, button, x, y));

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

@@ -6,7 +6,6 @@ package dan200.computercraft.client.gui;
 
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.client.render.ComputerBorderRenderer;
-import dan200.computercraft.data.client.ClientDataProviders;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureManager;
@@ -35,8 +34,8 @@ public final class GuiSprites extends TextureAtlasHolder {
 
     private static ButtonTextures button(String name) {
         return new ButtonTextures(
-            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "gui/buttons/" + name),
-            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "gui/buttons/" + name + "_hover")
+            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "buttons/" + name),
+            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "buttons/" + name + "_hover")
         );
     }
 
@@ -97,12 +96,8 @@ public final class GuiSprites extends TextureAtlasHolder {
      * @param active The texture for the button when it is active (hovered or focused).
      */
     public record ButtonTextures(ResourceLocation normal, ResourceLocation active) {
-        public TextureAtlasSprite get(boolean active) {
-            return GuiSprites.get(active ? this.active : normal);
-        }
-
-        public Stream<ResourceLocation> textures() {
-            return Stream.of(normal, active);
+        public ResourceLocation get(boolean isActive) {
+            return isActive ? active : normal;
         }
     }
 
@@ -113,7 +108,6 @@ public final class GuiSprites extends TextureAtlasHolder {
      * @param pocketBottom The texture for the bottom of a pocket computer.
      * @param sidebar      The texture for the computer sidebar.
      * @see ComputerBorderRenderer
-     * @see ClientDataProviders
      */
     public record ComputerTextures(
         ResourceLocation border,

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

@@ -6,15 +6,19 @@ package dan200.computercraft.client.gui;
 
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.ModRegistry;
-import dan200.computercraft.shared.common.HeldItemMenu;
+import dan200.computercraft.shared.media.PrintoutMenu;
 import dan200.computercraft.shared.media.items.PrintoutData;
-import dan200.computercraft.shared.media.items.PrintoutItem;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 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.Objects;
+
 import static dan200.computercraft.client.render.PrintoutRenderer.*;
 import static dan200.computercraft.client.render.RenderTypes.FULL_BRIGHT_LIGHTMAP;
 
@@ -23,41 +27,65 @@ import static dan200.computercraft.client.render.RenderTypes.FULL_BRIGHT_LIGHTMA
  *
  * @see dan200.computercraft.client.render.PrintoutRenderer
  */
-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 final class PrintoutScreen extends AbstractContainerScreen<PrintoutMenu> implements ContainerListener {
+    private PrintoutInfo printout = PrintoutInfo.DEFAULT;
+    private int page = 0;
 
-    public PrintoutScreen(HeldItemMenu container, Inventory player, Component title) {
+    public PrintoutScreen(PrintoutMenu container, Inventory player, Component title) {
         super(container, player, title);
-
         imageHeight = Y_SIZE;
+    }
 
-        var printout = container.getStack().getOrDefault(ModRegistry.DataComponents.PRINTOUT.get(), PrintoutData.EMPTY);
-        this.text = new TextBuffer[printout.lines().size()];
-        this.colours = new TextBuffer[printout.lines().size()];
-        for (var i = 0; i < this.text.length; i++) {
-            var line = printout.lines().get(i);
-            this.text[i] = new TextBuffer(line.text());
-            this.colours[i] = new TextBuffer(line.foreground());
-        }
-
+    private void setPrintout(ItemStack stack) {
         page = 0;
-        pages = Math.max(this.text.length / PrintoutData.LINES_PER_PAGE, 1);
-        book = ((PrintoutItem) container.getStack().getItem()).getType() == PrintoutItem.Type.BOOK;
+        printout = PrintoutInfo.of(PrintoutData.getOrEmpty(stack), stack.is(ModRegistry.Items.PRINTED_BOOK.get()));
+    }
+
+    @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);
     }
 
     @Override
     public boolean keyPressed(int key, int scancode, int modifiers) {
         if (key == GLFW.GLFW_KEY_RIGHT) {
-            if (page < pages - 1) page++;
+            nextPage();
             return true;
         }
 
         if (key == GLFW.GLFW_KEY_LEFT) {
-            if (page > 0) page--;
+            previousPage();
             return true;
         }
 
@@ -69,13 +97,13 @@ public class PrintoutScreen extends AbstractContainerScreen<HeldItemMenu> {
         if (super.mouseScrolled(x, y, deltaX, deltaY)) return true;
         if (deltaY < 0) {
             // Scroll up goes to the next page
-            if (page < pages - 1) page++;
+            nextPage();
             return true;
         }
 
         if (deltaY > 0) {
             // Scroll down goes to the previous page
-            if (page > 0) page--;
+            previousPage();
             return true;
         }
 
@@ -88,8 +116,8 @@ public class PrintoutScreen extends AbstractContainerScreen<HeldItemMenu> {
         graphics.pose().pushPose();
         graphics.pose().translate(0, 0, 1);
 
-        drawBorder(graphics.pose(), graphics.bufferSource(), leftPos, topPos, 0, page, pages, book, FULL_BRIGHT_LIGHTMAP);
-        drawText(graphics.pose(), graphics.bufferSource(), leftPos + X_TEXT_MARGIN, topPos + Y_TEXT_MARGIN, PrintoutData.LINES_PER_PAGE * page, FULL_BRIGHT_LIGHTMAP, text, colours);
+        drawBorder(graphics.pose(), graphics.bufferSource(), leftPos, topPos, 0, page, printout.pages(), printout.book(), FULL_BRIGHT_LIGHTMAP);
+        drawText(graphics.pose(), graphics.bufferSource(), leftPos + X_TEXT_MARGIN, topPos + Y_TEXT_MARGIN, PrintoutData.LINES_PER_PAGE * page, FULL_BRIGHT_LIGHTMAP, printout.text(), printout.colour());
 
         graphics.pose().popPose();
     }
@@ -98,4 +126,21 @@ public class PrintoutScreen extends AbstractContainerScreen<HeldItemMenu> {
     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 = of(PrintoutData.EMPTY, false);
+
+        public static PrintoutInfo of(PrintoutData printout, boolean book) {
+            var text = new TextBuffer[printout.lines().size()];
+            var colours = new TextBuffer[printout.lines().size()];
+            for (var i = 0; i < text.length; i++) {
+                var line = printout.lines().get(i);
+                text[i] = new TextBuffer(line.text());
+                colours[i] = new TextBuffer(line.foreground());
+            }
+
+            var pages = Math.max(text.length / PrintoutData.LINES_PER_PAGE, 1);
+            return new PrintoutInfo(pages, book, text, colours);
+        }
+    }
 }

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

@@ -26,6 +26,9 @@ public class TurtleScreen extends AbstractComputerScreen<TurtleMenu> {
     private static final ResourceLocation BACKGROUND_NORMAL = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "textures/gui/turtle_normal.png");
     private static final ResourceLocation BACKGROUND_ADVANCED = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "textures/gui/turtle_advanced.png");
 
+    private static final ResourceLocation SELECTED_NORMAL = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "turtle_normal_selected_slot");
+    private static final ResourceLocation SELECTED_ADVANCED = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "turtle_advanced_selected_slot");
+
     private static final int TEX_WIDTH = 278;
     private static final int TEX_HEIGHT = 217;
 
@@ -54,9 +57,9 @@ public class TurtleScreen extends AbstractComputerScreen<TurtleMenu> {
         if (slot >= 0) {
             var slotX = slot % 4;
             var slotY = slot / 4;
-            graphics.blit(texture,
-                leftPos + TURTLE_START_X - 2 + slotX * 18, topPos + PLAYER_START_Y - 2 + slotY * 18, 0,
-                0, 217, 24, 24, FULL_TEX_SIZE, FULL_TEX_SIZE
+            graphics.blitSprite(
+                advanced ? SELECTED_ADVANCED : SELECTED_NORMAL,
+                leftPos + TURTLE_START_X - 2 + slotX * 18, topPos + PLAYER_START_Y - 2 + slotY * 18, 0, 22, 22
             );
         }
 

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

@@ -55,7 +55,7 @@ public final class ComputerSidebar {
         add.accept(new DynamicImageButton(
             x, y, ICON_WIDTH, ICON_HEIGHT,
             GuiSprites.TERMINATE::get,
-            b -> input.queueEvent("terminate"),
+            b -> input.terminate(),
             new HintedMessage(
                 Component.translatable("gui.computercraft.tooltip.terminate"),
                 Component.translatable("gui.computercraft.tooltip.terminate.key")

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

@@ -10,8 +10,8 @@ import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.Tooltip;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 
 import javax.annotation.Nullable;
 import java.util.function.Supplier;
@@ -21,11 +21,11 @@ import java.util.function.Supplier;
  * dynamically.
  */
 public class DynamicImageButton extends Button {
-    private final Boolean2ObjectFunction<TextureAtlasSprite> texture;
+    private final Boolean2ObjectFunction<ResourceLocation> texture;
     private final Supplier<HintedMessage> message;
 
     public DynamicImageButton(
-        int x, int y, int width, int height, Boolean2ObjectFunction<TextureAtlasSprite> texture, OnPress onPress,
+        int x, int y, int width, int height, Boolean2ObjectFunction<ResourceLocation> texture, OnPress onPress,
         HintedMessage message
     ) {
         this(x, y, width, height, texture, onPress, () -> message);
@@ -33,7 +33,7 @@ public class DynamicImageButton extends Button {
 
     public DynamicImageButton(
         int x, int y, int width, int height,
-        Boolean2ObjectFunction<TextureAtlasSprite> texture,
+        Boolean2ObjectFunction<ResourceLocation> texture,
         OnPress onPress, Supplier<HintedMessage> message
     ) {
         super(x, y, width, height, Component.empty(), onPress, DEFAULT_NARRATION);
@@ -50,7 +50,7 @@ public class DynamicImageButton extends Button {
         var texture = this.texture.get(isHoveredOrFocused());
 
         RenderSystem.disableDepthTest();
-        graphics.blit(getX(), getY(), 0, width, height, texture);
+        graphics.blitSprite(texture, getX(), getY(), 0, width, height);
         RenderSystem.enableDepthTest();
     }
 

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

@@ -69,11 +69,8 @@ public class TerminalWidget extends AbstractWidget {
 
     @Override
     public boolean charTyped(char ch, int modifiers) {
-        if (ch >= 32 && ch <= 126 || ch >= 160 && ch <= 255) {
-            // Queue the char event for any printable chars in byte range
-            computer.queueEvent("char", new Object[]{ Character.toString(ch) });
-        }
-
+        var terminalChar = StringUtil.unicodeToTerminal(ch);
+        if (StringUtil.isTypableChar(terminalChar)) computer.charTyped((byte) terminalChar);
         return true;
     }
 
@@ -110,8 +107,8 @@ public class TerminalWidget extends AbstractWidget {
     }
 
     private void paste() {
-        var clipboard = StringUtil.normaliseClipboardString(Minecraft.getInstance().keyboardHandler.getClipboard());
-        if (!clipboard.isEmpty()) computer.queueEvent("paste", new Object[]{ clipboard });
+        var clipboard = StringUtil.getClipboardString(Minecraft.getInstance().keyboardHandler.getClipboard());
+        if (clipboard.remaining() > 0) computer.paste(clipboard);
     }
 
     @Override
@@ -220,7 +217,7 @@ public class TerminalWidget extends AbstractWidget {
 
     public void update() {
         if (terminateTimer >= 0 && terminateTimer < TERMINATE_TIME && (terminateTimer += 0.05f) > TERMINATE_TIME) {
-            computer.queueEvent("terminate");
+            computer.terminate();
         }
 
         if (shutdownTimer >= 0 && shutdownTimer < TERMINATE_TIME && (shutdownTimer += 0.05f) > TERMINATE_TIME) {

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

@@ -8,9 +8,10 @@ import com.google.auto.service.AutoService;
 import com.mojang.blaze3d.vertex.VertexFormat;
 import dan200.computercraft.client.render.RenderTypes;
 import dan200.computercraft.client.render.text.DirectFixedWidthFontRenderer;
-import net.fabricmc.loader.api.FabricLoader;
+import dan200.computercraft.shared.platform.PlatformHelper;
 import net.irisshaders.iris.api.v0.IrisApi;
 import net.irisshaders.iris.api.v0.IrisTextVertexSink;
+import net.minecraft.util.FastColor;
 
 import java.nio.ByteBuffer;
 import java.util.Optional;
@@ -20,7 +21,7 @@ import java.util.function.IntFunction;
 public class IrisShaderMod implements ShaderMod.Provider {
     @Override
     public Optional<ShaderMod> get() {
-        return FabricLoader.getInstance().isModLoaded("iris") ? Optional.of(new Impl()) : Optional.empty();
+        return PlatformHelper.get().isModLoaded("iris") ? Optional.of(new Impl()) : Optional.empty();
     }
 
     private static final class Impl extends ShaderMod {
@@ -54,12 +55,8 @@ public class IrisShaderMod implements ShaderMod.Provider {
             }
 
             @Override
-            public void quad(float x1, float y1, float x2, float y2, float z, byte[] rgba, float u1, float v1, float u2, float v2) {
-                sink.quad(x1, y1, x2, y2, z, pack(rgba[0], rgba[1], rgba[2], rgba[3]), u1, v1, u2, v2, RenderTypes.FULL_BRIGHT_LIGHTMAP);
-            }
-
-            private static int pack(int r, int g, int b, int a) {
-                return (a & 255) << 24 | (b & 255) << 16 | (g & 255) << 8 | r & 255;
+            public void quad(float x1, float y1, float x2, float y2, float z, int colour, float u1, float v1, float u2, float v2) {
+                sink.quad(x1, y1, x2, y2, z, FastColor.ABGR32.fromArgb32(colour), u1, v1, u2, v2, RenderTypes.FULL_BRIGHT_LIGHTMAP);
             }
         }
     }

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

@@ -0,0 +1,90 @@
+// 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 dan200.computercraft.api.ComputerCraftAPI;
+import dan200.computercraft.client.pocket.PocketComputerData;
+import dan200.computercraft.client.render.CustomLecternRenderer;
+import dan200.computercraft.shared.computer.core.ComputerFamily;
+import dan200.computercraft.shared.pocket.items.PocketComputerItem;
+import net.minecraft.client.model.geom.ModelPart;
+import net.minecraft.client.model.geom.PartPose;
+import net.minecraft.client.model.geom.builders.CubeListBuilder;
+import net.minecraft.client.model.geom.builders.MeshDefinition;
+import net.minecraft.client.renderer.LightTexture;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.resources.model.Material;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.inventory.InventoryMenu;
+import net.minecraft.world.item.component.DyedItemColor;
+
+/**
+ * A model for {@linkplain PocketComputerItem pocket computers} placed on a lectern.
+ *
+ * @see CustomLecternRenderer
+ */
+public class LecternPocketModel {
+    public static final ResourceLocation TEXTURE_NORMAL = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "entity/pocket_computer_normal");
+    public static final ResourceLocation TEXTURE_ADVANCED = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "entity/pocket_computer_advanced");
+    public static final ResourceLocation TEXTURE_COLOUR = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "entity/pocket_computer_colour");
+    public static final ResourceLocation TEXTURE_FRAME = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "entity/pocket_computer_frame");
+    public static final ResourceLocation TEXTURE_LIGHT = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "entity/pocket_computer_light");
+
+    private static final Material MATERIAL_NORMAL = new Material(InventoryMenu.BLOCK_ATLAS, TEXTURE_NORMAL);
+    private static final Material MATERIAL_ADVANCED = new Material(InventoryMenu.BLOCK_ATLAS, TEXTURE_ADVANCED);
+    private static final Material MATERIAL_COLOUR = new Material(InventoryMenu.BLOCK_ATLAS, TEXTURE_COLOUR);
+    private static final Material MATERIAL_FRAME = new Material(InventoryMenu.BLOCK_ATLAS, TEXTURE_FRAME);
+    private static final Material MATERIAL_LIGHT = new Material(InventoryMenu.BLOCK_ATLAS, TEXTURE_LIGHT);
+
+    // The size of the terminal within the model.
+    public static final float TERM_WIDTH = 12.0f / 32.0f;
+    public static final float TERM_HEIGHT = 14.0f / 32.0f;
+
+    // The size of the texture. The texture is 36x36, but is at 2x resolution.
+    private static final int TEXTURE_WIDTH = 36 / 2;
+    private static final int TEXTURE_HEIGHT = 36 / 2;
+
+    private final ModelPart root;
+
+    public LecternPocketModel() {
+        root = buildPages();
+    }
+
+    private static ModelPart buildPages() {
+        var mesh = new MeshDefinition();
+        var parts = mesh.getRoot();
+        parts.addOrReplaceChild(
+            "root",
+            CubeListBuilder.create().texOffs(0, 0).addBox(0f, -5.0f, -4.0f, 1f, 10.0f, 8.0f),
+            PartPose.ZERO
+        );
+        return mesh.getRoot().bake(TEXTURE_WIDTH, TEXTURE_HEIGHT);
+    }
+
+    /**
+     * Render the pocket computer model.
+     *
+     * @param poseStack     The current pose stack.
+     * @param bufferSource  The buffer source to draw to.
+     * @param packedLight   The current light level.
+     * @param packedOverlay The overlay texture (used for entity hurt animation).
+     * @param family        The computer family.
+     * @param frameColour   The pocket computer's {@linkplain DyedItemColor colour}.
+     * @param lightColour   The pocket computer's {@linkplain PocketComputerData#getLightState() light colour}.
+     */
+    public void render(PoseStack poseStack, MultiBufferSource bufferSource, int packedLight, int packedOverlay, ComputerFamily family, int frameColour, int lightColour) {
+        if (frameColour != -1) {
+            root.render(poseStack, MATERIAL_FRAME.buffer(bufferSource, RenderType::entityCutout), packedLight, packedOverlay);
+            root.render(poseStack, MATERIAL_COLOUR.buffer(bufferSource, RenderType::entityCutout), packedLight, packedOverlay, frameColour);
+        } else {
+            var buffer = (family == ComputerFamily.ADVANCED ? MATERIAL_ADVANCED : MATERIAL_NORMAL).buffer(bufferSource, RenderType::entityCutout);
+            root.render(poseStack, buffer, packedLight, packedOverlay);
+        }
+
+        root.render(poseStack, MATERIAL_LIGHT.buffer(bufferSource, RenderType::entityCutout), LightTexture.FULL_BRIGHT, packedOverlay, lightColour);
+    }
+}

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

@@ -0,0 +1,117 @@
+// 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 = ResourceLocation.fromNamespaceAndPath(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);
+    }
+
+    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);
+    }
+}

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

@@ -0,0 +1,111 @@
+// 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.LecternPocketModel;
+import dan200.computercraft.client.model.LecternPrintoutModel;
+import dan200.computercraft.client.pocket.ClientPocketComputers;
+import dan200.computercraft.client.render.text.FixedWidthFontRenderer;
+import dan200.computercraft.core.terminal.Terminal;
+import dan200.computercraft.core.util.Colour;
+import dan200.computercraft.shared.lectern.CustomLecternBlockEntity;
+import dan200.computercraft.shared.media.items.PrintoutData;
+import dan200.computercraft.shared.media.items.PrintoutItem;
+import dan200.computercraft.shared.pocket.items.PocketComputerItem;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;
+import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
+import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
+import net.minecraft.client.renderer.blockentity.LecternRenderer;
+import net.minecraft.util.FastColor;
+import net.minecraft.world.item.component.DyedItemColor;
+import net.minecraft.world.level.block.LecternBlock;
+import net.minecraft.world.phys.Vec3;
+
+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;
+
+/**
+ * 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 static final int POCKET_TERMINAL_RENDER_DISTANCE = 32;
+
+    private final BlockEntityRenderDispatcher berDispatcher;
+    private final LecternPrintoutModel printoutModel;
+    private final LecternPocketModel pocketModel;
+
+    public CustomLecternRenderer(BlockEntityRendererProvider.Context context) {
+        berDispatcher = context.getBlockEntityRenderDispatcher();
+
+        printoutModel = new LecternPrintoutModel();
+        pocketModel = new LecternPocketModel();
+    }
+
+    @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, PrintoutData.getOrEmpty(item).pages());
+            }
+        } else if (item.getItem() instanceof PocketComputerItem pocket) {
+            var computer = ClientPocketComputers.get(item);
+
+            pocketModel.render(
+                poseStack, buffer, packedLight, packedOverlay, pocket.getFamily(), DyedItemColor.getOrDefault(item, -1),
+                FastColor.ARGB32.opaque(computer == null || computer.getLightState() == -1 ? Colour.BLACK.getHex() : computer.getLightState())
+            );
+
+            // Jiggle the terminal about a bit, so (0, 0) is in the top left of the model's terminal hole.
+            poseStack.mulPose(Axis.YP.rotationDegrees(90f));
+            poseStack.translate(-0.5 * LecternPocketModel.TERM_WIDTH, 0.5 * LecternPocketModel.TERM_HEIGHT + 1f / 32.0f, 1 / 16.0f);
+            poseStack.mulPose(Axis.XP.rotationDegrees(180));
+
+            // Either render the terminal or a black screen, depending on how close we are.
+            var terminal = computer == null ? null : computer.getTerminal();
+            var quadEmitter = FixedWidthFontRenderer.toVertexConsumer(poseStack, buffer.getBuffer(RenderTypes.TERMINAL));
+            if (terminal != null && Vec3.atCenterOf(lectern.getBlockPos()).closerThan(berDispatcher.camera.getPosition(), POCKET_TERMINAL_RENDER_DISTANCE)) {
+                renderPocketTerminal(poseStack, quadEmitter, terminal);
+            } else {
+                FixedWidthFontRenderer.drawEmptyTerminal(quadEmitter, 0, 0, LecternPocketModel.TERM_WIDTH, LecternPocketModel.TERM_HEIGHT);
+            }
+        }
+
+        poseStack.popPose();
+    }
+
+    private static void renderPocketTerminal(PoseStack poseStack, FixedWidthFontRenderer.QuadEmitter quadEmitter, Terminal terminal) {
+        var width = terminal.getWidth() * FONT_WIDTH;
+        var height = terminal.getHeight() * FONT_HEIGHT;
+
+        // Scale the terminal down to fit in the available space.
+        var scaleX = LecternPocketModel.TERM_WIDTH / (width + MARGIN * 2);
+        var scaleY = LecternPocketModel.TERM_HEIGHT / (height + MARGIN * 2);
+        var scale = Math.min(scaleX, scaleY);
+        poseStack.scale(scale, scale, -1.0f);
+
+        // Convert the model dimensions to terminal space, then find out how large the margin should be.
+        var marginX = ((LecternPocketModel.TERM_WIDTH / scale) - width) / 2;
+        var marginY = ((LecternPocketModel.TERM_HEIGHT / scale) - height) / 2;
+
+        FixedWidthFontRenderer.drawTerminal(quadEmitter, marginX, marginY, terminal, marginY, marginY, marginX, marginX);
+    }
+}

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

@@ -14,6 +14,7 @@ import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.config.Config;
 import dan200.computercraft.shared.pocket.items.PocketComputerItem;
 import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.util.FastColor;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.component.DyedItemColor;
 import org.joml.Matrix4f;
@@ -38,8 +39,8 @@ public final class PocketItemRenderer extends ItemMapLikeRenderer {
 
         int termWidth, termHeight;
         if (terminal == null) {
-            termWidth = Config.pocketTermWidth;
-            termHeight = Config.pocketTermHeight;
+            termWidth = Config.DEFAULT_POCKET_TERM_WIDTH;
+            termHeight = Config.DEFAULT_POCKET_TERM_HEIGHT;
         } else {
             termWidth = terminal.getWidth();
             termHeight = terminal.getHeight();
@@ -93,16 +94,11 @@ 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,
-            c, RenderTypes.FULL_BRIGHT_LIGHTMAP
+            FastColor.ARGB32.opaque(colour), RenderTypes.FULL_BRIGHT_LIGHTMAP
         );
     }
 }

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

@@ -23,6 +23,7 @@ import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.CommonColors;
+import net.minecraft.util.FastColor;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
 
@@ -89,7 +90,7 @@ public class TurtleBlockEntityRenderer implements BlockEntityRenderer<TurtleBloc
             renderModel(transform, buffers, lightmapCoord, overlayLight, model, null);
         } else {
             // Otherwise render it using the colour item.
-            renderModel(transform, buffers, lightmapCoord, overlayLight, COLOUR_TURTLE_MODEL, new int[]{ colour });
+            renderModel(transform, buffers, lightmapCoord, overlayLight, COLOUR_TURTLE_MODEL, new int[]{ FastColor.ARGB32.opaque(colour) });
         }
 
         // Render the overlay

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

@@ -178,7 +178,7 @@ public class MonitorBlockEntityRenderer implements BlockEntityRenderer<MonitorBl
                     var size = DirectFixedWidthFontRenderer.getVertexCount(terminal);
 
                     // In an ideal world we could upload these both into one buffer. However, we can't render VBOs with
-                    // and starting and ending offset, and so need to use two buffers instead.
+                    // a starting and ending offset, and so need to use two buffers instead.
 
                     renderToBuffer(backgroundBuffer, size, sink ->
                         DirectFixedWidthFontRenderer.drawTerminalBackground(sink, 0, 0, terminal, yMargin, yMargin, xMargin, xMargin));
@@ -216,10 +216,10 @@ public class MonitorBlockEntityRenderer implements BlockEntityRenderer<MonitorBl
                 foregroundBuffer.bind();
                 foregroundBuffer.drawWithShader(
                     modelView, RenderSystem.getProjectionMatrix(), RenderTypes.getTerminalShader(),
-                    // As mentioned in the above comment, render the extra cursor quad if it is visible this frame. Each
-                    // // quad has an index count of 6.
-                    FixedWidthFontRenderer.isCursorVisible(terminal) && FrameInfo.getGlobalCursorBlink()
-                        ? foregroundBuffer.getIndexCount() + 6 : foregroundBuffer.getIndexCount()
+                    // Skip the cursor quad if it is not visible this frame.
+                    FixedWidthFontRenderer.isCursorVisible(terminal) && !FrameInfo.getGlobalCursorBlink()
+                        ? foregroundBuffer.getIndexCount() - RenderTypes.TERMINAL.mode().indexCount(4)
+                        : foregroundBuffer.getIndexCount()
                 );
 
                 // Clear state

projects/common/src/client/java/dan200/computercraft/client/render/text/DirectFixedWidthFontRenderer.java

@@ -12,9 +12,11 @@ import dan200.computercraft.core.terminal.Palette;
 import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.core.util.Colour;
+import net.minecraft.util.FastColor;
 import org.lwjgl.system.MemoryUtil;
 
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 
 import static dan200.computercraft.client.render.text.FixedWidthFontRenderer.*;
 import static org.lwjgl.system.MemoryUtil.*;
@@ -37,10 +39,12 @@ import static org.lwjgl.system.MemoryUtil.*;
  * {@link FixedWidthFontRenderer}.
  */
 public final class DirectFixedWidthFontRenderer {
+    private static final boolean IS_LITTLE_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN;
+
     private DirectFixedWidthFontRenderer() {
     }
 
-    private static void drawChar(QuadEmitter emitter, float x, float y, int index, byte[] colour) {
+    private static void drawChar(QuadEmitter emitter, float x, float y, int index, int colour) {
         // Short circuit to avoid the common case - the texture should be blank here after all.
         if (index == '\0' || index == ' ') return;
 
@@ -157,8 +161,8 @@ public final class DirectFixedWidthFontRenderer {
         return (terminal.getHeight() + 2) * (terminal.getWidth() + 2) * 2;
     }
 
-    private static void quad(QuadEmitter buffer, float x1, float y1, float x2, float y2, float z, byte[] rgba, float u1, float v1, float u2, float v2) {
-        buffer.quad(x1, y1, x2, y2, z, rgba, u1, v1, u2, v2);
+    private static void quad(QuadEmitter buffer, float x1, float y1, float x2, float y2, float z, int colour, float u1, float v1, float u2, float v2) {
+        buffer.quad(x1, y1, x2, y2, z, colour, u1, v1, u2, v2);
     }
 
     public interface QuadEmitter {
@@ -166,7 +170,7 @@ public final class DirectFixedWidthFontRenderer {
 
         ByteBuffer buffer();
 
-        void quad(float x1, float y1, float x2, float y2, float z, byte[] rgba, float u1, float v1, float u2, float v2);
+        void quad(float x1, float y1, float x2, float y2, float z, int colour, float u1, float v1, float u2, float v2);
     }
 
     public record ByteBufferEmitter(ByteBuffer buffer) implements QuadEmitter {
@@ -176,12 +180,12 @@ public final class DirectFixedWidthFontRenderer {
         }
 
         @Override
-        public void quad(float x1, float y1, float x2, float y2, float z, byte[] rgba, float u1, float v1, float u2, float v2) {
-            DirectFixedWidthFontRenderer.quad(buffer, x1, y1, x2, y2, z, rgba, u1, v1, u2, v2);
+        public void quad(float x1, float y1, float x2, float y2, float z, int colour, float u1, float v1, float u2, float v2) {
+            DirectFixedWidthFontRenderer.quad(buffer, x1, y1, x2, y2, z, colour, u1, v1, u2, v2);
         }
     }
 
-    static void quad(ByteBuffer buffer, float x1, float y1, float x2, float y2, float z, byte[] rgba, float u1, float v1, float u2, float v2) {
+    static void quad(ByteBuffer buffer, float x1, float y1, float x2, float y2, float z, int colour, float u1, float v1, float u2, float v2) {
         // Emit a single quad to our buffer. This uses Unsafe (well, LWJGL's MemoryUtil) to directly blit bytes to the
         // underlying buffer. This allows us to have a single bounds check up-front, rather than one for every write.
         // This provides significant performance gains, at the cost of well, using Unsafe.
@@ -195,16 +199,15 @@ public final class DirectFixedWidthFontRenderer {
         if (position < 0 || 112 > buffer.limit() - position) throw new IndexOutOfBoundsException();
         // Require the pointer to be aligned to a 32-bit boundary.
         if ((addr & 3) != 0) throw new IllegalStateException("Memory is not aligned");
-        // Also assert the length of the array. This appears to help elide bounds checks on the array in some circumstances.
-        if (rgba.length != 4) throw new IllegalStateException();
+
+        // Pack colour so it is equivalent to rgba:BBBB. This matches the logic in BufferBuilder.
+        var colourAbgr = FastColor.ABGR32.fromArgb32(colour);
+        var nativeColour = IS_LITTLE_ENDIAN ? colourAbgr : Integer.reverseBytes(colourAbgr);
 
         memPutFloat(addr + 0, x1);
         memPutFloat(addr + 4, y1);
         memPutFloat(addr + 8, z);
-        memPutByte(addr + 12, rgba[0]);
-        memPutByte(addr + 13, rgba[1]);
-        memPutByte(addr + 14, rgba[2]);
-        memPutByte(addr + 15, (byte) 255);
+        memPutInt(addr + 12, nativeColour);
         memPutFloat(addr + 16, u1);
         memPutFloat(addr + 20, v1);
         memPutShort(addr + 24, (short) 0xF0);
@@ -213,10 +216,7 @@ public final class DirectFixedWidthFontRenderer {
         memPutFloat(addr + 28, x1);
         memPutFloat(addr + 32, y2);
         memPutFloat(addr + 36, z);
-        memPutByte(addr + 40, rgba[0]);
-        memPutByte(addr + 41, rgba[1]);
-        memPutByte(addr + 42, rgba[2]);
-        memPutByte(addr + 43, (byte) 255);
+        memPutInt(addr + 40, nativeColour);
         memPutFloat(addr + 44, u1);
         memPutFloat(addr + 48, v2);
         memPutShort(addr + 52, (short) 0xF0);
@@ -225,10 +225,7 @@ public final class DirectFixedWidthFontRenderer {
         memPutFloat(addr + 56, x2);
         memPutFloat(addr + 60, y2);
         memPutFloat(addr + 64, z);
-        memPutByte(addr + 68, rgba[0]);
-        memPutByte(addr + 69, rgba[1]);
-        memPutByte(addr + 70, rgba[2]);
-        memPutByte(addr + 71, (byte) 255);
+        memPutInt(addr + 68, nativeColour);
         memPutFloat(addr + 72, u2);
         memPutFloat(addr + 76, v2);
         memPutShort(addr + 80, (short) 0xF0);
@@ -237,10 +234,7 @@ public final class DirectFixedWidthFontRenderer {
         memPutFloat(addr + 84, x2);
         memPutFloat(addr + 88, y1);
         memPutFloat(addr + 92, z);
-        memPutByte(addr + 96, rgba[0]);
-        memPutByte(addr + 97, rgba[1]);
-        memPutByte(addr + 98, rgba[2]);
-        memPutByte(addr + 99, (byte) 255);
+        memPutInt(addr + 96, nativeColour);
         memPutFloat(addr + 100, u2);
         memPutFloat(addr + 104, v1);
         memPutShort(addr + 108, (short) 0xF0);

projects/common/src/client/java/dan200/computercraft/client/render/text/FixedWidthFontRenderer.java

@@ -12,6 +12,7 @@ import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.core.util.Colour;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.FastColor;
 import org.joml.Matrix4f;
 import org.joml.Vector3f;
 
@@ -41,8 +42,8 @@ public final class FixedWidthFontRenderer {
     static final float BACKGROUND_START = (WIDTH - 6.0f) / WIDTH;
     static final float BACKGROUND_END = (WIDTH - 4.0f) / WIDTH;
 
-    private static final byte[] BLACK = new byte[]{ byteColour(Colour.BLACK.getR()), byteColour(Colour.BLACK.getR()), byteColour(Colour.BLACK.getR()), (byte) 255 };
-    private static final float Z_OFFSET = 1e-3f;
+    private static final int BLACK = FastColor.ARGB32.color(255, byteColour(Colour.BLACK.getR()), byteColour(Colour.BLACK.getR()), byteColour(Colour.BLACK.getR()));
+    private static final float Z_OFFSET = 1e-4f;
 
     private FixedWidthFontRenderer() {
     }
@@ -59,7 +60,7 @@ public final class FixedWidthFontRenderer {
         return 15 - Terminal.getColour(c, def);
     }
 
-    private static void drawChar(QuadEmitter emitter, float x, float y, int index, byte[] colour, int light) {
+    private static void drawChar(QuadEmitter emitter, float x, float y, int index, int colour, int light) {
         // Short circuit to avoid the common case - the texture should be blank here after all.
         if (index == '\0' || index == ' ') return;
 
@@ -75,7 +76,7 @@ public final class FixedWidthFontRenderer {
         );
     }
 
-    public static void drawQuad(QuadEmitter emitter, float x, float y, float z, float width, float height, byte[] colour, int light) {
+    public static void drawQuad(QuadEmitter emitter, float x, float y, float z, float width, float height, int colour, int light) {
         quad(emitter, x, y, x + width, y + height, z, colour, BACKGROUND_START, BACKGROUND_START, BACKGROUND_END, BACKGROUND_END, light);
     }
 
@@ -216,10 +217,10 @@ public final class FixedWidthFontRenderer {
         return new QuadEmitter(transform.last().pose(), consumer);
     }
 
-    private static void quad(QuadEmitter c, float x1, float y1, float x2, float y2, float z, byte[] rgba, float u1, float v1, float u2, float v2, int light) {
+    private static void quad(QuadEmitter c, float x1, float y1, float x2, float y2, float z, int colour, float u1, float v1, float u2, float v2, int light) {
         var poseMatrix = c.poseMatrix();
         var consumer = c.consumer();
-        byte r = rgba[0], g = rgba[1], b = rgba[2], a = rgba[3];
+        int r = FastColor.ARGB32.red(colour), g = FastColor.ARGB32.green(colour), b = FastColor.ARGB32.blue(colour), a = FastColor.ARGB32.alpha(colour);
 
         consumer.addVertex(poseMatrix, x1, y1, z).setColor(r, g, b, a).setUv(u1, v1).setLight(light);
         consumer.addVertex(poseMatrix, x1, y2, z).setColor(r, g, b, a).setUv(u1, v2).setLight(light);

projects/common/src/client/java/dan200/computercraft/data/client/ClientDataProviders.java

@@ -1,58 +0,0 @@
-// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.data.client;
-
-import dan200.computercraft.client.gui.GuiSprites;
-import dan200.computercraft.data.DataProviders;
-import dan200.computercraft.shared.turtle.TurtleOverlay;
-import dan200.computercraft.shared.turtle.inventory.UpgradeSlot;
-import net.minecraft.client.renderer.texture.atlas.SpriteSource;
-import net.minecraft.client.renderer.texture.atlas.SpriteSources;
-import net.minecraft.client.renderer.texture.atlas.sources.SingleFile;
-import net.minecraft.core.HolderLookup;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.PackType;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Stream;
-
-/**
- * A version of {@link DataProviders} which relies on client-side classes.
- * <p>
- * This is called from {@link DataProviders#add(DataProviders.GeneratorSink)}.
- */
-public final class ClientDataProviders {
-    private ClientDataProviders() {
-    }
-
-    public static void add(DataProviders.GeneratorSink generator, CompletableFuture<HolderLookup.Provider> registries) {
-        generator.addFromCodec("Block atlases", PackType.CLIENT_RESOURCES, "atlases", SpriteSources.FILE_CODEC, out -> {
-            out.accept(ResourceLocation.withDefaultNamespace("blocks"), List.of(
-                new SingleFile(UpgradeSlot.LEFT_UPGRADE, Optional.empty()),
-                new SingleFile(UpgradeSlot.RIGHT_UPGRADE, Optional.empty())
-            ));
-            out.accept(GuiSprites.SPRITE_SHEET, Stream.of(
-                // Buttons
-                GuiSprites.TURNED_OFF.textures(),
-                GuiSprites.TURNED_ON.textures(),
-                GuiSprites.TERMINATE.textures(),
-                // Computers
-                GuiSprites.COMPUTER_NORMAL.textures(),
-                GuiSprites.COMPUTER_ADVANCED.textures(),
-                GuiSprites.COMPUTER_COMMAND.textures(),
-                GuiSprites.COMPUTER_COLOUR.textures()
-            ).flatMap(x -> x).<SpriteSource>map(x -> new SingleFile(x, Optional.empty())).toList());
-        });
-
-        generator.add(pack -> new ExtraModelsProvider(pack, registries) {
-            @Override
-            public Stream<ResourceLocation> getModels(HolderLookup.Provider registries) {
-                return registries.lookupOrThrow(TurtleOverlay.REGISTRY).listElements().map(x -> x.value().model());
-            }
-        });
-    }
-}

projects/common/src/datagen/java/dan200/computercraft/data/BlockModelProvider.java

@@ -23,6 +23,7 @@ import net.minecraft.data.models.BlockModelGenerators;
 import net.minecraft.data.models.blockstates.*;
 import net.minecraft.data.models.model.*;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.Property;
@@ -96,10 +97,17 @@ class BlockModelProvider {
 
         registerCable(generators);
 
+        registerRedstoneControl(generators);
+
         registerTurtleUpgrade(generators, "block/turtle_crafting_table", "block/turtle_crafty_face");
         registerTurtleUpgrade(generators, "block/turtle_speaker", "block/turtle_speaker_face");
         registerTurtleModem(generators, "block/turtle_modem_normal", "block/wireless_modem_normal_face");
         registerTurtleModem(generators, "block/turtle_modem_advanced", "block/wireless_modem_advanced_face");
+
+        generators.blockStateOutput.accept(MultiVariantGenerator.multiVariant(
+            ModRegistry.Blocks.LECTERN.get(),
+            Variant.variant().with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(Blocks.LECTERN))
+        ).with(createHorizontalFacingDispatch()));
     }
 
     private static void registerDiskDrive(BlockModelGenerators generators) {
@@ -349,6 +357,18 @@ class BlockModelProvider {
         generators.blockStateOutput.accept(generator);
     }
 
+    private static void registerRedstoneControl(BlockModelGenerators generators) {
+        var redstoneControl = ModRegistry.Blocks.REDSTONE_RELAY.get();
+        var model = ModelTemplates.CUBE_ORIENTABLE_TOP_BOTTOM.create(
+            redstoneControl, TextureMapping.orientableCube(redstoneControl), generators.modelOutput
+        );
+        generators.blockStateOutput.accept(
+            MultiVariantGenerator.multiVariant(redstoneControl, Variant.variant().with(VariantProperties.MODEL, model))
+                .with(createHorizontalFacingDispatch())
+        );
+    }
+
+
     private static final BooleanProperty[] CABLE_DIRECTIONS = { CableBlock.DOWN, CableBlock.UP, CableBlock.NORTH, CableBlock.SOUTH, CableBlock.WEST, CableBlock.EAST };
     private static final boolean[] BOOLEANS = new boolean[]{ false, true };
 

projects/common/src/datagen/java/dan200/computercraft/data/DataProviders.java

@@ -7,8 +7,16 @@ package dan200.computercraft.data;
 import com.mojang.serialization.Codec;
 import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
+import dan200.computercraft.client.gui.GuiSprites;
+import dan200.computercraft.client.model.LecternPocketModel;
+import dan200.computercraft.client.model.LecternPrintoutModel;
+import dan200.computercraft.data.client.ExtraModelsProvider;
 import dan200.computercraft.shared.turtle.TurtleOverlay;
+import dan200.computercraft.shared.turtle.inventory.UpgradeSlot;
 import net.minecraft.Util;
+import net.minecraft.client.renderer.texture.atlas.SpriteSource;
+import net.minecraft.client.renderer.texture.atlas.SpriteSources;
+import net.minecraft.client.renderer.texture.atlas.sources.SingleFile;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.RegistrySetBuilder;
 import net.minecraft.data.DataProvider;
@@ -20,10 +28,15 @@ import net.minecraft.server.packs.PackType;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Stream;
 
 /**
  * All data providers for ComputerCraft. We require a mod-loader abstraction {@link GeneratorSink} (instead of
@@ -55,15 +68,35 @@ public final class DataProviders {
 
         generator.add(out -> new LanguageProvider(out, fullRegistries));
 
-        // Unfortunately we rely on some client-side classes in this code. We just load in the client side data provider
-        // and invoke that.
-        try {
-            Class.forName("dan200.computercraft.data.client.ClientDataProviders")
-                .getMethod("add", GeneratorSink.class, CompletableFuture.class)
-                .invoke(null, generator, fullRegistries);
-        } catch (ReflectiveOperationException e) {
-            throw new RuntimeException(e);
-        }
+        generator.addFromCodec("Block atlases", PackType.CLIENT_RESOURCES, "atlases", SpriteSources.FILE_CODEC, out -> {
+            out.accept(ResourceLocation.withDefaultNamespace("blocks"), makeSprites(Stream.of(
+                UpgradeSlot.LEFT_UPGRADE,
+                UpgradeSlot.RIGHT_UPGRADE,
+                LecternPrintoutModel.TEXTURE,
+                LecternPocketModel.TEXTURE_NORMAL, LecternPocketModel.TEXTURE_ADVANCED,
+                LecternPocketModel.TEXTURE_COLOUR, LecternPocketModel.TEXTURE_FRAME, LecternPocketModel.TEXTURE_LIGHT
+            )));
+            out.accept(GuiSprites.SPRITE_SHEET, makeSprites(
+                // Computers
+                GuiSprites.COMPUTER_NORMAL.textures(),
+                GuiSprites.COMPUTER_ADVANCED.textures(),
+                GuiSprites.COMPUTER_COMMAND.textures(),
+                GuiSprites.COMPUTER_COLOUR.textures()
+            ));
+        });
+
+        generator.add(pack -> new ExtraModelsProvider(pack, fullRegistries) {
+            @Override
+            public Stream<ResourceLocation> getModels(HolderLookup.Provider registries) {
+                return registries.lookupOrThrow(TurtleOverlay.REGISTRY).listElements().map(x -> x.value().model());
+            }
+        });
+    }
+
+    @SafeVarargs
+    @SuppressWarnings("varargs")
+    private static List<SpriteSource> makeSprites(final Stream<ResourceLocation>... files) {
+        return Arrays.stream(files).flatMap(Function.identity()).<SpriteSource>map(x -> new SingleFile(x, Optional.empty())).toList();
     }
 
     public interface GeneratorSink {

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

@@ -82,6 +82,7 @@ public final class LanguageProvider implements DataProvider {
         add(ModRegistry.Items.WIRED_MODEM.get(), "Wired Modem");
         add(ModRegistry.Items.CABLE.get(), "Networking Cable");
         add(ModRegistry.Items.WIRED_MODEM_FULL.get(), "Wired Modem");
+        add(ModRegistry.Items.REDSTONE_RELAY.get(), "Redstone Relay");
 
         add(ModRegistry.Items.TURTLE_NORMAL.get(), "Turtle");
         add(ModRegistry.Blocks.TURTLE_NORMAL.get().getDescriptionId() + ".upgraded", "%s Turtle");
@@ -164,8 +165,6 @@ public final class LanguageProvider implements DataProvider {
         add("commands.computercraft.queue.synopsis", "Send a computer_command event to a command computer");
         add("commands.computercraft.queue.desc", "Send a computer_command event to a command computer, passing through the additional arguments. This is mostly designed for map makers, acting as a more computer-friendly version of /trigger. Any player can run the command, which would most likely be done through a text component's click event.");
 
-        add("commands.computercraft.generic.no_position", "<no pos>");
-        add("commands.computercraft.generic.position", "%s, %s, %s");
         add("commands.computercraft.generic.yes", "Y");
         add("commands.computercraft.generic.no", "N");
         add("commands.computercraft.generic.exception", "Unhandled exception (%s)");
@@ -288,7 +287,9 @@ public final class LanguageProvider implements DataProvider {
         return Stream.of(
             BuiltInRegistries.BLOCK.holders()
                 .filter(x -> x.key().location().getNamespace().equals(ComputerCraftAPI.MOD_ID))
-                .map(x -> x.value().getDescriptionId()),
+                .map(x -> x.value().getDescriptionId())
+                // Exclude blocks that just reuse vanilla translations, such as the lectern.
+                .filter(x -> !x.startsWith("block.minecraft.")),
             BuiltInRegistries.ITEM.holders()
                 .filter(x -> x.key().location().getNamespace().equals(ComputerCraftAPI.MOD_ID))
                 .map(x -> x.value().getDescriptionId()),

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

@@ -14,6 +14,7 @@ import dan200.computercraft.shared.peripheral.modem.wired.CableModemVariant;
 import net.minecraft.advancements.critereon.StatePropertiesPredicate;
 import net.minecraft.data.loot.LootTableProvider.SubProviderEntry;
 import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.storage.loot.LootPool;
 import net.minecraft.world.level.storage.loot.LootTable;
@@ -49,6 +50,7 @@ class LootTableProvider {
         selfDrop(add, ModRegistry.Blocks.WIRED_MODEM_FULL);
         selfDrop(add, ModRegistry.Blocks.WIRELESS_MODEM_NORMAL);
         selfDrop(add, ModRegistry.Blocks.WIRELESS_MODEM_ADVANCED);
+        selfDrop(add, ModRegistry.Blocks.REDSTONE_RELAY);
 
         computerDrop(add, ModRegistry.Blocks.COMPUTER_NORMAL);
         computerDrop(add, ModRegistry.Blocks.COMPUTER_ADVANCED);
@@ -56,6 +58,8 @@ class LootTableProvider {
         computerDrop(add, ModRegistry.Blocks.TURTLE_NORMAL);
         computerDrop(add, ModRegistry.Blocks.TURTLE_ADVANCED);
 
+        blockDrop(add, ModRegistry.Blocks.LECTERN, LootItem.lootTableItem(Items.LECTERN), ExplosionCondition.survivesExplosion());
+
         add.accept(ModRegistry.Blocks.CABLE.get().getLootTable(), LootTable
             .lootTable()
             .withPool(LootPool.lootPool()

projects/common/src/datagen/java/dan200/computercraft/data/PrettyDataProvider.java

@@ -7,6 +7,7 @@ package dan200.computercraft.data;
 import com.google.common.hash.HashCode;
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
+import dan200.computercraft.shared.util.PrettyJsonWriter;
 import net.minecraft.data.CachedOutput;
 import net.minecraft.data.DataProvider;
 

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

@@ -491,6 +491,17 @@ final class RecipeProvider extends net.minecraft.data.recipes.RecipeProvider {
             .unlockedBy("has_printer", inventoryChange(ModRegistry.Items.PRINTER.get()))
             .build(x -> new PrintoutRecipe(x, pages, 1))
             .save(add);
+
+        ShapedRecipeBuilder
+            .shaped(RecipeCategory.REDSTONE, ModRegistry.Blocks.REDSTONE_RELAY.get())
+            .pattern("SRS")
+            .pattern("RCR")
+            .pattern("SRS")
+            .define('S', Items.STONE)
+            .define('R', ingredients.redstone())
+            .define('C', ModRegistry.Blocks.CABLE.get())
+            .unlockedBy("has_cable", inventoryChange(ModRegistry.Blocks.CABLE.get()))
+            .save(add);
     }
 
     private static DyeColor ofColour(Colour colour) {

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

@@ -5,9 +5,9 @@
 package dan200.computercraft.data;
 
 import dan200.computercraft.api.ComputerCraftTags;
-import dan200.computercraft.shared.util.RegistryHelper;
 import dan200.computercraft.shared.ModRegistry;
 import dan200.computercraft.shared.integration.ExternalModTags;
+import dan200.computercraft.shared.util.RegistryHelper;
 import net.minecraft.core.Registry;
 import net.minecraft.data.tags.ItemTagsProvider;
 import net.minecraft.data.tags.TagsProvider;
@@ -60,10 +60,7 @@ class TagProvider {
 
         tags.tag(ComputerCraftTags.Blocks.TURTLE_SWORD_BREAKABLE).addTag(BlockTags.WOOL).add(Blocks.COBWEB);
 
-        tags.tag(ComputerCraftTags.Blocks.TURTLE_CAN_USE)
-            .addTag(BlockTags.BEEHIVES)
-            .addTag(BlockTags.CAULDRONS)
-            .add(Blocks.COMPOSTER);
+        tags.tag(ComputerCraftTags.Blocks.TURTLE_CAN_USE);
 
         // Make all blocks aside from command computer mineable.
         tags.tag(BlockTags.MINEABLE_WITH_PICKAXE).add(
@@ -79,9 +76,12 @@ class TagProvider {
             ModRegistry.Blocks.WIRELESS_MODEM_NORMAL.get(),
             ModRegistry.Blocks.WIRELESS_MODEM_ADVANCED.get(),
             ModRegistry.Blocks.WIRED_MODEM_FULL.get(),
-            ModRegistry.Blocks.CABLE.get()
+            ModRegistry.Blocks.CABLE.get(),
+            ModRegistry.Blocks.REDSTONE_RELAY.get()
         );
 
+        tags.tag(BlockTags.MINEABLE_WITH_AXE).add(ModRegistry.Blocks.LECTERN.get());
+
         tags.tag(BlockTags.WITHER_IMMUNE).add(ModRegistry.Blocks.COMPUTER_COMMAND.get());
 
         tags.tag(ExternalModTags.Blocks.CREATE_BRITTLE).add(
@@ -107,6 +107,7 @@ class TagProvider {
             ModRegistry.Items.MONITOR_ADVANCED.get()
         );
 
+        // Allow printed books to be placed in bookshelves.
         tags.tag(ItemTags.BOOKSHELF_BOOKS).add(ModRegistry.Items.PRINTED_BOOK.get());
 
         tags.tag(ComputerCraftTags.Items.TURTLE_CAN_PLACE)
@@ -144,7 +145,7 @@ class TagProvider {
     /**
      * A wrapper over {@link ItemTagsProvider}.
      */
-    interface ItemTagConsumer extends TagConsumer<Item> {
+    public interface ItemTagConsumer extends TagConsumer<Item> {
         void copy(TagKey<Block> block, TagKey<Item> item);
     }
 }

projects/common/src/datagen/java/dan200/computercraft/data/client/ExtraModelsProvider.java

@@ -19,11 +19,11 @@ import java.util.stream.Stream;
 /**
  * A data provider to generate {@link ExtraModels}.
  */
-abstract class ExtraModelsProvider implements DataProvider {
+public abstract class ExtraModelsProvider implements DataProvider {
     private final Path path;
     private final CompletableFuture<HolderLookup.Provider> registries;
 
-    ExtraModelsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
+    public ExtraModelsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
         path = output.getOutputFolder(PackOutput.Target.RESOURCE_PACK).resolve(ExtraModels.PATH.getNamespace()).resolve(ExtraModels.PATH.getPath());
         this.registries = registries;
     }