Don't shade all of Netty in the CC:T jar

Fixes #1108. Let this be a lesson to all of us: don't update mods at
midnight after a 20h day while half-delirious.

.gitattributes

@@ -1,5 +1,5 @@
 # Ignore changes in generated files
-src/generated/resources/data/** linguist-generated
+src/generated/** linguist-generated
 src/testMod/server-files/structures linguist-generated
 
 * text=auto

.github/workflows/make-doc.sh

@@ -12,7 +12,7 @@ chmod 600 "$HOME/.ssh/key"
 
 # And upload
 rsync -avc -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no -p $SSH_PORT" \
-      "$GITHUB_WORKSPACE/build/docs/lua/" \
+      "$GITHUB_WORKSPACE/build/docs/site/" \
       "$SSH_USER@$SSH_HOST:/$DEST"
 rsync -avc -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no -p $SSH_PORT" \
       "$GITHUB_WORKSPACE/build/docs/javadoc/" \

CONTRIBUTING.md

@@ -65,7 +65,7 @@ Gradle should be your entrypoint to building most documentation. There's two tas
 
  - `./gradlew luaJavadoc` - Generate documentation stubs for Java methods.
  - `./gradlew docWebsite` - Generate the whole website (including Javascript pages). The resulting HTML is stored at
-   `./build/docs/lua/`.
+   `./build/docs/site/`.
 
 #### Writing documentation
 illuaminate's documentation system is not currently documented (somewhat ironic), but is _largely_ the same as

build.gradle

@@ -88,6 +88,23 @@ minecraft {
             args '--mod', 'computercraft', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
         }
 
+        testClient {
+            workingDirectory project.file('test-files/client')
+            parent runs.client
+
+            mods {
+                cctest {
+                    source sourceSets.testMod
+                }
+            }
+
+            lazyToken('minecraft_classpath') {
+                (configurations.shade.copyRecursive().resolve() + configurations.testModExtra.copyRecursive().resolve())
+                    .collect { it.absolutePath }
+                    .join(File.pathSeparator)
+            }
+        }
+
         gameTestServer {
             workingDirectory project.file('test-files/server')
 
@@ -142,9 +159,12 @@ dependencies {
     annotationProcessor 'org.spongepowered:mixin:0.8.4:processor'
 
     compileOnly fg.deobf("mezz.jei:jei-1.18.2:9.4.1.116:api")
-    runtimeOnly fg.deobf("mezz.jei:jei-1.18.2:9.4.1.116")
+    // runtimeOnly fg.deobf("mezz.jei:jei-1.18.2:9.4.1.116")
 
-    shade 'org.squiddev:Cobalt:0.5.2-SNAPSHOT'
+    shade 'org.squiddev:Cobalt:0.5.5'
+    shade('io.netty:netty-codec-http:4.1.76.Final') {
+        exclude group: "*"
+    }
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.0'
@@ -158,7 +178,7 @@ dependencies {
         exclude group: "org.jetbrains", module: "annotations"
     }
 
-    cctJavadoc 'cc.tweaked:cct-javadoc:1.4.5'
+    cctJavadoc 'cc.tweaked:cct-javadoc:1.4.6'
 }
 
 // Compile tasks
@@ -203,6 +223,8 @@ jar {
         ])
     }
 
+    duplicatesStrategy(DuplicatesStrategy.WARN)
+
     from configurations.shade.collect { it.isDirectory() ? it : zipTree(it) }
 }
 
@@ -220,9 +242,32 @@ processResources {
     try {
         hash = ["git", "-C", projectDir, "rev-parse", "HEAD"].execute().text.trim()
 
-        def blacklist = ['GitHub', 'dan200', 'Daniel Ratcliffe']
-        ["git", "-C", projectDir, "log", "--format=tformat:%an%n%cn"].execute().text.split('\n').each {
-            if (!blacklist.contains(it)) contributors.add(it)
+        def blacklist = ['GitHub', 'Daniel Ratcliffe', 'Weblate']
+
+        // Extract all authors, commiters and co-authors from the git log.
+        def authors = ["git", "-C", projectDir, "log", "--format=tformat:%an <%ae>%n%cn <%ce>%n%(trailers:key=Co-authored-by,valueonly)"]
+            .execute().text.readLines().unique()
+
+        // We now pass this through git's mailmap to de-duplicate some authors.
+        def remapAuthors = ["git", "check-mailmap", "--stdin"].execute()
+        remapAuthors.withWriter { stdin ->
+            if (stdin !instanceof BufferedWriter) stdin = new BufferedWriter(stdin)
+
+            authors.forEach {
+                if (it == "") return
+                if (!it.endsWith(">")) it += ">" // Some commits have broken Co-Authored-By lines!
+                stdin.writeLine(it)
+            }
+            stdin.close()
+        }
+
+        // And finally extract out the actual name.
+        def emailRegex = ~/^([^<]+) <.+>$/
+        remapAuthors.text.readLines().forEach {
+            def matcher = it =~ emailRegex
+            matcher.find()
+            def name = matcher.group(1)
+            if (!blacklist.contains(name)) contributors.add(name)
         }
     } catch (Exception e) {
         e.printStackTrace()
@@ -274,7 +319,7 @@ task rollup(type: Exec) {
 
 task illuaminateDocs(type: Exec, dependsOn: [rollup, luaJavadoc]) {
     group = "build"
-    description = "Bundles JS into rollup"
+    description = "Generates docs using Illuaminate"
 
     inputs.files(fileTree("doc")).withPropertyName("docs")
     inputs.files(fileTree("src/main/resources/data/computercraft/lua/rom")).withPropertyName("lua rom")
@@ -287,7 +332,21 @@ task illuaminateDocs(type: Exec, dependsOn: [rollup, luaJavadoc]) {
     commandLine mkCommand('"bin/illuaminate" doc-gen')
 }
 
-task docWebsite(type: Copy, dependsOn: [illuaminateDocs]) {
+task jsxDocs(type: Exec, dependsOn: [illuaminateDocs]) {
+    group = "build"
+    description = "Post-processes documentation to statically render some dynamic content."
+
+    inputs.files(fileTree("src/web")).withPropertyName("sources")
+    inputs.file("src/generated/export/index.json").withPropertyName("export")
+    inputs.file("package-lock.json").withPropertyName("package-lock.json")
+    inputs.file("tsconfig.json").withPropertyName("Typescript config")
+    inputs.files(fileTree("$buildDir/docs/lua"))
+    outputs.dir("$buildDir/docs/site")
+
+    commandLine mkCommand('"node_modules/.bin/ts-node" --esm src/web/transform.tsx')
+}
+
+task docWebsite(type: Copy, dependsOn: [jsxDocs]) {
     from('doc') {
         include 'logo.png'
         include 'images/**'
@@ -295,7 +354,14 @@ task docWebsite(type: Copy, dependsOn: [illuaminateDocs]) {
     from("$buildDir/rollup") {
         exclude 'index.js'
     }
-    into "${project.docsDir}/lua"
+    from("$buildDir/docs/lua") {
+        exclude '**/*.html'
+    }
+    from("src/generated/export/items") {
+        into("images/items")
+    }
+
+    into "${project.docsDir}/site"
 }
 
 // Check tasks

config/checkstyle/checkstyle.xml

@@ -83,7 +83,9 @@
         <module name="JavadocBlockTagLocation" />
         <module name="JavadocMethod"/>
         <module name="JavadocType"/>
-        <module name="JavadocStyle" />
+        <module name="JavadocStyle">
+            <property name="checkHtml" value="false" />
+        </module>
         <module name="NonEmptyAtclauseDescription" />
         <module name="SingleLineJavadoc" />
         <module name="SummaryJavadocCheck"/>

doc/events/mouse_click.md

@@ -15,13 +15,11 @@ advanced turtles and pocket computers).
 Several mouse events (@{mouse_click}, @{mouse_up}, @{mouse_scroll}) contain a "mouse button" code. This takes a
 numerical value depending on which button on your mouse was last pressed when this event occurred.
 
-<table class="pretty-table">
-    <!-- Our markdown parser doesn't work on tables!? Guess I'll have to roll my own soonish :/. -->
-    <tr><th>Button code</th><th>Mouse button</th></tr>
-    <tr><td align="right">1</td><td>Left button</td></tr>
-    <tr><td align="right">2</td><td>Right button</td></tr>
-    <tr><td align="right">3</td><td>Middle button</td></tr>
-</table>
+| Button Code | Mouse Button  |
+|------------:|---------------|
+|           1 | Left button   |
+|           2 | Right button  |
+|           3 | Middle button |
 
 ## Example
 Print the button and the coordinates whenever the mouse is clicked.

doc/guides/local_ips.md

@@ -0,0 +1,99 @@
+---
+module: [kind=guide] local_ips
+---
+
+# Allowing access to local IPs
+By default, ComputerCraft blocks access to local IP addresses for security. This means you can't normally access any
+HTTP server running on your computer. However, this may be useful for testing programs without having a remote
+server. You can unblock these IPs in the ComputerCraft config.
+
+ - [Minecraft 1.13 and later, CC:T 1.87.0 and later](#cc-1.87.0)
+ - [Minecraft 1.13 and later, CC:T 1.86.2 and earlier](#cc-1.86.2)
+ - [Minecraft 1.12.2 and earlier](#mc-1.12)
+
+## Minecraft 1.13 and later, CC:T 1.87.0 and later {#cc-1.87.0}
+The configuration file can be located at `serverconfig/computercraft-server.toml` inside the world folder on either
+single-player or multiplayer. Look for lines that look like this:
+
+```toml
+#A list of rules which control behaviour of the "http" API for specific domains or IPs.
+#Each rule is an item with a 'host' to match against, and a series of properties. The host may be a domain name ("pastebin.com"),
+#wildcard ("*.pastebin.com") or CIDR notation ("127.0.0.0/8"). If no rules, the domain is blocked.
+[[http.rules]]
+    host = "$private"
+    action = "deny"
+```
+
+On 1.95.0 and later, this will be a single entry with `host = "$private"`. On earlier versions, this will be a number of
+`[[http.rules]]` with various IP addresses. You will want to remove all of the `[[http.rules]]` entires that have
+`action = "deny"`. Then save the file and relaunch Minecraft (Server).
+
+Here's what it should look like after removing:
+
+```toml
+#A list of rules which control behaviour of the "http" API for specific domains or IPs.
+#Each rule is an item with a 'host' to match against, and a series of properties. The host may be a domain name ("pastebin.com"),
+#wildcard ("*.pastebin.com") or CIDR notation ("127.0.0.0/8"). If no rules, the domain is blocked.
+[[http.rules]]
+    #The maximum size (in bytes) that a computer can send or receive in one websocket packet.
+    max_websocket_message = 131072
+    host = "*"
+    #The maximum size (in bytes) that a computer can upload in a single request. This includes headers and POST text.
+    max_upload = 4194304
+    action = "allow"
+    #The maximum size (in bytes) that a computer can download in a single request. Note that responses may receive more data than allowed, but this data will not be returned to the client.
+    max_download = 16777216
+    #The period of time (in milliseconds) to wait before a HTTP request times out. Set to 0 for unlimited.
+    timeout = 30000
+```
+
+## Minecraft 1.13 and later, CC:T 1.86.2 and earlier {#cc-1.86.2}
+The configuration file for singleplayer is at `.minecraft/config/computercraft-common.toml`. Look for lines that look
+like this:
+
+```toml
+#A list of wildcards for domains or IP ranges that cannot be accessed through the "http" API on Computers.
+#If this is empty then all whitelisted domains will be accessible. Example: "*.github.com" will block access to all subdomains of github.com.
+#You can use domain names ("pastebin.com"), wilcards ("*.pastebin.com") or CIDR notation ("127.0.0.0/8").
+blacklist = ["127.0.0.0/8", "10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "fd00::/8"]
+```
+
+Remove everything inside the array, leaving the last line as `blacklist = []`. Then save the file and relaunch Minecraft.
+
+Here's what it should look like after removing:
+
+```toml
+#A list of wildcards for domains or IP ranges that cannot be accessed through the "http" API on Computers.
+#If this is empty then all whitelisted domains will be accessible. Example: "*.github.com" will block access to all subdomains of github.com.
+#You can use domain names ("pastebin.com"), wilcards ("*.pastebin.com") or CIDR notation ("127.0.0.0/8").
+blacklist = []
+```
+
+## Minecraft 1.12.2 and earlier {#mc-1.12}
+On singleplayer, the configuration file is located at `.minecraft\config\ComputerCraft.cfg`. On multiplayer, the
+configuration file is located at `<server folder>\config\ComputerCraft.cfg`. Look for lines that look like this:
+
+```ini
+# A list of wildcards for domains or IP ranges that cannot be accessed through the "http" API on Computers.
+# If this is empty then all explicitly allowed domains will be accessible. Example: "*.github.com" will block access to all subdomains of github.com.
+# You can use domain names ("pastebin.com"), wildcards ("*.pastebin.com") or CIDR notation ("127.0.0.0/8").
+S:blocked_domains <
+    127.0.0.0/8
+    10.0.0.0/8
+    172.16.0.0/12
+    192.168.0.0/16
+    fd00::/8
+ >
+```
+
+Delete everything between the `<>`, leaving the last line as `S:blocked_domains = <>`. Then save the file and relaunch
+Minecraft (Server).
+
+Here's what it should look like after removing:
+
+```ini
+# A list of wildcards for domains or IP ranges that cannot be accessed through the "http" API on Computers.
+# If this is empty then all explicitly allowed domains will be accessible. Example: "*.github.com" will block access to all subdomains of github.com.
+# You can use domain names ("pastebin.com"), wildcards ("*.pastebin.com") or CIDR notation ("127.0.0.0/8").
+S:blocked_domains <>
+```

doc/guides/speaker_audio.md

@@ -125,7 +125,7 @@ different.
 First, we require the dfpwm module and call @{cc.audio.dfpwm.make_decoder} to construct a new decoder. This decoder
 accepts blocks of DFPWM data and converts it to a list of 8-bit amplitudes, which we can then play with our speaker.
 
-As mentioned to above, @{speaker.playAudio} accepts at most 128×1024 samples in one go. DFPMW uses a single bit for each
+As mentioned above, @{speaker.playAudio} accepts at most 128×1024 samples in one go. DFPMW uses a single bit for each
 sample, which means we want to process our audio in chunks of 16×1024 bytes (16KiB). In order to do this, we use
 @{io.lines}, which provides a nice way to loop over chunks of a file. You can of course just use @{fs.open} and
 @{fs.BinaryReadHandle.read} if you prefer.
@@ -136,22 +136,22 @@ You can mix together samples from different streams by adding their amplitudes,
 samples, etc...
 
 Let's put together a small demonstration here. We're going to add a small delay effect to the song above, so that you
-hear a faint echo about a second later.
+hear a faint echo a second and a half later.
 
 In order to do this, we'll follow a format similar to the previous example, decoding the audio and then playing it.
 However, we'll also add some new logic between those two steps, which loops over every sample in our chunk of audio, and
-adds the sample from one second ago to it.
+adds the sample from 1.5 seconds ago to it.
 
-For this, we'll need to keep track of the last 48k samples - exactly one seconds worth of audio. We can do this using a
+For this, we'll need to keep track of the last 72k samples - exactly 1.5 seconds worth of audio. We can do this using a
 [Ring Buffer], which helps makes things a little more efficient.
 
 ```lua {data-peripheral=speaker}
 local dfpwm = require("cc.audio.dfpwm")
 local speaker = peripheral.find("speaker")
 
--- Speakers play at 48kHz, so one second is 48k samples. We first fill our buffer
+-- Speakers play at 48kHz, so 1.5 seconds is 72k samples. We first fill our buffer
 -- with 0s, as there's nothing to echo at the start of the track!
-local samples_i, samples_n = 1, 48000
+local samples_i, samples_n = 1, 48000 * 1.5
 local samples = {}
 for i = 1, samples_n do samples[i] = 0 end
 
@@ -162,7 +162,7 @@ for chunk in io.lines("data/example.dfpwm", 16 * 1024) do
     for i = 1, #buffer do
         local original_value = buffer[i]
 
-        -- Replace this sample with its current amplitude plus the amplitude from one second ago.
+        -- Replace this sample with its current amplitude plus the amplitude from 1.5 seconds ago.
         -- We scale both to ensure the resulting value is still between -128 and 127.
         buffer[i] = original_value * 0.6 + samples[samples_i] * 0.4
 
@@ -175,6 +175,11 @@ for chunk in io.lines("data/example.dfpwm", 16 * 1024) do
     while not speaker.playAudio(buffer) do
         os.pullEvent("speaker_audio_empty")
     end
+
+    -- The audio processing above can be quite slow and preparing the first batch of audio
+    -- may timeout the computer. We sleep to avoid this.
+    -- There's definitely better ways of handling this - this is just an example!
+    sleep(0.05)
 end
 ```
 

doc/reference/feature_compat.md

@@ -0,0 +1,95 @@
+---
+module: [kind=reference] feature_compat
+---
+
+# Lua 5.2/5.3 features in CC: Tweaked
+CC: Tweaked is based off of the Cobalt Lua runtime, which uses Lua 5.1. However, Cobalt and CC:T implement additional features from Lua 5.2 and 5.3 (as well as some deprecated 5.0 features) that are not available in base 5.1. This page lists all of the compatibility for these newer versions.
+
+## Lua 5.2
+| Feature                                                       | Supported? | Notes                                                             |
+|---------------------------------------------------------------|------------|-------------------------------------------------------------------|
+| `goto`/labels                                                 | ❌         |                                                                   |
+| `_ENV`                                                        | 🔶         | The `_ENV` global points to `getfenv()`, but it cannot be set.    |
+| `\z` escape                                                   | ✔          |                                                                   |
+| `\xNN` escape                                                 | ✔          |                                                                   |
+| Hex literal fractional/exponent parts                         | ✔          |                                                                   |
+| Empty statements                                              | ❌         |                                                                   |
+| `__len` metamethod                                            | ✔          |                                                                   |
+| `__ipairs` metamethod                                         | ❌         |                                                                   |
+| `__pairs` metamethod                                          | ✔          |                                                                   |
+| `bit32` library                                               | ✔          |                                                                   |
+| `collectgarbage` isrunning, generational, incremental options | ❌         | `collectgarbage` does not exist in CC:T.                          |
+| New `load` syntax                                             | ✔          |                                                                   |
+| `loadfile` mode parameter                                     | ✔          | Supports both 5.1 and 5.2+ syntax.                                |
+| Removed `loadstring`                                          | 🔶         | Only if `disable_lua51_features` is enabled in the configuration. |
+| Removed `getfenv`, `setfenv`                                  | 🔶         | Only if `disable_lua51_features` is enabled in the configuration. |
+| `rawlen` function                                             | ✔          |                                                                   |
+| Negative index to `select`                                    | ✔          |                                                                   |
+| Removed `unpack`                                              | 🔶         | Only if `disable_lua51_features` is enabled in the configuration. |
+| Arguments to `xpcall`                                         | ❌         |                                                                   |
+| Second return value from `coroutine.running`                  | ❌         |                                                                   |
+| Removed `module`                                              | ✔          |                                                                   |
+| `package.loaders` -> `package.searchers`                      | ❌         |                                                                   |
+| Second argument to loader functions                           | ✔          |                                                                   |
+| `package.config`                                              | ✔          |                                                                   |
+| `package.searchpath`                                          | ✔          |                                                                   |
+| Removed `package.seeall`                                      | ✔          |                                                                   |
+| `string.dump` on functions with upvalues (blanks them out)    | ✔          |                                                                   |
+| `string.rep` separator                                        | ❌         |                                                                   |
+| `%g` match group                                              | ❌         |                                                                   |
+| Removal of `%z` match group                                   | ❌         |                                                                   |
+| Removed `table.maxn`                                          | 🔶         | Only if `disable_lua51_features` is enabled in the configuration. |
+| `table.pack`/`table.unpack`                                   | ✔          |                                                                   |
+| `math.log` base argument                                      | ✔          |                                                                   |
+| Removed `math.log10`                                          | 🔶         | Only if `disable_lua51_features` is enabled in the configuration. |
+| `*L` mode to `file:read`                                      | ✔          |                                                                   |
+| `os.execute` exit type + return value                         | ❌         | `os.execute` does not exist in CC:T.                              |
+| `os.exit` close argument                                      | ❌         | `os.exit` does not exist in CC:T.                                 |
+| `istailcall` field in `debug.getinfo`                         | ❌         |                                                                   |
+| `nparams` field in `debug.getinfo`                            | ✔          |                                                                   |
+| `isvararg` field in `debug.getinfo`                           | ✔          |                                                                   |
+| `debug.getlocal` negative indices for varargs                 | ❌         |                                                                   |
+| `debug.getuservalue`/`debug.setuservalue`                     | ❌         | Userdata are rarely used in CC:T, so this is not necessary.       |
+| `debug.upvalueid`                                             | ✔          |                                                                   |
+| `debug.upvaluejoin`                                           | ✔          |                                                                   |
+| Tail call hooks                                               | ❌         |                                                                   |
+| `=` prefix for chunks                                         | ✔          |                                                                   |
+| Yield across C boundary                                       | ✔          |                                                                   |
+| Removal of ambiguity error                                    | ❌         |                                                                   |
+| Identifiers may no longer use locale-dependent letters        | ✔          |                                                                   |
+| Ephemeron tables                                              | ❌         |                                                                   |
+| Identical functions may be reused                             | ❌         |                                                                   |
+| Generational garbage collector                                | ❌         | Cobalt uses the built-in Java garbage collector.                  |
+
+## Lua 5.3
+| Feature                                                                               | Supported? | Notes                     |
+|---------------------------------------------------------------------------------------|------------|---------------------------|
+| Integer subtype                                                                       | ❌         |                           |
+| Bitwise operators/floor division                                                      | ❌         |                           |
+| `\u{XXX}` escape sequence                                                             | ✔          |                           |
+| `utf8` library                                                                        | ✔          |                           |
+| removed `__ipairs` metamethod                                                         | ✔          |                           |
+| `coroutine.isyieldable`                                                               | ❌         |                           |
+| `string.dump` strip argument                                                          | ✔          |                           |
+| `string.pack`/`string.unpack`/`string.packsize`                                       | ✔          |                           |
+| `table.move`                                                                          | ❌         |                           |
+| `math.atan2` -> `math.atan`                                                           | ❌         |                           |
+| Removed `math.frexp`, `math.ldexp`, `math.pow`, `math.cosh`, `math.sinh`, `math.tanh` | ❌         |                           |
+| `math.maxinteger`/`math.mininteger`                                                   | ❌         |                           |
+| `math.tointeger`                                                                      | ❌         |                           |
+| `math.type`                                                                           | ❌         |                           |
+| `math.ult`                                                                            | ❌         |                           |
+| Removed `bit32` library                                                               | ❌         |                           |
+| Remove `*` from `file:read` modes                                                     | ✔          |                           |
+| Metamethods respected in `table.*`, `ipairs`                                          | 🔶         | Only `__lt` is respected. |
+
+## Lua 5.0
+| Feature                          | Supported? | Notes                                            |
+|----------------------------------|------------|--------------------------------------------------|
+| `arg` table                      | 🔶         | Only set in the shell - not used in functions.   |
+| `string.gfind`                   | ✔          | Equal to `string.gmatch`.                        |
+| `table.getn`                     | ✔          | Equal to `#tbl`.                                 |
+| `table.setn`                     | ❌         |                                                  |
+| `math.mod`                       | ✔          | Equal to `math.fmod`.                            |
+| `table.foreach`/`table.foreachi` | ✔          |                                                  |
+| `gcinfo`                         | ❌         | Cobalt uses the built-in Java garbage collector. |

doc/stub/fs.lua

@@ -1,6 +1,4 @@
----  The FS API allows you to manipulate files and the filesystem.
---
--- @module fs
+--- @module fs
 
 --- Returns true if a path is mounted to the parent filesystem.
 --

doc/stub/global.lua

@@ -62,7 +62,7 @@ function print(...) end
 -- @usage printError("Something went wrong!")
 function printError(...) end
 
---[[- Reads user input from the terminal, automatically handling arrow keys,
+--[[- Reads user input from the terminal. This automatically handles arrow keys,
 pasting, character replacement, history scrollback, auto-completion, and
 default values.
 
@@ -110,10 +110,15 @@ the prompt.
 ]]
 function read(replaceChar, history, completeFn, default) end
 
---- The ComputerCraft and Minecraft version of the current computer environment.
+--- Stores the current ComputerCraft and Minecraft versions.
+--
+-- Outside of Minecraft (for instance, in an emulator) @{_HOST} will contain the
+-- emulator's version instead.
 --
 -- For example, `ComputerCraft 1.93.0 (Minecraft 1.15.2)`.
--- @usage _HOST
+-- @usage Print the current computer's environment.
+--
+--     print(_HOST)
 -- @since 1.76
 _HOST = _HOST
 

doc/stub/http.lua

@@ -1,14 +1,13 @@
---- The http library allows communicating with web servers, sending and
--- receiving data from them.
+--- Make HTTP requests, sending and receiving data to a remote web server.
 --
 -- @module http
 -- @since 1.1
+-- @see local_ips To allow accessing servers running on your local network.
 
 --- Asynchronously make a HTTP request to the given url.
 --
--- This returns immediately, a [`http_success`](#http-success-event) or
--- [`http_failure`](#http-failure-event) will be queued once the request has
--- completed.
+-- This returns immediately, a @{http_success} or @{http_failure} will be queued
+-- once the request has completed.
 --
 -- @tparam      string url   The url to request
 -- @tparam[opt] string body  An optional string containing the body of the
@@ -112,9 +111,8 @@ function post(...) end
 
 --- Asynchronously determine whether a URL can be requested.
 --
--- If this returns `true`, one should also listen for [`http_check`
--- events](#http-check-event) which will container further information about
--- whether the URL is allowed or not.
+-- If this returns `true`, one should also listen for @{http_check} which will
+-- container further information about whether the URL is allowed or not.
 --
 -- @tparam string url The URL to check.
 -- @treturn true When this url is not invalid. This does not imply that it is
@@ -128,9 +126,8 @@ function checkURLAsync(url) end
 
 --- Determine whether a URL can be requested.
 --
--- If this returns `true`, one should also listen for [`http_check`
--- events](#http-check-event) which will container further information about
--- whether the URL is allowed or not.
+-- If this returns `true`, one should also listen for @{http_check} which will
+-- container further information about whether the URL is allowed or not.
 --
 -- @tparam string url The URL to check.
 -- @treturn true When this url is valid and can be requested via @{http.request}.
@@ -168,9 +165,8 @@ function websocket(url, headers) end
 
 --- Asynchronously open a websocket.
 --
--- This returns immediately, a [`websocket_success`](#websocket-success-event)
--- or [`websocket_failure`](#websocket-failure-event) will be queued once the
--- request has completed.
+-- This returns immediately, a @{websocket_success} or @{websocket_failure}
+-- will be queued once the request has completed.
 --
 -- @tparam string url The websocket url to connect to. This should have the
 -- `ws://` or `wss://` protocol.

gradle.properties

@@ -1,10 +1,10 @@
 org.gradle.jvmargs=-Xmx3G
 
 # Mod properties
-mod_version=1.100.4
+mod_version=1.100.7
 
 # Minecraft properties (update mods.toml when changing)
-mc_version=1.18.2
-mapping_version=2022.02.13
-forge_version=40.0.24
+mc_version=1.19
+mapping_version=2022.03.13
+forge_version=41.0.16
 # NO SERIOUSLY, UPDATE mods.toml WHEN CHANGING

illuaminate.sexp

@@ -1,9 +1,7 @@
 ; -*- mode: Lisp;-*-
 
 (sources
-  /doc/events/
-  /doc/guides/
-  /doc/stub/
+  /doc/
   /build/docs/luaJavadoc/
   /src/main/resources/*/computercraft/lua/bios.lua
   /src/main/resources/*/computercraft/lua/rom/
@@ -29,7 +27,8 @@
     (peripheral Peripherals)
     (generic_peripheral "Generic Peripherals")
     (event Events)
-    (guide Guides))
+    (guide Guides)
+    (reference Reference))
 
   (library-path
     /doc/stub/

package.json

@@ -4,6 +4,7 @@
   "description": "Website additions for tweaked.cc",
   "author": "SquidDev",
   "license": "BSD-3-Clause",
+  "type": "module",
   "dependencies": {
     "preact": "^10.5.5",
     "tslib": "^2.0.3"
@@ -11,9 +12,18 @@
   "devDependencies": {
     "@rollup/plugin-typescript": "^8.2.5",
     "@rollup/plugin-url": "^6.1.0",
+    "@types/glob": "^7.2.0",
+    "@types/react-dom": "^18.0.5",
+    "glob": "^8.0.3",
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0",
+    "rehype": "^12.0.1",
+    "rehype-highlight": "^5.0.2",
+    "rehype-react": "^7.1.1",
     "requirejs": "^2.3.6",
     "rollup": "^2.33.1",
     "rollup-plugin-terser": "^7.0.2",
+    "ts-node": "^10.8.0",
     "typescript": "^4.0.5"
   }
 }

src/generated/export/index.json

@@ -0,0 +1,760 @@
+{
+  "itemNames": {
+    "computercraft:cable": "Networking Cable",
+    "computercraft:computer_advanced": "Advanced Computer",
+    "computercraft:computer_command": "Command Computer",
+    "computercraft:computer_normal": "Computer",
+    "computercraft:disk": "Floppy Disk",
+    "computercraft:disk_drive": "Disk Drive",
+    "computercraft:monitor_advanced": "Advanced Monitor",
+    "computercraft:monitor_normal": "Monitor",
+    "computercraft:pocket_computer_advanced": "Advanced Pocket Computer",
+    "computercraft:pocket_computer_normal": "Pocket Computer",
+    "computercraft:printed_book": "Printed Book",
+    "computercraft:printed_page": "Printed Page",
+    "computercraft:printed_pages": "Printed Pages",
+    "computercraft:printer": "Printer",
+    "computercraft:speaker": "Speaker",
+    "computercraft:treasure_disk": "Floppy Disk",
+    "computercraft:turtle_advanced": "Advanced Turtle",
+    "computercraft:turtle_normal": "Turtle",
+    "computercraft:wired_modem": "Wired Modem",
+    "computercraft:wired_modem_full": "Wired Modem",
+    "computercraft:wireless_modem_advanced": "Ender Modem",
+    "computercraft:wireless_modem_normal": "Wireless Modem",
+    "minecraft:black_dye": "Black Dye",
+    "minecraft:blue_dye": "Blue Dye",
+    "minecraft:brown_dye": "Brown Dye",
+    "minecraft:chest": "Chest",
+    "minecraft:command_block": "Command Block",
+    "minecraft:cyan_dye": "Cyan Dye",
+    "minecraft:ender_eye": "Eye of Ender",
+    "minecraft:ender_pearl": "Ender Pearl",
+    "minecraft:glass_pane": "Glass Pane",
+    "minecraft:gold_block": "Block of Gold",
+    "minecraft:gold_ingot": "Gold Ingot",
+    "minecraft:golden_apple": "Golden Apple",
+    "minecraft:gray_dye": "Gray Dye",
+    "minecraft:green_dye": "Green Dye",
+    "minecraft:iron_ingot": "Iron Ingot",
+    "minecraft:leather": "Leather",
+    "minecraft:light_blue_dye": "Light Blue Dye",
+    "minecraft:light_gray_dye": "Light Gray Dye",
+    "minecraft:lime_dye": "Lime Dye",
+    "minecraft:magenta_dye": "Magenta Dye",
+    "minecraft:note_block": "Note Block",
+    "minecraft:orange_dye": "Orange Dye",
+    "minecraft:pink_dye": "Pink Dye",
+    "minecraft:purple_dye": "Purple Dye",
+    "minecraft:red_dye": "Red Dye",
+    "minecraft:redstone": "Redstone Dust",
+    "minecraft:stone": "Stone",
+    "minecraft:string": "String",
+    "minecraft:white_dye": "White Dye",
+    "minecraft:yellow_dye": "Yellow Dye"
+  },
+  "recipes": {
+    "computercraft:cable": {
+      "inputs": [
+        null,
+        [
+          "minecraft:stone"
+        ],
+        null,
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:redstone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        null,
+        [
+          "minecraft:stone"
+        ],
+        null
+      ],
+      "output": "computercraft:cable",
+      "count": 6
+    },
+    "computercraft:computer_advanced": {
+      "inputs": [
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:redstone"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:glass_pane"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ]
+      ],
+      "output": "computercraft:computer_advanced",
+      "count": 1
+    },
+    "computercraft:computer_advanced_upgrade": {
+      "inputs": [
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "computercraft:computer_normal"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        null,
+        [
+          "minecraft:gold_ingot"
+        ]
+      ],
+      "output": "computercraft:computer_advanced",
+      "count": 1
+    },
+    "computercraft:computer_command": {
+      "inputs": [
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:command_block"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:glass_pane"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ]
+      ],
+      "output": "computercraft:computer_command",
+      "count": 1
+    },
+    "computercraft:computer_normal": {
+      "inputs": [
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:redstone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:glass_pane"
+        ],
+        [
+          "minecraft:stone"
+        ]
+      ],
+      "output": "computercraft:computer_normal",
+      "count": 1
+    },
+    "computercraft:disk_drive": {
+      "inputs": [
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:redstone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:redstone"
+        ],
+        [
+          "minecraft:stone"
+        ]
+      ],
+      "output": "computercraft:disk_drive",
+      "count": 1
+    },
+    "computercraft:monitor_advanced": {
+      "inputs": [
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:glass_pane"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ]
+      ],
+      "output": "computercraft:monitor_advanced",
+      "count": 4
+    },
+    "computercraft:monitor_normal": {
+      "inputs": [
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:glass_pane"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ]
+      ],
+      "output": "computercraft:monitor_normal",
+      "count": 1
+    },
+    "computercraft:pocket_computer_advanced": {
+      "inputs": [
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:golden_apple"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:glass_pane"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ]
+      ],
+      "output": "computercraft:pocket_computer_advanced",
+      "count": 1
+    },
+    "computercraft:pocket_computer_advanced_upgrade": {
+      "inputs": [
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "computercraft:pocket_computer_normal"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        null,
+        [
+          "minecraft:gold_ingot"
+        ]
+      ],
+      "output": "computercraft:pocket_computer_advanced",
+      "count": 1
+    },
+    "computercraft:pocket_computer_normal": {
+      "inputs": [
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:golden_apple"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:glass_pane"
+        ],
+        [
+          "minecraft:stone"
+        ]
+      ],
+      "output": "computercraft:pocket_computer_normal",
+      "count": 1
+    },
+    "computercraft:printed_book": {
+      "inputs": [
+        [
+          "minecraft:leather"
+        ],
+        [
+          "computercraft:printed_page"
+        ],
+        [
+          "minecraft:string"
+        ],
+        null,
+        null,
+        null,
+        null,
+        null,
+        null
+      ],
+      "output": "computercraft:printed_book",
+      "count": 1
+    },
+    "computercraft:printed_pages": {
+      "inputs": [
+        [
+          "computercraft:printed_page"
+        ],
+        [
+          "computercraft:printed_page"
+        ],
+        [
+          "minecraft:string"
+        ],
+        null,
+        null,
+        null,
+        null,
+        null,
+        null
+      ],
+      "output": "computercraft:printed_pages",
+      "count": 1
+    },
+    "computercraft:printer": {
+      "inputs": [
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:redstone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:black_dye",
+          "minecraft:blue_dye",
+          "minecraft:brown_dye",
+          "minecraft:cyan_dye",
+          "minecraft:gray_dye",
+          "minecraft:green_dye",
+          "minecraft:light_blue_dye",
+          "minecraft:light_gray_dye",
+          "minecraft:lime_dye",
+          "minecraft:magenta_dye",
+          "minecraft:orange_dye",
+          "minecraft:pink_dye",
+          "minecraft:purple_dye",
+          "minecraft:red_dye",
+          "minecraft:white_dye",
+          "minecraft:yellow_dye"
+        ],
+        [
+          "minecraft:stone"
+        ]
+      ],
+      "output": "computercraft:printer",
+      "count": 1
+    },
+    "computercraft:speaker": {
+      "inputs": [
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:note_block"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:redstone"
+        ],
+        [
+          "minecraft:stone"
+        ]
+      ],
+      "output": "computercraft:speaker",
+      "count": 1
+    },
+    "computercraft:turtle_advanced": {
+      "inputs": [
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "computercraft:computer_advanced"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:chest"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ]
+      ],
+      "output": "computercraft:turtle_advanced",
+      "count": 1
+    },
+    "computercraft:turtle_advanced_upgrade": {
+      "inputs": [
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "computercraft:turtle_normal"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        null,
+        [
+          "minecraft:gold_block"
+        ],
+        null
+      ],
+      "output": "computercraft:turtle_advanced",
+      "count": 1
+    },
+    "computercraft:turtle_normal": {
+      "inputs": [
+        [
+          "minecraft:iron_ingot"
+        ],
+        [
+          "minecraft:iron_ingot"
+        ],
+        [
+          "minecraft:iron_ingot"
+        ],
+        [
+          "minecraft:iron_ingot"
+        ],
+        [
+          "computercraft:computer_normal"
+        ],
+        [
+          "minecraft:iron_ingot"
+        ],
+        [
+          "minecraft:iron_ingot"
+        ],
+        [
+          "minecraft:chest"
+        ],
+        [
+          "minecraft:iron_ingot"
+        ]
+      ],
+      "output": "computercraft:turtle_normal",
+      "count": 1
+    },
+    "computercraft:wired_modem": {
+      "inputs": [
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:redstone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ]
+      ],
+      "output": "computercraft:wired_modem",
+      "count": 1
+    },
+    "computercraft:wired_modem_full_from": {
+      "inputs": [
+        [
+          "computercraft:wired_modem"
+        ],
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null
+      ],
+      "output": "computercraft:wired_modem_full",
+      "count": 1
+    },
+    "computercraft:wired_modem_full_to": {
+      "inputs": [
+        [
+          "computercraft:wired_modem_full"
+        ],
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null
+      ],
+      "output": "computercraft:wired_modem",
+      "count": 1
+    },
+    "computercraft:wireless_modem_advanced": {
+      "inputs": [
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:ender_eye"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ],
+        [
+          "minecraft:gold_ingot"
+        ]
+      ],
+      "output": "computercraft:wireless_modem_advanced",
+      "count": 1
+    },
+    "computercraft:wireless_modem_normal": {
+      "inputs": [
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:ender_pearl"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ],
+        [
+          "minecraft:stone"
+        ]
+      ],
+      "output": "computercraft:wireless_modem_normal",
+      "count": 1
+    }
+  }
+}

src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java

@@ -6,6 +6,7 @@
 package dan200.computercraft;
 
 import dan200.computercraft.api.ComputerCraftAPI.IComputerCraftAPI;
+import dan200.computercraft.api.detail.IDetailProvider;
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.filesystem.IWritableMount;
 import dan200.computercraft.api.lua.GenericSource;
@@ -24,6 +25,7 @@ import dan200.computercraft.shared.BundledRedstone;
 import dan200.computercraft.shared.MediaProviders;
 import dan200.computercraft.shared.Peripherals;
 import dan200.computercraft.shared.peripheral.generic.GenericPeripheralProvider;
+import dan200.computercraft.shared.peripheral.generic.data.DetailProviders;
 import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork;
 import dan200.computercraft.shared.util.IDAssigner;
 import dan200.computercraft.shared.wired.WiredNode;
@@ -59,9 +61,11 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
     public static InputStream getResourceFile( String domain, String subPath )
     {
         var manager = ServerLifecycleHooks.getCurrentServer().getResourceManager();
+        var resource = manager.getResource( new ResourceLocation( domain, subPath ) ).orElse( null );
+        if( resource == null ) return null;
         try
         {
-            return manager.getResource( new ResourceLocation( domain, subPath ) ).getInputStream();
+            return resource.open();
         }
         catch( IOException ignored )
         {
@@ -155,6 +159,12 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
         ApiFactories.register( factory );
     }
 
+    @Override
+    public <T> void registerDetailProvider( @Nonnull Class<T> type, @Nonnull IDetailProvider<T> provider )
+    {
+        DetailProviders.registerProvider( type, provider );
+    }
+
     @Nonnull
     @Override
     public IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element )

src/main/java/dan200/computercraft/api/ComputerCraftAPI.java

@@ -5,6 +5,8 @@
  */
 package dan200.computercraft.api;
 
+import dan200.computercraft.api.detail.BlockReference;
+import dan200.computercraft.api.detail.IDetailProvider;
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.filesystem.IWritableMount;
 import dan200.computercraft.api.lua.GenericSource;
@@ -20,10 +22,12 @@ import dan200.computercraft.api.peripheral.IPeripheralProvider;
 import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
+import net.minecraftforge.fluids.FluidStack;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -196,6 +200,20 @@ public final class ComputerCraftAPI
         getInstance().registerAPIFactory( factory );
     }
 
+    /**
+     * Registers a detail provider to provide additional details for blocks, fluids and items when inspected by methods
+     * such as {@code turtle.getItemDetail()} or {@code turtle.inspect()}.
+     *
+     * @param type     The type of object that this provider can provide details for. Should be {@link BlockReference},
+     *                 {@link FluidStack} or {@link ItemStack}.
+     * @param provider The detail provider to register.
+     * @param <T>      The type of object that this provider can provide details for.
+     */
+    public static <T> void registerDetailProvider( @Nonnull Class<T> type, @Nonnull IDetailProvider<T> provider )
+    {
+        getInstance().registerDetailProvider( type, provider );
+    }
+
     /**
      * Construct a new wired node for a given wired element.
      *
@@ -272,6 +290,8 @@ public final class ComputerCraftAPI
 
         void registerAPIFactory( @Nonnull ILuaAPIFactory factory );
 
+        <T> void registerDetailProvider( @Nonnull Class<T> type, @Nonnull IDetailProvider<T> provider );
+
         @Nonnull
         IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element );
 

src/main/java/dan200/computercraft/api/detail/BasicItemDetailProvider.java

@@ -0,0 +1,79 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2022. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+package dan200.computercraft.api.detail;
+
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+
+import javax.annotation.Nonnull;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 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.
+ */
+public abstract class BasicItemDetailProvider<T> implements IDetailProvider<ItemStack>
+{
+    private final Class<T> itemType;
+    private final String namespace;
+
+    /**
+     * Create a new item detail provider. Meta will be inserted into a new sub-map named as per {@code namespace}.
+     *
+     * @param itemType  The type the stack's item must have.
+     * @param namespace The namespace to use for this provider.
+     */
+    public BasicItemDetailProvider( String namespace, @Nonnull Class<T> itemType )
+    {
+        Objects.requireNonNull( itemType );
+        this.itemType = itemType;
+        this.namespace = namespace;
+    }
+
+    /**
+     * Create a new item detail provider. Meta will be inserted directly into the results.
+     *
+     * @param itemType The type the stack's item must have.
+     */
+    public BasicItemDetailProvider( @Nonnull Class<T> itemType )
+    {
+        this( null, itemType );
+    }
+
+    /**
+     * Provide additional details for the given {@link Item} and {@link ItemStack}. This method is called by
+     * {@code turtle.getItemDetail()}. New properties should be added to the given {@link Map}, {@code data}.
+     *
+     * 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 stack The item stack to provide details for.
+     * @param item  The item to provide details for.
+     */
+    public abstract void provideDetails( @Nonnull Map<? super String, Object> data, @Nonnull ItemStack stack,
+                                         @Nonnull T item );
+
+    @Override
+    public void provideDetails( @Nonnull Map<? super String, Object> data, @Nonnull ItemStack stack )
+    {
+        Item 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 )
+        {
+            data.put( namespace, child );
+        }
+    }
+}

src/main/java/dan200/computercraft/api/detail/BlockReference.java

@@ -0,0 +1,35 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2022. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+package dan200.computercraft.api.detail;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * A reference to a block in the world, used by block detail providers.
+ *
+ * @param level       The level the block exists in.
+ * @param pos         The position of the block.
+ * @param state       The block state at this position.
+ * @param blockEntity The block entity at this position, if it exists.
+ */
+public record BlockReference(
+    @Nonnull Level level,
+    @Nonnull BlockPos pos,
+    @Nonnull BlockState state,
+    @Nullable BlockEntity blockEntity
+)
+{
+    public BlockReference( Level level, BlockPos pos )
+    {
+        this( level, pos, level.getBlockState( pos ), level.getBlockEntity( pos ) );
+    }
+}

src/main/java/dan200/computercraft/api/detail/IDetailProvider.java

@@ -0,0 +1,32 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2022. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+package dan200.computercraft.api.detail;
+
+import javax.annotation.Nonnull;
+import java.util.Map;
+
+/**
+ * This interface is used to provide details about a block, fluid, or item.
+ *
+ * @param <T> The type of object that this provider can provide details for.
+ * @see dan200.computercraft.api.ComputerCraftAPI#registerDetailProvider(Class, IDetailProvider)
+ */
+@FunctionalInterface
+public interface IDetailProvider<T>
+{
+    /**
+     * Provide additional details for the given object. This method is called by functions such as
+     * {@code turtle.getItemDetail()} and {@code turtle.inspect()}. New properties should be added to the given
+     * {@link Map}, {@code data}.
+     *
+     * 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. New properties should be added to this map.
+     * @param object The object to provide details for.
+     */
+    void provideDetails( @Nonnull Map<? super String, Object> data, @Nonnull T object );
+}

src/main/java/dan200/computercraft/api/lua/IArguments.java

@@ -188,8 +188,8 @@ public interface IArguments
      *
      * Classes implementing this interface may choose to implement a more optimised version which does not copy the
      * table, instead returning a wrapper version, making it more efficient. However, the caller must guarantee that
-     * they do not access off the computer thread (and so should not be used with main-thread functions) or once the
-     * function call has finished (for instance, in callbacks).
+     * they do not access the table the computer thread (and so should not be used with main-thread functions) or once
+     * the initial call has finished (for instance, in a callback to {@link MethodResult#pullEvent}).
      *
      * @param index The argument number.
      * @return The argument's value.
@@ -448,7 +448,10 @@ public interface IArguments
      * This is called when the current function finishes, before any main thread tasks have run.
      *
      * Called when the current function returns, and so some values are no longer guaranteed to be safe to access.
+     *
+     * @deprecated This method was an internal implementation detail and is no longer used.
      */
+    @Deprecated
     default void releaseImmediate()
     {
     }

src/main/java/dan200/computercraft/api/lua/ObjectArguments.java

@@ -5,12 +5,10 @@
  */
 package dan200.computercraft.api.lua;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 
 /**
  * An implementation of {@link IArguments} which wraps an array of {@link Object}.
@@ -19,7 +17,6 @@ public final class ObjectArguments implements IArguments
 {
     private static final IArguments EMPTY = new ObjectArguments();
 
-    private boolean released = false;
     private final List<Object> args;
 
     @Deprecated
@@ -67,34 +64,4 @@ public final class ObjectArguments implements IArguments
     {
         return args.toArray();
     }
-
-    @Nonnull
-    @Override
-    public LuaTable<?, ?> getTableUnsafe( int index ) throws LuaException
-    {
-        if( released )
-        {
-            throw new IllegalStateException( "Cannot use getTableUnsafe after IArguments has been released" );
-        }
-
-        return IArguments.super.getTableUnsafe( index );
-    }
-
-    @Nonnull
-    @Override
-    public Optional<LuaTable<?, ?>> optTableUnsafe( int index ) throws LuaException
-    {
-        if( released )
-        {
-            throw new IllegalStateException( "Cannot use optTableUnsafe after IArguments has been released" );
-        }
-
-        return IArguments.super.optTableUnsafe( index );
-    }
-
-    @Override
-    public void releaseImmediate()
-    {
-        released = true;
-    }
 }

src/main/java/dan200/computercraft/api/pocket/PocketUpgradeDataProvider.java

@@ -25,6 +25,6 @@ public abstract class PocketUpgradeDataProvider extends UpgradeDataProvider<IPoc
 {
     public PocketUpgradeDataProvider( @Nonnull DataGenerator generator )
     {
-        super( generator, "Pocket Computer Upgrades", "computercraft/pocket_upgrades", PocketUpgradeSerialiser.REGISTRY_ID );
+        super( generator, "Pocket Computer Upgrades", "computercraft/pocket_upgrades", PocketUpgradeSerialiser.registry() );
     }
 }

src/main/java/dan200/computercraft/api/pocket/PocketUpgradeSerialiser.java

@@ -16,7 +16,7 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.SimpleRecipeSerializer;
 import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.ForgeRegistryEntry;
+import net.minecraftforge.registries.IForgeRegistry;
 import net.minecraftforge.registries.RegistryManager;
 
 import javax.annotation.Nonnull;
@@ -40,16 +40,19 @@ public interface PocketUpgradeSerialiser<T extends IPocketUpgrade> extends Upgra
      *
      * This is largely intended for use with Forge Registry methods/classes, such as {@link DeferredRegister} and
      * {@link RegistryManager#getRegistry(ResourceKey)}.
+     *
+     * @see #registry()
      */
     ResourceKey<Registry<PocketUpgradeSerialiser<?>>> REGISTRY_ID = ResourceKey.createRegistryKey( new ResourceLocation( ComputerCraft.MOD_ID, "pocket_upgrade_serialiser" ) );
 
     /**
-     * A convenient base class to inherit to implement {@link PocketUpgradeSerialiser}.
-     *
-     * @param <T> The type of the upgrade created by this serialiser.
+     * The associated registry.
+     * @return The registry for pocket upgrade serialisers.
+     * @see #REGISTRY_ID
      */
-    abstract class Base<T extends IPocketUpgrade> extends ForgeRegistryEntry<PocketUpgradeSerialiser<?>> implements PocketUpgradeSerialiser<T>
+    static IForgeRegistry<PocketUpgradeSerialiser<?>> registry()
     {
+        return RegistryManager.ACTIVE.getRegistry( REGISTRY_ID );
     }
 
     /**

src/main/java/dan200/computercraft/api/turtle/TurtleUpgradeDataProvider.java

@@ -15,6 +15,7 @@ import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
+import net.minecraftforge.registries.ForgeRegistries;
 
 import javax.annotation.Nonnull;
 import java.util.function.Consumer;
@@ -34,7 +35,7 @@ public abstract class TurtleUpgradeDataProvider extends UpgradeDataProvider<ITur
 
     public TurtleUpgradeDataProvider( DataGenerator generator )
     {
-        super( generator, "Turtle Upgrades", "computercraft/turtle_upgrades", TurtleUpgradeSerialiser.REGISTRY_ID );
+        super( generator, "Turtle Upgrades", "computercraft/turtle_upgrades", TurtleUpgradeSerialiser.registry() );
     }
 
     /**
@@ -137,9 +138,9 @@ public abstract class TurtleUpgradeDataProvider extends UpgradeDataProvider<ITur
         public void add( @Nonnull Consumer<Upgrade<TurtleUpgradeSerialiser<?>>> add )
         {
             add.accept( new Upgrade<>( id, serialiser, s -> {
-                s.addProperty( "item", toolItem.getRegistryName().toString() );
+                s.addProperty( "item", ForgeRegistries.ITEMS.getKey( toolItem ).toString() );
                 if( adjective != null ) s.addProperty( "adjective", adjective );
-                if( craftingItem != null ) s.addProperty( "craftItem", craftingItem.getRegistryName().toString() );
+                if( craftingItem != null ) s.addProperty( "craftItem", ForgeRegistries.ITEMS.getKey( craftingItem ).toString() );
                 if( damageMultiplier != null ) s.addProperty( "damageMultiplier", damageMultiplier );
                 if( breakable != null ) s.addProperty( "breakable", breakable.location().toString() );
             } ) );

src/main/java/dan200/computercraft/api/turtle/TurtleUpgradeSerialiser.java

@@ -17,7 +17,6 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.item.crafting.SimpleRecipeSerializer;
 import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.ForgeRegistryEntry;
 import net.minecraftforge.registries.IForgeRegistry;
 import net.minecraftforge.registries.RegistryManager;
 
@@ -68,16 +67,18 @@ public interface TurtleUpgradeSerialiser<T extends ITurtleUpgrade> extends Upgra
      *
      * This is largely intended for use with Forge Registry methods/classes, such as {@link DeferredRegister} and
      * {@link RegistryManager#getRegistry(ResourceKey)}.
+     * @see #registry()
      */
     ResourceKey<Registry<TurtleUpgradeSerialiser<?>>> REGISTRY_ID = ResourceKey.createRegistryKey( new ResourceLocation( ComputerCraft.MOD_ID, "turtle_upgrade_serialiser" ) );
 
     /**
-     * A convenient base class to inherit to implement {@link TurtleUpgradeSerialiser}.
-     *
-     * @param <T> The type of the upgrade created by this serialiser.
+     * The associated registry.
+     * @return The registry for pocket upgrade serialisers.
+     * @see #REGISTRY_ID
      */
-    abstract class Base<T extends ITurtleUpgrade> extends ForgeRegistryEntry<TurtleUpgradeSerialiser<?>> implements TurtleUpgradeSerialiser<T>
+    static IForgeRegistry<TurtleUpgradeSerialiser<?>> registry()
     {
+        return RegistryManager.ACTIVE.getRegistry( REGISTRY_ID );
     }
 
     /**

src/main/java/dan200/computercraft/api/upgrades/UpgradeDataProvider.java

@@ -12,14 +12,13 @@ import com.google.gson.JsonParseException;
 import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser;
 import dan200.computercraft.internal.upgrades.SerialiserWithCraftingItem;
 import dan200.computercraft.internal.upgrades.SimpleSerialiser;
-import net.minecraft.core.Registry;
+import net.minecraft.data.CachedOutput;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.DataProvider;
-import net.minecraft.data.HashCache;
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
-import net.minecraftforge.registries.RegistryManager;
+import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.IForgeRegistry;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -45,11 +44,11 @@ public abstract class UpgradeDataProvider<T extends IUpgradeBase, R extends Upgr
     private final DataGenerator generator;
     private final String name;
     private final String folder;
-    private final ResourceKey<Registry<R>> registry;
+    private final IForgeRegistry<R> registry;
 
     private List<T> upgrades;
 
-    protected UpgradeDataProvider( @Nonnull DataGenerator generator, @Nonnull String name, @Nonnull String folder, @Nonnull ResourceKey<Registry<R>> registry )
+    protected UpgradeDataProvider( @Nonnull DataGenerator generator, @Nonnull String name, @Nonnull String folder, @Nonnull IForgeRegistry<R> registry )
     {
         this.generator = generator;
         this.name = name;
@@ -92,7 +91,7 @@ public abstract class UpgradeDataProvider<T extends IUpgradeBase, R extends Upgr
         }
 
         return new Upgrade<>( id, serialiser, s ->
-            s.addProperty( "item", Objects.requireNonNull( item.getRegistryName(), "Item is not registered" ).toString() )
+            s.addProperty( "item", Objects.requireNonNull( ForgeRegistries.ITEMS.getKey( item ), "Item is not registered" ).toString() )
         );
     }
 
@@ -111,7 +110,7 @@ public abstract class UpgradeDataProvider<T extends IUpgradeBase, R extends Upgr
     protected abstract void addUpgrades( @Nonnull Consumer<Upgrade<R>> addUpgrade );
 
     @Override
-    public final void run( @Nonnull HashCache cache ) throws IOException
+    public final void run( @Nonnull CachedOutput cache ) throws IOException
     {
         Path base = generator.getOutputFolder().resolve( "data" );
 
@@ -121,12 +120,12 @@ public abstract class UpgradeDataProvider<T extends IUpgradeBase, R extends Upgr
             if( !seen.add( upgrade.id() ) ) throw new IllegalStateException( "Duplicate upgrade " + upgrade.id() );
 
             var json = new JsonObject();
-            json.addProperty( "type", Objects.requireNonNull( upgrade.serialiser().getRegistryName(), "Serialiser has not been registered" ).toString() );
+            json.addProperty( "type", Objects.requireNonNull( registry.getKey( upgrade.serialiser() ), "Serialiser has not been registered" ).toString() );
             upgrade.serialise().accept( json );
 
             try
             {
-                DataProvider.save( GSON, cache, json, base.resolve( upgrade.id().getNamespace() + "/" + folder + "/" + upgrade.id().getPath() + ".json" ) );
+                DataProvider.saveStable( cache, json, base.resolve( upgrade.id().getNamespace() + "/" + folder + "/" + upgrade.id().getPath() + ".json" ) );
             }
             catch( IOException e )
             {
@@ -157,7 +156,7 @@ public abstract class UpgradeDataProvider<T extends IUpgradeBase, R extends Upgr
     @Nonnull
     public final R existingSerialiser( @Nonnull ResourceLocation id )
     {
-        var result = RegistryManager.ACTIVE.getRegistry( registry ).getValue( id );
+        var result = registry.getValue( id );
         if( result == null ) throw new IllegalArgumentException( "No such serialiser " + registry );
         return result;
     }

src/main/java/dan200/computercraft/api/upgrades/UpgradeSerialiser.java

@@ -10,7 +10,6 @@ import dan200.computercraft.api.pocket.PocketUpgradeSerialiser;
 import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.registries.IForgeRegistryEntry;
 
 import javax.annotation.Nonnull;
 
@@ -25,7 +24,7 @@ import javax.annotation.Nonnull;
  * @see TurtleUpgradeSerialiser
  * @see PocketUpgradeSerialiser
  */
-public interface UpgradeSerialiser<T extends IUpgradeBase, R extends UpgradeSerialiser<?, R>> extends IForgeRegistryEntry<R>
+public interface UpgradeSerialiser<T extends IUpgradeBase, R extends UpgradeSerialiser<?, R>>
 {
     /**
      * Read this upgrade from a JSON file in a datapack.

src/main/java/dan200/computercraft/client/ClientRegistry.java

@@ -123,8 +123,6 @@ public final class ClientRegistry
     @SubscribeEvent
     public static void setupClient( FMLClientSetupEvent event )
     {
-        registerContainers();
-
         // While turtles themselves are not transparent, their upgrades may be.
         ItemBlockRenderTypes.setRenderLayer( Registry.ModBlocks.TURTLE_NORMAL.get(), RenderType.translucent() );
         ItemBlockRenderTypes.setRenderLayer( Registry.ModBlocks.TURTLE_ADVANCED.get(), RenderType.translucent() );
@@ -139,14 +137,18 @@ public final class ClientRegistry
         BlockEntityRenderers.register( Registry.ModBlockEntities.TURTLE_NORMAL.get(), TileEntityTurtleRenderer::new );
         BlockEntityRenderers.register( Registry.ModBlockEntities.TURTLE_ADVANCED.get(), TileEntityTurtleRenderer::new );
 
-        registerItemProperty( "state",
-            ( stack, world, player, random ) -> ItemPocketComputer.getState( stack ).ordinal(),
-            Registry.ModItems.POCKET_COMPUTER_NORMAL, Registry.ModItems.POCKET_COMPUTER_ADVANCED
-        );
-        registerItemProperty( "coloured",
-            ( stack, world, player, random ) -> IColouredItem.getColourBasic( stack ) != -1 ? 1 : 0,
-            Registry.ModItems.POCKET_COMPUTER_NORMAL, Registry.ModItems.POCKET_COMPUTER_ADVANCED
-        );
+        event.enqueueWork( () -> {
+            registerContainers();
+
+            registerItemProperty( "state",
+                ( stack, world, player, random ) -> ItemPocketComputer.getState( stack ).ordinal(),
+                Registry.ModItems.POCKET_COMPUTER_NORMAL, Registry.ModItems.POCKET_COMPUTER_ADVANCED
+            );
+            registerItemProperty( "coloured",
+                ( stack, world, player, random ) -> IColouredItem.getColourBasic( stack ) != -1 ? 1 : 0,
+                Registry.ModItems.POCKET_COMPUTER_NORMAL, Registry.ModItems.POCKET_COMPUTER_ADVANCED
+            );
+        } );
     }
 
     @SafeVarargs

src/main/java/dan200/computercraft/client/gui/ComputerScreenBase.java

@@ -20,7 +20,6 @@ import dan200.computercraft.shared.network.server.ContinueUploadMessage;
 import dan200.computercraft.shared.network.server.UploadFileMessage;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.entity.player.Inventory;
 import org.lwjgl.glfw.GLFW;
 
@@ -37,9 +36,9 @@ import java.util.List;
 
 public abstract class ComputerScreenBase<T extends ContainerComputerBase> extends AbstractContainerScreen<T>
 {
-    private static final Component OK = new TranslatableComponent( "gui.ok" );
-    private static final Component CANCEL = new TranslatableComponent( "gui.cancel" );
-    private static final Component OVERWRITE = new TranslatableComponent( "gui.computercraft.upload.overwrite_button" );
+    private static final Component OK = Component.translatable( "gui.ok" );
+    private static final Component CANCEL = Component.translatable( "gui.cancel" );
+    private static final Component OVERWRITE = Component.translatable( "gui.computercraft.upload.overwrite_button" );
 
     protected WidgetTerminal terminal;
     protected final ClientComputer computer;
@@ -58,7 +57,7 @@ public abstract class ComputerScreenBase<T extends ContainerComputerBase> extend
     protected abstract WidgetTerminal createTerminal();
 
     @Override
-    protected final void init()
+    protected void init()
     {
         super.init();
         minecraft.keyboardHandler.setSendRepeatsToGui( true );
@@ -69,21 +68,21 @@ public abstract class ComputerScreenBase<T extends ContainerComputerBase> extend
     }
 
     @Override
-    public final void removed()
+    public void removed()
     {
         super.removed();
         minecraft.keyboardHandler.setSendRepeatsToGui( false );
     }
 
     @Override
-    public final void containerTick()
+    public void containerTick()
     {
         super.containerTick();
         terminal.update();
     }
 
     @Override
-    public final boolean keyPressed( int key, int scancode, int modifiers )
+    public boolean keyPressed( int key, int scancode, int modifiers )
     {
         // Forward the tab key to the terminal, rather than moving between controls.
         if( key == GLFW.GLFW_KEY_TAB && getFocused() != null && getFocused() == terminal )
@@ -96,7 +95,7 @@ public abstract class ComputerScreenBase<T extends ContainerComputerBase> extend
 
 
     @Override
-    public final void render( @Nonnull PoseStack stack, int mouseX, int mouseY, float partialTicks )
+    public void render( @Nonnull PoseStack stack, int mouseX, int mouseY, float partialTicks )
     {
         renderBackground( stack );
         super.render( stack, mouseX, mouseY, partialTicks );
@@ -114,7 +113,7 @@ public abstract class ComputerScreenBase<T extends ContainerComputerBase> extend
     }
 
     @Override
-    public final boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
+    public boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
     {
         return (getFocused() != null && getFocused().mouseDragged( x, y, button, deltaX, deltaY ))
             || super.mouseDragged( x, y, button, deltaX, deltaY );
@@ -158,7 +157,7 @@ public abstract class ComputerScreenBase<T extends ContainerComputerBase> extend
                 String name = file.getFileName().toString();
                 if( name.length() > UploadFileMessage.MAX_FILE_NAME )
                 {
-                    alert( UploadResult.FAILED_TITLE, new TranslatableComponent( "gui.computercraft.upload.failed.name_too_long" ) );
+                    alert( UploadResult.FAILED_TITLE, Component.translatable( "gui.computercraft.upload.failed.name_too_long" ) );
                     return;
                 }
 
@@ -169,7 +168,7 @@ public abstract class ComputerScreenBase<T extends ContainerComputerBase> extend
                 byte[] digest = FileUpload.getDigest( buffer );
                 if( digest == null )
                 {
-                    alert( UploadResult.FAILED_TITLE, new TranslatableComponent( "gui.computercraft.upload.failed.corrupted" ) );
+                    alert( UploadResult.FAILED_TITLE, Component.translatable( "gui.computercraft.upload.failed.corrupted" ) );
                     return;
                 }
 
@@ -178,13 +177,13 @@ public abstract class ComputerScreenBase<T extends ContainerComputerBase> extend
             catch( IOException e )
             {
                 ComputerCraft.log.error( "Failed uploading files", e );
-                alert( UploadResult.FAILED_TITLE, new TranslatableComponent( "gui.computercraft.upload.failed.generic", "Cannot compute checksum" ) );
+                alert( UploadResult.FAILED_TITLE, Component.translatable( "gui.computercraft.upload.failed.generic", "Cannot compute checksum" ) );
             }
         }
 
         if( toUpload.size() > UploadFileMessage.MAX_FILES )
         {
-            alert( UploadResult.FAILED_TITLE, new TranslatableComponent( "gui.computercraft.upload.failed.too_many_files" ) );
+            alert( UploadResult.FAILED_TITLE, Component.translatable( "gui.computercraft.upload.failed.too_many_files" ) );
             return;
         }
 

src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java

@@ -1,288 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-package dan200.computercraft.client.gui;
-
-import com.mojang.blaze3d.vertex.Tesselator;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.Matrix4f;
-import dan200.computercraft.client.FrameInfo;
-import dan200.computercraft.client.render.RenderTypes;
-import dan200.computercraft.core.terminal.Terminal;
-import dan200.computercraft.core.terminal.TextBuffer;
-import dan200.computercraft.shared.util.Colour;
-import dan200.computercraft.shared.util.Palette;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.resources.ResourceLocation;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import static dan200.computercraft.client.render.RenderTypes.FULL_BRIGHT_LIGHTMAP;
-
-/**
- * Handles rendering fixed width text and computer terminals.
- *
- * This class has several modes of usage:
- * <ul>
- * <li>{@link #drawString}: Drawing basic text without a terminal (such as for printouts). Unlike the other methods,
- * this accepts a lightmap coordinate as, unlike terminals, printed pages render fullbright.</li>
- * <li>{@link #drawTerminalWithoutCursor}/{@link #drawCursor}: Draw a terminal without a cursor and then draw the cursor
- * separately. This is used by the monitor renderer to render the terminal to a VBO and draw the cursor dynamically.
- * </li>
- * <li>{@link #drawTerminal}: Draw a terminal with a cursor. This is used by the various computer GUIs to render the
- * whole term.</li>
- * <li>{@link #drawBlocker}: When rendering a terminal using {@link RenderTypes#TERMINAL_WITHOUT_DEPTH} you need to
- * render an additional "depth blocker" on top of the monitor.</li>
- * </ul>
- */
-public final class FixedWidthFontRenderer
-{
-    public static final ResourceLocation FONT = new ResourceLocation( "computercraft", "textures/gui/term_font.png" );
-
-    public static final int FONT_HEIGHT = 9;
-    public static final int FONT_WIDTH = 6;
-    public static final float WIDTH = 256.0f;
-
-    public static final float BACKGROUND_START = (WIDTH - 6.0f) / WIDTH;
-    public static final float BACKGROUND_END = (WIDTH - 4.0f) / WIDTH;
-
-    private FixedWidthFontRenderer()
-    {
-    }
-
-    public static float toGreyscale( double[] rgb )
-    {
-        return (float) ((rgb[0] + rgb[1] + rgb[2]) / 3);
-    }
-
-    public static int getColour( char c, Colour def )
-    {
-        return 15 - Terminal.getColour( c, def );
-    }
-
-    private static void drawChar( Matrix4f transform, VertexConsumer buffer, float x, float y, int index, float r, float g, float b, int light )
-    {
-        // Short circuit to avoid the common case - the texture should be blank here after all.
-        if( index == '\0' || index == ' ' ) return;
-
-        int column = index % 16;
-        int row = index / 16;
-
-        int xStart = 1 + column * (FONT_WIDTH + 2);
-        int yStart = 1 + row * (FONT_HEIGHT + 2);
-
-        buffer.vertex( transform, x, y, 0f ).color( r, g, b, 1.0f ).uv( xStart / WIDTH, yStart / WIDTH ).uv2( light ).endVertex();
-        buffer.vertex( transform, x, y + FONT_HEIGHT, 0f ).color( r, g, b, 1.0f ).uv( xStart / WIDTH, (yStart + FONT_HEIGHT) / WIDTH ).uv2( light ).endVertex();
-        buffer.vertex( transform, x + FONT_WIDTH, y, 0f ).color( r, g, b, 1.0f ).uv( (xStart + FONT_WIDTH) / WIDTH, yStart / WIDTH ).uv2( light ).endVertex();
-        buffer.vertex( transform, x + FONT_WIDTH, y, 0f ).color( r, g, b, 1.0f ).uv( (xStart + FONT_WIDTH) / WIDTH, yStart / WIDTH ).uv2( light ).endVertex();
-        buffer.vertex( transform, x, y + FONT_HEIGHT, 0f ).color( r, g, b, 1.0f ).uv( xStart / WIDTH, (yStart + FONT_HEIGHT) / WIDTH ).uv2( light ).endVertex();
-        buffer.vertex( transform, x + FONT_WIDTH, y + FONT_HEIGHT, 0f ).color( r, g, b, 1.0f ).uv( (xStart + FONT_WIDTH) / WIDTH, (yStart + FONT_HEIGHT) / WIDTH ).uv2( light ).endVertex();
-    }
-
-    private static void drawQuad( Matrix4f transform, VertexConsumer buffer, float x, float y, float width, float height, float r, float g, float b )
-    {
-        buffer.vertex( transform, x, y, 0 ).color( r, g, b, 1.0f ).uv( BACKGROUND_START, BACKGROUND_START ).endVertex();
-        buffer.vertex( transform, x, y + height, 0 ).color( r, g, b, 1.0f ).uv( BACKGROUND_START, BACKGROUND_END ).endVertex();
-        buffer.vertex( transform, x + width, y, 0 ).color( r, g, b, 1.0f ).uv( BACKGROUND_END, BACKGROUND_START ).endVertex();
-        buffer.vertex( transform, x + width, y, 0 ).color( r, g, b, 1.0f ).uv( BACKGROUND_END, BACKGROUND_START ).endVertex();
-        buffer.vertex( transform, x, y + height, 0 ).color( r, g, b, 1.0f ).uv( BACKGROUND_START, BACKGROUND_END ).endVertex();
-        buffer.vertex( transform, x + width, y + height, 0 ).color( r, g, b, 1.0f ).uv( BACKGROUND_END, BACKGROUND_END ).endVertex();
-    }
-
-    private static void drawQuad( Matrix4f transform, VertexConsumer buffer, float x, float y, float width, float height, Palette palette, boolean greyscale, char colourIndex )
-    {
-        double[] colour = palette.getColour( getColour( colourIndex, Colour.BLACK ) );
-        float r, g, b;
-        if( greyscale )
-        {
-            r = g = b = toGreyscale( colour );
-        }
-        else
-        {
-            r = (float) colour[0];
-            g = (float) colour[1];
-            b = (float) colour[2];
-        }
-
-        drawQuad( transform, buffer, x, y, width, height, r, g, b );
-    }
-
-    private static void drawBackground(
-        @Nonnull Matrix4f transform, @Nonnull VertexConsumer renderer, float x, float y,
-        @Nonnull TextBuffer backgroundColour, @Nonnull Palette palette, boolean greyscale,
-        float leftMarginSize, float rightMarginSize, float height
-    )
-    {
-        if( leftMarginSize > 0 )
-        {
-            drawQuad( transform, renderer, x - leftMarginSize, y, leftMarginSize, height, palette, greyscale, backgroundColour.charAt( 0 ) );
-        }
-
-        if( rightMarginSize > 0 )
-        {
-            drawQuad( transform, renderer, x + backgroundColour.length() * FONT_WIDTH, y, rightMarginSize, height, palette, greyscale, backgroundColour.charAt( backgroundColour.length() - 1 ) );
-        }
-
-        // Batch together runs of identical background cells.
-        int blockStart = 0;
-        char blockColour = '\0';
-        for( int i = 0; i < backgroundColour.length(); i++ )
-        {
-            char colourIndex = backgroundColour.charAt( i );
-            if( colourIndex == blockColour ) continue;
-
-            if( blockColour != '\0' )
-            {
-                drawQuad( transform, renderer, x + blockStart * FONT_WIDTH, y, FONT_WIDTH * (i - blockStart), height, palette, greyscale, blockColour );
-            }
-
-            blockColour = colourIndex;
-            blockStart = i;
-        }
-
-        if( blockColour != '\0' )
-        {
-            drawQuad( transform, renderer, x + blockStart * FONT_WIDTH, y, FONT_WIDTH * (backgroundColour.length() - blockStart), height, palette, greyscale, blockColour );
-        }
-    }
-
-    public static void drawString(
-        @Nonnull Matrix4f transform, @Nonnull VertexConsumer renderer, float x, float y,
-        @Nonnull TextBuffer text, @Nonnull TextBuffer textColour, @Nullable TextBuffer backgroundColour,
-        @Nonnull Palette palette, boolean greyscale, float leftMarginSize, float rightMarginSize, int light
-    )
-    {
-        if( backgroundColour != null )
-        {
-            drawBackground( transform, renderer, x, y, backgroundColour, palette, greyscale, leftMarginSize, rightMarginSize, FONT_HEIGHT );
-        }
-
-        for( int i = 0; i < text.length(); i++ )
-        {
-            double[] colour = palette.getColour( getColour( textColour.charAt( i ), Colour.BLACK ) );
-            float r, g, b;
-            if( greyscale )
-            {
-                r = g = b = toGreyscale( colour );
-            }
-            else
-            {
-                r = (float) colour[0];
-                g = (float) colour[1];
-                b = (float) colour[2];
-            }
-
-            // Draw char
-            int index = text.charAt( i );
-            if( index > 255 ) index = '?';
-            drawChar( transform, renderer, x + i * FONT_WIDTH, y, index, r, g, b, light );
-        }
-
-    }
-
-    public static void drawTerminalWithoutCursor(
-        @Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y,
-        @Nonnull Terminal terminal, boolean greyscale,
-        float topMarginSize, float bottomMarginSize, float leftMarginSize, float rightMarginSize
-    )
-    {
-        Palette palette = terminal.getPalette();
-        int height = terminal.getHeight();
-
-        // Top and bottom margins
-        drawBackground(
-            transform, buffer, x, y - topMarginSize,
-            terminal.getBackgroundColourLine( 0 ), palette, greyscale,
-            leftMarginSize, rightMarginSize, topMarginSize
-        );
-
-        drawBackground(
-            transform, buffer, x, y + height * FONT_HEIGHT,
-            terminal.getBackgroundColourLine( height - 1 ), palette, greyscale,
-            leftMarginSize, rightMarginSize, bottomMarginSize
-        );
-
-        // The main text
-        for( int i = 0; i < height; i++ )
-        {
-            drawString(
-                transform, buffer, x, y + FixedWidthFontRenderer.FONT_HEIGHT * i,
-                terminal.getLine( i ), terminal.getTextColourLine( i ), terminal.getBackgroundColourLine( i ),
-                palette, greyscale, leftMarginSize, rightMarginSize, FULL_BRIGHT_LIGHTMAP
-            );
-        }
-    }
-
-    public static void drawCursor(
-        @Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y,
-        @Nonnull Terminal terminal, boolean greyscale
-    )
-    {
-        Palette palette = terminal.getPalette();
-        int width = terminal.getWidth();
-        int height = terminal.getHeight();
-
-        int cursorX = terminal.getCursorX();
-        int cursorY = terminal.getCursorY();
-        if( terminal.getCursorBlink() && cursorX >= 0 && cursorX < width && cursorY >= 0 && cursorY < height && FrameInfo.getGlobalCursorBlink() )
-        {
-            double[] colour = palette.getColour( 15 - terminal.getTextColour() );
-            float r, g, b;
-            if( greyscale )
-            {
-                r = g = b = toGreyscale( colour );
-            }
-            else
-            {
-                r = (float) colour[0];
-                g = (float) colour[1];
-                b = (float) colour[2];
-            }
-
-            drawChar( transform, buffer, x + cursorX * FONT_WIDTH, y + cursorY * FONT_HEIGHT, '_', r, g, b, FULL_BRIGHT_LIGHTMAP );
-        }
-    }
-
-    public static void drawTerminal(
-        @Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y,
-        @Nonnull Terminal terminal, boolean greyscale,
-        float topMarginSize, float bottomMarginSize, float leftMarginSize, float rightMarginSize
-    )
-    {
-        drawTerminalWithoutCursor( transform, buffer, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize );
-        drawCursor( transform, buffer, x, y, terminal, greyscale );
-    }
-
-    public static void drawTerminal(
-        @Nonnull Matrix4f transform, float x, float y, @Nonnull Terminal terminal, boolean greyscale,
-        float topMarginSize, float bottomMarginSize, float leftMarginSize, float rightMarginSize
-    )
-    {
-        MultiBufferSource.BufferSource renderer = MultiBufferSource.immediate( Tesselator.getInstance().getBuilder() );
-        VertexConsumer buffer = renderer.getBuffer( RenderTypes.TERMINAL_WITH_DEPTH );
-        drawTerminal( transform, buffer, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize );
-        renderer.endBatch();
-    }
-
-    public static void drawEmptyTerminal( @Nonnull Matrix4f transform, @Nonnull MultiBufferSource renderer, float x, float y, float width, float height )
-    {
-        Colour colour = Colour.BLACK;
-        drawQuad( transform, renderer.getBuffer( RenderTypes.TERMINAL_WITH_DEPTH ), x, y, width, height, colour.getR(), colour.getG(), colour.getB() );
-    }
-
-    public static void drawEmptyTerminal( @Nonnull Matrix4f transform, float x, float y, float width, float height )
-    {
-        MultiBufferSource.BufferSource renderer = MultiBufferSource.immediate( Tesselator.getInstance().getBuilder() );
-        drawEmptyTerminal( transform, renderer, x, y, width, height );
-        renderer.endBatch();
-    }
-
-    public static void drawBlocker( @Nonnull Matrix4f transform, @Nonnull MultiBufferSource renderer, float x, float y, float width, float height )
-    {
-        Colour colour = Colour.BLACK;
-        drawQuad( transform, renderer.getBuffer( RenderTypes.TERMINAL_BLOCKER ), x, y, width, height, colour.getR(), colour.getG(), colour.getB() );
-    }
-}

src/main/java/dan200/computercraft/client/gui/GuiComputer.java

@@ -10,7 +10,6 @@ import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
 import dan200.computercraft.client.render.ComputerBorderRenderer;
-import dan200.computercraft.client.render.RenderTypes;
 import dan200.computercraft.shared.computer.inventory.ContainerComputerBase;
 import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
 import net.minecraft.network.chat.Component;
@@ -19,6 +18,7 @@ import net.minecraft.world.entity.player.Inventory;
 import javax.annotation.Nonnull;
 
 import static dan200.computercraft.client.render.ComputerBorderRenderer.BORDER;
+import static dan200.computercraft.client.render.RenderTypes.FULL_BRIGHT_LIGHTMAP;
 
 public final class GuiComputer<T extends ContainerComputerBase> extends ComputerScreenBase<T>
 {
@@ -77,8 +77,8 @@ public final class GuiComputer<T extends ContainerComputerBase> extends Computer
     {
         // Draw a border around the terminal
         ComputerBorderRenderer.render(
-            ComputerBorderRenderer.getTexture( family ), terminal.x, terminal.y, getBlitOffset(),
-            RenderTypes.FULL_BRIGHT_LIGHTMAP, terminal.getWidth(), terminal.getHeight()
+            stack.last().pose(), ComputerBorderRenderer.getTexture( family ), terminal.x, terminal.y, getBlitOffset(),
+            FULL_BRIGHT_LIGHTMAP, terminal.getWidth(), terminal.getHeight()
         );
         ComputerSidebar.renderBackground( stack, leftPos, topPos + sidebarYOffset );
     }

src/main/java/dan200/computercraft/client/gui/NoTermComputerScreen.java

@@ -15,7 +15,6 @@ import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.MenuAccess;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.world.entity.player.Inventory;
 import org.lwjgl.glfw.GLFW;
@@ -112,7 +111,7 @@ public class NoTermComputerScreen<T extends ContainerComputerBase> extends Scree
         super.render( transform, mouseX, mouseY, partialTicks );
 
         Font font = minecraft.font;
-        List<FormattedCharSequence> lines = font.split( new TranslatableComponent( "gui.computercraft.pocket_computer_overlay" ), (int) (width * 0.8) );
+        List<FormattedCharSequence> lines = font.split( Component.translatable( "gui.computercraft.pocket_computer_overlay" ), (int) (width * 0.8) );
         float y = 10.0f;
         for( FormattedCharSequence line : lines )
         {

src/main/java/dan200/computercraft/client/gui/widgets/ComputerSidebar.java

@@ -12,7 +12,7 @@ import dan200.computercraft.shared.computer.core.ClientComputer;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 
 import java.util.Arrays;
@@ -53,11 +53,11 @@ public final class ComputerSidebar
             screen, x, y, ICON_WIDTH, ICON_HEIGHT, () -> computer.isOn() ? 15 : 1, 1, ICON_TEX_Y_DIFF,
             TEXTURE, TEX_SIZE, TEX_SIZE, b -> toggleComputer( computer ),
             () -> computer.isOn() ? Arrays.asList(
-                new TranslatableComponent( "gui.computercraft.tooltip.turn_off" ),
-                new TranslatableComponent( "gui.computercraft.tooltip.turn_off.key" ).withStyle( ChatFormatting.GRAY )
+                Component.translatable( "gui.computercraft.tooltip.turn_off" ),
+                Component.translatable( "gui.computercraft.tooltip.turn_off.key" ).withStyle( ChatFormatting.GRAY )
             ) : Arrays.asList(
-                new TranslatableComponent( "gui.computercraft.tooltip.turn_on" ),
-                new TranslatableComponent( "gui.computercraft.tooltip.turn_off.key" ).withStyle( ChatFormatting.GRAY )
+                Component.translatable( "gui.computercraft.tooltip.turn_on" ),
+                Component.translatable( "gui.computercraft.tooltip.turn_off.key" ).withStyle( ChatFormatting.GRAY )
             )
         ) );
 
@@ -67,8 +67,8 @@ public final class ComputerSidebar
             screen, x, y, ICON_WIDTH, ICON_HEIGHT, 29, 1, ICON_TEX_Y_DIFF,
             TEXTURE, TEX_SIZE, TEX_SIZE, b -> computer.queueEvent( "terminate" ),
             Arrays.asList(
-                new TranslatableComponent( "gui.computercraft.tooltip.terminate" ),
-                new TranslatableComponent( "gui.computercraft.tooltip.terminate.key" ).withStyle( ChatFormatting.GRAY )
+                Component.translatable( "gui.computercraft.tooltip.terminate" ),
+                Component.translatable( "gui.computercraft.tooltip.terminate.key" ).withStyle( ChatFormatting.GRAY )
             )
         ) );
     }

src/main/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java

@@ -10,7 +10,6 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.common.util.NonNullSupplier;
 
@@ -53,7 +52,7 @@ public class DynamicImageButton extends Button
         OnPress onPress, NonNullSupplier<List<Component>> tooltip
     )
     {
-        super( x, y, width, height, TextComponent.EMPTY, onPress );
+        super( x, y, width, height, Component.empty(), onPress );
         this.screen = screen;
         this.textureWidth = textureWidth;
         this.textureHeight = textureHeight;
@@ -84,7 +83,7 @@ public class DynamicImageButton extends Button
     public Component getMessage()
     {
         List<Component> tooltip = this.tooltip.get();
-        return tooltip.isEmpty() ? TextComponent.EMPTY : tooltip.get( 0 );
+        return tooltip.isEmpty() ? Component.empty() : tooltip.get( 0 );
     }
 
     @Override

src/main/java/dan200/computercraft/client/gui/widgets/WidgetTerminal.java

@@ -6,23 +6,26 @@
 package dan200.computercraft.client.gui.widgets;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.math.Matrix4f;
-import dan200.computercraft.client.gui.FixedWidthFontRenderer;
+import dan200.computercraft.client.render.RenderTypes;
+import dan200.computercraft.client.render.text.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.shared.computer.core.ClientComputer;
 import net.minecraft.SharedConstants;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
-import net.minecraft.network.chat.TextComponent;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.network.chat.Component;
 import org.lwjgl.glfw.GLFW;
 
 import javax.annotation.Nonnull;
 import java.util.BitSet;
 
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
 import static dan200.computercraft.client.render.ComputerBorderRenderer.MARGIN;
+import static dan200.computercraft.client.render.text.FixedWidthFontRenderer.FONT_HEIGHT;
+import static dan200.computercraft.client.render.text.FixedWidthFontRenderer.FONT_WIDTH;
 
 public class WidgetTerminal extends AbstractWidget
 {
@@ -48,7 +51,7 @@ public class WidgetTerminal extends AbstractWidget
 
     public WidgetTerminal( @Nonnull ClientComputer computer, int x, int y, int termWidth, int termHeight )
     {
-        super( x, y, termWidth * FONT_WIDTH + MARGIN * 2, termHeight * FONT_HEIGHT + MARGIN * 2, TextComponent.EMPTY );
+        super( x, y, termWidth * FONT_WIDTH + MARGIN * 2, termHeight * FONT_HEIGHT + MARGIN * 2, Component.empty() );
 
         this.computer = computer;
 
@@ -315,14 +318,24 @@ public class WidgetTerminal extends AbstractWidget
         if( !visible ) return;
         Matrix4f matrix = transform.last().pose();
         Terminal terminal = computer.getTerminal();
+
+        var bufferSource = MultiBufferSource.immediate( Tesselator.getInstance().getBuilder() );
+        var emitter = FixedWidthFontRenderer.toVertexConsumer( matrix, bufferSource.getBuffer( RenderTypes.TERMINAL_WITH_DEPTH ) );
+
         if( terminal != null )
         {
-            FixedWidthFontRenderer.drawTerminal( matrix, innerX, innerY, terminal, !computer.isColour(), MARGIN, MARGIN, MARGIN, MARGIN );
+            boolean greyscale = !computer.isColour();
+            FixedWidthFontRenderer.drawTerminal(
+                emitter,
+                (float) innerX, (float) innerY, terminal, greyscale, (float) MARGIN, (float) MARGIN, (float) MARGIN, (float) MARGIN
+            );
         }
         else
         {
-            FixedWidthFontRenderer.drawEmptyTerminal( matrix, x, y, width, height );
+            FixedWidthFontRenderer.drawEmptyTerminal( emitter, (float) x, (float) y, (float) width, (float) height );
         }
+
+        bufferSource.endBatch();
     }
 
     @Override

src/main/java/dan200/computercraft/client/render/ComputerBorderRenderer.java

@@ -23,13 +23,6 @@ public class ComputerBorderRenderer
     public static final ResourceLocation BACKGROUND_COMMAND = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners_command.png" );
     public static final ResourceLocation BACKGROUND_COLOUR = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners_colour.png" );
 
-    private static final Matrix4f IDENTITY = new Matrix4f();
-
-    static
-    {
-        IDENTITY.setIdentity();
-    }
-
     /**
      * The margin between the terminal and its border.
      */
@@ -70,7 +63,6 @@ public class ComputerBorderRenderer
         this.b = b;
     }
 
-
     @Nonnull
     public static ResourceLocation getTexture( @Nonnull ComputerFamily family )
     {
@@ -92,10 +84,10 @@ public class ComputerBorderRenderer
         return RenderType.text( location );
     }
 
-    public static void render( ResourceLocation location, int x, int y, int z, int light, int width, int height )
+    public static void render( Matrix4f transform, ResourceLocation location, int x, int y, int z, int light, int width, int height )
     {
         MultiBufferSource.BufferSource source = MultiBufferSource.immediate( Tesselator.getInstance().getBuilder() );
-        render( IDENTITY, source.getBuffer( getRenderType( location ) ), x, y, z, light, width, height, false, 1, 1, 1 );
+        render( transform, source.getBuffer( getRenderType( location ) ), x, y, z, light, width, height, false, 1, 1, 1 );
         source.endBatch();
     }
 

src/main/java/dan200/computercraft/client/render/ItemMapLikeRenderer.java

@@ -74,7 +74,7 @@ public abstract class ItemMapLikeRenderer
         {
             transform.pushPose();
             transform.mulPose( Vector3f.ZP.rotationDegrees( offset * 10f ) );
-            minecraft.getItemInHandRenderer().renderPlayerArm( transform, render, combinedLight, equipProgress, swingProgress, side );
+            minecraft.getEntityRenderDispatcher().getItemInHandRenderer().renderPlayerArm( transform, render, combinedLight, equipProgress, swingProgress, side );
             transform.popPose();
         }
 
@@ -111,7 +111,7 @@ public abstract class ItemMapLikeRenderer
     private void renderItemFirstPersonCenter( PoseStack transform, MultiBufferSource render, int combinedLight, float pitch, float equipProgress, float swingProgress, ItemStack stack )
     {
         Minecraft minecraft = Minecraft.getInstance();
-        ItemInHandRenderer renderer = minecraft.getItemInHandRenderer();
+        ItemInHandRenderer renderer = minecraft.getEntityRenderDispatcher().getItemInHandRenderer();
 
         // Setup the appropriate transformations. This is just copied from the
         // corresponding method in ItemRenderer.

src/main/java/dan200/computercraft/client/render/ItemPocketRenderer.java

@@ -10,7 +10,7 @@ import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Matrix4f;
 import com.mojang.math.Vector3f;
 import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.client.gui.FixedWidthFontRenderer;
+import dan200.computercraft.client.render.text.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.shared.computer.core.ClientComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
@@ -24,9 +24,9 @@ import net.minecraftforge.client.event.RenderHandEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
 import static dan200.computercraft.client.render.ComputerBorderRenderer.*;
+import static dan200.computercraft.client.render.text.FixedWidthFontRenderer.FONT_HEIGHT;
+import static dan200.computercraft.client.render.text.FixedWidthFontRenderer.FONT_WIDTH;
 
 /**
  * Emulates map rendering for pocket computers.
@@ -54,7 +54,7 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
     }
 
     @Override
-    protected void renderItem( PoseStack transform, MultiBufferSource renderer, ItemStack stack, int light )
+    protected void renderItem( PoseStack transform, MultiBufferSource bufferSource, ItemStack stack, int light )
     {
         ClientComputer computer = ItemPocketComputer.createClientComputer( stack );
         Terminal terminal = computer == null ? null : computer.getTerminal();
@@ -91,24 +91,30 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
         int frameColour = item.getColour( stack );
 
         Matrix4f matrix = transform.last().pose();
-        renderFrame( matrix, renderer, family, frameColour, light, width, height );
+        renderFrame( matrix, bufferSource, family, frameColour, light, width, height );
 
         // Render the light
         int lightColour = ItemPocketComputer.getLightState( stack );
         if( lightColour == -1 ) lightColour = Colour.BLACK.getHex();
-        renderLight( matrix, renderer, lightColour, width, height );
+        renderLight( matrix, bufferSource, lightColour, width, height );
 
         if( computer != null && terminal != null )
         {
             FixedWidthFontRenderer.drawTerminal(
-                matrix, renderer.getBuffer( RenderTypes.TERMINAL_WITHOUT_DEPTH ),
+                FixedWidthFontRenderer.toVertexConsumer( matrix, bufferSource.getBuffer( RenderTypes.TERMINAL_WITHOUT_DEPTH ) ),
                 MARGIN, MARGIN, terminal, !computer.isColour(), MARGIN, MARGIN, MARGIN, MARGIN
             );
-            FixedWidthFontRenderer.drawBlocker( transform.last().pose(), renderer, 0, 0, width, height );
+            FixedWidthFontRenderer.drawBlocker(
+                FixedWidthFontRenderer.toVertexConsumer( matrix, bufferSource.getBuffer( RenderTypes.TERMINAL_BLOCKER ) ),
+                0, 0, width, height
+            );
         }
         else
         {
-            FixedWidthFontRenderer.drawEmptyTerminal( matrix, renderer, 0, 0, width, height );
+            FixedWidthFontRenderer.drawEmptyTerminal(
+                FixedWidthFontRenderer.toVertexConsumer( matrix, bufferSource.getBuffer( RenderTypes.TERMINAL_WITH_DEPTH ) ),
+                0, 0, width, height
+            );
         }
 
         transform.popPose();
@@ -127,15 +133,16 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
 
     private static void renderLight( Matrix4f transform, MultiBufferSource render, int colour, int width, int height )
     {
-        float r = ((colour >>> 16) & 0xFF) / 255.0f;
-        float g = ((colour >>> 8) & 0xFF) / 255.0f;
-        float b = (colour & 0xFF) / 255.0f;
-        float z = 0.001f;
+        byte r = (byte) ((colour >>> 16) & 0xFF);
+        byte g = (byte) ((colour >>> 8) & 0xFF);
+        byte b = (byte) (colour & 0xFF);
+        byte[] c = new byte[] { r, g, b, (byte) 255 };
 
-        VertexConsumer buffer = render.getBuffer( RenderTypes.POSITION_COLOR );
-        buffer.vertex( transform, width - LIGHT_HEIGHT * 2, height + LIGHT_HEIGHT + BORDER / 2.0f, z ).color( r, g, b, 1.0f ).endVertex();
-        buffer.vertex( transform, width, height + LIGHT_HEIGHT + BORDER / 2.0f, z ).color( r, g, b, 1.0f ).endVertex();
-        buffer.vertex( transform, width, height + BORDER / 2.0f, z ).color( r, g, b, 1.0f ).endVertex();
-        buffer.vertex( transform, width - LIGHT_HEIGHT * 2, height + BORDER / 2.0f, z ).color( r, g, b, 1.0f ).endVertex();
+        VertexConsumer buffer = render.getBuffer( RenderTypes.TERMINAL_WITH_DEPTH );
+        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
+        );
     }
 }

src/main/java/dan200/computercraft/client/render/ItemPrintoutRenderer.java

@@ -19,9 +19,9 @@ import net.minecraftforge.client.event.RenderItemInFrameEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
 import static dan200.computercraft.client.render.PrintoutRenderer.*;
+import static dan200.computercraft.client.render.text.FixedWidthFontRenderer.FONT_HEIGHT;
+import static dan200.computercraft.client.render.text.FixedWidthFontRenderer.FONT_WIDTH;
 import static dan200.computercraft.shared.media.items.ItemPrintout.LINES_PER_PAGE;
 import static dan200.computercraft.shared.media.items.ItemPrintout.LINE_MAX_LENGTH;
 
@@ -88,7 +88,7 @@ public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
         double height = LINES_PER_PAGE * FONT_HEIGHT + Y_TEXT_MARGIN * 2;
 
         // Non-books will be left aligned
-        if( !book ) width += offsetAt( pages );
+        if( !book ) width += offsetAt( pages - 1 );
 
         double visualWidth = width, visualHeight = height;
 

src/main/java/dan200/computercraft/client/render/MonitorTextureBufferShader.java

@@ -7,95 +7,63 @@ package dan200.computercraft.client.render;
 
 import com.mojang.blaze3d.shaders.Uniform;
 import com.mojang.blaze3d.vertex.VertexFormat;
-import dan200.computercraft.client.gui.FixedWidthFontRenderer;
-import dan200.computercraft.shared.util.Palette;
+import dan200.computercraft.client.FrameInfo;
+import dan200.computercraft.client.render.text.FixedWidthFontRenderer;
+import dan200.computercraft.core.terminal.Terminal;
+import dan200.computercraft.core.terminal.TextBuffer;
+import dan200.computercraft.shared.util.Colour;
 import net.minecraft.client.renderer.ShaderInstance;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.ResourceProvider;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.lwjgl.opengl.GL13;
+import org.lwjgl.opengl.GL31;
 
 import javax.annotation.Nullable;
 import java.io.IOException;
-import java.nio.FloatBuffer;
+import java.nio.ByteBuffer;
+
+import static dan200.computercraft.client.render.text.FixedWidthFontRenderer.getColour;
 
 public class MonitorTextureBufferShader extends ShaderInstance
 {
+    public static final int UNIFORM_SIZE = 4 * 4 * 16 + 4 + 4 + 2 * 4 + 4;
+
     static final int TEXTURE_INDEX = GL13.GL_TEXTURE3;
 
     private static final Logger LOGGER = LogManager.getLogger();
 
-    private final Uniform palette;
-    private final Uniform width;
-    private final Uniform height;
+    private final int monitorData;
+    private int uniformBuffer = 0;
+
+    private final Uniform cursorBlink;
 
     public MonitorTextureBufferShader( ResourceProvider provider, ResourceLocation location, VertexFormat format ) throws IOException
     {
         super( provider, location, format );
+        monitorData = GL31.glGetUniformBlockIndex( getId(), "MonitorData" );
+        if( monitorData == -1 ) throw new IllegalStateException( "Could not find MonitorData uniform." );
 
-        width = getUniformChecked( "Width" );
-        height = getUniformChecked( "Height" );
-        palette = new Uniform( "Palette", Uniform.UT_FLOAT3, 16 * 3, this );
-        updateUniformLocation( palette );
+        cursorBlink = getUniformChecked( "CursorBlink" );
 
         Uniform tbo = getUniformChecked( "Tbo" );
         if( tbo != null ) tbo.set( TEXTURE_INDEX - GL13.GL_TEXTURE0 );
     }
 
-    void setupUniform( int width, int height, Palette palette, boolean greyscale )
+    public void setupUniform( int buffer )
     {
-        if( this.width != null ) this.width.set( width );
-        if( this.height != null ) this.height.set( height );
-        setupPalette( palette, greyscale );
-    }
+        uniformBuffer = buffer;
 
-    private void setupPalette( Palette palette, boolean greyscale )
-    {
-        if( this.palette == null ) return;
-
-        FloatBuffer paletteBuffer = this.palette.getFloatBuffer();
-        paletteBuffer.rewind();
-        for( int i = 0; i < 16; i++ )
-        {
-            double[] colour = palette.getColour( i );
-            if( greyscale )
-            {
-                float f = FixedWidthFontRenderer.toGreyscale( colour );
-                paletteBuffer.put( f ).put( f ).put( f );
-            }
-            else
-            {
-                paletteBuffer.put( (float) colour[0] ).put( (float) colour[1] ).put( (float) colour[2] );
-            }
-        }
+        int cursorAlpha = FrameInfo.getGlobalCursorBlink() ? 1 : 0;
+        if( cursorBlink != null && cursorBlink.getIntBuffer().get( 0 ) != cursorAlpha ) cursorBlink.set( cursorAlpha );
     }
 
     @Override
     public void apply()
     {
         super.apply();
-        palette.upload();
-    }
-
-    @Override
-    public void close()
-    {
-        palette.close();
-        super.close();
-    }
-
-    private void updateUniformLocation( Uniform uniform )
-    {
-        int id = Uniform.glGetUniformLocation( getId(), uniform.getName() );
-        if( id == -1 )
-        {
-            LOGGER.warn( "Shader {} could not find uniform named {} in the specified shader program.", getName(), uniform.getName() );
-        }
-        else
-        {
-            uniform.setLocation( id );
-        }
+        GL31.glBindBufferBase( GL31.GL_UNIFORM_BUFFER, monitorData, uniformBuffer );
     }
 
     @Nullable
@@ -109,4 +77,56 @@ public class MonitorTextureBufferShader extends ShaderInstance
 
         return uniform;
     }
+
+    public static void setTerminalData( ByteBuffer buffer, Terminal terminal )
+    {
+        int width = terminal.getWidth(), height = terminal.getHeight();
+
+        int pos = 0;
+        for( int y = 0; y < height; y++ )
+        {
+            TextBuffer text = terminal.getLine( y ), textColour = terminal.getTextColourLine( y ), background = terminal.getBackgroundColourLine( y );
+            for( int x = 0; x < width; x++ )
+            {
+                buffer.put( pos, (byte) (text.charAt( x ) & 0xFF) );
+                buffer.put( pos + 1, (byte) getColour( textColour.charAt( x ), Colour.WHITE ) );
+                buffer.put( pos + 2, (byte) getColour( background.charAt( x ), Colour.BLACK ) );
+                pos += 3;
+            }
+        }
+
+        buffer.limit( pos );
+    }
+
+    public static void setUniformData( ByteBuffer buffer, Terminal terminal, boolean greyscale )
+    {
+        int pos = 0;
+        var palette = terminal.getPalette();
+        for( int i = 0; i < 16; i++ )
+        {
+            {
+                double[] colour = palette.getColour( i );
+                if( greyscale )
+                {
+                    float f = FixedWidthFontRenderer.toGreyscale( colour );
+                    buffer.putFloat( pos, f ).putFloat( pos + 4, f ).putFloat( pos + 8, f );
+                }
+                else
+                {
+                    buffer.putFloat( pos, (float) colour[0] ).putFloat( pos + 4, (float) colour[1] ).putFloat( pos + 8, (float) colour[2] );
+                }
+            }
+
+            pos += 4 * 4; // std140 requires these are 4-wide
+        }
+
+        boolean showCursor = FixedWidthFontRenderer.isCursorVisible( terminal );
+        buffer
+            .putInt( pos, terminal.getWidth() ).putInt( pos + 4, terminal.getHeight() )
+            .putInt( pos + 8, showCursor ? terminal.getCursorX() : -2 )
+            .putInt( pos + 12, showCursor ? terminal.getCursorY() : -2 )
+            .putInt( pos + 16, 15 - terminal.getTextColour() );
+
+        buffer.limit( UNIFORM_SIZE );
+    }
 }

src/main/java/dan200/computercraft/client/render/PrintoutRenderer.java

@@ -7,12 +7,12 @@ package dan200.computercraft.client.render;
 
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Matrix4f;
-import dan200.computercraft.client.gui.FixedWidthFontRenderer;
+import dan200.computercraft.client.render.text.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.util.Palette;
 import net.minecraft.client.renderer.MultiBufferSource;
 
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
+import static dan200.computercraft.client.render.text.FixedWidthFontRenderer.FONT_HEIGHT;
 import static dan200.computercraft.shared.media.items.ItemPrintout.LINES_PER_PAGE;
 
 public final class PrintoutRenderer
@@ -54,39 +54,39 @@ public final class PrintoutRenderer
 
     private PrintoutRenderer() {}
 
-    public static void drawText( Matrix4f transform, MultiBufferSource renderer, int x, int y, int start, int light, TextBuffer[] text, TextBuffer[] colours )
+    public static void drawText( Matrix4f transform, MultiBufferSource bufferSource, int x, int y, int start, int light, TextBuffer[] text, TextBuffer[] colours )
     {
-        VertexConsumer buffer = renderer.getBuffer( RenderTypes.PRINTOUT_TEXT );
+        var buffer = bufferSource.getBuffer( RenderTypes.PRINTOUT_TEXT );
+        var emitter = FixedWidthFontRenderer.toVertexConsumer( transform, buffer );
         for( int line = 0; line < LINES_PER_PAGE && line < text.length; line++ )
         {
-            FixedWidthFontRenderer.drawString( transform, buffer,
-                x, y + line * FONT_HEIGHT, text[start + line], colours[start + line], null, Palette.DEFAULT,
-                false, 0, 0,
-                light
+            FixedWidthFontRenderer.drawString( emitter,
+                x, y + line * FONT_HEIGHT, text[start + line], colours[start + line],
+                Palette.DEFAULT, false, light
             );
         }
     }
 
-    public static void drawText( Matrix4f transform, MultiBufferSource renderer, int x, int y, int start, int light, String[] text, String[] colours )
+    public static void drawText( Matrix4f transform, MultiBufferSource bufferSource, int x, int y, int start, int light, String[] text, String[] colours )
     {
-        VertexConsumer buffer = renderer.getBuffer( RenderTypes.PRINTOUT_TEXT );
+        var buffer = bufferSource.getBuffer( RenderTypes.PRINTOUT_TEXT );
+        var emitter = FixedWidthFontRenderer.toVertexConsumer( transform, buffer );
         for( int line = 0; line < LINES_PER_PAGE && line < text.length; line++ )
         {
-            FixedWidthFontRenderer.drawString( transform, buffer,
+            FixedWidthFontRenderer.drawString( emitter,
                 x, y + line * FONT_HEIGHT,
                 new TextBuffer( text[start + line] ), new TextBuffer( colours[start + line] ),
-                null, Palette.DEFAULT, false, 0, 0,
-                light
+                Palette.DEFAULT, false, light
             );
         }
     }
 
-    public static void drawBorder( Matrix4f transform, MultiBufferSource renderer, float x, float y, float z, int page, int pages, boolean isBook, int light )
+    public static void drawBorder( Matrix4f transform, MultiBufferSource bufferSource, float x, float y, float z, int page, int pages, boolean isBook, int light )
     {
         int leftPages = page;
         int rightPages = pages - page - 1;
 
-        VertexConsumer buffer = renderer.getBuffer( RenderTypes.PRINTOUT_BACKGROUND );
+        VertexConsumer buffer = bufferSource.getBuffer( RenderTypes.PRINTOUT_BACKGROUND );
 
         if( isBook )
         {

src/main/java/dan200/computercraft/client/render/RenderTypes.java

@@ -8,7 +8,8 @@ package dan200.computercraft.client.render;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.vertex.VertexFormat;
 import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.client.gui.FixedWidthFontRenderer;
+import dan200.computercraft.client.render.text.FixedWidthFontRenderer;
+import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.RenderStateShard;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.ShaderInstance;
@@ -27,24 +28,45 @@ public class RenderTypes
     public static final int FULL_BRIGHT_LIGHTMAP = (0xF << 4) | (0xF << 20);
 
     private static MonitorTextureBufferShader monitorTboShader;
-    private static ShaderInstance terminalShader;
-
-    public static final RenderType TERMINAL_WITHOUT_DEPTH = Types.TERMINAL_WITHOUT_DEPTH;
-    public static final RenderType TERMINAL_BLOCKER = Types.TERMINAL_BLOCKER;
-    public static final RenderType TERMINAL_WITH_DEPTH = Types.TERMINAL_WITH_DEPTH;
-    public static final RenderType MONITOR_TBO = Types.MONITOR_TBO;
-    public static final RenderType PRINTOUT_TEXT = Types.PRINTOUT_TEXT;
 
     /**
-     * This looks wrong (it should be POSITION_COLOR_TEX_LIGHTMAP surely!) but the fragment/vertex shader for that
-     * appear to entirely ignore the lightmap.
+     * Renders a fullbright terminal without writing to the depth layer. This is used in combination with
+     * {@link #TERMINAL_BLOCKER} to ensure we can render a terminal without z-fighting.
+     */
+    public static final RenderType TERMINAL_WITHOUT_DEPTH = Types.TERMINAL_WITHOUT_DEPTH;
+
+    /**
+     * A transparent texture which only writes to the depth layer.
+     */
+    public static final RenderType TERMINAL_BLOCKER = Types.TERMINAL_BLOCKER;
+
+    /**
+     * Renders a fullbright terminal which also writes to the depth layer. This is used when z-fighting isn't an issue -
+     * for instance rendering an empty terminal or inside a GUI.
      *
-     * Note that vanilla maps do the same, so this isn't unreasonable.
+     * This is identical to <em>vanilla's</em> {@link RenderType#text}. Forge overrides one with a definition which sets
+     * sortOnUpload to true, which is entirely broken!
+     */
+    public static final RenderType TERMINAL_WITH_DEPTH = Types.TERMINAL_WITH_DEPTH;
+
+    /**
+     * Renders a monitor with the TBO shader.
+     *
+     * @see MonitorTextureBufferShader
+     */
+    public static final RenderType MONITOR_TBO = Types.MONITOR_TBO;
+
+    /**
+     * A variant of {@link #TERMINAL_WITH_DEPTH} which uses the lightmap rather than rendering fullbright.
+     */
+    public static final RenderType PRINTOUT_TEXT = RenderType.text( FixedWidthFontRenderer.FONT );
+
+    /**
+     * Printout's background texture. {@link RenderType#text(ResourceLocation)} is a <em>little</em> questionable, but
+     * it is what maps use, so should behave the same as vanilla in both item frames and in-hand.
      */
     public static final RenderType PRINTOUT_BACKGROUND = RenderType.text( new ResourceLocation( "computercraft", "textures/gui/printout.png" ) );
 
-    public static final RenderType POSITION_COLOR = Types.POSITION_COLOR;
-
     @Nonnull
     static MonitorTextureBufferShader getMonitorTextureBufferShader()
     {
@@ -55,8 +77,7 @@ public class RenderTypes
     @Nonnull
     static ShaderInstance getTerminalShader()
     {
-        if( terminalShader == null ) throw new NullPointerException( "MonitorTboShader has not been registered" );
-        return terminalShader;
+        return GameRenderer.getPositionColorTexShader();
     }
 
     @SubscribeEvent
@@ -70,15 +91,6 @@ public class RenderTypes
             ),
             x -> monitorTboShader = (MonitorTextureBufferShader) x
         );
-
-        event.registerShader(
-            new ShaderInstance(
-                event.getResourceManager(),
-                new ResourceLocation( ComputerCraft.MOD_ID, "terminal" ),
-                TERMINAL_WITHOUT_DEPTH.format()
-            ),
-            x -> terminalShader = x
-        );
     }
 
     private static final class Types extends RenderStateShard
@@ -88,7 +100,6 @@ public class RenderTypes
             false, false // blur, minimap
         );
         private static final VertexFormat TERM_FORMAT = DefaultVertexFormat.POSITION_COLOR_TEX;
-        private static final VertexFormat.Mode TERM_MODE = VertexFormat.Mode.TRIANGLES;
         private static final ShaderStateShard TERM_SHADER = new ShaderStateShard( RenderTypes::getTerminalShader );
 
         static final RenderType MONITOR_TBO = RenderType.create(
@@ -97,57 +108,36 @@ public class RenderTypes
             RenderType.CompositeState.builder()
                 .setTextureState( TERM_FONT_TEXTURE )
                 .setShaderState( new ShaderStateShard( RenderTypes::getMonitorTextureBufferShader ) )
-                .setWriteMaskState( COLOR_WRITE )
                 .createCompositeState( false )
         );
 
         static final RenderType TERMINAL_WITHOUT_DEPTH = RenderType.create(
-            "terminal_without_depth", TERM_FORMAT, TERM_MODE, 1024,
+            "terminal_without_depth", TERM_FORMAT, VertexFormat.Mode.QUADS, 1024,
             false, false, // useDelegate, needsSorting
             RenderType.CompositeState.builder()
                 .setTextureState( TERM_FONT_TEXTURE )
                 .setShaderState( TERM_SHADER )
+                .setLightmapState( LIGHTMAP )
                 .setWriteMaskState( COLOR_WRITE )
                 .createCompositeState( false )
         );
 
         static final RenderType TERMINAL_BLOCKER = RenderType.create(
-            "terminal_blocker", TERM_FORMAT, TERM_MODE, 256,
+            "terminal_blocker", DefaultVertexFormat.POSITION, VertexFormat.Mode.QUADS, 256,
             false, false, // useDelegate, needsSorting
             RenderType.CompositeState.builder()
-                .setTextureState( TERM_FONT_TEXTURE )
-                .setShaderState( TERM_SHADER )
+                .setShaderState( POSITION_SHADER )
                 .setWriteMaskState( DEPTH_WRITE )
                 .createCompositeState( false )
         );
 
         static final RenderType TERMINAL_WITH_DEPTH = RenderType.create(
-            "terminal_with_depth", TERM_FORMAT, TERM_MODE, 1024,
+            "terminal_with_depth", TERM_FORMAT, VertexFormat.Mode.QUADS, 1024,
             false, false, // useDelegate, needsSorting
             RenderType.CompositeState.builder()
                 .setTextureState( TERM_FONT_TEXTURE )
                 .setShaderState( TERM_SHADER )
-                .createCompositeState( false )
-        );
-
-        /**
-         * A variant of {@link #TERMINAL_WITH_DEPTH} which uses the lightmap rather than rendering fullbright.
-         */
-        static final RenderType PRINTOUT_TEXT = RenderType.create(
-            "printout_text", DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP, TERM_MODE, 1024,
-            false, false, // useDelegate, needsSorting
-            RenderType.CompositeState.builder()
-                .setTextureState( TERM_FONT_TEXTURE )
-                .setShaderState( RenderStateShard.RENDERTYPE_TEXT_SHADER )
-                .setLightmapState( RenderStateShard.LIGHTMAP )
-                .createCompositeState( false )
-        );
-
-        static final RenderType POSITION_COLOR = RenderType.create(
-            "position_color", DefaultVertexFormat.POSITION_COLOR, VertexFormat.Mode.QUADS, 128,
-            false, false, // useDelegate, needsSorting
-            RenderType.CompositeState.builder()
-                .setShaderState( POSITION_COLOR_SHADER )
+                .setLightmapState( LIGHTMAP )
                 .createCompositeState( false )
         );
 

src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java

@@ -8,19 +8,19 @@ package dan200.computercraft.client.render;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.platform.MemoryTracker;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.*;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Matrix4f;
-import com.mojang.math.Transformation;
 import com.mojang.math.Vector3f;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.FrameInfo;
-import dan200.computercraft.client.gui.FixedWidthFontRenderer;
+import dan200.computercraft.client.render.text.DirectFixedWidthFontRenderer;
+import dan200.computercraft.client.render.text.FixedWidthFontRenderer;
+import dan200.computercraft.client.util.DirectBuffers;
 import dan200.computercraft.core.terminal.Terminal;
-import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.peripheral.monitor.ClientMonitor;
 import dan200.computercraft.shared.peripheral.monitor.MonitorRenderer;
 import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
-import dan200.computercraft.shared.util.Colour;
 import dan200.computercraft.shared.util.DirectionUtil;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
@@ -35,7 +35,8 @@ import org.lwjgl.opengl.GL31;
 import javax.annotation.Nonnull;
 import java.nio.ByteBuffer;
 
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.*;
+import static dan200.computercraft.client.render.text.FixedWidthFontRenderer.FONT_HEIGHT;
+import static dan200.computercraft.client.render.text.FixedWidthFontRenderer.FONT_WIDTH;
 
 public class TileEntityMonitorRenderer implements BlockEntityRenderer<TileMonitor>
 {
@@ -44,16 +45,14 @@ public class TileEntityMonitorRenderer implements BlockEntityRenderer<TileMonito
      * the monitor frame and contents.
      */
     private static final float MARGIN = (float) (TileMonitor.RENDER_MARGIN * 1.1);
-    private static ByteBuffer tboContents;
-
-    private static final Matrix4f IDENTITY = Transformation.identity().getMatrix();
+    private static ByteBuffer backingBuffer;
 
     public TileEntityMonitorRenderer( BlockEntityRendererProvider.Context context )
     {
     }
 
     @Override
-    public void render( @Nonnull TileMonitor monitor, float partialTicks, @Nonnull PoseStack transform, @Nonnull MultiBufferSource renderer, int lightmapCoord, int overlayLight )
+    public void render( @Nonnull TileMonitor monitor, float partialTicks, @Nonnull PoseStack transform, @Nonnull MultiBufferSource bufferSource, int lightmapCoord, int overlayLight )
     {
         // Render from the origin monitor
         ClientMonitor originTerminal = monitor.getClientMonitor();
@@ -114,31 +113,14 @@ public class TileEntityMonitorRenderer implements BlockEntityRenderer<TileMonito
 
             Matrix4f matrix = transform.last().pose();
 
-            renderTerminal( renderer, matrix, originTerminal, (float) (MARGIN / xScale), (float) (MARGIN / yScale) );
-
-            // We don't draw the cursor with the VBO, as it's dynamic and so we'll end up refreshing far more than is
-            // reasonable.
-            FixedWidthFontRenderer.drawCursor(
-                matrix, renderer.getBuffer( RenderTypes.TERMINAL_WITHOUT_DEPTH ),
-                0, 0, terminal, !originTerminal.isColour()
-            );
+            renderTerminal( bufferSource, matrix, originTerminal, (float) (MARGIN / xScale), (float) (MARGIN / yScale) );
 
             transform.popPose();
-
-            FixedWidthFontRenderer.drawBlocker(
-                transform.last().pose(), renderer,
-                -MARGIN, MARGIN,
-                (float) (xSize + 2 * MARGIN), (float) -(ySize + MARGIN * 2)
-            );
-
-            // Force a flush of the blocker. WorldRenderer.updateCameraAndRender will "finish" all the built-in
-            // buffers before calling renderer.finish, which means the blocker isn't actually rendered at that point!
-            renderer.getBuffer( RenderType.solid() );
         }
         else
         {
             FixedWidthFontRenderer.drawEmptyTerminal(
-                transform.last().pose(), renderer,
+                FixedWidthFontRenderer.toVertexConsumer( transform.last().pose(), bufferSource.getBuffer( RenderTypes.TERMINAL_WITH_DEPTH ) ),
                 -MARGIN, MARGIN,
                 (float) (xSize + 2 * MARGIN), (float) -(ySize + MARGIN * 2)
             );
@@ -147,9 +129,11 @@ public class TileEntityMonitorRenderer implements BlockEntityRenderer<TileMonito
         transform.popPose();
     }
 
-    private static void renderTerminal( @Nonnull MultiBufferSource renderer, Matrix4f matrix, ClientMonitor monitor, float xMargin, float yMargin )
+    private static void renderTerminal( @Nonnull MultiBufferSource bufferSource, Matrix4f matrix, ClientMonitor monitor, float xMargin, float yMargin )
     {
         Terminal terminal = monitor.getTerminal();
+        int width = terminal.getWidth(), height = terminal.getHeight();
+        int pixelWidth = width * FONT_WIDTH, pixelHeight = height * FONT_HEIGHT;
 
         MonitorRenderer renderType = MonitorRenderer.current();
         boolean redraw = monitor.pollTerminalChanged();
@@ -159,34 +143,15 @@ public class TileEntityMonitorRenderer implements BlockEntityRenderer<TileMonito
         {
             case TBO:
             {
-                int width = terminal.getWidth(), height = terminal.getHeight();
-
-                int pixelWidth = width * FONT_WIDTH, pixelHeight = height * FONT_HEIGHT;
                 if( redraw )
                 {
-                    int size = width * height * 3;
-                    if( tboContents == null || tboContents.capacity() < size )
-                    {
-                        tboContents = MemoryTracker.create( size );
-                    }
+                    var terminalBuffer = getBuffer( width * height * 3 );
+                    MonitorTextureBufferShader.setTerminalData( terminalBuffer, terminal );
+                    DirectBuffers.setBufferData( GL31.GL_TEXTURE_BUFFER, monitor.tboBuffer, terminalBuffer, GL20.GL_STATIC_DRAW );
 
-                    ByteBuffer monitorBuffer = tboContents;
-                    monitorBuffer.clear();
-                    for( int y = 0; y < height; y++ )
-                    {
-                        TextBuffer text = terminal.getLine( y ), textColour = terminal.getTextColourLine( y ), background = terminal.getBackgroundColourLine( y );
-                        for( int x = 0; x < width; x++ )
-                        {
-                            monitorBuffer.put( (byte) (text.charAt( x ) & 0xFF) );
-                            monitorBuffer.put( (byte) getColour( textColour.charAt( x ), Colour.WHITE ) );
-                            monitorBuffer.put( (byte) getColour( background.charAt( x ), Colour.BLACK ) );
-                        }
-                    }
-                    monitorBuffer.flip();
-
-                    GlStateManager._glBindBuffer( GL31.GL_TEXTURE_BUFFER, monitor.tboBuffer );
-                    GlStateManager._glBufferData( GL31.GL_TEXTURE_BUFFER, monitorBuffer, GL20.GL_STATIC_DRAW );
-                    GlStateManager._glBindBuffer( GL31.GL_TEXTURE_BUFFER, 0 );
+                    var uniformBuffer = getBuffer( MonitorTextureBufferShader.UNIFORM_SIZE );
+                    MonitorTextureBufferShader.setUniformData( uniformBuffer, terminal, !monitor.isColour() );
+                    DirectBuffers.setBufferData( GL31.GL_UNIFORM_BUFFER, monitor.tboUniform, uniformBuffer, GL20.GL_STATIC_DRAW );
                 }
 
                 // Nobody knows what they're doing!
@@ -196,43 +161,61 @@ public class TileEntityMonitorRenderer implements BlockEntityRenderer<TileMonito
                 RenderSystem.activeTexture( active );
 
                 MonitorTextureBufferShader shader = RenderTypes.getMonitorTextureBufferShader();
-                shader.setupUniform( width, height, terminal.getPalette(), !monitor.isColour() );
+                shader.setupUniform( monitor.tboUniform );
 
-                VertexConsumer buffer = renderer.getBuffer( RenderTypes.MONITOR_TBO );
+                VertexConsumer buffer = bufferSource.getBuffer( RenderTypes.MONITOR_TBO );
                 tboVertex( buffer, matrix, -xMargin, -yMargin );
                 tboVertex( buffer, matrix, -xMargin, pixelHeight + yMargin );
                 tboVertex( buffer, matrix, pixelWidth + xMargin, -yMargin );
                 tboVertex( buffer, matrix, pixelWidth + xMargin, pixelHeight + yMargin );
 
-                // And force things to flush. We strictly speaking do this later on anyway for the cursor, but nice to
-                // be consistent.
-                renderer.getBuffer( RenderTypes.TERMINAL_WITHOUT_DEPTH );
                 break;
             }
 
             case VBO:
             {
-                VertexBuffer vbo = monitor.buffer;
+                var vbo = monitor.buffer;
                 if( redraw )
                 {
-                    Tesselator tessellator = Tesselator.getInstance();
-                    BufferBuilder builder = tessellator.getBuilder();
-                    builder.begin( RenderTypes.TERMINAL_WITHOUT_DEPTH.mode(), RenderTypes.TERMINAL_WITHOUT_DEPTH.format() );
-                    FixedWidthFontRenderer.drawTerminalWithoutCursor(
-                        IDENTITY, builder, 0, 0,
-                        terminal, !monitor.isColour(), yMargin, yMargin, xMargin, xMargin
-                    );
+                    int vertexSize = RenderTypes.TERMINAL_WITHOUT_DEPTH.format().getVertexSize();
+                    ByteBuffer buffer = getBuffer( DirectFixedWidthFontRenderer.getVertexCount( terminal ) * vertexSize );
 
-                    builder.end();
-                    vbo.upload( builder );
+                    // Draw the main terminal and store how many vertices it has.
+                    DirectFixedWidthFontRenderer.drawTerminalWithoutCursor(
+                        buffer, 0, 0, terminal, !monitor.isColour(), yMargin, yMargin, xMargin, xMargin
+                    );
+                    int termIndexes = buffer.position() / vertexSize;
+
+                    // If the cursor is visible, we append it to the end of our buffer. When rendering, we can either
+                    // render n or n+1 quads and so toggle the cursor on and off.
+                    DirectFixedWidthFontRenderer.drawCursor( buffer, 0, 0, terminal, !monitor.isColour() );
+
+                    buffer.flip();
+
+                    vbo.upload( termIndexes, RenderTypes.TERMINAL_WITHOUT_DEPTH.mode(), RenderTypes.TERMINAL_WITHOUT_DEPTH.format(), buffer );
                 }
 
-                renderer.getBuffer( RenderTypes.TERMINAL_WITHOUT_DEPTH );
+                bufferSource.getBuffer( RenderTypes.TERMINAL_WITHOUT_DEPTH );
                 RenderTypes.TERMINAL_WITHOUT_DEPTH.setupRenderState();
-                vbo.drawWithShader( matrix, RenderSystem.getProjectionMatrix(), RenderTypes.getTerminalShader() );
+
+                vbo.drawWithShader(
+                    matrix, RenderSystem.getProjectionMatrix(), RenderTypes.getTerminalShader(),
+                    // As mentioned in the above comment, render the extra cursor quad if it is visible this frame. Each
+                    // // quad has an index count of 6.
+                    FixedWidthFontRenderer.isCursorVisible( terminal ) && FrameInfo.getGlobalCursorBlink() ? vbo.getIndexCount() + 6 : vbo.getIndexCount()
+                );
+
+                FixedWidthFontRenderer.drawBlocker(
+                    FixedWidthFontRenderer.toVertexConsumer( matrix, bufferSource.getBuffer( RenderTypes.TERMINAL_BLOCKER ) ),
+                    -xMargin, -yMargin, pixelWidth + xMargin, pixelHeight + yMargin
+                );
                 break;
             }
         }
+
+        // Force a flush of the buffer. WorldRenderer.updateCameraAndRender will "finish" all the built-in buffers
+        // before calling renderer.finish, which means our TBO quad or depth blocker won't be rendered yet!
+        bufferSource.getBuffer( RenderType.solid() );
     }
 
     private static void tboVertex( VertexConsumer builder, Matrix4f matrix, float x, float y )
@@ -241,6 +224,20 @@ public class TileEntityMonitorRenderer implements BlockEntityRenderer<TileMonito
         builder.vertex( matrix, x, y, 0 ).uv( x, y ).endVertex();
     }
 
+    @Nonnull
+    private static ByteBuffer getBuffer( int capacity )
+    {
+
+        ByteBuffer buffer = backingBuffer;
+        if( buffer == null || buffer.capacity() < capacity )
+        {
+            buffer = backingBuffer = buffer == null ? MemoryTracker.create( capacity ) : MemoryTracker.resize( buffer, capacity );
+        }
+
+        buffer.clear();
+        return buffer;
+    }
+
     @Override
     public int getViewDistance()
     {

src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java

@@ -30,6 +30,7 @@ import net.minecraft.client.resources.model.ModelManager;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.core.Direction;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.RandomSource;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
@@ -37,7 +38,6 @@ import net.minecraftforge.client.model.data.EmptyModelData;
 
 import javax.annotation.Nonnull;
 import java.util.List;
-import java.util.Random;
 
 public class TileEntityTurtleRenderer implements BlockEntityRenderer<TileTurtle>
 {
@@ -46,7 +46,7 @@ public class TileEntityTurtleRenderer implements BlockEntityRenderer<TileTurtle>
     private static final ModelResourceLocation COLOUR_TURTLE_MODEL = new ModelResourceLocation( "computercraft:turtle_colour", "inventory" );
     private static final ModelResourceLocation ELF_OVERLAY_MODEL = new ModelResourceLocation( "computercraft:turtle_elf_overlay", "inventory" );
 
-    private final Random random = new Random( 0 );
+    private final RandomSource random = RandomSource.create( 0 );
 
     private final BlockEntityRenderDispatcher renderer;
 

src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java

@@ -12,6 +12,7 @@ import net.minecraft.client.renderer.block.model.ItemOverrides;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.Direction;
+import net.minecraft.util.RandomSource;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.client.model.data.EmptyModelData;
 import net.minecraftforge.client.model.data.IModelData;
@@ -19,7 +20,10 @@ import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;
 import net.minecraftforge.client.model.pipeline.TRSRTransformer;
 
 import javax.annotation.Nonnull;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
 
 public class TurtleMultiModel implements BakedModel
 {
@@ -44,14 +48,14 @@ public class TurtleMultiModel implements BakedModel
     @Nonnull
     @Override
     @Deprecated
-    public List<BakedQuad> getQuads( BlockState state, Direction side, @Nonnull Random rand )
+    public List<BakedQuad> getQuads( BlockState state, Direction side, @Nonnull RandomSource rand )
     {
         return getQuads( state, side, rand, EmptyModelData.INSTANCE );
     }
 
     @Nonnull
     @Override
-    public List<BakedQuad> getQuads( BlockState state, Direction side, @Nonnull Random rand, @Nonnull IModelData data )
+    public List<BakedQuad> getQuads( BlockState state, Direction side, @Nonnull RandomSource rand, @Nonnull IModelData data )
     {
         if( side != null )
         {
@@ -65,7 +69,7 @@ public class TurtleMultiModel implements BakedModel
         }
     }
 
-    private List<BakedQuad> buildQuads( BlockState state, Direction side, Random rand )
+    private List<BakedQuad> buildQuads( BlockState state, Direction side, RandomSource rand )
     {
         ArrayList<BakedQuad> quads = new ArrayList<>();