Bump CC:T version

Allow peripherals to have multiple types (#963 )
Peripherals can now have multiple types: - A single primary type. This is the same as the current idea of a type - some identifier which (mostly) uniquely identifies this kind of peripheral. For instance, "speaker" or "minecraft:chest". - 0 or more "additional" types. These are more like traits, and describe what other behaviour the peripheral has - is it an inventory? Does it supply additional peripherals (like a wired modem)?. This is mostly intended for the generic peripheral system, but it might prove useful elsewhere too - we'll have to see! - peripheral.getType (and modem.getTypeRemote) now returns 1 or more values, rather than exactly one. - Add a new peripheral.hasType (and modem.hasTypeRemote) function which determines if a peripheral has the given type (primary or additional). - Change peripheral.find and all internal peripheral methods to use peripheral.hasType instead. - Update the peripherals program to show all types This effectively allows you to do things like `peripheral.find("inventory")` to find all inventories. This also rewrites the introduction to the peripheral API, hopefully making it a little more useful.
2025-10-22 17:37:38 +00:00 · 2021-11-29 18:54:54 +00:00 · 2021-11-29 17:37:30 +00:00 · 2021-11-28 20:03:27 +00:00 · 2021-11-28 12:47:08 +00:00 · 2021-11-28 12:32:31 +00:00
430 changed files with 10822 additions and 2909 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,6 @@
 # Ignore changes in generated files
 src/generated/resources/data/** linguist-generated
-src/test/server-files/structures linguist-generated
+src/testMod/server-files/structures linguist-generated

 * text=auto

--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -10,6 +10,7 @@ body:
    options:
      - 1.15.x
      - 1.16.x
+      - 1.17.x
  validations:
    required: true
 - type: input
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -4,5 +4,5 @@ contact_links:
  url: https://discord.computercraft.cc
  about: Get help on the ComputerCraft Discord.
 - name: GitHub Discussions
-  url: https://github.com/SquidDev-CC/CC-Tweaked/discussions
+  url: https://github.com/cc-tweaked/CC-Tweaked/discussions
  about: Or ask questions on GitHub Discussions.
--- a/.github/workflows/main-ci.yml
+++ b/.github/workflows/main-ci.yml
@@ -32,7 +32,7 @@ jobs:
      run: |
        ./gradlew assemble || ./gradlew assemble
        ./gradlew downloadAssets || ./gradlew downloadAssets
-        ./gradlew build
+        xvfb-run ./gradlew build

    - name: Upload Jar
      uses: actions/upload-artifact@v2
@@ -40,8 +40,17 @@ jobs:
        name: CC-Tweaked
        path: build/libs

+    - name: Upload Screnshots
+      uses: actions/upload-artifact@v2
+      with:
+        name: Screenshots
+        path: test-files/client/screenshots
+        if-no-files-found: ignore
+        retention-days: 5
+      if: failure()
+
    - name: Upload Coverage
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v2

    - name: Parse test reports
      run: ./tools/parse-reports.py
--- a/.github/workflows/make-doc.sh
+++ b/.github/workflows/make-doc.sh
@@ -13,7 +13,7 @@ chmod 600 "$HOME/.ssh/key"
 # And upload
 rsync -avc -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no -p $SSH_PORT" \
      "$GITHUB_WORKSPACE/build/docs/lua/" \
-      "$SSH_USER@$SSH_HOST:/var/www/tweaked.cc/$DEST"
+      "$SSH_USER@$SSH_HOST:/$DEST"
 rsync -avc -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no -p $SSH_PORT" \
      "$GITHUB_WORKSPACE/build/docs/javadoc/" \
-      "$SSH_USER@$SSH_HOST:/var/www/tweaked.cc/$DEST/javadoc"
+      "$SSH_USER@$SSH_HOST:/$DEST/javadoc"
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,11 +16,11 @@ automatically with GitHub, so please don't submit PRs adding/changing translatio
 In order to develop CC: Tweaked, you'll need to download the source code and then run it. This is a pretty simple
 process. When building on Windows, Use `gradlew.bat` instead of `./gradlew`.

- - **Clone the repository:** `git clone https://github.com/SquidDev-CC/CC-Tweaked.git && cd CC-Tweaked`
+ - **Clone the repository:** `git clone https://github.com/cc-tweaked/CC-Tweaked.git && cd CC-Tweaked`
 - **Setup Forge:** `./gradlew build`
 - **Run Minecraft:** `./gradlew runClient` (or run the `GradleStart` class from your IDE).
 - **Optionally:** For small PRs (especially those only touching Lua code), it may be easier to use GitPod, which
-   provides a pre-configured environment: [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-2b2b2b?logo=gitpod)](https://gitpod.io/#https://github.com/SquidDev-CC/CC-Tweaked/)
+   provides a pre-configured environment: [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-2b2b2b?logo=gitpod)](https://gitpod.io/#https://github.com/cc-tweaked/CC-Tweaked/)

   Do note you will need to download the mod after compiling to test.

@@ -90,10 +90,11 @@ Before we get into writing tests, it's worth mentioning the various test suites

   These tests are run by the '"Core" Java' test suite, and so are also run with `./gradlew test`.

- - In-game (`./src/test/java/dan200/computercraft/ingame/`): These tests are run on an actual Minecraft server, using
-   [the same system Mojang do][mc-test]. The aim of these is to test in-game behaviour of blocks and peripherals.
+ - In-game (`./src/testMod/java/dan200/computercraft/ingame/`): These tests are run on an actual Minecraft server and client,
+   using [the same system Mojang do][mc-test]. The aim of these is to test in-game behaviour of blocks and peripherals.

-   These are run by `./gradlew testInGame`.
+   These are run by `./gradlew testClient` and `./gradlew testServer`. You may want to run the client under `xvfb-run`
+   or similar when running in a headless environment.

 ## CraftOS tests
 CraftOS's tests are written using a test system called "mcfly", heavily inspired by [busted] (and thus RSpec). Groups of
@@ -102,7 +103,7 @@ tests go inside `describe` blocks, and a single test goes inside `it`.
 Assertions are generally written using `expect` (inspired by Hamcrest and the like). For instance, `expect(foo):eq("bar")`
 asserts that your variable `foo` is equal to the expected value `"bar"`.

-[new-issue]: https://github.com/SquidDev-CC/CC-Tweaked/issues/new/choose "Create a new issue"
+[new-issue]: https://github.com/cc-tweaked/CC-Tweaked/issues/new/choose "Create a new issue"
 [community]: README.md#Community "Get in touch with the community."
 [checkstyle]: https://checkstyle.org/
 [illuaminate]: https://github.com/SquidDev/illuaminate/ "Illuaminate on GitHub"
--- a/README.md
+++ b/README.md
@@ -1,40 +1,11 @@
 # ![CC: Tweaked](doc/logo.png)
-[![Current build status](https://github.com/SquidDev-CC/CC-Tweaked/workflows/Build/badge.svg)](https://github.com/SquidDev-CC/CC-Tweaked/actions "Current build status") [![Download CC: Tweaked on CurseForge](http://cf.way2muchnoise.eu/title/cc-tweaked.svg)](https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked on CurseForge")
+[![Current build status](https://github.com/cc-tweaked/CC-Tweaked/workflows/Build/badge.svg)](https://github.com/cc-tweaked/CC-Tweaked/actions "Current build status") [![Download CC: Tweaked on CurseForge](http://cf.way2muchnoise.eu/title/cc-tweaked.svg)][CurseForge]

-CC: Tweaked is a fork of [ComputerCraft](https://github.com/dan200/ComputerCraft), adding programmable computers,
-turtles and more to Minecraft.
+CC: Tweaked is a mod for Minecraft which adds programmable computers, turtles and more to the game. A fork of the
+much-beloved [ComputerCraft], it continues its legacy with better performance, stability, and a wealth of new features.

-## What?
-ComputerCraft has always held a fond place in my heart: it's the mod which really got me into Minecraft, and it's the
-mod which has kept me playing it for many years. However, development of the original mod has slowed, as the original
-developers have had less time to work on the mod, and moved onto other projects and commitments.
-
-CC: Tweaked (or CC:T for short) is an attempt to continue ComputerCraft's legacy. It's not intended to be a competitor
-to CC, nor do I want to take it in a vastly different direction to the original mod. Instead, CC:T focuses on making the
-ComputerCraft experience as _solid_ as possible, ironing out any wrinkles that may have developed over time.
-
-## Features
-CC: Tweaked contains all the features of the latest version of ComputerCraft, as well as numerous fixes, performance
-improvements and several nifty additions. I'd recommend checking out [the releases page](https://github.com/SquidDev-CC/CC-Tweaked/releases)
-to see the full set of changes, but here's a couple of the more interesting additions:
-
- - Improvements to the `http` library, including websockets, support for other HTTP methods (`PUT`, `DELETE`, etc...)
-   and configurable limits on HTTP usage.
- - Full-block wired modems, allowing one to wrap non-solid peripherals (such as turtles, or chests if Plethora is
-   installed).
- - Pocket computers can be held like maps, allowing you to view the screen without entering a GUI.
- - Printed pages and books can be placed in item frames and held like maps.
- - Several profiling and administration tools for server owners, via the `/computercraft` command. This allows operators
-   to track which computers are hogging resources, turn on and shutdown multiple computers at once and interact with
-   computers remotely.
- - Closer emulation of standard Lua, adding the `debug` and `io` libraries. This also enables seeking within binary
-   files, meaning you don't need to read large files into memory.
- - Allow running multiple computers on multiple threads, reducing latency on worlds with many computers.
-
-## Relation to CCTweaks?
-This mod has nothing to do with CCTweaks, though there is no denying the name is a throwback to it. That being said,
-several features have been included, such as full block modems, the Cobalt runtime and map-like rendering for pocket
-computers.
+CC: Tweaked can be installed from [CurseForge] or [Modrinth]. It requires the [Minecraft Forge][forge] mod loader, but
+[versions are available for Fabric][ccrestitched].

 ## Contributing
 Any contribution is welcome, be that using the mod, reporting bugs or contributing code. If you want to get started
@@ -46,8 +17,7 @@ ComputerCraft we have a [forum](https://forums.computercraft.cc/) and [Discord g
 There's also a fairly populated, albeit quiet [IRC channel](http://webchat.esper.net/?channels=computercraft), if that's
 more your cup of tea.

-I'd generally recommend you don't contact me directly (email, DM, etc...) unless absolutely necessary (i.e. in order to
-report exploits). You'll get a far quicker response if you ask the whole community!
+We also host fairly comprehensive documentation at [tweaked.cc](https://tweaked.cc/ "The CC: Tweaked website").

 ## Using
 CC: Tweaked is hosted on my maven repo, and so is relatively simple to depend on. You may wish to add a soft (or hard)
@@ -56,7 +26,12 @@ on is present.

 ```groovy
 repositories {
-  maven { url 'https://squiddev.cc/maven/' }
+  maven {
+    url 'https://squiddev.cc/maven/'
+    content {
+      includeGroup 'org.squiddev'
+    }
+  }
 }

 dependencies {
@@ -70,3 +45,9 @@ exposing more features.

 We bundle the API sources with the jar, so documentation should be easily viewable within your editor. Alternatively,
 the generated documentation [can be browsed online](https://tweaked.cc/javadoc/).
+
+[computercraft]: https://github.com/dan200/ComputerCraft "ComputerCraft on GitHub"
+[curseforge]: https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked from CurseForge"
+[modrinth]: https://modrinth.com/mod/gu7yAYhd "Download CC: Tweaked from Modrinth"
+[forge]: https://files.minecraftforge.net/ "Download Minecraft Forge."
+[ccrestitched]: https://www.curseforge.com/minecraft/mc-mods/cc-restitched "Download CC: Restitched from CurseForge"
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,12 @@
 buildscript {
    repositories {
        mavenCentral()
-        maven {
-            name = "forge"
-            url = "https://maven.minecraftforge.net"
-        }
+        maven { url = "https://maven.minecraftforge.net" }
+        maven { url = 'https://maven.parchmentmc.org' }
    }
    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:5.0.24'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:5.1.+'
+        classpath 'org.parchmentmc:librarian:1.+'
    }
 }

@@ -18,11 +17,12 @@ plugins {
    id "com.github.hierynomus.license" version "0.16.1"
    id "com.matthewprenger.cursegradle" version "1.4.0"
    id "com.github.breadmoirai.github-release" version "2.2.12"
-    id "org.jetbrains.kotlin.jvm" version "1.3.72"
+    id "org.jetbrains.kotlin.jvm" version "1.6.0"
    id "com.modrinth.minotaur" version "1.2.1"
 }

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

 version = mod_version

@@ -45,10 +45,17 @@ tasks.withType(JavaExec).configureEach {
    }
 }

+sourceSets {
+    main.resources {
+        srcDir 'src/generated/resources'
+    }
+
+    testMod {}
+}
+
 minecraft {
    runs {
-        client {
-            workingDirectory project.file('run')
+        all {
            property 'forge.logging.markers', 'REGISTRIES'
            property 'forge.logging.console.level', 'debug'

@@ -59,28 +66,27 @@ minecraft {
            }
        }

+        client {
+            workingDirectory project.file('run')
+        }
+
        server {
            workingDirectory project.file("run/server")
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
            arg "--nogui"
-
-            mods {
-                computercraft {
-                    source sourceSets.main
-                }
-            }
        }

        data {
            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-
            args '--mod', 'computercraft', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+        }
+
+        testClient {
+            workingDirectory project.file('test-files/client')
+            parent runs.client
+
            mods {
-                computercraft {
-                    source sourceSets.main
+                cctest {
+                    source sourceSets.testMod
                }
            }
        }
@@ -88,26 +94,19 @@ minecraft {
        testServer {
            workingDirectory project.file('test-files/server')
            parent runs.server
-            arg "--nogui"

            mods {
                cctest {
-                    source sourceSets.test
+                    source sourceSets.testMod
                }
            }
        }
    }

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

    accessTransformer file('src/main/resources/META-INF/accesstransformer.cfg')
-    accessTransformer file('src/test/resources/META-INF/accesstransformer.cfg')
-}
-
-sourceSets {
-    main.resources {
-        srcDir 'src/generated/resources'
-    }
+    accessTransformer file('src/testMod/resources/META-INF/accesstransformer.cfg')
 }

 repositories {
@@ -120,8 +119,11 @@ repositories {

 configurations {
    shade
-    compile.extendsFrom shade
+    implementation.extendsFrom shade
    cctJavadoc
+
+    testModImplementation.extendsFrom(implementation)
+    testModImplementation.extendsFrom(testImplementation)
 }

 dependencies {
@@ -141,15 +143,21 @@ dependencies {
    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.0'
    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
    testImplementation 'org.hamcrest:hamcrest:2.2'
-    testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72'
-    testImplementation 'org.jetbrains.kotlin:kotlin-reflect:1.3.72'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
+    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'

-    cctJavadoc 'cc.tweaked:cct-javadoc:1.4.1'
+    testModImplementation sourceSets.main.output
+
+    cctJavadoc 'cc.tweaked:cct-javadoc:1.4.2'
 }

 // Compile tasks

+compileTestModJava {
+    dependsOn(compileJava)
+}
+
 javadoc {
    include "dan200/computercraft/api/**/*.java"
 }
@@ -185,7 +193,7 @@ jar {
    from configurations.shade.collect { it.isDirectory() ? it : zipTree(it) }
 }

-[compileJava, compileTestJava].forEach {
+[compileJava, compileTestJava, compileTestModJava].forEach {
    it.configure {
        options.compilerArgs << "-Xlint" << "-Xlint:-processing"
    }
@@ -280,7 +288,9 @@ task illuaminateDocs(type: Exec, dependsOn: [minifyWeb, luaJavadoc]) {
 }

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

@@ -318,7 +328,7 @@ license {
    }
 }

-[licenseTest, licenseFormatTest].forEach {
+[licenseTest, licenseFormatTest, licenseTestMod, licenseFormatTestMod].forEach {
    it.configure {
        include("**/*.java")
        header file('config/license/main.txt')
@@ -346,57 +356,64 @@ task setupServer(type: Copy) {
    group "test server"
    description "Sets up the environment for the test server."

-    from("src/test/server-files") {
+    from("src/testMod/server-files") {
        include "eula.txt"
        include "server.properties"
    }
    into "test-files/server"
 }

-tasks.register('testInGame', JavaExec.class).configure {
-    it.group('test server')
-    it.description("Runs tests on a temporary Minecraft server.")
-    it.dependsOn(setupServer, 'prepareRunTestServer', 'cleanTestInGame')
+["Client", "Server"].forEach { name ->
+    tasks.register("test$name", JavaExec.class).configure {
+        it.group('In-game tests')
+        it.description("Runs tests on a temporary Minecraft instance.")
+        it.dependsOn(setupServer, "prepareRunTest$name", "cleanTest$name", 'compileTestModJava')

-    // Copy from runTestServer. We do it in this slightly odd way as runTestServer
-    // isn't created until the task is configured (which is no good for us).
-    JavaExec exec = tasks.getByName('runTestServer')
-    exec.copyTo(it)
-    it.setClasspath(exec.getClasspath())
-    it.mainClass = exec.mainClass
-    it.setArgs(exec.getArgs())
+        // Copy from runTestServer. We do it in this slightly odd way as runTestServer
+        // isn't created until the task is configured (which is no good for us).
+        JavaExec exec = tasks.getByName("runTest$name")
+        exec.copyTo(it)
+        it.setClasspath(exec.getClasspath())
+        it.mainClass = exec.mainClass
+        it.setArgs(exec.getArgs())

-    it.systemProperty('forge.logging.console.level', 'info')
-    it.systemProperty('cctest.run', 'true')
+        it.systemProperty('forge.logging.console.level', 'info')
+        it.systemProperty('cctest.run', 'true')

-    // Jacoco and modlauncher don't play well together as the classes loaded in-game don't
-    // match up with those written to disk. We get Jacoco to dump all classes to disk, and
-    // use that when generating the report.
-    def coverageOut = new File(buildDir, 'jacocoClassDump/testInGame')
-    jacoco.applyTo(it)
-    it.jacoco.setIncludes(["dan200.computercraft.*"])
-    it.jacoco.setClassDumpDir(coverageOut)
-    it.outputs.dir(coverageOut)
-    // Older versions of modlauncher don't include a protection domain (and thus no code
-    // source). Jacoco skips such classes by default, so we need to explicitly include them.
-    it.jacoco.setIncludeNoLocationClasses(true)
-}
+        // Jacoco and modlauncher don't play well together as the classes loaded in-game don't
+        // match up with those written to disk. We get Jacoco to dump all classes to disk, and
+        // use that when generating the report.
+        def coverageOut = new File(buildDir, "jacocoClassDump/test$name")
+        jacoco.applyTo(it)
+        it.jacoco.setIncludes(["dan200.computercraft.*"])
+        it.jacoco.setClassDumpDir(coverageOut)
+        it.outputs.dir(coverageOut)
+        // Older versions of modlauncher don't include a protection domain (and thus no code
+        // source). Jacoco skips such classes by default, so we need to explicitly include them.
+        it.jacoco.setIncludeNoLocationClasses(true)
+    }

-tasks.register('jacocoTestInGameReport', JacocoReport.class).configure {
-    it.group('test server')
-    it.description('Generate coverage reports for in-game tests (testInGame)')
-    it.dependsOn('testInGame')
+    tasks.register("jacocoTest${name}Report", JacocoReport.class).configure {
+        it.group('In-game')
+        it.description("Generate coverage reports for test$name")
+        it.dependsOn("test$name")

-    it.executionData(new File(buildDir, 'jacoco/testInGame.exec'))
-    it.sourceDirectories.from(sourceSets.main.allJava.srcDirs)
-    it.classDirectories.from(new File(buildDir, 'jacocoClassDump/testInGame'))
+        it.executionData(new File(buildDir, "jacoco/test${name}.exec"))
+        it.sourceDirectories.from(sourceSets.main.allJava.srcDirs)
+        it.classDirectories.from(new File(buildDir, "jacocoClassDump/test$name"))

-    it.reports {
-        xml.enabled true
-        html.enabled true
+        it.reports {
+            xml.enabled true
+            html.enabled true
+        }
+    }
+
+    if (name != "Client" || project.findProperty('cc.tweaked.clientTests') == 'true') {
+        // Don't run client tests unless explicitly opted into them. They're a bit of a faff
+        // to run and pretty flakey.
+        check.dependsOn("jacocoTest${name}Report")
    }
 }
-check.dependsOn('jacocoTestInGameReport')


 // Upload tasks
@@ -446,11 +463,7 @@ curseforge {
    project {
        id = '282001'
        releaseType = 'release'
-        changelog = "Release notes can be found on the GitHub repository (https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})."
-
-        relations {
-            incompatible "computercraft"
-        }
+        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}"
    }
@@ -468,7 +481,7 @@ tasks.register('publishModrinth', TaskModrinthUpload.class).configure {
    versionNumber = "${project.mc_version}-${project.mod_version}"
    uploadFile = jar
    addGameVersion(project.mc_version)
-    changelog = "Release notes can be found on the [GitHub repository](https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_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')
 }

@@ -485,21 +498,21 @@ publishing {
            pom {
                name = 'CC: Tweaked'
                description = 'CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles and more to Minecraft.'
-                url = 'https://github.com/SquidDev-CC/CC-Tweaked'
+                url = 'https://github.com/cc-tweaked/CC-Tweaked'

                scm {
-                    url = 'https://github.com/SquidDev-CC/CC-Tweaked.git'
+                    url = 'https://github.com/cc-tweaked/CC-Tweaked.git'
                }

                issueManagement {
                    system = 'github'
-                    url = 'https://github.com/SquidDev-CC/CC-Tweaked/issues'
+                    url = 'https://github.com/cc-tweaked/CC-Tweaked/issues'
                }

                licenses {
                    license {
                        name = 'ComputerCraft Public License, Version 1.0'
-                        url = 'https://github.com/SquidDev-CC/CC-Tweaked/blob/mc-1.15.x/LICENSE'
+                        url = 'https://github.com/cc-tweaked/CC-Tweaked/blob/mc-1.15.x/LICENSE'
                    }
                }

@@ -524,7 +537,7 @@ publishing {

 githubRelease {
    token project.hasProperty('githubApiKey') ? project.githubApiKey : ''
-    owner 'SquidDev-CC'
+    owner 'cc-tweaked'
    repo 'CC-Tweaked'
    targetCommitish.set(project.provider({
        try {
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -149,8 +149,12 @@
            <property name="tokens" value="COMMA" />
        </module>
        <module name="WhitespaceAround">
-            <property name="allowEmptyConstructors" value="true" />
            <property name="ignoreEnhancedForColon" value="false" />
+            <!-- Allow empty functions -->
+            <property name="allowEmptyLambdas" value="true" />
+            <property name="allowEmptyMethods" value="true" />
+            <property name="allowEmptyConstructors" 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>
    </module>
--- a/config/pre-commit/config.yml
+++ b/config/pre-commit/config.yml
@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.2.0
+  rev: v4.0.1
  hooks:
  - id: trailing-whitespace
  - id: end-of-file-fixer
@@ -16,7 +16,7 @@ repos:
    exclude: "tsconfig\\.json$"

 - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
-  rev: 2.3.5
+  rev: 2.3.54
  hooks:
  - id: editorconfig-checker
    args: ['-disable-indentation']
@@ -50,6 +50,6 @@ exclude: |
  (?x)^(
    src/generated|
    src/test/resources/test-rom/data/json-parsing/|
-    src/test/server-files/|
+    src/testMod/server-files/|
    config/idea/
  )
--- a/doc/events/redstone.md
+++ b/doc/events/redstone.md
@@ -2,7 +2,7 @@
 module: [kind=event] redstone
 ---

-The @{redstone} event is fired whenever any redstone inputs on the computer change.
+The @{event!redstone} event is fired whenever any redstone inputs on the computer change.

 ## Example
 Prints a message when a redstone input changes:
--- a/doc/events/websocket_message.md
+++ b/doc/events/websocket_message.md
@@ -10,6 +10,7 @@ This event is normally handled by @{http.Websocket.receive}, but it can also be
 1. @{string}: The event name.
 2. @{string}: The URL of the WebSocket.
 3. @{string}: The contents of the message.
+4. @{boolean}: Whether this is a binary message.

 ## Example
 Prints a message sent by a WebSocket:
--- a/doc/images/basic-terminal.png
+++ b/doc/images/basic-terminal.png
--- a/doc/images/peripherals.png
+++ b/doc/images/peripherals.png
--- a/doc/images/turtle.png
+++ b/doc/images/turtle.png
--- a/doc/index.md
+++ b/doc/index.md
@@ -1,11 +1,55 @@
-# ![CC: Tweaked](logo.png) [![Download CC: Tweaked on CurseForge](https://cf.way2muchnoise.eu/title/cc-tweaked.svg)](https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked on CurseForge")
+# ![CC: Tweaked](logo.png)
+CC: Tweaked is a mod for Minecraft which adds programmable computers, turtles and more to the game. A fork of the
+much-beloved [ComputerCraft], it continues its legacy with better performance, stability, and a wealth of new features.

-CC: Tweaked is a fork of [ComputerCraft], adding programmable computers, turtles and more to Minecraft.
+CC: Tweaked can be installed from [CurseForge] or [Modrinth]. It requires the [Minecraft Forge][forge] mod loader, but
+[versions are available for Fabric][ccrestitched].

-This website contains documentation for all Lua libraries and APIs from the latest version of CC: Tweaked. This
-documentation is still in development, so will most likely be incomplete. If you've found something you think is wrong,
-or would like to help out [please get in touch on GitHub][gh].
+## Features
+Controlled using the [Lua programming language][lua], CC: Tweaked's computers provides all the tools you need to start
+writing code and automating your Minecraft world.

-[bug]: https://github.com/SquidDev-CC/CC-Tweaked/issues/new/choose
+![A ComputerCraft terminal open and ready to be programmed.](images/basic-terminal.png){.big-image}
+
+While computers are incredibly powerful, they're rather limited by their inability to move about. *Turtles* are the
+solution here. They can move about the world, placing and breaking blocks, swinging a sword to protect you from zombies,
+or whatever else you program them to!
+
+![A turtle tunneling in Minecraft.](images/turtle.png){.big-image}
+
+Not all problems can be solved with a pickaxe though, and so CC: Tweaked also provides a bunch of additional peripherals
+for your computers. You can play a tune with speakers, display text or images on a monitor, connect all your
+computers together with modems, and much more.
+
+Computers can now also interact with inventories such as chests, allowing you to build complex inventory and item
+management systems.
+
+![A chest's contents being read by a computer and displayed on a monitor.](images/peripherals.png){.big-image}
+
+## Getting Started
+While ComputerCraft is lovely for both experienced programmers and for people who have never coded before, it can be a
+little daunting getting started. Thankfully, there's several fantastic tutorials out there:
+
+ - [Direwolf20's ComputerCraft tutorials](https://www.youtube.com/watch?v=wrUHUhfCY5A "ComputerCraft Tutorial Episode 1 - HELP! and Hello World")
+ - [Sethbling's ComputerCraft series](https://www.youtube.com/watch?v=DSsx4VSe-Uk "Programming Tutorial with Minecraft Turtles -- Ep. 1: Intro to Turtles and If-Then-Else_End")
+ - [Lyqyd's Computer Basics 1](http://www.computercraft.info/forums2/index.php?/topic/15033-computer-basics-i/ "Computer Basics I")
+
+Once you're a little more familiar with the mod, the sidebar and links below provide more detailed documentation on the
+various APIs and peripherals provided by the mod.
+
+If you get stuck, do pop in to the [Minecraft Computer Mod Discord guild][discord] or ComputerCraft's
+[IRC channel][irc].
+
+## Get Involved
+CC: Tweaked lives on [GitHub]. If you've got any ideas, feedback or bugs please do [create an issue][bug].
+
+[github]: https://github.com/cc-tweaked/CC-Tweaked/ "CC: Tweaked on GitHub"
+[bug]: https://github.com/cc-tweaked/CC-Tweaked/issues/new/choose
 [computercraft]: https://github.com/dan200/ComputerCraft "ComputerCraft on GitHub"
-[gh]: https://github.com/SquidDev-CC/CC-Tweaked "CC:Tweaked on GitHub"
+[curseforge]: https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked from CurseForge"
+[modrinth]: https://modrinth.com/mod/gu7yAYhd "Download CC: Tweaked from Modrinth"
+[forge]: https://files.minecraftforge.net/ "Download Minecraft Forge."
+[ccrestitched]: https://www.curseforge.com/minecraft/mc-mods/cc-restitched "Download CC: Restitched from CurseForge"
+[lua]: https://www.lua.org/ "Lua's main website"
+[discord]: https://discord.computercraft.cc "The Minecraft Computer Mods Discord"
+[irc]: http://webchat.esper.net/?channels=computercraft "IRC webchat on EsperNet"
--- a/doc/logo.png
+++ b/doc/logo.png
--- a/doc/stub/fs.lua
+++ b/doc/stub/fs.lua
@@ -12,6 +12,7 @@
 -- @treturn boolean If the path is mounted, rather than a normal file/folder.
 -- @throws If the path does not exist.
 -- @see getDrive
+-- @since 1.87.0
 function isDriveRoot(path) end

 --[[- Provides completion for a file or directory name, suitable for use with
@@ -30,5 +31,6 @@ included in the returned list.
@tparam[opt] boolean include_dirs When @{false}, "raw" directories will not be
 included in the returned list.
@treturn { string... } A list of possible completion candidates.
+@since 1.74
 ]]
 function complete(path, location, include_files, include_dirs) end
--- a/doc/stub/http.lua
+++ b/doc/stub/http.lua
@@ -2,6 +2,7 @@
 -- receiving data from them.
 --
 -- @module http
+-- @since 1.1

 --- Asynchronously make a HTTP request to the given url.
 --
@@ -35,6 +36,11 @@
 --
 -- @see http.get  For a synchronous way to make GET requests.
 -- @see http.post For a synchronous way to make POST requests.
+--
+-- @changed 1.63 Added argument for headers.
+-- @changed 1.80pr1 Added argument for binary handles.
+-- @changed 1.80pr1.6 Added support for table argument.
+-- @changed 1.86.0 Added PATCH and TRACE methods.
 function request(...) end

 --- Make a HTTP GET request to the given url.
@@ -58,6 +64,12 @@ function request(...) end
 -- @treturn string A message detailing why the request failed.
 -- @treturn Response|nil The failing http response, if available.
 --
+-- @changed 1.63 Added argument for headers.
+-- @changed 1.80pr1 Response handles are now returned on error if available.
+-- @changed 1.80pr1 Added argument for binary handles.
+-- @changed 1.80pr1.6 Added support for table argument.
+-- @changed 1.86.0 Added PATCH and TRACE methods.
+--
 -- @usage Make a request to [example.tweaked.cc](https://example.tweaked.cc),
 -- and print the returned page.
 -- ```lua
@@ -89,6 +101,13 @@ function get(...) end
 -- error or connection timeout.
 -- @treturn string A message detailing why the request failed.
 -- @treturn Response|nil The failing http response, if available.
+--
+-- @since 1.31
+-- @changed 1.63 Added argument for headers.
+-- @changed 1.80pr1 Response handles are now returned on error if available.
+-- @changed 1.80pr1 Added argument for binary handles.
+-- @changed 1.80pr1.6 Added support for table argument.
+-- @changed 1.86.0 Added PATCH and TRACE methods.
 function post(...) end

 --- Asynchronously determine whether a URL can be requested.
@@ -142,6 +161,9 @@ function checkURL(url) end
 -- @treturn Websocket The websocket connection.
 -- @treturn[2] false If the websocket connection failed.
 -- @treturn string An error message describing why the connection failed.
+-- @since 1.80pr1.1
+-- @changed 1.80pr1.3 No longer asynchronous.
+-- @changed 1.95.3 Added User-Agent to default headers.
 function websocket(url, headers) end

 --- Asynchronously open a websocket.
@@ -154,4 +176,6 @@ function websocket(url, headers) end
 -- `ws://` or `wss://` protocol.
 -- @tparam[opt] { [string] = string } headers Additional headers to send as part
 -- of the initial websocket connection.
+-- @since 1.80pr1.3
+-- @changed 1.95.3 Added User-Agent to default headers.
 function websocketAsync(url, headers) end
--- a/doc/stub/os.lua
+++ b/doc/stub/os.lua
@@ -8,6 +8,7 @@ variables and functions exported by it will by available through the use of

@tparam string path The path of the API to load.
@treturn boolean Whether or not the API was successfully loaded.
+@since 1.2

@deprecated When possible it's best to avoid using this function. It pollutes
 the global table and can mask errors.
@@ -21,6 +22,7 @@ function loadAPI(path) end
 -- This effectively removes the specified table from `_G`.
 --
 -- @tparam string name The name of the API to unload.
+-- @since 1.2
 -- @deprecated See @{os.loadAPI} for why.
 function unloadAPI(name) end

@@ -58,6 +60,7 @@ event, printing the error "Terminated".
    end

@see os.pullEventRaw To pull the terminate event.
+@changed 1.3 Added filter argument.
 ]]
 function pullEvent(filter) end

--- a/doc/stub/turtle.lua
+++ b/doc/stub/turtle.lua
@@ -9,5 +9,6 @@ empty, including those outside the crafting "grid".
@treturn[1] true If crafting succeeds.
@treturn[2] false If crafting fails.
@treturn string A string describing why crafting failed.
+@since 1.4
 ]]
 function craft(limit) end
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,8 @@
 # Mod properties
-mod_version=1.98.1
+mod_version=1.99.0

 # Minecraft properties (update mods.toml when changing)
 mc_version=1.16.5
+mapping_version=2021.08.08
 forge_version=36.1.0
 # NO SERIOUSLY, UPDATE mods.toml WHEN CHANGING
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/269
+++ b/269
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh

 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #

 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################

 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum

 warn () {
    echo "$*"
-}
+} >&2

 die () {
    echo
    echo "$*"
    echo
    exit 1
-}
+} >&2

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
    else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD="java"
+    JAVACMD=java
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
 fi

-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.

-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'

 exec "$JAVACMD" "$@"
--- a/illuaminate.sexp
+++ b/illuaminate.sexp
@@ -18,7 +18,7 @@
    (title "CC: Tweaked")
    (logo src/main/resources/pack.png)
    (url https://tweaked.cc/)
-    (source-link https://github.com/SquidDev-CC/CC-Tweaked/blob/${commit}/${path}#L${line})
+    (source-link https://github.com/cc-tweaked/CC-Tweaked/blob/${commit}/${path}#L${line})

    (styles src/web/styles.css)
    (scripts build/rollup/index.js)
@@ -61,6 +61,8 @@
      (table space)
      (index no-space))

+    (allow-clarifying-parens true)
+
    ;; colours imports from colors, and we don't handle that right now.
    ;; keys is entirely dynamic, so we skip it.
    (dynamic-modules colours keys _G)
@@ -69,6 +71,7 @@
      :max
      _CC_DEFAULT_SETTINGS
      _CC_DISABLE_LUA51_FEATURES
+      _HOST
      ;; Ideally we'd pick these up from bios.lua, but illuaminate currently
      ;; isn't smart enough.
      sleep write printError read rs)))
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,17 +13,52 @@
        "tslib": "^2.0.3"
      },
      "devDependencies": {
-        "@rollup/plugin-typescript": "^6.1.0",
+        "@rollup/plugin-typescript": "^8.2.5",
        "requirejs": "^2.3.6",
        "rollup": "^2.33.1",
-        "terser": "^5.3.8",
+        "rollup-plugin-terser": "^7.0.2",
        "typescript": "^4.0.5"
      }
    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",
+      "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.16.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.15.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
+      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz",
+      "integrity": "sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.15.7",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
    "node_modules/@rollup/plugin-typescript": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-6.1.0.tgz",
-      "integrity": "sha512-hJxaiE6WyNOsK+fZpbFh9CUijZYqPQuAOWO5khaGTUkM8DYNNyA2TDlgamecE+qLOG1G1+CwbWMAx3rbqpp6xQ==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.3.0.tgz",
+      "integrity": "sha512-I5FpSvLbtAdwJ+naznv+B4sjXZUcIvLLceYpITAn7wAP8W0wqc5noLdGIp9HGVntNhRWXctwPYrSSFQxtl0FPA==",
      "dev": true,
      "dependencies": {
        "@rollup/pluginutils": "^3.1.0",
@@ -31,6 +66,11 @@
      },
      "engines": {
        "node": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.14.0",
+        "tslib": "*",
+        "typescript": ">=3.7.0"
      }
    },
    "node_modules/@rollup/pluginutils": {
@@ -45,6 +85,9 @@
      },
      "engines": {
        "node": ">= 8.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0"
      }
    },
    "node_modules/@types/estree": {
@@ -53,10 +96,57 @@
      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
      "dev": true
    },
+    "node_modules/@types/node": {
+      "version": "16.11.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.10.tgz",
+      "integrity": "sha512-3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA==",
+      "dev": true
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
      "dev": true
    },
    "node_modules/commander": {
@@ -65,6 +155,15 @@
      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
      "dev": true
    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
    "node_modules/estree-walker": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
@@ -72,10 +171,11 @@
      "dev": true
    },
    "node_modules/fsevents": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
      "dev": true,
+      "hasInstallScript": true,
      "optional": true,
      "os": [
        "darwin"
@@ -102,34 +202,109 @@
        "node": ">= 0.4.0"
      }
    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/is-core-module": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz",
-      "integrity": "sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
+      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
      "dev": true,
      "dependencies": {
        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/jest-worker": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "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/path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
      "dev": true
    },
    "node_modules/picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
      "dev": true,
      "engines": {
        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
      }
    },
    "node_modules/preact": {
-      "version": "10.5.5",
-      "resolved": "https://registry.npmjs.org/preact/-/preact-10.5.5.tgz",
-      "integrity": "sha512-5ONLNH1SXMzzbQoExZX4TELemNt+TEDb622xXFNfZngjjM9qtrzseJt+EfiUu4TZ6EJ95X5sE1ES4yqHFSIdhg=="
+      "version": "10.6.1",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.6.1.tgz",
+      "integrity": "sha512-ydCg+ISIq70vqiThvNWStZWLRjR9U2awP/JAmGdWUKm9+Tyuy+MqVdAIyEByeIspAVtD4GWC/SJtxO8XD4knVA==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/preact"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
    },
    "node_modules/requirejs": {
      "version": "2.3.6",
@@ -145,19 +320,22 @@
      }
    },
    "node_modules/resolve": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
-      "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
      "dev": true,
      "dependencies": {
-        "is-core-module": "^2.0.0",
+        "is-core-module": "^2.2.0",
        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/rollup": {
-      "version": "2.33.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.33.1.tgz",
-      "integrity": "sha512-uY4O/IoL9oNW8MMcbA5hcOaz6tZTMIh7qJHx/tzIJm+n1wLoY38BLn6fuy7DhR57oNFLMbDQtDeJoFURt5933w==",
+      "version": "2.60.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.60.1.tgz",
+      "integrity": "sha512-akwfnpjY0rXEDSn1UTVfKXJhPsEBu+imi1gqBA1ZkHGydUnkV/fWCC90P7rDaLEW8KTwBcS1G3N4893Ndz+jwg==",
      "dev": true,
      "bin": {
        "rollup": "dist/bin/rollup"
@@ -166,7 +344,51 @@
        "node": ">=10.0.0"
      },
      "optionalDependencies": {
-        "fsevents": "~2.1.2"
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/rollup-plugin-terser": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz",
+      "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "jest-worker": "^26.2.1",
+        "serialize-javascript": "^4.0.0",
+        "terser": "^5.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.0.0"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/serialize-javascript": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
      }
    },
    "node_modules/source-map": {
@@ -179,9 +401,9 @@
      }
    },
    "node_modules/source-map-support": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
      "dev": true,
      "dependencies": {
        "buffer-from": "^1.0.0",
@@ -197,32 +419,52 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/terser": {
-      "version": "5.3.8",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.8.tgz",
-      "integrity": "sha512-zVotuHoIfnYjtlurOouTazciEfL7V38QMAOhGqpXDEg6yT13cF4+fEP9b0rrCEQTn+tT46uxgFsTZzhygk+CzQ==",
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz",
+      "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==",
      "dev": true,
      "dependencies": {
        "commander": "^2.20.0",
        "source-map": "~0.7.2",
-        "source-map-support": "~0.5.19"
+        "source-map-support": "~0.5.20"
      },
      "bin": {
        "terser": "bin/terser"
      },
      "engines": {
        "node": ">=10"
+      },
+      "peerDependencies": {
+        "acorn": "^8.5.0"
+      },
+      "peerDependenciesMeta": {
+        "acorn": {
+          "optional": true
+        }
      }
    },
    "node_modules/tslib": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
    },
    "node_modules/typescript": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz",
-      "integrity": "sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==",
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz",
+      "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==",
      "dev": true,
      "bin": {
        "tsc": "bin/tsc",
@@ -234,10 +476,36 @@
    }
  },
  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",
+      "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.16.0"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.15.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
+      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
+      "dev": true
+    },
+    "@babel/highlight": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz",
+      "integrity": "sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.15.7",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
    "@rollup/plugin-typescript": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-6.1.0.tgz",
-      "integrity": "sha512-hJxaiE6WyNOsK+fZpbFh9CUijZYqPQuAOWO5khaGTUkM8DYNNyA2TDlgamecE+qLOG1G1+CwbWMAx3rbqpp6xQ==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.3.0.tgz",
+      "integrity": "sha512-I5FpSvLbtAdwJ+naznv+B4sjXZUcIvLLceYpITAn7wAP8W0wqc5noLdGIp9HGVntNhRWXctwPYrSSFQxtl0FPA==",
      "dev": true,
      "requires": {
        "@rollup/pluginutils": "^3.1.0",
@@ -261,10 +529,51 @@
      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
      "dev": true
    },
+    "@types/node": {
+      "version": "16.11.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.10.tgz",
+      "integrity": "sha512-3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
    "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
      "dev": true
    },
    "commander": {
@@ -273,6 +582,12 @@
      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
      "dev": true
    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
    "estree-walker": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
@@ -280,9 +595,9 @@
      "dev": true
    },
    "fsevents": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
      "dev": true,
      "optional": true
    },
@@ -301,31 +616,86 @@
        "function-bind": "^1.1.1"
      }
    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
    "is-core-module": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz",
-      "integrity": "sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
+      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
      "dev": true,
      "requires": {
        "has": "^1.0.3"
      }
    },
+    "jest-worker": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "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
+    },
    "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
      "dev": true
    },
    "picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
      "dev": true
    },
    "preact": {
-      "version": "10.5.5",
-      "resolved": "https://registry.npmjs.org/preact/-/preact-10.5.5.tgz",
-      "integrity": "sha512-5ONLNH1SXMzzbQoExZX4TELemNt+TEDb622xXFNfZngjjM9qtrzseJt+EfiUu4TZ6EJ95X5sE1ES4yqHFSIdhg=="
+      "version": "10.6.1",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.6.1.tgz",
+      "integrity": "sha512-ydCg+ISIq70vqiThvNWStZWLRjR9U2awP/JAmGdWUKm9+Tyuy+MqVdAIyEByeIspAVtD4GWC/SJtxO8XD4knVA=="
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
    },
    "requirejs": {
      "version": "2.3.6",
@@ -334,22 +704,49 @@
      "dev": true
    },
    "resolve": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
-      "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
      "dev": true,
      "requires": {
-        "is-core-module": "^2.0.0",
+        "is-core-module": "^2.2.0",
        "path-parse": "^1.0.6"
      }
    },
    "rollup": {
-      "version": "2.33.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.33.1.tgz",
-      "integrity": "sha512-uY4O/IoL9oNW8MMcbA5hcOaz6tZTMIh7qJHx/tzIJm+n1wLoY38BLn6fuy7DhR57oNFLMbDQtDeJoFURt5933w==",
+      "version": "2.60.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.60.1.tgz",
+      "integrity": "sha512-akwfnpjY0rXEDSn1UTVfKXJhPsEBu+imi1gqBA1ZkHGydUnkV/fWCC90P7rDaLEW8KTwBcS1G3N4893Ndz+jwg==",
      "dev": true,
      "requires": {
-        "fsevents": "~2.1.2"
+        "fsevents": "~2.3.2"
+      }
+    },
+    "rollup-plugin-terser": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz",
+      "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.10.4",
+        "jest-worker": "^26.2.1",
+        "serialize-javascript": "^4.0.0",
+        "terser": "^5.0.0"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true
+    },
+    "serialize-javascript": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.1.0"
      }
    },
    "source-map": {
@@ -359,9 +756,9 @@
      "dev": true
    },
    "source-map-support": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
      "dev": true,
      "requires": {
        "buffer-from": "^1.0.0",
@@ -376,26 +773,35 @@
        }
      }
    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
    "terser": {
-      "version": "5.3.8",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.8.tgz",
-      "integrity": "sha512-zVotuHoIfnYjtlurOouTazciEfL7V38QMAOhGqpXDEg6yT13cF4+fEP9b0rrCEQTn+tT46uxgFsTZzhygk+CzQ==",
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz",
+      "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==",
      "dev": true,
      "requires": {
        "commander": "^2.20.0",
        "source-map": "~0.7.2",
-        "source-map-support": "~0.5.19"
+        "source-map-support": "~0.5.20"
      }
    },
    "tslib": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
    },
    "typescript": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz",
-      "integrity": "sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==",
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz",
+      "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==",
      "dev": true
    }
  }
--- a/package.json
+++ b/package.json
@@ -9,10 +9,10 @@
    "tslib": "^2.0.3"
  },
  "devDependencies": {
-    "@rollup/plugin-typescript": "^6.1.0",
+    "@rollup/plugin-typescript": "^8.2.5",
    "requirejs": "^2.3.6",
    "rollup": "^2.33.1",
-    "terser": "^5.3.8",
+    "rollup-plugin-terser": "^7.0.2",
    "typescript": "^4.0.5"
  }
 }
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,7 +1,8 @@
-import { readFileSync, promises as fs } from "fs";
+import { readFileSync    } from "fs";
 import path from "path";

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

 const input = "src/web";
 const requirejs = readFileSync("node_modules/requirejs/require.js");
@@ -12,7 +13,14 @@ export default {
        file: "build/rollup/index.js",
        // We bundle requirejs (and config) into the header. It's rather gross
        // but also works reasonably well.
-        banner: `${requirejs}\nrequire.config({ paths: { copycat: "https://copy-cat.squiddev.cc" } });`,
+        // Also suffix a ?v=${date} onto the end in the event we need to require a specific copy-cat version.
+        banner: `
+            ${requirejs}
+            require.config({
+                paths: { copycat: "https://copy-cat.squiddev.cc" },
+                urlArgs: function(id) { return id == "copycat/embed" ? "?v=20211127" : ""; }
+            });
+        `,
        format: "amd",
        preferConst: true,
        amd: {
@@ -27,22 +35,6 @@ export default {

        {
            name: "cc-tweaked",
-            async options(options) {
-                // Generate .d.ts files for all /mount files. This is the worst way to do it,
-                // but we need to run before the TS pass.
-                const template = "declare const contents : string;\nexport default contents;\n";
-                const files = await fs.readdir(`${input}/mount`);
-
-                await Promise.all(files
-                    .filter(x => path.extname(x) !== ".ts")
-                    .map(async file => {
-                        const path = `${input}/mount/${file}.d.ts`;
-                        const contents = await fs.readFile(path, { encoding: "utf-8" }).catch(() => "");
-                        if (contents !== template) await fs.writeFile(path, template);
-                    })
-                );
-                return options;
-            },
            async transform(code, file) {
                // Allow loading files in /mount.
                const ext = path.extname(file);
@@ -50,6 +42,8 @@ export default {
                    ? `export default ${JSON.stringify(code)};\n`
                    : null;
            },
-        }
+        },
+
+        terser(),
    ],
 };
--- a/src/generated/resources/assets/computercraft/blockstates/speaker.json
+++ b/src/generated/resources/assets/computercraft/blockstates/speaker.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=north": {
+      "model": "computercraft:block/speaker"
+    },
+    "facing=south": {
+      "model": "computercraft:block/speaker",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "computercraft:block/speaker",
+      "y": 270
+    },
+    "facing=east": {
+      "model": "computercraft:block/speaker",
+      "y": 90
+    }
+  }
+}
--- a/src/generated/resources/assets/computercraft/blockstates/turtle_advanced.json
+++ b/src/generated/resources/assets/computercraft/blockstates/turtle_advanced.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=north": {
+      "model": "computercraft:block/turtle_advanced"
+    },
+    "facing=south": {
+      "model": "computercraft:block/turtle_advanced",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "computercraft:block/turtle_advanced",
+      "y": 270
+    },
+    "facing=east": {
+      "model": "computercraft:block/turtle_advanced",
+      "y": 90
+    }
+  }
+}
--- a/src/generated/resources/assets/computercraft/blockstates/turtle_normal.json
+++ b/src/generated/resources/assets/computercraft/blockstates/turtle_normal.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=north": {
+      "model": "computercraft:block/turtle_normal"
+    },
+    "facing=south": {
+      "model": "computercraft:block/turtle_normal",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "computercraft:block/turtle_normal",
+      "y": 270
+    },
+    "facing=east": {
+      "model": "computercraft:block/turtle_normal",
+      "y": 90
+    }
+  }
+}
--- a/src/generated/resources/assets/computercraft/blockstates/wired_modem_full.json
+++ b/src/generated/resources/assets/computercraft/blockstates/wired_modem_full.json
@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "modem=false,peripheral=false": {
+      "model": "computercraft:block/wired_modem_full_off"
+    },
+    "modem=true,peripheral=false": {
+      "model": "computercraft:block/wired_modem_full_on"
+    },
+    "modem=false,peripheral=true": {
+      "model": "computercraft:block/wired_modem_full_off_peripheral"
+    },
+    "modem=true,peripheral=true": {
+      "model": "computercraft:block/wired_modem_full_on_peripheral"
+    }
+  }
+}
--- a/src/generated/resources/assets/computercraft/blockstates/wireless_modem_advanced.json
+++ b/src/generated/resources/assets/computercraft/blockstates/wireless_modem_advanced.json
@@ -0,0 +1,54 @@
+{
+  "variants": {
+    "facing=down,on=false": {
+      "model": "computercraft:block/wireless_modem_advanced_off",
+      "x": 90,
+      "y": 90
+    },
+    "facing=up,on=false": {
+      "model": "computercraft:block/wireless_modem_advanced_off",
+      "x": 270,
+      "y": 90
+    },
+    "facing=north,on=false": {
+      "model": "computercraft:block/wireless_modem_advanced_off"
+    },
+    "facing=south,on=false": {
+      "model": "computercraft:block/wireless_modem_advanced_off",
+      "y": 180
+    },
+    "facing=west,on=false": {
+      "model": "computercraft:block/wireless_modem_advanced_off",
+      "y": 270
+    },
+    "facing=east,on=false": {
+      "model": "computercraft:block/wireless_modem_advanced_off",
+      "y": 90
+    },
+    "facing=down,on=true": {
+      "model": "computercraft:block/wireless_modem_advanced_on",
+      "x": 90,
+      "y": 90
+    },
+    "facing=up,on=true": {
+      "model": "computercraft:block/wireless_modem_advanced_on",
+      "x": 270,
+      "y": 90
+    },
+    "facing=north,on=true": {
+      "model": "computercraft:block/wireless_modem_advanced_on"
+    },
+    "facing=south,on=true": {
+      "model": "computercraft:block/wireless_modem_advanced_on",
+      "y": 180
+    },
+    "facing=west,on=true": {
+      "model": "computercraft:block/wireless_modem_advanced_on",
+      "y": 270
+    },
+    "facing=east,on=true": {
+      "model": "computercraft:block/wireless_modem_advanced_on",
+      "y": 90
+    }
+  }
+}
--- a/src/generated/resources/assets/computercraft/blockstates/wireless_modem_normal.json
+++ b/src/generated/resources/assets/computercraft/blockstates/wireless_modem_normal.json
@@ -0,0 +1,54 @@
+{
+  "variants": {
+    "facing=down,on=false": {
+      "model": "computercraft:block/wireless_modem_normal_off",
+      "x": 90,
+      "y": 90
+    },
+    "facing=up,on=false": {
+      "model": "computercraft:block/wireless_modem_normal_off",
+      "x": 270,
+      "y": 90
+    },
+    "facing=north,on=false": {
+      "model": "computercraft:block/wireless_modem_normal_off"
+    },
+    "facing=south,on=false": {
+      "model": "computercraft:block/wireless_modem_normal_off",
+      "y": 180
+    },
+    "facing=west,on=false": {
+      "model": "computercraft:block/wireless_modem_normal_off",
+      "y": 270
+    },
+    "facing=east,on=false": {
+      "model": "computercraft:block/wireless_modem_normal_off",
+      "y": 90
+    },
+    "facing=down,on=true": {
+      "model": "computercraft:block/wireless_modem_normal_on",
+      "x": 90,
+      "y": 90
+    },
+    "facing=up,on=true": {
+      "model": "computercraft:block/wireless_modem_normal_on",
+      "x": 270,
+      "y": 90
+    },
+    "facing=north,on=true": {
+      "model": "computercraft:block/wireless_modem_normal_on"
+    },
+    "facing=south,on=true": {
+      "model": "computercraft:block/wireless_modem_normal_on",
+      "y": 180
+    },
+    "facing=west,on=true": {
+      "model": "computercraft:block/wireless_modem_normal_on",
+      "y": 270
+    },
+    "facing=east,on=true": {
+      "model": "computercraft:block/wireless_modem_normal_on",
+      "y": 90
+    }
+  }
+}
--- a/src/generated/resources/assets/computercraft/models/block/computer_advanced_blinking.json
+++ b/src/generated/resources/assets/computercraft/models/block/computer_advanced_blinking.json
@@ -1,8 +1,8 @@
 {
-  "parent": "block/orientable",
+  "parent": "minecraft:block/orientable",
  "textures": {
-    "top": "computercraft:block/computer_advanced_top",
    "side": "computercraft:block/computer_advanced_side",
-    "front": "computercraft:block/computer_advanced_front_blink"
+    "front": "computercraft:block/computer_advanced_front_blink",
+    "top": "computercraft:block/computer_advanced_top"
  }
 }
--- a/src/generated/resources/assets/computercraft/models/block/computer_advanced_off.json
+++ b/src/generated/resources/assets/computercraft/models/block/computer_advanced_off.json
@@ -1,8 +1,8 @@
 {
-  "parent": "block/orientable",
+  "parent": "minecraft:block/orientable",
  "textures": {
-    "top": "computercraft:block/computer_advanced_top",
    "side": "computercraft:block/computer_advanced_side",
-    "front": "computercraft:block/computer_advanced_front"
+    "front": "computercraft:block/computer_advanced_front",
+    "top": "computercraft:block/computer_advanced_top"
  }
 }
--- a/src/generated/resources/assets/computercraft/models/block/computer_advanced_on.json
+++ b/src/generated/resources/assets/computercraft/models/block/computer_advanced_on.json
@@ -1,8 +1,8 @@
 {
-  "parent": "block/orientable",
+  "parent": "minecraft:block/orientable",
  "textures": {
-    "top": "computercraft:block/computer_advanced_top",
    "side": "computercraft:block/computer_advanced_side",
-    "front": "computercraft:block/computer_advanced_front_on"
+    "front": "computercraft:block/computer_advanced_front_on",
+    "top": "computercraft:block/computer_advanced_top"
  }
 }
--- a/src/generated/resources/assets/computercraft/models/block/computer_command_blinking.json
+++ b/src/generated/resources/assets/computercraft/models/block/computer_command_blinking.json
@@ -1,8 +1,8 @@
 {
-  "parent": "block/orientable",
+  "parent": "minecraft:block/orientable",
  "textures": {
-    "top": "computercraft:block/computer_command_top",
    "side": "computercraft:block/computer_command_side",
-    "front": "computercraft:block/computer_command_front_blink"
+    "front": "computercraft:block/computer_command_front_blink",
+    "top": "computercraft:block/computer_command_top"
  }
 }
--- a/src/generated/resources/assets/computercraft/models/block/computer_command_off.json
+++ b/src/generated/resources/assets/computercraft/models/block/computer_command_off.json
@@ -1,8 +1,8 @@
 {
-  "parent": "block/orientable",
+  "parent": "minecraft:block/orientable",
  "textures": {
-    "top": "computercraft:block/computer_command_top",
    "side": "computercraft:block/computer_command_side",
-    "front": "computercraft:block/computer_command_front"
+    "front": "computercraft:block/computer_command_front",
+    "top": "computercraft:block/computer_command_top"
  }
 }
--- a/src/generated/resources/assets/computercraft/models/block/computer_command_on.json
+++ b/src/generated/resources/assets/computercraft/models/block/computer_command_on.json
@@ -1,8 +1,8 @@
 {
-  "parent": "block/orientable",
+  "parent": "minecraft:block/orientable",
  "textures": {
-    "top": "computercraft:block/computer_command_top",
    "side": "computercraft:block/computer_command_side",
-    "front": "computercraft:block/computer_command_front_on"
+    "front": "computercraft:block/computer_command_front_on",
+    "top": "computercraft:block/computer_command_top"
  }
 }
--- a/src/generated/resources/assets/computercraft/models/block/computer_normal_blinking.json
+++ b/src/generated/resources/assets/computercraft/models/block/computer_normal_blinking.json
@@ -1,8 +1,8 @@
 {
-  "parent": "block/orientable",
+  "parent": "minecraft:block/orientable",
  "textures": {
-    "top": "computercraft:block/computer_normal_top",
    "side": "computercraft:block/computer_normal_side",
-    "front": "computercraft:block/computer_normal_front_blink"
+    "front": "computercraft:block/computer_normal_front_blink",
+    "top": "computercraft:block/computer_normal_top"
  }
 }
--- a/src/generated/resources/assets/computercraft/models/block/computer_normal_off.json
+++ b/src/generated/resources/assets/computercraft/models/block/computer_normal_off.json
@@ -1,8 +1,8 @@
 {
-  "parent": "block/orientable",
+  "parent": "minecraft:block/orientable",
  "textures": {
-    "top": "computercraft:block/computer_normal_top",
    "side": "computercraft:block/computer_normal_side",
-    "front": "computercraft:block/computer_normal_front"
+    "front": "computercraft:block/computer_normal_front",
+    "top": "computercraft:block/computer_normal_top"
  }
 }
--- a/src/generated/resources/assets/computercraft/models/block/computer_normal_on.json
+++ b/src/generated/resources/assets/computercraft/models/block/computer_normal_on.json
@@ -1,8 +1,8 @@
 {
-  "parent": "block/orientable",
+  "parent": "minecraft:block/orientable",
  "textures": {
-    "top": "computercraft:block/computer_normal_top",
    "side": "computercraft:block/computer_normal_side",
-    "front": "computercraft:block/computer_normal_front_on"
+    "front": "computercraft:block/computer_normal_front_on",
+    "top": "computercraft:block/computer_normal_top"
  }
 }
--- a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_item.json
+++ b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_item.json
@@ -0,0 +1,8 @@
+{
+  "parent": "minecraft:block/orientable",
+  "textures": {
+    "side": "computercraft:block/monitor_advanced_4",
+    "front": "computercraft:block/monitor_advanced_15",
+    "top": "computercraft:block/monitor_advanced_0"
+  }
+}
--- a/src/generated/resources/assets/computercraft/models/block/monitor_normal_item.json
+++ b/src/generated/resources/assets/computercraft/models/block/monitor_normal_item.json
@@ -0,0 +1,8 @@
+{
+  "parent": "minecraft:block/orientable",
+  "textures": {
+    "side": "computercraft:block/monitor_normal_4",
+    "front": "computercraft:block/monitor_normal_15",
+    "top": "computercraft:block/monitor_normal_0"
+  }
+}
--- a/src/generated/resources/assets/computercraft/models/block/speaker.json
+++ b/src/generated/resources/assets/computercraft/models/block/speaker.json
@@ -0,0 +1,8 @@
+{
+  "parent": "minecraft:block/orientable",
+  "textures": {
+    "side": "computercraft:block/speaker_side",
+    "front": "computercraft:block/speaker_front",
+    "top": "computercraft:block/speaker_top"
+  }
+}
--- a/src/generated/resources/assets/computercraft/models/block/turtle_advanced.json
+++ b/src/generated/resources/assets/computercraft/models/block/turtle_advanced.json
@@ -0,0 +1,4 @@
+{
+  "loader": "computercraft:turtle",
+  "model": "computercraft:block/turtle_advanced_base"
+}
--- a/src/generated/resources/assets/computercraft/models/block/turtle_advanced_base.json
+++ b/src/generated/resources/assets/computercraft/models/block/turtle_advanced_base.json
@@ -0,0 +1,6 @@
+{
+  "parent": "computercraft:block/turtle_base",
+  "textures": {
+    "texture": "computercraft:block/turtle_advanced"
+  }
+}
--- a/src/generated/resources/assets/computercraft/models/block/turtle_normal.json
+++ b/src/generated/resources/assets/computercraft/models/block/turtle_normal.json
@@ -0,0 +1,4 @@
+{
+  "loader": "computercraft:turtle",
+  "model": "computercraft:block/turtle_normal_base"
+}
--- a/src/generated/resources/assets/computercraft/models/block/turtle_normal_base.json
+++ b/src/generated/resources/assets/computercraft/models/block/turtle_normal_base.json
@@ -0,0 +1,6 @@
+{
+  "parent": "computercraft:block/turtle_base",
+  "textures": {
+    "texture": "computercraft:block/turtle_normal"
+  }
+}
--- a/src/generated/resources/assets/computercraft/models/block/wired_modem_full_off.json
+++ b/src/generated/resources/assets/computercraft/models/block/wired_modem_full_off.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "computercraft:block/wired_modem_face"
+  }
+}
--- a/src/generated/resources/assets/computercraft/models/block/wired_modem_full_off_peripheral.json
+++ b/src/generated/resources/assets/computercraft/models/block/wired_modem_full_off_peripheral.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "computercraft:block/wired_modem_face_peripheral"
+  }
+}
--- a/src/generated/resources/assets/computercraft/models/block/wired_modem_full_on.json
+++ b/src/generated/resources/assets/computercraft/models/block/wired_modem_full_on.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "computercraft:block/wired_modem_face_on"
+  }
+}
--- a/src/generated/resources/assets/computercraft/models/block/wired_modem_full_on_peripheral.json
+++ b/src/generated/resources/assets/computercraft/models/block/wired_modem_full_on_peripheral.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "computercraft:block/wired_modem_face_peripheral_on"
+  }
+}
--- a/src/generated/resources/assets/computercraft/models/block/wired_modem_off.json
+++ b/src/generated/resources/assets/computercraft/models/block/wired_modem_off.json
@@ -0,0 +1,7 @@
+{
+  "parent": "computercraft:block/modem",
+  "textures": {
+    "front": "computercraft:block/wired_modem_face",
+    "back": "computercraft:block/modem_back"
+  }
+}
--- a/src/generated/resources/assets/computercraft/models/block/wired_modem_off_peripheral.json
+++ b/src/generated/resources/assets/computercraft/models/block/wired_modem_off_peripheral.json
@@ -0,0 +1,7 @@
+{
+  "parent": "computercraft:block/modem",
+  "textures": {
+    "front": "computercraft:block/wired_modem_face_peripheral",
+    "back": "computercraft:block/modem_back"
+  }
+}
--- a/src/generated/resources/assets/computercraft/models/block/wired_modem_on.json
+++ b/src/generated/resources/assets/computercraft/models/block/wired_modem_on.json
@@ -0,0 +1,7 @@
+{
+  "parent": "computercraft:block/modem",
+  "textures": {
+    "front": "computercraft:block/wired_modem_face_on",
+    "back": "computercraft:block/modem_back"
+  }
+}
--- a/src/generated/resources/assets/computercraft/models/block/wired_modem_on_peripheral.json
+++ b/src/generated/resources/assets/computercraft/models/block/wired_modem_on_peripheral.json
@@ -0,0 +1,7 @@
+{
+  "parent": "computercraft:block/modem",
+  "textures": {
+    "front": "computercraft:block/wired_modem_face_peripheral_on",
+    "back": "computercraft:block/modem_back"
+  }
+}
--- a/src/generated/resources/assets/computercraft/models/block/wireless_modem_advanced_off.json
+++ b/src/generated/resources/assets/computercraft/models/block/wireless_modem_advanced_off.json
@@ -0,0 +1,7 @@
+{
+  "parent": "computercraft:block/modem",
+  "textures": {
+    "front": "computercraft:block/wireless_modem_advanced_face",
+    "back": "computercraft:block/modem_back"
+  }
+}
--- a/src/generated/resources/assets/computercraft/models/block/wireless_modem_advanced_on.json
+++ b/src/generated/resources/assets/computercraft/models/block/wireless_modem_advanced_on.json
@@ -0,0 +1,7 @@
+{
+  "parent": "computercraft:block/modem",
+  "textures": {
+    "front": "computercraft:block/wireless_modem_advanced_face_on",
+    "back": "computercraft:block/modem_back"
+  }
+}
--- a/src/generated/resources/assets/computercraft/models/block/wireless_modem_normal_off.json
+++ b/src/generated/resources/assets/computercraft/models/block/wireless_modem_normal_off.json
@@ -0,0 +1,7 @@
+{
+  "parent": "computercraft:block/modem",
+  "textures": {
+    "front": "computercraft:block/wireless_modem_normal_face",
+    "back": "computercraft:block/modem_back"
+  }
+}
--- a/src/generated/resources/assets/computercraft/models/block/wireless_modem_normal_on.json
+++ b/src/generated/resources/assets/computercraft/models/block/wireless_modem_normal_on.json
@@ -0,0 +1,7 @@
+{
+  "parent": "computercraft:block/modem",
+  "textures": {
+    "front": "computercraft:block/wireless_modem_normal_face_on",
+    "back": "computercraft:block/modem_back"
+  }
+}
--- a/src/generated/resources/assets/computercraft/models/item/computer_advanced.json
+++ b/src/generated/resources/assets/computercraft/models/item/computer_advanced.json
@@ -0,0 +1,3 @@
+{
+  "parent": "computercraft:block/computer_advanced_blinking"
+}
--- a/src/generated/resources/assets/computercraft/models/item/computer_command.json
+++ b/src/generated/resources/assets/computercraft/models/item/computer_command.json
@@ -0,0 +1,3 @@
+{
+  "parent": "computercraft:block/computer_command_blinking"
+}
--- a/src/generated/resources/assets/computercraft/models/item/computer_normal.json
+++ b/src/generated/resources/assets/computercraft/models/item/computer_normal.json
@@ -0,0 +1,3 @@
+{
+  "parent": "computercraft:block/computer_normal_blinking"
+}
--- a/src/generated/resources/assets/computercraft/models/item/monitor_advanced.json
+++ b/src/generated/resources/assets/computercraft/models/item/monitor_advanced.json
@@ -0,0 +1,3 @@
+{
+  "parent": "computercraft:block/monitor_advanced_item"
+}
--- a/src/generated/resources/assets/computercraft/models/item/monitor_normal.json
+++ b/src/generated/resources/assets/computercraft/models/item/monitor_normal.json
@@ -0,0 +1,3 @@
+{
+  "parent": "computercraft:block/monitor_normal_item"
+}
--- a/src/generated/resources/assets/computercraft/models/item/speaker.json
+++ b/src/generated/resources/assets/computercraft/models/item/speaker.json
@@ -0,0 +1,3 @@
+{
+  "parent": "computercraft:block/speaker"
+}
--- a/src/generated/resources/assets/computercraft/models/item/turtle_advanced.json
+++ b/src/generated/resources/assets/computercraft/models/item/turtle_advanced.json
@@ -0,0 +1,3 @@
+{
+  "parent": "computercraft:block/turtle_advanced"
+}
--- a/src/generated/resources/assets/computercraft/models/item/turtle_normal.json
+++ b/src/generated/resources/assets/computercraft/models/item/turtle_normal.json
@@ -0,0 +1,3 @@
+{
+  "parent": "computercraft:block/turtle_normal"
+}
--- a/src/generated/resources/assets/computercraft/models/item/wired_modem.json
+++ b/src/generated/resources/assets/computercraft/models/item/wired_modem.json
@@ -0,0 +1,3 @@
+{
+  "parent": "computercraft:block/wired_modem_off"
+}
--- a/src/generated/resources/assets/computercraft/models/item/wired_modem_full.json
+++ b/src/generated/resources/assets/computercraft/models/item/wired_modem_full.json
@@ -0,0 +1,3 @@
+{
+  "parent": "computercraft:block/wired_modem_full_off"
+}
--- a/src/generated/resources/assets/computercraft/models/item/wireless_modem_advanced.json
+++ b/src/generated/resources/assets/computercraft/models/item/wireless_modem_advanced.json
@@ -0,0 +1,3 @@
+{
+  "parent": "computercraft:block/wireless_modem_advanced_off"
+}
--- a/src/generated/resources/assets/computercraft/models/item/wireless_modem_normal.json
+++ b/src/generated/resources/assets/computercraft/models/item/wireless_modem_normal.json
@@ -0,0 +1,3 @@
+{
+  "parent": "computercraft:block/wireless_modem_normal_off"
+}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/cable.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/cable.json
@@ -21,7 +21,7 @@
      "conditions": {
        "items": [
          {
-            "tag": "computercraft:computer"
+            "tag": "computercraft:wired_modem"
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printed_book.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printed_book.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "computercraft:printed_book"
+    ]
+  },
+  "criteria": {
+    "has_printer": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "computercraft:printer"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "computercraft:printed_book"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_printer",
+      "has_the_recipe"
+    ]
+  ]
+}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printed_pages.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printed_pages.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "computercraft:printed_pages"
+    ]
+  },
+  "criteria": {
+    "has_printer": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "computercraft:printer"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "computercraft:printed_pages"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_printer",
+      "has_the_recipe"
+    ]
+  ]
+}
--- a/src/generated/resources/data/computercraft/advancements/recipes/decorations/skull_cloudy.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/decorations/skull_cloudy.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "computercraft:skull_cloudy"
+    ]
+  },
+  "criteria": {
+    "has_monitor": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "computercraft:monitor_normal"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "computercraft:skull_cloudy"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_monitor",
+      "has_the_recipe"
+    ]
+  ]
+}
--- a/src/generated/resources/data/computercraft/advancements/recipes/decorations/skull_dan200.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/decorations/skull_dan200.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "computercraft:skull_dan200"
+    ]
+  },
+  "criteria": {
+    "has_computer": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "computercraft:computer_advanced"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "computercraft:skull_dan200"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_computer",
+      "has_the_recipe"
+    ]
+  ]
+}
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/cable.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/cable.json
@@ -0,0 +1,52 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "name": "cable",
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "computercraft:cable"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        },
+        {
+          "condition": "minecraft:block_state_property",
+          "block": "computercraft:cable",
+          "properties": {
+            "cable": "true"
+          }
+        }
+      ]
+    },
+    {
+      "name": "wired_modem",
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "computercraft:wired_modem"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        },
+        {
+          "condition": "minecraft:inverted",
+          "term": {
+            "condition": "minecraft:block_state_property",
+            "block": "computercraft:cable",
+            "properties": {
+              "modem": "none"
+            }
+          }
+        }
+      ]
+    }
+  ]
+}
--- a/src/generated/resources/data/computercraft/recipes/colour.json
+++ b/src/generated/resources/data/computercraft/recipes/colour.json
@@ -0,0 +1,3 @@
+{
+  "type": "computercraft:colour"
+}
--- a/src/generated/resources/data/computercraft/recipes/disk.json
+++ b/src/generated/resources/data/computercraft/recipes/disk.json
@@ -0,0 +1,3 @@
+{
+  "type": "computercraft:disk"
+}
--- a/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/speaker.json
@@ -6,14 +6,15 @@
    "P"
  ],
  "key": {
-    "#": {
+    "P": {
      "item": "computercraft:pocket_computer_advanced"
    },
-    "P": {
+    "#": {
      "item": "computercraft:speaker"
    }
  },
  "result": {
-    "item": "computercraft:pocket_computer_advanced"
+    "item": "computercraft:pocket_computer_advanced",
+    "nbt": "{Upgrade:\"computercraft:speaker\"}"
  }
 }
--- a/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_advanced.json
@@ -6,14 +6,15 @@
    "P"
  ],
  "key": {
-    "#": {
+    "P": {
      "item": "computercraft:pocket_computer_advanced"
    },
-    "P": {
+    "#": {
      "item": "computercraft:wireless_modem_advanced"
    }
  },
  "result": {
-    "item": "computercraft:pocket_computer_advanced"
+    "item": "computercraft:pocket_computer_advanced",
+    "nbt": "{Upgrade:\"computercraft:wireless_modem_advanced\"}"
  }
 }
--- a/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_normal.json
@@ -6,14 +6,15 @@
    "P"
  ],
  "key": {
-    "#": {
+    "P": {
      "item": "computercraft:pocket_computer_advanced"
    },
-    "P": {
+    "#": {
      "item": "computercraft:wireless_modem_normal"
    }
  },
  "result": {
-    "item": "computercraft:pocket_computer_advanced"
+    "item": "computercraft:pocket_computer_advanced",
+    "nbt": "{Upgrade:\"computercraft:wireless_modem_normal\"}"
  }
 }
--- a/src/generated/resources/data/computercraft/recipes/pocket_computer_upgrade.json
+++ b/src/generated/resources/data/computercraft/recipes/pocket_computer_upgrade.json
@@ -0,0 +1,3 @@
+{
+  "type": "computercraft:pocket_computer_upgrade"
+}
--- a/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/speaker.json
@@ -6,14 +6,15 @@
    "P"
  ],
  "key": {
-    "#": {
+    "P": {
      "item": "computercraft:pocket_computer_normal"
    },
-    "P": {
+    "#": {
      "item": "computercraft:speaker"
    }
  },
  "result": {
-    "item": "computercraft:pocket_computer_normal"
+    "item": "computercraft:pocket_computer_normal",
+    "nbt": "{Upgrade:\"computercraft:speaker\"}"
  }
 }
--- a/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_advanced.json
@@ -6,14 +6,15 @@
    "P"
  ],
  "key": {
-    "#": {
+    "P": {
      "item": "computercraft:pocket_computer_normal"
    },
-    "P": {
+    "#": {
      "item": "computercraft:wireless_modem_advanced"
    }
  },
  "result": {
-    "item": "computercraft:pocket_computer_normal"
+    "item": "computercraft:pocket_computer_normal",
+    "nbt": "{Upgrade:\"computercraft:wireless_modem_advanced\"}"
  }
 }
--- a/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_normal.json
@@ -6,14 +6,15 @@
    "P"
  ],
  "key": {
-    "#": {
+    "P": {
      "item": "computercraft:pocket_computer_normal"
    },
-    "P": {
+    "#": {
      "item": "computercraft:wireless_modem_normal"
    }
  },
  "result": {
-    "item": "computercraft:pocket_computer_normal"
+    "item": "computercraft:pocket_computer_normal",
+    "nbt": "{Upgrade:\"computercraft:wireless_modem_normal\"}"
  }
 }
--- a/src/generated/resources/data/computercraft/recipes/printed_book.json
+++ b/src/generated/resources/data/computercraft/recipes/printed_book.json
@@ -0,0 +1,17 @@
+{
+  "type": "computercraft:impostor_shapeless",
+  "ingredients": [
+    {
+      "tag": "forge:leather"
+    },
+    {
+      "item": "computercraft:printed_page"
+    },
+    {
+      "tag": "forge:string"
+    }
+  ],
+  "result": {
+    "item": "computercraft:printed_book"
+  }
+}
--- a/src/generated/resources/data/computercraft/recipes/printed_pages.json
+++ b/src/generated/resources/data/computercraft/recipes/printed_pages.json
@@ -0,0 +1,17 @@
+{
+  "type": "computercraft:impostor_shapeless",
+  "ingredients": [
+    {
+      "item": "computercraft:printed_page"
+    },
+    {
+      "item": "computercraft:printed_page"
+    },
+    {
+      "tag": "forge:string"
+    }
+  ],
+  "result": {
+    "item": "computercraft:printed_pages"
+  }
+}
--- a/src/generated/resources/data/computercraft/recipes/printout.json
+++ b/src/generated/resources/data/computercraft/recipes/printout.json
@@ -0,0 +1,3 @@
+{
+  "type": "computercraft:printout"
+}
--- a/src/generated/resources/data/computercraft/recipes/skull_cloudy.json
+++ b/src/generated/resources/data/computercraft/recipes/skull_cloudy.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "tag": "forge:heads"
+    },
+    {
+      "item": "computercraft:monitor_normal"
+    }
+  ],
+  "result": {
+    "item": "minecraft:player_head",
+    "nbt": "{SkullOwner:{Id:\"6d074736-b1e9-4378-a99b-bd8777821c9c\",Name:\"Cloudhunter\"}}"
+  }
+}
--- a/src/generated/resources/data/computercraft/recipes/skull_dan200.json
+++ b/src/generated/resources/data/computercraft/recipes/skull_dan200.json
@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {
+      "tag": "forge:heads"
+    },
+    {
+      "item": "computercraft:computer_advanced"
+    }
+  ],
+  "result": {
+    "item": "minecraft:player_head",
+    "nbt": "{SkullOwner:{Id:\"f3c8d69b-0776-4512-8434-d1b2165909eb\",Name:\"dan200\"}}"
+  }
+}
--- a/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/speaker.json
@@ -5,10 +5,10 @@
    "#T"
  ],
  "key": {
-    "#": {
+    "T": {
      "item": "computercraft:turtle_advanced"
    },
-    "T": {
+    "#": {
      "item": "computercraft:speaker"
    }
  },
--- a/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_advanced.json
@@ -5,10 +5,10 @@
    "#T"
  ],
  "key": {
-    "#": {
+    "T": {
      "item": "computercraft:turtle_advanced"
    },
-    "T": {
+    "#": {
      "item": "computercraft:wireless_modem_advanced"
    }
  },
--- a/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_normal.json
@@ -5,10 +5,10 @@
    "#T"
  ],
  "key": {
-    "#": {
+    "T": {
      "item": "computercraft:turtle_advanced"
    },
-    "T": {
+    "#": {
      "item": "computercraft:wireless_modem_normal"
    }
  },
--- a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/crafting_table.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/crafting_table.json
@@ -5,10 +5,10 @@
    "#T"
  ],
  "key": {
-    "#": {
+    "T": {
      "item": "computercraft:turtle_advanced"
    },
-    "T": {
+    "#": {
      "item": "minecraft:crafting_table"
    }
  },
--- a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_axe.json
+++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_axe.json
@@ -5,10 +5,10 @@
    "#T"
  ],
  "key": {
-    "#": {
+    "T": {
      "item": "computercraft:turtle_advanced"
    },
-    "T": {
+    "#": {
      "item": "minecraft:diamond_axe"
    }
  },
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jonathan Coates	5927e9bb10	Bump CC:T version	2021-11-29 18:54:54 +00:00
Jonathan Coates	53811f8169	Allow peripherals to have multiple types (#963 ) Peripherals can now have multiple types: - A single primary type. This is the same as the current idea of a type - some identifier which (mostly) uniquely identifies this kind of peripheral. For instance, "speaker" or "minecraft:chest". - 0 or more "additional" types. These are more like traits, and describe what other behaviour the peripheral has - is it an inventory? Does it supply additional peripherals (like a wired modem)?. This is mostly intended for the generic peripheral system, but it might prove useful elsewhere too - we'll have to see! - peripheral.getType (and modem.getTypeRemote) now returns 1 or more values, rather than exactly one. - Add a new peripheral.hasType (and modem.hasTypeRemote) function which determines if a peripheral has the given type (primary or additional). - Change peripheral.find and all internal peripheral methods to use peripheral.hasType instead. - Update the peripherals program to show all types This effectively allows you to do things like `peripheral.find("inventory")` to find all inventories. This also rewrites the introduction to the peripheral API, hopefully making it a little more useful.	2021-11-29 17:37:30 +00:00
Jonathan Coates	298f339376	Invalidate peripherals during the computer's tick instead - Capability invalidation and tile/block entity changes set a dirty bit instead of refetching the peripheral immediately. - Then on the block's tick we recompute the peripheral if the dirty bit is set. Fixes #696 and probably fixes #882. Some way towards #893, but not everything yet. This is probably going to break things horribly. Let's find out!	2021-11-28 20:03:27 +00:00
Jonathan Coates	9d44f1ca66	Make capability invalidation callbacks less strict Forge!! shakes fist.	2021-11-28 12:47:08 +00:00
Jonathan Coates	306e06a79a	Do not allow transferring into removed blocks See #893.	2021-11-28 12:32:31 +00:00
Jonathan Coates	4f11549112	Remove space in fs API	2021-11-27 16:35:44 +00:00
Jonathan Coates	7f3490591d	Some fixes to the web-based emulator - Bump copy-cat version to have support for initial files in directories and the blit fixes. - Add an example nft image and move example nfp into a data/ directory. - Fix nft parser not resetting colours on the start of each line.	2021-11-27 12:27:40 +00:00
Lupus590	8ffd45c66e	"cc.pretty".pretty_print shortcut function (#965 )	2021-11-26 21:13:15 +00:00
Jonathan Coates	e247bd823e	Bump Gradle and Kotlin versions I think we need this for 1.18	2021-11-26 21:12:20 +00:00
Jonathan Coates	276956eed8	Fix command block config not being read	2021-11-26 20:58:58 +00:00
Jonathan Coates	18d66bd727	Add dimension parameter to commands.getBlockInfo{,s} Closes #130. Worth noting it doesn't add an additional argument to getBlockPosition - want to leave that off for now.	2021-11-24 19:31:54 +00:00
Jonathan Coates	d3563a3854	Cleanup resource mount reloading - Subscribe to the "on add reload listener" event, otherwise we don't get reloads beyond the first one! This means we no longer need to cast the resource manager to a reloadable one. - Change the mount cache so it's keyed on path, rather than "path ✕ manager". - Update the reload listener just to use the mount cache, rather than having its own separate list. I really don't understand what I was thinking before.	2021-11-24 19:07:12 +00:00
Jonathan Coates	c2dc8bf675	Rewrite monitor resizing - Some improvements to validation of monitors. This rejects monitors with invalid dimensions, specifically those with a width or height of 0. Should fix #922. - Simplify monitor collapsing a little. This now just attempts to resize the four "corner" monitors (where present) and then expands them if needed. Fixes #913. - Rewrite monitor expansion so that it's no longer recursive. Instead we track the "origin" monitor and replace it whenever we resize to the left or upwards. Also add a upper bound on the loop count, which should prevent things like #922 happening again. Though as mentioned above, validation should prevent this anyway. - Some small bits of cleanup to general monitor code. I have absolutely no confidence that this code is any better behaved than the previous version. Let's find out I guess!	2021-11-24 13:35:57 +00:00
Jonathan Coates	603119e1e6	Replace magic values with Forge constants Gonna have to replace these in 1.17 as Minecraft exposes these by default!	2021-11-23 21:17:34 +00:00
Jonathan Coates	d9b3f17b52	Add a debug overlay for monitors and turtles Monitors is probably the more useful thing here (well, for me at least). It is a _debug_ overlay after all :p.	2021-11-23 21:14:06 +00:00
Jonathan Coates	993bccc51f	Resort language files Slightly annoying that weblate keeps getting this wrong. I don't think any of the addons allow me to enforce an ordering either.	2021-11-23 19:48:47 +00:00
Weblate	96d3b27064	Translations for Korean Co-authored-by: E. Kim <mindy15963@naver.com>	2021-11-23 19:43:15 +00:00
Jonathan Coates	f33f57ea35	Allow generic peripherals to specify a custom source - Add a new GenericPeripheral interface. We don't strictly speaking need this - could put this on GenericSource - but the separation seems cleaner. - GenericPeripheral.getType() returns a new PeripheralType class, which can either be untyped() or specify a type name. This is a little over-engineered (could just be a nullable string), but I'm planning to allow multiple types in the future, so want some level of future-proofing. - Thread this PeripheralType through the method gathering code and expose it to the GenericPeripheralProvider, which then chooses an appropriate name. This is a little ugly (we're leaking information about peripherals everywhere), but I think is fine for now. It's all private internals after all! Closes #830	2021-11-22 18:05:13 +00:00
Jonathan Coates	070479d901	Make executeMainThreadTask a default method - Move TaskCallback into the API and make it package private. This effectively means it's not an API class, just exists there for convenience reasons. - Replace any usage of TaskCallback.make with ILuaContext.executeMainThreadTask. - Some minor formatting/checkstyle changes to bring us inline with IntelliJ config.	2021-11-21 11:19:02 +00:00
Jonathan Coates	2fe40f669d	Don't send packets when the server is stopping Fixes #956	2021-11-20 23:20:27 +00:00
Jonathan Coates	1b39c9f470	Bump various package versions	2021-11-20 23:20:12 +00:00
Weblate	814d5cbcd1	Translations for Italian Co-authored-by: Alessandro <ale.proto00@gmail.com>	2021-11-17 14:24:23 +00:00
Anavrins	4d8862c78e	Optimize peripheral calls in rednet.run (#954 )	2021-11-14 06:57:47 +00:00
Weblate	6cc2f035db	Translations for Japanese (ja_jp) Co-authored-by: MORIMORI0317 <morimori.0317@outlook.jp>	2021-11-13 06:24:20 +00:00
Jonathan Coates	ea7a218f4a	Make turtle breaking a little more data driven - Allow any tool to break an "instabreak" block (saplings, plants, TNT). Oddly this doesn't include bamboo or bamboo sapings (they're marked as instabreak, only to have their strength overridden again!), so we also provide a tag for additional blocks to allow. - Hoes and shovels now allow breaking any block for which this tool is effective. - Use block tags to drive any other block breaking capabilities. For instance, hoes can break pumpkins and cactuses despite not being effective. This should get a little nicer in 1.17, as we can just use block tags for everything.	2021-10-27 19:32:58 +01:00
Jonathan Coates	544bcaa599	Clear the entity drop list as well as cancelling Fixes #940	2021-10-24 19:11:21 +01:00
Jonathan Coates	ab6b861cd6	Move repo to cc-tweaked org Let's see how this goes. - Update references to the new repo - Use rrsync on the server, meaning make-doc.sh uploads relative to the website root. - Bump Gradle wrapper to 7.2. Not related to this change, but possibly fixes running under Java 16. Possibly.	2021-10-17 18:14:32 +01:00
Jonathan Coates	72e8fc03d3	Fix upload bandwidth limit not being set Lol, woops.	2021-10-13 17:56:12 +01:00
Jonathan Coates	482ae0d22e	Fix recipe book upgrade recipes - Flip turtle/pocket and upgrade item. - Correctly set NBT on pocket upgrade recipe output.	2021-10-11 12:17:45 +01:00
Jonathan Coates	6dd33f7099	Play sounds using ResourceLocation rather than SoundEvent The latter is not registered when sounds are added via resource packs. Fixes #938. Probably.	2021-10-10 22:35:45 +01:00
Jonathan Coates	045472577a	Improve motd a hundred fold Yes, I know this is a terrible feature. But it's been a long week and I'm so tired. Also fix the ordering in motd_spec. Who thought putting the month first was reasonable?	2021-10-08 20:49:37 +01:00
JackMacWindows	9f539dbd59	Add about program for easier version identification (#936 )	2021-10-08 11:29:52 +01:00
Jonathan Coates	ca367e7cc7	Don't run client tests on CI Kinda sucks, but they're so inconsistent between platforms right now, and I cannot be bothered to get CI working. It only needs to work on my machine.	2021-10-07 11:51:18 +01:00
Weblate	f6fd0ad172	Translations for Russian (ru_ru) Translations for French Translations for English Co-authored-by: SquidDev <git@squiddev.cc>	2021-10-07 10:25:23 +00:00
Weblate	13779d6ad3	Translations for French Translations for German Co-authored-by: SquidDev <bonzoweb@hotmail.co.uk>	2021-10-06 16:09:38 +00:00
Jonathan Coates	d700f1f500	Bump the image comparison threshold again Not sure what the right long-term solution is here. An alternative image comparison? Take multiple screenshots?	2021-10-03 11:21:37 +01:00
i develop things	06bf84f151	Make color arguments to `term.blit` case-insensitive (#929 )	2021-10-03 11:11:31 +01:00
Jonathan Coates	8ba20985d7	Store additional state in WiredModemPeripheral This means wired peripherals now correctly track their current mounts and attached state, rather than inheriting from the origin wired modem. Closes #890	2021-09-27 22:18:32 +01:00
JackMacWindows	7bb7b5e638	Make Rednet deduplication more efficient (#925 )	2021-09-26 21:15:37 +01:00
Alessandro	297426419b	Fix computer IDs greater than 65535 crashing Rednet (#900 )	2021-09-26 17:13:26 +01:00
Jonathan Coates	eb61c5c5d7	Add a overly-complex test harness for rednet Allows us to run multiple "computers" in parallel and send messages betwene them. I don't think this counts as another test framework, but it's sure silly.	2021-09-26 16:45:23 +01:00
Jonathan Coates	cf2bc667c1	Add more tests for monitor and printout rendering	2021-09-26 11:10:41 +01:00
Jonathan Coates	c8449086ee	Optimise CC:T logo	2021-09-26 10:26:42 +01:00
Jonathan Coates	662bead8be	Several fixes and improvements for client tests - Fix broken /cctest marker - Correctly wait for the screenshot to be taken before continuing. - Filter out client tests in a different place, meaning we can remove the /cctest runall command - Bump kotlin version	2021-09-26 09:48:58 +01:00
Jonathan Coates	acaa61a720	Make the monitor depth blocker slightly larger	2021-09-25 16:46:37 +01:00
Jonathan Coates	5facbca2b3	Merge pull request #927 from MCJack123/patch-8 Added binary flag to websocket_message docs	2021-09-23 20:34:21 +01:00
JackMacWindows	6c6b2c2ff3	Added binary flag to websocket_message docs	2021-09-23 15:20:19 -04:00
MAGGen-hub	647902c019	Allow using mouse in off-hand pocket computer screen (#918 )	2021-09-19 11:24:55 +01:00
Jonathan Coates	2aa70b49c1	Add invisible slots to computer GUIs This ensures inventory slots are synced while the container is open, meaning the hotbar (which is visible underneath the GUI) correctly updates. Fixes #915	2021-09-19 11:18:24 +01:00
Jonathan Coates	b17ab16e05	Allow the user to opt in to client tests	2021-09-19 10:43:55 +01:00
Wojbie	94ad106272	Several improvements to textutils.serialise (#920 ) - Handle nan and infinity, by emitting them as 0/0 and 0/1. - Differentiate between repeated and recursive tables in the error message.	2021-09-17 10:30:23 +01:00
xXTurner	dc9edf26ec	Fixed typo in the javadoc of CommandsAPI class (#924 )	2021-09-15 19:35:32 +01:00
Jonathan Coates	048c7bda23	Allow opening pocket computers without rendering a terminal When placed in the off hand, pocket computers now render a different screen when opened in the off-hand, just rendering text at the top of the screen rather than "opening" the whole computer. This means you can view the world and computer in your hand at the same time, effectively allowing you to emulate the Plethora/MoarPeripherals keyboard (and much more). This currently requires you to move the pocket computer to the other hand to open it normally. I did look into allowing for shift+right click to open normally, but this is awkward when you're looking at a something like a monitor - you need to shift as otherwise you'd click the block! Plethora hooks into onItemUseFirst instead, and this might be an option in the future - meaning that right click would always open some computer GUI and never the blocks. This may be something we change in the future - let's get some feedback first! Closes #861. Apologies for this essay, but if you got this far you were probably interested!	2021-08-30 18:52:02 +01:00
Jonathan Coates	c9397460a4	Optimise maven repository usage Geesh, we get a lot of 404s against this.	2021-08-29 22:23:58 +01:00
Jonathan Coates	9e82209aab	Split uploaded files across multiple packets Still not 100% sure of the correctness here, but it appears to work. Closes #887.	2021-08-29 16:58:02 +01:00
JackMacWindows	340ade170f	Add the rest of the feature introduction versions to the docs (#908 )	2021-08-26 08:02:58 +01:00
ralphgod3	7cac8401e8	Uncomment remaining keys (#907 )	2021-08-25 22:45:10 +01:00
Jonathan Coates	0f899357c2	Some documentation bits and bobs More #853, closes #858	2021-08-25 22:33:55 +01:00
Jonathan Coates	3396fe2871	Make UserLevel.OWNER a little more strict Closes #904	2021-08-25 22:09:24 +01:00
Jonathan Coates	9fbcbae5b3	Bump version to 1.98.2	2021-08-22 17:39:32 +01:00
Jonathan Coates	36a779dc18	Use data generators in a few more places As always, a massive diff which is largely just moving files between projects. This does fix a couple of issues with advancements, but otherwise should behave the same. Speaking of which, should probably go and test some of these recipes...	2021-08-21 15:50:01 +01:00
Jonathan Coates	cd8b8bbc74	Bump codecov action version This'll be deprecated next year. We've plenty of time, but worth fixing while I'm looking at this stuff.	2021-08-20 22:33:09 +01:00
Jonathan Coates	d8319bb35c	Fix coverage not being generated for in-game tests	2021-08-20 22:13:21 +01:00
Jonathan Coates	afd6adbffa	npm update The worst ecosystem	2021-08-20 21:54:44 +01:00
Jonathan Coates	d3a5d1e314	Add tests for transmitting via wired modems It crashes on 1.17 right now, so worth checking!	2021-08-20 18:35:00 +01:00
Jonathan Coates	56010382fb	Rethink how computers run tests in game Instead of using ids for each computer each computer is spawned with id 0 but has a label which matches up to its test name. This has several advantages: - No more confusing IDs: the test code now just does thenComputerOk() and that's it - the computer to track is inferred from the test name. - All files are stored on one computer, which means we can write code which is shared between tests.	2021-08-20 17:05:27 +01:00
Jonathan Coates	0ff6b0ca70	Client-side tests This spins up a Minecraft instance (much like we do for the server) and instructs the client to take screenshots at particular times. We then compare those screenshots and assert they match (modulo some small delta).	2021-08-20 17:05:13 +01:00
Jonathan Coates	4b33306940	Refactor the test code to be closer to 1.17 Basically mimic the actual API that Minecraft would expose if the methods hadn't been stripped. Lots of ATs and unsafe hacks to get this working, but thankfully the API we can expose to the user is pretty nice. Yay for Kotlin? Anyway, will cause some immediate pain (yay merge conflicts) but should make keeping the two in sync much easier.	2021-08-20 17:05:13 +01:00
Jonathan Coates	4dea3dff36	Move some Forge hooks into a separate class	2021-08-20 17:05:13 +01:00
Jonathan Coates	3e8c741170	Update test mod "generated" tags	2021-08-18 13:03:53 +01:00
Jonathan Coates	62baa72457	Add some tests for wired modems	2021-08-18 12:55:58 +01:00
Jonathan Coates	5eb711da87	Relocate test mod to testMod source set This'll be fun to rebase 1.17 on to :).	2021-08-18 12:55:58 +01:00
Jonathan Coates	79c5df1d92	Fix weblate exporting the wrong language Ughghgr.	2021-08-18 12:53:19 +01:00
Jonathan Coates	991ea6e829	Switch mappings over to Parchment These are still equivalent to the official mappings but also include method names and javadoc. Yay! A bit weird to be on versioned mappings after 8 months of MojMap :).!	2021-08-18 12:49:50 +01:00
Weblate	1d160641a4	Translations for Japanese Co-authored-by: MORIMORI0317 <morimori.0317@outlook.jp>	2021-08-18 10:53:58 +00:00
Weblate	c2b3d914f7	Added translation for Japanese Co-authored-by: MORIMORI0317 <morimori.0317@outlook.jp>	2021-08-18 10:22:58 +00:00
Jonathan Coates	143b2bdbcd	🦀 ComputerCraft is dead 🦀	2021-08-15 22:25:31 +01:00
Jonathan Coates	8cb21ed4d1	Woops I had this as assume-unchanged for some reason	2021-08-13 22:45:42 +01:00
Jonathan Coates	8aa7695fdd	Some doc updates - Fix some spacing in code blocks - Rewrite the index page - You can't see it, but update illuaminate.	2021-08-13 22:35:08 +01:00
Jonathan Coates	fa78818069	Several fixes to speaker volume - Use linear attenuation. - Fix speakers being 16 times as loud as they should be. They correctly cut off at the right distance, but didn't fade out as one might expect. - Clamp volume at 0, not 1. Fixes #892	2021-08-12 18:19:53 +01:00
Jonathan Coates	62172c6049	Fix depending on a client-only class I checked matrix but not transformationmatrix >_>.	2021-08-08 12:38:06 +01:00
Jonathan Coates	39f3cf8cbe	Cache the tool's transformation matrix	2021-08-08 12:28:25 +01:00
Jonathan Coates	5082947331	Add 1.17 to the issue template	2021-08-08 12:23:02 +01:00
Jonathan Coates	01ddb2b4e4	A couple of documentation improvements - Add some missing to the turtle API docs - Version history for peripheral and redstone. I /think/ this is complete.	2021-08-05 19:25:10 +01:00