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

Ended up writing my own janky script to do this, rather than use the GH
integration. I'm not proud of this, but it works.

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -6,7 +6,8 @@ body:
   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 +27,5 @@ 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.

.github/workflows/main-ci.yml

@@ -30,8 +30,16 @@ jobs:
     - name: ⚒️ Build
       run: ./gradlew assemble || ./gradlew assemble
 
+    - name: Cache pre-commit
+      uses: actions/cache@v4
+      with:
+        path: ~/.cache/pre-commit
+        key: pre-commit-3|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
+
     - name: 💡 Lint
-      uses: pre-commit/action@v3.0.0
+      run: |
+        pipx install pre-commit
+        pre-commit run --show-diff-on-failure --color=always
 
     - name: 🧪 Run tests
       run: ./gradlew test validateMixinNames checkChangelog
@@ -42,11 +50,6 @@ jobs:
     - 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() }}
@@ -63,9 +66,6 @@ jobs:
         name: CC-Tweaked
         path: ./jars
 
-    - name: 📤 Upload coverage
-      uses: codecov/codecov-action@v4
-
   build-core:
     strategy:
       fail-fast: false

CONTRIBUTING.md

@@ -12,6 +12,7 @@ If you've any other questions, [just ask the community][community] or [open an i
 
 ## Table of Contents
  - [Reporting issues](#reporting-issues)
+ - [Translations](#translations)
  - [Setting up a development environment](#setting-up-a-development-environment)
  - [Developing CC: Tweaked](#developing-cc-tweaked)
  - [Writing documentation](#writing-documentation)
@@ -20,6 +21,10 @@ If you've any other questions, [just ask the community][community] or [open an i
 If you have a bug, suggestion, or other feedback, the best thing to do is [file an issue][new-issue]. When doing so, do
 use the issue templates - they provide a useful hint on what information to provide.
 
+## Translations
+Translations are managed through [CrowdIn], an online interface for managing language strings. Translations may either
+be contributed there, or directly via a pull request.
+
 ## Setting up a development environment
 In order to develop CC: Tweaked, you'll need to download the source code and then run it.
 
@@ -102,3 +107,4 @@ about how you can build on that until you've covered everything!
 [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/

REUSE.toml

@@ -101,7 +101,7 @@ SPDX-License-Identifier = "CC0-1.0"
 path = ".github/**"
 
 [[annotations]]
-path = ["gradle/wrapper/**", "gradlew", "gradlew.bat"]
+path = ["gradle/wrapper/**"]
 SPDX-FileCopyrightText = "Gradle Inc"
 SPDX-License-Identifier = "Apache-2.0"
 

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

@@ -269,7 +269,7 @@ abstract class CCTweakedExtension(
     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> {

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)
     }

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

@@ -18,6 +18,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
 
 /**
@@ -108,6 +109,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())

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>

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/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/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.112.0
+modVersion=1.114.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/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.7+1.21"
+fabric-api = "0.102.1+1.21.1"
 fabric-loader = "0.15.11"
-neoForge = "21.0.143"
+neoForge = "21.1.9"
 neoForgeSpi = "8.0.1"
 mixin = "0.8.5"
 parchment = "2024.07.28"
 parchmentMc = "1.21"
-yarn = "1.21+build.1"
+yarn = "1.21.1+build.1"
 
 # Core dependencies (these versions are tied to the version Minecraft uses)
 fastutil = "8.5.12"
@@ -26,7 +26,7 @@ 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"
@@ -38,14 +38,14 @@ nightConfig = "3.6.7"
 # 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"
 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"
@@ -57,8 +57,8 @@ junit = "5.10.1"
 jmh = "1.37"
 
 # Build tools
-cctJavadoc = "1.8.2"
-checkstyle = "10.14.1"
+cctJavadoc = "1.8.3"
+checkstyle = "10.20.1"
 curseForgeGradle = "1.1.18"
 errorProne-core = "2.27.0"
 errorProne-plugin = "3.1.0"
@@ -66,11 +66,12 @@ fabric-loom = "1.7.1"
 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"
+neoGradle = "7.0.170"
 nullAway = "0.10.25"
+shadow = "8.3.1"
 spotless = "6.23.3"
 taskTree = "2.1.1"
 teavm = "0.11.0-SQUID.1"
@@ -94,9 +95,10 @@ 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" }
@@ -109,7 +111,8 @@ fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fab
 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 = { module = "maven.modrinth:iris", version.ref = "iris" }
+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" }
@@ -117,12 +120,11 @@ 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" }
 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" }
@@ -173,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" }
 
@@ -181,10 +184,10 @@ 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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-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,8 @@ 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
+' "$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()
 }
@@ -17,8 +19,36 @@ dependencies {
 }
 
 tasks.javadoc {
+    title = "CC: Tweaked $version Minecraft $mcVersion"
     include("dan200/computercraft/api/**/*.java")
 
+    options {
+        (this as StandardJavadocDocletOptions)
+
+        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(),
+        )
+    }
+
     // 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/main/java/dan200/computercraft/api/ComputerCraftAPI.java

@@ -173,14 +173,14 @@ public final class ComputerCraftAPI {
      * This may be used with {@link IComputerSystem#getComponent(ComputerComponent)} to only attach APIs to specific
      * computers. For example, one can add an additional API just to turtles with the following code:
      *
-     * <pre>{@code
+     * {@snippet lang="java":
      * ComputerCraftAPI.registerAPIFactory(computer -> {
      *   // Read the turtle component.
      *   var turtle = computer.getComponent(ComputerComponents.TURTLE);
      *   // If present then add our API.
      *   return turtle == null ? null : new MyCustomTurtleApi(turtle);
      * });
-     * }</pre>
+     * }
      *
      * @param factory The factory for your API subclass.
      * @see ILuaAPIFactory

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/network/wired/WiredElement.java

@@ -14,7 +14,7 @@ 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 {

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/build.gradle.kts

@@ -38,9 +38,9 @@ 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)

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

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;
@@ -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/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,7 +42,7 @@ 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 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-3f;
 
     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

@@ -5,6 +5,7 @@
 package dan200.computercraft.data.client;
 
 import dan200.computercraft.client.gui.GuiSprites;
+import dan200.computercraft.client.model.LecternPrintoutModel;
 import dan200.computercraft.data.DataProviders;
 import dan200.computercraft.shared.turtle.TurtleOverlay;
 import dan200.computercraft.shared.turtle.inventory.UpgradeSlot;
@@ -33,7 +34,8 @@ public final class ClientDataProviders {
         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())
+                new SingleFile(UpgradeSlot.RIGHT_UPGRADE, Optional.empty()),
+                new SingleFile(LecternPrintoutModel.TEXTURE, Optional.empty())
             ));
             out.accept(GuiSprites.SPRITE_SHEET, Stream.of(
                 // Buttons

projects/common/src/generated/resources/assets/computercraft/blockstates/lectern.json

@@ -0,0 +1,8 @@
+{
+  "variants": {
+    "facing=east": {"model": "minecraft:block/lectern", "y": 90},
+    "facing=north": {"model": "minecraft:block/lectern", "y": 0},
+    "facing=south": {"model": "minecraft:block/lectern", "y": 180},
+    "facing=west": {"model": "minecraft:block/lectern", "y": 270}
+  }
+}

projects/common/src/generated/resources/assets/computercraft/blockstates/redstone_relay.json

@@ -0,0 +1,8 @@
+{
+  "variants": {
+    "facing=east": {"model": "computercraft:block/redstone_relay", "y": 90},
+    "facing=north": {"model": "computercraft:block/redstone_relay", "y": 0},
+    "facing=south": {"model": "computercraft:block/redstone_relay", "y": 180},
+    "facing=west": {"model": "computercraft:block/redstone_relay", "y": 270}
+  }
+}

projects/common/src/generated/resources/assets/computercraft/lang/en_us.json

@@ -17,6 +17,7 @@
   "block.computercraft.monitor_advanced": "Advanced Monitor",
   "block.computercraft.monitor_normal": "Monitor",
   "block.computercraft.printer": "Printer",
+  "block.computercraft.redstone_relay": "Redstone Relay",
   "block.computercraft.speaker": "Speaker",
   "block.computercraft.turtle_advanced": "Advanced Turtle",
   "block.computercraft.turtle_advanced.upgraded": "Advanced %s Turtle",
@@ -38,8 +39,6 @@
   "commands.computercraft.generic.additional_rows": "%d additional rows…",
   "commands.computercraft.generic.exception": "Unhandled exception (%s)",
   "commands.computercraft.generic.no": "N",
-  "commands.computercraft.generic.no_position": "<no pos>",
-  "commands.computercraft.generic.position": "%s, %s, %s",
   "commands.computercraft.generic.yes": "Y",
   "commands.computercraft.help.desc": "Displays this help message",
   "commands.computercraft.help.no_children": "%s has no sub-commands",

projects/common/src/generated/resources/assets/computercraft/models/block/redstone_relay.json

@@ -0,0 +1,9 @@
+{
+  "parent": "minecraft:block/orientable_with_bottom",
+  "textures": {
+    "bottom": "computercraft:block/redstone_relay_bottom",
+    "front": "computercraft:block/redstone_relay_front",
+    "side": "computercraft:block/redstone_relay_side",
+    "top": "computercraft:block/redstone_relay_top"
+  }
+}

projects/common/src/generated/resources/assets/computercraft/models/item/redstone_relay.json

@@ -0,0 +1 @@
+{"parent": "computercraft:block/redstone_relay"}

projects/common/src/generated/resources/assets/minecraft/atlases/blocks.json

@@ -1,6 +1,7 @@
 {
   "sources": [
     {"type": "minecraft:single", "resource": "computercraft:gui/turtle_upgrade_left"},
-    {"type": "minecraft:single", "resource": "computercraft:gui/turtle_upgrade_right"}
+    {"type": "minecraft:single", "resource": "computercraft:gui/turtle_upgrade_right"},
+    {"type": "minecraft:single", "resource": "computercraft:entity/printout"}
   ]
 }

projects/common/src/generated/resources/data/computercraft/advancement/recipes/redstone/redstone_relay.json

@@ -0,0 +1,15 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_cable": {
+      "conditions": {"items": [{"items": "computercraft:wired_modem"}]},
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {"recipe": "computercraft:redstone_relay"},
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [["has_the_recipe", "has_cable"]],
+  "rewards": {"recipes": ["computercraft:redstone_relay"]}
+}

projects/common/src/generated/resources/data/computercraft/loot_table/blocks/lectern.json

@@ -0,0 +1,12 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [{"condition": "minecraft:survives_explosion"}],
+      "entries": [{"type": "minecraft:item", "name": "minecraft:lectern"}],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "computercraft:blocks/lectern"
+}

projects/common/src/generated/resources/data/computercraft/loot_table/blocks/redstone_relay.json

@@ -0,0 +1,12 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [{"condition": "minecraft:survives_explosion"}],
+      "entries": [{"type": "minecraft:item", "name": "computercraft:redstone_relay"}],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "computercraft:blocks/redstone_relay"
+}

projects/common/src/generated/resources/data/computercraft/recipe/redstone_relay.json

@@ -0,0 +1,11 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "redstone",
+  "key": {
+    "C": {"item": "computercraft:wired_modem"},
+    "R": {"tag": "c:dusts/redstone"},
+    "S": {"item": "minecraft:stone"}
+  },
+  "pattern": ["SRS", "RCR", "SRS"],
+  "result": {"count": 1, "id": "computercraft:redstone_relay"}
+}

projects/common/src/generated/resources/data/minecraft/tags/block/mineable/axe.json

@@ -0,0 +1 @@
+{"values": ["computercraft:lectern"]}

projects/common/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json

@@ -12,6 +12,7 @@
     "computercraft:wireless_modem_normal",
     "computercraft:wireless_modem_advanced",
     "computercraft:wired_modem_full",
-    "computercraft:cable"
+    "computercraft:cable",
+    "computercraft:redstone_relay"
   ]
 }

projects/common/src/main/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/main/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/main/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/main/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/main/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;
@@ -79,9 +79,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 +110,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)

projects/common/src/main/java/dan200/computercraft/impl/detail/DetailRegistryImpl.java

@@ -15,7 +15,7 @@ import java.util.*;
  * @param <T> The type of object that this registry provides details for.
  */
 public class DetailRegistryImpl<T> implements DetailRegistry<T> {
-    private final Collection<DetailProvider<T>> providers = new ArrayList<>();
+    private final Collection<DetailProvider<? super T>> providers = new ArrayList<>();
     private final DetailProvider<T> basic;
 
     public DetailRegistryImpl(DetailProvider<T> basic) {
@@ -24,7 +24,7 @@ public class DetailRegistryImpl<T> implements DetailRegistry<T> {
     }
 
     @Override
-    public synchronized void addProvider(DetailProvider<T> provider) {
+    public synchronized void addProvider(DetailProvider<? super T> provider) {
         Objects.requireNonNull(provider, "provider cannot be null");
         if (!providers.contains(provider)) providers.add(provider);
     }

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

@@ -9,6 +9,7 @@ import dan200.computercraft.core.apis.http.NetworkUtils;
 import dan200.computercraft.shared.computer.core.ResourceMount;
 import dan200.computercraft.shared.computer.core.ServerContext;
 import dan200.computercraft.shared.computer.metrics.ComputerMBean;
+import dan200.computercraft.shared.lectern.CustomLecternBlock;
 import dan200.computercraft.shared.peripheral.monitor.MonitorWatcher;
 import dan200.computercraft.shared.util.DropConsumer;
 import dan200.computercraft.shared.util.TickScheduler;
@@ -20,16 +21,23 @@ import net.minecraft.server.dedicated.DedicatedServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.packs.resources.PreparableReloadListener;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.CreativeModeTabs;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.LecternBlock;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.storage.loot.BuiltInLootTables;
 import net.minecraft.world.level.storage.loot.LootPool;
 import net.minecraft.world.level.storage.loot.LootTable;
 import net.minecraft.world.level.storage.loot.entries.NestedLootTable;
 import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
+import net.minecraft.world.phys.BlockHitResult;
 
 import javax.annotation.Nullable;
 import java.util.Set;
@@ -92,6 +100,20 @@ public final class CommonHooks {
         TickScheduler.onChunkTicketChanged(level, chunkPos, oldLevel, newLevel);
     }
 
+    public static InteractionResult onUseBlock(Player player, Level level, InteractionHand hand, BlockHitResult hitResult) {
+        if (player.isSpectator()) return InteractionResult.PASS;
+
+        var pos = hitResult.getBlockPos();
+        var heldItem = player.getItemInHand(hand);
+        var blockState = level.getBlockState(pos);
+
+        if (blockState.is(Blocks.LECTERN) && !blockState.getValue(LecternBlock.HAS_BOOK)) {
+            return CustomLecternBlock.tryPlaceItem(player, level, pos, blockState, heldItem);
+        }
+
+        return InteractionResult.PASS;
+    }
+
     public static final ResourceKey<LootTable> TREASURE_DISK_LOOT = ResourceKey.create(Registries.LOOT_TABLE, ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "treasure_disk"));
 
     private static final Set<ResourceKey<LootTable>> TREASURE_DISK_LOOT_TABLES = Set.of(

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

@@ -26,7 +26,6 @@ import dan200.computercraft.shared.command.arguments.TrackingFieldArgumentType;
 import dan200.computercraft.shared.common.ClearColourRecipe;
 import dan200.computercraft.shared.common.ColourableRecipe;
 import dan200.computercraft.shared.common.DefaultBundledRedstoneProvider;
-import dan200.computercraft.shared.common.HeldItemMenu;
 import dan200.computercraft.shared.computer.apis.CommandAPI;
 import dan200.computercraft.shared.computer.blocks.CommandComputerBlock;
 import dan200.computercraft.shared.computer.blocks.ComputerBlock;
@@ -44,12 +43,14 @@ import dan200.computercraft.shared.data.PlayerCreativeLootCondition;
 import dan200.computercraft.shared.details.BlockDetails;
 import dan200.computercraft.shared.details.ItemDetails;
 import dan200.computercraft.shared.integration.PermissionRegistry;
+import dan200.computercraft.shared.lectern.CustomLecternBlock;
+import dan200.computercraft.shared.lectern.CustomLecternBlockEntity;
+import dan200.computercraft.shared.media.PrintoutMenu;
 import dan200.computercraft.shared.media.items.*;
 import dan200.computercraft.shared.media.recipes.DiskRecipe;
 import dan200.computercraft.shared.media.recipes.PrintoutRecipe;
 import dan200.computercraft.shared.network.container.ComputerContainerData;
 import dan200.computercraft.shared.network.container.ContainerData;
-import dan200.computercraft.shared.network.container.HeldItemContainerData;
 import dan200.computercraft.shared.peripheral.diskdrive.DiskDriveBlock;
 import dan200.computercraft.shared.peripheral.diskdrive.DiskDriveBlockEntity;
 import dan200.computercraft.shared.peripheral.diskdrive.DiskDriveMenu;
@@ -61,6 +62,8 @@ import dan200.computercraft.shared.peripheral.monitor.MonitorBlockEntity;
 import dan200.computercraft.shared.peripheral.printer.PrinterBlock;
 import dan200.computercraft.shared.peripheral.printer.PrinterBlockEntity;
 import dan200.computercraft.shared.peripheral.printer.PrinterMenu;
+import dan200.computercraft.shared.peripheral.redstone.RedstoneRelayBlock;
+import dan200.computercraft.shared.peripheral.redstone.RedstoneRelayBlockEntity;
 import dan200.computercraft.shared.peripheral.speaker.SpeakerBlock;
 import dan200.computercraft.shared.peripheral.speaker.SpeakerBlockEntity;
 import dan200.computercraft.shared.platform.PlatformHelper;
@@ -114,9 +117,11 @@ import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.item.crafting.SimpleCraftingRecipeSerializer;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
 import net.minecraft.world.level.material.MapColor;
 import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType;
 
@@ -142,7 +147,7 @@ public final class ModRegistry {
             return BlockBehaviour.Properties.of().strength(2);
         }
 
-        private static BlockBehaviour.Properties computerProperties() {
+        private static BlockBehaviour.Properties redstoneConductor() {
             // Computers shouldn't conduct redstone through them, so set isRedstoneConductor to false. This still allows
             // redstone to connect to computers though as it's a signal source.
             return properties().isRedstoneConductor((block, level, blockPos) -> false);
@@ -157,11 +162,11 @@ public final class ModRegistry {
         }
 
         public static final RegistryEntry<ComputerBlock<ComputerBlockEntity>> COMPUTER_NORMAL = REGISTRY.register("computer_normal",
-            () -> new ComputerBlock<>(computerProperties().mapColor(MapColor.STONE), BlockEntities.COMPUTER_NORMAL));
+            () -> new ComputerBlock<>(redstoneConductor().mapColor(MapColor.STONE), BlockEntities.COMPUTER_NORMAL));
         public static final RegistryEntry<ComputerBlock<ComputerBlockEntity>> COMPUTER_ADVANCED = REGISTRY.register("computer_advanced",
-            () -> new ComputerBlock<>(computerProperties().mapColor(MapColor.GOLD), BlockEntities.COMPUTER_ADVANCED));
+            () -> new ComputerBlock<>(redstoneConductor().mapColor(MapColor.GOLD), BlockEntities.COMPUTER_ADVANCED));
         public static final RegistryEntry<ComputerBlock<ComputerBlockEntity>> COMPUTER_COMMAND = REGISTRY.register("computer_command",
-            () -> new CommandComputerBlock<>(computerProperties().strength(-1, 6000000.0F), BlockEntities.COMPUTER_COMMAND));
+            () -> new CommandComputerBlock<>(redstoneConductor().strength(-1, 6000000.0F), BlockEntities.COMPUTER_COMMAND));
 
         public static final RegistryEntry<TurtleBlock> TURTLE_NORMAL = REGISTRY.register("turtle_normal",
             () -> new TurtleBlock(turtleProperties().mapColor(MapColor.STONE), BlockEntities.TURTLE_NORMAL));
@@ -185,6 +190,13 @@ public final class ModRegistry {
         public static final RegistryEntry<WiredModemFullBlock> WIRED_MODEM_FULL = REGISTRY.register("wired_modem_full",
             () -> new WiredModemFullBlock(modemProperties().mapColor(MapColor.STONE)));
         public static final RegistryEntry<CableBlock> CABLE = REGISTRY.register("cable", () -> new CableBlock(modemProperties().mapColor(MapColor.STONE)));
+
+        public static final RegistryEntry<CustomLecternBlock> LECTERN = REGISTRY.register("lectern", () -> new CustomLecternBlock(
+            BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.5F).sound(SoundType.WOOD).ignitedByLava()
+        ));
+
+        public static final RegistryEntry<RedstoneRelayBlock> REDSTONE_RELAY = REGISTRY.register("redstone_relay",
+            () -> new RedstoneRelayBlock(redstoneConductor().mapColor(MapColor.STONE)));
     }
 
     public static class BlockEntities {
@@ -226,6 +238,10 @@ public final class ModRegistry {
             ofBlock(Blocks.WIRELESS_MODEM_NORMAL, (p, s) -> new WirelessModemBlockEntity(BlockEntities.WIRELESS_MODEM_NORMAL.get(), p, s, false));
         public static final RegistryEntry<BlockEntityType<WirelessModemBlockEntity>> WIRELESS_MODEM_ADVANCED =
             ofBlock(Blocks.WIRELESS_MODEM_ADVANCED, (p, s) -> new WirelessModemBlockEntity(BlockEntities.WIRELESS_MODEM_ADVANCED.get(), p, s, true));
+
+        public static final RegistryEntry<BlockEntityType<CustomLecternBlockEntity>> LECTERN = ofBlock(Blocks.LECTERN, CustomLecternBlockEntity::new);
+
+        public static final RegistryEntry<BlockEntityType<RedstoneRelayBlockEntity>> REDSTONE_RELAY = ofBlock(Blocks.REDSTONE_RELAY, RedstoneRelayBlockEntity::new);
     }
 
     public static final class Items {
@@ -275,6 +291,7 @@ public final class ModRegistry {
         public static final RegistryEntry<BlockItem> WIRELESS_MODEM_NORMAL = ofBlock(Blocks.WIRELESS_MODEM_NORMAL, BlockItem::new);
         public static final RegistryEntry<BlockItem> WIRELESS_MODEM_ADVANCED = ofBlock(Blocks.WIRELESS_MODEM_ADVANCED, BlockItem::new);
         public static final RegistryEntry<BlockItem> WIRED_MODEM_FULL = ofBlock(Blocks.WIRED_MODEM_FULL, BlockItem::new);
+        public static final RegistryEntry<BlockItem> REDSTONE_RELAY = ofBlock(Blocks.REDSTONE_RELAY, BlockItem::new);
 
         public static final RegistryEntry<CableBlockItem.Cable> CABLE = REGISTRY.register("cable",
             () -> new CableBlockItem.Cable(Blocks.CABLE.get(), properties()));
@@ -429,11 +446,8 @@ public final class ModRegistry {
         public static final RegistryEntry<MenuType<PrinterMenu>> PRINTER = REGISTRY.register("printer",
             () -> new MenuType<>(PrinterMenu::new, FeatureFlags.VANILLA_SET));
 
-        public static final RegistryEntry<MenuType<HeldItemMenu>> PRINTOUT = REGISTRY.register("printout",
-            () -> ContainerData.toType(
-                HeldItemContainerData.STREAM_CODEC,
-                (id, inventory, data) -> new HeldItemMenu(Menus.PRINTOUT.get(), id, inventory.player, data.hand())
-            ));
+        public static final RegistryEntry<MenuType<PrintoutMenu>> PRINTOUT = REGISTRY.register("printout",
+            () -> new MenuType<>((i, c) -> PrintoutMenu.createRemote(i), FeatureFlags.VANILLA_SET));
     }
 
     static class ArgumentTypes {
@@ -540,6 +554,7 @@ public final class ModRegistry {
                 out.accept(Items.CABLE.get());
                 out.accept(Items.WIRED_MODEM.get());
                 out.accept(Items.WIRED_MODEM_FULL.get());
+                out.accept(Items.REDSTONE_RELAY.get());
 
                 out.accept(Items.MONITOR_NORMAL.get());
                 out.accept(Items.MONITOR_ADVANCED.get());

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

@@ -39,9 +39,8 @@ public final class ChatHelpers {
         return component;
     }
 
-    public static MutableComponent position(@Nullable BlockPos pos) {
-        if (pos == null) return Component.translatable("commands.computercraft.generic.no_position");
-        return Component.translatable("commands.computercraft.generic.position", pos.getX(), pos.getY(), pos.getZ());
+    public static MutableComponent position(BlockPos pos) {
+        return Component.literal(pos.toShortString());
     }
 
     public static MutableComponent bool(boolean value) {

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

@@ -63,7 +63,7 @@ public class TableBuilder {
     /**
      * Get the number of columns for this table.
      * <p>
-     * This will be the same as {@link #getHeaders()}'s length if it is is non-{@code null},
+     * This will be the same as {@link #getHeaders()}'s length if it is non-{@code null},
      * otherwise the length of the first column.
      *
      * @return The number of columns.

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

@@ -1,68 +0,0 @@
-// Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
-//
-// SPDX-License-Identifier: LicenseRef-CCPL
-
-package dan200.computercraft.shared.common;
-
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.MenuProvider;
-import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.item.ItemStack;
-
-import javax.annotation.Nullable;
-
-public class HeldItemMenu extends AbstractContainerMenu {
-    private final ItemStack stack;
-    private final InteractionHand hand;
-
-    public HeldItemMenu(MenuType<? extends HeldItemMenu> type, int id, Player player, InteractionHand hand) {
-        super(type, id);
-
-        this.hand = hand;
-        stack = player.getItemInHand(hand).copy();
-    }
-
-    public ItemStack getStack() {
-        return stack;
-    }
-
-    @Override
-    public ItemStack quickMoveStack(Player player, int slot) {
-        return ItemStack.EMPTY;
-    }
-
-    @Override
-    public boolean stillValid(Player player) {
-        if (!player.isAlive()) return false;
-
-        var stack = player.getItemInHand(hand);
-        return stack == this.stack || !stack.isEmpty() && !this.stack.isEmpty() && stack.getItem() == this.stack.getItem();
-    }
-
-    public static class Factory implements MenuProvider {
-        private final MenuType<HeldItemMenu> type;
-        private final Component name;
-        private final InteractionHand hand;
-
-        public Factory(MenuType<HeldItemMenu> type, ItemStack stack, InteractionHand hand) {
-            this.type = type;
-            name = stack.getHoverName();
-            this.hand = hand;
-        }
-
-        @Override
-        public Component getDisplayName() {
-            return name;
-        }
-
-        @Nullable
-        @Override
-        public AbstractContainerMenu createMenu(int id, Inventory inventory, Player player) {
-            return new HeldItemMenu(type, id, player, hand);
-        }
-    }
-}

projects/common/src/main/java/dan200/computercraft/shared/computer/apis/CommandAPI.java

@@ -256,7 +256,7 @@ public class CommandAPI implements ILuaAPI {
      * Get some basic information about a block.
      * <p>
      * The returned table contains the current name, metadata and block state (as
-     * with [`turtle.inspect`]). If there is a tile entity for that block, its NBT
+     * with [`turtle.inspect`]). If there is a block entity for that block, its NBT
      * will also be returned.
      *
      * @param x         The x position of the block to query.

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

@@ -111,7 +111,7 @@ public abstract class AbstractComputerBlockEntity extends BlockEntity implements
         fresh = false;
         computerID = computer.getID();
 
-        // If the on state has changed, mark as as dirty.
+        // If the on state has changed, mark as dirty.
         var newOn = computer.isOn();
         if (on != newOn) {
             on = newOn;
@@ -128,7 +128,7 @@ public abstract class AbstractComputerBlockEntity extends BlockEntity implements
         // Update the block state if needed.
         updateBlockState(computer.getState());
 
-        var changes = computer.pollAndResetChanges();
+        var changes = computer.pollRedstoneChanges();
         if (changes != 0) {
             for (var direction : DirectionUtil.FACINGS) {
                 if ((changes & (1 << remapToLocalSide(direction).ordinal())) != 0) updateRedstoneTo(direction);
@@ -221,8 +221,10 @@ public abstract class AbstractComputerBlockEntity extends BlockEntity implements
         var offsetSide = dir.getOpposite();
         var localDir = remapToLocalSide(dir);
 
-        computer.setRedstoneInput(localDir, RedstoneUtil.getRedstoneInput(getLevel(), targetPos, dir));
-        computer.setBundledRedstoneInput(localDir, BundledRedstone.getOutput(getLevel(), targetPos, offsetSide));
+        computer.setRedstoneInput(localDir,
+            RedstoneUtil.getRedstoneInput(getLevel(), targetPos, dir),
+            BundledRedstone.getOutput(getLevel(), targetPos, offsetSide)
+        );
     }
 
     /**

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

@@ -132,8 +132,8 @@ public class ServerComputer implements InputHandler, ComputerEnvironment {
      *
      * @return What sides on the computer have changed.
      */
-    public int pollAndResetChanges() {
-        return computer.pollAndResetChanges();
+    public int pollRedstoneChanges() {
+        return computer.pollRedstoneChanges();
     }
 
     public UUID register() {
@@ -216,19 +216,15 @@ public class ServerComputer implements InputHandler, ComputerEnvironment {
     }
 
     public int getRedstoneOutput(ComputerSide side) {
-        return computer.getEnvironment().getExternalRedstoneOutput(side);
+        return computer.isOn() ? computer.getRedstone().getExternalOutput(side) : 0;
     }
 
-    public void setRedstoneInput(ComputerSide side, int level) {
-        computer.getEnvironment().setRedstoneInput(side, level);
+    public void setRedstoneInput(ComputerSide side, int level, int bundledState) {
+        computer.getRedstone().setInput(side, level, bundledState);
     }
 
     public int getBundledRedstoneOutput(ComputerSide side) {
-        return computer.getEnvironment().getExternalBundledRedstoneOutput(side);
-    }
-
-    public void setBundledRedstoneInput(ComputerSide side, int combination) {
-        computer.getEnvironment().setBundledRedstoneInput(side, combination);
+        return computer.isOn() ? computer.getRedstone().getExternalBundledOutput(side) : 0;
     }
 
     public void setPeripheral(ComputerSide side, @Nullable IPeripheral peripheral) {

projects/common/src/main/java/dan200/computercraft/shared/data/HasComputerIdLootCondition.java

@@ -15,7 +15,7 @@ import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType;
 import java.util.Set;
 
 /**
- * A loot condition which checks if the tile entity has a non-0 ID.
+ * A loot condition which checks if the block entity has a computer ID.
  */
 public final class HasComputerIdLootCondition implements LootItemCondition {
     public static final HasComputerIdLootCondition INSTANCE = new HasComputerIdLootCondition();

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

@@ -53,7 +53,9 @@ public class ItemDetails {
         data.put("itemGroups", getItemGroups(stack));
 
         var lore = stack.get(DataComponents.LORE);
-        if (lore != null) data.put("lore", lore.lines().stream().map(Component::getString).toList());
+        if (lore != null && !lore.lines().isEmpty()) {
+            data.put("lore", lore.lines().stream().map(Component::getString).toList());
+        }
 
         var enchants = getAllEnchants(stack);
         if (!enchants.isEmpty()) data.put("enchantments", enchants);

projects/common/src/main/java/dan200/computercraft/shared/lectern/CustomLecternBlock.java

@@ -0,0 +1,163 @@
+// SPDX-FileCopyrightText: 2024 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.shared.lectern;
+
+import dan200.computercraft.shared.ModRegistry;
+import dan200.computercraft.shared.media.items.PrintoutItem;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.stats.Stats;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.item.context.UseOnContext;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.LecternBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.BlockHitResult;
+
+/**
+ * Extends {@link LecternBlock} with support for {@linkplain PrintoutItem printouts}.
+ * <p>
+ * Unlike the vanilla lectern, this block is never empty. If the book is removed from the lectern, it converts back to
+ * its vanilla version (see {@link #clearLectern(Level, BlockPos, BlockState)}).
+ *
+ * @see PrintoutItem#useOn(UseOnContext) Placing books into a lectern.
+ */
+public class CustomLecternBlock extends LecternBlock {
+    public CustomLecternBlock(Properties properties) {
+        super(properties);
+        registerDefaultState(defaultBlockState().setValue(HAS_BOOK, true));
+    }
+
+    /**
+     * Attempt to place an item onto an (empty) lectern.
+     *
+     * @param player     The player placing the item.
+     * @param level      The current level.
+     * @param pos        The position of the lectern.
+     * @param blockState The current state of the lectern.
+     * @param item       The item to place in the custom lectern.
+     * @return Whether the item was placed or not.
+     */
+    public static InteractionResult tryPlaceItem(Player player, Level level, BlockPos pos, BlockState blockState, ItemStack item) {
+        if (item.getItem() instanceof PrintoutItem) {
+            if (!level.isClientSide) replaceLectern(player, level, pos, blockState, item);
+            return InteractionResult.sidedSuccess(level.isClientSide);
+        }
+
+        return InteractionResult.PASS;
+    }
+
+    /**
+     * Replace a vanilla lectern with a custom one.
+     *
+     * @param player     The player placing the item.
+     * @param level      The current level.
+     * @param pos        The position of the lectern.
+     * @param blockState The current state of the lectern.
+     * @param item       The item to place in the custom lectern.
+     */
+    private static void replaceLectern(Player player, Level level, BlockPos pos, BlockState blockState, ItemStack item) {
+        level.setBlockAndUpdate(pos, ModRegistry.Blocks.LECTERN.get().defaultBlockState()
+            .setValue(HAS_BOOK, true)
+            .setValue(FACING, blockState.getValue(FACING))
+            .setValue(POWERED, blockState.getValue(POWERED)));
+
+        if (level.getBlockEntity(pos) instanceof CustomLecternBlockEntity be) {
+            be.setItem(item.consumeAndReturn(1, player));
+        }
+    }
+
+    /**
+     * Remove a custom lectern and replace it with an empty vanilla one.
+     *
+     * @param level      The current level.
+     * @param pos        The position of the lectern.
+     * @param blockState The current state of the lectern.
+     */
+    static void clearLectern(Level level, BlockPos pos, BlockState blockState) {
+        level.setBlockAndUpdate(pos, Blocks.LECTERN.defaultBlockState()
+            .setValue(HAS_BOOK, false)
+            .setValue(FACING, blockState.getValue(FACING))
+            .setValue(POWERED, blockState.getValue(POWERED)));
+    }
+
+    @Override
+    @Deprecated
+    public ItemStack getCloneItemStack(LevelReader level, BlockPos pos, BlockState state) {
+        return new ItemStack(Items.LECTERN);
+    }
+
+    @Override
+    public void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
+        // If we've no lectern, remove it.
+        if (level.getBlockEntity(pos) instanceof CustomLecternBlockEntity lectern && lectern.getItem().isEmpty()) {
+            clearLectern(level, pos, state);
+            return;
+        }
+
+        super.tick(state, level, pos, random);
+    }
+
+    @Override
+    public void onRemove(BlockState state, Level level, BlockPos pos, BlockState newState, boolean isMoving) {
+        if (state.is(newState.getBlock())) return;
+
+        if (level.getBlockEntity(pos) instanceof CustomLecternBlockEntity lectern) {
+            dropItem(level, pos, state, lectern.getItem().copy());
+        }
+
+        super.onRemove(state, level, pos, newState, isMoving);
+    }
+
+    private static void dropItem(Level level, BlockPos pos, BlockState state, ItemStack stack) {
+        if (stack.isEmpty()) return;
+
+        var direction = state.getValue(FACING);
+        var dx = 0.25 * direction.getStepX();
+        var dz = 0.25 * direction.getStepZ();
+        var entity = new ItemEntity(level, pos.getX() + 0.5 + dx, pos.getY() + 1, pos.getZ() + 0.5 + dz, stack);
+        entity.setDefaultPickUpDelay();
+        level.addFreshEntity(entity);
+    }
+
+    @Override
+    public String getDescriptionId() {
+        return Blocks.LECTERN.getDescriptionId();
+    }
+
+    @Override
+    public CustomLecternBlockEntity newBlockEntity(BlockPos pos, BlockState state) {
+        return new CustomLecternBlockEntity(pos, state);
+    }
+
+    @Override
+    public int getAnalogOutputSignal(BlockState blockState, Level level, BlockPos pos) {
+        return level.getBlockEntity(pos) instanceof CustomLecternBlockEntity lectern ? lectern.getRedstoneSignal() : 0;
+    }
+
+    @Override
+    public InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hit) {
+        if (!level.isClientSide && level.getBlockEntity(pos) instanceof CustomLecternBlockEntity lectern) {
+            if (player.isSecondaryUseActive()) {
+                // When shift+clicked with an empty hand, drop the item and replace with the normal lectern.
+                clearLectern(level, pos, state);
+            } else {
+                // Otherwise open the screen.
+                player.openMenu(lectern);
+            }
+
+            player.awardStat(Stats.INTERACT_WITH_LECTERN);
+        }
+
+        return InteractionResult.sidedSuccess(level.isClientSide);
+    }
+}

projects/common/src/main/java/dan200/computercraft/shared/lectern/CustomLecternBlockEntity.java

@@ -0,0 +1,195 @@
+// SPDX-FileCopyrightText: 2024 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.shared.lectern;
+
+import dan200.computercraft.shared.ModRegistry;
+import dan200.computercraft.shared.container.BasicContainer;
+import dan200.computercraft.shared.container.SingleContainerData;
+import dan200.computercraft.shared.media.PrintoutMenu;
+import dan200.computercraft.shared.media.items.PrintoutData;
+import dan200.computercraft.shared.media.items.PrintoutItem;
+import dan200.computercraft.shared.util.BlockEntityHelpers;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientGamePacketListener;
+import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
+import net.minecraft.util.Mth;
+import net.minecraft.world.Container;
+import net.minecraft.world.MenuProvider;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.ContainerData;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.LecternBlock;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.LecternBlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.AbstractList;
+import java.util.List;
+
+/**
+ * The block entity for our {@link CustomLecternBlock}.
+ *
+ * @see LecternBlockEntity
+ */
+public final class CustomLecternBlockEntity extends BlockEntity implements MenuProvider {
+    private static final String NBT_ITEM = "Item";
+    private static final String NBT_PAGE = "Page";
+
+    private ItemStack item = ItemStack.EMPTY;
+    private int page, pageCount;
+
+    public CustomLecternBlockEntity(BlockPos pos, BlockState blockState) {
+        super(ModRegistry.BlockEntities.LECTERN.get(), pos, blockState);
+    }
+
+    public ItemStack getItem() {
+        return item;
+    }
+
+    void setItem(ItemStack item) {
+        this.item = item;
+        itemChanged();
+        BlockEntityHelpers.updateBlock(this);
+    }
+
+    int getRedstoneSignal() {
+        if (item.getItem() instanceof PrintoutItem) {
+            var progress = pageCount > 1 ? (float) page / (pageCount - 1) : 1F;
+            return Mth.floor(progress * 14f) + 1;
+        }
+
+        return 15;
+    }
+
+    /**
+     * Called after the item has changed. This sets up the state for the new item.
+     */
+    private void itemChanged() {
+        if (item.getItem() instanceof PrintoutItem) {
+            pageCount = PrintoutData.getOrEmpty(item).pages();
+            page = Mth.clamp(page, 0, pageCount - 1);
+        } else {
+            pageCount = page = 0;
+        }
+    }
+
+    /**
+     * Set the current page, emitting a redstone pulse if needed.
+     *
+     * @param page The new page.
+     */
+    private void setPage(int page) {
+        if (this.page == page) return;
+
+        this.page = page;
+        setChanged();
+        if (getLevel() != null) LecternBlock.signalPageChange(getLevel(), getBlockPos(), getBlockState());
+    }
+
+    @Override
+    public void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) {
+        super.loadAdditional(tag, registries);
+
+        item = tag.contains(NBT_ITEM, Tag.TAG_COMPOUND) ? ItemStack.parseOptional(registries, tag.getCompound(NBT_ITEM)) : ItemStack.EMPTY;
+        page = tag.getInt(NBT_PAGE);
+        itemChanged();
+    }
+
+    @Override
+    protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) {
+        super.saveAdditional(tag, registries);
+
+        if (!item.isEmpty()) tag.put(NBT_ITEM, item.save(registries));
+        if (item.getItem() instanceof PrintoutItem) tag.putInt(NBT_PAGE, page);
+    }
+
+    @Override
+    public Packet<ClientGamePacketListener> getUpdatePacket() {
+        return ClientboundBlockEntityDataPacket.create(this);
+    }
+
+    @Override
+    public CompoundTag getUpdateTag(HolderLookup.Provider registries) {
+        var tag = super.getUpdateTag(registries);
+        tag.put(NBT_ITEM, item.save(registries));
+        return tag;
+    }
+
+    @Nullable
+    @Override
+    public AbstractContainerMenu createMenu(int containerId, Inventory playerInventory, Player player) {
+        var item = getItem();
+        if (item.getItem() instanceof PrintoutItem) {
+            return new PrintoutMenu(
+                containerId, new LecternContainer(), 0,
+                p -> Container.stillValidBlockEntity(this, player, Container.DEFAULT_DISTANCE_BUFFER),
+                new PrintoutContainerData()
+            );
+        }
+
+        return null;
+    }
+
+    @Override
+    public Component getDisplayName() {
+        return getItem().getDisplayName();
+    }
+
+    /**
+     * A read-only container storing the lectern's contents.
+     */
+    private final class LecternContainer implements BasicContainer {
+        private final List<ItemStack> itemView = new AbstractList<>() {
+            @Override
+            public ItemStack get(int index) {
+                if (index != 0) throw new IndexOutOfBoundsException("Inventory only has one slot");
+                return item;
+            }
+
+            @Override
+            public int size() {
+                return 1;
+            }
+        };
+
+        @Override
+        public List<ItemStack> getItems() {
+            return itemView;
+        }
+
+        @Override
+        public void setChanged() {
+            // Should never happen, so a no-op.
+        }
+
+        @Override
+        public boolean stillValid(Player player) {
+            return !isRemoved();
+        }
+    }
+
+    /**
+     * {@link ContainerData} for a {@link PrintoutMenu}. This provides a read/write view of the current page.
+     */
+    private final class PrintoutContainerData implements SingleContainerData {
+        @Override
+        public int get() {
+            return page;
+        }
+
+        @Override
+        public void set(int index, int value) {
+            if (index == 0) setPage(value);
+        }
+    }
+}

projects/common/src/main/java/dan200/computercraft/shared/media/PrintoutMenu.java

@@ -0,0 +1,137 @@
+// SPDX-FileCopyrightText: 2024 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.shared.media;
+
+import dan200.computercraft.shared.ModRegistry;
+import dan200.computercraft.shared.container.InvisibleSlot;
+import dan200.computercraft.shared.media.items.PrintoutData;
+import dan200.computercraft.shared.media.items.PrintoutItem;
+import net.minecraft.util.Mth;
+import net.minecraft.world.Container;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.SimpleContainer;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.*;
+import net.minecraft.world.item.ItemStack;
+
+import java.util.function.Predicate;
+
+/**
+ * The menus for {@linkplain PrintoutItem printouts}.
+ * <p>
+ * This is a somewhat similar design to {@link LecternMenu}, which is used to read written books.
+ * <p>
+ * This holds a single slot (containing the printout), and a single data slot ({@linkplain #DATA_CURRENT_PAGE holding
+ * the current page}). The page is set by the client by sending a {@linkplain #clickMenuButton(Player, int) button
+ * press} with an index of {@link #PAGE_BUTTON_OFFSET} plus the current page.
+ * <p>
+ * The client-side screen uses {@linkplain ContainerListener container listeners} to subscribe to item and page changes.
+ * However, listeners aren't fired on the client, so we copy {@link LecternMenu}'s hack and call
+ * {@link #broadcastChanges()} whenever an item or data value are changed.
+ */
+public class PrintoutMenu extends AbstractContainerMenu {
+    public static final int DATA_CURRENT_PAGE = 0;
+    private static final int DATA_SIZE = 1;
+
+    public static final int PAGE_BUTTON_OFFSET = 100;
+
+    private final Predicate<Player> valid;
+    private final ContainerData currentPage;
+
+    public PrintoutMenu(
+        int containerId, Container container, int slotIdx, Predicate<Player> valid, ContainerData currentPage
+    ) {
+        super(ModRegistry.Menus.PRINTOUT.get(), containerId);
+        this.valid = valid;
+        this.currentPage = currentPage;
+
+        addSlot(new InvisibleSlot(container, slotIdx) {
+            @Override
+            public void setChanged() {
+                super.setChanged();
+                slotsChanged(container); // Trigger listeners on the client.
+            }
+        });
+        addDataSlots(currentPage);
+    }
+
+    /**
+     * Create {@link PrintoutMenu} for use a remote (client).
+     *
+     * @param containerId The current container id.
+     * @return The constructed container.
+     */
+    public static PrintoutMenu createRemote(int containerId) {
+        return new PrintoutMenu(containerId, new SimpleContainer(1), 0, p -> true, new SimpleContainerData(DATA_SIZE));
+    }
+
+    /**
+     * Create a {@link PrintoutMenu} for the printout in the current player's hand.
+     *
+     * @param containerId The current container id.
+     * @param player      The player to open the container.
+     * @param hand        The hand containing the item.
+     * @return The constructed container.
+     */
+    public static PrintoutMenu createInHand(int containerId, Player player, InteractionHand hand) {
+        var currentStack = player.getItemInHand(hand);
+        var currentItem = currentStack.getItem();
+
+        var slot = switch (hand) {
+            case MAIN_HAND -> player.getInventory().selected;
+            case OFF_HAND -> Inventory.SLOT_OFFHAND;
+        };
+        return new PrintoutMenu(
+            containerId, player.getInventory(), slot,
+            p -> player.getItemInHand(hand).getItem() == currentItem, new SimpleContainerData(DATA_SIZE)
+        );
+    }
+
+    @Override
+    public ItemStack quickMoveStack(Player player, int index) {
+        return ItemStack.EMPTY;
+    }
+
+    @Override
+    public boolean stillValid(Player player) {
+        return valid.test(player);
+    }
+
+    @Override
+    public boolean clickMenuButton(Player player, int id) {
+        if (id >= PAGE_BUTTON_OFFSET) {
+            var page = Mth.clamp(id - PAGE_BUTTON_OFFSET, 0, PrintoutData.getOrEmpty(getPrintout()).pages() - 1);
+            setData(DATA_CURRENT_PAGE, page);
+            return true;
+        }
+
+        return super.clickMenuButton(player, id);
+    }
+
+    /**
+     * Get the current printout.
+     *
+     * @return The current printout.
+     */
+    public ItemStack getPrintout() {
+        return getSlot(0).getItem();
+    }
+
+    /**
+     * Get the current page.
+     *
+     * @return The current page.
+     */
+    public int getPage() {
+        return currentPage.get(DATA_CURRENT_PAGE);
+    }
+
+    @Override
+    public void setData(int id, int data) {
+        super.setData(id, data);
+        broadcastChanges(); // Trigger listeners on the client.
+    }
+}

projects/common/src/main/java/dan200/computercraft/shared/media/items/PrintoutItem.java

@@ -4,13 +4,13 @@
 
 package dan200.computercraft.shared.media.items;
 
-import dan200.computercraft.shared.ModRegistry;
-import dan200.computercraft.shared.common.HeldItemMenu;
-import dan200.computercraft.shared.network.container.HeldItemContainerData;
+import com.google.common.base.Strings;
+import dan200.computercraft.shared.media.PrintoutMenu;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionResultHolder;
+import net.minecraft.world.SimpleMenuProvider;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -41,11 +41,13 @@ public class PrintoutItem extends Item {
 
     @Override
     public InteractionResultHolder<ItemStack> use(Level world, Player player, InteractionHand hand) {
+        var stack = player.getItemInHand(hand);
         if (!world.isClientSide) {
-            new HeldItemContainerData(hand)
-                .open(player, new HeldItemMenu.Factory(ModRegistry.Menus.PRINTOUT.get(), player.getItemInHand(hand), hand));
+            var title = PrintoutData.getOrEmpty(stack).title();
+            var displayTitle = Strings.isNullOrEmpty(title) ? stack.getDisplayName() : Component.literal(title);
+            player.openMenu(new SimpleMenuProvider((id, playerInventory, p) -> PrintoutMenu.createInHand(id, p, hand), displayTitle));
         }
-        return new InteractionResultHolder<>(InteractionResult.sidedSuccess(world.isClientSide), player.getItemInHand(hand));
+        return new InteractionResultHolder<>(InteractionResult.sidedSuccess(world.isClientSide), stack);
     }
 
     public Type getType() {

projects/common/src/main/java/dan200/computercraft/shared/network/container/HeldItemContainerData.java

@@ -1,31 +0,0 @@
-// SPDX-FileCopyrightText: 2019 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.shared.network.container;
-
-import dan200.computercraft.shared.common.HeldItemMenu;
-import dan200.computercraft.shared.media.items.PrintoutItem;
-import dan200.computercraft.shared.network.codec.MoreStreamCodecs;
-import net.minecraft.network.RegistryFriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.world.InteractionHand;
-
-/**
- * Opens a printout GUI based on the currently held item.
- *
- * @param hand The hand holding this item.
- * @see HeldItemMenu
- * @see PrintoutItem
- */
-public record HeldItemContainerData(InteractionHand hand) implements ContainerData {
-    public static final StreamCodec<RegistryFriendlyByteBuf, HeldItemContainerData> STREAM_CODEC = StreamCodec.composite(
-        MoreStreamCodecs.ofEnum(InteractionHand.class), HeldItemContainerData::hand,
-        HeldItemContainerData::new
-    );
-
-    @Override
-    public void toBytes(RegistryFriendlyByteBuf buf) {
-        STREAM_CODEC.encode(buf, this);
-    }
-}

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

@@ -99,11 +99,13 @@ public final class DiskDriveBlockEntity extends AbstractContainerBlockEntity imp
 
     @Override
     public void clearRemoved() {
+        super.clearRemoved();
         updateMedia();
     }
 
     @Override
     public void setRemoved() {
+        super.setRemoved();
         if (recordPlaying) stopRecord();
     }
 

projects/common/src/main/java/dan200/computercraft/shared/peripheral/generic/methods/AbstractFluidMethods.java

@@ -70,10 +70,10 @@ public abstract class AbstractFluidMethods<T> implements GenericPeripheral {
     ) throws LuaException;
 
     /**
-     * Move a fluid from a connected fluid container into this oneone.
+     * Move a fluid from a connected fluid container into this one.
      * <p>
      * This allows you to pull fluid in the current fluid container from another container <em>on the same wired
-     * network</em>. Both containers must attached to wired modems which are connected via a cable.
+     * network</em>. Both containers must be attached to wired modems which are connected via a cable.
      *
      * @param to        Container to move fluid to.
      * @param computer  The current computer.

projects/common/src/main/java/dan200/computercraft/shared/peripheral/generic/methods/AbstractInventoryMethods.java

@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers
 //
-// SPDX-License-Identifier: LicenseRef-CCPL
+// SPDX-License-Identifier: MPL-2.0
 
 package dan200.computercraft.shared.peripheral.generic.methods;
 

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

@@ -5,6 +5,7 @@
 package dan200.computercraft.shared.peripheral.monitor;
 
 import com.google.common.annotations.VisibleForTesting;
+import dan200.computercraft.api.peripheral.AttachedComputerSet;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.core.terminal.Terminal;
@@ -25,9 +26,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
-import java.util.Collections;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 
 public class MonitorBlockEntity extends BlockEntity {
@@ -53,7 +51,7 @@ public class MonitorBlockEntity extends BlockEntity {
     private @Nullable ClientMonitor clientMonitor;
 
     private @Nullable MonitorPeripheral peripheral;
-    private final Set<IComputerAccess> computers = Collections.newSetFromMap(new ConcurrentHashMap<>());
+    private final AttachedComputerSet computers = new AttachedComputerSet();
 
     private boolean needsUpdate = false;
     private boolean needsValidating = false;
@@ -487,7 +485,7 @@ public class MonitorBlockEntity extends BlockEntity {
                 var monitor = getLoadedMonitor(x, y).getMonitor();
                 if (monitor == null) continue;
 
-                for (var computer : monitor.computers) fun.accept(computer);
+                computers.forEach(fun);
             }
         }
     }

projects/common/src/main/java/dan200/computercraft/shared/peripheral/redstone/RedstoneRelayBlock.java

@@ -0,0 +1,92 @@
+// SPDX-FileCopyrightText: 2024 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+package dan200.computercraft.shared.peripheral.redstone;
+
+import com.mojang.serialization.MapCodec;
+import dan200.computercraft.shared.common.IBundledRedstoneBlock;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.item.context.BlockPlaceContext;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.EntityBlock;
+import net.minecraft.world.level.block.HorizontalDirectionalBlock;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.StateDefinition;
+
+import javax.annotation.Nonnull;
+
+/**
+ * The block for redstone relays. This mostly just forwards method calls to the {@linkplain RedstoneRelayBlockEntity
+ * block entity}.
+ */
+public final class RedstoneRelayBlock extends HorizontalDirectionalBlock implements EntityBlock, IBundledRedstoneBlock {
+    private static final MapCodec<RedstoneRelayBlock> CODEC = simpleCodec(RedstoneRelayBlock::new);
+
+    public RedstoneRelayBlock(Properties properties) {
+        super(properties);
+        registerDefaultState(defaultBlockState().setValue(FACING, Direction.NORTH));
+    }
+
+    @Override
+    protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> properties) {
+        properties.add(FACING);
+    }
+
+    @Override
+    protected MapCodec<RedstoneRelayBlock> codec() {
+        return CODEC;
+    }
+
+    @Override
+    public BlockState getStateForPlacement(BlockPlaceContext placement) {
+        return defaultBlockState().setValue(FACING, placement.getHorizontalDirection());
+    }
+
+    @Override
+    @Deprecated
+    public void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
+        super.tick(state, level, pos, random);
+
+        if (level.getBlockEntity(pos) instanceof RedstoneRelayBlockEntity relay) relay.update();
+    }
+
+    @Override
+    @Deprecated
+    public boolean isSignalSource(@Nonnull BlockState state) {
+        return true;
+    }
+
+    @Override
+    @Deprecated
+    public int getDirectSignal(@Nonnull BlockState state, BlockGetter level, @Nonnull BlockPos pos, @Nonnull Direction incomingSide) {
+        return level.getBlockEntity(pos) instanceof RedstoneRelayBlockEntity relay ? relay.getRedstoneOutput(incomingSide.getOpposite()) : 0;
+    }
+
+    @Override
+    @Deprecated
+    public int getSignal(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
+        return getDirectSignal(state, level, pos, direction);
+    }
+
+    @Override
+    public int getBundledRedstoneOutput(Level level, BlockPos pos, Direction side) {
+        return level.getBlockEntity(pos) instanceof RedstoneRelayBlockEntity relay ? relay.getBundledRedstoneOutput(side) : 0;
+    }
+
+    @Override
+    @Deprecated
+    public void neighborChanged(@Nonnull BlockState state, @Nonnull Level world, @Nonnull BlockPos pos, @Nonnull Block neighbourBlock, @Nonnull BlockPos neighbourPos, boolean isMoving) {
+        if (world.getBlockEntity(pos) instanceof RedstoneRelayBlockEntity relay) relay.neighborChanged(neighbourPos);
+    }
+
+    @Override
+    public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
+        return new RedstoneRelayBlockEntity(pos, state);
+    }
+}

projects/common/src/main/java/dan200/computercraft/shared/peripheral/redstone/RedstoneRelayBlockEntity.java

@@ -0,0 +1,92 @@
+// SPDX-FileCopyrightText: 2024 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+package dan200.computercraft.shared.peripheral.redstone;
+
+import dan200.computercraft.api.peripheral.IPeripheral;
+import dan200.computercraft.core.computer.ComputerSide;
+import dan200.computercraft.core.redstone.RedstoneState;
+import dan200.computercraft.impl.BundledRedstone;
+import dan200.computercraft.shared.ModRegistry;
+import dan200.computercraft.shared.util.DirectionUtil;
+import dan200.computercraft.shared.util.RedstoneUtil;
+import dan200.computercraft.shared.util.TickScheduler;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.HorizontalDirectionalBlock;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+
+public final class RedstoneRelayBlockEntity extends BlockEntity {
+    private final TickScheduler.Token tickToken = new TickScheduler.Token(this);
+
+    private final RedstoneState redstoneState = new RedstoneState(() -> TickScheduler.schedule(tickToken));
+    private final RedstoneRelayPeripheral peripheral = new RedstoneRelayPeripheral(redstoneState);
+
+    public RedstoneRelayBlockEntity(BlockPos pos, BlockState blockState) {
+        super(ModRegistry.BlockEntities.REDSTONE_RELAY.get(), pos, blockState);
+    }
+
+    @Override
+    public void clearRemoved() {
+        super.clearRemoved();
+        TickScheduler.schedule(tickToken);
+    }
+
+    void update() {
+        var changes = redstoneState.updateOutput();
+        if (changes != 0) {
+            for (var direction : DirectionUtil.FACINGS) {
+                if ((changes & (1 << mapSide(direction).ordinal())) != 0) updateRedstoneTo(direction);
+            }
+        }
+
+        if (redstoneState.pollInputChanged()) peripheral.queueRedstoneEvent();
+    }
+
+    void neighborChanged(BlockPos neighbour) {
+        for (var dir : DirectionUtil.FACINGS) {
+            var offset = getBlockPos().relative(dir);
+            if (offset.equals(neighbour)) {
+                updateRedstoneInput(dir, offset, false);
+                return;
+            }
+        }
+
+        // If the position is not any adjacent one, update all inputs. This is pretty terrible, but some redstone mods
+        // handle this incorrectly.
+        for (var dir : DirectionUtil.FACINGS) updateRedstoneInput(dir, getBlockPos().relative(dir), false);
+    }
+
+    private void updateRedstoneTo(Direction direction) {
+        RedstoneUtil.propagateRedstoneOutput(getLevel(), getBlockPos(), direction);
+        updateRedstoneInput(direction, getBlockPos().relative(direction), true);
+    }
+
+    private void updateRedstoneInput(Direction dir, BlockPos targetPos, boolean ticking) {
+        var changed = redstoneState.setInput(mapSide(dir),
+            RedstoneUtil.getRedstoneInput(getLevel(), targetPos, dir),
+            BundledRedstone.getOutput(getLevel(), targetPos, dir.getOpposite())
+        );
+
+        // If the input has changed, and we're not currently in update(), then schedule a new tick so we can queue a
+        // redstone event.
+        if (changed && !ticking) TickScheduler.schedule(tickToken);
+    }
+
+    private ComputerSide mapSide(Direction globalSide) {
+        return DirectionUtil.toLocal(getBlockState().getValue(HorizontalDirectionalBlock.FACING), globalSide);
+    }
+
+    int getRedstoneOutput(Direction side) {
+        return redstoneState.getExternalOutput(mapSide(side));
+    }
+
+    int getBundledRedstoneOutput(Direction side) {
+        return redstoneState.getExternalBundledOutput(mapSide(side));
+    }
+
+    public IPeripheral peripheral() {
+        return peripheral;
+    }
+}

projects/common/src/main/java/dan200/computercraft/shared/peripheral/redstone/RedstoneRelayPeripheral.java

@@ -0,0 +1,73 @@
+// SPDX-FileCopyrightText: 2024 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+package dan200.computercraft.shared.peripheral.redstone;
+
+import dan200.computercraft.api.peripheral.AttachedComputerSet;
+import dan200.computercraft.api.peripheral.IComputerAccess;
+import dan200.computercraft.api.peripheral.IPeripheral;
+import dan200.computercraft.core.apis.RedstoneAPI;
+import dan200.computercraft.core.apis.RedstoneMethods;
+import dan200.computercraft.core.redstone.RedstoneAccess;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * The redstone relay is a peripheral that allows reading and outputting redstone signals. While this is not very useful
+ * on its own (as computers have the same functionality [built-in][`redstone`]), this can be used with [wired
+ * modems][`modem`] to interact with multiple redstone signals from the same computer.
+ * <p>
+ * The peripheral provides largely identical methods to a computer's built-in {@link RedstoneAPI} API, allowing setting
+ * signals on all six sides of the block ("top", "bottom", "left", "right", "front" and "back").
+ *
+ * <p>
+ * ## Recipe
+ * <div class="recipe-container">
+ *   <mc-recipe recipe="computercraft:redstone_relay"></mc-recipe>
+ * </div>
+ *
+ * @cc.usage Toggle the redstone signal above the computer every 0.5 seconds.
+ *
+ * <pre>{@code
+ * local relay = peripheral.find("redstone_relay")
+ * while true do
+ *   relay.setOutput("top", not relay.getOutput("top"))
+ *   sleep(0.5)
+ * end
+ * }</pre>
+ * @cc.module redstone_relay
+ * @cc.since 1.114.0
+ */
+public final class RedstoneRelayPeripheral extends RedstoneMethods implements IPeripheral {
+    private final AttachedComputerSet computers = new AttachedComputerSet();
+
+    RedstoneRelayPeripheral(RedstoneAccess access) {
+        super(access);
+    }
+
+    @Nonnull
+    @Override
+    public String getType() {
+        return "redstone_relay";
+    }
+
+    @Override
+    public boolean equals(@Nullable IPeripheral other) {
+        return this == other;
+    }
+
+    @Override
+    public void attach(IComputerAccess computer) {
+        computers.add(computer);
+    }
+
+    @Override
+    public void detach(IComputerAccess computer) {
+        computers.remove(computer);
+    }
+
+    void queueRedstoneEvent() {
+        computers.queueEvent("redstone");
+    }
+}

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

@@ -4,11 +4,11 @@
 
 package dan200.computercraft.shared.peripheral.speaker;
 
-import com.google.errorprone.annotations.concurrent.GuardedBy;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.api.lua.LuaFunction;
 import dan200.computercraft.api.lua.LuaTable;
+import dan200.computercraft.api.peripheral.AttachedComputerSet;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.core.util.Nullability;
@@ -59,7 +59,7 @@ public abstract class SpeakerPeripheral implements IPeripheral {
     public static final int SAMPLE_RATE = 48000;
 
     private final UUID source = UUID.randomUUID();
-    private final @GuardedBy("computers") Set<IComputerAccess> computers = new HashSet<>();
+    private final AttachedComputerSet computers = new AttachedComputerSet();
 
     private long clock = 0;
     private long lastPositionTime;
@@ -139,11 +139,7 @@ public abstract class SpeakerPeripheral implements IPeripheral {
             syncedPosition(position);
 
             // And notify computers that we have space for more audio.
-            synchronized (computers) {
-                for (var computer : computers) {
-                    computer.queueEvent("speaker_audio_empty", computer.getAttachmentName());
-                }
-            }
+            computers.forEach(c -> c.queueEvent("speaker_audio_empty", c.getAttachmentName()));
         }
 
         // Push position updates to any speakers which have ever played a note,
@@ -356,16 +352,12 @@ public abstract class SpeakerPeripheral implements IPeripheral {
 
     @Override
     public void attach(IComputerAccess computer) {
-        synchronized (computers) {
-            computers.add(computer);
-        }
+        computers.add(computer);
     }
 
     @Override
     public void detach(IComputerAccess computer) {
-        synchronized (computers) {
-            computers.remove(computer);
-        }
+        computers.remove(computer);
     }
 
     static double clampVolume(double volume) {

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

@@ -33,8 +33,6 @@ import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.CraftingInput;
-import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
@@ -60,6 +58,14 @@ public interface PlatformHelper {
         return instance == null ? Services.raise(PlatformHelper.class, Instance.ERROR) : instance;
     }
 
+    /**
+     * Determine if the specified mod is loaded.
+     *
+     * @param id The id of the mod to check.
+     * @return Whether this mod is loaded.
+     */
+    boolean isModLoaded(String id);
+
     /**
      * Create a new config builder.
      *
@@ -208,26 +214,6 @@ public interface PlatformHelper {
      */
     ItemStack getCraftingRemainingItem(ItemStack stack);
 
-    /**
-     * A more general version of {@link #getCraftingRemainingItem(ItemStack)} which gets all remaining items for a
-     * recipe.
-     *
-     * @param player    The player performing the crafting.
-     * @param recipe    The recipe currently doing the crafting.
-     * @param container The crafting container.
-     * @return A list of items to return to the player after crafting.
-     */
-    List<ItemStack> getRecipeRemainingItems(ServerPlayer player, Recipe<CraftingInput> recipe, CraftingInput container);
-
-    /**
-     * Fire an event after crafting has occurred.
-     *
-     * @param player    The player performing the crafting.
-     * @param container The current crafting container.
-     * @param stack     The resulting stack from crafting.
-     */
-    void onItemCrafted(ServerPlayer player, CraftingInput container, ItemStack stack);
-
     /**
      * Check whether we should notify neighbours in a particular direction.
      *

projects/common/src/main/java/dan200/computercraft/shared/pocket/apis/PocketAPI.java

@@ -30,6 +30,12 @@ import java.util.Objects;
  *   print("On something else")
  * end
  * }</pre>
+ * <p>
+ * ## Recipes
+ * <div class="recipe-container">
+ *  <mc-recipe recipe="computercraft:pocket_computer_normal"></mc-recipe>
+ *  <mc-recipe recipe="computercraft:pocket_computer_advanced"></mc-recipe>
+ * </div>
  *
  * @cc.module pocket
  */

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

@@ -21,6 +21,7 @@ import net.minecraft.world.item.component.DyedItemColor;
 import net.minecraft.world.phys.Vec3;
 
 import javax.annotation.Nullable;
+import java.util.Objects;
 
 /**
  * Holds additional state for a pocket computer. This includes pocket computer upgrade,
@@ -169,6 +170,8 @@ public final class PocketBrain implements IPocketAccess {
      */
     @Override
     public void setUpgrade(@Nullable UpgradeData<IPocketUpgrade> upgrade) {
+        if (Objects.equals(this.upgrade, upgrade)) return;
+
         this.upgrade = upgrade;
         dirty = true;
         invalidatePeripheral();

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

@@ -102,12 +102,16 @@ public class PocketComputerItem extends Item implements IMedia {
     }
 
     @Override
-    public void inventoryTick(ItemStack stack, Level world, Entity entity, int slotNum, boolean selected) {
+    public void inventoryTick(ItemStack stack, Level world, Entity entity, int compartmentSlot, boolean selected) {
         // This (in vanilla at least) is only called for players. Don't bother to handle other entities.
         if (world.isClientSide || !(entity instanceof ServerPlayer player)) return;
 
+        // Find the actual slot the item exists in, aborting if it can't be found.
+        var slot = InventoryUtil.getInventorySlotFromCompartment(player, compartmentSlot, stack);
+        if (slot < 0) return;
+
         // If we're in the inventory, create a computer and keep it alive.
-        var holder = new PocketHolder.PlayerHolder(player, slotNum);
+        var holder = new PocketHolder.PlayerHolder(player, slot);
         var brain = getOrCreateBrain((ServerLevel) world, holder, stack);
         brain.computer().keepAlive();
 
@@ -222,6 +226,18 @@ public class PocketComputerItem extends Item implements IMedia {
         return getServerComputer(ServerContext.get(server).registry(), stack);
     }
 
+    @Override
+    public void onCraftedPostProcess(ItemStack stack, Level level) {
+        // Normally we treat the computer instance as the source of truth, and copy the computer's state back to the
+        // item. However, if we've just crafted the computer with an upgrade, we should sync the other way, and update
+        // the computer.
+        var server = level.getServer();
+        if (server != null) {
+            var computer = getServerComputer(server, stack);
+            if (computer != null) computer.getBrain().setUpgrade(getUpgradeWithData(stack));
+        }
+    }
+
     public ComputerFamily getFamily() {
         return family;
     }

projects/common/src/main/java/dan200/computercraft/shared/turtle/apis/TurtleAPI.java

@@ -47,18 +47,24 @@ import java.util.Optional;
  * <p>
  * ## Turtle upgrades
  * While a normal turtle can move about the world and place blocks, its functionality is limited. Thankfully, turtles
- * can be upgraded with *tools* and [peripherals][`peripheral`]. Turtles have two upgrade slots, one on the left and right
- * sides. Upgrades can be equipped by crafting a turtle with the upgrade, or calling the [`turtle.equipLeft`]/[`turtle.equipRight`]
- * functions.
+ * can be upgraded with upgrades. Turtles have two upgrade slots, one on the left and right sides. Upgrades can be
+ * equipped by crafting a turtle with the upgrade, or calling the [`turtle.equipLeft`]/[`turtle.equipRight`] functions.
  * <p>
- * Turtle tools allow you to break blocks ([`turtle.dig`]) and attack entities ([`turtle.attack`]). Some tools are more
- * suitable to a task than others. For instance, a diamond pickaxe can break every block, while a sword does more
- * damage. Other tools have more niche use-cases, for instance hoes can til dirt.
+ * By default, any diamond tool may be used as an upgrade (though more may be added with [datapacks]). The diamond
+ * pickaxe may be used to break blocks (with [`turtle.dig`]), while the sword can attack entities ([`turtle.attack`]).
+ * Other tools have more niche use-cases, for instance hoes can til dirt.
  * <p>
- * Peripherals (such as the [wireless modem][`modem`] or [`speaker`]) can also be equipped as upgrades. These are then
- * accessible by accessing the `"left"` or `"right"` peripheral.
+ * Some peripherals (namely [speakers][`speaker`] and Ender and Wireless [modems][`modem`]) can also be equipped as
+ * upgrades. These are then accessible by accessing the `"left"` or `"right"` peripheral.
+ * <p>
+ * ## Recipes
+ * <div class="recipe-container">
+ *  <mc-recipe recipe="computercraft:turtle_normal"></mc-recipe>
+ *  <mc-recipe recipe="computercraft:turtle_advanced"></mc-recipe>
+ * </div>
  * <p>
  * [Turtle Graphics]: https://en.wikipedia.org/wiki/Turtle_graphics "Turtle graphics"
+ * [datapacks]: https://datapacks.madefor.cc ""
  *
  * @cc.module turtle
  * @cc.since 1.3
@@ -345,7 +351,7 @@ public class TurtleAPI implements ILuaAPI {
      * For instance, if a slot contains 13 blocks of dirt, it has room for another 51.
      *
      * @param slot The slot we wish to check. Defaults to the {@link #select selected slot}.
-     * @return The space left in in this slot.
+     * @return The space left in this slot.
      * @throws LuaException If the slot is out of range.
      */
     @LuaFunction

projects/common/src/main/java/dan200/computercraft/shared/turtle/blocks/TurtleBlock.java

@@ -129,11 +129,24 @@ public class TurtleBlock extends AbstractComputerBlock<TurtleBlockEntity> implem
     protected final void onRemove(BlockState state, Level level, BlockPos pos, BlockState newState, boolean isMoving) {
         if (state.is(newState.getBlock())) return;
 
-        if (!level.isClientSide && level.getBlockEntity(pos) instanceof TurtleBlockEntity turtle && !turtle.hasMoved()) {
-            Containers.dropContents(level, pos, turtle);
-        }
+        // Most blocks drop items and then remove the BE. However, if a turtle is consuming drops right now, that can
+        // lead to loops where it tries to insert an item back into the inventory. To prevent this, take a reference to
+        // the turtle BE now, remove it, and then drop the items.
+        var turtle = !level.isClientSide && level.getBlockEntity(pos) instanceof TurtleBlockEntity t && !t.hasMoved()
+            ? t : null;
 
         super.onRemove(state, level, pos, newState, isMoving);
+
+        if (turtle != null) Containers.dropContents(level, pos, turtle);
+    }
+
+    @Override
+    public void setPlacedBy(Level level, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) {
+        super.setPlacedBy(level, pos, state, entity, stack);
+
+        if (!level.isClientSide && level.getBlockEntity(pos) instanceof TurtleBlockEntity turtle && entity instanceof Player player) {
+            turtle.setOwningPlayer(player.getGameProfile());
+        }
     }
 
     @Override

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

@@ -26,6 +26,7 @@ public class TurtleCraftCommand implements TurtleCommand {
 
         // Store or drop any remainders
         for (var stack : results) TurtleUtil.storeItemOrDrop(turtle, stack);
+        turtle.getInventory().setChanged();
 
         if (!results.isEmpty()) turtle.playAnimation(TurtleAnimation.WAIT);
         return TurtleCommandResult.success();

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

@@ -5,9 +5,7 @@
 package dan200.computercraft.shared.turtle.upgrades;
 
 import dan200.computercraft.api.turtle.ITurtleAccess;
-import dan200.computercraft.shared.platform.PlatformHelper;
 import dan200.computercraft.shared.turtle.blocks.TurtleBlockEntity;
-import dan200.computercraft.shared.turtle.core.TurtlePlayer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.Container;
 import net.minecraft.world.item.ItemStack;
@@ -82,18 +80,15 @@ public final class TurtleInventoryCrafting {
         var xStart = candidate.xStart();
         var yStart = candidate.yStart();
 
-        var player = TurtlePlayer.get(turtle).player();
-
         var results = new ArrayList<ItemStack>();
         for (var i = 0; i < maxCount && recipe.matches(input, level); i++) {
             var result = recipe.assemble(input, level.registryAccess());
             if (result.isEmpty()) break;
             results.add(result);
 
-            result.onCraftedBy(level, player, result.getCount());
-            PlatformHelper.get().onItemCrafted(player, input, result);
+            result.onCraftedBySystem(level);
 
-            var remainders = PlatformHelper.get().getRecipeRemainingItems(player, recipe, input);
+            var remainders = recipe.getRemainingItems(input);
             for (var y = 0; y < input.height(); y++) {
                 for (var x = 0; x < input.width(); x++) {
                     var slot = xStart + x + (y + yStart) * TurtleBlockEntity.INVENTORY_WIDTH;
@@ -110,10 +105,9 @@ public final class TurtleInventoryCrafting {
                     // Either update the current stack or add it to the remainder list (to be inserted into the inventory
                     // afterwards).
                     if (existing.isEmpty()) {
-                        inventory.setItem(slot, existing);
-                    } else if (ItemStack.isSameItemSameComponents(existing, remainder)) {
-                        remainder.grow(existing.getCount());
                         inventory.setItem(slot, remainder);
+                    } else if (ItemStack.isSameItemSameComponents(existing, remainder)) {
+                        existing.grow(remainder.getCount());
                     } else {
                         results.add(remainder);
                     }

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

@@ -48,7 +48,7 @@ public class ComponentizationFixers {
 
     private static final Set<String> DYEABLE = Stream.concat(
         Stream.of(TURTLES, POCKET_COMPUTERS).flatMap(Set::stream),
-        Stream.of(DISK, TREASURE_DISK)
+        Stream.of(DISK)
     ).collect(Collectors.toUnmodifiableSet());
 
     /**
@@ -62,13 +62,7 @@ public class ComponentizationFixers {
         if (item.is(ALL_COMPUTERS)) item.moveTagToComponent("ComputerId", "computercraft:computer_id");
 
         // Set dyed colour
-        if (item.is(DYEABLE)) {
-            item.removeTag("Color").asNumber().result().map(Number::intValue).ifPresent(col ->
-                item.setComponent("minecraft:dyed_color", ops.emptyMap()
-                    .set("rgb", ops.createInt(col))
-                    .set("show_in_tooltip", ops.createBoolean(false))
-                ));
-        }
+        if (item.is(DYEABLE)) moveColourToComponent(item, ops, "Color");
 
         if (item.is(POCKET_COMPUTERS)) {
             item.moveTagToComponent("On", "computercraft:on");
@@ -89,7 +83,7 @@ public class ComponentizationFixers {
             moveUpgradeToComponent(item, ops, "RightUpgrade", "RightUpgradeNbt", "computercraft:right_turtle_upgrade");
         }
 
-        if (item.is(DISK)) item.moveTagToComponent("DiskId", "computercraft:disk");
+        if (item.is(DISK)) item.moveTagToComponent("DiskId", "computercraft:disk_id");
 
         if (item.is(TREASURE_DISK)) {
             var name = item.removeTag("Title").asString().result();
@@ -99,6 +93,8 @@ public class ComponentizationFixers {
                     .set("name", ops.createString(name.get()))
                     .set("path", ops.createString(path.get())));
             }
+
+            moveColourToComponent(item, ops, "Colour");
         }
 
         if (item.is(PRINTOUTS)) movePrintoutToComponent(item, ops);
@@ -111,6 +107,14 @@ public class ComponentizationFixers {
         data.setComponent(component, createUpgradeData(ops, upgrade, data.removeTag(dataKey)));
     }
 
+    private static void moveColourToComponent(ItemStackComponentizationFix.ItemStackData item, Dynamic<?> ops, String key) {
+        item.removeTag(key).asNumber().result().map(Number::intValue).ifPresent(col ->
+            item.setComponent("minecraft:dyed_color", ops.emptyMap()
+                .set("rgb", ops.createInt(col))
+                .set("show_in_tooltip", ops.createBoolean(false))
+            ));
+    }
+
     /**
      * Move printout data to a component.
      *

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

@@ -9,9 +9,12 @@ import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.Container;
 import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.EntityHitResult;
 import net.minecraft.world.phys.Vec3;
 
@@ -35,6 +38,28 @@ public final class InventoryUtil {
         };
     }
 
+    /**
+     * Map a slot inside a player's compartment to a slot in the full player's inventory.
+     * <p>
+     * {@link Inventory#tick()} passes in a slot to {@link Item#inventoryTick(ItemStack, Level, Entity, int, boolean)}.
+     * However, this slot corresponds to the index within the current compartment (items, armour, offhand) and not
+     * the actual slot.
+     * <p>
+     * This method searches the relevant compartments (inventory and offhand, skipping armour) for the stack, returning
+     * its slot if found.
+     *
+     * @param player The player holding the item.
+     * @param slot   The slot inside the compartment.
+     * @param stack  The stack being ticked.
+     * @return The inventory slot, or {@code -1} if the item could not be found in the inventory.
+     */
+    public static int getInventorySlotFromCompartment(Player player, int slot, ItemStack stack) {
+        if (stack.isEmpty()) throw new IllegalArgumentException("Cannot search for empty stack");
+        if (player.getInventory().getItem(slot) == stack) return slot;
+        if (player.getInventory().getItem(Inventory.SLOT_OFFHAND) == stack) return Inventory.SLOT_OFFHAND;
+        return -1;
+    }
+
     public static @Nullable Container getEntityContainer(ServerLevel level, BlockPos pos, Direction side) {
         var vecStart = new Vec3(
             pos.getX() + 0.5 + 0.6 * side.getStepX(),

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

@@ -109,8 +109,9 @@ public final class TickScheduler {
             return State.UNLOADED;
         } else {
             // This should be impossible: either the block entity is at the above position, or it has been removed.
-            if (level.getBlockEntity(pos) != blockEntity) {
-                throw new IllegalStateException("Expected " + blockEntity + " at " + pos);
+            var currentBlockEntity = level.getBlockEntity(pos);
+            if (currentBlockEntity != blockEntity) {
+                throw new IllegalStateException("Expected " + blockEntity + " at " + pos + ", got " + currentBlockEntity);
             }
 
             // Otherwise schedule a tick and remove it from the queue.

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

@@ -32,8 +32,6 @@
     "commands.computercraft.generic.additional_rows": "%d řádků navíc…",
     "commands.computercraft.generic.exception": "Neočekávaná chyba (%s)",
     "commands.computercraft.generic.no": "N",
-    "commands.computercraft.generic.no_position": "<žádná pozice>",
-    "commands.computercraft.generic.position": "%s, %s, %s",
     "commands.computercraft.generic.yes": "A",
     "commands.computercraft.help.desc": "Ukáže tuto pomocnou zprávu",
     "commands.computercraft.help.no_children": "%s nemá žádné podpříkazy",
@@ -98,6 +96,7 @@
     "gui.computercraft.config.http.max_requests.tooltip": "Počet HTTP požadavků které počítač může udělat v jedné chvíli. Požadavky navíc\nbudou zaslány do fronty, a poslány když běžící požadavky byly dokončeny. Nastav\nna 0 pro neomezeno.\nRozsah: > 0",
     "gui.computercraft.config.http.max_websockets": "Maximální souběžné websockety",
     "gui.computercraft.config.http.max_websockets.tooltip": "Počet websocketů které může mít počítač otevřené najednou: Nastav na 0 pro neomezeno.\nRozsah: > 1",
+    "gui.computercraft.config.http.proxy": "Proxy",
     "gui.computercraft.config.http.proxy.host": "Název hostitele",
     "gui.computercraft.config.http.proxy.host.tooltip": "Název hostitele nebo IP adresa proxy serveru.",
     "gui.computercraft.config.http.proxy.port": "Port",
@@ -164,6 +163,7 @@
     "gui.computercraft.config.turtle.normal_fuel_limit.tooltip": "Limit paliva pro roboty.\nRozsah: > 0",
     "gui.computercraft.config.turtle.tooltip": "Různé možnosti o robotech.",
     "gui.computercraft.config.upload_max_size": "Limit velikosti nahrávaného souboru (v bajtech)",
+    "gui.computercraft.config.upload_max_size.tooltip": "Limit velikosti nahrávaného souboru v bytech. Musí být v rozmezí od 1 KiB do 16 MiB.\nMěj na paměti, že nahrávání souborů je zpracováváno v jednom ticku - velké soubory nebo\nšpatný výkon sítě mohou zpomalit síťové vlákno. A nezapomeň na místo na disku!\nRozsah: 1024 ~ 16777216",
     "gui.computercraft.config.upload_nag_delay": "Nahrání zpoždění nag",
     "gui.computercraft.config.upload_nag_delay.tooltip": "Zpoždění v sekundách po kterém oznámíme o nezpracovaných importech. Nastav na 0 pro vypnutí.\nRozsah: 0 ~ 60",
     "gui.computercraft.pocket_computer_overlay": "Kapesní počítač otevřen. Zmáčkni ESC pro uzavření.",
@@ -195,6 +195,10 @@
     "item.computercraft.printed_pages": "Tisknuté stránky",
     "item.computercraft.treasure_disk": "Disketa",
     "itemGroup.computercraft": "ComputerCraft",
+    "tag.item.computercraft.computer": "Počítače",
+    "tag.item.computercraft.monitor": "Monitory",
+    "tag.item.computercraft.turtle": "Roboti",
+    "tag.item.computercraft.wired_modem": "Drátové modemy",
     "tracking_field.computercraft.avg": "%s (průměr)",
     "tracking_field.computercraft.computer_tasks.name": "Úlohy",
     "tracking_field.computercraft.count": "%s (počet)",
@@ -216,11 +220,5 @@
     "upgrade.minecraft.diamond_hoe.adjective": "Farmářský",
     "upgrade.minecraft.diamond_pickaxe.adjective": "Těžební",
     "upgrade.minecraft.diamond_shovel.adjective": "Kopací",
-    "upgrade.minecraft.diamond_sword.adjective": "Bojový",
-    "tag.item.computercraft.computer": "Počítače",
-    "tag.item.computercraft.monitor": "Monitory",
-    "tag.item.computercraft.turtle": "Roboti",
-    "tag.item.computercraft.wired_modem": "Drátové modemy",
-    "gui.computercraft.config.http.proxy": "Proxy",
-    "gui.computercraft.config.upload_max_size.tooltip": "Limit velikosti nahrávaného souboru v bytech. Musí být v rozmezí od 1 KiB do 16 MiB.\nMěj na paměti, že nahrávání souborů je zpracováváno v jednom ticku - velké soubory nebo\nšpatný výkon sítě mohou zpomalit síťové vlákno. A nezapomeň na místo na disku!\nRozsah: 1024 ~ 16777216"
+    "upgrade.minecraft.diamond_sword.adjective": "Bojový"
 }

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

@@ -1,8 +1,13 @@
 {
     "argument.computercraft.argument_expected": "Parameter erwartet",
+    "argument.computercraft.computer.family": "Computer familie",
+    "argument.computercraft.computer.id": "Computer ID",
+    "argument.computercraft.computer.instance": "einzigartige Instanz ID",
+    "argument.computercraft.computer.label": "Computer name",
     "argument.computercraft.computer.many_matching": "Mehrere Computer passen auf '%s' (Instanzen %s)",
     "argument.computercraft.computer.no_matching": "Kein Computer passt auf '%s'",
     "argument.computercraft.tracking_field.no_field": "Unbekanntes Feld '%s'",
+    "argument.computercraft.unknown_computer_family": "Unbekannte computer familie '%s'",
     "block.computercraft.cable": "Netzwerkkabel",
     "block.computercraft.computer_advanced": "Erweiterter Computer",
     "block.computercraft.computer_command": "Befehlscomputer",
@@ -32,8 +37,6 @@
     "commands.computercraft.generic.additional_rows": "%d zusätzliche Zeilen…",
     "commands.computercraft.generic.exception": "Unbehandelte Ausnahme (%s)",
     "commands.computercraft.generic.no": "N",
-    "commands.computercraft.generic.no_position": "<Keine Position>",
-    "commands.computercraft.generic.position": "%s, %s, %s",
     "commands.computercraft.generic.yes": "J",
     "commands.computercraft.help.desc": "Zeigt diese Hilfe Nachricht",
     "commands.computercraft.help.no_children": "%s hat keine Unterbefehle",
@@ -82,8 +85,16 @@
     "gui.computercraft.config.execution.max_main_computer_time": "Computer Servertick Zeitlimit",
     "gui.computercraft.config.execution.max_main_computer_time.tooltip": "Die ideale maximale Zeit, in der ein Computer laufen kann im innerhalb von einem tick in Millisekunden.\nBeachte, dass wir wahrscheinlich über diesen Limit gehen werden, da es unmöglich ist zu bestimmen,\nwie lange ein Computer brauchen wird. Dies wird also die höhere Grenze der durchschnittlichen Zeit darstellen.\nBereich: > 1",
     "gui.computercraft.config.execution.max_main_global_time": "Globales Servertick Zeitlimit",
+    "gui.computercraft.config.execution.max_main_global_time.tooltip": "Die maximale Zeit in millisekunden, in der Aufgaben ausgeführt werden.\nAnmerkung: Diese Zeit wird höchstwarscheinlich überschritten und dient nur als ungefähre Grenze.\nLimit: > 1",
     "gui.computercraft.config.floppy_space_limit": "Speicherplatz von Disketten (Bytes)",
+    "gui.computercraft.config.floppy_space_limit.tooltip": "Die maximale Dateisystem Größe von Disketten (in bytes).",
     "gui.computercraft.config.http": "HTTP",
+    "gui.computercraft.config.http.bandwidth": "Bandbreite",
+    "gui.computercraft.config.http.bandwidth.global_download": "Globales download limit",
+    "gui.computercraft.config.http.bandwidth.global_download.tooltip": "Die maximale Geschwindigkeit aller Computer in bytes/s mit der Heruntergeladen werden kann.\nBereich: > 1",
+    "gui.computercraft.config.http.bandwidth.global_upload": "Globales upload limit",
+    "gui.computercraft.config.http.bandwidth.global_upload.tooltip": "Die maximale Hochladungs Geschwindigkeit aller Computer in bytes/s.\nBereich: > 1",
+    "gui.computercraft.config.http.bandwidth.tooltip": "Limitiert die Bandbreite der Computer.",
     "gui.computercraft.config.http.enabled": "HTTP-API aktivieren",
     "gui.computercraft.config.http.max_requests": "Maximale Anzahl gleichzeitiger Anfragen",
     "gui.computercraft.config.http.max_websockets": "Maximale Anzahl gleichzeitiger Websockets",
@@ -130,18 +141,5 @@
     "upgrade.minecraft.diamond_hoe.adjective": "Ackerbau",
     "upgrade.minecraft.diamond_pickaxe.adjective": "Bergbau",
     "upgrade.minecraft.diamond_shovel.adjective": "Graben",
-    "upgrade.minecraft.diamond_sword.adjective": "Nahkampf",
-    "argument.computercraft.computer.id": "Computer ID",
-    "argument.computercraft.computer.instance": "einzigartige Instanz ID",
-    "argument.computercraft.computer.label": "Computer name",
-    "argument.computercraft.unknown_computer_family": "Unbekannte computer familie '%s'",
-    "gui.computercraft.config.floppy_space_limit.tooltip": "Die maximale Dateisystem Größe von Disketten (in bytes).",
-    "gui.computercraft.config.http.bandwidth": "Bandbreite",
-    "gui.computercraft.config.http.bandwidth.global_upload": "Globales upload limit",
-    "gui.computercraft.config.http.bandwidth.global_download.tooltip": "Die maximale Geschwindigkeit aller Computer in bytes/s mit der Heruntergeladen werden kann.\nBereich: > 1",
-    "gui.computercraft.config.http.bandwidth.global_download": "Globales download limit",
-    "gui.computercraft.config.http.bandwidth.tooltip": "Limitiert die Bandbreite der Computer.",
-    "argument.computercraft.computer.family": "Computer familie",
-    "gui.computercraft.config.execution.max_main_global_time.tooltip": "Die maximale Zeit in millisekunden, in der Aufgaben ausgeführt werden.\nAnmerkung: Diese Zeit wird höchstwarscheinlich überschritten und dient nur als ungefähre Grenze.\nLimit: > 1",
-    "gui.computercraft.config.http.bandwidth.global_upload.tooltip": "Die maximale Hochladungs Geschwindigkeit aller Computer in bytes/s.\nBereich: > 1"
+    "upgrade.minecraft.diamond_sword.adjective": "Nahkampf"
 }

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

@@ -1,6 +1,14 @@
 {
     "argument.computercraft.argument_expected": "Argumento esperado",
+    "argument.computercraft.computer.distance": "Distancia a entidad",
+    "argument.computercraft.computer.family": "Familia de computadoras",
+    "argument.computercraft.computer.id": "ID de la computadora",
+    "argument.computercraft.computer.instance": "ID de instancia único",
+    "argument.computercraft.computer.label": "Etiqueta de la computadora",
     "argument.computercraft.computer.many_matching": "Varias computadoras que coinciden con ' %s' (instancias %s)",
+    "argument.computercraft.computer.no_matching": "No hay ordenadores que coincidan con '%s'",
+    "argument.computercraft.tracking_field.no_field": "Campo desconocido '%s'",
+    "argument.computercraft.unknown_computer_family": "Familia de ordenadores desconocida '%s'",
     "block.computercraft.cable": "Cable de red",
     "block.computercraft.computer_advanced": "Ordenador avanzado",
     "block.computercraft.computer_command": "Ordenador de Comandos",
@@ -22,31 +30,167 @@
     "block.computercraft.wireless_modem_normal": "Módem sin cables",
     "chat.computercraft.wired_modem.peripheral_connected": "El periférico \"%s\" se conectó a la red",
     "chat.computercraft.wired_modem.peripheral_disconnected": "El periférico \"%s\" se desconectó de la red",
+    "commands.computercraft.desc": "El comando /computercraft proporciona varias herramientas de depuración y administración para controlar e interactuar con computadoras.",
+    "commands.computercraft.dump.action": "Ver más info acerca de esta computadora",
+    "commands.computercraft.dump.desc": "Muestra el estado de todas las computadoras o información específica sobre una computadora. Puedes especificar el id de instancia de la computadora (ej. 123), el id de la computadora (ej. #123) o su etiqueta (ej. \"@Mi computadora\").",
+    "commands.computercraft.dump.open_path": "Ver los archivos de esta computadora",
+    "commands.computercraft.dump.synopsis": "Mostrar el estado de las computadoras.",
     "commands.computercraft.generic.additional_rows": "%d filas adicionales…",
+    "commands.computercraft.generic.exception": "Excepción no controlada (%s)",
     "commands.computercraft.generic.no": "N",
-    "commands.computercraft.generic.no_position": "<sin pos>",
-    "commands.computercraft.generic.position": "%s, %s, %s",
     "commands.computercraft.generic.yes": "Y",
     "commands.computercraft.help.desc": "Muestra este mensaje de ayuda",
+    "commands.computercraft.help.no_children": "%s no tiene sub-comandos",
     "commands.computercraft.help.no_command": "Sin comando '%s'",
+    "commands.computercraft.help.synopsis": "Provee ayuda para un comando específico",
+    "commands.computercraft.queue.desc": "Envía un evento computer_command a un ordenador de comandos, pasándole los argumentos adicionales. Esto está diseñado principalmente para los map makers, actuando como una versión más amigable con el ordenador de /trigger. Cualquier jugador puede ejecutar el comando, lo que probablemente se haría a través de un evento de clic de un componente de texto.",
+    "commands.computercraft.queue.synopsis": "Envía un evento computer_command a un ordenador de comandos",
+    "commands.computercraft.shutdown.desc": "Apagar las computadoras listadas o todas si ninguna se especifica. Puedes especificar el id de la instancia de la computadora (ej. 123), el id de la computadora (ej. #123) o la etiqueta (ej. \"@Mi Computadora\").",
     "commands.computercraft.shutdown.done": "Apague %s/%s computadoras",
     "commands.computercraft.shutdown.synopsis": "Apague las computadoras de forma remota.",
+    "commands.computercraft.synopsis": "Varios comandos para controlar computadoras.",
+    "commands.computercraft.tp.action": "Teletransportarse a esta computadora",
+    "commands.computercraft.tp.desc": "Teletransportarse a la ubicación de una computadora. Puedes especificar tanto el id de la instancia de la computadora (ej. 123) o el id de la computadora (ej. #123).",
+    "commands.computercraft.tp.synopsis": "Teletransportarse a una computadora específica.",
+    "commands.computercraft.track.desc": "Seguimiento de qué tanto se ejecutan las computadoras, y también cuántos eventos manejan. Esto presenta información en una manera similar a /forge track y puede ser útil para diagnosticar lag.",
+    "commands.computercraft.track.dump.computer": "Computadora",
+    "commands.computercraft.track.dump.desc": "Volcar los últimos resultados del seguimiento de computadoras.",
+    "commands.computercraft.track.dump.no_timings": "No hay temporizaciones disponibles",
+    "commands.computercraft.track.dump.synopsis": "Volcar los últimos resultados de seguimiento",
+    "commands.computercraft.track.start.desc": "Comenzar el seguimiento de todos los tiempos y conteo de eventos de las computadoras. Esto va a descartar los resultados de ejecuciones previas.",
+    "commands.computercraft.track.start.stop": "Ejecute %s para detener el seguimiento y ver los resultados",
+    "commands.computercraft.track.start.synopsis": "Comenzar el seguimiento de todas las computadoras",
+    "commands.computercraft.track.stop.action": "Clic para detener el seguimiento",
+    "commands.computercraft.track.stop.desc": "Detener el seguimiento de todos los eventos y tiempos de ejecución de las computadoras",
+    "commands.computercraft.track.stop.not_enabled": "Actualmente no hay computadoras en seguimiento",
+    "commands.computercraft.track.stop.synopsis": "Dejar de seguir a todas las computadoras",
+    "commands.computercraft.track.synopsis": "Seguimiento de tiempos de ejecución para computadoras.",
+    "commands.computercraft.turn_on.desc": "Encender las computadoras listadas. Puedes especificar el id de la instancia de la computadora (ej. 123), el id de la computadora (ej. #123) o la etiqueta (ej. \"@Mi computadora\").",
+    "commands.computercraft.turn_on.done": "Encendidas %s/%s computadoras",
+    "commands.computercraft.turn_on.synopsis": "Encender computadoras remotamente.",
+    "commands.computercraft.view.action": "Ver esta computadora",
+    "commands.computercraft.view.desc": "Abrir la terminal de una computadora, permitiendo el control remoto de esta. Esto no proporciona acceso al inventario de tortugas. Puede tanto especificar el Id de instancia de la computadora (ej. 123) o el Id de la computadora (ej. #123).",
+    "commands.computercraft.view.not_player": "No se puede abrir la terminal para un no-jugador",
+    "commands.computercraft.view.synopsis": "Ver la terminal de una computadora",
+    "gui.computercraft.config.command_require_creative": "Las computadoras de comando requieren creativo",
+    "gui.computercraft.config.command_require_creative.tooltip": "Requiere que los jugadores estén en modo creativo y sean operadores para\ninteractuar con las computadoras de comandos. Este es el comportamiento\npredeterminado para los bloques de comandos en vanilla.",
     "gui.computercraft.config.computer_space_limit": "Límite de memoria de ordenadores (en bytes)",
+    "gui.computercraft.config.computer_space_limit.tooltip": "Límite de espacio en disco para computadoras y tortugas, en bytes.",
     "gui.computercraft.config.default_computer_settings": "Configuración de Ordenador por defecto",
+    "gui.computercraft.config.default_computer_settings.tooltip": "Una lista separada por comas de los ajustes predeterminados para establecer en nuevas computadoras.\nEjemplo: \"shell.autocomplete=false,lua.autocomplete=false,edit.autocomplete=false\"\ndeshabilitará todo el autocompletado.",
+    "gui.computercraft.config.disabled_generic_methods": "Métodos genéricos desactivados",
+    "gui.computercraft.config.disabled_generic_methods.tooltip": "Una lista de métodos genéricos o métodos de fuente para deshabilitar. Los\nmétodos genéricos son métodos añadidos a un bloque/block entity cuando no hay\nun proveedor de periférico explícito. Esto incluye métodos de inventario (ej.\ninventory.getItemDetail, inventory.pushItems), y (si está en Forge), los\nmétodos fluid_storage y energy_storage.\nLos métodos en esta lista pueden ser tanto un grupo entero de métodos\n(computercraft:inventory) o un método en particular\n(computercraft:inventory#pushItems).\n",
+    "gui.computercraft.config.execution": "Ejecución",
+    "gui.computercraft.config.execution.computer_threads": "Hilos de la computadora",
+    "gui.computercraft.config.execution.computer_threads.tooltip": "Establece el número de hilos en los que las computadoras pueden correr. Un número\nmás alto significa que más computadoras pueden ejecutarse a la vez, pero podrían\ninducir lag. Ten en cuenta que algunos mods podrían no funcionar con un número de\nhilos mayor a 1. Usar con precaución.\nRango: > 1",
+    "gui.computercraft.config.execution.max_main_computer_time": "Límite de tiempo de la computadora en un tick del servidor",
+    "gui.computercraft.config.execution.max_main_global_time": "Límite de tiempo global en un tick del servidor",
+    "gui.computercraft.config.execution.tooltip": "Controla el comportamiento de ejecución de las computadoras. Esto es\nen gran medida destinado al control fino para servidores, y generalmente no\ndebería ser cambiado.",
     "gui.computercraft.config.floppy_space_limit": "Límite de memoria de disquetes (en bytes)",
+    "gui.computercraft.config.floppy_space_limit.tooltip": "El límite de espacio en disco para los disquetes, en bytes.",
+    "gui.computercraft.config.http": "HTTP",
+    "gui.computercraft.config.http.bandwidth": "Ancho de banda",
+    "gui.computercraft.config.http.bandwidth.global_download": "Límite de descarga global",
+    "gui.computercraft.config.http.bandwidth.global_download.tooltip": "El número de bytes que se pueden descargar por segundo. Esto es compartido para todas las computadoras. (bytes/s).\nRango: > 1",
+    "gui.computercraft.config.http.bandwidth.global_upload": "Límite de subida global",
+    "gui.computercraft.config.http.bandwidth.global_upload.tooltip": "El número de bytes que se pueden subir por segundo. Esto es compartido para todas las computadoras. (bytes/s).\nRango: > 1",
+    "gui.computercraft.config.http.bandwidth.tooltip": "Limita el ancho de banda usado por las computadoras.",
     "gui.computercraft.config.http.enabled": "Habilitar API de HTTP",
+    "gui.computercraft.config.http.enabled.tooltip": "Habilitar la API \"http\" en computadoras. Deshabilitar esto también desactiva los\nprogramas \"pastebin\" y \"wget\", los cuales muchos usuarios dependen. Se recomienda\ndejar esto encendido y usar la opción \"reglas\" en configuración para imponer un\ncontrol más fino.",
+    "gui.computercraft.config.http.max_requests": "Máximo de solicitudes simultáneas",
+    "gui.computercraft.config.http.max_requests.tooltip": "El número de solicitudes http que un equipo puede hacer a la vez. Las solicitudes\nadicionales se pondrán en cola, y se enviarán cuando las solicitudes en ejecución\nhayan finalizado. Establezca 0 para ilimitado.\nRango: > 0",
+    "gui.computercraft.config.http.max_websockets": "Máximos websockets concurrentes",
+    "gui.computercraft.config.http.max_websockets.tooltip": "El número de websockets que una computadora puede tener abierto\nen el mismo momento.\nRango: > 1",
+    "gui.computercraft.config.http.proxy": "Proxy",
+    "gui.computercraft.config.http.proxy.host": "Nombre del host",
+    "gui.computercraft.config.http.proxy.host.tooltip": "El nombre del host o la dirección IP del servidor proxy.",
+    "gui.computercraft.config.http.proxy.port": "Puerto",
+    "gui.computercraft.config.http.proxy.port.tooltip": "El puerto del servidor proxy.\nRango: 1 ~ 65536",
+    "gui.computercraft.config.http.proxy.tooltip": "Pasa los pedidos HTTP y websocket a través de un servidor proxy. Solo afecta a las\nreglas HTTP con \"use_proxy\" puesto en verdadero (falso por defecto).\nSi se requiere autenticación para el proxy, crea un archivo\n\"computercraft-proxy.pw\" en la misma carpeta que se encuentra\n\"computercraft-server.toml\", conteniendo el nombre de usuario y contraseña\nseparada por dos puntos, por ejemplo: \"miusuario:micontraseña\". Para proxys\nSOCKS4 solo se requiere el nombre de usuario.",
+    "gui.computercraft.config.http.proxy.type": "Tipo de proxy",
+    "gui.computercraft.config.http.proxy.type.tooltip": "El tipo de proxy a utilizar.\nValores permitidos: HTTP, HTTPS, SOCKS4, SOCKS5",
+    "gui.computercraft.config.http.rules": "Reglas de permitir/denegar",
+    "gui.computercraft.config.http.rules.tooltip": "Una lista de reglas que controlan el comportamiento de la API \"http\" para dominios\nespecíficos o IPs. Cada regla aplica a un hostname y un puerto opcional, y luego\nestablece varias propiedades para el pedido. Las reglas son evaluadas en orden,\nlo que quiere decir que las reglas primeras sobreescriben a las de después.\n\nPropiedades válidas:\n - \"host\" (requerido): El dominio o dirección IP con el que la regla va a operar.\n   Este puede ser nombre de dominio (\"pastebin.com\"), wildcard (\"*.pastebin.com\")\n   o notación CIDR (\"127.0.0.0/8\").\n - \"port\" (opcional): Solo aplicar a pedidos para un puerto específico, como 80\n   o 443.\n - \"action\" (opcional): Permitir o denegar este pedido.\n - \"max_download\" (opcional): El tamaño máximo (en bytes) que una computadora \n   puede descargar en este pedido.\n - \"max_upload\" (opcional): El tamaño máximo (en bytes) que una computadora puede\n   subir en este pedido.\n - \"max_websocket_message\" (opcional): El tamaño máximo (en bytes) que una\n   computadora puede enviar en un paquete websocket.\n - \"use_proxy\" (opcional): Habilitar el uso de el proxy HTTP/SOCKS si está\n   configurado.",
+    "gui.computercraft.config.http.tooltip": "Controla la API HTTP",
+    "gui.computercraft.config.http.websocket_enabled": "Habilitar websockets",
+    "gui.computercraft.config.http.websocket_enabled.tooltip": "Habilita el uso de websockets http. Esto requiere que la opción \"http_enable\" sea verdadera.",
     "gui.computercraft.config.log_computer_errors": "Grabar errores periféricos",
+    "gui.computercraft.config.log_computer_errors.tooltip": "Registra excepciones lanzadas por los periféricos y otros objetos de Lua. Esto facilita\ndepurar problemas para los autores de mods, pero puede resultar en spam en el\nregistro si la gente utiliza métodos con errores potenciales.",
     "gui.computercraft.config.maximum_open_files": "Archivos abiertos máximos por cada ordenador",
+    "gui.computercraft.config.maximum_open_files.tooltip": "Establece cuántos archivos puede tener abiertos una computadora al mismo tiempo. Establezca 0 para ilimitados.\nRango: > 0",
+    "gui.computercraft.config.monitor_distance": "Distancia al monitor",
+    "gui.computercraft.config.monitor_distance.tooltip": "La distancia máxima a la que los monitores se renderizarán. El valor\npredeterminado es el límite de los tile entities, pero puede ser extendido si quieres\nconstruir monitores más grandes.\nRango: 16 ~ 1024",
+    "gui.computercraft.config.monitor_renderer": "Renderizador del monitor",
+    "gui.computercraft.config.monitor_renderer.tooltip": "El renderizador a usar en monitores. Generalmente esto debe estar en \"BEST\"\n(mejor) - si los monitores tienen problemas de rendimiento, podrías querer\nexperimentar con renderizadores alternativos.\nValores permitidos: BEST, TBO, VBO",
+    "gui.computercraft.config.peripheral": "Periféricos",
     "gui.computercraft.config.peripheral.command_block_enabled": "Habilitar bloque de comandos periférico",
+    "gui.computercraft.config.peripheral.command_block_enabled.tooltip": "Habilitar soporte del periférico Bloque de Comandos",
     "gui.computercraft.config.peripheral.max_notes_per_tick": "Notas máximas que un ordenador puede tocar a la vez",
+    "gui.computercraft.config.peripheral.max_notes_per_tick.tooltip": "Cantidad máxima de notas que un parlante puede reproducir a la vez.\nRango: > 1",
     "gui.computercraft.config.peripheral.modem_high_altitude_range": "Rango del módem (en altitud)",
+    "gui.computercraft.config.peripheral.modem_high_altitude_range.tooltip": "El rango de los Modems inalámbricos a máxima altitud en clima despejado, en metros.\nRango: 0 ~ 100000",
     "gui.computercraft.config.peripheral.modem_high_altitude_range_during_storm": "Rango del módem (en altitud con mal tiempo)",
+    "gui.computercraft.config.peripheral.modem_high_altitude_range_during_storm.tooltip": "El rango de los Modems inalámbricos a máxima altitud durante las tormentas, en metros.\nRango: 0 ~ 100000",
     "gui.computercraft.config.peripheral.modem_range": "Rango del módem (Por defecto)",
+    "gui.computercraft.config.peripheral.modem_range.tooltip": "El rango de los Modems inalámbricos a baja altitud en clima despejado, en metros.\nRango: 0 ~ 100000",
     "gui.computercraft.config.peripheral.modem_range_during_storm": "Rango del módem (mal tiempo)",
+    "gui.computercraft.config.peripheral.modem_range_during_storm.tooltip": "El rango de los Modems inalámbricos a baja altitud durante las tormentas, en metros.\nRango: 0 ~ 100000",
+    "gui.computercraft.config.peripheral.monitor_bandwidth": "Ancho de banda del monitor",
+    "gui.computercraft.config.peripheral.monitor_bandwidth.tooltip": "El límite de datos que un monitor puede enviar *por tick* Nota:\n - El ancho de banda es medido antes de la compresión, así que los datos enviados\n   al cliente son más pequeños.\n - Esto ignora el número de jugadores a los que se les envían los paquetes.\n   Actualizar un monitor para un jugador consume lo mismo que actualizarlo para\n   20.\n - Un monitor del tamaño más grande envía ~25kb de datos. Así que el límite\n   predeterminado (1MB) permite actualizar ~40 monitores en un solo tick.\nEstablezca en 0 para desactivar.\nRango: > 0",
+    "gui.computercraft.config.peripheral.tooltip": "Varias opciones relacionadas con los periféricos.",
+    "gui.computercraft.config.term_sizes": "Tamaños de la terminal",
+    "gui.computercraft.config.term_sizes.computer": "Computadora",
+    "gui.computercraft.config.term_sizes.computer.height": "Altura de la terminal",
+    "gui.computercraft.config.term_sizes.computer.height.tooltip": "Rango: 1 ~ 255",
+    "gui.computercraft.config.term_sizes.computer.tooltip": "Tamaño de la terminal de las computadoras.",
+    "gui.computercraft.config.term_sizes.computer.width": "Ancho de la terminal",
+    "gui.computercraft.config.term_sizes.computer.width.tooltip": "Rango: 1 ~ 255",
+    "gui.computercraft.config.term_sizes.monitor": "Monitor",
+    "gui.computercraft.config.term_sizes.monitor.height": "Altura máxima del monitor",
+    "gui.computercraft.config.term_sizes.monitor.height.tooltip": "Rango: 1 ~ 32",
+    "gui.computercraft.config.term_sizes.monitor.tooltip": "Tamaño máximo de los monitores (en bloques).",
+    "gui.computercraft.config.term_sizes.monitor.width": "Anchura máxima del monitor",
+    "gui.computercraft.config.term_sizes.monitor.width.tooltip": "Rango: 1 ~ 32",
+    "gui.computercraft.config.term_sizes.pocket_computer": "Computadora de bolsillo",
+    "gui.computercraft.config.term_sizes.pocket_computer.height": "Altura de la terminal",
+    "gui.computercraft.config.term_sizes.pocket_computer.height.tooltip": "Rango: 1 ~ 255",
+    "gui.computercraft.config.term_sizes.pocket_computer.tooltip": "Tamaño de la terminal de las computadoras de bolsillo.",
+    "gui.computercraft.config.term_sizes.pocket_computer.width": "Ancho de la terminal",
+    "gui.computercraft.config.term_sizes.pocket_computer.width.tooltip": "Rango: 1 ~ 255",
+    "gui.computercraft.config.term_sizes.tooltip": "Configura el tamaño de las terminales de varias computadoras.\nTerminales más grandes requieren mayor ancho de banda, así que úselo con cuidado.",
+    "gui.computercraft.config.turtle": "Tortugas",
     "gui.computercraft.config.turtle.advanced_fuel_limit": "Límite de combustible de las tortugas avanzadas",
+    "gui.computercraft.config.turtle.advanced_fuel_limit.tooltip": "El límite de combustible para Tortugas Avanzadas.\nRango: > 0",
     "gui.computercraft.config.turtle.can_push": "Las tortugas pueden empujar entidades",
+    "gui.computercraft.config.turtle.can_push.tooltip": "Si es verdadero, las tortugas empujarán a las entidades de su camino en\nlugar de detenerse si hay espacio para hacerlo.",
     "gui.computercraft.config.turtle.need_fuel": "Habilitar combustible",
+    "gui.computercraft.config.turtle.need_fuel.tooltip": "Establece si las tortugas requieren combustible para moverse.",
     "gui.computercraft.config.turtle.normal_fuel_limit": "Límite de combustible de las tortugas",
+    "gui.computercraft.config.turtle.normal_fuel_limit.tooltip": "Límite de combustible para las Tortugas.\nRango: > 0",
+    "gui.computercraft.config.turtle.tooltip": "Varias opciones relacionadas con las tortugas.",
+    "gui.computercraft.config.upload_max_size": "Límite de tamaño del archivo subido (bytes)",
+    "gui.computercraft.config.upload_max_size.tooltip": "El límite de subida por archivo, en bytes. Debe estar en un rango de entre 1 KiB y 16 MiB.\nTen en cuenta que las subidas son procesadas en un un solo tick - archivos grandes o\nun rendimiento de internet malo puede paralizar el hilo de red. Y tamién ten en cuenta el espacio en disco!\nRango: 1024 ~ 16777216",
+    "gui.computercraft.config.upload_nag_delay": "Retraso de subida nag",
+    "gui.computercraft.config.upload_nag_delay.tooltip": "El retraso en segundos después de los cuales notificaremos las importaciones no manejadas. Establecer en 0 para deshabilitar.\nRango: 0 ~ 60",
+    "gui.computercraft.pocket_computer_overlay": "Computadora de bolsillo abierta. Pulsa ESC para cerrar.",
+    "gui.computercraft.terminal": "Terminal de la Computadora",
+    "gui.computercraft.tooltip.computer_id": "ID de la Computadora: %s",
+    "gui.computercraft.tooltip.copy": "Copiar al portapapeles",
+    "gui.computercraft.tooltip.disk_id": "ID del disquete: %s",
+    "gui.computercraft.tooltip.terminate": "Detener el código en ejecución",
+    "gui.computercraft.tooltip.terminate.key": "Mantenga Ctrl+T",
+    "gui.computercraft.tooltip.turn_off": "Apagar esta computadora",
+    "gui.computercraft.tooltip.turn_off.key": "Mantenga Ctrl+S",
+    "gui.computercraft.tooltip.turn_on": "Encender esta computadora",
+    "gui.computercraft.upload.failed": "Subida fallida",
+    "gui.computercraft.upload.failed.computer_off": "Debes encender la computadora antes de subir archivos.",
+    "gui.computercraft.upload.failed.corrupted": "Archivos corruptos al subir. Por favor, inténtelo de nuevo.",
+    "gui.computercraft.upload.failed.generic": "Error al subir archivos (%s)",
+    "gui.computercraft.upload.failed.name_too_long": "Los nombres de los archivos son demasiado largos para ser cargados.",
+    "gui.computercraft.upload.failed.too_many_files": "No se pueden subir tantos archivos.",
+    "gui.computercraft.upload.failed.too_much": "Tus archivos son demasiado grandes para ser subidos.",
+    "gui.computercraft.upload.no_response": "Transfiriendo archivos",
+    "gui.computercraft.upload.no_response.msg": "Tu computadora no ha usado tus archivos transferidos. Es posible que debas ejecutar el programa %s e intentar de nuevo.",
     "item.computercraft.disk": "Disquete",
     "item.computercraft.pocket_computer_advanced": "Ordenador de bolsillo avanzado",
     "item.computercraft.pocket_computer_advanced.upgraded": "Ordenador de bolsillo %s avanzado",
@@ -56,6 +200,25 @@
     "item.computercraft.printed_page": "Página impresa",
     "item.computercraft.printed_pages": "Páginas impresas",
     "item.computercraft.treasure_disk": "Disquete (Tesoro)",
+    "itemGroup.computercraft": "ComputerCraft",
+    "tag.item.computercraft.computer": "Computadoras",
+    "tag.item.computercraft.monitor": "Monitores",
+    "tag.item.computercraft.turtle": "Tortugas",
+    "tag.item.computercraft.wired_modem": "Módems cableados",
+    "tracking_field.computercraft.avg": "%s (promedio)",
+    "tracking_field.computercraft.computer_tasks.name": "Tareas",
+    "tracking_field.computercraft.count": "%s (cuenta)",
+    "tracking_field.computercraft.fs.name": "Operaciones del sistema de archivos",
+    "tracking_field.computercraft.http_download.name": "Descarga HTTP",
+    "tracking_field.computercraft.http_requests.name": "Peticiones HTTP",
+    "tracking_field.computercraft.http_upload.name": "Subida HTTP",
+    "tracking_field.computercraft.java_allocation.name": "Asignaciones de Java",
+    "tracking_field.computercraft.max": "%s (max)",
+    "tracking_field.computercraft.peripheral.name": "Llamadas del periférico",
+    "tracking_field.computercraft.server_tasks.name": "Tareas del servidor",
+    "tracking_field.computercraft.turtle_ops.name": "Operaciones de la Tortuga",
+    "tracking_field.computercraft.websocket_incoming.name": "Websocket entrante",
+    "tracking_field.computercraft.websocket_outgoing.name": "Websocket saliente",
     "upgrade.computercraft.speaker.adjective": "ruidosa",
     "upgrade.computercraft.wireless_modem_advanced.adjective": "ender",
     "upgrade.computercraft.wireless_modem_normal.adjective": "sin cables",

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

@@ -32,8 +32,6 @@
     "commands.computercraft.generic.additional_rows": "%d lignes supplémentaires…",
     "commands.computercraft.generic.exception": "Exception non gérée (%s)",
     "commands.computercraft.generic.no": "N",
-    "commands.computercraft.generic.no_position": "<pas de position>",
-    "commands.computercraft.generic.position": "%s, %s, %s",
     "commands.computercraft.generic.yes": "O",
     "commands.computercraft.help.desc": "Affiche ce message d'aide",
     "commands.computercraft.help.no_children": "%s n'a pas de sous-commandes",

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

@@ -1,15 +1,19 @@
 {
     "argument.computercraft.argument_expected": "È previsto un argomento",
+    "argument.computercraft.computer.distance": "Distanza dall'entità",
+    "argument.computercraft.computer.family": "Famiglia computer",
+    "argument.computercraft.computer.id": "ID computer",
+    "argument.computercraft.computer.instance": "ID istanza unica",
+    "argument.computercraft.computer.label": "Etichetta computer",
     "argument.computercraft.computer.many_matching": "Molteplici computer che combaciano con '%s' (istanze %s)",
     "argument.computercraft.computer.no_matching": "Nessun computer che combacia con '%s'",
     "argument.computercraft.tracking_field.no_field": "Campo sconosciuto '%s'",
+    "argument.computercraft.unknown_computer_family": "Famiglia computer '%s' sconosciuta",
     "block.computercraft.cable": "Cavo Di Rete",
     "block.computercraft.computer_advanced": "Computer Avanzato",
     "block.computercraft.computer_command": "Computer Comando",
-    "block.computercraft.computer_normal": "Computer",
     "block.computercraft.disk_drive": "Lettore Di Dischi",
     "block.computercraft.monitor_advanced": "Monitor Avanzato",
-    "block.computercraft.monitor_normal": "Monitor",
     "block.computercraft.printer": "Stampante",
     "block.computercraft.speaker": "Altoparlante",
     "block.computercraft.turtle_advanced": "Tartaruga Avanzata",
@@ -31,9 +35,6 @@
     "commands.computercraft.dump.synopsis": "Mostra lo stato dei computer.",
     "commands.computercraft.generic.additional_rows": "%d colonne aggiuntive…",
     "commands.computercraft.generic.exception": "Eccezione non gestita (%s)",
-    "commands.computercraft.generic.no": "N",
-    "commands.computercraft.generic.no_position": "<no posizione>",
-    "commands.computercraft.generic.position": "%s, %s, %s",
     "commands.computercraft.generic.yes": "S",
     "commands.computercraft.help.desc": "Mostra questo messaggio d'aiuto",
     "commands.computercraft.help.no_children": "%s non ha sottocomandi",
@@ -49,7 +50,6 @@
     "commands.computercraft.tp.desc": "Teletrasporta alla posizione di un computer. Puoi specificare il computer con l'instance id (e.g. 123) o con l'id (e.g. #123).",
     "commands.computercraft.tp.synopsis": "Teletrasporta al computer specificato.",
     "commands.computercraft.track.desc": "Monitora per quanto tempo i computer vengono eseguiti e quanti eventi ricevono. Questo comando fornisce le informazioni in modo simile a /forge track e può essere utile per diagnosticare il lag.",
-    "commands.computercraft.track.dump.computer": "Computer",
     "commands.computercraft.track.dump.desc": "Cancella gli ultimi risultati del monitoraggio dei computer.",
     "commands.computercraft.track.dump.no_timings": "No ci sono tempi disponibili",
     "commands.computercraft.track.dump.synopsis": "Cancella gli ultimi risultati monitorati",
@@ -74,6 +74,8 @@
     "gui.computercraft.config.computer_space_limit.tooltip": "Limite di spazio di archiviazione per i computer e le tartarughe, in byte.",
     "gui.computercraft.config.default_computer_settings": "Impostazioni Computer predefinite",
     "gui.computercraft.config.default_computer_settings.tooltip": "Una lista di impostazioni predefinite per i nuovi computer, separate da virgola.\nEsempio: \"shell.autocomplete=false,lua.autocomplete=false,edit.autocomplete=false\"\ndisattiverà tutti gli autocompletamenti.",
+    "gui.computercraft.config.disabled_generic_methods": "Metodi generici disattivati",
+    "gui.computercraft.config.disabled_generic_methods.tooltip": "Una lista di metodi generici o sorgenti di metodi da disattivare. I metodi generici sono\nmetodi aggiunti a blocchi/entità blocchi quando non c'è un provider della periferica esplicito.\nQuesto include metodi dell'inventario (ad es. inventory.getItemDetail, inventory.pushItems) e,\nse su Forge, i metodi fluid_storage e energy_storage.\nI metodi in questa lista possono essere sia un gruppo intero di metodi (computer:inventory)\no un singolo metodo (computer:inventory#pushItems).\n",
     "gui.computercraft.config.execution": "Esecuzione",
     "gui.computercraft.config.execution.computer_threads": "Threads computer",
     "gui.computercraft.config.execution.computer_threads.tooltip": "Imposta la quantità di thread che possono eseguire i computer. Un numero più alto significa\nche più computer possono essere eseguiti alla volta, ma può indurre a lag. Alcune mod potrebbero\nnon funzionare con numeri di thread maggiore a 1. Usare con cautela.\nRange: > 1",
@@ -84,7 +86,6 @@
     "gui.computercraft.config.execution.tooltip": "Controlla comportamento esecuzione dei computer. Questo è largamente utilizzato\nper ritoccare la performance dei server, e generale non dovrebbe essere toccato.",
     "gui.computercraft.config.floppy_space_limit": "Limite spazio Disco Floppy (bytes)",
     "gui.computercraft.config.floppy_space_limit.tooltip": "Limite di spazio di archiviazione per i dischi floppy, in byte.",
-    "gui.computercraft.config.http": "HTTP",
     "gui.computercraft.config.http.bandwidth": "Banda larga",
     "gui.computercraft.config.http.bandwidth.global_download": "Limite download globale",
     "gui.computercraft.config.http.bandwidth.global_download.tooltip": "Numero di byte che possono essere scaricati in un secondo. Questo è condiviso tra tutti i computer. (bytes/s).\nRange: > 1",
@@ -97,7 +98,6 @@
     "gui.computercraft.config.http.max_requests.tooltip": "Il numero di richieste http che un computer può fare alla volta. Ulteriori richieste\nverranno messe in coda, ed inviate quando le richieste correnti sono terminate.\nImposta a 0 per illimitato.\nRange: > 0",
     "gui.computercraft.config.http.max_websockets": "Connessioni websocket massime",
     "gui.computercraft.config.http.max_websockets.tooltip": "Il numero di websocket che un computer può avere aperte allo stesso momento.\nImposta a 0 per illimitato.\nRange: > 1",
-    "gui.computercraft.config.http.proxy": "Proxy",
     "gui.computercraft.config.http.proxy.host": "Nome host",
     "gui.computercraft.config.http.proxy.host.tooltip": "Il nome dell'host o l'indirizzo IP del server proxy.",
     "gui.computercraft.config.http.proxy.port": "Porta",
@@ -135,24 +135,17 @@
     "gui.computercraft.config.peripheral.monitor_bandwidth.tooltip": "Il limite di quanti dati dei monitor possono essere inviati *al tick*. Nota:\n - La banda larga è misurata prima della compressione, così che il dato inviato al client è\n   più piccolo.\n - Questo ignora il numero di giocatori a cui viene inviato il pacchetto. Aggiornare un monitor\n   per un giocatore consuma lo stesso limite di banda larga dell'invio a 20 giocatori.\n - Un monitor alla massima grandezza invia ~25kb di dati. Quindi il valore predefinito (1MB) concede\n   ~40 monitor di essere aggiornati in un singolo tick.\nImposta a 0 per disattivare.\nRange: > 0",
     "gui.computercraft.config.peripheral.tooltip": "Opzioni varie riguardo le periferiche.",
     "gui.computercraft.config.term_sizes": "Dimensioni terminale",
-    "gui.computercraft.config.term_sizes.computer": "Computer",
     "gui.computercraft.config.term_sizes.computer.height": "Altezza terminale",
-    "gui.computercraft.config.term_sizes.computer.height.tooltip": "Range: 1 ~ 255",
     "gui.computercraft.config.term_sizes.computer.tooltip": "Dimensioni del terminale dei computer.",
     "gui.computercraft.config.term_sizes.computer.width": "Larghezza terminale",
     "gui.computercraft.config.term_sizes.computer.width.tooltip": "Intervallo: 1 ~ 255",
-    "gui.computercraft.config.term_sizes.monitor": "Monitor",
     "gui.computercraft.config.term_sizes.monitor.height": "Massima altezza del monitor",
-    "gui.computercraft.config.term_sizes.monitor.height.tooltip": "Range: 1 ~ 32",
     "gui.computercraft.config.term_sizes.monitor.tooltip": "Massima grandezza dei monitor (in blocchi).",
     "gui.computercraft.config.term_sizes.monitor.width": "Larghezza massima del monitor",
-    "gui.computercraft.config.term_sizes.monitor.width.tooltip": "Range: 1 ~ 32",
     "gui.computercraft.config.term_sizes.pocket_computer": "Computer Tascabile",
     "gui.computercraft.config.term_sizes.pocket_computer.height": "Altezza terminale",
-    "gui.computercraft.config.term_sizes.pocket_computer.height.tooltip": "Range: 1 ~ 255",
     "gui.computercraft.config.term_sizes.pocket_computer.tooltip": "Dimensioni del terminale dei computer tascabili.",
     "gui.computercraft.config.term_sizes.pocket_computer.width": "Larghezza terminale",
-    "gui.computercraft.config.term_sizes.pocket_computer.width.tooltip": "Range: 1 ~ 255",
     "gui.computercraft.config.term_sizes.tooltip": "Configura le dimensioni dei terminali di vari computer.\nTerminali più grandi richiedono più banda larga, usa con cautela.",
     "gui.computercraft.config.turtle": "Tartarughe",
     "gui.computercraft.config.turtle.advanced_fuel_limit": "Limite carburante tartarughe avanzate",
@@ -196,7 +189,10 @@
     "item.computercraft.printed_page": "Pagina Stampata",
     "item.computercraft.printed_pages": "Pagine Stampate",
     "item.computercraft.treasure_disk": "Disco Floppy",
-    "itemGroup.computercraft": "ComputerCraft",
+    "tag.item.computercraft.computer": "Computer",
+    "tag.item.computercraft.monitor": "Monitor",
+    "tag.item.computercraft.turtle": "Tartarughe",
+    "tag.item.computercraft.wired_modem": "Modem cablati",
     "tracking_field.computercraft.avg": "%s (media)",
     "tracking_field.computercraft.computer_tasks.name": "Attività",
     "tracking_field.computercraft.count": "%s (conta)",
@@ -204,6 +200,7 @@
     "tracking_field.computercraft.http_download.name": "Download HTTP",
     "tracking_field.computercraft.http_requests.name": "Richieste HTTP",
     "tracking_field.computercraft.http_upload.name": "Upload HTTP",
+    "tracking_field.computercraft.java_allocation.name": "Allocazioni Java",
     "tracking_field.computercraft.max": "%s (massimo)",
     "tracking_field.computercraft.peripheral.name": "Chiamate alle periferiche",
     "tracking_field.computercraft.server_tasks.name": "Attività server",
@@ -211,25 +208,10 @@
     "tracking_field.computercraft.websocket_incoming.name": "Websocket in arrivo",
     "tracking_field.computercraft.websocket_outgoing.name": "Websocket in uscita",
     "upgrade.computercraft.speaker.adjective": "Rumoroso",
-    "upgrade.computercraft.wireless_modem_advanced.adjective": "Ender",
-    "upgrade.computercraft.wireless_modem_normal.adjective": "Wireless",
     "upgrade.minecraft.crafting_table.adjective": "Artigiana",
     "upgrade.minecraft.diamond_axe.adjective": "Taglialegna",
     "upgrade.minecraft.diamond_hoe.adjective": "Contadina",
     "upgrade.minecraft.diamond_pickaxe.adjective": "Minatrice",
     "upgrade.minecraft.diamond_shovel.adjective": "Scavatrice",
-    "upgrade.minecraft.diamond_sword.adjective": "Da Combattimento",
-    "tag.item.computercraft.computer": "Computer",
-    "tag.item.computercraft.wired_modem": "Modem cablati",
-    "argument.computercraft.computer.distance": "Distanza dall'entità",
-    "argument.computercraft.computer.family": "Famiglia computer",
-    "argument.computercraft.computer.id": "ID computer",
-    "argument.computercraft.computer.instance": "ID istanza unica",
-    "argument.computercraft.computer.label": "Etichetta computer",
-    "argument.computercraft.unknown_computer_family": "Famiglia computer '%s' sconosciuta",
-    "gui.computercraft.config.disabled_generic_methods": "Metodi generici disattivati",
-    "gui.computercraft.config.disabled_generic_methods.tooltip": "Una lista di metodi generici o sorgenti di metodi da disattivare. I metodi generici sono\nmetodi aggiunti a blocchi/entità blocchi quando non c'è un provider della periferica esplicito.\nQuesto include metodi dell'inventario (ad es. inventory.getItemDetail, inventory.pushItems) e,\nse su Forge, i metodi fluid_storage e energy_storage.\nI metodi in questa lista possono essere sia un gruppo intero di metodi (computer:inventory)\no un singolo metodo (computer:inventory#pushItems).\n",
-    "tag.item.computercraft.monitor": "Monitor",
-    "tag.item.computercraft.turtle": "Tartarughe",
-    "tracking_field.computercraft.java_allocation.name": "Allocazioni Java"
+    "upgrade.minecraft.diamond_sword.adjective": "Da Combattimento"
 }

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

@@ -1,8 +1,14 @@
 {
     "argument.computercraft.argument_expected": "引数が期待される",
+    "argument.computercraft.computer.distance": "エンティティまでの距離",
+    "argument.computercraft.computer.family": "コンピューターファミリー",
+    "argument.computercraft.computer.id": "コンピューターID",
+    "argument.computercraft.computer.instance": "固有インスタンスID",
+    "argument.computercraft.computer.label": "コンピューターラベル",
     "argument.computercraft.computer.many_matching": "'%s'に一致する複数のコンピューター (インスタンス %s)",
-    "argument.computercraft.computer.no_matching": "'%s'に一致するコンピュータはありません",
+    "argument.computercraft.computer.no_matching": "'%s'に一致するコンピューターはありません",
     "argument.computercraft.tracking_field.no_field": "'%s'は未知のフィールドです",
+    "argument.computercraft.unknown_computer_family": "'%s'は未知のコンピューターファミリーです",
     "block.computercraft.cable": "ネットワークケーブル",
     "block.computercraft.computer_advanced": "高度なコンピューター",
     "block.computercraft.computer_command": "コマンドコンピューター",
@@ -12,9 +18,9 @@
     "block.computercraft.monitor_normal": "モニター",
     "block.computercraft.printer": "プリンター",
     "block.computercraft.speaker": "スピーカー",
-    "block.computercraft.turtle_advanced": "高度なタートル",
-    "block.computercraft.turtle_advanced.upgraded": "高度な%sタートル",
-    "block.computercraft.turtle_advanced.upgraded_twice": "高度な%s%sタートル",
+    "block.computercraft.turtle_advanced": "アドバンスドタートル",
+    "block.computercraft.turtle_advanced.upgraded": "アドバンスド%sタートル",
+    "block.computercraft.turtle_advanced.upgraded_twice": "アドバンスド%s%sタートル",
     "block.computercraft.turtle_normal": "タートル",
     "block.computercraft.turtle_normal.upgraded": "%sタートル",
     "block.computercraft.turtle_normal.upgraded_twice": "%s%sタートル",
@@ -24,80 +30,195 @@
     "block.computercraft.wireless_modem_normal": "無線モデム",
     "chat.computercraft.wired_modem.peripheral_connected": "周辺の\"%s\"のネットワークに接続されました",
     "chat.computercraft.wired_modem.peripheral_disconnected": "周辺の\"%s\"のネットワークから切断されました",
-    "commands.computercraft.desc": "/computercraft コマンドは、コンピュータとの制御および対話するためのさまざまなデバッグツールと管理者ツールを提供します。",
-    "commands.computercraft.dump.action": "このコンピュータの詳細を表示します",
-    "commands.computercraft.dump.desc": "すべてのコンピューターの状態、または一台のコンピューターの特定の情報を表示する。 コンピュータのインスタンスID (例えば 123), コンピュータID (例えば #123) またはラベル (例えば \\\"@My Computer\\\") を指定することができます。",
-    "commands.computercraft.dump.open_path": "このコンピュータのファイルを表示します",
-    "commands.computercraft.dump.synopsis": "コンピュータの状態を表示します。",
+    "commands.computercraft.desc": "/computercraft コマンドは、コンピューターとの制御および対話するためのさまざまなデバッグツールと管理者ツールを提供します。",
+    "commands.computercraft.dump.action": "このコンピューターの詳細を表示します",
+    "commands.computercraft.dump.desc": "すべてのコンピューターの状態、または一台のコンピューターの特定の情報を表示する。 コンピューターのインスタンスID (例えば 123), コンピューターID (例えば #123) またはラベル (例えば \\\"@My Computer\\\") を指定することができます。",
+    "commands.computercraft.dump.open_path": "このコンピューターのファイルを表示します",
+    "commands.computercraft.dump.synopsis": "コンピューターの状態を表示します。",
     "commands.computercraft.generic.additional_rows": "%d行を追加…",
     "commands.computercraft.generic.exception": "未処理の例外 (%s)",
     "commands.computercraft.generic.no": "N",
-    "commands.computercraft.generic.no_position": "<no pos>",
-    "commands.computercraft.generic.position": "%s, %s, %s",
     "commands.computercraft.generic.yes": "Y",
     "commands.computercraft.help.desc": "このヘルプメッセージを表示します",
     "commands.computercraft.help.no_children": "%s にサブコマンドはありません",
     "commands.computercraft.help.no_command": "%s というコマンドはありません",
     "commands.computercraft.help.synopsis": "特定のコマンドのヘルプを提供します",
-    "commands.computercraft.queue.desc": "追加の引数を通過する computer_command インベントをコマンドコンピューターに送信します。これは主にマップメーカーのために設計されており、よりコンピュータフレンドリーバージョンの /trigger として機能します。 どのプレイヤーでもコマンドを実行できます。これは、テキストコンポーネントのクリックイベントを介して行われる可能性があります。",
+    "commands.computercraft.queue.desc": "追加の引数を通過する computer_command インベントをコマンドコンピューターに送信します。これは主にマップメーカーのために設計されており、よりコンピューターフレンドリーバージョンの /trigger として機能します。 どのプレイヤーでもコマンドを実行できます。これは、テキストコンポーネントのクリックイベントを介して行われる可能性があります。",
     "commands.computercraft.queue.synopsis": "computer_command インベントをコマンドコンピューターに送信します",
-    "commands.computercraft.shutdown.desc": "指定されたコンピュータ、指定されていない場合はすべてのコンピュータをシャットダウンします。 コンピュータのインスタンスID (例えば 123), コンピュータID (例えば #123) またはラベル (例えば \\\"@My Computer\\\") を指定することができます。",
+    "commands.computercraft.shutdown.desc": "指定されたコンピューター、指定されていない場合はすべてのコンピューターをシャットダウンします。 コンピューターのインスタンスID (例えば 123), コンピューターID (例えば #123) またはラベル (例えば \\\"@My Computer\\\") を指定することができます。",
     "commands.computercraft.shutdown.done": "%s/%s コンピューターをシャットダウンしました",
-    "commands.computercraft.shutdown.synopsis": "コンピュータをリモートでシャットダウンする。",
-    "commands.computercraft.synopsis": "コンピュータを制御するためのさまざまなコマンド。",
+    "commands.computercraft.shutdown.synopsis": "コンピューターをリモートでシャットダウンする。",
+    "commands.computercraft.synopsis": "コンピューターを制御するためのさまざまなコマンド。",
     "commands.computercraft.tp.action": "このコンピューターへテレポートします",
-    "commands.computercraft.tp.desc": "コンピュータの場所にテレポート.コンピュータのインスタンスID（例えば 123）またはコンピュータID（例えば #123）を指定することができます。",
-    "commands.computercraft.tp.synopsis": "特定のコンピュータにテレポート。",
-    "commands.computercraft.track.desc": "コンピュータの実行時間を追跡するだけでなく、イベントを確認することができます。 これは /forge と同様の方法で情報を提示し、遅れを診断するのに役立ちます。",
+    "commands.computercraft.tp.desc": "コンピューターの場所にテレポート.コンピューターのインスタンスID（例えば 123）またはコンピューターID（例えば #123）を指定することができます。",
+    "commands.computercraft.tp.synopsis": "特定のコンピューターにテレポート。",
+    "commands.computercraft.track.desc": "コンピューターの実行時間を追跡するだけでなく、イベントを確認することができます。 これは /forge と同様の方法で情報を提示し、遅れを診断するのに役立ちます。",
     "commands.computercraft.track.dump.computer": "コンピューター",
-    "commands.computercraft.track.dump.desc": "コンピュータの最新の追跡結果をダンプしてください。",
+    "commands.computercraft.track.dump.desc": "コンピューターの最新の追跡結果をダンプしてください。",
     "commands.computercraft.track.dump.no_timings": "利用可能なタイミングはありません",
     "commands.computercraft.track.dump.synopsis": "最新の追跡結果をダンプしてください",
-    "commands.computercraft.track.start.desc": "すべてのコンピュータの実行時間とイベント数の追跡を開始します。 これにより、以前の実行結果が破棄されます。",
+    "commands.computercraft.track.start.desc": "すべてのコンピューターの実行時間とイベント数の追跡を開始します。 これにより、以前の実行結果が破棄されます。",
     "commands.computercraft.track.start.stop": "トラッキングを停止して結果を表示するには %s を実行してください",
-    "commands.computercraft.track.start.synopsis": "すべてのコンピュータの追跡を開始します",
+    "commands.computercraft.track.start.synopsis": "すべてのコンピューターの追跡を開始します。",
     "commands.computercraft.track.stop.action": "追跡を中止するためにクリックしてください",
-    "commands.computercraft.track.stop.desc": "すべてのコンピュータのイベントと実行時間の追跡を停止します",
-    "commands.computercraft.track.stop.not_enabled": "現在コンピュータを追跡していません",
-    "commands.computercraft.track.stop.synopsis": "すべてのコンピュータの追跡を停止します",
-    "commands.computercraft.track.synopsis": "コンピュータの実行時間を追跡します。",
-    "commands.computercraft.turn_on.desc": "指定されているコンピュータを起動します。 コンピュータのインスタンスID (例えば 123), コンピュータID (例えば #123) またはラベル (例えば \\\"@My Computer\\\") を指定することができます。",
+    "commands.computercraft.track.stop.desc": "すべてのコンピューターのイベントと実行時間の追跡を停止します",
+    "commands.computercraft.track.stop.not_enabled": "現在コンピューターを追跡していません",
+    "commands.computercraft.track.stop.synopsis": "すべてのコンピューターの追跡を停止します。",
+    "commands.computercraft.track.synopsis": "コンピューターの実行時間を追跡します。",
+    "commands.computercraft.turn_on.desc": "指定されているコンピューターを起動します。 コンピューターのインスタンスID (例えば 123), コンピューターID (例えば #123) またはラベル (例えば \\\"@My Computer\\\") を指定することができます。",
     "commands.computercraft.turn_on.done": "%s/%s コンピューターを起動しました",
     "commands.computercraft.turn_on.synopsis": "コンピューターをリモートで起動します。",
-    "commands.computercraft.view.action": "このコンピュータを見ます",
-    "commands.computercraft.view.desc": "コンピュータのターミナルを開き、コンピュータのリモートコントロールを可能にします。 これはタートルのインベントリへのアクセスを提供しません。 コンピュータのインスタンスID（例えば 123）またはコンピュータID（例えば #123）を指定することができます。",
+    "commands.computercraft.view.action": "このコンピューターを見ます",
+    "commands.computercraft.view.desc": "コンピューターのターミナルを開き、コンピューターのリモートコントロールを可能にします。 これはタートルのインベントリへのアクセスを提供しません。 コンピューターのインスタンスID（例えば 123）またはコンピューターID（例えば #123）を指定することができます。",
     "commands.computercraft.view.not_player": "非プレイヤー用のターミナルを開くことができません",
-    "commands.computercraft.view.synopsis": "コンピュータのターミナルを表示します。",
-    "gui.computercraft.pocket_computer_overlay": "ポケットコンピュータを開いています。 ESCを押して閉じます。",
-    "gui.computercraft.tooltip.computer_id": "コンピュータID: %s",
+    "commands.computercraft.view.synopsis": "コンピューターのターミナルを表示します。",
+    "gui.computercraft.config.command_require_creative": "コマンドコンピューターはクリエイティブモードが必要です。",
+    "gui.computercraft.config.command_require_creative.tooltip": "コマンドコンピューターと対話するためにはプレイヤーがクリエイティブモードかつOP権限保有者でなければなりません。\nこれはバニラのコマンドブロックのデフォルト挙動です。",
+    "gui.computercraft.config.computer_space_limit": "コンピューターの限容制限(バイト)",
+    "gui.computercraft.config.computer_space_limit.tooltip": "コンピューターとタートルのディスク容量制限、バイト単位。",
+    "gui.computercraft.config.default_computer_settings": "デフォルトのコンピューター設定",
+    "gui.computercraft.config.default_computer_settings.tooltip": "新しいコンピューターに設定するデフォルトのシステム設定のコンマ区切りのリスト。\n例: \"shell.autocomplete=false,lua.autocomplete=false,edit.autocomplete=false\"\nは全ての自動補完を無効にします。",
+    "gui.computercraft.config.disabled_generic_methods": "無効化するジェネリックメソッド",
+    "gui.computercraft.config.disabled_generic_methods.tooltip": "無効にするジェネリックメソッドまたはメソッドソースのリスト。\nジェネリックメソッドは、明示的な周辺プロバイダがない場合にブロック/ブロックエンティティに追加されるメソッドです。\nこれには、インベントリメソッド (inventory.getItemDetail や inventory.pushItems) や、(Forgeであれば)fluid_storage や energy_storage メソッドが含まれます。\nこのリストに含まれるメソッドは、メソッド群全体 (computercraft:inventory) か、単一のメソッド (computercraft:inventory#pushItems) のどちらかになります。",
+    "gui.computercraft.config.execution": "実行",
+    "gui.computercraft.config.execution.computer_threads": "コンピューターのスレッド",
+    "gui.computercraft.config.execution.computer_threads.tooltip": "コンピューターが実行できるスレッド数を設定する。\n数値が高いほどより多くのコンピューターが一度に実行できますが、ラグを誘発する可能性があります。\nスレッド数が1より大きいと動作しないMODもあるので注意してください\n範囲: > 1",
+    "gui.computercraft.config.execution.max_main_computer_time": "サーバーティックのコンピューター時間上限",
+    "gui.computercraft.config.execution.max_main_computer_time.tooltip": "コンピューターが1ティックで実行できる理想的な最大時間、ミリ秒単位。\nどれぐらい時間がかかるか不明であるため、上限を超える可能性があることに注意。\nこれは平均時間の上限を目的とする。\n範囲: > 1",
+    "gui.computercraft.config.execution.max_main_global_time": "サーバーティックのグローバル回数上限",
+    "gui.computercraft.config.execution.max_main_global_time.tooltip": "1ティックでタスクを実行できる最大時間、ミリ秒単位。\nどれぐらい時間がかかるか不明であるため、上限を超える可能性があることに注意。\nこれは平均回数の上限を時間とする。",
+    "gui.computercraft.config.execution.tooltip": "コンピュータの実行挙動を制御する。\nこれは主にサーバーを微調整するためのもので、一般的には触る必要はない。",
+    "gui.computercraft.config.floppy_space_limit": "フロッピーディスクの容量制限(バイト)",
+    "gui.computercraft.config.floppy_space_limit.tooltip": "フロッピーディスクのディスク容量制限(バイト単位)。",
+    "gui.computercraft.config.http": "HTTP",
+    "gui.computercraft.config.http.bandwidth": "帯域幅",
+    "gui.computercraft.config.http.bandwidth.global_download": "グローバルダウンロード制限",
+    "gui.computercraft.config.http.bandwidth.global_download.tooltip": "1秒間にダウンロードできるバイト数。これはすべてのコンピュータで共有されます。(byte/s).\n範囲: > 1",
+    "gui.computercraft.config.http.bandwidth.global_upload": "グローバルアップロード制限",
+    "gui.computercraft.config.http.bandwidth.global_upload.tooltip": "1秒間にアップロードできるバイト数。これはすべてのコンピュータで共有されます。(byte/s).\n範囲: > 1",
+    "gui.computercraft.config.http.bandwidth.tooltip": "コンピュータが使用する帯域幅を制限する。",
+    "gui.computercraft.config.http.enabled": "HTTP APIを有効にする",
+    "gui.computercraft.config.http.enabled.tooltip": "コンピュータの\"http\" APIを有効にする。これを無効にすると、多くのユーザーが依存している\"pastebin\"と\"wget\"プログラムも無効になる。\nこのオプションはオンのままにしておき、よりきめ細かい制御を行うために\"ルール\"の設定オプションを使用することを推奨する。",
+    "gui.computercraft.config.http.max_requests": "最大同時リクエスト数",
+    "gui.computercraft.config.http.max_requests.tooltip": "コンピューターが一度にできるhttpリクエストの数。追加のリクエストはキューに入れられ、実行中のリクエストが終了したときに送信されます。無制限の場合は0に設定します。\n範囲: > 0",
+    "gui.computercraft.config.http.max_websockets": "最大同時ウェブソケット数",
+    "gui.computercraft.config.http.max_websockets.tooltip": "コンピュータが一度に開くことのできるウェブソケットの数。\n範囲: > 1",
+    "gui.computercraft.config.http.proxy": "プロキシ",
+    "gui.computercraft.config.http.proxy.host": "ホスト名",
+    "gui.computercraft.config.http.proxy.host.tooltip": "プロキシサーバーのホスト名またはIPアドレス。",
+    "gui.computercraft.config.http.proxy.port": "ポート",
+    "gui.computercraft.config.http.proxy.port.tooltip": "プロキシサーバーのポート。\n範囲: 1 ~ 65536",
+    "gui.computercraft.config.http.proxy.tooltip": "HTTPとウェブソケットリクエストをプロキシサーバ経由でトンネリングする。\"use_proxy\"が\"true\"(デフォルトでは\"off\")に設定されている HTTPルールにのみ影響します。\nプロキシに認証が必要な場合は、\"computercraft-server.toml\"と同じディレクトリに\"myuser:mypassword\"のようにユーザー名とパスワードをコロンで区切って記述した\"computercraft-proxy.pw\"ファイルを作成します。\nSOCKS4プロキシでは、ユーザー名のみが必要です。",
+    "gui.computercraft.config.http.proxy.type": "プロキシ種類",
+    "gui.computercraft.config.http.proxy.type.tooltip": "使用するプロキシの種類。\n許可された値: HTTP, HTTPS, SOCKS4, SOCKS5",
+    "gui.computercraft.config.http.rules": "ルールの許可/拒否",
+    "gui.computercraft.config.http.rules.tooltip": "特定のドメインやIPに対する\"http\" APIの動作を制御するルールのリスト。それぞれのルールはホスト名とオプションのポートに対して対応し、 リクエストに対していくつかのプロパティを設定します。 ルールは順番に評価され、前のルールが後のルールを上書きします。\n\n有効なプロパティ:\n - \"host\" (必須): このルールが対応するドメインまたはIPアドレス。 これはドメイン名(\"pastebin.com\")、ワイルドカード(\"*.pastebin.com\")、あるいはCIDR表記(\"127.0.0.0/8\")となります。\n - \"port\" (オプション): 80や 443など、特定のポートに対するリクエストにのみマッチする。.\n\n - \"action\" (オプション): このリクエストを許可するか拒否するか。\n - \"max_download\" (オプション): このリクエストでコンピューターがダウンロードできる最大サイズ(バイト単位)。\n - \"max_upload\" (オプション): このリクエストでコンピューターがアップロードできる最大サイズ（バイト）。\n - \"max_websocket_message\" (オプション): コンピューターが1つのウェブソケット・パケットで送受信できる最大サイズ（バイト）。\n - \"use_proxy\" (オプション): HTTP/SOCKSプロキシが設定されている場合は、その使用を有効にする。",
+    "gui.computercraft.config.http.tooltip": "HTTP APIの制御",
+    "gui.computercraft.config.http.websocket_enabled": "ウェブソケットを有効にする",
+    "gui.computercraft.config.http.websocket_enabled.tooltip": "httpウェブソケットの使用を有効にする。これには、\"http_enable\"オプションもtrueである必要があります。.",
+    "gui.computercraft.config.log_computer_errors": "コンピュータのエラーを記録する",
+    "gui.computercraft.config.log_computer_errors.tooltip": "周辺機器やその他のLuaオブジェクトが発生させた例外を記録します。これにより、MODの作者が問題をデバッグしやすくなりますが、バグを含んだメソッドを使用した場合、ログスパムが発生する可能性があります。",
+    "gui.computercraft.config.maximum_open_files": "1台のコンピューターで開けるファイルの最大数",
+    "gui.computercraft.config.maximum_open_files.tooltip": "コンピューターが同時に開くことができるファイルの数を設定します。無制限の場合は0に設定します。\n範囲: > 0",
+    "gui.computercraft.config.monitor_distance": "モニター距離",
+    "gui.computercraft.config.monitor_distance.tooltip": "モニターがレンダリングする最大距離。デフォルトは標準的なタイルエンティティの制限値ですが、より大きなモニタを構築したい場合は拡張することができます。\n範囲: 16 ~ 1024",
+    "gui.computercraft.config.monitor_renderer": "モニターレンダラー",
+    "gui.computercraft.config.monitor_renderer.tooltip": "モニターに使用するレンダラー。一般的に、この値は\"best\"に保つたれるべきです。 - モニターにパフォーマンス上の問題がある場合は、別のレンダラーを試してみるとよいでしょう。\n許可された値: BEST, TBO, VBO",
+    "gui.computercraft.config.peripheral": "周辺機器",
+    "gui.computercraft.config.peripheral.command_block_enabled": "コマンドブロック周辺機器を有効にする",
+    "gui.computercraft.config.peripheral.command_block_enabled.tooltip": "コマンドブロック周辺機器サポートを有効にする",
+    "gui.computercraft.config.peripheral.max_notes_per_tick": "コンピューターが一度に演奏できる最大音符数",
+    "gui.computercraft.config.peripheral.max_notes_per_tick.tooltip": "スピーカーが一度に演奏できる最大音符数。\n範囲: > 1",
+    "gui.computercraft.config.peripheral.modem_high_altitude_range": "モデム範囲(高高度)",
+    "gui.computercraft.config.peripheral.modem_high_altitude_range.tooltip": "晴天時の最大高度におけるワイヤレスモデムの通信距離、メートル単位。\n範囲: 0 ~ 100000",
+    "gui.computercraft.config.peripheral.modem_high_altitude_range_during_storm": "モデム範囲（高高度、悪天候）",
+    "gui.computercraft.config.peripheral.modem_high_altitude_range_during_storm.tooltip": "悪天候の最大高度におけるワイヤレスモデムの通信距離、メートル単位。\n範囲: 0 ~ 100000",
+    "gui.computercraft.config.peripheral.modem_range": "モデム範囲(デフォルト)",
+    "gui.computercraft.config.peripheral.modem_range.tooltip": "晴天時の低高度におけるワイヤレスモデムの通信距離、メートル単位。\n範囲: 0 ~ 100000",
+    "gui.computercraft.config.peripheral.modem_range_during_storm": "モデム範囲(悪天候)",
+    "gui.computercraft.config.peripheral.modem_range_during_storm.tooltip": "荒天時の低高度におけるワイヤレスモデムの通信距離、メートル単位。\n範囲: 0 ~ 100000",
+    "gui.computercraft.config.peripheral.monitor_bandwidth": "モニター帯域幅",
+    "gui.computercraft.config.peripheral.monitor_bandwidth.tooltip": "1ティックあたりのモニターデータ送信量の上限。注:\n - 帯域幅は圧縮前に測定されるため、クライアントに送信されるデータはより小さくなります。\n - これは、パケットを送信するプレーヤーの数を無視する。1人のプレーヤーのモニターを更新することは、20人に送信するのと同じ帯域幅の制限を消費する。\n - フルサイズのモニターは~25kbのデータを送信する。そのため、デフォルト(1MB)では、1回のティックで~40個のモニターを更新することができる。\n 無効にするには 0 を設定する。\n範囲: > 0",
+    "gui.computercraft.config.peripheral.tooltip": "周辺機器に関する各種オプション。",
+    "gui.computercraft.config.term_sizes": "ターミナルサイズ",
+    "gui.computercraft.config.term_sizes.computer": "コンピューター",
+    "gui.computercraft.config.term_sizes.computer.height": "ターミナルの高さ",
+    "gui.computercraft.config.term_sizes.computer.height.tooltip": "範囲: 1 ~ 255",
+    "gui.computercraft.config.term_sizes.computer.tooltip": "コンピュータの端末サイズ。",
+    "gui.computercraft.config.term_sizes.computer.width": "ターミナルの幅",
+    "gui.computercraft.config.term_sizes.computer.width.tooltip": "範囲: 1 ~ 255",
+    "gui.computercraft.config.term_sizes.monitor": "モニター",
+    "gui.computercraft.config.term_sizes.monitor.height": "モニターの最大高さ",
+    "gui.computercraft.config.term_sizes.monitor.height.tooltip": "範囲: 1 ~ 32",
+    "gui.computercraft.config.term_sizes.monitor.tooltip": "モニターの最大サイズ(ブロック単位).",
+    "gui.computercraft.config.term_sizes.monitor.width": "モニターの最大幅",
+    "gui.computercraft.config.term_sizes.monitor.width.tooltip": "範囲: 1 ~ 32",
+    "gui.computercraft.config.term_sizes.pocket_computer": "ポケットコンピューター",
+    "gui.computercraft.config.term_sizes.pocket_computer.height": "ターミナルの高さ",
+    "gui.computercraft.config.term_sizes.pocket_computer.height.tooltip": "範囲: 1 ~ 255",
+    "gui.computercraft.config.term_sizes.pocket_computer.tooltip": "ポケットコンピュータのターミナルサイズ。",
+    "gui.computercraft.config.term_sizes.pocket_computer.width": "ターミナルの幅",
+    "gui.computercraft.config.term_sizes.pocket_computer.width.tooltip": "範囲: 1 ~ 255",
+    "gui.computercraft.config.term_sizes.tooltip": "各種コンピュータのターミナルサイズを設定します。ターミナルサイズが大きくなるとより多くの帯域幅を必要としますので、注意して使用してください。",
+    "gui.computercraft.config.turtle": "タートル",
+    "gui.computercraft.config.turtle.advanced_fuel_limit": "アドバンスドタートルの燃料制限",
+    "gui.computercraft.config.turtle.advanced_fuel_limit.tooltip": "アドバンスドタートルの燃料制限。\n範囲: > 0",
+    "gui.computercraft.config.turtle.can_push": "タートルのによるエンティティ押出し",
+    "gui.computercraft.config.turtle.can_push.tooltip": "trueに設定すると、タートルは空間がある場合停止する代わりにエンティティを押し出す。",
+    "gui.computercraft.config.turtle.need_fuel": "燃料を有効にする",
+    "gui.computercraft.config.turtle.need_fuel.tooltip": "タートルズが移動に燃料を必要とするかどうかを設定する。",
+    "gui.computercraft.config.turtle.normal_fuel_limit": "タートルの燃料制限",
+    "gui.computercraft.config.turtle.normal_fuel_limit.tooltip": "タートルの燃料制限。\n範囲: > 0",
+    "gui.computercraft.config.turtle.tooltip": "タートルに関する様々なオプション。",
+    "gui.computercraft.config.upload_max_size": "ファイルアップロードサイズ制限(バイト)",
+    "gui.computercraft.config.upload_max_size.tooltip": "ファイルアップロードサイズの上限をバイト数で指定します。1KiBから16MiBの範囲でなければなりません。 \nアップロードは1ティックで処理されることを覚えておいてください - 大きなファイルやネットワークパフォーマンスの低下はネットワーキングスレッドを停止させる可能性があります。\nディスク容量にも注意してください！\n範囲: 1024 ~ 16777216",
+    "gui.computercraft.config.upload_nag_delay": "アップロード催促遅延",
+    "gui.computercraft.config.upload_nag_delay.tooltip": "未処理の入力について通知するまでの遅延時間(秒)。無効にするには0を設定する。\n範囲: 0 ~ 60",
+    "gui.computercraft.pocket_computer_overlay": "ポケットコンピューターを開いています。 ESCを押して閉じます。",
+    "gui.computercraft.terminal": "コンピューターターミナル",
+    "gui.computercraft.tooltip.computer_id": "コンピューターID: %s",
     "gui.computercraft.tooltip.copy": "クリップボードにコピー",
     "gui.computercraft.tooltip.disk_id": "ディスクID: %s",
     "gui.computercraft.tooltip.terminate": "現在実行中のコードを停止する",
     "gui.computercraft.tooltip.terminate.key": "Ctrl+T 長押し",
-    "gui.computercraft.tooltip.turn_off": "このコンピュータをオフにする",
+    "gui.computercraft.tooltip.turn_off": "このコンピューターをオフにする",
     "gui.computercraft.tooltip.turn_off.key": "Ctrl+S 長押し",
-    "gui.computercraft.tooltip.turn_on": "このコンピュータをオンにする",
+    "gui.computercraft.tooltip.turn_on": "このコンピューターをオンにする",
     "gui.computercraft.upload.failed": "アップロードに失敗しました",
-    "gui.computercraft.upload.failed.computer_off": "ファイルをアップロードする前にコンピュータを起動する必要があります。",
+    "gui.computercraft.upload.failed.computer_off": "ファイルをアップロードする前にコンピューターを起動する必要があります。",
     "gui.computercraft.upload.failed.corrupted": "アップロード時にファイルが破損しました。 もう一度やり直してください。",
     "gui.computercraft.upload.failed.generic": "ファイルのアップロードに失敗しました(%s)",
     "gui.computercraft.upload.failed.name_too_long": "ファイル名が長すぎてアップロードできません。",
     "gui.computercraft.upload.failed.too_many_files": "多くのファイルをアップロードできません。",
     "gui.computercraft.upload.failed.too_much": "アップロードするにはファイルが大きスギます。",
+    "gui.computercraft.upload.no_response": "ファイルの転送",
+    "gui.computercraft.upload.no_response.msg": "コンピュータが転送されたファイルを使用していません。プログラム %s を実行して再試行する必要があります。",
     "item.computercraft.disk": "フロッピーディスク",
-    "item.computercraft.pocket_computer_advanced": "高度なポケットコンピュータ",
-    "item.computercraft.pocket_computer_advanced.upgraded": "高度な%sポケットコンピュータ",
-    "item.computercraft.pocket_computer_normal": "ポケットコンピュータ",
-    "item.computercraft.pocket_computer_normal.upgraded": "%sポケットコンピュータ",
+    "item.computercraft.pocket_computer_advanced": "高度なポケットコンピューター",
+    "item.computercraft.pocket_computer_advanced.upgraded": "高度な%sポケットコンピューター",
+    "item.computercraft.pocket_computer_normal": "ポケットコンピューター",
+    "item.computercraft.pocket_computer_normal.upgraded": "%sポケットコンピューター",
     "item.computercraft.printed_book": "印刷された本",
     "item.computercraft.printed_page": "印刷された紙",
     "item.computercraft.printed_pages": "印刷された紙束",
     "item.computercraft.treasure_disk": "フロッピーディスク",
     "itemGroup.computercraft": "ComputerCraft",
+    "tag.item.computercraft.computer": "コンピューター",
+    "tag.item.computercraft.monitor": "モニター",
+    "tag.item.computercraft.turtle": "タートル",
+    "tag.item.computercraft.wired_modem": "有線モデム",
+    "tracking_field.computercraft.avg": "%s (平均)",
+    "tracking_field.computercraft.computer_tasks.name": "タスク",
+    "tracking_field.computercraft.count": "%s (回)",
     "tracking_field.computercraft.fs.name": "ファイルシステム演算",
     "tracking_field.computercraft.http_download.name": "HTTPダウンロード",
+    "tracking_field.computercraft.http_requests.name": "HTTPリクエスト",
     "tracking_field.computercraft.http_upload.name": "HTTPアップロード",
+    "tracking_field.computercraft.java_allocation.name": "Java割当",
+    "tracking_field.computercraft.max": "%s (最大)",
     "tracking_field.computercraft.peripheral.name": "実行呼び出し",
+    "tracking_field.computercraft.server_tasks.name": "サーバータスク",
+    "tracking_field.computercraft.turtle_ops.name": "タートル操作",
     "tracking_field.computercraft.websocket_incoming.name": "Websocket 受信",
     "tracking_field.computercraft.websocket_outgoing.name": "Websocket 送信",
     "upgrade.computercraft.speaker.adjective": "騒音",

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

@@ -32,8 +32,6 @@
     "commands.computercraft.generic.additional_rows": "%d개의 추가 행…",
     "commands.computercraft.generic.exception": "처리되지 않은 예외 (%s)",
     "commands.computercraft.generic.no": "N",
-    "commands.computercraft.generic.no_position": "<no pos>",
-    "commands.computercraft.generic.position": "%s, %s, %s",
     "commands.computercraft.generic.yes": "Y",
     "commands.computercraft.help.desc": "이 도움말 메시지를 표시합니다.",
     "commands.computercraft.help.no_children": "%s에는 하위 명령어가 없습니다.",

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

@@ -10,7 +10,6 @@
     "block.computercraft.disk_drive": "Diskstasjon",
     "block.computercraft.monitor_advanced": "Avansert Skjerm",
     "block.computercraft.monitor_normal": "Skjerm",
-    "block.computercraft.printer": "Printer",
     "block.computercraft.speaker": "Høytaler",
     "block.computercraft.turtle_advanced": "Avansert Skilpadde",
     "block.computercraft.turtle_advanced.upgraded": "Avansert %s Skilpadde",
@@ -20,7 +19,6 @@
     "block.computercraft.turtle_normal.upgraded_twice": "%s %s Skilpadde",
     "block.computercraft.wired_modem": "Kablet Modem",
     "block.computercraft.wired_modem_full": "Kablet Modem",
-    "block.computercraft.wireless_modem_advanced": "Ender Modem",
     "block.computercraft.wireless_modem_normal": "Trådløst Modem",
     "chat.computercraft.wired_modem.peripheral_connected": "Perifer \"%s\" koblet til nettverk",
     "chat.computercraft.wired_modem.peripheral_disconnected": "Perifer \"%s\" koblet fra nettverk",
@@ -31,9 +29,6 @@
     "commands.computercraft.dump.synopsis": "Viser statusen av datamaskiner.",
     "commands.computercraft.generic.additional_rows": "%d flere rader…",
     "commands.computercraft.generic.exception": "Uhåndtert unntak (%s)",
-    "commands.computercraft.generic.no": "N",
-    "commands.computercraft.generic.no_position": "<ingen posisjon>",
-    "commands.computercraft.generic.position": "%s, %s, %s",
     "commands.computercraft.generic.yes": "J",
     "commands.computercraft.help.desc": "Viser denne hjelpemeldingen",
     "commands.computercraft.help.no_children": "%s har ingen underkommandoer",
@@ -69,7 +64,6 @@
     "commands.computercraft.view.not_player": "Kan kun åpne terminal for spillere",
     "commands.computercraft.view.synopsis": "Vis terminal til en datamaskin.",
     "gui.computercraft.config.command_require_creative": "Kommando datamaskiner trenger kreativ",
-    "gui.computercraft.config.http": "HTTP",
     "gui.computercraft.config.http.enabled": "Slå på HTTP APIen",
     "gui.computercraft.config.http.rules": "Godta/Avslå regler",
     "gui.computercraft.config.monitor_distance": "Skjerm distanse",
@@ -88,7 +82,6 @@
     "gui.computercraft.terminal": "Datamaskin terminal",
     "gui.computercraft.tooltip.computer_id": "Datamaskin ID: %s",
     "gui.computercraft.tooltip.copy": "Kopier til utklippstavle",
-    "gui.computercraft.tooltip.disk_id": "Disk ID: %s",
     "gui.computercraft.tooltip.terminate": "Stopp den kjørende koden",
     "gui.computercraft.tooltip.terminate.key": "Hold Ctrl + T",
     "gui.computercraft.tooltip.turn_off": "Skru denne datamaskinen av",
@@ -102,7 +95,6 @@
     "gui.computercraft.upload.failed.too_many_files": "Kan ikke laste opp så mange filer.",
     "gui.computercraft.upload.failed.too_much": "Filene dine er for store for å kunne bli lastet opp.",
     "gui.computercraft.upload.no_response": "Overfører Filer",
-    "item.computercraft.disk": "Floppy Disk",
     "item.computercraft.pocket_computer_advanced": "Avansert Lomme Datamaskin",
     "item.computercraft.pocket_computer_advanced.upgraded": "Avansert %s Lomme Datamaskin",
     "item.computercraft.pocket_computer_normal": "Lomme datamaskin",
@@ -110,8 +102,6 @@
     "item.computercraft.printed_book": "Printet Bok",
     "item.computercraft.printed_page": "Printet Side",
     "item.computercraft.printed_pages": "Printet Sider",
-    "item.computercraft.treasure_disk": "Floppy Disk",
-    "itemGroup.computercraft": "ComputerCraft",
     "tracking_field.computercraft.computer_tasks.name": "Oppgaver",
     "tracking_field.computercraft.count": "%s (antall)",
     "tracking_field.computercraft.fs.name": "Filsystem operasjoner",
@@ -123,7 +113,6 @@
     "tracking_field.computercraft.websocket_incoming.name": "Innkommende Websocket",
     "tracking_field.computercraft.websocket_outgoing.name": "Utgående Websocket",
     "upgrade.computercraft.speaker.adjective": "Høylydt",
-    "upgrade.computercraft.wireless_modem_advanced.adjective": "Ender",
     "upgrade.computercraft.wireless_modem_normal.adjective": "Trådløs",
     "upgrade.minecraft.crafting_table.adjective": "Håndverks",
     "upgrade.minecraft.diamond_axe.adjective": "Hoggende",

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

@@ -32,8 +32,6 @@
     "commands.computercraft.generic.additional_rows": "%d additionele rijen…",
     "commands.computercraft.generic.exception": "Niet-afgehandelde exception (%s)",
     "commands.computercraft.generic.no": "N",
-    "commands.computercraft.generic.no_position": "<geen positie>",
-    "commands.computercraft.generic.position": "%s, %s, %s",
     "commands.computercraft.generic.yes": "J",
     "commands.computercraft.help.desc": "Geeft dit hulpbericht weer",
     "commands.computercraft.help.no_children": "%s heeft geen sub-commando's",

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

@@ -19,8 +19,6 @@
     "commands.computercraft.dump.desc": "Wyświetla status wszystkich komputerów lub informacje o jednym komputerze. Możesz wybrać numer sesji komputera (np. 123), ID komputera (np. #123) lub jego etykietę (np. \"@Mój Komputer\").",
     "commands.computercraft.dump.open_path": "Przeglądaj pliki tego komputera",
     "commands.computercraft.dump.synopsis": "Wyświetl stan komputerów.",
-    "commands.computercraft.generic.no_position": "<brak pozycji>",
-    "commands.computercraft.generic.position": "%s, %s, %s",
     "commands.computercraft.generic.yes": "T",
     "commands.computercraft.help.no_children": "%s nie ma pod-komend",
     "commands.computercraft.help.no_command": "Nie odnaleziono komendy '%s'",

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

@@ -1,4 +1,14 @@
 {
+    "argument.computercraft.argument_expected": "Argumento esperado",
+    "argument.computercraft.computer.distance": "Distância para a entidade",
+    "argument.computercraft.computer.family": "Família de Computadores",
+    "argument.computercraft.computer.id": "ID do Computador",
+    "argument.computercraft.computer.instance": "ID de Instância Única",
+    "argument.computercraft.computer.label": "Rótulo do Computador",
+    "argument.computercraft.computer.many_matching": "Vários computadores correspondendo a '%s' (instâncias %s)",
+    "argument.computercraft.computer.no_matching": "Sem computadores correspondentes a '%s'",
+    "argument.computercraft.tracking_field.no_field": "Campo desconhecido '%s'",
+    "argument.computercraft.unknown_computer_family": "Família de computador desconhecida '%s'",
     "block.computercraft.cable": "Cabo de Rede",
     "block.computercraft.computer_advanced": "Computador Avançado",
     "block.computercraft.computer_command": "Computador de Comandos",
@@ -23,43 +33,166 @@
     "commands.computercraft.desc": "O comando /computercraft providencia várias ferramentas de depuração e administração para controle e interação com computadores.",
     "commands.computercraft.dump.action": "Ver mais informação sobre este computador",
     "commands.computercraft.dump.desc": "Mostra o status de todos os computadores ou uma informação específica sobre um computador. Você pode especificar o id de instância do computador (ex.: 123), id do computador (ex.: #123) ou o rótulo (ex.: \"@MeuComputador\").",
+    "commands.computercraft.dump.open_path": "Ver arquivos deste computador",
     "commands.computercraft.dump.synopsis": "Mostra status de computadores.",
+    "commands.computercraft.generic.additional_rows": "%d linhas adicionais…",
+    "commands.computercraft.generic.exception": "Exceção não tratada (%s)",
+    "commands.computercraft.generic.no": "N",
+    "commands.computercraft.generic.yes": "S",
     "commands.computercraft.help.desc": "Mostra essa mensagem de ajuda",
     "commands.computercraft.help.no_children": "%s não tem sub-comandos",
     "commands.computercraft.help.no_command": "Comando '%s' não existe",
     "commands.computercraft.help.synopsis": "Providencia ajuda para um comando específico",
+    "commands.computercraft.queue.desc": "Envie um evento computer_command para um computador de comando, passando os argumentos adicionais. Isso é projetado principalmente para criadores de mapas, funcionando como uma versão mais amigável do computador do comando /trigger. Qualquer jogador pode executar o comando, que provavelmente será feito por meio do evento de clique de um componente de texto.",
+    "commands.computercraft.queue.synopsis": "Envie um evento computer_command para um computador de comando",
     "commands.computercraft.shutdown.desc": "Desliga os computadores em escuta ou todos caso não tenha sido especificado. Você pode especificar o id de instância do computador (ex.: 123), id do computador (ex.: #123) ou o rótulo (ex.: \"@MeuComputador\").",
     "commands.computercraft.shutdown.done": "Desliga %s/%s computadores",
     "commands.computercraft.shutdown.synopsis": "Desliga computadores remotamente.",
     "commands.computercraft.synopsis": "Vários comandos para controlar computadores.",
+    "commands.computercraft.tp.action": "Teletransportar para este computador",
+    "commands.computercraft.tp.desc": "Teletransporte para a localização de um computador. Você pode especificar o Id da instância do computador (por exemplo, 123) ou o Id do computador (por exemplo, #123).",
     "commands.computercraft.tp.synopsis": "Teleprota para um computador específico.",
+    "commands.computercraft.track.desc": "Rastreie quanto tempo os computadores executam, bem como quantos eventos eles manipulam. Isso apresenta informações de maneira semelhante ao /forge track e pode ser útil para diagnosticar lag.",
+    "commands.computercraft.track.dump.computer": "Computador",
+    "commands.computercraft.track.dump.desc": "Despeje os últimos resultados do rastreamento de computadores.",
+    "commands.computercraft.track.dump.no_timings": "Nenhum tempo disponível",
+    "commands.computercraft.track.dump.synopsis": "Despeje os últimos resultados de rastreamento",
+    "commands.computercraft.track.start.desc": "Comece a rastrear os tempos de execução e contagens de eventos de todos os computadores. Isso descartará os resultados de execuções anteriores.",
+    "commands.computercraft.track.start.stop": "Execute %s para parar o rastreamento e visualizar os resultados",
+    "commands.computercraft.track.start.synopsis": "Comece a rastrear todos os computadores",
+    "commands.computercraft.track.stop.action": "Clique para parar o rastreamento",
+    "commands.computercraft.track.stop.desc": "Parar de rastrear eventos de todos os computadores e tempos de execução",
+    "commands.computercraft.track.stop.not_enabled": "Não está rastreando computadores",
+    "commands.computercraft.track.stop.synopsis": "Parar de rastrear todos os computadores",
+    "commands.computercraft.track.synopsis": "Acompanhe os tempos de execução para computadores.",
     "commands.computercraft.turn_on.desc": "Liga os computadores em escuta. Você pode especificar o id de instância do computador (ex.: 123), id do computador (ex.: #123) ou o rótulo (ex.: \"@MeuComputador\").",
     "commands.computercraft.turn_on.done": "Ligou %s/%s computadores",
     "commands.computercraft.turn_on.synopsis": "Liga computadores remotamente.",
+    "commands.computercraft.view.action": "Visualizar este computador",
+    "commands.computercraft.view.desc": "Abra o terminal de um computador, permitindo o controle remoto de um computador. Isso não fornece acesso aos inventários das tartarugas. Você pode especificar o Id da instância do computador (por exemplo, 123) ou o Id do computador (por exemplo, #123).",
+    "commands.computercraft.view.not_player": "Não é possível abrir terminal para um não-jogador",
+    "commands.computercraft.view.synopsis": "Ver o terminal de um computador.",
+    "gui.computercraft.config.command_require_creative": "Computadores de comando requerem criativo",
+    "gui.computercraft.config.command_require_creative.tooltip": "Exigir que os jogadores estejam no modo criativo e tenham permissões de operador (opped) para interagir com computadores de comando. Este é o comportamento padrão dos blocos de comando no modo vanilla.",
     "gui.computercraft.config.computer_space_limit": "Limite de espaço dos Computadores (bytes)",
+    "gui.computercraft.config.computer_space_limit.tooltip": "O limite de espaço em disco para computadores e tartarugas, em bytes.",
     "gui.computercraft.config.default_computer_settings": "Configurações padrão para Computadores",
+    "gui.computercraft.config.default_computer_settings.tooltip": "Uma lista separada por vírgulas das configurações padrão do sistema a serem definidas em novos computadores. \nExemplo: \"shell.autocomplete=false,lua.autocomplete=false,edit.autocomplete=false\" desativará todas as funcionalidades de autocompletar.",
+    "gui.computercraft.config.disabled_generic_methods": "Métodos genéricos desativados",
+    "gui.computercraft.config.disabled_generic_methods.tooltip": "Uma lista de métodos genéricos ou fontes de métodos a serem desativados. Métodos genéricos são aqueles adicionados a um bloco ou entidade de bloco quando não há um provedor de periféricos explícito. Isso inclui métodos de inventário (ou seja, inventory.getItemDetail, inventory.pushItems) e, se estiver usando Forge, os métodos fluid_storage e energy_storage. \nOs métodos nesta lista podem ser um grupo inteiro de métodos (computercraft:inventory) ou um único método (computercraft:inventory#pushItems).\n",
+    "gui.computercraft.config.execution": "Execução",
     "gui.computercraft.config.execution.computer_threads": "Threads por computador",
+    "gui.computercraft.config.execution.computer_threads.tooltip": "Defina o número de threads que os computadores podem utilizar. Um número maior significa que mais computadores podem ser executados ao mesmo tempo, mas pode causar lag. Observe que alguns mods podem não funcionar com uma contagem de threads superior a 1. Use com cautela. \nIntervalo: > 1",
+    "gui.computercraft.config.execution.max_main_computer_time": "Limite de tempo do computador por tick do servidor",
+    "gui.computercraft.config.execution.max_main_computer_time.tooltip": "O tempo máximo ideal que um computador pode executar em um tick, em milissegundos. \nObserve que é bastante provável que ultrapassemos esse limite, pois não há como saber exatamente quanto tempo uma operação levará - isso visa ser o limite superior do tempo médio. \nIntervalo: > 1",
+    "gui.computercraft.config.execution.max_main_global_time": "Limite de tempo global por tick do servidor",
+    "gui.computercraft.config.execution.max_main_global_time.tooltip": "O tempo máximo que pode ser gasto executando tarefas em um único tick, em milissegundos. \nObserve que é bastante provável que ultrapassemos esse limite, pois não há como saber exatamente quanto tempo uma operação levará - isso visa ser o limite superior do tempo médio. \nIntervalo: > 1",
+    "gui.computercraft.config.execution.tooltip": "Controla o comportamento de execução dos computadores. Isso é principalmente destinado ao ajuste fino dos servidores e, geralmente, não deve ser alterado.",
     "gui.computercraft.config.floppy_space_limit": "Limite de espaço dos Disquetes (bytes)",
+    "gui.computercraft.config.floppy_space_limit.tooltip": "O limite de espaço em disco para disquete em bytes.",
     "gui.computercraft.config.http": "HTTP",
+    "gui.computercraft.config.http.bandwidth": "Largura de banda",
+    "gui.computercraft.config.http.bandwidth.global_download": "Limite de download global",
+    "gui.computercraft.config.http.bandwidth.global_download.tooltip": "O número de bytes que podem ser baixados em um segundo. Isso é compartilhado entre todos os computadores. (bytes/s). \nIntervalo: > 1",
+    "gui.computercraft.config.http.bandwidth.global_upload": "Limite de upload global",
+    "gui.computercraft.config.http.bandwidth.global_upload.tooltip": "O número de bytes que podem ser enviados em um segundo. Isso é compartilhado entre todos os computadores. (bytes/s). \nIntervalo: > 1",
+    "gui.computercraft.config.http.bandwidth.tooltip": "Limita a banda usada pelos computadores.",
     "gui.computercraft.config.http.enabled": "Habilitar a biblioteca de HTTP",
+    "gui.computercraft.config.http.enabled.tooltip": "Ative a API \"http\" nos Computadores. Desativar isso também desativa os programas \"pastebin\" e \"wget\", dos quais muitos usuários dependem. É recomendado deixar isso ativado e usar a opção de configuração \"rules\" para impor um controle mais detalhado.",
     "gui.computercraft.config.http.max_requests": "Limite de conexões paralelas",
+    "gui.computercraft.config.http.max_requests.tooltip": "O número de solicitações Http que um computador pode fazer ao mesmo tempo. Solicitações adicionais serão enfileiradas e enviadas quando as solicitações em execução forem concluídas. Defina como 0 para ilimitado.\nIntervalo: > 0",
     "gui.computercraft.config.http.max_websockets": "Limite de conexões websocket",
+    "gui.computercraft.config.http.max_websockets.tooltip": "O número de websockets que um computador pode ter abertos ao mesmo tempo.\nIntervalo: > 1",
+    "gui.computercraft.config.http.proxy": "Proxy",
+    "gui.computercraft.config.http.proxy.host": "Nome de host",
+    "gui.computercraft.config.http.proxy.host.tooltip": "O nome do host ou endereço IP do servidor proxy.",
+    "gui.computercraft.config.http.proxy.port": "Porta",
+    "gui.computercraft.config.http.proxy.port.tooltip": "A porta do servidor proxy.\nIntervalo: 1 ~ 65536",
+    "gui.computercraft.config.http.proxy.tooltip": "Tunéis de solicitações HTTP e websocket através de um servidor proxy. Afeta apenas as regras HTTP com \"use_proxy\" definido como verdadeiro (desligado por padrão). Se a autenticação for necessária para o proxy, crie um arquivo \"computercraft-proxy.pw\" no mesmo diretório que \"computercraft-server.toml\", contendo o nome de usuário e a senha separados por dois pontos, por exemplo, \"meuusuario:minhasenha\". Para proxies SOCKS4, apenas o nome de usuário é necessário.",
+    "gui.computercraft.config.http.proxy.type": "Tipo de proxy",
+    "gui.computercraft.config.http.proxy.type.tooltip": "O tipo de proxy para usar.\nValores permitidos: HTTP, HTTPS, SOCKS4, SOCKS5",
+    "gui.computercraft.config.http.rules": "Regras Permitir/Negar",
+    "gui.computercraft.config.http.rules.tooltip": "Uma lista de regras que controlam o comportamento da API \"http\" para domínios ou IPs específicos. Cada regra corresponde a um nome de host e uma porta opcional, e então define várias propriedades para a solicitação. As regras são avaliadas em ordem, o que significa que regras anteriores sobrescrevem as posteriores.\n\nPropriedades válidas:\n- \"host\" (obrigatório): O domínio ou endereço IP que esta regra corresponde. Isso pode ser um nome de domínio (\"pastebin.com\"), um curinga (\"*.pastebin.com\") ou notação CIDR (\"127.0.0.0/8\").\n- \"port\" (opcional): Corresponder apenas a solicitações para uma porta específica, como 80 ou 443.\n\n- \"action\" (opcional): Se permitir ou negar esta solicitação.\n- \"max_download\" (opcional): O tamanho máximo (em bytes) que um computador pode baixar nesta solicitação.\n- \"max_upload\" (opcional): O tamanho máximo (em bytes) que um computador pode enviar em uma solicitação.\n- \"max_websocket_message\" (opcional): O tamanho máximo (em bytes) que um computador pode enviar ou receber em um pacote websocket.\n- \"use_proxy\" (opcional): Habilitar o uso do proxy HTTP/SOCKS se estiver configurado.",
+    "gui.computercraft.config.http.tooltip": "Controla a API HTTP",
     "gui.computercraft.config.http.websocket_enabled": "Habilitar websockets",
+    "gui.computercraft.config.http.websocket_enabled.tooltip": "Habilitar o uso de websockets Http. Isso requer que a opção \"http_enable\" também esteja definida como verdadeira.",
     "gui.computercraft.config.log_computer_errors": "Registrar erros de computadores",
+    "gui.computercraft.config.log_computer_errors.tooltip": "Registrar exceções lançadas por periféricos e outros objetos Lua. Isso facilita a depuração de problemas para os autores de mods, mas pode resultar em excesso de registros caso as pessoas utilizem métodos com falhas.",
     "gui.computercraft.config.maximum_open_files": "Número máximo de arquivos em um computador",
+    "gui.computercraft.config.maximum_open_files.tooltip": "Defina quantos arquivos um computador pode ter aberto ao mesmo tempo. Defina como 0 para ilimitado.\nIntervalo: > 0",
+    "gui.computercraft.config.monitor_distance": "Distância do monitor",
+    "gui.computercraft.config.monitor_distance.tooltip": "A distância máxima que os monitores renderizarão. Isso padrão é o limite padrão de entidades de tile, mas pode ser estendido se você desejar construir monitores maiores. \nIntervalo: 16 ~ 1024",
+    "gui.computercraft.config.monitor_renderer": "Renderizador do monitor",
+    "gui.computercraft.config.monitor_renderer.tooltip": "O renderizador a ser utilizado para os monitores. Geralmente, isso deve ser mantido em \"best\" - se os monitores apresentarem problemas de desempenho, você pode querer experimentar renderizadores alternativos. \nValores Permitidos: BEST, TBO, VBO",
     "gui.computercraft.config.peripheral": "Periféricos",
     "gui.computercraft.config.peripheral.command_block_enabled": "Habilitar periférico do bloco de comando",
+    "gui.computercraft.config.peripheral.command_block_enabled.tooltip": "Habilitar periférico do bloco de comando",
     "gui.computercraft.config.peripheral.max_notes_per_tick": "Número de notas que um computador pode tocar simultâneamente",
+    "gui.computercraft.config.peripheral.max_notes_per_tick.tooltip": "Quantidade máxima de notas que um alto-falante pode jogar de uma vez.\nIntervalo: > 1",
     "gui.computercraft.config.peripheral.modem_high_altitude_range": "Alcance do modem (altitude elevada)",
+    "gui.computercraft.config.peripheral.modem_high_altitude_range.tooltip": "O intervalo de Modems Sem Fio a altitude máxima em tempo limpo, em metros.\nIntervalo: 0 ~ 100000",
     "gui.computercraft.config.peripheral.modem_high_altitude_range_during_storm": "Alcance do modem (altitude elevada, clima ruim)",
+    "gui.computercraft.config.peripheral.modem_high_altitude_range_during_storm.tooltip": "O intervalo de Modems Sem Fio à altitude máxima em clima tempestuoso, em metros.\nIntervalo: 0 ~ 100000",
     "gui.computercraft.config.peripheral.modem_range": "Alcance do modem (padrão)",
+    "gui.computercraft.config.peripheral.modem_range.tooltip": "O alcance de Modems Sem Fio a baixa altitude em clima limpo, em metros.\nIntervalo: 0 ~ 100000",
     "gui.computercraft.config.peripheral.modem_range_during_storm": "Alcance do modem (clima ruim)",
+    "gui.computercraft.config.peripheral.modem_range_during_storm.tooltip": "A variedade de Modems Sem Fio a baixa altitude em clima tempestuoso, em metros.\nIntervalo: 0 ~ 100000",
+    "gui.computercraft.config.peripheral.monitor_bandwidth": "Monitorar banda",
+    "gui.computercraft.config.peripheral.monitor_bandwidth.tooltip": "O limite de quanta informação de monitor pode ser enviada *por tick*. Nota:\n- A largura de banda é medida antes da compressão, então os dados enviados ao cliente são menores.\n- Isso ignora o número de jogadores para os quais um pacote é enviado. Atualizar um monitor para um jogador consome o mesmo limite de largura de banda que enviar para 20.\n- Um monitor de tamanho completo envia ~25kb de dados. Portanto, o padrão (1MB) permite que ~40 monitores sejam atualizados em um único tick.  \nDefina como 0 para desativar.  \nIntervalo: > 0",
+    "gui.computercraft.config.peripheral.tooltip": "Várias opções relacionadas com os periféricos.",
+    "gui.computercraft.config.term_sizes": "Tamanhos do terminal",
+    "gui.computercraft.config.term_sizes.computer": "Computador",
+    "gui.computercraft.config.term_sizes.computer.height": "Altura do terminal",
+    "gui.computercraft.config.term_sizes.computer.height.tooltip": "Intervalo: 1 ~ 255",
+    "gui.computercraft.config.term_sizes.computer.tooltip": "Tamanho do terminal dos computadores portátil.",
+    "gui.computercraft.config.term_sizes.computer.width": "Largura do terminal",
+    "gui.computercraft.config.term_sizes.computer.width.tooltip": "Intervalo: 1 ~ 255",
+    "gui.computercraft.config.term_sizes.monitor": "Monitor",
+    "gui.computercraft.config.term_sizes.monitor.height": "Altura máxima da monitor",
+    "gui.computercraft.config.term_sizes.monitor.height.tooltip": "Intervalo: 1 ~ 32",
+    "gui.computercraft.config.term_sizes.monitor.tooltip": "Tamanho máximo de monitores (em blocos).",
+    "gui.computercraft.config.term_sizes.monitor.width": "Largura máxima do monitor",
+    "gui.computercraft.config.term_sizes.monitor.width.tooltip": "Intervalo: 1 ~ 32",
+    "gui.computercraft.config.term_sizes.pocket_computer": "Computador Portátil",
+    "gui.computercraft.config.term_sizes.pocket_computer.height": "Altura do terminal",
+    "gui.computercraft.config.term_sizes.pocket_computer.height.tooltip": "Intervalo: 1 ~ 255",
+    "gui.computercraft.config.term_sizes.pocket_computer.tooltip": "Tamanho do terminal dos computadores portátil.",
+    "gui.computercraft.config.term_sizes.pocket_computer.width": "Largura do terminal",
+    "gui.computercraft.config.term_sizes.pocket_computer.width.tooltip": "Intervalo: 1 ~ 255",
+    "gui.computercraft.config.term_sizes.tooltip": "Configure o tamanho dos terminais de vários computadores. Terminais maiores exigem mais largura de banda, portanto, use com cuidado.",
     "gui.computercraft.config.turtle": "Tartarugas",
     "gui.computercraft.config.turtle.advanced_fuel_limit": "Limite de combustível de Tartarugas Avançadas",
+    "gui.computercraft.config.turtle.advanced_fuel_limit.tooltip": "O limite de combustível para Advanced Turtles. \nIntervalo: > 0",
     "gui.computercraft.config.turtle.can_push": "Tartarugas podem empurrar entidades",
+    "gui.computercraft.config.turtle.can_push.tooltip": "Se definido como verdadeiro, as Tartarugas empurrarão entidades para o lado em vez de parar, caso haja espaço para isso.",
     "gui.computercraft.config.turtle.need_fuel": "Habilitar combustível",
+    "gui.computercraft.config.turtle.need_fuel.tooltip": "Defina se as tartarugas requerem combustível para se mover.",
     "gui.computercraft.config.turtle.normal_fuel_limit": "Limite de combustível de Tartarugas",
+    "gui.computercraft.config.turtle.normal_fuel_limit.tooltip": "O limite de combustível para Advanced Turtles. \nIntervalo: > 0",
+    "gui.computercraft.config.turtle.tooltip": "Várias opções relacionadas às Tartarugas.",
+    "gui.computercraft.config.upload_max_size": "Tamanho máximo para upload de arquivos (bytes)",
+    "gui.computercraft.config.upload_max_size.tooltip": "O limite de tamanho de upload de arquivos, em bytes. Deve estar na faixa de 1 KiB a 16 MiB. \nTenha em mente que os uploads são processados em um único tick - arquivos grandes ou desempenho de rede ruim podem travar a thread de rede. E cuidado com o espaço em disco! \nIntervalo: 1024 ~ 16777216",
+    "gui.computercraft.config.upload_nag_delay": "Atraso de notificação de upload",
+    "gui.computercraft.config.upload_nag_delay.tooltip": "O atraso em segundos após o qual seremos notificados sobre importações não tratadas. Defina como 0 para desabilitar. \nIntervalo: 0 ~ 60",
+    "gui.computercraft.pocket_computer_overlay": "Computador portátil aberto. Pressione ESC para fechar.",
+    "gui.computercraft.terminal": "Terminal do Computador",
+    "gui.computercraft.tooltip.computer_id": "ID do Computador: %s",
     "gui.computercraft.tooltip.copy": "Copiar para a área de transferência",
+    "gui.computercraft.tooltip.disk_id": "ID do Disco: %s",
+    "gui.computercraft.tooltip.terminate": "Parar o código atualmente em execução",
+    "gui.computercraft.tooltip.terminate.key": "Segure Ctrl+T",
+    "gui.computercraft.tooltip.turn_off": "Desligar este computador",
+    "gui.computercraft.tooltip.turn_off.key": "Segure Ctrl+S",
+    "gui.computercraft.tooltip.turn_on": "Ligar este computador",
+    "gui.computercraft.upload.failed": "Falha no Upload",
+    "gui.computercraft.upload.failed.computer_off": "Você deve ligar o computador antes de fazer o upload de arquivos.",
+    "gui.computercraft.upload.failed.corrupted": "Arquivos corrompidos ao dar upload. Por favor, tente novamente.",
+    "gui.computercraft.upload.failed.generic": "Upload de arquivos falhou (%s)",
+    "gui.computercraft.upload.failed.name_too_long": "Nomes de arquivos são muito longos para dar upload.",
+    "gui.computercraft.upload.failed.too_many_files": "Não é possível dar upload nesta quantidade de arquivos.",
+    "gui.computercraft.upload.failed.too_much": "Seus arquivos são muito grandes para dar upload.",
+    "gui.computercraft.upload.no_response": "Transferindo Arquivos",
+    "gui.computercraft.upload.no_response.msg": "Seu computador não usou os arquivos transferidos. Você pode precisar executar o programa %s e tentar novamente.",
     "item.computercraft.disk": "Disquete",
     "item.computercraft.pocket_computer_advanced": "Computador Portátil Avançado",
     "item.computercraft.pocket_computer_advanced.upgraded": "Computador Portátil Avançado %s",
@@ -69,6 +202,25 @@
     "item.computercraft.printed_page": "Página Impressa",
     "item.computercraft.printed_pages": "Páginas Impressas",
     "item.computercraft.treasure_disk": "Disquete",
+    "itemGroup.computercraft": "ComputerCraft",
+    "tag.item.computercraft.computer": "Computadores",
+    "tag.item.computercraft.monitor": "Monitores",
+    "tag.item.computercraft.turtle": "Tartarugas",
+    "tag.item.computercraft.wired_modem": "Modems com Fio",
+    "tracking_field.computercraft.avg": "%s (média)",
+    "tracking_field.computercraft.computer_tasks.name": "Tarefas",
+    "tracking_field.computercraft.count": "%s (contagem)",
+    "tracking_field.computercraft.fs.name": "Operações de sistema",
+    "tracking_field.computercraft.http_download.name": "Download HTTP",
+    "tracking_field.computercraft.http_requests.name": "Solicitações HTTP",
+    "tracking_field.computercraft.http_upload.name": "Upload de HTTP",
+    "tracking_field.computercraft.java_allocation.name": "Alocações Java",
+    "tracking_field.computercraft.max": "%s (máximo)",
+    "tracking_field.computercraft.peripheral.name": "Chamadas Periféricas",
+    "tracking_field.computercraft.server_tasks.name": "Tarefas do servidor",
+    "tracking_field.computercraft.turtle_ops.name": "Operações de tartaruga",
+    "tracking_field.computercraft.websocket_incoming.name": "Entrada do Websocket",
+    "tracking_field.computercraft.websocket_outgoing.name": "Saída do Websocket",
     "upgrade.computercraft.speaker.adjective": "(Alto-Falante)",
     "upgrade.computercraft.wireless_modem_advanced.adjective": "Ender",
     "upgrade.computercraft.wireless_modem_normal.adjective": "sem Fio",