Fix some typos in a dfpwm example

Add speaker support to the documentation website
Happy to pick a different piece of audio, but this seemed like a fun one to me.
2025-10-23 18:07:39 +00:00 · 2021-12-21 22:25:16 +00:00 · 2021-12-21 22:20:57 +00:00 · 2021-12-21 14:55:01 +00:00 · 2021-12-21 14:39:08 +00:00 · 2021-12-21 12:00:13 +00:00
532 changed files with 23519 additions and 9460 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,3 +13,4 @@ src/testMod/server-files/structures linguist-generated

 *.png binary
 *.jar binary
+*.dfpwm binary
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,8 @@ buildscript {
        maven { url = 'https://maven.parchmentmc.org' }
    }
    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:5.1.24'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:5.1.+'
+        classpath "org.spongepowered:mixingradle:0.7.+"
        classpath 'org.parchmentmc:librarian:1.+'
    }
 }
@@ -22,6 +23,7 @@ plugins {
 }

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

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

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

 sourceSets {
-    main.java {
-        exclude 'dan200/computercraft/shared/integration/morered/**'
-    }
    main.resources {
        srcDir 'src/generated/resources'
    }
@@ -59,10 +58,6 @@ sourceSets {
 minecraft {
    runs {
        all {
-            lazyToken('minecraft_classpath') {
-                configurations.shade.copyRecursive().resolve().collect { it.absolutePath }.join(File.pathSeparator)
-            }
-
            property 'forge.logging.markers', 'REGISTRIES'
            property 'forge.logging.console.level', 'debug'

@@ -71,6 +66,8 @@ minecraft {
                    source sourceSets.main
                }
            }
+
+            arg "-mixin.config=computercraft.mixins.json"
        }

        client {
@@ -96,12 +93,6 @@ minecraft {
                    source sourceSets.testMod
                }
            }
-
-            lazyToken('minecraft_classpath') {
-                (configurations.shade.copyRecursive().resolve() + configurations.testModExtra.copyRecursive().resolve())
-                    .collect { it.absolutePath }
-                    .join(File.pathSeparator)
-            }
        }

        testServer {
@@ -113,12 +104,6 @@ minecraft {
                    source sourceSets.testMod
                }
            }
-
-            lazyToken('minecraft_classpath') {
-                (configurations.shade.copyRecursive().resolve() + configurations.testModExtra.copyRecursive().resolve())
-                    .collect { it.absolutePath }
-                    .join(File.pathSeparator)
-            }
        }
    }

@@ -127,6 +112,11 @@ minecraft {
    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 {
@@ -138,23 +128,23 @@ repositories {
 configurations {
    shade
    implementation.extendsFrom shade
-
    cctJavadoc

-    testModExtra
-    testModImplementation.extendsFrom(testModExtra)
    testModImplementation.extendsFrom(implementation)
+    testModImplementation.extendsFrom(testImplementation)
 }

 dependencies {
-    checkstyle "com.puppycrawl.tools:checkstyle:8.45"
+    checkstyle "com.puppycrawl.tools:checkstyle:8.25"

    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")
-    // compileOnly fg.deobf("commoble.morered:morered-1.16.5:2.1.1.0")
+    compileOnly fg.deobf("mezz.jei:jei-1.16.5:7.7.0.104:api")
+    compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.16.5:7.1.0.313")
+    compileOnly fg.deobf("commoble.morered:morered-1.16.5:2.1.1.0")

-    runtimeOnly fg.deobf("mezz.jei:jei-1.17.1:8.0.0.14")
+    runtimeOnly fg.deobf("mezz.jei:jei-1.16.5:7.7.0.104")

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

@@ -163,12 +153,12 @@ dependencies {
    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
    testImplementation 'org.hamcrest:hamcrest:2.2'
    testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0'
+    testImplementation 'org.jetbrains.kotlin:kotlin-reflect:1.6.0'
    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'

    testModImplementation sourceSets.main.output
-    testModExtra 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21'

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

 // Compile tasks
@@ -194,7 +184,7 @@ task luaJavadoc(type: Javadoc) {
    options.noTimestamp = false

    javadocTool = javaToolchains.javadocToolFor {
-        languageVersion = javaVersion
+        languageVersion = JavaLanguageVersion.of(11)
    }
 }

@@ -207,15 +197,14 @@ jar {
            "Implementation-Title"    : "CC: Tweaked",
            "Implementation-Version"  : "${mod_version}",
            "Implementation-Vendor"   : "SquidDev",
-            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+            "MixinConfigs"            : "computercraft.mixins.json",
        ])
    }

    from configurations.shade.collect { it.isDirectory() ? it : zipTree(it) }
 }

-jar.finalizedBy('reobfJar')
-
 [compileJava, compileTestJava, compileTestModJava].forEach {
    it.configure {
        options.compilerArgs << "-Xlint" << "-Xlint:-processing"
@@ -223,6 +212,9 @@ jar.finalizedBy('reobfJar')
 }

 processResources {
+    inputs.property "version", mod_version
+    inputs.property "mcversion", mc_version
+
    def hash = 'none'
    Set<String> contributors = []
    try {
@@ -239,14 +231,16 @@ processResources {
    duplicatesStrategy = DuplicatesStrategy.INCLUDE

    from(sourceSets.main.resources.srcDirs) {
+        include 'META-INF/mods.toml'
        include 'data/computercraft/lua/rom/help/credits.txt'

-        expand(
-            'gitcontributors': contributors.sort(false, String.CASE_INSENSITIVE_ORDER).join('\n')
-        )
+        expand 'version': mod_version,
+                'mcversion': mc_version,
+                'gitcontributors': contributors.sort(false, String.CASE_INSENSITIVE_ORDER).join('\n')
    }

    from(sourceSets.main.resources.srcDirs) {
+        exclude 'META-INF/mods.toml'
        exclude 'data/computercraft/lua/rom/help/credits.txt'
    }
 }
@@ -260,7 +254,6 @@ sourcesJar {

 import com.hierynomus.gradle.license.tasks.LicenseCheck
 import com.hierynomus.gradle.license.tasks.LicenseFormat
-import com.modrinth.minotaur.TaskModrinthUpload
 import org.apache.tools.ant.taskdefs.condition.Os

 List<String> mkCommand(String command) {
@@ -280,18 +273,7 @@ task rollup(type: Exec) {
    commandLine mkCommand('"node_modules/.bin/rollup" --config rollup.config.js')
 }

-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]) {
+task illuaminateDocs(type: Exec, dependsOn: [rollup, luaJavadoc]) {
    group = "build"
    description = "Bundles JS into rollup"

@@ -299,7 +281,7 @@ task illuaminateDocs(type: Exec, dependsOn: [minifyWeb, 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.min.js").withPropertyName("scripts")
+    inputs.file("$buildDir/rollup/index.js").withPropertyName("scripts")
    inputs.file("src/web/styles.css").withPropertyName("styles")
    outputs.dir("$buildDir/docs/lua")

@@ -307,9 +289,13 @@ task illuaminateDocs(type: Exec, dependsOn: [minifyWeb, luaJavadoc]) {
 }

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

@@ -477,19 +463,18 @@ task checkRelease {
 }
 check.dependsOn checkRelease

-def isStable = false
-
 curseforge {
    apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
    project {
        id = '282001'
-        releaseType = isStable ? 'release' : 'alpha'
+        releaseType = 'release'
        changelog = "Release notes can be found on the GitHub repository (https://github.com/cc-tweaked/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})."

        addGameVersion "${mc_version}"
    }
 }

+import com.modrinth.minotaur.TaskModrinthUpload
 tasks.register('publishModrinth', TaskModrinthUpload.class).configure {
    dependsOn('assemble', 'reobfJar')
    onlyIf {
@@ -500,7 +485,6 @@ tasks.register('publishModrinth', TaskModrinthUpload.class).configure {
    projectId = 'gu7yAYhd'
    versionNumber = "${project.mc_version}-${project.mod_version}"
    uploadFile = jar
-    versionType = isStable ? 'RELEASE' : 'ALPHA'
    addGameVersion(project.mc_version)
    changelog = "Release notes can be found on the [GitHub repository](https://github.com/cc-tweaked/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})."
    addLoader('forge')
@@ -561,17 +545,12 @@ githubRelease {
    owner 'cc-tweaked'
    repo 'CC-Tweaked'
    targetCommitish.set(project.provider({
-        def cmd = ["git", "rev-parse", "--abbrev-ref", "HEAD"]
-        println(cmd)
-        def proc = cmd.execute([], projectDir)
-        if (proc.waitFor() != 0) {
-            println(proc.err.text.trim())
-            throw new IllegalStateException("Executed with a non-0 exit code (${proc.exitValue()}).")
+        try {
+            return ["git", "-C", projectDir, "rev-parse", "--abbrev-ref", "HEAD"].execute().text.trim()
+        } catch (Exception e) {
+            e.printStackTrace()
        }
-
-        def branch = proc.text.trim()
-        if (branch == "") throw new IllegalStateException("Cannot determine branch")
-        return branch
+        return "master"
    }))

    tagName "v${mc_version}-${mod_version}"
@@ -582,7 +561,7 @@ githubRelease {
            .takeWhile { it != 'Type "help changelog" to see the full version history.' }
            .join("\n").trim()
    }))
-    prerelease isStable
+    prerelease false
 }

 def uploadTasks = ["publish", "curseforge", "publishModrinth", "githubRelease"]
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -58,20 +58,13 @@
        <module name="SimplifyBooleanExpression" />
        <module name="SimplifyBooleanReturn" />
        <module name="StringLiteralEquality" />
-        <module name="UnnecessaryParentheses">
-            <!-- Default minus LAND. -->
-            <property name="tokens" value="EXPR,IDENT,NUM_DOUBLE,NUM_FLOAT,NUM_INT,NUM_LONG,STRING_LITERAL,LITERAL_NULL,LITERAL_FALSE,LITERAL_TRUE,ASSIGN,BAND_ASSIGN,BOR_ASSIGN,BSR_ASSIGN,BXOR_ASSIGN,DIV_ASSIGN,MINUS_ASSIGN,MOD_ASSIGN,PLUS_ASSIGN,SL_ASSIGN,SR_ASSIGN,STAR_ASSIGN,LAMBDA,TEXT_BLOCK_LITERAL_BEGIN,LITERAL_INSTANCEOF,GT,LT,GE,LE,EQUAL,NOT_EQUAL,UNARY_MINUS,UNARY_PLUS,INC,DEC,LNOT,BNOT,POST_INC,POST_DEC" />
-        </module>
+        <module name="UnnecessaryParentheses" />
        <module name="UnnecessarySemicolonAfterTypeMemberDeclaration" />
        <module name="UnnecessarySemicolonInTryWithResources" />
        <module name="UnnecessarySemicolonInEnumeration" />

        <!-- Imports -->
-        <module name="CustomImportOrder">
-            <property name="customImportOrderRules"
-                value="THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE###STATIC"
-            />
-        </module>
+        <module name="CustomImportOrder" />
        <module name="IllegalImport" />
        <module name="RedundantImport" />
        <module name="UnusedImports" />
@@ -161,7 +154,6 @@
            <property name="allowEmptyLambdas" value="true" />
            <property name="allowEmptyMethods" value="true" />
            <property name="allowEmptyConstructors" value="true" />
-            <property name="allowEmptyTypes" value="true" />

            <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAMBDA,LAND,LCURLY,LE,LITERAL_RETURN,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND" />
        </module>
--- a/config/gitpod/Dockerfile
+++ b/config/gitpod/Dockerfile
@@ -3,6 +3,6 @@ FROM gitpod/workspace-base
 USER gitpod

 RUN sudo apt-get -q update \
- && sudo apt-get install -yq openjdk-16-jdk python3-pip npm \
+ && sudo apt-get install -yq openjdk-8-jdk openjdk-16-jdk python3-pip npm \
 && sudo pip3 install pre-commit \
- && sudo update-java-alternatives --set java-1.16.0-openjdk-amd64
+ && sudo update-java-alternatives --set java-1.8.0-openjdk-amd64
--- a/config/pre-commit/config.yml
+++ b/config/pre-commit/config.yml
@@ -51,5 +51,6 @@ exclude: |
    src/generated|
    src/test/resources/test-rom/data/json-parsing/|
    src/testMod/server-files/|
-    config/idea/
+    config/idea/|
+    .*\.dfpwm
  )
--- 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,11 +10,15 @@ 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 (decimal).
+6. @{number}: The distance between the sender and the receiver, in blocks.

 ## Example
-Prints a message when one is sent:
+Wraps a @{modem} peripheral, opens channel 0 for listening, and prints all received messages.
+
 ```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
@@ -0,0 +1,27 @@
+---
+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/guides/speaker_audio.md
+++ b/doc/guides/speaker_audio.md
@@ -0,0 +1,200 @@
+---
+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 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
@@ -0,0 +1,83 @@
+---
+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,16 +12,19 @@ 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.

-**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.
+:::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.
+:::

-**Warning** Internally, this function queues and waits for a timer event (using
+:::caution
+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,8 @@
-org.gradle.jvmargs=-Xmx3G
-
 # Mod properties
-mod_version=1.99.1
+mod_version=1.100.0

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

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

  (library-path
    /doc/stub/
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,6 +14,7 @@
      },
      "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",
@@ -73,6 +74,23 @@
        "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",
@@ -264,12 +282,39 @@
      "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",
@@ -382,6 +427,15 @@
        }
      ]
    },
+    "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",
@@ -512,6 +566,17 @@
        "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",
@@ -665,12 +730,27 @@
      "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",
@@ -740,6 +820,12 @@
      "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,6 +10,7 @@
  },
  "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,7 +1,8 @@
-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";
@@ -10,7 +11,7 @@ const requirejs = readFileSync("node_modules/requirejs/require.js");
 export default {
    input: [`${input}/index.tsx`],
    output: {
-        file: "build/rollup/index.js",
+        dir: "build/rollup/",
        // 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.
@@ -18,7 +19,7 @@ export default {
            ${requirejs}
            require.config({
                paths: { copycat: "https://copy-cat.squiddev.cc" },
-                urlArgs: function(id) { return id == "copycat/embed" ? "?v=20211127" : ""; }
+                urlArgs: function(id) { return id == "copycat/embed" ? "?v=20211221" : ""; }
            });
        `,
        format: "amd",
@@ -33,12 +34,18 @@ 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 != '.tsx' && ext != '.ts' && path.dirname(file) === path.resolve(`${input}/mount`)
+                return ext != '.dfpwm' && path.dirname(file) === path.resolve(`${input}/mount`)
                    ? `export default ${JSON.stringify(code)};\n`
                    : null;
            },
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_advanced.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_advanced.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "minecraft:redstone"
-            ]
+            "item": "minecraft:redstone"
          },
          {
-            "items": [
-              "minecraft:gold_ingot"
-            ]
+            "item": "minecraft:gold_ingot"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_command.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_command.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "minecraft:command_block"
-            ]
+            "item": "minecraft:command_block"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_1.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_1.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:disk_drive"
-            ]
+            "item": "computercraft:disk_drive"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_10.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_10.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:disk_drive"
-            ]
+            "item": "computercraft:disk_drive"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_11.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_11.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:disk_drive"
-            ]
+            "item": "computercraft:disk_drive"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_12.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_12.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:disk_drive"
-            ]
+            "item": "computercraft:disk_drive"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_13.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_13.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:disk_drive"
-            ]
+            "item": "computercraft:disk_drive"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_14.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_14.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:disk_drive"
-            ]
+            "item": "computercraft:disk_drive"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_15.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_15.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:disk_drive"
-            ]
+            "item": "computercraft:disk_drive"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_16.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_16.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:disk_drive"
-            ]
+            "item": "computercraft:disk_drive"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_2.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_2.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:disk_drive"
-            ]
+            "item": "computercraft:disk_drive"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_3.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_3.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:disk_drive"
-            ]
+            "item": "computercraft:disk_drive"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_4.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_4.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:disk_drive"
-            ]
+            "item": "computercraft:disk_drive"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_5.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_5.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:disk_drive"
-            ]
+            "item": "computercraft:disk_drive"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_6.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_6.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:disk_drive"
-            ]
+            "item": "computercraft:disk_drive"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_7.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_7.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:disk_drive"
-            ]
+            "item": "computercraft:disk_drive"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_8.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_8.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:disk_drive"
-            ]
+            "item": "computercraft:disk_drive"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_9.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_9.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:disk_drive"
-            ]
+            "item": "computercraft:disk_drive"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/speaker.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:pocket_computer_advanced"
-            ]
+            "item": "computercraft:pocket_computer_advanced"
          },
          {
-            "items": [
-              "computercraft:speaker"
-            ]
+            "item": "computercraft:speaker"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_advanced.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:pocket_computer_advanced"
-            ]
+            "item": "computercraft:pocket_computer_advanced"
          },
          {
-            "items": [
-              "computercraft:wireless_modem_advanced"
-            ]
+            "item": "computercraft:wireless_modem_advanced"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_normal.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:pocket_computer_advanced"
-            ]
+            "item": "computercraft:pocket_computer_advanced"
          },
          {
-            "items": [
-              "computercraft:wireless_modem_normal"
-            ]
+            "item": "computercraft:wireless_modem_normal"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_advanced.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_advanced.json
@@ -21,9 +21,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "minecraft:golden_apple"
-            ]
+            "item": "minecraft:golden_apple"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_normal.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_normal.json
@@ -21,9 +21,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "minecraft:golden_apple"
-            ]
+            "item": "minecraft:golden_apple"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/speaker.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:pocket_computer_normal"
-            ]
+            "item": "computercraft:pocket_computer_normal"
          },
          {
-            "items": [
-              "computercraft:speaker"
-            ]
+            "item": "computercraft:speaker"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/wireless_modem_advanced.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:pocket_computer_normal"
-            ]
+            "item": "computercraft:pocket_computer_normal"
          },
          {
-            "items": [
-              "computercraft:wireless_modem_advanced"
-            ]
+            "item": "computercraft:wireless_modem_advanced"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/wireless_modem_normal.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:pocket_computer_normal"
-            ]
+            "item": "computercraft:pocket_computer_normal"
          },
          {
-            "items": [
-              "computercraft:wireless_modem_normal"
-            ]
+            "item": "computercraft:wireless_modem_normal"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printed_book.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printed_book.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:printer"
-            ]
+            "item": "computercraft:printer"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printed_pages.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printed_pages.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:printer"
-            ]
+            "item": "computercraft:printer"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/speaker.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:turtle_advanced"
-            ]
+            "item": "computercraft:turtle_advanced"
          },
          {
-            "items": [
-              "computercraft:speaker"
-            ]
+            "item": "computercraft:speaker"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/wireless_modem_advanced.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:turtle_advanced"
-            ]
+            "item": "computercraft:turtle_advanced"
          },
          {
-            "items": [
-              "computercraft:wireless_modem_advanced"
-            ]
+            "item": "computercraft:wireless_modem_advanced"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/wireless_modem_normal.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:turtle_advanced"
-            ]
+            "item": "computercraft:turtle_advanced"
          },
          {
-            "items": [
-              "computercraft:wireless_modem_normal"
-            ]
+            "item": "computercraft:wireless_modem_normal"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/crafting_table.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/crafting_table.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:turtle_advanced"
-            ]
+            "item": "computercraft:turtle_advanced"
          },
          {
-            "items": [
-              "minecraft:crafting_table"
-            ]
+            "item": "minecraft:crafting_table"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_axe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_axe.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:turtle_advanced"
-            ]
+            "item": "computercraft:turtle_advanced"
          },
          {
-            "items": [
-              "minecraft:diamond_axe"
-            ]
+            "item": "minecraft:diamond_axe"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_hoe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_hoe.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:turtle_advanced"
-            ]
+            "item": "computercraft:turtle_advanced"
          },
          {
-            "items": [
-              "minecraft:diamond_hoe"
-            ]
+            "item": "minecraft:diamond_hoe"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_pickaxe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_pickaxe.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:turtle_advanced"
-            ]
+            "item": "computercraft:turtle_advanced"
          },
          {
-            "items": [
-              "minecraft:diamond_pickaxe"
-            ]
+            "item": "minecraft:diamond_pickaxe"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_shovel.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_shovel.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:turtle_advanced"
-            ]
+            "item": "computercraft:turtle_advanced"
          },
          {
-            "items": [
-              "minecraft:diamond_shovel"
-            ]
+            "item": "minecraft:diamond_shovel"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_sword.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_sword.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:turtle_advanced"
-            ]
+            "item": "computercraft:turtle_advanced"
          },
          {
-            "items": [
-              "minecraft:diamond_sword"
-            ]
+            "item": "minecraft:diamond_sword"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/speaker.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:turtle_normal"
-            ]
+            "item": "computercraft:turtle_normal"
          },
          {
-            "items": [
-              "computercraft:speaker"
-            ]
+            "item": "computercraft:speaker"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/wireless_modem_advanced.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:turtle_normal"
-            ]
+            "item": "computercraft:turtle_normal"
          },
          {
-            "items": [
-              "computercraft:wireless_modem_advanced"
-            ]
+            "item": "computercraft:wireless_modem_advanced"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/wireless_modem_normal.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:turtle_normal"
-            ]
+            "item": "computercraft:turtle_normal"
          },
          {
-            "items": [
-              "computercraft:wireless_modem_normal"
-            ]
+            "item": "computercraft:wireless_modem_normal"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/crafting_table.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/crafting_table.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:turtle_normal"
-            ]
+            "item": "computercraft:turtle_normal"
          },
          {
-            "items": [
-              "minecraft:crafting_table"
-            ]
+            "item": "minecraft:crafting_table"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_axe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_axe.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:turtle_normal"
-            ]
+            "item": "computercraft:turtle_normal"
          },
          {
-            "items": [
-              "minecraft:diamond_axe"
-            ]
+            "item": "minecraft:diamond_axe"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_hoe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_hoe.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:turtle_normal"
-            ]
+            "item": "computercraft:turtle_normal"
          },
          {
-            "items": [
-              "minecraft:diamond_hoe"
-            ]
+            "item": "minecraft:diamond_hoe"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_pickaxe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_pickaxe.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:turtle_normal"
-            ]
+            "item": "computercraft:turtle_normal"
          },
          {
-            "items": [
-              "minecraft:diamond_pickaxe"
-            ]
+            "item": "minecraft:diamond_pickaxe"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_shovel.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_shovel.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:turtle_normal"
-            ]
+            "item": "computercraft:turtle_normal"
          },
          {
-            "items": [
-              "minecraft:diamond_shovel"
-            ]
+            "item": "minecraft:diamond_shovel"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_sword.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_sword.json
@@ -11,14 +11,10 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:turtle_normal"
-            ]
+            "item": "computercraft:turtle_normal"
          },
          {
-            "items": [
-              "minecraft:diamond_sword"
-            ]
+            "item": "minecraft:diamond_sword"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem.json
@@ -21,9 +21,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:cable"
-            ]
+            "item": "computercraft:cable"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wireless_modem_advanced.json
@@ -21,9 +21,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:wireless_modem_normal"
-            ]
+            "item": "computercraft:wireless_modem_normal"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/decorations/skull_cloudy.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/decorations/skull_cloudy.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:monitor_normal"
-            ]
+            "item": "computercraft:monitor_normal"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/decorations/skull_dan200.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/decorations/skull_dan200.json
@@ -11,9 +11,7 @@
      "conditions": {
        "items": [
          {
-            "items": [
-              "computercraft:computer_advanced"
-            ]
+            "item": "computercraft:computer_advanced"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/computercraft/pocket_upgrades/speaker.json
+++ b/src/generated/resources/data/computercraft/computercraft/pocket_upgrades/speaker.json
@@ -1,4 +0,0 @@
-{
-  "type": "computercraft:speaker",
-  "item": "computercraft:speaker"
-}
--- a/src/generated/resources/data/computercraft/computercraft/pocket_upgrades/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/computercraft/pocket_upgrades/wireless_modem_advanced.json
@@ -1,4 +0,0 @@
-{
-  "type": "computercraft:wireless_modem_advanced",
-  "item": "computercraft:wireless_modem_advanced"
-}
--- a/src/generated/resources/data/computercraft/computercraft/pocket_upgrades/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/computercraft/pocket_upgrades/wireless_modem_normal.json
@@ -1,4 +0,0 @@
-{
-  "type": "computercraft:wireless_modem_normal",
-  "item": "computercraft:wireless_modem_normal"
-}
--- a/src/generated/resources/data/computercraft/computercraft/turtle_upgrades/speaker.json
+++ b/src/generated/resources/data/computercraft/computercraft/turtle_upgrades/speaker.json
@@ -1,4 +0,0 @@
-{
-  "type": "computercraft:speaker",
-  "item": "computercraft:speaker"
-}
--- a/src/generated/resources/data/computercraft/computercraft/turtle_upgrades/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/computercraft/turtle_upgrades/wireless_modem_advanced.json
@@ -1,4 +0,0 @@
-{
-  "type": "computercraft:wireless_modem_advanced",
-  "item": "computercraft:wireless_modem_advanced"
-}
--- a/src/generated/resources/data/computercraft/computercraft/turtle_upgrades/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/computercraft/turtle_upgrades/wireless_modem_normal.json
@@ -1,4 +0,0 @@
-{
-  "type": "computercraft:wireless_modem_normal",
-  "item": "computercraft:wireless_modem_normal"
-}
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/cable.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/cable.json
@@ -3,8 +3,7 @@
  "pools": [
    {
      "name": "cable",
-      "rolls": 1.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
      "entries": [
        {
          "type": "minecraft:item",
@@ -22,13 +21,11 @@
            "cable": "true"
          }
        }
-      ],
-      "functions": []
+      ]
    },
    {
      "name": "wired_modem",
-      "rolls": 1.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
      "entries": [
        {
          "type": "minecraft:item",
@@ -49,8 +46,7 @@
            }
          }
        }
-      ],
-      "functions": []
+      ]
    }
  ]
 }
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/computer_advanced.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_advanced.json
@@ -3,8 +3,7 @@
  "pools": [
    {
      "name": "main",
-      "rolls": 1.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
      "entries": [
        {
          "type": "minecraft:dynamic",
@@ -29,8 +28,7 @@
            }
          ]
        }
-      ],
-      "functions": []
+      ]
    }
  ]
 }
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/computer_command.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_command.json
@@ -3,8 +3,7 @@
  "pools": [
    {
      "name": "main",
-      "rolls": 1.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
      "entries": [
        {
          "type": "minecraft:dynamic",
@@ -29,8 +28,7 @@
            }
          ]
        }
-      ],
-      "functions": []
+      ]
    }
  ]
 }
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/computer_normal.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_normal.json
@@ -3,8 +3,7 @@
  "pools": [
    {
      "name": "main",
-      "rolls": 1.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
      "entries": [
        {
          "type": "minecraft:dynamic",
@@ -29,8 +28,7 @@
            }
          ]
        }
-      ],
-      "functions": []
+      ]
    }
  ]
 }
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/disk_drive.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/disk_drive.json
@@ -3,8 +3,7 @@
  "pools": [
    {
      "name": "main",
-      "rolls": 1.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
      "entries": [
        {
          "type": "minecraft:item",
@@ -15,8 +14,7 @@
        {
          "condition": "minecraft:survives_explosion"
        }
-      ],
-      "functions": []
+      ]
    }
  ]
 }
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json
@@ -3,8 +3,7 @@
  "pools": [
    {
      "name": "main",
-      "rolls": 1.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
      "entries": [
        {
          "type": "minecraft:item",
@@ -15,8 +14,7 @@
        {
          "condition": "minecraft:survives_explosion"
        }
-      ],
-      "functions": []
+      ]
    }
  ]
 }
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_normal.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_normal.json
@@ -3,8 +3,7 @@
  "pools": [
    {
      "name": "main",
-      "rolls": 1.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
      "entries": [
        {
          "type": "minecraft:item",
@@ -15,8 +14,7 @@
        {
          "condition": "minecraft:survives_explosion"
        }
-      ],
-      "functions": []
+      ]
    }
  ]
 }
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/printer.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/printer.json
@@ -3,8 +3,7 @@
  "pools": [
    {
      "name": "main",
-      "rolls": 1.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
      "entries": [
        {
          "type": "minecraft:item",
@@ -15,8 +14,7 @@
        {
          "condition": "minecraft:survives_explosion"
        }
-      ],
-      "functions": []
+      ]
    }
  ]
 }
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/speaker.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/speaker.json
@@ -3,8 +3,7 @@
  "pools": [
    {
      "name": "main",
-      "rolls": 1.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
      "entries": [
        {
          "type": "minecraft:item",
@@ -15,8 +14,7 @@
        {
          "condition": "minecraft:survives_explosion"
        }
-      ],
-      "functions": []
+      ]
    }
  ]
 }
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_advanced.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_advanced.json
@@ -3,8 +3,7 @@
  "pools": [
    {
      "name": "main",
-      "rolls": 1.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
      "entries": [
        {
          "type": "minecraft:dynamic",
@@ -29,8 +28,7 @@
            }
          ]
        }
-      ],
-      "functions": []
+      ]
    }
  ]
 }
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_normal.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_normal.json
@@ -3,8 +3,7 @@
  "pools": [
    {
      "name": "main",
-      "rolls": 1.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
      "entries": [
        {
          "type": "minecraft:dynamic",
@@ -29,8 +28,7 @@
            }
          ]
        }
-      ],
-      "functions": []
+      ]
    }
  ]
 }
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/wired_modem_full.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/wired_modem_full.json
@@ -3,8 +3,7 @@
  "pools": [
    {
      "name": "main",
-      "rolls": 1.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
      "entries": [
        {
          "type": "minecraft:item",
@@ -15,8 +14,7 @@
        {
          "condition": "minecraft:survives_explosion"
        }
-      ],
-      "functions": []
+      ]
    }
  ]
 }
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json
@@ -3,8 +3,7 @@
  "pools": [
    {
      "name": "main",
-      "rolls": 1.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
      "entries": [
        {
          "type": "minecraft:item",
@@ -15,8 +14,7 @@
        {
          "condition": "minecraft:survives_explosion"
        }
-      ],
-      "functions": []
+      ]
    }
  ]
 }
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json
@@ -3,8 +3,7 @@
  "pools": [
    {
      "name": "main",
-      "rolls": 1.0,
-      "bonus_rolls": 0.0,
+      "rolls": 1,
      "entries": [
        {
          "type": "minecraft:item",
@@ -15,8 +14,7 @@
        {
          "condition": "minecraft:survives_explosion"
        }
-      ],
-      "functions": []
+      ]
    }
  ]
 }
--- a/src/generated/resources/data/computercraft/tags/blocks/turtle_hoe_harvestable.json
+++ b/src/generated/resources/data/computercraft/tags/blocks/turtle_hoe_harvestable.json
@@ -2,7 +2,6 @@
  "replace": false,
  "values": [
    "#minecraft:crops",
-    "#minecraft:mineable/hoe",
    "minecraft:cactus",
    "minecraft:melon",
    "minecraft:pumpkin",
--- a/src/generated/resources/data/computercraft/tags/blocks/turtle_shovel_harvestable.json
+++ b/src/generated/resources/data/computercraft/tags/blocks/turtle_shovel_harvestable.json
@@ -1,7 +1,6 @@
 {
  "replace": false,
  "values": [
-    "#minecraft:mineable/shovel",
    "minecraft:melon",
    "minecraft:pumpkin",
    "minecraft:carved_pumpkin",
--- a/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/crafting_table.json
+++ b/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/crafting_table.json
@@ -1,4 +0,0 @@
-{
-  "type": "computercraft:workbench",
-  "item": "minecraft:crafting_table"
-}
--- a/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_axe.json
+++ b/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_axe.json
@@ -1,5 +0,0 @@
-{
-  "type": "computercraft:tool",
-  "item": "minecraft:diamond_axe",
-  "damageMultiplier": 6.0
-}
--- a/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_hoe.json
+++ b/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_hoe.json
@@ -1,5 +0,0 @@
-{
-  "type": "computercraft:tool",
-  "item": "minecraft:diamond_hoe",
-  "breakable": "computercraft:turtle_hoe_harvestable"
-}
--- a/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_pickaxe.json
+++ b/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_pickaxe.json
@@ -1,4 +0,0 @@
-{
-  "type": "computercraft:tool",
-  "item": "minecraft:diamond_pickaxe"
-}
--- a/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_shovel.json
+++ b/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_shovel.json
@@ -1,5 +0,0 @@
-{
-  "type": "computercraft:tool",
-  "item": "minecraft:diamond_shovel",
-  "breakable": "computercraft:turtle_shovel_harvestable"
-}
--- a/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_sword.json
+++ b/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_sword.json
@@ -1,6 +0,0 @@
-{
-  "type": "computercraft:tool",
-  "item": "minecraft:diamond_sword",
-  "damageMultiplier": 9.0,
-  "breakable": "computercraft:turtle_sword_harvestable"
-}
--- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
+++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
@@ -1,18 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    "computercraft:computer_normal",
-    "computercraft:computer_advanced",
-    "computercraft:turtle_normal",
-    "computercraft:turtle_advanced",
-    "computercraft:speaker",
-    "computercraft:disk_drive",
-    "computercraft:printer",
-    "computercraft:monitor_normal",
-    "computercraft:monitor_advanced",
-    "computercraft:wireless_modem_normal",
-    "computercraft:wireless_modem_advanced",
-    "computercraft:wired_modem_full",
-    "computercraft:cable"
-  ]
-}
--- a/src/main/java/dan200/computercraft/ComputerCraft.java
+++ b/src/main/java/dan200/computercraft/ComputerCraft.java
@@ -5,6 +5,7 @@
 */
 package dan200.computercraft;

+import dan200.computercraft.api.turtle.event.TurtleAction;
 import dan200.computercraft.core.apis.http.options.Action;
 import dan200.computercraft.core.apis.http.options.AddressRule;
 import dan200.computercraft.shared.Config;
@@ -12,10 +13,16 @@ import dan200.computercraft.shared.Registry;
 import dan200.computercraft.shared.computer.core.ClientComputerRegistry;
 import dan200.computercraft.shared.computer.core.ServerComputerRegistry;
 import dan200.computercraft.shared.peripheral.monitor.MonitorRenderer;
+import dan200.computercraft.shared.pocket.peripherals.PocketModem;
+import dan200.computercraft.shared.pocket.peripherals.PocketSpeaker;
+import dan200.computercraft.shared.turtle.upgrades.*;
 import net.minecraftforge.fml.common.Mod;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.concurrent.TimeUnit;

@@ -38,10 +45,10 @@ public final class ComputerCraft

    public static boolean httpEnabled = true;
    public static boolean httpWebsocketEnabled = true;
-    public static List<AddressRule> httpRules = List.of(
+    public static List<AddressRule> httpRules = Collections.unmodifiableList( Arrays.asList(
        AddressRule.parse( "$private", null, Action.DENY.toPartial() ),
        AddressRule.parse( "*", null, Action.ALLOW.toPartial() )
-    );
+    ) );

    public static int httpMaxRequests = 16;
    public static int httpMaxWebsockets = 4;
@@ -55,7 +62,7 @@ public final class ComputerCraft
    public static int modemHighAltitudeRangeDuringStorm = 384;
    public static int maxNotesPerTick = 8;
    public static MonitorRenderer monitorRenderer = MonitorRenderer.BEST;
-    public static int monitorDistance = 65;
+    public static double monitorDistanceSq = 4096;
    public static long monitorBandwidth = 1_000_000;

    public static boolean turtlesNeedFuel = true;
@@ -63,6 +70,7 @@ public final class ComputerCraft
    public static int advancedTurtleFuelLimit = 100000;
    public static boolean turtlesObeyBlockProtection = true;
    public static boolean turtlesCanPush = true;
+    public static EnumSet<TurtleAction> turtleDisabledActions = EnumSet.noneOf( TurtleAction.class );

    public static int computerTermWidth = 51;
    public static int computerTermHeight = 19;
@@ -76,6 +84,27 @@ public final class ComputerCraft
    public static int monitorWidth = 8;
    public static int monitorHeight = 6;

+    public static final class TurtleUpgrades
+    {
+        public static TurtleModem wirelessModemNormal;
+        public static TurtleModem wirelessModemAdvanced;
+        public static TurtleSpeaker speaker;
+
+        public static TurtleCraftingTable craftingTable;
+        public static TurtleSword diamondSword;
+        public static TurtleShovel diamondShovel;
+        public static TurtleTool diamondPickaxe;
+        public static TurtleAxe diamondAxe;
+        public static TurtleHoe diamondHoe;
+    }
+
+    public static final class PocketUpgrades
+    {
+        public static PocketModem wirelessModemNormal;
+        public static PocketModem wirelessModemAdvanced;
+        public static PocketSpeaker speaker;
+    }
+
    // Registries
    public static final ClientComputerRegistry clientComputerRegistry = new ClientComputerRegistry();
    public static final ServerComputerRegistry serverComputerRegistry = new ServerComputerRegistry();
--- a/src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java
+++ b/src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java
@@ -15,30 +15,30 @@ import dan200.computercraft.api.network.IPacketNetwork;
 import dan200.computercraft.api.network.wired.IWiredElement;
 import dan200.computercraft.api.network.wired.IWiredNode;
 import dan200.computercraft.api.peripheral.IPeripheralProvider;
+import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
+import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.core.apis.ApiFactories;
 import dan200.computercraft.core.asm.GenericMethod;
 import dan200.computercraft.core.filesystem.FileMount;
 import dan200.computercraft.core.filesystem.ResourceMount;
-import dan200.computercraft.shared.BundledRedstone;
-import dan200.computercraft.shared.MediaProviders;
-import dan200.computercraft.shared.Peripherals;
+import dan200.computercraft.shared.*;
 import dan200.computercraft.shared.peripheral.generic.GenericPeripheralProvider;
 import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork;
 import dan200.computercraft.shared.util.IDAssigner;
 import dan200.computercraft.shared.wired.WiredNode;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.resources.ReloadableResourceManager;
-import net.minecraft.server.packs.resources.ResourceManager;
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.resources.IReloadableResourceManager;
+import net.minecraft.resources.IResourceManager;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockReader;
+import net.minecraft.world.World;
 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.fml.server.ServerLifecycleHooks;

 import javax.annotation.Nonnull;
 import java.io.File;
@@ -59,7 +59,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI

    public static InputStream getResourceFile( String domain, String subPath )
    {
-        ReloadableResourceManager manager = (ReloadableResourceManager) ServerLifecycleHooks.getCurrentServer().getResourceManager();
+        IReloadableResourceManager manager = (IReloadableResourceManager) ServerLifecycleHooks.getCurrentServer().getDataPackRegistries().getResourceManager();
        try
        {
            return manager.getResource( new ResourceLocation( domain, subPath ) ).getInputStream();
@@ -81,13 +81,13 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
    }

    @Override
-    public int createUniqueNumberedSaveDir( @Nonnull Level world, @Nonnull String parentSubPath )
+    public int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath )
    {
        return IDAssigner.getNextId( parentSubPath );
    }

    @Override
-    public IWritableMount createSaveDirMount( @Nonnull Level world, @Nonnull String subPath, long capacity )
+    public IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity )
    {
        try
        {
@@ -102,7 +102,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
    @Override
    public IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath )
    {
-        ResourceManager manager = ServerLifecycleHooks.getCurrentServer().getResourceManager();
+        IResourceManager manager = ServerLifecycleHooks.getCurrentServer().getDataPackRegistries().getResourceManager();
        ResourceMount mount = ResourceMount.get( domain, subPath, manager );
        return mount.exists( "" ) ? mount : null;
    }
@@ -125,6 +125,12 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
        GenericPeripheralProvider.addCapability( capability );
    }

+    @Override
+    public void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade )
+    {
+        TurtleUpgrades.register( upgrade );
+    }
+
    @Override
    public void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider )
    {
@@ -132,7 +138,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
    }

    @Override
-    public int getBundledRedstoneOutput( @Nonnull Level world, @Nonnull BlockPos pos, @Nonnull Direction side )
+    public int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side )
    {
        return BundledRedstone.getDefaultOutput( world, pos, side );
    }
@@ -143,6 +149,12 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
        MediaProviders.register( provider );
    }

+    @Override
+    public void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade )
+    {
+        PocketUpgrades.register( upgrade );
+    }
+
    @Nonnull
    @Override
    public IPacketNetwork getWirelessNetwork()
@@ -165,9 +177,9 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI

    @Nonnull
    @Override
-    public LazyOptional<IWiredElement> getWiredElementAt( @Nonnull BlockGetter world, @Nonnull BlockPos pos, @Nonnull Direction side )
+    public LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull Direction side )
    {
-        BlockEntity tile = world.getBlockEntity( pos );
+        TileEntity tile = world.getBlockEntity( pos );
        return tile == null ? LazyOptional.empty() : tile.getCapability( CAPABILITY_WIRED_ELEMENT, side );
    }
 }
--- a/src/main/java/dan200/computercraft/api/ComputerCraftAPI.java
+++ b/src/main/java/dan200/computercraft/api/ComputerCraftAPI.java
@@ -17,11 +17,13 @@ import dan200.computercraft.api.network.wired.IWiredNode;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.peripheral.IPeripheralProvider;
+import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.Level;
+import dan200.computercraft.api.turtle.ITurtleUpgrade;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockReader;
+import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;

@@ -36,14 +38,19 @@ import javax.annotation.Nullable;
 */
 public final class ComputerCraftAPI
 {
-    public static final String MOD_ID = "computercraft";
-
    @Nonnull
    public static String getInstalledVersion()
    {
        return getInstance().getInstalledVersion();
    }

+    @Nonnull
+    @Deprecated
+    public static String getAPIVersion()
+    {
+        return getInstalledVersion();
+    }
+
    /**
     * Creates a numbered directory in a subfolder of the save directory for a given world, and returns that number.
     *
@@ -55,9 +62,9 @@ public final class ComputerCraftAPI
     *
     * eg: if createUniqueNumberedSaveDir( world, "computer/disk" ) was called returns 42, then "computer/disk/42" is now
     * available for writing.
-     * @see #createSaveDirMount(Level, String, long)
+     * @see #createSaveDirMount(World, String, long)
     */
-    public static int createUniqueNumberedSaveDir( @Nonnull Level world, @Nonnull String parentSubPath )
+    public static int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath )
    {
        return getInstance().createUniqueNumberedSaveDir( world, parentSubPath );
    }
@@ -74,14 +81,14 @@ public final class ComputerCraftAPI
     * @param capacity The amount of data that can be stored in the directory before it fills up, in bytes.
     * @return The mount, or null if it could be created for some reason. Use IComputerAccess.mount() or IComputerAccess.mountWritable()
     * to mount this on a Computers' file system.
-     * @see #createUniqueNumberedSaveDir(Level, String)
+     * @see #createUniqueNumberedSaveDir(World, String)
     * @see IComputerAccess#mount(String, IMount)
     * @see IComputerAccess#mountWritable(String, IWritableMount)
     * @see IMount
     * @see IWritableMount
     */
    @Nullable
-    public static IWritableMount createSaveDirMount( @Nonnull Level world, @Nonnull String subPath, long capacity )
+    public static IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity )
    {
        return getInstance().createSaveDirMount( world, subPath, capacity );
    }
@@ -144,6 +151,19 @@ public final class ComputerCraftAPI
        getInstance().registerGenericCapability( capability );
    }

+    /**
+     * Registers a new turtle turtle for use in ComputerCraft. After calling this,
+     * users should be able to craft Turtles with your new turtle. It is recommended to call
+     * this during the load() method of your mod.
+     *
+     * @param upgrade The turtle upgrade to register.
+     * @see ITurtleUpgrade
+     */
+    public static void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade )
+    {
+        getInstance().registerTurtleUpgrade( upgrade );
+    }
+
    /**
     * Registers a bundled redstone provider to provide bundled redstone output for blocks.
     *
@@ -165,7 +185,7 @@ public final class ComputerCraftAPI
     * If there is no block capable of emitting bundled redstone at the location, -1 will be returned.
     * @see IBundledRedstoneProvider
     */
-    public static int getBundledRedstoneOutput( @Nonnull Level world, @Nonnull BlockPos pos, @Nonnull Direction side )
+    public static int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side )
    {
        return getInstance().getBundledRedstoneOutput( world, pos, side );
    }
@@ -181,6 +201,11 @@ public final class ComputerCraftAPI
        getInstance().registerMediaProvider( provider );
    }

+    public static void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade )
+    {
+        getInstance().registerPocketUpgrade( upgrade );
+    }
+
    /**
     * Attempt to get the game-wide wireless network.
     *
@@ -219,7 +244,7 @@ public final class ComputerCraftAPI
     * @see IWiredElement#getNode()
     */
    @Nonnull
-    public static LazyOptional<IWiredElement> getWiredElementAt( @Nonnull BlockGetter world, @Nonnull BlockPos pos, @Nonnull Direction side )
+    public static LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull Direction side )
    {
        return getInstance().getWiredElementAt( world, pos, side );
    }
@@ -247,10 +272,10 @@ public final class ComputerCraftAPI
        @Nonnull
        String getInstalledVersion();

-        int createUniqueNumberedSaveDir( @Nonnull Level world, @Nonnull String parentSubPath );
+        int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath );

        @Nullable
-        IWritableMount createSaveDirMount( @Nonnull Level world, @Nonnull String subPath, long capacity );
+        IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity );

        @Nullable
        IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath );
@@ -261,12 +286,16 @@ public final class ComputerCraftAPI

        void registerGenericCapability( @Nonnull Capability<?> capability );

+        void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade );
+
        void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider );

-        int getBundledRedstoneOutput( @Nonnull Level world, @Nonnull BlockPos pos, @Nonnull Direction side );
+        int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side );

        void registerMediaProvider( @Nonnull IMediaProvider provider );

+        void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade );
+
        @Nonnull
        IPacketNetwork getWirelessNetwork();

@@ -276,6 +305,6 @@ public final class ComputerCraftAPI
        IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element );

        @Nonnull
-        LazyOptional<IWiredElement> getWiredElementAt( @Nonnull BlockGetter world, @Nonnull BlockPos pos, @Nonnull Direction side );
+        LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull Direction side );
    }
 }
--- a/src/main/java/dan200/computercraft/api/ComputerCraftTags.java
+++ b/src/main/java/dan200/computercraft/api/ComputerCraftTags.java
@@ -1,66 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * 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;
-
-import dan200.computercraft.ComputerCraft;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.BlockTags;
-import net.minecraft.tags.ItemTags;
-import net.minecraft.tags.Tag;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
-
-/**
- * Tags provided by ComputerCraft.
- */
-public class ComputerCraftTags
-{
-    public static class Items
-    {
-        public static final Tag.Named<Item> COMPUTER = make( "computer" );
-        public static final Tag.Named<Item> TURTLE = make( "turtle" );
-        public static final Tag.Named<Item> WIRED_MODEM = make( "wired_modem" );
-        public static final Tag.Named<Item> MONITOR = make( "monitor" );
-
-        private static Tag.Named<Item> make( String name )
-        {
-            return ItemTags.bind( new ResourceLocation( ComputerCraft.MOD_ID, name ).toString() );
-        }
-    }
-
-    public static class Blocks
-    {
-        public static final Tag.Named<Block> COMPUTER = make( "computer" );
-        public static final Tag.Named<Block> TURTLE = make( "turtle" );
-        public static final Tag.Named<Block> WIRED_MODEM = make( "wired_modem" );
-        public static final Tag.Named<Block> MONITOR = make( "monitor" );
-
-        /**
-         * Blocks which can be broken by any turtle tool.
-         */
-        public static final Tag.Named<Block> TURTLE_ALWAYS_BREAKABLE = make( "turtle_always_breakable" );
-
-        /**
-         * Blocks which can be broken by the default shovel tool.
-         */
-        public static final Tag.Named<Block> TURTLE_SHOVEL_BREAKABLE = make( "turtle_shovel_harvestable" );
-
-        /**
-         * Blocks which can be broken with the default sword tool.
-         */
-        public static final Tag.Named<Block> TURTLE_SWORD_BREAKABLE = make( "turtle_sword_harvestable" );
-
-        /**
-         * Blocks which can be broken with the default hoe tool.
-         */
-        public static final Tag.Named<Block> TURTLE_HOE_BREAKABLE = make( "turtle_hoe_harvestable" );
-
-        private static Tag.Named<Block> make( String name )
-        {
-            return BlockTags.bind( new ResourceLocation( ComputerCraft.MOD_ID, name ).toString() );
-        }
-    }
-}
--- a/src/main/java/dan200/computercraft/api/upgrades/IUpgradeBase.java
+++ b/src/main/java/dan200/computercraft/api/upgrades/IUpgradeBase.java
@@ -3,14 +3,13 @@
 * 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;
+package dan200.computercraft.api;

 import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import net.minecraft.Util;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.util.ResourceLocation;

 import javax.annotation.Nonnull;

@@ -77,25 +76,11 @@ public interface IUpgradeBase

        // A more expanded form of ItemStack.areShareTagsEqual, but allowing an empty tag to be equal to a
        // null one.
-        CompoundTag shareTag = stack.getItem().getShareTag( stack );
-        CompoundTag craftingShareTag = crafting.getItem().getShareTag( crafting );
+        CompoundNBT shareTag = stack.getItem().getShareTag( stack );
+        CompoundNBT craftingShareTag = crafting.getItem().getShareTag( crafting );
        if( shareTag == craftingShareTag ) return true;
        if( shareTag == null ) return craftingShareTag.isEmpty();
        if( craftingShareTag == null ) return shareTag.isEmpty();
        return shareTag.equals( craftingShareTag );
    }
-
-    /**
-     * Get a suitable default unlocalised adjective for an upgrade ID. This converts "modid:some_upgrade" to
-     * "upgrade.modid.some_upgrade.adjective".
-     *
-     * @param id The upgrade ID.
-     * @return The  generated adjective.
-     * @see #getUnlocalisedAdjective()
-     */
-    @Nonnull
-    static String getDefaultAdjective( @Nonnull ResourceLocation id )
-    {
-        return Util.makeDescriptionId( "upgrade", id ) + ".adjective";
-    }
 }
--- a/src/main/java/dan200/computercraft/api/client/TransformedModel.java
+++ b/src/main/java/dan200/computercraft/api/client/TransformedModel.java
@@ -5,12 +5,12 @@
 */
 package dan200.computercraft.api.client;

-import com.mojang.math.Transformation;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.model.BakedModel;
-import net.minecraft.client.resources.model.ModelManager;
-import net.minecraft.client.resources.model.ModelResourceLocation;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.client.renderer.model.IBakedModel;
+import net.minecraft.client.renderer.model.ModelManager;
+import net.minecraft.client.renderer.model.ModelResourceLocation;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.vector.TransformationMatrix;

 import javax.annotation.Nonnull;
 import java.util.Objects;
@@ -20,19 +20,19 @@ import java.util.Objects;
 */
 public final class TransformedModel
 {
-    private final BakedModel model;
-    private final Transformation matrix;
+    private final IBakedModel model;
+    private final TransformationMatrix matrix;

-    public TransformedModel( @Nonnull BakedModel model, @Nonnull Transformation matrix )
+    public TransformedModel( @Nonnull IBakedModel model, @Nonnull TransformationMatrix matrix )
    {
        this.model = Objects.requireNonNull( model );
        this.matrix = Objects.requireNonNull( matrix );
    }

-    public TransformedModel( @Nonnull BakedModel model )
+    public TransformedModel( @Nonnull IBakedModel model )
    {
        this.model = Objects.requireNonNull( model );
-        matrix = Transformation.identity();
+        matrix = TransformationMatrix.identity();
    }

    public static TransformedModel of( @Nonnull ModelResourceLocation location )
@@ -41,20 +41,20 @@ public final class TransformedModel
        return new TransformedModel( modelManager.getModel( location ) );
    }

-    public static TransformedModel of( @Nonnull ItemStack item, @Nonnull Transformation transform )
+    public static TransformedModel of( @Nonnull ItemStack item, @Nonnull TransformationMatrix transform )
    {
-        BakedModel model = Minecraft.getInstance().getItemRenderer().getItemModelShaper().getItemModel( item );
+        IBakedModel model = Minecraft.getInstance().getItemRenderer().getItemModelShaper().getItemModel( item );
        return new TransformedModel( model, transform );
    }

    @Nonnull
-    public BakedModel getModel()
+    public IBakedModel getModel()
    {
        return model;
    }

    @Nonnull
-    public Transformation getMatrix()
+    public TransformationMatrix getMatrix()
    {
        return matrix;
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jonathan Coates	e558b31b2b	Fix some typos in a dfpwm example	2021-12-21 22:25:16 +00:00
Jonathan Coates	afd82fbf1f	Add speaker support to the documentation website Happy to pick a different piece of audio, but this seemed like a fun one to me.	2021-12-21 22:20:57 +00:00
Jonathan Coates	f470478a0f	Bump CC:T version to 1.100 We're still a few days away from release, but don't think anything else is going to change. And I /really/ don't want to have to write this changelog (and then merge into later versions) on the 25th.	2021-12-21 14:55:01 +00:00
Jonathan Coates	aa009df740	Improve fs API introduction Again, not perfect, but better than a single sentence.	2021-12-21 14:39:08 +00:00
Jonathan Coates	0c6c0badde	Move turtle docs into the Java code instead Yeah, should have seen that coming	2021-12-21 12:00:13 +00:00
Jonathan Coates	bed2e0b658	Write an introduction to the turtle API It's better at least, I just don't know if it's good.	2021-12-21 11:53:46 +00:00
Jonathan Coates	0f9ddac83c	Copy and paste the wiki guide on require I wrote the original, so I don't need to feel guilty :) Closes #565.	2021-12-21 00:55:16 +00:00
Jonathan Coates	932b77d7ee	Rewrite several doc introductions Mostly focussing on rednet and modem here. Not sure if I made them any better, we'll see!	2021-12-21 00:27:07 +00:00
Jonathan Coates	5eedea1bbb	Don't push non-pushable entities Fixes #949	2021-12-20 17:58:39 +00:00
Jonathan Coates	114261944a	Tick pocket computers in item entity form See #995. And no, just because I'm adding this doesn't mean it's not a terrible issue.	2021-12-20 17:37:42 +00:00
Jonathan Coates	4d10639efb	Use correct Java annotations package	2021-12-20 12:19:52 +00:00
Jonathan Coates	aa36b49c50	Enqueue audio when receiving it While Minecraft will automatically push a new buffer when one is exhausted, this doesn't help if there's only a single buffer in the queue, and you end up with stutter. By enquing a buffer when receiving sound we ensure there's always something queued. I'm not 100% happy with this solution, but it does alleviate some of the concerns in #993. Also reduce the size of the client buffer to 0.5s from 1.5s. This is still enough to ensure seamless audio when the server is running slow (I tested at 13 tps, but should be able to go much worse).	2021-12-19 19:50:43 +00:00
Jonathan Coates	8a1067940d	Account for the game being paused when tracking sound progress When the game is paused in SSP world, speakers are not ticked. However, System.nanoTime() continues to increase, which means the next tick speakers believe there has been a big jump and so schedule a bunch of extra audio. To avoid this, we keep track of how long the game has been paused offset nanoTime by that amount. Fixes #994	2021-12-19 16:29:06 +00:00
Jonathan Coates	0477b2742c	Use duplicate() instead of rewind() It's just more confusing having to keep track of where the ByteBuffer is at. In this case, I think we were forgetting to rewind after computing the digest. Hopefully we'll be able to drop some of these in 1.17 as Java 16 has a few more ByteBuffer methods Fixes #992	2021-12-18 11:23:12 +00:00
Jonathan Coates	b048b6666d	Add arbitrary audio support to speakers (#982 ) Speakers can now play arbitrary PCM audio, sampled at 48kHz and with a resolution of 8 bits. Programs can build up buffers of audio locally, play it using `speaker.playAudio`, where it is encoded to DFPWM, sent across the network, decoded, and played on the client. `speaker.playAudio` may return false when a chunk of audio has been submitted but not yet sent to the client. In this case, the program should wait for a speaker_audio_empty event and try again, repeating until it works. While the API is a little odd, this gives us fantastic flexibility (we can play arbitrary streams of audio) while still being resilient in the presence of server lag (either TPS or on the computer thread). Some other notes: - There is a significant buffer on both the client and server, which means that sound take several seconds to finish after playing has started. One can force it to be stopped playing with the new `speaker.stop` call. - This also adds a `cc.audio.dfpwm` module, which allows encoding and decoding DFPWM1a audio files. - I spent so long writing the documentation for this. Who knows if it'll be helpful!	2021-12-13 22:56:59 +00:00
Jonathan Coates	e16f66e128	Some bits of rednet cleanup - Remove all the hungrarian notation in variables. Currently leaving the format of rednet messages for now, while I work out whether this counts as part of the public API or not. - Fix the "repeat" program failing with broadcast packets. This was introduced in #900, but I don't think anybody noticed. Will be more relevant when #955 is implemented though.	2021-12-13 14:30:13 +00:00
Jonathan Coates	1cfad31a0d	Separate breaking progress for wired modems This means that if the current player is breaking a cable/wired modem, only the part they're looking at has breaking progress. Closes #355. A mixin is definitely not the cleanest way to do this. There's a couple of alternatives: - CodeChickenLib's approach of overriding the BlockRendererDispatcher instance with a delegating subclasss. One mod doing this is fine, several is Not Great.o - Adding a PR to Forge: I started this, and it's definitely the ideal solution, but any event for this would have a ton of fields and just ended up looking super ugly.	2021-12-13 13:30:43 +00:00