Increase timeout of some more tests

Merge branch 'mc-1.16.x' into mc-1.17.x
Bump version to 1.98.2
2025-11-01 22:22:59 +00:00 · 2021-08-22 18:01:06 +01:00 · 2021-08-22 17:50:33 +01:00 · 2021-08-22 17:39:32 +01:00 · 2021-08-21 15:50:01 +01:00 · 2021-08-20 22:33:09 +01:00
634 changed files with 11196 additions and 13983 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
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+- name: ComputerCraft Discord
+  url: https://discord.computercraft.cc
+  about: Get help on the ComputerCraft Discord.
+- name: GitHub Discussions
+  url: https://github.com/SquidDev-CC/CC-Tweaked/discussions
+  about: Or ask questions on GitHub Discussions.
--- a/.github/ISSUE_TEMPLATE/something_else.md
+++ b/.github/ISSUE_TEMPLATE/something_else.md
@@ -0,0 +1,4 @@
+---
+name: Something else
+about: An issue about something else.
+---
--- 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/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -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
--- 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/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)][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)
@@ -70,3 +40,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,14 +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 'com.google.code.gson:gson:2.8.1'
-        classpath 'net.minecraftforge.gradle:ForgeGradle:5.0.6'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:5.1.+'
+        classpath 'org.parchmentmc:librarian:1.+'
    }
 }

@@ -19,18 +17,19 @@ 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.5.21"
    id "com.modrinth.minotaur" version "1.2.1"
 }

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

 version = mod_version

 group = "org.squiddev"
 archivesBaseName = "cc-tweaked-${mc_version}"

-def javaVersion = JavaLanguageVersion.of(8)
+def javaVersion = JavaLanguageVersion.of(16)
 java {
    toolchain {
        languageVersion = javaVersion
@@ -40,24 +39,30 @@ java {
    withJavadocJar()
 }

-// Tragically java.toolchain.languageVersion doesn't apply to ForgeGradle's
-// tasks, so we force all launchers to use the right Java version.
-tasks.withType(JavaCompile).configureEach {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = javaVersion
-    }
-}
-
 tasks.withType(JavaExec).configureEach {
    javaLauncher = javaToolchains.launcherFor {
        languageVersion = javaVersion
    }
 }

+sourceSets {
+    main.java {
+        exclude 'dan200/computercraft/shared/integration/**'
+    }
+    main.resources {
+        srcDir 'src/generated/resources'
+    }
+
+    testMod {}
+}
+
 minecraft {
    runs {
-        client {
-            workingDirectory project.file('run')
+        all {
+            lazyToken('minecraft_classpath') {
+                configurations.shade.copyRecursive().resolve().collect { it.absolutePath }.join(File.pathSeparator)
+            }
+
            property 'forge.logging.markers', 'REGISTRIES'
            property 'forge.logging.console.level', 'debug'

@@ -68,30 +73,35 @@ 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
                }
            }
+
+            lazyToken('minecraft_classpath') {
+                (configurations.shade.copyRecursive().resolve() + configurations.testModExtra.copyRecursive().resolve())
+                    .collect { it.absolutePath }
+                    .join(File.pathSeparator)
+            }
        }

        testServer {
@@ -100,23 +110,23 @@ minecraft {

            mods {
                cctest {
-                    source sourceSets.test
+                    source sourceSets.testMod
                }
            }
+
+            lazyToken('minecraft_classpath') {
+                (configurations.shade.copyRecursive().resolve() + configurations.testModExtra.copyRecursive().resolve())
+                    .collect { it.absolutePath }
+                    .join(File.pathSeparator)
+            }
        }
    }

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

    accessTransformer file('src/main/resources/META-INF/accesstransformer.cfg')
+    accessTransformer file('src/testMod/resources/META-INF/accesstransformer.cfg')
 }
-
-sourceSets {
-    main.resources {
-        srcDir 'src/generated/resources'
-    }
-}
-
 repositories {
    mavenCentral()
    maven {
@@ -127,19 +137,25 @@ repositories {

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

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

    minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"

-    compileOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.3:api")
-    compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.15.2:6.0.0.9")
+    compileOnly fg.deobf("mezz.jei:jei-1.16.5:7.7.0.104:api")
+    // compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.16.5:7.1.0.313")
+    // compileOnly fg.deobf("commoble.morered:morered-1.16.5:2.1.1.0")

-    runtimeOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.3")
+    // runtimeOnly fg.deobf("mezz.jei:jei-1.16.5:7.7.0.104")

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

@@ -147,15 +163,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.5.21'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1'

-    cctJavadoc 'cc.tweaked:cct-javadoc:1.4.0'
+    testModImplementation sourceSets.main.output
+    testModExtra 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21'
+
+    cctJavadoc 'cc.tweaked:cct-javadoc:1.4.1'
 }

 // Compile tasks

+compileTestModJava {
+    dependsOn(compileJava)
+}
+
 javadoc {
    include "dan200/computercraft/api/**/*.java"
 }
@@ -173,25 +195,29 @@ task luaJavadoc(type: Javadoc) {
    options.noTimestamp = false

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

 jar {
    manifest {
-        attributes(["Specification-Title": "computercraft",
-                    "Specification-Vendor": "SquidDev",
-                    "Specification-Version": "1",
-                    "Implementation-Title": "CC: Tweaked",
-                    "Implementation-Version": "${mod_version}",
-                    "Implementation-Vendor" :"SquidDev",
-                    "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")])
+        attributes([
+            "Specification-Title"     : "computercraft",
+            "Specification-Vendor"    : "SquidDev",
+            "Specification-Version"   : "1",
+            "Implementation-Title"    : "CC: Tweaked",
+            "Implementation-Version"  : "${mod_version}",
+            "Implementation-Vendor"   : "SquidDev",
+            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+        ])
    }

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

-[compileJava, compileTestJava].forEach {
+jar.finalizedBy('reobfJar')
+
+[compileJava, compileTestJava, compileTestModJava].forEach {
    it.configure {
        options.compilerArgs << "-Xlint" << "-Xlint:-processing"
    }
@@ -210,7 +236,7 @@ processResources {
        ["git", "-C", projectDir, "log", "--format=tformat:%an%n%cn"].execute().text.split('\n').each {
            if (!blacklist.contains(it)) contributors.add(it)
        }
-    } catch(Exception e) {
+    } catch (Exception e) {
        e.printStackTrace()
    }
    inputs.property "commithash", hash
@@ -220,9 +246,11 @@ processResources {
        include 'META-INF/mods.toml'
        include 'data/computercraft/lua/rom/help/credits.txt'

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

    from(sourceSets.main.resources.srcDirs) {
@@ -237,6 +265,10 @@ sourcesJar {

 // Web tasks

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

 List<String> mkCommand(String command) {
@@ -283,7 +315,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"
 }

@@ -299,17 +333,13 @@ test {
 jacocoTestReport {
    dependsOn('test')
    reports {
-        xml.enabled true
-        html.enabled true
+        xml.required = true
+        html.required = true
    }
 }

 check.dependsOn jacocoTestReport

-
-import com.hierynomus.gradle.license.tasks.LicenseCheck
-import com.hierynomus.gradle.license.tasks.LicenseFormat
-
 license {
    mapping("java", "SLASHSTAR_STYLE")
    strictCheck true
@@ -325,7 +355,7 @@ license {
    }
 }

-[licenseTest, licenseFormatTest].forEach {
+[licenseTest, licenseFormatTest, licenseTestMod, licenseFormatTestMod].forEach {
    it.configure {
        include("**/*.java")
        header file('config/license/main.txt')
@@ -339,8 +369,8 @@ gradle.projectsEvaluated {
 }


-task licenseAPI(type: LicenseCheck);
-task licenseFormatAPI(type: LicenseFormat);
+task licenseAPI(type: LicenseCheck)
+task licenseFormatAPI(type: LicenseFormat)
 [licenseAPI, licenseFormatAPI].forEach {
    it.configure {
        source = sourceSets.main.java
@@ -353,61 +383,60 @@ 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')
-    it.setWorkingDir(exec.getWorkingDir())
-    it.setSystemProperties(exec.getSystemProperties())
-    it.setBootstrapClasspath(exec.getBootstrapClasspath())
-    it.setClasspath(exec.getClasspath())
-    it.setMain(exec.getMain())
-    it.setEnvironment(exec.getEnvironment())
-    it.setArgs(exec.getArgs())
-    it.setJvmArgs(exec.getJvmArgs())
+        // 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)
-}
-
-tasks.register('jacocoTestInGameReport', JacocoReport.class).configure {
-    it.group('test server')
-    it.description('Generate coverage reports for in-game tests (testInGame)')
-    it.dependsOn('testInGame')
-
-    it.executionData(new File(buildDir, 'jacoco/testInGame.exec'))
-    it.sourceDirectories.from(sourceSets.main.allJava.srcDirs)
-    it.classDirectories.from(new File(buildDir, 'jacocoClassDump/testInGame'))
-
-    it.reports {
-        xml.enabled true
-        html.enabled 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("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/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
+        }
+    }
+
+    check.dependsOn("jacocoTest${name}Report")
 }
-check.dependsOn('jacocoTestInGameReport')


 // Upload tasks
@@ -436,7 +465,7 @@ task checkRelease {
            ok = false
            project.logger.error("Must mention the changelog in whatsnew.md")
        } else {
-            whatsnew = whatsnew.getAt(0 ..< idx)
+            whatsnew = whatsnew.getAt(0..<idx)
        }

        // Check whatsnew and changelog match.
@@ -452,20 +481,19 @@ task checkRelease {
 }
 check.dependsOn checkRelease

+def isStable = false
+
 curseforge {
    apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
    project {
        id = '282001'
-        releaseType = 'release'
+        releaseType = isStable ? 'release' : 'alpha'
        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"
-        }
+        addGameVersion "${mc_version}"
    }
 }

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

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

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

        <!-- Imports -->
-        <module name="CustomImportOrder" />
+        <module name="CustomImportOrder">
+            <property name="customImportOrderRules"
+                value="THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE###STATIC"
+            />
+        </module>
        <module name="IllegalImport" />
        <module name="RedundantImport" />
        <module name="UnusedImports" />
--- a/config/pre-commit/config.yml
+++ b/config/pre-commit/config.yml
@@ -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/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.

+![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/SquidDev-CC/CC-Tweaked/ "CC: Tweaked on GitHub"
 [bug]: https://github.com/SquidDev-CC/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/stub/global.lua
+++ b/doc/stub/global.lua
@@ -77,7 +77,7 @@ the prompt.
@treturn string The text typed in.

@see cc.completion For functions to help with completion.
-@usage Read an string and echo it back to the user
+@usage Read a string and echo it back to the user

    write("> ")
    local msg = read()
@@ -101,6 +101,9 @@ the prompt.
    write("> ")
    local msg = read(nil, history, function(text) return completion.choice(text, choices) end, "app")
    print(msg)
+
+@changed 1.74 Added `completeFn` parameter.
+@changed 1.80pr1 Added `default` parameter.
 ]]
 function read(replaceChar, history, completeFn, default) end

@@ -108,6 +111,7 @@ function read(replaceChar, history, completeFn, default) end
 --
 -- For example, `ComputerCraft 1.93.0 (Minecraft 1.15.2)`.
 -- @usage _HOST
+-- @since 1.76
 _HOST = _HOST

 --[[- The default computer settings as defined in the ComputerCraft
@@ -121,5 +125,6 @@ An example value to disable autocompletion:
    shell.autocomplete=false,lua.autocomplete=false,edit.autocomplete=false

@usage _CC_DEFAULT_SETTINGS
+@since 1.77
 ]]
 _CC_DEFAULT_SETTINGS = _CC_DEFAULT_SETTINGS
--- a/doc/stub/os.lua
+++ b/doc/stub/os.lua
@@ -2,9 +2,6 @@

 --[[- Loads the given API into the global environment.

-**Warning** This function is deprecated. Use of this function will pollute the
-global table, use @{require} instead.
-
 This function loads and executes the file at the given path, and all global
 variables and functions exported by it will by available through the use of
 `myAPI.<function name>`, where `myAPI` is the base name of the API file.
@@ -12,7 +9,10 @@ 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.

-@deprecated Use @{require}.
+@deprecated When possible it's best to avoid using this function. It pollutes
+the global table and can mask errors.
+
+@{require} should be used to load libraries instead.
 ]]
 function loadAPI(path) end

@@ -21,7 +21,7 @@ function loadAPI(path) end
 -- This effectively removes the specified table from `_G`.
 --
 -- @tparam string name The name of the API to unload.
-- @deprecated Use @{require}.
+-- @deprecated See @{os.loadAPI} for why.
 function unloadAPI(name) end

 --[[- Pause execution of the current thread and waits for any events matching
--- a/doc/stub/turtle.lua
+++ b/doc/stub/turtle.lua
@@ -1,7 +1,7 @@
 --[[- Craft a recipe based on the turtle's inventory.

 The turtle's inventory should set up like a crafting grid. For instance, to
-craft sticks, slots 1 and 5 should contain sticks. _All_ other slots should be
+craft sticks, slots 1 and 5 should contain planks. _All_ other slots should be
 empty, including those outside the crafting "grid".

@tparam[opt=64] number limit The maximum number of crafting steps to run.
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,8 @@
 # Mod properties
-mod_version=1.97.1
+mod_version=1.98.2

 # Minecraft properties (update mods.toml when changing)
-mc_version=1.15.2
-forge_version=31.1.41
+mc_version=1.17.1
+mapping_version=2021.08.15
+forge_version=37.0.34
+# NO SERIOUSLY, UPDATE mods.toml WHEN CHANGING
--- 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.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,13 +1,265 @@
 {
  "name": "tweaked.cc",
  "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
  "requires": true,
+  "packages": {
+    "": {
+      "name": "tweaked.cc",
+      "version": "1.0.0",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "preact": "^10.5.5",
+        "tslib": "^2.0.3"
+      },
+      "devDependencies": {
+        "@rollup/plugin-typescript": "^8.2.5",
+        "requirejs": "^2.3.6",
+        "rollup": "^2.33.1",
+        "terser": "^5.3.8",
+        "typescript": "^4.0.5"
+      }
+    },
+    "node_modules/@rollup/plugin-typescript": {
+      "version": "8.2.5",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.2.5.tgz",
+      "integrity": "sha512-QL/LvDol/PAGB2O0S7/+q2HpSUNodpw7z6nGn9BfoVCPOZ0r4EALrojFU29Bkoi2Hr2jgTocTejJ5GGWZfOxbQ==",
+      "dev": true,
+      "dependencies": {
+        "@rollup/pluginutils": "^3.1.0",
+        "resolve": "^1.17.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.14.0",
+        "tslib": "*",
+        "typescript": ">=3.7.0"
+      }
+    },
+    "node_modules/@rollup/pluginutils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
+      "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "0.0.39",
+        "estree-walker": "^1.0.1",
+        "picomatch": "^2.2.2"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "0.0.39",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
+      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
+      "dev": true
+    },
+    "node_modules/buffer-from": {
+      "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/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/estree-walker": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
+      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "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"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz",
+      "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/path-parse": {
+      "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.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.14",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.5.14.tgz",
+      "integrity": "sha512-KojoltCrshZ099ksUZ2OQKfbH66uquFoxHSbnwKbTJHeQNvx42EmC7wQVWNuDt6vC5s3nudRHFtKbpY4ijKlaQ==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/preact"
+      }
+    },
+    "node_modules/requirejs": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz",
+      "integrity": "sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==",
+      "dev": true,
+      "bin": {
+        "r_js": "bin/r.js",
+        "r.js": "bin/r.js"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/resolve": {
+      "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.2.0",
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "2.56.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.56.2.tgz",
+      "integrity": "sha512-s8H00ZsRi29M2/lGdm1u8DJpJ9ML8SUOpVVBd33XNeEeL3NVaTiUcSBHzBdF3eAyR0l7VSpsuoVUGrRHq7aPwQ==",
+      "dev": true,
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "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==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.1.tgz",
+      "integrity": "sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^2.20.0",
+        "source-map": "~0.7.2",
+        "source-map-support": "~0.5.19"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/tslib": {
+      "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.3.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
+      "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    }
+  },
  "dependencies": {
    "@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.2.5",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.2.5.tgz",
+      "integrity": "sha512-QL/LvDol/PAGB2O0S7/+q2HpSUNodpw7z6nGn9BfoVCPOZ0r4EALrojFU29Bkoi2Hr2jgTocTejJ5GGWZfOxbQ==",
      "dev": true,
      "requires": {
        "@rollup/pluginutils": "^3.1.0",
@@ -32,9 +284,9 @@
      "dev": true
    },
    "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
    },
    "commander": {
@@ -50,9 +302,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
    },
@@ -72,30 +324,30 @@
      }
    },
    "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.6.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz",
+      "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==",
      "dev": true,
      "requires": {
        "has": "^1.0.3"
      }
    },
    "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.5.14",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.5.14.tgz",
+      "integrity": "sha512-KojoltCrshZ099ksUZ2OQKfbH66uquFoxHSbnwKbTJHeQNvx42EmC7wQVWNuDt6vC5s3nudRHFtKbpY4ijKlaQ=="
    },
    "requirejs": {
      "version": "2.3.6",
@@ -104,22 +356,22 @@
      "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.56.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.56.2.tgz",
+      "integrity": "sha512-s8H00ZsRi29M2/lGdm1u8DJpJ9ML8SUOpVVBd33XNeEeL3NVaTiUcSBHzBdF3eAyR0l7VSpsuoVUGrRHq7aPwQ==",
      "dev": true,
      "requires": {
-        "fsevents": "~2.1.2"
+        "fsevents": "~2.3.2"
      }
    },
    "source-map": {
@@ -147,9 +399,9 @@
      }
    },
    "terser": {
-      "version": "5.3.8",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.8.tgz",
-      "integrity": "sha512-zVotuHoIfnYjtlurOouTazciEfL7V38QMAOhGqpXDEg6yT13cF4+fEP9b0rrCEQTn+tT46uxgFsTZzhygk+CzQ==",
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.1.tgz",
+      "integrity": "sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg==",
      "dev": true,
      "requires": {
        "commander": "^2.20.0",
@@ -158,14 +410,14 @@
      }
    },
    "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.3.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
+      "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
      "dev": true
    }
  }
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
    "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",
--- 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/computer_advanced.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_advanced.json
@@ -11,10 +11,14 @@
      "conditions": {
        "items": [
          {
-            "item": "minecraft:redstone"
+            "items": [
+              "minecraft:redstone"
+            ]
          },
          {
-            "item": "minecraft:gold_ingot"
+            "items": [
+              "minecraft:gold_ingot"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_command.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_command.json
@@ -11,7 +11,9 @@
      "conditions": {
        "items": [
          {
-            "item": "minecraft:command_block"
+            "items": [
+              "minecraft:command_block"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_1.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_1.json
@@ -11,7 +11,9 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:disk_drive"
+            "items": [
+              "computercraft:disk_drive"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_10.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_10.json
@@ -11,7 +11,9 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:disk_drive"
+            "items": [
+              "computercraft:disk_drive"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_11.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_11.json
@@ -11,7 +11,9 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:disk_drive"
+            "items": [
+              "computercraft:disk_drive"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_12.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_12.json
@@ -11,7 +11,9 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:disk_drive"
+            "items": [
+              "computercraft:disk_drive"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_13.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_13.json
@@ -11,7 +11,9 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:disk_drive"
+            "items": [
+              "computercraft:disk_drive"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_14.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_14.json
@@ -11,7 +11,9 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:disk_drive"
+            "items": [
+              "computercraft:disk_drive"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_15.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_15.json
@@ -11,7 +11,9 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:disk_drive"
+            "items": [
+              "computercraft:disk_drive"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_16.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_16.json
@@ -11,7 +11,9 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:disk_drive"
+            "items": [
+              "computercraft:disk_drive"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_2.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_2.json
@@ -11,7 +11,9 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:disk_drive"
+            "items": [
+              "computercraft:disk_drive"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_3.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_3.json
@@ -11,7 +11,9 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:disk_drive"
+            "items": [
+              "computercraft:disk_drive"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_4.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_4.json
@@ -11,7 +11,9 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:disk_drive"
+            "items": [
+              "computercraft:disk_drive"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_5.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_5.json
@@ -11,7 +11,9 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:disk_drive"
+            "items": [
+              "computercraft:disk_drive"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_6.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_6.json
@@ -11,7 +11,9 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:disk_drive"
+            "items": [
+              "computercraft:disk_drive"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_7.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_7.json
@@ -11,7 +11,9 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:disk_drive"
+            "items": [
+              "computercraft:disk_drive"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_8.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_8.json
@@ -11,7 +11,9 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:disk_drive"
+            "items": [
+              "computercraft:disk_drive"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_9.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_9.json
@@ -11,7 +11,9 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:disk_drive"
+            "items": [
+              "computercraft:disk_drive"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/speaker.json
@@ -11,10 +11,14 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:pocket_computer_advanced"
+            "items": [
+              "computercraft:pocket_computer_advanced"
+            ]
          },
          {
-            "item": "computercraft:speaker"
+            "items": [
+              "computercraft:speaker"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_advanced.json
@@ -11,10 +11,14 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:pocket_computer_advanced"
+            "items": [
+              "computercraft:pocket_computer_advanced"
+            ]
          },
          {
-            "item": "computercraft:wireless_modem_advanced"
+            "items": [
+              "computercraft:wireless_modem_advanced"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_normal.json
@@ -11,10 +11,14 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:pocket_computer_advanced"
+            "items": [
+              "computercraft:pocket_computer_advanced"
+            ]
          },
          {
-            "item": "computercraft:wireless_modem_normal"
+            "items": [
+              "computercraft:wireless_modem_normal"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_advanced.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_advanced.json
@@ -21,7 +21,9 @@
      "conditions": {
        "items": [
          {
-            "item": "minecraft:golden_apple"
+            "items": [
+              "minecraft:golden_apple"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_normal.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_normal.json
@@ -21,7 +21,9 @@
      "conditions": {
        "items": [
          {
-            "item": "minecraft:golden_apple"
+            "items": [
+              "minecraft:golden_apple"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/speaker.json
@@ -11,10 +11,14 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:pocket_computer_normal"
+            "items": [
+              "computercraft:pocket_computer_normal"
+            ]
          },
          {
-            "item": "computercraft:speaker"
+            "items": [
+              "computercraft:speaker"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/wireless_modem_advanced.json
@@ -11,10 +11,14 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:pocket_computer_normal"
+            "items": [
+              "computercraft:pocket_computer_normal"
+            ]
          },
          {
-            "item": "computercraft:wireless_modem_advanced"
+            "items": [
+              "computercraft:wireless_modem_advanced"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/wireless_modem_normal.json
@@ -11,10 +11,14 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:pocket_computer_normal"
+            "items": [
+              "computercraft:pocket_computer_normal"
+            ]
          },
          {
-            "item": "computercraft:wireless_modem_normal"
+            "items": [
+              "computercraft:wireless_modem_normal"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printed_book.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printed_book.json
@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "computercraft:printed_book"
+    ]
+  },
+  "criteria": {
+    "has_printer": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "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,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "computercraft:printed_pages"
+    ]
+  },
+  "criteria": {
+    "has_printer": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "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/computercraft/turtle_advanced/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/speaker.json
@@ -11,10 +11,14 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:turtle_advanced"
+            "items": [
+              "computercraft:turtle_advanced"
+            ]
          },
          {
-            "item": "computercraft:speaker"
+            "items": [
+              "computercraft:speaker"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/wireless_modem_advanced.json
@@ -11,10 +11,14 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:turtle_advanced"
+            "items": [
+              "computercraft:turtle_advanced"
+            ]
          },
          {
-            "item": "computercraft:wireless_modem_advanced"
+            "items": [
+              "computercraft:wireless_modem_advanced"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/wireless_modem_normal.json
@@ -11,10 +11,14 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:turtle_advanced"
+            "items": [
+              "computercraft:turtle_advanced"
+            ]
          },
          {
-            "item": "computercraft:wireless_modem_normal"
+            "items": [
+              "computercraft:wireless_modem_normal"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/crafting_table.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/crafting_table.json
@@ -11,10 +11,14 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:turtle_advanced"
+            "items": [
+              "computercraft:turtle_advanced"
+            ]
          },
          {
-            "item": "minecraft:crafting_table"
+            "items": [
+              "minecraft:crafting_table"
+            ]
          }
        ]
      }
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_axe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_axe.json
@@ -11,10 +11,14 @@
      "conditions": {
        "items": [
          {
-            "item": "computercraft:turtle_advanced"
+            "items": [
+              "computercraft:turtle_advanced"
+            ]
          },
          {
-            "item": "minecraft:diamond_axe"
+            "items": [
+              "minecraft:diamond_axe"
+            ]
          }
        ]
      }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jonathan Coates	bbf3e48763	Increase timeout of some more tests	2021-08-22 18:01:06 +01:00
Jonathan Coates	92fe1d4bc2	Merge branch 'mc-1.16.x' into mc-1.17.x	2021-08-22 17:50:33 +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	4d591c600c	Use clearRemoved rather than onLoad Latter is broken on Forge right now.	2021-08-20 21:48:34 +01:00
Jonathan Coates	0a8e427c61	Merge branch 'mc-1.16.x' into mc-1.17.x	2021-08-20 21:47:55 +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	0a537eaeee	Rewrite some in-hand rendering code - Fix missing shader for printout render type - Use current buffer provider for pocket computers rather than the tesselator. This requires us to use a non-depth-writing terminal + depth blocker, as otherwise one gets z-fighting. - Thus refactor some of the shaders to be terminal wide, not just for monitors. Fixes #894	2021-08-17 13:00:52 +01: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	aa857c1be3	Start using Java's instanceof pattern matching Well, not really pattern matching, but it's still an improvement!	2021-08-08 12:45:30 +01:00
Jonathan Coates	e4ced551eb	Remove most of the turtle events I don't think anybody actually used these, and I'm not convinced they had much value anyway. It might be worth switching the refueling code to work as a registry instead, though events are kinda nice.	2021-08-08 12:43:03 +01:00
Jonathan Coates	6eec9ba1a3	Merge branch 'mc-1.16.x' into mc-1.17.x	2021-08-08 12:40:00 +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	a8f675c59d	Make current branch detection more robust	2021-08-06 18:04:05 +01:00
Jonathan Coates	bb1ebaee4f	Bump Forge and prepare for a release I've been shown up[1]. Unacceptable! [1]: https://twitter.com/SangarWasTaken/status/1423676992336060417	2021-08-06 17:25:34 +01:00
Jonathan Coates	bb1183d274	Update to Minecraft 1.17.1 - Remap everything to use MojMap class names too. This is what Forge uses, so \o/. This does NOT currently rename any classes to use suffix notation or BlockEntity. That will come in a later change. We do however rename references of "World" to "Level". - Move the test mod into a separate "cctest" source set. As Forge now works using Jigsaw we cannot have multiple mods defining the same package, which causes problems with our JUnit test classes. - Remove our custom test framework and replace it with vanilla's (this is no longer stripped from the jar). RIP kotlin coroutines. It's still worth using Kotlin here though, just for extension methods. - Other 1.17-related changes: - Use separate tile/block entity tick methods for server and client side, often avoiding ticking at all on the client. - Switch much of the monitor rendering code to use vanilla's built-in shader system. It's still an incredibly ugly hack, so not really expecting this to work with any rendering mods, but we'll cross that bridge when we come to it.	2021-08-06 17:18:09 +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
Jonathan Coates	bdd38fb061	Update changelog and whatsnew for release	2021-08-02 20:15:32 +01:00
DrHesperus	06f35e4997	Update and rename	2021-08-02 19:49:50 +01:00
Jonathan Coates	2d95c32892	Reformat language files	2021-08-02 19:48:16 +01:00
Jonathan Coates	6f4d4540b2	Update location of several langauge files Looks like weblate was misconfigured here. These should be picked up - fingers crossed!	2021-08-02 19:05:10 +01:00
Jonathan Coates	96316cddaa	Fix monitor resize checks being entirely wrong Fixes #879	2021-08-02 18:46:00 +01:00
Jonathan Coates	e84ddef877	Bump version to 1.98.0	2021-08-01 09:02:05 +01:00
Jonathan Coates	11b40bb6d5	Identify unknown upgrades as ComputerCraft instead When the mod id is null, the namespace is given as "minecraft". This is not what we want, so use CC there instead.	2021-08-01 08:48:02 +01:00
Jonathan Coates	686c6a4c44	Use cc.strings.wrap inside slowWrite Means we don't end up re-wrapping text and producing incorrect results. Fixes #865	2021-08-01 08:43:37 +01:00
Jonathan Coates	a1821035d3	Add a bit of version information to the bios It's probably the lowest traffic module :p. Also (somewhat) improve the deprecated messages in os.loadAPI. We really need a proper article on require and converting from os.loadAPI.	2021-07-30 22:45:51 +01:00
Jonathan Coates	7b8650bbc8	Fix fs.getCapacity docs Slightly embarassing the state this was in	2021-07-29 09:59:21 +00:00
Jonathan Coates	0285260e97	Merge branch 'mc-1.15.x' into mc-1.16.x	2021-07-28 16:18:27 +01:00
Jonathan Coates	7012ac7163	Merge branch 'mc-1.15.x' into mc-1.16.x	2021-07-25 16:42:22 +01:00
Jonathan Coates	5b57f7509d	Add back executeMainThreadTask Closes #868	2021-07-24 12:04:21 +01:00
Jonathan Coates	7bcc16bb40	Some examples for rednet	2021-07-23 10:52:44 +00:00
Jonathan Coates	31e6746bdf	Reword community links a bit	2021-07-21 23:20:27 +01:00
Jonathan Coates	c39bf3eb4d	Hopefully block people creating blank issues	2021-07-21 23:18:32 +01:00
JackMacWindows	8b952e7e1e	Fix `parallel.*` hanging when called with no args (#863 )	2021-07-19 11:20:35 +01:00
SkyTheCodeMaster	04e97f7b86	Fix & enhance some docs (#857 )	2021-07-18 17:36:09 +01:00
Jonathan Coates	74752c561c	Correctly extract parse errors from build reports	2021-07-18 16:17:11 +01:00
Jonathan Coates	ee96458b56	Merge pull request #862 from Angalexik/typo Fix typo in paintutils documentation	2021-07-18 12:16:19 +01:00
Angalexik	333410e4cd	Fixed typo in paintutils documentation	2021-07-18 12:37:16 +02:00
Jonathan Coates	999a39a3e6	Merge branch 'mc-1.15.x' into mc-1.16.x	2021-07-15 13:05:31 +01:00
Jonathan Coates	347affcc5c	Merge pull request #859 from emiliskiskis/patch-1 Fix typo in turtle.craft documentation	2021-07-12 14:31:28 +01:00
Emilis Kiškis	8ebe34b8da	Fix typo in turtle.craft documentation Description wrote "to craft sticks, slots should contain sticks", whereas it should say "planks" in the second part.	2021-07-11 11:03:41 +03:00
Jonathan Coates	7086cb8a02	Merge pull request #848 from SkyTheCodeMaster/patch-3 Turn a nil to a string	2021-07-05 06:16:05 +01:00
SkyTheCodeMaster	8dbc930c2f	Turn a nil to a string Makes a `nil` a string inside of an expect in `define`, allowing `nil` to be passed.	2021-07-04 20:54:55 -04:00
Jonathan Coates	61eb67849d	Some fs examples See #566	2021-07-03 14:05:41 +01:00
Jonathan Coates	0d22270f8b	Publish docs from 1.16 instead	2021-07-02 21:49:19 +01:00
Jonathan Coates	abb9c14256	Bump Forge Gradle version	2021-07-02 21:48:28 +01:00
Jonathan Coates	815e534dc6	Merge branch 'mc-1.15.x' into mc-1.16.x	2021-07-02 21:03:39 +01:00
Jonathan Coates	efa2be2821	Update changelog for 1.16.x-only features	2021-06-28 22:58:13 +01:00
Jonathan Coates	670db97fc7	Merge branch 'mc-1.15.x' into mc-1.16.x	2021-06-28 22:52:05 +01:00
Jonathan Coates	a5bca3f0df	File uploading (#840 )	2021-06-28 22:49:45 +01:00
Jonathan Coates	5ef8d52c13	Merge branch 'mc-1.15.x' into mc-1.16.x	2021-06-28 18:37:24 +01:00
Jonathan Coates	3ab3213290	Try the new issue template system	2021-06-24 08:31:41 +00:00
Jonathan Coates	9bd662d8dc	Fix CraftTweaker actions being applied twice By default CT applies them on the client and server. In a single player world, this means we try to create two upgrades, which obviously fails! Fixes #721	2021-06-22 19:39:46 +01:00
Jonathan Coates	df7a40354e	Merge branch 'mc-1.15.x' into mc-1.16.x	2021-06-19 15:18:12 +01:00
Jonathan Coates	2d3e88ef59	Replace mixin with access transformers Hadn't realised I could use these to touch final modifiers! More importantly, Mixin doesn't work with FG 5.0, so we needed an alternative :).	2021-06-19 12:52:07 +01:00
Jonathan Coates	0bfe960cbd	Merge branch 'mc-1.15.x' into mc-1.16.x	2021-06-19 12:41:30 +01:00
Jonathan Coates	db2cde4a4c	Add MoreRed support I've written three or four integrations with bundled cables now over the various versions, and I'm still not convinced this one is right. It appears to work though, so we'll see. We need depend on the main jar here (rather than the API jar), as otherwise our javadoc tools fails - the API references some internal classes which aren't on our classpath. It might be nice to write tests for this (and CT) in the future - goodness knows these features are fragile - but that'll require some more gradle work which I don't want to do right now. Closes #772	2021-06-05 14:48:38 +01:00
Jonathan Coates	5eec7d9172	Bump to 1.16.5 I don't think anyone still uses 1.16.4, so no point worrying about it. Closes #808	2021-06-05 12:32:40 +01:00
Jonathan Coates	8b9735d72e	Fix background not rendering on (pocket) computers	2021-06-05 11:46:10 +01:00
Jonathan Coates	1866916cb8	Fix coloured pocket computers using the wrong texture	2021-06-05 11:36:36 +01:00
Jonathan Coates	f38a6a9d43	Merge branch 'mc-1.15.x' into mc-1.16.x	2021-06-05 11:36:30 +01:00
Jonathan Coates	7f9b86a78e	Add basic JMX monitoring on dedicated servers Closes #482	2021-05-27 21:36:56 +01:00
Jonathan Coates	f0ba1108d5	Merge branch 'mc-1.15.x' into mc-1.16.x	2021-05-20 19:03:56 +01:00
Jonathan Coates	8b8692ba53	Merge branch 'mc-1.15.x' into mc-1.16.x	2021-05-20 18:30:10 +01:00
Jonathan Coates	f387730b88	Merge branch 'mc-1.15.x' into mc-1.16.x	2021-04-24 11:50:23 +01:00
Jonathan Coates	8c56b6a7be	Merge branch 'mc-1.15.x' into mc-1.16.x	2021-03-12 09:26:15 +00:00
Jonathan Coates	7514cf7320	Mark as compatible with 1.16.{4,5} Closes #694	2021-01-24 21:23:29 +00:00
FensieRenaud	417fda3019	Serialise sparse arrays into JSON (#685 )	2021-01-18 16:44:39 +00:00
Jonathan Coates	23bf33c454	Use mixins to construct the TestFunctionInfo class There's some funky things going on here, but thankfully they're limited to test code.	2021-01-16 12:40:00 +00:00
Jonathan Coates	0be030c497	Merge branch 'mc-1.15.x' into mc-1.16.x	2021-01-16 11:38:59 +00:00
Jonathan Coates	a3a9684505	Widen version range to include 1.16.5 Building against 1.16.4 for now to ensure we don't break it. Hopefully we can bump this too once most people have migrated. Will push a release tomorrow - don't want to be sorting out merge conflicts at 23:30.	2021-01-15 23:26:01 +00:00
Jonathan Coates	c5694ea966	Merge branch 'mc-1.15.x' into mc-1.16.x	2021-01-09 19:25:33 +00:00
Jonathan Coates	7b476cb24b	Remove usage of deprecated event constructor This requires a Forge bump, but probably no harm in doing so anyway. We're on an ancient (2nd Nov) version. Fixes #665.	2021-01-09 18:49:40 +00:00
Jonathan Coates	7ca261d763	Merge branch 'mc-1.15.x' into mc-1.16.x	2021-01-09 18:32:40 +00:00
Jonathan Coates	1edb7288b9	Merge branch 'mc-1.15.x' into mc-1.16.x	2021-01-06 22:39:54 +00:00
Jonathan Coates	4af5bcc0b0	Fix serveral 1.15 -> 1.16 issues Well, strictly speaking some mapping changes.	2020-12-25 16:59:09 +00:00
Jonathan Coates	96c577482d	Merge branch 'mc-1.15.x' into mc-1.16.x	2020-12-25 16:43:32 +00:00
SquidDev	61f8e97f6b	Force the monitor depth blocker to be flushed As explained in the comment, "built-in" rendering types are now manually rendered ("finish"ed) before calling finish() on the main renderer. This means our depth blocker hasn't actually been drawn (if a monitor is the last TE to be rendered), and so blocks pass the depth test when they shouldn't. Fixes #599	2020-12-11 13:09:16 +00:00
SquidDev	c92f06cfd9	Bump deps to 1.16.4	2020-12-11 13:08:24 +00:00
Stephen Gibson	c9f3d315c0	Fix epoch documentation to use milliseconds (#580 )	2020-11-13 14:32:49 +00:00
SquidDev	83df64e520	Merge branch 'mc-1.15.x' into mc-1.16.x	2020-11-07 12:46:10 +00:00
SquidDev	ab232bd689	Update to MC 1.16.4 Just some mapping changes really	2020-11-03 15:33:10 +00:00
SquidDev	5bf367af9f	Merge branch 'mc-1.15.x' into mc-1.16.x	2020-10-23 17:45:11 +01:00
SquidDev	4766833cf2	Bump JEI/crafttweaker versions In my defence, they weren't out when I started the 1.15 update.	2020-10-20 17:38:59 +01:00
SquidDev	71563a52ff	Let's make this a proper release	2020-10-04 11:31:06 +01:00
SquidDev	0c6e7b5db5	Merge branch 'mc-1.15.x' into mc-1.16.x	2020-10-04 11:24:42 +01:00
SquidDev	72c1d451fe	Mark the release as beta-quality	2020-09-12 10:47:19 +01:00
SquidDev	8b4a01df27	Update to Minecraft 1.16.3 I hope the Fabric folks now realise this is gonna be a race of who can update first :p. Either way, this was a very easy update - only changes were due to unrelated Forge changes.	2020-09-12 10:45:59 +01:00
SquidDev	d0a973fa46	Merge branch 'mc-1.15.x' into mc-1.16.x	2020-09-12 09:29:21 +01:00
SquidDev	26c12ac1a9	Bump version to 1.91.1	2020-09-04 17:29:35 +01:00
SquidDev	2c67849b35	Fix NPE when turtles interact with an entity Closes #531	2020-08-27 17:17:03 +01:00
SquidDev	7809a2eddd	Merge branch 'mc-1.15.x' into mc-1.16.x	2020-08-23 15:46:17 +01:00
SquidDev	e8e9294fdf	Correctly check for success or consume No, I don't really know what the difference is either :). Closes #518.	2020-08-22 19:28:02 +01:00
SquidDev	99581e1f40	Initial update to 1.16.2 Seems to load fine, but not done any proper testing.	2020-08-14 22:00:03 +01:00
SquidDev	29646a7f61	Bump version to 1.90.3	2020-07-27 19:07:06 +01:00
SquidDev	50d2712581	Resolve CC's save location to the world dir Fixes #509	2020-07-27 19:04:57 +01:00
SquidDev	3093f882d8	Fix selected slot now showing in the turtle GUI	2020-07-27 18:37:07 +01:00
SquidDev	e5cf0d1c61	Update mappings	2020-07-27 18:26:42 +01:00
SquidDev	6b102a8142	Merge branch 'mc-1.15.x' into mc-1.16.x	2020-07-25 12:08:33 +01:00
SquidDev	c8a6888a2f	Fix styles not being saved Styles have been changed to be immutable, meaning that we were never updating them! Fixes #499.	2020-07-25 11:19:04 +01:00
SquidDev	9ce33f8a3f	Add back missing override of getPositionVec This was removed in the initial update (`46595e73df`) because I got terribly confused over mappings and I forgot to add it back. Fixes #505	2020-07-25 10:56:50 +01:00
SquidDev	a1dcd59d95	Update to latest Forge Fixes #498	2020-07-18 15:11:57 +01:00
SquidDev	2a17585702	Merge branch 'mc-1.15.x' into mc-1.16.x	2020-07-18 12:24:49 +01:00
SquidDev	087c305b0d	Fix non-inventory GUIs rendering labels	2020-07-18 12:17:02 +01:00
SquidDev	31764f6d65	Register various gold items as piglin_loved	2020-07-18 11:14:55 +01:00
SquidDev	4efde2b294	Merge branch 'mc-1.15.x' into mc-1.16.x	2020-07-18 10:34:29 +01:00
SquidDev	46595e73df	Initial update to Minecraft 1.16.1 A lot is broken, but at least we can get in game: - GUIs render a whole bunch of additional "inventory" text, which we really don't want. - Computers load from the wrong location. - There's some issues with using Forge's tags from outside of JSON recipes. We need to work out why.	2020-07-11 20:36:10 +01:00