save -> saveAdditional

Also add in a janky workabround for handleUpdateTag not being called. Being an early porter is always fun :D:.
Exclude Jetbrains annotations from testModExtra
2025-10-23 18:07:39 +00:00 · 2021-12-02 09:20:06 +00:00 · 2021-12-01 20:40:46 +00:00 · 2021-11-30 22:48:38 +00:00
545 changed files with 1508 additions and 6929 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,4 +13,3 @@ src/testMod/server-files/structures linguist-generated

 *.png binary
 *.jar binary
-*.dfpwm binary
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -8,9 +8,9 @@ body:
    label: Minecraft Version
    description: What version of Minecraft are you using?
    options:
+      - 1.15.x
      - 1.16.x
      - 1.17.x
-      - 1.18.x
  validations:
    required: true
 - type: input
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,7 @@ buildscript {
        maven { url = 'https://maven.parchmentmc.org' }
    }
    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:5.1.24'
-        classpath "org.spongepowered:mixingradle:0.7.+"
+        classpath 'net.minecraftforge.gradle:ForgeGradle:5.1.+'
        classpath 'org.parchmentmc:librarian:1.+'
    }
 }
@@ -23,7 +22,6 @@ plugins {
 }

 apply plugin: 'net.minecraftforge.gradle'
-apply plugin: "org.spongepowered.mixin"
 apply plugin: 'org.parchmentmc.librarian.forgegradle'

 version = mod_version
@@ -31,7 +29,7 @@ version = mod_version
 group = "org.squiddev"
 archivesBaseName = "cc-tweaked-${mc_version}"

-def javaVersion = JavaLanguageVersion.of(16)
+def javaVersion = JavaLanguageVersion.of(17)
 java {
    toolchain {
        languageVersion = javaVersion
@@ -48,6 +46,10 @@ tasks.withType(JavaExec).configureEach {
 }

 sourceSets {
+    main.java {
+        exclude 'dan200/computercraft/shared/integration/jei/**'
+        exclude 'dan200/computercraft/shared/integration/morered/**'
+    }
    main.resources {
        srcDir 'src/generated/resources'
    }
@@ -70,8 +72,6 @@ minecraft {
                    source sourceSets.main
                }
            }
-
-            arg "-mixin.config=computercraft.mixins.json"
        }

        client {
@@ -123,16 +123,12 @@ minecraft {
        }
    }

-    mappings channel: 'parchment', version: "${mapping_version}-${mc_version}"
+    // mappings channel: 'parchment', version: "${mapping_version}-${mc_version}"
+    mappings channel: 'official', version: mc_version

    accessTransformer file('src/main/resources/META-INF/accesstransformer.cfg')
    accessTransformer file('src/testMod/resources/META-INF/accesstransformer.cfg')
 }
-
-mixin {
-    add sourceSets.main, 'computercraft.mixins.refmap.json'
-}
-
 repositories {
    mavenCentral()
    maven {
@@ -156,11 +152,9 @@ dependencies {
    checkstyle "com.puppycrawl.tools:checkstyle:8.45"

    minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
-    annotationProcessor 'org.spongepowered:mixin:0.8.4:processor'

-    compileOnly fg.deobf("mezz.jei:jei-1.17.1:8.0.0.14:api")
-
-    runtimeOnly fg.deobf("mezz.jei:jei-1.17.1:8.0.0.14")
+    // compileOnly fg.deobf("mezz.jei:jei-1.17.1:8.0.0.14:api")
+    // runtimeOnly fg.deobf("mezz.jei:jei-1.17.1:8.0.0.14")

    shade 'org.squiddev:Cobalt:0.5.2-SNAPSHOT'

@@ -172,9 +166,11 @@ dependencies {
    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'

    testModImplementation sourceSets.main.output
-    testModExtra 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21'
+    testModExtra('org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0') {
+        exclude group: "org.jetbrains", module: "annotations"
+    }

-    cctJavadoc 'cc.tweaked:cct-javadoc:1.4.5'
+    cctJavadoc 'cc.tweaked:cct-javadoc:1.4.2'
 }

 // Compile tasks
@@ -214,8 +210,6 @@ jar {
            "Implementation-Version"  : "${mod_version}",
            "Implementation-Vendor"   : "SquidDev",
            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-        ,
-            "MixinConfigs"            : "computercraft.mixins.json",
        ])
    }

@@ -288,7 +282,18 @@ task rollup(type: Exec) {
    commandLine mkCommand('"node_modules/.bin/rollup" --config rollup.config.js')
 }

-task illuaminateDocs(type: Exec, dependsOn: [rollup, luaJavadoc]) {
+task minifyWeb(type: Exec, dependsOn: rollup) {
+    group = "build"
+    description = "Bundles JS into rollup"
+
+    inputs.file("$buildDir/rollup/index.js").withPropertyName("sources")
+    inputs.file("package-lock.json").withPropertyName("package-lock.json")
+    outputs.file("$buildDir/rollup/index.min.js").withPropertyName("output")
+
+    commandLine mkCommand('"node_modules/.bin/terser"' + " -o '$buildDir/rollup/index.min.js' '$buildDir/rollup/index.js'")
+}
+
+task illuaminateDocs(type: Exec, dependsOn: [minifyWeb, luaJavadoc]) {
    group = "build"
    description = "Bundles JS into rollup"

@@ -296,7 +301,7 @@ task illuaminateDocs(type: Exec, dependsOn: [rollup, luaJavadoc]) {
    inputs.files(fileTree("src/main/resources/data/computercraft/lua/rom")).withPropertyName("lua rom")
    inputs.file("illuaminate.sexp").withPropertyName("illuaminate.sexp")
    inputs.dir("$buildDir/docs/luaJavadoc")
-    inputs.file("$buildDir/rollup/index.js").withPropertyName("scripts")
+    inputs.file("$buildDir/rollup/index.min.js").withPropertyName("scripts")
    inputs.file("src/web/styles.css").withPropertyName("styles")
    outputs.dir("$buildDir/docs/lua")

@@ -304,13 +309,9 @@ task illuaminateDocs(type: Exec, dependsOn: [rollup, luaJavadoc]) {
 }

 task docWebsite(type: Copy, dependsOn: [illuaminateDocs]) {
-    from('doc') {
-        include 'logo.png'
-        include 'images/**'
-    }
-    from("$buildDir/rollup") {
-        exclude 'index.js'
-    }
+    from 'doc'
+    include 'logo.png'
+    include 'images/**'
    into "${project.docsDir}/lua"
 }

@@ -478,7 +479,7 @@ task checkRelease {
 }
 check.dependsOn checkRelease

-def isStable = true
+def isStable = false

 curseforge {
    apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
@@ -583,7 +584,7 @@ githubRelease {
            .takeWhile { it != 'Type "help changelog" to see the full version history.' }
            .join("\n").trim()
    }))
-    prerelease !isStable
+    prerelease isStable
 }

 def uploadTasks = ["publish", "curseforge", "publishModrinth", "githubRelease"]
--- a/config/pre-commit/config.yml
+++ b/config/pre-commit/config.yml
@@ -51,6 +51,5 @@ exclude: |
    src/generated|
    src/test/resources/test-rom/data/json-parsing/|
    src/testMod/server-files/|
-    config/idea/|
-    .*\.dfpwm
+    config/idea/
  )
--- a/doc/events/modem_message.md
+++ b/doc/events/modem_message.md
@@ -2,7 +2,7 @@
 module: [kind=event] modem_message
 ---

-The @{modem_message} event is fired when a message is received on an open channel on any @{modem}.
+The @{modem_message} event is fired when a message is received on an open channel on any modem.

 ## Return Values
 1. @{string}: The event name.
@@ -10,15 +10,11 @@ The @{modem_message} event is fired when a message is received on an open channe
 3. @{number}: The channel that the message was sent on.
 4. @{number}: The reply channel set by the sender.
 5. @{any}: The message as sent by the sender.
-6. @{number}: The distance between the sender and the receiver, in blocks.
+6. @{number}: The distance between the sender and the receiver, in blocks (decimal).

 ## Example
-Wraps a @{modem} peripheral, opens channel 0 for listening, and prints all received messages.
-
+Prints a message when one is sent:
 ```lua
-local modem = peripheral.find("modem") or error("No modem attached", 0)
-modem.open(0)
-
 while true do
  local event, side, channel, replyChannel, message, distance = os.pullEvent("modem_message")
  print(("Message received on side %s on channel %d (reply to %d) from %f blocks away with message %s"):format(side, channel, replyChannel, distance, tostring(message)))
--- a/doc/events/speaker_audio_empty.md
+++ b/doc/events/speaker_audio_empty.md
@@ -1,27 +0,0 @@
---
-module: [kind=event] speaker_audio_empty
-see: speaker.playAudio To play audio using the speaker
---
-
-## Return Values
-1. @{string}: The event name.
-2. @{string}: The name of the speaker which is available to play more audio.
-
-
-## Example
-This uses @{io.lines} to read audio data in blocks of 16KiB from "example_song.dfpwm", and then attempts to play it
-using @{speaker.playAudio}. If the speaker's buffer is full, it waits for an event and tries again.
-
-```lua {data-peripheral=speaker}
-local dfpwm = require("cc.audio.dfpwm")
-local speaker = peripheral.find("speaker")
-
-local decoder = dfpwm.make_decoder()
-for chunk in io.lines("data/example.dfpwm", 16 * 1024) do
-    local buffer = decoder(chunk)
-
-    while not speaker.playAudio(buffer) do
-        os.pullEvent("speaker_audio_empty")
-    end
-end
-```
--- a/doc/events/term_resize.md
+++ b/doc/events/term_resize.md
@@ -2,12 +2,7 @@
 module: [kind=event] term_resize
 ---

-The @{term_resize} event is fired when the main terminal is resized. For instance:
- - When a the tab bar is shown or hidden in @{multishell}.
- - When the terminal is redirected to a monitor via the "monitor" program and the monitor is resized.
-
-When this event fires, some parts of the terminal may have been moved or deleted. Simple terminal programs (those
-not using @{term.setCursorPos}) can ignore this event, but more complex GUI programs should redraw the entire screen.
+The @{term_resize} event is fired when the main terminal is resized, mainly when a new tab is opened or closed in @{multishell}.

 ## Example
 Prints :
--- a/doc/guides/speaker_audio.md
+++ b/doc/guides/speaker_audio.md
@@ -1,200 +0,0 @@
---
-module: [kind=guide] speaker_audio
-see: speaker.playAudio Play PCM audio using a speaker.
-see: cc.audio.dfpwm Provides utilities for encoding and decoding DFPWM files.
---
-
-# Playing audio with speakers
-CC: Tweaked's speaker peripheral provides a powerful way to play any audio you like with the @{speaker.playAudio}
-method. However, for people unfamiliar with digital audio, it's not the most intuitive thing to use. This guide provides
-an introduction to digital audio, demonstrates how to play music with CC: Tweaked's speakers, and then briefly discusses
-the more complex topic of audio processing.
-
-## A short introduction to digital audio
-When sound is recorded it is captured as an analogue signal, effectively the electrical version of a sound
-wave. However, this signal is continuous, and so can't be used directly by a computer. Instead, we measure (or *sample*)
-the amplitude of the wave many times a second and then *quantise* that amplitude, rounding it to the nearest
-representable value.
-
-This representation of sound - a long, uniformally sampled list of amplitudes is referred to as [Pulse-code
-Modulation][PCM] (PCM). PCM can be thought of as the "standard" audio format, as it's incredibly easy to work with. For
-instance, to mix two pieces of audio together, you can just add samples from the two tracks together and take the average.
-
-CC: Tweaked's speakers also work with PCM audio. It plays back 48,000 samples a second, where each sample is an integer
-between -128 and 127. This is more commonly referred to as 48kHz and an 8-bit resolution.
-
-Let's now look at a quick example. We're going to generate a [Sine Wave] at 220Hz, which sounds like a low monotonous
-hum. First we wrap our speaker peripheral, and then we fill a table (also referred to as a *buffer*) with 128×1024
-samples - this is the maximum number of samples a speaker can accept in one go.
-
-In order to fill this buffer, we need to do a little maths. We want to play 220 sine waves each second, where each sine
-wave completes a full oscillation in 2π "units". This means one seconds worth of audio is 2×π×220 "units" long. We then
-need to split this into 48k samples, basically meaning for each sample we move 2×π×220/48k "along" the sine curve.
-
-```lua {data-peripheral=speaker}
-local speaker = peripheral.find("speaker")
-
-local buffer = {}
-local t, dt = 0, 2 * math.pi * 220 / 48000
-for i = 1, 128 * 1024 do
-    buffer[i] = math.floor(math.sin(t) * 127)
-    t = (t + dt) % (math.pi * 2)
-end
-
-speaker.playAudio(buffer)
-```
-
-## Streaming audio
-You might notice that the above snippet only generates a short bit of audio - 2.7s seconds to be precise. While we could
-try increasing the number of loop iterations, we'll get an error when we try to play it through the speaker: the sound
-buffer is too large for it to handle.
-
-Our 2.7 seconds of audio is stored in a table with over 130 _thousand_ elements. If we wanted to play a full minute of
-sine waves (and why wouldn't you?), you'd need a table with almost 3 _million_. Suddenly you find these numbers adding
-up very quickly, and these tables take up more and more memory.
-
-Instead of building our entire song (well, sine wave) in one go, we can produce it in small batches, each of which get
-passed off to @{speaker.playAudio} when the time is right. This allows us to build a _stream_ of audio, where we read
-chunks of audio one at a time (either from a file or a tone generator like above), do some optional processing to each
-one, and then play them.
-
-Let's adapt our example from above to do that instead.
-
-```lua {data-peripheral=speaker}
-local speaker = peripheral.find("speaker")
-
-local t, dt = 0, 2 * math.pi * 220 / 48000
-while true do
-    local buffer = {}
-    for i = 1, 16 * 1024 * 8 do
-        buffer[i] = math.floor(math.sin(t) * 127)
-        t = (t + dt) % (math.pi * 2)
-    end
-
-    while not speaker.playAudio(buffer) do
-        os.pullEvent("speaker_audio_empty")
-    end
-end
-```
-
-It looks pretty similar to before, aside from we've wrapped the generation and playing code in a while loop, and added a
-rather odd loop with @{speaker.playAudio} and @{os.pullEvent}.
-
-Let's talk about this loop, why do we need to keep calling @{speaker.playAudio}? Remember that what we're trying to do
-here is avoid keeping too much audio in memory at once. However, if we're generating audio quicker than the speakers can
-play it, we're not helping at all - all this audio is still hanging around waiting to be played!
-
-In order to avoid this, the speaker rejects any new chunks of audio if its backlog is too large. When this happens,
-@{speaker.playAudio} returns false. Once enough audio has played, and the backlog has been reduced, a
-@{speaker_audio_empty} event is queued, and we can try to play our chunk once more.
-
-## Storing audio
-PCM is a fantastic way of representing audio when we want to manipulate it, but it's not very efficient when we want to
-store it to disk. Compare the size of a WAV file (which uses PCM) to an equivalent MP3, it's often 5 times the size.
-Instead, we store audio in special formats (or *codecs*) and then convert them to PCM when we need to do processing on
-them.
-
-Modern audio codecs use some incredibly impressive techniques to compress the audio as much as possible while preserving
-sound quality. However, due to CC: Tweaked's limited processing power, it's not really possible to use these from your
-computer. Instead, we need something much simpler.
-
-DFPWM (Dynamic Filter Pulse Width Modulation) is the de facto standard audio format of the ComputerCraft (and
-OpenComputers) world. Originally popularised by the addon mod [Computronics], CC:T now has built-in support for it with
-the @{cc.audio.dfpwm} module. This allows you to read DFPWM files from disk, decode them to PCM, and then play them
-using the speaker.
-
-Let's dive in with an example, and we'll explain things afterwards:
-
-```lua {data-peripheral=speaker}
-local dfpwm = require("cc.audio.dfpwm")
-local speaker = peripheral.find("speaker")
-
-local decoder = dfpwm.make_decoder()
-for chunk in io.lines("data/example.dfpwm", 16 * 1024) do
-    local buffer = decoder(chunk)
-
-    while not speaker.playAudio(buffer) do
-        os.pullEvent("speaker_audio_empty")
-    end
-end
-```
-
-Once again, we see the @{speaker.playAudio}/@{speaker_audio_empty} loop. However, the rest of the program is a little
-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
-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.
-
-## Processing audio
-As mentioned near the beginning of this guide, PCM audio is pretty easy to work with as it's just a list of amplitudes.
-You can mix together samples from different streams by adding their amplitudes, change the rate of playback by removing
-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.
-
-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.
-
-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
-[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
-- with 0s, as there's nothing to echo at the start of the track!
-local samples_i, samples_n = 1, 48000
-local samples = {}
-for i = 1, samples_n do samples[i] = 0 end
-
-local decoder = dfpwm.make_decoder()
-for chunk in io.lines("data/example.dfpwm", 16 * 1024) do
-    local buffer = decoder(chunk)
-
-    for i = 1, #buffer do
-        local original_value = buffer[i]
-
-        -- Replace this sample with its current amplitude plus the amplitude from one second 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
-
-        -- Now store the current sample, and move the "head" of our ring buffer forward one place.
-        samples[samples_i] = original_value
-        samples_i = samples_i + 1
-        if samples_i > samples_n then samples_i = 1 end
-    end
-
-    while not speaker.playAudio(buffer) do
-        os.pullEvent("speaker_audio_empty")
-    end
-end
-```
-
-:::note Confused?
-Don't worry if you don't understand this example. It's quite advanced, and does use some ideas that this guide doesn't
-cover. That said, don't be afraid to ask on [Discord] or [IRC] either!
-:::
-
-It's worth noting that the examples of audio processing we've mentioned here are about manipulating the _amplitude_ of
-the wave. If you wanted to modify the _frequency_ (for instance, shifting the pitch), things get rather more complex.
-For this, you'd need to use the [Fast Fourier transform][FFT] to convert the stream of amplitudes to frequencies,
-process those, and then convert them back to amplitudes.
-
-This is, I'm afraid, left as an exercise to the reader.
-
-[Computronics]: https://github.com/Vexatos/Computronics/ "Computronics on GitHub"
-[FFT]: https://en.wikipedia.org/wiki/Fast_Fourier_transform "Fast Fourier transform - Wikipedia"
-[PCM]: https://en.wikipedia.org/wiki/Pulse-code_modulation "Pulse-code Modulation - Wikipedia"
-[Ring Buffer]: https://en.wikipedia.org/wiki/Circular_buffer "Circular buffer - Wikipedia"
-[Sine Wave]: https://en.wikipedia.org/wiki/Sine_wave "Sine wave - Wikipedia"
-
-[Discord]: https://discord.computercraft.cc "The Minecraft Computer Mods Discord"
-[IRC]: http://webchat.esper.net/?channels=computercraft "IRC webchat on EsperNet"
--- a/doc/guides/using_require.md
+++ b/doc/guides/using_require.md
@@ -1,83 +0,0 @@
---
-module: [kind=guide] using_require
---
-
-# Reusing code with require
-A library is a collection of useful functions and other definitions which is stored separately to your main program. You
-might want to create a library because you have some functions which are used in multiple programs, or just to split
-your program into multiple more modular files.
-
-Let's say we want to create a small library to make working with the @{term|terminal} a little easier. We'll provide two
-functions: `reset`, which clears the terminal and sets the cursor to (1, 1), and `write_center`, which prints some text
-in the middle of the screen.
-
-Start off by creating a file called `more_term.lua`:
-
-```lua {data-snippet=more_term}
-local function reset()
-  term.clear()
-  term.setCursorPos(1, 1)
-end
-
-local function write_center(text)
-  local x, y = term.getCursorPos()
-  local width, height = term.getSize()
-  term.setCursorPos(math.floor((width - #text) / 2) + 1, y)
-  term.write(text)
-end
-
-return { reset = reset, write_center = write_center }
-```
-
-Now, what's going on here? We define our two functions as one might expect, and then at the bottom return a table with
-the two functions. When we require this library, this table is what is returned. With that, we can then call the
-original functions. Now create a new file, with the following:
-
-```lua {data-mount=more_term:more_term.lua}
-local more_term = require("more_term")
-more_term.reset()
-more_term.write_center("Hello, world!")
-```
-
-When run, this'll clear the screen and print some text in the middle of the first line.
-
-## require in depth
-While the previous section is a good introduction to how @{require} operates, there are a couple of remaining points
-which are worth mentioning for more advanced usage.
-
-### Libraries can return anything
-In our above example, we return a table containing the functions we want to expose. However, it's worth pointing out
-that you can return ''anything'' from your library - a table, a function or even just a string! @{require} treats them
-all the same, and just returns whatever your library provides.
-
-### Module resolution and the package path
-In the above examples, we defined our library in a file, and @{require} read from it. While this is what you'll do most
-of the time, it is possible to make @{require} look elsewhere for your library, such as downloading from a website or
-loading from an in-memory library store.
-
-As a result, the *module name* you pass to @{require} doesn't correspond to a file path. One common mistake is to load
-code from a sub-directory using `require("folder/library")` or even `require("folder/library.lua")`, neither of which
-will do quite what you expect.
-
-When loading libraries (also referred to as *modules*) from files, @{require} searches along the *@{package.path|module
-path}*. By default, this looks something like:
-
-* `?.lua`
-* `?/init.lua`
-* `/rom/modules/main/?.lua`
-* etc...
-
-When you call `require("my_library")`, @{require} replaces the `?` in each element of the path with your module name, and
-checks if the file exists. In this case, we'd look for `my_library.lua`, `my_library/init.lua`,
-`/rom/modules/main/my_library.lua` and so on. Note that this works *relative to the current program*, so if your
-program is actually called `folder/program`, then we'll look for `folder/my_library.lua`, etc...
-
-One other caveat is loading libraries from sub-directories. For instance, say we have a file
-`my/fancy/library.lua`. This can be loaded by using `require("my.fancy.library")` - the '.'s are replaced with '/'
-before we start looking for the library.
-
-## External links
-There are several external resources which go into require in a little more detail:
-
- - The [Lua Module tutorial](http://lua-users.org/wiki/ModulesTutorial) on the Lua wiki.
- - [Lua's manual section on @{require}](https://www.lua.org/manual/5.1/manual.html#pdf-require).
--- a/doc/stub/global.lua
+++ b/doc/stub/global.lua
@@ -12,19 +12,16 @@ rounded up to the nearest multiple of 0.05 seconds. If you are using coroutines
 or the @{parallel|parallel API}, it will only pause execution of the current
 thread, not the whole program.

-:::tip
-Because sleep internally uses timers, it is a function that yields. This means
-that you can use it to prevent "Too long without yielding" errors, however, as
-the minimum sleep time is 0.05 seconds, it will slow your program down.
-:::
+**Note** Because sleep internally uses timers, it is a function that yields.
+This means that you can use it to prevent "Too long without yielding" errors,
+however, as the minimum sleep time is 0.05 seconds, it will slow your program
+down.

-:::caution
-Internally, this function queues and waits for a timer event (using
+**Warning** Internally, this function queues and waits for a timer event (using
@{os.startTimer}), however it does not listen for any other events. This means
 that any event that occurs while sleeping will be entirely discarded. If you
 need to receive events while sleeping, consider using @{os.startTimer|timers},
 or the @{parallel|parallel API}.
-:::

@tparam number time The number of seconds to sleep for, rounded up to the
 nearest multiple of 0.05.
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,10 +1,10 @@
 org.gradle.jvmargs=-Xmx3G

 # Mod properties
-mod_version=1.100.2
+mod_version=1.99.0

 # Minecraft properties (update mods.toml when changing)
-mc_version=1.17.1
+mc_version=1.18
 mapping_version=2021.09.05
-forge_version=37.0.85
+forge_version=38.0.0
 # NO SERIOUSLY, UPDATE mods.toml WHEN CHANGING
--- a/illuaminate.sexp
+++ b/illuaminate.sexp
@@ -1,9 +1,8 @@
 ; -*- mode: Lisp;-*-

 (sources
-  /doc/events/
-  /doc/guides/
  /doc/stub/
+  /doc/events/
  /build/docs/luaJavadoc/
  /src/main/resources/*/computercraft/lua/bios.lua
  /src/main/resources/*/computercraft/lua/rom/
@@ -28,8 +27,7 @@
  (module-kinds
    (peripheral Peripherals)
    (generic_peripheral "Generic Peripherals")
-    (event Events)
-    (guide Guides))
+    (event Events))

  (library-path
    /doc/stub/
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,6 @@
      },
      "devDependencies": {
        "@rollup/plugin-typescript": "^8.2.5",
-        "@rollup/plugin-url": "^6.1.0",
        "requirejs": "^2.3.6",
        "rollup": "^2.33.1",
        "rollup-plugin-terser": "^7.0.2",
@@ -74,23 +73,6 @@
        "typescript": ">=3.7.0"
      }
    },
-    "node_modules/@rollup/plugin-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-url/-/plugin-url-6.1.0.tgz",
-      "integrity": "sha512-FJNWBnBB7nLzbcaGmu1no+U/LlRR67TtgfRFP+VEKSrWlDTE6n9jMns/N4Q/VL6l4x6kTHQX4HQfwTcldaAfHQ==",
-      "dev": true,
-      "dependencies": {
-        "@rollup/pluginutils": "^3.1.0",
-        "make-dir": "^3.1.0",
-        "mime": "^2.4.6"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0"
-      }
-    },
    "node_modules/@rollup/pluginutils": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
@@ -282,39 +264,12 @@
      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
      "dev": true
    },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
    "node_modules/merge-stream": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
      "dev": true
    },
-    "node_modules/mime": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
    "node_modules/path-parse": {
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
@@ -427,15 +382,6 @@
        }
      ]
    },
-    "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
    "node_modules/serialize-javascript": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
@@ -566,17 +512,6 @@
        "resolve": "^1.17.0"
      }
    },
-    "@rollup/plugin-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-url/-/plugin-url-6.1.0.tgz",
-      "integrity": "sha512-FJNWBnBB7nLzbcaGmu1no+U/LlRR67TtgfRFP+VEKSrWlDTE6n9jMns/N4Q/VL6l4x6kTHQX4HQfwTcldaAfHQ==",
-      "dev": true,
-      "requires": {
-        "@rollup/pluginutils": "^3.1.0",
-        "make-dir": "^3.1.0",
-        "mime": "^2.4.6"
-      }
-    },
    "@rollup/pluginutils": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
@@ -730,27 +665,12 @@
      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
      "dev": true
    },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "requires": {
-        "semver": "^6.0.0"
-      }
-    },
    "merge-stream": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
      "dev": true
    },
-    "mime": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-      "dev": true
-    },
    "path-parse": {
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
@@ -820,12 +740,6 @@
      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
      "dev": true
    },
-    "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true
-    },
    "serialize-javascript": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
--- a/package.json
+++ b/package.json
@@ -10,7 +10,6 @@
  },
  "devDependencies": {
    "@rollup/plugin-typescript": "^8.2.5",
-    "@rollup/plugin-url": "^6.1.0",
    "requirejs": "^2.3.6",
    "rollup": "^2.33.1",
    "rollup-plugin-terser": "^7.0.2",
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,8 +1,7 @@
-import { readFileSync } from "fs";
+import { readFileSync    } from "fs";
 import path from "path";

 import typescript from "@rollup/plugin-typescript";
-import url from '@rollup/plugin-url';
 import { terser } from "rollup-plugin-terser";

 const input = "src/web";
@@ -11,7 +10,7 @@ const requirejs = readFileSync("node_modules/requirejs/require.js");
 export default {
    input: [`${input}/index.tsx`],
    output: {
-        dir: "build/rollup/",
+        file: "build/rollup/index.js",
        // We bundle requirejs (and config) into the header. It's rather gross
        // but also works reasonably well.
        // Also suffix a ?v=${date} onto the end in the event we need to require a specific copy-cat version.
@@ -19,7 +18,7 @@ export default {
            ${requirejs}
            require.config({
                paths: { copycat: "https://copy-cat.squiddev.cc" },
-                urlArgs: function(id) { return id == "copycat/embed" ? "?v=20211221" : ""; }
+                urlArgs: function(id) { return id == "copycat/embed" ? "?v=20211127" : ""; }
            });
        `,
        format: "amd",
@@ -34,18 +33,12 @@ export default {
    plugins: [
        typescript(),

-        url({
-            include: "**/*.dfpwm",
-            fileName: "[name]-[hash][extname]",
-            publicPath: "/",
-        }),
-
        {
            name: "cc-tweaked",
            async transform(code, file) {
                // Allow loading files in /mount.
                const ext = path.extname(file);
-                return ext != '.dfpwm' && path.dirname(file) === path.resolve(`${input}/mount`)
+                return ext != '.tsx' && ext != '.ts' && path.dirname(file) === path.resolve(`${input}/mount`)
                    ? `export default ${JSON.stringify(code)};\n`
                    : null;
            },
--- a/src/main/java/dan200/computercraft/ComputerCraft.java
+++ b/src/main/java/dan200/computercraft/ComputerCraft.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft;
--- a/src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java
+++ b/src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft;
@@ -38,7 +38,7 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fml.ModList;
-import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks;
+import net.minecraftforge.server.ServerLifecycleHooks;

 import javax.annotation.Nonnull;
 import java.io.File;
--- a/src/main/java/dan200/computercraft/api/ComputerCraftAPI.java
+++ b/src/main/java/dan200/computercraft/api/ComputerCraftAPI.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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;
--- a/src/main/java/dan200/computercraft/api/ComputerCraftTags.java
+++ b/src/main/java/dan200/computercraft/api/ComputerCraftTags.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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;
--- a/src/main/java/dan200/computercraft/api/client/TransformedModel.java
+++ b/src/main/java/dan200/computercraft/api/client/TransformedModel.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.client;
--- a/src/main/java/dan200/computercraft/api/filesystem/FileAttributes.java
+++ b/src/main/java/dan200/computercraft/api/filesystem/FileAttributes.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.filesystem;
--- a/src/main/java/dan200/computercraft/api/filesystem/FileOperationException.java
+++ b/src/main/java/dan200/computercraft/api/filesystem/FileOperationException.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.filesystem;
--- a/src/main/java/dan200/computercraft/api/filesystem/IFileSystem.java
+++ b/src/main/java/dan200/computercraft/api/filesystem/IFileSystem.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.filesystem;
--- a/src/main/java/dan200/computercraft/api/filesystem/IMount.java
+++ b/src/main/java/dan200/computercraft/api/filesystem/IMount.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.filesystem;
--- a/src/main/java/dan200/computercraft/api/filesystem/IWritableMount.java
+++ b/src/main/java/dan200/computercraft/api/filesystem/IWritableMount.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.filesystem;
--- a/src/main/java/dan200/computercraft/api/lua/GenericSource.java
+++ b/src/main/java/dan200/computercraft/api/lua/GenericSource.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.lua;
--- a/src/main/java/dan200/computercraft/api/lua/IArguments.java
+++ b/src/main/java/dan200/computercraft/api/lua/IArguments.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.lua;
@@ -183,24 +183,6 @@ public interface IArguments
        return (Map<?, ?>) value;
    }

-    /**
-     * Get an argument as a table in an unsafe manner.
-     *
-     * 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).
-     *
-     * @param index The argument number.
-     * @return The argument's value.
-     * @throws LuaException If the value is not a table.
-     */
-    @Nonnull
-    default LuaTable<?, ?> getTableUnsafe( int index ) throws LuaException
-    {
-        return new ObjectLuaTable( getTable( index ) );
-    }
-
    /**
     * Get an argument as a double.
     *
@@ -332,27 +314,6 @@ public interface IArguments
        return Optional.of( (Map<?, ?>) value );
    }

-    /**
-     * Get an argument as a table in an unsafe manner.
-     *
-     * 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).
-     *
-     * @param index The argument number.
-     * @return The argument's value, or {@link Optional#empty()} if not present.
-     * @throws LuaException If the value is not a table.
-     */
-    @Nonnull
-    default Optional<LuaTable<?, ?>> optTableUnsafe( int index ) throws LuaException
-    {
-        Object value = get( index );
-        if( value == null ) return Optional.empty();
-        if( !(value instanceof Map) ) throw LuaValues.badArgumentOf( index, "map", value );
-        return Optional.of( new ObjectLuaTable( (Map<?, ?>) value ) );
-    }
-
    /**
     * Get an argument as a double.
     *
@@ -443,13 +404,4 @@ public interface IArguments
    {
        return optTable( index ).orElse( def );
    }
-
-    /**
-     * 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.
-     */
-    default void releaseImmediate()
-    {
-    }
 }
--- a/src/main/java/dan200/computercraft/api/lua/IComputerSystem.java
+++ b/src/main/java/dan200/computercraft/api/lua/IComputerSystem.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.lua;
--- a/src/main/java/dan200/computercraft/api/lua/IDynamicLuaObject.java
+++ b/src/main/java/dan200/computercraft/api/lua/IDynamicLuaObject.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.lua;
--- a/src/main/java/dan200/computercraft/api/lua/ILuaAPI.java
+++ b/src/main/java/dan200/computercraft/api/lua/ILuaAPI.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.lua;
--- a/src/main/java/dan200/computercraft/api/lua/ILuaAPIFactory.java
+++ b/src/main/java/dan200/computercraft/api/lua/ILuaAPIFactory.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.lua;
--- a/src/main/java/dan200/computercraft/api/lua/ILuaCallback.java
+++ b/src/main/java/dan200/computercraft/api/lua/ILuaCallback.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.lua;
--- a/src/main/java/dan200/computercraft/api/lua/ILuaContext.java
+++ b/src/main/java/dan200/computercraft/api/lua/ILuaContext.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.lua;
--- a/src/main/java/dan200/computercraft/api/lua/ILuaFunction.java
+++ b/src/main/java/dan200/computercraft/api/lua/ILuaFunction.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.lua;
--- a/src/main/java/dan200/computercraft/api/lua/ILuaTask.java
+++ b/src/main/java/dan200/computercraft/api/lua/ILuaTask.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.lua;
--- a/src/main/java/dan200/computercraft/api/lua/LuaException.java
+++ b/src/main/java/dan200/computercraft/api/lua/LuaException.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.lua;
--- a/src/main/java/dan200/computercraft/api/lua/LuaFunction.java
+++ b/src/main/java/dan200/computercraft/api/lua/LuaFunction.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.lua;
@@ -51,17 +51,8 @@ public @interface LuaFunction
     * Run this function on the main server thread. This should be specified for any method which interacts with
     * Minecraft in a thread-unsafe manner.
     *
-     * @return Whether this function should be run on the main thread.
+     * @return Whether this functi
     * @see ILuaContext#issueMainThreadTask(ILuaTask)
     */
    boolean mainThread() default false;
-
-    /**
-     * Allow using "unsafe" arguments, such {@link IArguments#getTableUnsafe(int)}.
-     *
-     * This is incompatible with {@link #mainThread()}.
-     *
-     * @return Whether this function supports unsafe arguments.
-     */
-    boolean unsafe() default false;
 }
--- a/src/main/java/dan200/computercraft/api/lua/LuaTable.java
+++ b/src/main/java/dan200/computercraft/api/lua/LuaTable.java
@@ -1,113 +0,0 @@
-/*
- * 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.lua;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.Map;
-
-import static dan200.computercraft.api.lua.LuaValues.*;
-
-public interface LuaTable<K, V> extends Map<K, V>
-{
-    /**
-     * Compute the length of the array part of this table.
-     *
-     * @return This table's length.
-     */
-    default int length()
-    {
-        int size = 0;
-        while( containsKey( (double) (size + 1) ) ) size++;
-        return size;
-    }
-
-    /**
-     * Get an array entry as an integer.
-     *
-     * @param index The index in the table, starting at 1.
-     * @return The table's value.
-     * @throws LuaException If the value is not an integer.
-     */
-    default long getLong( int index ) throws LuaException
-    {
-        Object value = get( (double) index );
-        if( !(value instanceof Number) ) throw badTableItem( index, "number", getType( value ) );
-
-        Number number = (Number) value;
-        double asDouble = number.doubleValue();
-        if( !Double.isFinite( asDouble ) ) throw badTableItem( index, "number", getNumericType( asDouble ) );
-        return number.longValue();
-    }
-
-    /**
-     * Get a table entry as an integer.
-     *
-     * @param key The name of the field in the table.
-     * @return The table's value.
-     * @throws LuaException If the value is not an integer.
-     */
-    default long getLong( String key ) throws LuaException
-    {
-        Object value = get( key );
-        if( !(value instanceof Number) ) throw badField( key, "number", getType( value ) );
-
-        Number number = (Number) value;
-        double asDouble = number.doubleValue();
-        if( !Double.isFinite( asDouble ) ) throw badField( key, "number", getNumericType( asDouble ) );
-        return number.longValue();
-    }
-
-    /**
-     * Get an array entry as an integer.
-     *
-     * @param index The index in the table, starting at 1.
-     * @return The table's value.
-     * @throws LuaException If the value is not an integer.
-     */
-    default int getInt( int index ) throws LuaException
-    {
-        return (int) getLong( index );
-    }
-
-    /**
-     * Get a table entry as an integer.
-     *
-     * @param key The name of the field in the table.
-     * @return The table's value.
-     * @throws LuaException If the value is not an integer.
-     */
-    default int getInt( String key ) throws LuaException
-    {
-        return (int) getLong( key );
-    }
-
-
-    @Nullable
-    @Override
-    default V put( K o, V o2 )
-    {
-        throw new UnsupportedOperationException( "Cannot modify LuaTable" );
-    }
-
-    @Override
-    default V remove( Object o )
-    {
-        throw new UnsupportedOperationException( "Cannot modify LuaTable" );
-    }
-
-    @Override
-    default void putAll( @Nonnull Map<? extends K, ? extends V> map )
-    {
-        throw new UnsupportedOperationException( "Cannot modify LuaTable" );
-    }
-
-    @Override
-    default void clear()
-    {
-        throw new UnsupportedOperationException( "Cannot modify LuaTable" );
-    }
-}
--- a/src/main/java/dan200/computercraft/api/lua/LuaValues.java
+++ b/src/main/java/dan200/computercraft/api/lua/LuaValues.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.lua;
@@ -102,34 +102,6 @@ public final class LuaValues
        return new LuaException( "bad argument #" + (index + 1) + " (" + expected + " expected, got " + actual + ")" );
    }

-    /**
-     * Construct a table item exception, from an expected and actual type.
-     *
-     * @param index    The index into the table, starting from 1.
-     * @param expected The expected type for this table item.
-     * @param actual   The provided type for this table item.
-     * @return The constructed exception, which should be thrown immediately.
-     */
-    @Nonnull
-    public static LuaException badTableItem( int index, @Nonnull String expected, @Nonnull String actual )
-    {
-        return new LuaException( "table item #" + index + " is not " + expected + " (got " + actual + ")" );
-    }
-
-    /**
-     * Construct a field exception, from an expected and actual type.
-     *
-     * @param key      The name of the field.
-     * @param expected The expected type for this table item.
-     * @param actual   The provided type for this table item.
-     * @return The constructed exception, which should be thrown immediately.
-     */
-    @Nonnull
-    public static LuaException badField( String key, @Nonnull String expected, @Nonnull String actual )
-    {
-        return new LuaException( "field " + key + " is not " + expected + " (got " + actual + ")" );
-    }
-
    /**
     * Ensure a numeric argument is finite (i.e. not infinite or {@link Double#NaN}.
     *
--- a/src/main/java/dan200/computercraft/api/lua/MethodResult.java
+++ b/src/main/java/dan200/computercraft/api/lua/MethodResult.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.lua;
@@ -98,10 +98,7 @@ public final class MethodResult
    {
        Objects.requireNonNull( callback, "callback cannot be null" );
        return new MethodResult( new Object[] { filter }, results -> {
-            if( results.length >= 1 && Objects.equals( results[0], "terminate" ) )
-            {
-                throw new LuaException( "Terminated", 0 );
-            }
+            if( results.length >= 1 && results[0].equals( "terminate" ) ) throw new LuaException( "Terminated", 0 );
            return callback.resume( results );
        } );
    }
--- a/src/main/java/dan200/computercraft/api/lua/ObjectArguments.java
+++ b/src/main/java/dan200/computercraft/api/lua/ObjectArguments.java
@@ -1,16 +1,14 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.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}.
@@ -18,8 +16,6 @@ import java.util.Optional;
 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 +63,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;
-    }
 }
--- a/src/main/java/dan200/computercraft/api/lua/ObjectLuaTable.java
+++ b/src/main/java/dan200/computercraft/api/lua/ObjectLuaTable.java
@@ -1,73 +0,0 @@
-/*
- * 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.lua;
-
-import javax.annotation.Nonnull;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
-public class ObjectLuaTable implements LuaTable<Object, Object>
-{
-    private final Map<Object, Object> map;
-
-    public ObjectLuaTable( Map<?, ?> map )
-    {
-        this.map = Collections.unmodifiableMap( map );
-    }
-
-    @Override
-    public int size()
-    {
-        return map.size();
-    }
-
-    @Override
-    public boolean isEmpty()
-    {
-        return map.isEmpty();
-    }
-
-    @Override
-    public boolean containsKey( Object o )
-    {
-        return map.containsKey( o );
-    }
-
-    @Override
-    public boolean containsValue( Object o )
-    {
-        return map.containsKey( o );
-    }
-
-    @Override
-    public Object get( Object o )
-    {
-        return map.get( o );
-    }
-
-    @Nonnull
-    @Override
-    public Set<Object> keySet()
-    {
-        return map.keySet();
-    }
-
-    @Nonnull
-    @Override
-    public Collection<Object> values()
-    {
-        return map.values();
-    }
-
-    @Nonnull
-    @Override
-    public Set<Entry<Object, Object>> entrySet()
-    {
-        return map.entrySet();
-    }
-}
--- a/src/main/java/dan200/computercraft/api/lua/TaskCallback.java
+++ b/src/main/java/dan200/computercraft/api/lua/TaskCallback.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.lua;
--- a/src/main/java/dan200/computercraft/api/media/IMedia.java
+++ b/src/main/java/dan200/computercraft/api/media/IMedia.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.media;
--- a/src/main/java/dan200/computercraft/api/media/IMediaProvider.java
+++ b/src/main/java/dan200/computercraft/api/media/IMediaProvider.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.media;
--- a/src/main/java/dan200/computercraft/api/network/IPacketNetwork.java
+++ b/src/main/java/dan200/computercraft/api/network/IPacketNetwork.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.network;
--- a/src/main/java/dan200/computercraft/api/network/IPacketReceiver.java
+++ b/src/main/java/dan200/computercraft/api/network/IPacketReceiver.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.network;
--- a/src/main/java/dan200/computercraft/api/network/IPacketSender.java
+++ b/src/main/java/dan200/computercraft/api/network/IPacketSender.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.network;
--- a/src/main/java/dan200/computercraft/api/network/Packet.java
+++ b/src/main/java/dan200/computercraft/api/network/Packet.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.network;
--- a/src/main/java/dan200/computercraft/api/network/wired/IWiredElement.java
+++ b/src/main/java/dan200/computercraft/api/network/wired/IWiredElement.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.network.wired;
--- a/src/main/java/dan200/computercraft/api/network/wired/IWiredNetwork.java
+++ b/src/main/java/dan200/computercraft/api/network/wired/IWiredNetwork.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.network.wired;
--- a/src/main/java/dan200/computercraft/api/network/wired/IWiredNetworkChange.java
+++ b/src/main/java/dan200/computercraft/api/network/wired/IWiredNetworkChange.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.network.wired;
--- a/src/main/java/dan200/computercraft/api/network/wired/IWiredNode.java
+++ b/src/main/java/dan200/computercraft/api/network/wired/IWiredNode.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.network.wired;
--- a/src/main/java/dan200/computercraft/api/network/wired/IWiredSender.java
+++ b/src/main/java/dan200/computercraft/api/network/wired/IWiredSender.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.network.wired;
--- a/src/main/java/dan200/computercraft/api/peripheral/GenericPeripheral.java
+++ b/src/main/java/dan200/computercraft/api/peripheral/GenericPeripheral.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.peripheral;
@@ -23,7 +23,7 @@ public interface GenericPeripheral extends GenericSource
     * Get the type of the exposed peripheral.
     *
     * Unlike normal {@link IPeripheral}s, {@link GenericPeripheral} do not have to have a type. By default, the
-     * resulting peripheral uses the resource name of the wrapped {@link BlockEntity} (for instance {@code minecraft:chest}).
+     * resulting peripheral uses the resource name of the wrapped {@link BlockEntity} (for instance {@literal minecraft:chest}).
     *
     * However, in some cases it may be more appropriate to specify a more readable name. Overriding this method allows
     * you to do so.
--- a/src/main/java/dan200/computercraft/api/peripheral/IComputerAccess.java
+++ b/src/main/java/dan200/computercraft/api/peripheral/IComputerAccess.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.peripheral;
--- a/src/main/java/dan200/computercraft/api/peripheral/IDynamicPeripheral.java
+++ b/src/main/java/dan200/computercraft/api/peripheral/IDynamicPeripheral.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.peripheral;
--- a/src/main/java/dan200/computercraft/api/peripheral/IPeripheral.java
+++ b/src/main/java/dan200/computercraft/api/peripheral/IPeripheral.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.peripheral;
--- a/src/main/java/dan200/computercraft/api/peripheral/IPeripheralProvider.java
+++ b/src/main/java/dan200/computercraft/api/peripheral/IPeripheralProvider.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.peripheral;
--- a/src/main/java/dan200/computercraft/api/peripheral/IWorkMonitor.java
+++ b/src/main/java/dan200/computercraft/api/peripheral/IWorkMonitor.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.peripheral;
--- a/src/main/java/dan200/computercraft/api/peripheral/NotAttachedException.java
+++ b/src/main/java/dan200/computercraft/api/peripheral/NotAttachedException.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.peripheral;
--- a/src/main/java/dan200/computercraft/api/peripheral/PeripheralType.java
+++ b/src/main/java/dan200/computercraft/api/peripheral/PeripheralType.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.peripheral;
@@ -63,7 +63,7 @@ public final class PeripheralType
     * Create a new non-empty peripheral type with additional traits.
     *
     * @param type            The name of the type.
-     * @param additionalTypes Additional types, or "traits" of this peripheral. For instance, {@code "inventory"}.
+     * @param additionalTypes Additional types, or "traits" of this peripheral. For instance, {@literal "inventory"}.
     * @return The constructed peripheral type.
     */
    public static PeripheralType ofType( @Nonnull String type, Collection<String> additionalTypes )
@@ -76,7 +76,7 @@ public final class PeripheralType
     * Create a new non-empty peripheral type with additional traits.
     *
     * @param type            The name of the type.
-     * @param additionalTypes Additional types, or "traits" of this peripheral. For instance, {@code "inventory"}.
+     * @param additionalTypes Additional types, or "traits" of this peripheral. For instance, {@literal "inventory"}.
     * @return The constructed peripheral type.
     */
    public static PeripheralType ofType( @Nonnull String type, @Nonnull String... additionalTypes )
@@ -88,7 +88,7 @@ public final class PeripheralType
    /**
     * Create a new peripheral type with no primary type but additional traits.
     *
-     * @param additionalTypes Additional types, or "traits" of this peripheral. For instance, {@code "inventory"}.
+     * @param additionalTypes Additional types, or "traits" of this peripheral. For instance, {@literal "inventory"}.
     * @return The constructed peripheral type.
     */
    public static PeripheralType ofAdditional( Collection<String> additionalTypes )
@@ -99,7 +99,7 @@ public final class PeripheralType
    /**
     * Create a new peripheral type with no primary type but additional traits.
     *
-     * @param additionalTypes Additional types, or "traits" of this peripheral. For instance, {@code "inventory"}.
+     * @param additionalTypes Additional types, or "traits" of this peripheral. For instance, {@literal "inventory"}.
     * @return The constructed peripheral type.
     */
    public static PeripheralType ofAdditional( @Nonnull String... additionalTypes )
@@ -108,7 +108,7 @@ public final class PeripheralType
    }

    /**
-     * Get the name of this peripheral type. This may be {@code null}.
+     * Get the name of this peripheral type. This may be {@literal null}.
     *
     * @return The type of this peripheral.
     */
--- a/src/main/java/dan200/computercraft/api/pocket/AbstractPocketUpgrade.java
+++ b/src/main/java/dan200/computercraft/api/pocket/AbstractPocketUpgrade.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.pocket;
--- a/src/main/java/dan200/computercraft/api/pocket/IPocketAccess.java
+++ b/src/main/java/dan200/computercraft/api/pocket/IPocketAccess.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.pocket;
--- a/src/main/java/dan200/computercraft/api/pocket/IPocketUpgrade.java
+++ b/src/main/java/dan200/computercraft/api/pocket/IPocketUpgrade.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.pocket;
--- a/src/main/java/dan200/computercraft/api/pocket/PocketUpgradeDataProvider.java
+++ b/src/main/java/dan200/computercraft/api/pocket/PocketUpgradeDataProvider.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.pocket;
--- a/src/main/java/dan200/computercraft/api/pocket/PocketUpgradeSerialiser.java
+++ b/src/main/java/dan200/computercraft/api/pocket/PocketUpgradeSerialiser.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.pocket;
--- a/src/main/java/dan200/computercraft/api/redstone/IBundledRedstoneProvider.java
+++ b/src/main/java/dan200/computercraft/api/redstone/IBundledRedstoneProvider.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.redstone;
--- a/src/main/java/dan200/computercraft/api/turtle/AbstractTurtleUpgrade.java
+++ b/src/main/java/dan200/computercraft/api/turtle/AbstractTurtleUpgrade.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.turtle;
--- a/src/main/java/dan200/computercraft/api/turtle/ITurtleAccess.java
+++ b/src/main/java/dan200/computercraft/api/turtle/ITurtleAccess.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.turtle;
--- a/src/main/java/dan200/computercraft/api/turtle/ITurtleCommand.java
+++ b/src/main/java/dan200/computercraft/api/turtle/ITurtleCommand.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.turtle;
--- a/src/main/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java
+++ b/src/main/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.turtle;
--- a/src/main/java/dan200/computercraft/api/turtle/TurtleAnimation.java
+++ b/src/main/java/dan200/computercraft/api/turtle/TurtleAnimation.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.turtle;
--- a/src/main/java/dan200/computercraft/api/turtle/TurtleCommandResult.java
+++ b/src/main/java/dan200/computercraft/api/turtle/TurtleCommandResult.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.turtle;
--- a/src/main/java/dan200/computercraft/api/turtle/TurtleSide.java
+++ b/src/main/java/dan200/computercraft/api/turtle/TurtleSide.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.turtle;
--- a/src/main/java/dan200/computercraft/api/turtle/TurtleUpgradeDataProvider.java
+++ b/src/main/java/dan200/computercraft/api/turtle/TurtleUpgradeDataProvider.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.turtle;
--- a/src/main/java/dan200/computercraft/api/turtle/TurtleUpgradeSerialiser.java
+++ b/src/main/java/dan200/computercraft/api/turtle/TurtleUpgradeSerialiser.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.turtle;
--- a/src/main/java/dan200/computercraft/api/turtle/TurtleUpgradeType.java
+++ b/src/main/java/dan200/computercraft/api/turtle/TurtleUpgradeType.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.turtle;
--- a/src/main/java/dan200/computercraft/api/turtle/TurtleVerb.java
+++ b/src/main/java/dan200/computercraft/api/turtle/TurtleVerb.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.turtle;
--- a/src/main/java/dan200/computercraft/api/turtle/event/TurtleEvent.java
+++ b/src/main/java/dan200/computercraft/api/turtle/event/TurtleEvent.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.turtle.event;
--- a/src/main/java/dan200/computercraft/api/turtle/event/TurtleRefuelEvent.java
+++ b/src/main/java/dan200/computercraft/api/turtle/event/TurtleRefuelEvent.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.turtle.event;
--- a/src/main/java/dan200/computercraft/api/upgrades/IUpgradeBase.java
+++ b/src/main/java/dan200/computercraft/api/upgrades/IUpgradeBase.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.upgrades;
--- a/src/main/java/dan200/computercraft/api/upgrades/UpgradeDataProvider.java
+++ b/src/main/java/dan200/computercraft/api/upgrades/UpgradeDataProvider.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.upgrades;
--- a/src/main/java/dan200/computercraft/api/upgrades/UpgradeSerialiser.java
+++ b/src/main/java/dan200/computercraft/api/upgrades/UpgradeSerialiser.java
@@ -1,6 +1,6 @@
 /*
 * 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.
+ * Copyright Daniel Ratcliffe, 2011-2021. 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.upgrades;
--- a/src/main/java/dan200/computercraft/client/ClientHooks.java
+++ b/src/main/java/dan200/computercraft/client/ClientHooks.java
@@ -1,12 +1,11 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.client;

 import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.client.sound.SpeakerManager;
 import dan200.computercraft.shared.peripheral.monitor.ClientMonitor;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.ClientPlayerNetworkEvent;
@@ -23,7 +22,7 @@ public class ClientHooks
        if( event.getWorld().isClientSide() )
        {
            ClientMonitor.destroyAll();
-            SpeakerManager.reset();
+            SoundManager.reset();
        }
    }

--- a/src/main/java/dan200/computercraft/client/ClientRegistry.java
+++ b/src/main/java/dan200/computercraft/client/ClientRegistry.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.client;
@@ -32,7 +32,7 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.ColorHandlerEvent;
 import net.minecraftforge.client.event.EntityRenderersEvent;
 import net.minecraftforge.client.event.ModelRegistryEvent;
-import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.client.model.ForgeModelBakery;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
@@ -76,7 +76,7 @@ public final class ClientRegistry
        ModelLoaderRegistry.registerLoader( new ResourceLocation( ComputerCraft.MOD_ID, "turtle" ), TurtleModelLoader.INSTANCE );
        for( String model : EXTRA_MODELS )
        {
-            ModelLoader.addSpecialModel( new ModelResourceLocation( new ResourceLocation( ComputerCraft.MOD_ID, model ), "inventory" ) );
+            ForgeModelBakery.addSpecialModel( new ModelResourceLocation( new ResourceLocation( ComputerCraft.MOD_ID, model ), "inventory" ) );
        }
    }

--- a/src/main/java/dan200/computercraft/client/ClientTableFormatter.java
+++ b/src/main/java/dan200/computercraft/client/ClientTableFormatter.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.client;
--- a/src/main/java/dan200/computercraft/client/FrameInfo.java
+++ b/src/main/java/dan200/computercraft/client/FrameInfo.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.client;
--- a/src/main/java/dan200/computercraft/client/SoundManager.java
+++ b/src/main/java/dan200/computercraft/client/SoundManager.java
@@ -0,0 +1,84 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+package dan200.computercraft.client;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.sounds.AbstractSoundInstance;
+import net.minecraft.client.resources.sounds.SoundInstance;
+import net.minecraft.client.resources.sounds.TickableSoundInstance;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.world.phys.Vec3;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+public class SoundManager
+{
+    private static final Map<UUID, MoveableSound> sounds = new HashMap<>();
+
+    public static void playSound( UUID source, Vec3 position, ResourceLocation event, float volume, float pitch )
+    {
+        var soundManager = Minecraft.getInstance().getSoundManager();
+
+        MoveableSound oldSound = sounds.get( source );
+        if( oldSound != null ) soundManager.stop( oldSound );
+
+        MoveableSound newSound = new MoveableSound( event, position, volume, pitch );
+        sounds.put( source, newSound );
+        soundManager.play( newSound );
+    }
+
+    public static void stopSound( UUID source )
+    {
+        SoundInstance sound = sounds.remove( source );
+        if( sound == null ) return;
+
+        Minecraft.getInstance().getSoundManager().stop( sound );
+    }
+
+    public static void moveSound( UUID source, Vec3 position )
+    {
+        MoveableSound sound = sounds.get( source );
+        if( sound != null ) sound.setPosition( position );
+    }
+
+    public static void reset()
+    {
+        sounds.clear();
+    }
+
+    private static class MoveableSound extends AbstractSoundInstance implements TickableSoundInstance
+    {
+        protected MoveableSound( ResourceLocation sound, Vec3 position, float volume, float pitch )
+        {
+            super( sound, SoundSource.RECORDS );
+            setPosition( position );
+            this.volume = volume;
+            this.pitch = pitch;
+            attenuation = Attenuation.LINEAR;
+        }
+
+        void setPosition( Vec3 position )
+        {
+            x = (float) position.x();
+            y = (float) position.y();
+            z = (float) position.z();
+        }
+
+        @Override
+        public boolean isStopped()
+        {
+            return false;
+        }
+
+        @Override
+        public void tick()
+        {
+        }
+    }
+}
--- a/src/main/java/dan200/computercraft/client/gui/ComputerScreenBase.java
+++ b/src/main/java/dan200/computercraft/client/gui/ComputerScreenBase.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.client.gui;
@@ -8,7 +8,6 @@ package dan200.computercraft.client.gui;
 import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.widgets.ComputerSidebar;
-import dan200.computercraft.client.gui.widgets.DynamicImageButton;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
 import dan200.computercraft.shared.computer.core.ClientComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
@@ -103,16 +102,6 @@ public abstract class ComputerScreenBase<T extends ContainerComputerBase> extend
        renderTooltip( stack, mouseX, mouseY );
    }

-    @Override
-    public boolean mouseClicked( double x, double y, int button )
-    {
-        boolean changed = super.mouseClicked( x, y, button );
-        // Clicking the terminate/shutdown button steals focus, which means then pressing "enter" will click the button
-        // again. Restore the focus to the terminal in these cases.
-        if( getFocused() instanceof DynamicImageButton ) setFocused( terminal );
-        return changed;
-    }
-
    @Override
    public final boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
    {
@@ -173,6 +162,7 @@ public abstract class ComputerScreenBase<T extends ContainerComputerBase> extend
                    return;
                }

+                buffer.rewind();
                toUpload.add( new FileUpload( name, buffer, digest ) );
            }
            catch( IOException e )
--- a/src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java
+++ b/src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.client.gui;
--- a/src/main/java/dan200/computercraft/client/gui/GuiComputer.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiComputer.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.client.gui;
--- a/src/main/java/dan200/computercraft/client/gui/GuiDiskDrive.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiDiskDrive.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.client.gui;
--- a/src/main/java/dan200/computercraft/client/gui/GuiPrinter.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiPrinter.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.client.gui;
--- a/src/main/java/dan200/computercraft/client/gui/GuiPrintout.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiPrintout.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.client.gui;
--- a/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.client.gui;
--- a/src/main/java/dan200/computercraft/client/gui/NoTermComputerScreen.java
+++ b/src/main/java/dan200/computercraft/client/gui/NoTermComputerScreen.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.client.gui;
@@ -10,7 +10,6 @@ import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
 import dan200.computercraft.shared.computer.core.ClientComputer;
 import dan200.computercraft.shared.computer.inventory.ContainerComputerBase;
-import net.minecraft.client.KeyMapping;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.MenuAccess;
@@ -45,11 +44,8 @@ public class NoTermComputerScreen<T extends ContainerComputerBase> extends Scree
    protected void init()
    {
        passEvents = true; // Pass mouse vents through to the game's mouse handler.
-        // First ensure we're still grabbing the mouse, so the user can look around. Then reset bits of state that
-        // grabbing unsets.
        minecraft.mouseHandler.grabMouse();
        minecraft.screen = this;
-        KeyMapping.releaseAll();

        super.init();
        minecraft.keyboardHandler.setSendRepeatsToGui( true );
--- a/src/main/java/dan200/computercraft/client/gui/OptionScreen.java
+++ b/src/main/java/dan200/computercraft/client/gui/OptionScreen.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.client.gui;
--- a/src/main/java/dan200/computercraft/client/gui/widgets/ComputerSidebar.java
+++ b/src/main/java/dan200/computercraft/client/gui/widgets/ComputerSidebar.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.client.gui.widgets;
--- a/src/main/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java
+++ b/src/main/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
 package dan200.computercraft.client.gui.widgets;
@@ -71,12 +71,12 @@ public class DynamicImageButton extends Button
        RenderSystem.disableDepthTest();

        int yTex = yTexStart;
-        if( isHovered() ) yTex += yDiffTex;
+        if( isHoveredOrFocused() ) yTex += yDiffTex;

        blit( stack, x, y, xTexStart.getAsInt(), yTex, width, height, textureWidth, textureHeight );
        RenderSystem.enableDepthTest();

-        if( isHovered() ) renderToolTip( stack, mouseX, mouseY );
+        if( isHovered ) renderToolTip( stack, mouseX, mouseY );
    }

    @Nonnull
--- a/Show More
+++ b/Show More