Don't run CI on 1.12

Our cable has a rather complex getCollisionBoundingBox implementation,
which (combined with computing the actual block state) ends up taking an
awful lot of time.

This shaves 9% off each frame. I don't miss 1.12 one bit.

.editorconfig

@@ -17,5 +17,6 @@ indent_size = 2
 [*.yml]
 indent_size = 2
 
+
 [*.properties]
 insert_final_newline = false

.gitattributes

@@ -1,2 +0,0 @@
-# Ignore changes in generated files
-src/generated/resources/data/** linguist-generated

.github/ISSUE_TEMPLATE/bug_report.md

@@ -12,5 +12,4 @@ labels: bug
 ## Useful information to include:
  - Minecraft version
  - CC: Tweaked version
- - Logs: These will be located in the `logs/` directory of your Minecraft instance. Please upload them as a gist or directly into this editor.
  - Detailed reproduction steps: sometimes I can spot a bug pretty easily, but often it's much more obscure. The more information I have to help reproduce it, the quicker it'll get fixed.

.github/workflows/main-ci.yml

@@ -1,50 +0,0 @@
-name: Build
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up Java 8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 8
-
-    - name: Cache gradle dependencies
-      uses: actions/cache@v1
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('gradle.properties') }}
-        restore-keys: |
-          ${{ runner.os }}-gradle-
-
-    - name: Build with Gradle
-      run: ./gradlew build --no-daemon || ./gradlew build --no-daemon
-
-    - name: Upload Jar
-      uses: actions/upload-artifact@v1
-      with:
-        name: CC-Tweaked
-        path: build/libs
-
-    - name: Upload Coverage
-      run: bash <(curl -s https://codecov.io/bash)
-      continue-on-error: true
-
-    - name: Generate Java documentation stubs
-      run: ./gradlew luaJavadoc --no-daemon
-
-    - name: Lint Lua code
-      run: |
-        test -d bin || mkdir bin
-        test -f bin/illuaminate || wget -q -Obin/illuaminate https://squiddev.cc/illuaminate/linux-x86-64/illuaminate
-        chmod +x bin/illuaminate
-        bin/illuaminate lint
-
-    - name: Check whitespace
-      run: python3 tools/check-lines.py

.github/workflows/make-doc.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-DEST="${GITHUB_REF#refs/*/}"
-echo "Uploading docs to https://tweaked.cc/$DEST"
-
-# Setup ssh key
-mkdir -p "$HOME/.ssh/"
-echo "$SSH_KEY" > "$HOME/.ssh/key"
-chmod 600 "$HOME/.ssh/key"
-
-# And upload
-rsync -avc -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no -p $SSH_PORT" \
-      "$GITHUB_WORKSPACE/build/docs/lua/" \
-      "$SSH_USER@$SSH_HOST:/var/www/tweaked.cc/$DEST"
-rsync -avc -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no -p $SSH_PORT" \
-      "$GITHUB_WORKSPACE/build/docs/javadoc/" \
-      "$SSH_USER@$SSH_HOST:/var/www/tweaked.cc/$DEST/javadoc"

.github/workflows/make-doc.yml

@@ -1,50 +0,0 @@
-name: Build documentation
-
-on:
-  push:
-    branches:
-    - mc-1.15.x
-
-jobs:
-  make_doc:
-    name: Build
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: Set up Java 8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 8
-
-    - name: Cache gradle dependencies
-      uses: actions/cache@v1
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('gradle.properties') }}
-        restore-keys: |
-          ${{ runner.os }}-gradle-
-
-    - name: Setup illuaminate
-      run: |
-        test -d bin || mkdir bin
-        test -f bin/illuaminate || wget -q -Obin/illuaminate https://squiddev.cc/illuaminate/linux-x86-64/illuaminate
-        chmod +x bin/illuaminate
-
-    - name: Setup node
-      run: npm ci
-
-    - name: Build with Gradle
-      run: ./gradlew compileJava --no-daemon || ./gradlew compileJava --no-daemon
-
-    - name: Generate documentation
-      run: ./gradlew docWebsite javadoc --no-daemon
-
-    - name: Upload documentation
-      run: .github/workflows/make-doc.sh 2> /dev/null
-      env:
-        SSH_KEY:  ${{ secrets.SSH_KEY  }}
-        SSH_USER: ${{ secrets.SSH_USER }}
-        SSH_HOST: ${{ secrets.SSH_HOST }}
-        SSH_PORT: ${{ secrets.SSH_PORT }}

.gitignore

@@ -3,8 +3,8 @@
 /logs
 /build
 /out
-/doc/out/
-/node_modules
+/doc/**/*.html
+/doc/index.json
 
 # Runtime directories
 /run
@@ -18,12 +18,8 @@
 .gradle
 *.DS_Store
 
-/.classpath
-/.project
-/.settings
-/.vscode
+.classpath
+.project
+.settings/
 bin/
 *.launch
-
-/src/generated/resources/.cache
-/src/web/mount/*.d.ts

CONTRIBUTING.md

@@ -10,10 +10,10 @@ do use the issue templates - they provide a useful hint on what information to p
 
 ## Developing
 In order to develop CC: Tweaked, you'll need to download the source code and then run it. This is a pretty simple
-process. When building on Windows, Use `gradlew.bat` instead of `./gradlew`.
+process.
 
  - **Clone the repository:** `git clone https://github.com/SquidDev-CC/CC-Tweaked.git && cd CC-Tweaked`
- - **Setup Forge:** `./gradlew build`
+ - **Setup Forge:** `./gradlew setupDecompWorkspace`
  - **Run Minecraft:** `./gradlew runClient` (or run the `GradleStart` class from your IDE).
 
 If you want to run CC:T in a normal Minecraft instance, run `./gradlew build` and copy the `.jar` from `build/libs`.
@@ -29,13 +29,8 @@ are run whenever you submit a PR, it's often useful to run this before committin
  - **[illuaminate]:** Checks Lua code for semantic and styleistic issues. See [the usage section][illuaminate-usage] for
    how to download and run it.
 
-## Translations
-Translations are managed through [Weblate], an online interface for managing language strings. This is synced
-automatically with GitHub, so please don't submit PRs adding/changing translations!
-
 [new-issue]: https://github.com/SquidDev-CC/CC-Tweaked/issues/new/choose "Create a new issue"
 [community]: README.md#Community "Get in touch with the community."
 [checkstyle]: https://checkstyle.org/
 [illuaminate]: https://github.com/SquidDev/illuaminate/
 [illuaminate-usage]: https://github.com/SquidDev/illuaminate/blob/master/README.md#usage
-[weblate]: https://i18n.tweaked.cc/projects/cc-tweaked/minecraft/

README.md

@@ -50,23 +50,20 @@ I'd generally recommend you don't contact me directly (email, DM, etc...) unless
 report exploits). You'll get a far quicker response if you ask the whole community!
 
 ## 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)
-dependency in your `mods.toml` file, with the appropriate version bounds, to ensure that API functionality you depend
-on is present.
+If you want to depend on CC: Tweaked, we have a maven repo. However, you should be wary that some functionality is only
+exposed by CC:T's API and not vanilla ComputerCraft. If you wish to support all variations of ComputerCraft, I recommend
+using [cc.crzd.me's maven](https://cc.crzd.me/maven/) instead.
 
 ```groovy
-repositories {
+dependencies {
   maven { url 'https://squiddev.cc/maven/' }
 }
 
 dependencies {
-  implementation fg.deobf("org.squiddev:cc-tweaked-${mc_version}:${cct_version}")
+  implementation "org.squiddev:cc-tweaked-${mc_version}:${cct_version}"
 }
 ```
 
 You should also be careful to only use classes within the `dan200.computercraft.api` package. Non-API classes are
 subject to change at any point. If you depend on functionality outside the API, file an issue, and we can look into
 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/).

build.gradle

@@ -1,7 +1,8 @@
+
+// For those who want the bleeding edge
 buildscript {
     repositories {
         jcenter()
-        mavenCentral()
         maven {
             name = "forge"
             url = "https://files.minecraftforge.net/maven"
@@ -9,8 +10,8 @@ buildscript {
     }
     dependencies {
         classpath 'com.google.code.gson:gson:2.8.1'
-        classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.187'
-        classpath 'net.sf.proguard:proguard-gradle:6.1.0beta2'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+        classpath 'net.sf.proguard:proguard-gradle:6.1.0beta1'
         classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
     }
 }
@@ -23,7 +24,7 @@ plugins {
     id "com.github.breadmoirai.github-release" version "2.2.4"
 }
 
-apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'org.ajoberstar.grgit'
 apply plugin: 'maven-publish'
 apply plugin: 'maven'
@@ -33,97 +34,48 @@ version = mod_version
 group = "org.squiddev"
 archivesBaseName = "cc-tweaked-${mc_version}"
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
-
 minecraft {
-    runs {
-        client {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
+    version = "${mc_version}-${forge_version}"
+    runDir = "run"
+    replace '${version}', mod_version
 
-            mods {
-                computercraft {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        server {
-            workingDirectory project.file("run/server-${mc_version}")
-            property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                computercraft {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        data {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
-            property 'forge.logging.console.level', 'debug'
-
-            args '--mod', 'computercraft', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-            mods {
-                computercraft {
-                    source sourceSets.main
-                }
-            }
-        }
-    }
-
-    mappings channel: 'snapshot', version: "${mappings_version}".toString()
-
-    accessTransformer file('src/main/resources/META-INF/accesstransformer.cfg')
-}
-
-sourceSets {
-    main.resources {
-        srcDir 'src/generated/resources'
-    }
+    mappings = mappings_version
+    makeObfSourceJar = false
 }
 
 repositories {
-    mavenCentral()
     maven {
         name "SquidDev"
         url "https://squiddev.cc/maven"
     }
+    ivy {
+        name "Charset"
+        artifactPattern "https://asie.pl/files/mods/Charset/LibOnly/[module]-[revision](-[classifier]).[ext]"
+    }
 }
 
 configurations {
     shade
     compile.extendsFrom shade
     deployerJars
-    cctJavadoc
 }
 
 dependencies {
     checkstyle "com.puppycrawl.tools:checkstyle:8.25"
 
-    minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
+    deobfProvided "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.554"
+    deobfProvided "MCMultiPart2:MCMultiPart:2.5.3"
+    deobfProvided "mezz.jei:jei_1.12.2:4.15.0.269:api"
+    deobfProvided "pl.asie:Charset-Lib:0.5.4.6"
 
-    compileOnly fg.deobf("mezz.jei:jei-1.16.4:7.6.0.58:api")
-    compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.16.4:7.0.0.63")
+    runtime "mezz.jei:jei_1.12.2:4.15.0.269"
 
-    runtimeOnly fg.deobf("mezz.jei:jei-1.16.4:7.6.0.58")
+    shade 'org.squiddev:Cobalt:0.5.5'
 
-    compileOnly 'com.google.auto.service:auto-service:1.0-rc7'
-    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc7'
-
-    shade 'org.squiddev:Cobalt:0.5.1-SNAPSHOT'
-
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
-    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.junit.jupiter:junit-jupiter-api:5.4.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.2'
 
     deployerJars "org.apache.maven.wagon:wagon-ssh:3.0.0"
-
-    cctJavadoc 'cc.tweaked:cct-javadoc:1.3.0'
 }
 
 // Compile tasks
@@ -132,35 +84,11 @@ javadoc {
     include "dan200/computercraft/api/**/*.java"
 }
 
-task luaJavadoc(type: Javadoc) {
-    description "Generates documentation for Java-side Lua functions."
-    group "documentation"
-
-    source = sourceSets.main.allJava
-    destinationDir = file("${project.docsDir}/luaJavadoc")
-    classpath = sourceSets.main.compileClasspath
-
-    options.docletpath = configurations.cctJavadoc.files as List
-    options.doclet = "cc.tweaked.javadoc.LuaDoclet"
-
-    // Attempt to run under Java 11 (any Java >= 9 will work though).
-    if(System.getProperty("java.version").startsWith("1.")
-        && (System.getenv("JAVA_HOME_11_X64") != null || project.hasProperty("java11Home"))) {
-        executable = "${System.getenv("JAVA_HOME_11_X64") ?: project.property("java11Home")}/bin/javadoc"
-    }
-}
-
 jar {
     dependsOn javadoc
 
     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('FMLAT': 'computercraft_at.cfg')
     }
 
     from (sourceSets.main.allSource) {
@@ -172,10 +100,12 @@ jar {
 
 [compileJava, compileTestJava].forEach {
     it.configure {
-        options.compilerArgs << "-Xlint" << "-Xlint:-processing"
+        options.compilerArgs << "-Xlint" << "-Xlint:-processing" << "-Werror"
     }
 }
 
+
+
 import java.nio.charset.StandardCharsets
 import java.nio.file.*
 import java.util.zip.*
@@ -206,15 +136,14 @@ task proguard(type: ProGuardTask, dependsOn: jar) {
     // We want to avoid as much obfuscation as possible. We're only doing this to shrink code size.
     dontobfuscate; dontoptimize; keepattributes; keepparameternames
 
+    // Tell ProGuard to shut up
+    dontwarn 'org.checkerframework.**'
+
     // Proguard will remove directories by default, but that breaks JarMount.
-    keepdirectories 'data/computercraft/lua**'
+    keepdirectories 'assets/computercraft/lua**'
 
     // Preserve ComputerCraft classes - we only want to strip shadowed files.
     keep 'class dan200.computercraft.** { *; }'
-
-    // LWJGL and Apache bundle Java 9 versions, which is great, but rather breaks Proguard
-    dontwarn 'module-info'
-    dontwarn 'org.apache.**,org.lwjgl.**'
 }
 
 task proguardMove(dependsOn: proguard) {
@@ -230,6 +159,8 @@ task proguardMove(dependsOn: proguard) {
     }
 }
 
+reobfJar.dependsOn proguardMove
+
 processResources {
     inputs.property "version", mod_version
     inputs.property "mcversion", mc_version
@@ -250,8 +181,8 @@ processResources {
     inputs.property "commithash", hash
 
     from(sourceSets.main.resources.srcDirs) {
-        include 'META-INF/mods.toml'
-        include 'data/computercraft/lua/rom/help/credits.txt'
+        include 'mcmod.info'
+        include 'assets/computercraft/lua/rom/help/credits.txt'
 
         expand 'version': mod_version,
                'mcversion': mc_version,
@@ -259,12 +190,12 @@ processResources {
     }
 
     from(sourceSets.main.resources.srcDirs) {
-        exclude 'META-INF/mods.toml'
-        exclude 'data/computercraft/lua/rom/help/credits.txt'
+        exclude 'mcmod.info'
+        exclude 'assets/computercraft/lua/rom/help/credits.txt'
     }
 }
 
-task compressJson(dependsOn: jar) {
+task compressJson(dependsOn: extractAnnotationsJar) {
     group "compact"
     description "Minifies all JSON files, stripping whitespace"
 
@@ -307,58 +238,6 @@ task compressJson(dependsOn: jar) {
 
 assemble.dependsOn compressJson
 
-// Web tasks
-
-import org.apache.tools.ant.taskdefs.condition.Os
-
-List<String> mkCommand(String command) {
-    return Os.isFamily(Os.FAMILY_WINDOWS) ? ["cmd", "/c", command] : ["sh", "-c", command]
-}
-
-task rollup(type: Exec) {
-    group = "build"
-    description = "Bundles JS into rollup"
-
-    inputs.files(fileTree("src/web")).withPropertyName("sources")
-    inputs.file("package-lock.json").withPropertyName("package-lock.json")
-    inputs.file("tsconfig.json").withPropertyName("Typescript config")
-    inputs.file("rollup.config.js").withPropertyName("Rollup config")
-    outputs.file("$buildDir/rollup/index.js").withPropertyName("output")
-
-    commandLine mkCommand('"node_modules/.bin/rollup" --config rollup.config.js')
-}
-
-task minifyWeb(type: Exec, dependsOn: rollup) {
-    group = "build"
-    description = "Bundles JS into rollup"
-
-    inputs.file("$buildDir/rollup/index.js").withPropertyName("sources")
-    inputs.file("package-lock.json").withPropertyName("package-lock.json")
-    outputs.file("$buildDir/rollup/index.min.js").withPropertyName("output")
-
-    commandLine mkCommand('"node_modules/.bin/terser"' + " -o $buildDir/rollup/index.min.js $buildDir/rollup/index.js")
-}
-
-task illuaminateDocs(type: Exec, dependsOn: [minifyWeb, luaJavadoc]) {
-    group = "build"
-    description = "Bundles JS into rollup"
-
-    inputs.files(fileTree("doc")).withPropertyName("docs")
-    inputs.files(fileTree("src/main/resources/data/computercraft/lua/rom")).withPropertyName("lua rom")
-    inputs.file("illuaminate.sexp").withPropertyName("illuaminate.sexp")
-    inputs.dir("$buildDir/docs/luaJavadoc")
-    inputs.file("$buildDir/rollup/index.min.js").withPropertyName("scripts")
-    inputs.file("src/web/styles.css").withPropertyName("styles")
-    outputs.dir("$buildDir/docs/lua")
-
-    commandLine mkCommand('"bin/illuaminate" doc-gen')
-}
-
-task docWebsite(type: Copy, dependsOn: [illuaminateDocs]) {
-    from 'doc/logo.png'
-    into "${project.docsDir}/lua"
-}
-
 // Check tasks
 
 test {
@@ -381,7 +260,7 @@ license {
     mapping("java", "SLASHSTAR_STYLE")
     strictCheck true
 
-    ext.year = Calendar.getInstance().get(Calendar.YEAR)
+    ext.year = 2020
 }
 
 [licenseMain, licenseFormatMain].forEach {
@@ -423,14 +302,14 @@ task checkRelease {
     description "Verifies that everything is ready for a release"
 
     inputs.property "version", mod_version
-    inputs.file("src/main/resources/data/computercraft/lua/rom/help/changelog.txt")
-    inputs.file("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt")
+    inputs.file("src/main/resources/assets/computercraft/lua/rom/help/changelog.txt")
+    inputs.file("src/main/resources/assets/computercraft/lua/rom/help/whatsnew.txt")
 
     doLast {
         def ok = true
 
         // Check we're targetting the current version
-        def whatsnew = new File("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt").readLines()
+        def whatsnew = new File("src/main/resources/assets/computercraft/lua/rom/help/whatsnew.txt").readLines()
         if (whatsnew[0] != "New features in CC: Tweaked $mod_version") {
             ok = false
             project.logger.error("Expected `whatsnew.txt' to target $mod_version.")
@@ -447,7 +326,7 @@ task checkRelease {
 
         // Check whatsnew and changelog match.
         def versionChangelog = "# " + whatsnew.join("\n")
-        def changelog = new File("src/main/resources/data/computercraft/lua/rom/help/changelog.txt").getText()
+        def changelog = new File("src/main/resources/assets/computercraft/lua/rom/help/changelog.txt").getText()
         if (!changelog.startsWith(versionChangelog)) {
             ok = false
             project.logger.error("whatsnew and changelog are not in sync")
@@ -475,7 +354,7 @@ publishing {
     publications {
         mavenJava(MavenPublication) {
             from components.java
-            // artifact sourceJar
+            artifact sourceJar
         }
     }
 }
@@ -535,7 +414,7 @@ githubRelease {
     tagName "v${mc_version}-${mod_version}"
     releaseName "[${mc_version}] ${mod_version}"
     body {
-        "## " + new File("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt")
+        "## " + new File("src/main/resources/assets/computercraft/lua/rom/help/whatsnew.txt")
             .readLines()
             .takeWhile { it != 'Type "help changelog" to see the full version history.' }
             .join("\n").trim()
@@ -550,3 +429,6 @@ task uploadAll(dependsOn: uploadTasks) {
     group "upload"
     description "Uploads to all repositories (Maven, Curse, GitHub release)"
 }
+
+runClient.outputs.upToDateWhen { false }
+runServer.outputs.upToDateWhen { false }

config/checkstyle/checkstyle.xml

@@ -10,10 +10,6 @@
         <property name="file" value="config/checkstyle/suppressions.xml" />
     </module>
 
-    <module name="BeforeExecutionExclusionFileFilter">
-        <property name="fileNamePattern" value="render_old"/>
-    </module>
-
     <module name="TreeWalker">
         <!-- Annotations -->
         <module name="AnnotationLocation" />
@@ -114,11 +110,11 @@
         </module>
         <module name="ParameterName" />
         <module name="StaticVariableName">
-            <property name="format" value="^[a-z][a-zA-Z0-9]*|CAPABILITY(_[A-Z_]+)?$" />
+            <property name="format" value="^[a-z][a-zA-Z0-9]*|CAPABILITY(_[A-Z]+)?$" />
             <property name="applyToPrivate" value="false" />
         </module>
         <module name="StaticVariableName">
-            <property name="format" value="^(s_)?[a-z][a-zA-Z0-9]*|CAPABILITY(_[A-Z_]+)?$" />
+            <property name="format" value="^(s_)?[a-z][a-zA-Z0-9]*|CAPABILITY(_[A-Z]+)?$" />
             <property name="applyToPrivate" value="true" />
         </module>
         <module name="TypeName" />
@@ -160,7 +156,7 @@
         <module name="WhitespaceAround">
             <property name="allowEmptyConstructors" value="true" />
             <property name="ignoreEnhancedForColon" value="false" />
-            <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAMBDA,LAND,LCURLY,LE,LITERAL_RETURN,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND" />
+            <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,DO_WHILE,EQUAL,GE,GT,LAMBDA,LAND,LCURLY,LE,LITERAL_RETURN,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND" />
         </module>
     </module>
 

config/checkstyle/suppressions.xml

@@ -9,7 +9,4 @@
 
     <!-- Do not check for missing package Javadoc. -->
     <suppress checks="JavadocStyle" files=".*[\\/]package-info.java" />
-
-    <!-- The commands API is documented in Lua. -->
-    <suppress checks="SummaryJavadocCheck" files=".*[\\/]CommandAPI.java" />
 </suppressions>

doc/stub/commands.lua

@@ -0,0 +1,77 @@
+--- Execute a specific command.
+--
+-- @tparam string command The command to execute.
+-- @treturn boolean Whether the command executed successfully.
+-- @treturn { string... } The output of this command, as a list of lines.
+-- @treturn number|nil The number of "affected" objects, or `nil` if the command
+-- failed. The definition of this varies from command to command.
+-- @usage Set the block above the command computer to stone.
+--
+--     commands.exec("setblock ~ ~1 ~ minecraft:stone")
+function exec(command) end
+
+--- Asynchronously execute a command.
+--
+-- Unlike @{exec}, this will immediately return, instead of waiting for the
+-- command to execute. This allows you to run multiple commands at the same
+-- time.
+--
+-- When this command has finished executing, it will queue a `task_complete`
+-- event containing the result of executing this command (what @{exec} would
+-- return).
+--
+-- @tparam string command The command to execute.
+-- @treturn number The "task id". When this command has been executed, it will
+-- queue a `task_complete` event with a matching id.
+-- @usage Asynchronously sets the block above the computer to stone.
+--
+--     commands.execAsync("~ ~1 ~ minecraft:stone")
+-- @see parallel One may also use the parallel API to run multiple commands at
+-- once.
+function execAsync(commad) end
+
+--- List all available commands which the computer has permission to execute.
+--
+-- @treturn { string... } A list of all available commands
+function list() end
+
+--- Get the position of the current command computer.
+--
+-- @treturn number This computer's x position.
+-- @treturn number This computer's y position.
+-- @treturn number This computer's z position.
+-- @see gps.locate To get the position of a non-command computer.
+function getBlockPosition() end
+
+--- Get some basic information about a block.
+--
+-- The returned table contains the current name, metadata and block state (as
+-- with @{turtle.inspect}). If there is a tile entity for that block, its NBT
+-- will also be returned.
+--
+-- @tparam number x The x position of the block to query.
+-- @tparam number y The y position of the block to query.
+-- @tparam number z The z position of the block to query.
+-- @treturn table The given block's information.
+-- @throws If the coordinates are not within the world, or are not currently
+-- loaded.
+function getBlockInfo(x, y, z) end
+
+--- Get information about a range of blocks.
+--
+-- This returns the same information as @{getBlockInfo}, just for multiple
+-- blocks at once.
+--
+-- Blocks are traversed by ascending y level, followed by z and x - the returned
+-- table may be indexed using `x + z*width + y*depth*depth`.
+--
+-- @tparam number min_x The start x coordinate of the range to query.
+-- @tparam number min_y The start y coordinate of the range to query.
+-- @tparam number min_z The start z coordinate of the range to query.
+-- @tparam number max_x The end x coordinate of the range to query.
+-- @tparam number max_y The end y coordinate of the range to query.
+-- @tparam number max_z The end z coordinate of the range to query.
+-- @treturn { table... } A list of information about each block.
+-- @throws If the coordinates are not within the world.
+-- @throws If trying to get information about more than 4096 blocks.
+function getBlockInfos(min_x, min_y, min_z, max_x, max_y, max_z) end

doc/stub/fs.lua

@@ -2,6 +2,23 @@
 --
 -- @module fs
 
+function list(path) end
+function combine(base, child) end
+function getName(path) end
+function getSize(path) end
+function exists(path) end
+function isDir(path) end
+function isReadOnly(path) end
+function makeDir(path) end
+function move(from, to) end
+function copy(from, to) end
+function delete(path) end
+function open(path, mode) end
+function getDrive(path) end
+function getFreeSpace(path) end
+function find(pattern) end
+function getDir(path) end
+
 --- Returns true if a path is mounted to the parent filesystem.
 --
 -- The root filesystem "/" is considered a mount, along with disk folders and
@@ -14,21 +31,54 @@
 -- @see getDrive
 function isDriveRoot(path) end
 
---[[- Provides completion for a file or directory name, suitable for use with
-@{_G.read}.
+--- Get the capacity of the drive at the given path.
+--
+-- This may be used in conjunction with @{getFreeSpace} to determine what
+-- percentage of this drive has been used.
+--
+-- @tparam string path The path of the drive to get.
+-- @treturn number This drive's capacity. This will be 0 for "read-only" drives,
+-- such as the ROM or treasure disks.
+function getCapacity(path) end
 
-When a directory is a possible candidate for completion, two entries are
-included - one with a trailing slash (indicating that entries within this
-directory exist) and one without it (meaning this entry is an immediate
-completion candidate). `include_dirs` can be set to @{false} to only include
-those with a trailing slash.
+--- Get attributes about a specific file or folder.
+--
+-- The returned attributes table contains information about the size of the
+-- file, whether it is a directory, and when it was created and last modified.
+--
+-- The creation and modification times are given as the number of milliseconds
+-- since the UNIX epoch. This may be given to @{os.date} in order to convert it
+-- to more usable form.
+--
+-- @tparam string path The path to get attributes for.
+-- @treturn { size = number, isDir = boolean, created = number, modified = number }
+-- The resulting attributes.
+-- @throws If the path does not exist.
+-- @see getSize If you only care about the file's size.
+-- @see isDir If you only care whether a path is a directory or not.
+function attributes(path) end
 
-@tparam string path The path to complete.
-@tparam string location The location where paths are resolved from.
-@tparam[opt] boolean include_files When @{false}, only directories will be
-included in the returned list.
-@tparam[opt] boolean include_dirs When @{false}, "raw" directories will not be
-included in the returned list.
-@treturn { string... } A list of possible completion candidates.
-]]
-function complete(path, location, include_files, include_dirs) end
+-- Defined in bios.lua
+function complete(sPath, sLocation, bIncludeFiles, bIncludeDirs) end
+
+--- A file handle which can be read from.
+--
+-- @type ReadHandle
+-- @see fs.open
+local ReadHandle = {}
+function ReadHandle.read(count) end
+function ReadHandle.readAll() end
+function ReadHandle.readLine(with_trailing) end
+function ReadHandle.seek(whence, offset) end
+function ReadHandle.close() end
+
+--- A file handle which can be written to.
+--
+-- @type WriteHandle
+-- @see fs.open
+local WriteHandle = {}
+function WriteHandle.write(text) end
+function WriteHandle.writeLine(text) end
+function WriteHandle.flush(text) end
+function WriteHandle.seek(whence, offset) end
+function WriteHandle.close() end

doc/stub/global.lua

@@ -1,125 +0,0 @@
---[[-
-Functions in the global environment, defined in `bios.lua`. This does not
-include standard Lua functions.
-
-@module _G
-]]
-
---[[- Pauses execution for the specified number of seconds.
-
-As it waits for a fixed amount of world ticks, `time` will automatically be
-rounded up to the nearest multiple of 0.05 seconds. If you are using coroutines
-or the @{parallel|parallel API}, it will only pause execution of the current
-thread, not the whole program.
-
-**Note** Because sleep internally uses timers, it is a function that yields.
-This means that you can use it to prevent "Too long without yielding" errors,
-however, as the minimum sleep time is 0.05 seconds, it will slow your program
-down.
-
-**Warning** Internally, this function queues and waits for a timer event (using
-@{os.startTimer}), however it does not listen for any other events. This means
-that any event that occurs while sleeping will be entirely discarded. If you
-need to receive events while sleeping, consider using @{os.startTimer|timers},
-or the @{parallel|parallel API}.
-
-@tparam number time The number of seconds to sleep for, rounded up to the
-nearest multiple of 0.05.
-
-@see os.startTimer
-@usage Sleep for three seconds.
-
-    print("Sleeping for three seconds")
-    sleep(3)
-    print("Done!")
-]]
-function sleep(time) end
-
---- Writes a line of text to the screen without a newline at the end, wrapping
--- text if necessary.
---
--- @tparam string text The text to write to the string
--- @treturn number The number of lines written
--- @see print A wrapper around write that adds a newline and accepts multiple arguments
--- @usage write("Hello, world")
-function write(text) end
-
---- Prints the specified values to the screen separated by spaces, wrapping if
--- necessary. After printing, the cursor is moved to the next line.
---
--- @param ... The values to print on the screen
--- @treturn number The number of lines written
--- @usage print("Hello, world!")
-function print(...) end
-
---- Prints the specified values to the screen in red, separated by spaces,
--- wrapping if necessary. After printing, the cursor is moved to the next line.
---
--- @param ... The values to print on the screen
--- @usage printError("Something went wrong!")
-function printError(...) end
-
---[[- Reads user input from the terminal, automatically handling arrow keys,
-pasting, character replacement, history scrollback, auto-completion, and
-default values.
-
-@tparam[opt] string replaceChar A character to replace each typed character with.
-This can be used for hiding passwords, for example.
-@tparam[opt] table history A table holding history items that can be scrolled
-back to with the up/down arrow keys. The oldest item is at index 1, while the
-newest item is at the highest index.
-@tparam[opt] function(partial: string):({ string... }|nil) completeFn A function
-to be used for completion. This function should take the partial text typed so
-far, and returns a list of possible completion options.
-@tparam[opt] string default Default text which should already be entered into
-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
-
-    write("> ")
-    local msg = read()
-    print(msg)
-
-@usage Prompt a user for a password.
-
-    while true do
-      write("Password> ")
-      local pwd = read("*")
-      if pwd == "let me in" then break end
-      print("Incorrect password, try again.")
-    end
-    print("Logged in!")
-
-@usage A complete example with completion, history and a default value.
-
-    local completion = require "cc.completion"
-    local history = { "potato", "orange", "apple" }
-    local choices = { "apple", "orange", "banana", "strawberry" }
-    write("> ")
-    local msg = read(nil, history, function(text) return completion.choice(text, choices) end, "app")
-    print(msg)
-]]
-function read(replaceChar, history, completeFn, default) end
-
---- The ComputerCraft and Minecraft version of the current computer environment.
---
--- For example, `ComputerCraft 1.93.0 (Minecraft 1.15.2)`.
--- @usage _HOST
-_HOST = _HOST
-
---[[- The default computer settings as defined in the ComputerCraft
-configuration.
-
-This is a comma-separated list of settings pairs defined by the mod
-configuration or server owner. By default, it is empty.
-
-An example value to disable autocompletion:
-
-    shell.autocomplete=false,lua.autocomplete=false,edit.autocomplete=false
-
-@usage _CC_DEFAULT_SETTINGS
-]]
-_CC_DEFAULT_SETTINGS = _CC_DEFAULT_SETTINGS

doc/stub/http.lua

@@ -1,6 +1,8 @@
 --- The http library allows communicating with web servers, sending and
 -- receiving data from them.
 --
+-- #### `http_check` event
+--
 -- @module http
 
 --- Asynchronously make a HTTP request to the given url.
@@ -91,6 +93,47 @@ function get(...) end
 -- @treturn Response|nil The failing http response, if available.
 function post(...) end
 
+--- A http response. This acts very much like a @{fs.ReadHandle|file}, though
+-- provides some http specific methods.
+--
+-- #### `http_success` event
+-- #### `http_failure` event
+--
+-- @type Response
+-- @see http.request On how to make a http request.
+local Response = {}
+
+--- Returns the response code and response message returned by the server
+--
+-- @treturn number The response code (i.e. 200)
+-- @treturn string The response message (i.e. "OK")
+function Response.getResponseCode() end
+
+--- Get a table containing the response's headers, in a format similar to that
+-- required by @{http.request}. If multiple headers are sent with the same
+-- name, they will be combined with a comma.
+--
+-- @treturn { [string]=string } The response's headers.
+-- Make a request to [example.computercraft.cc](https://example.computercraft.cc),
+-- and print the returned headers.
+-- ```lua
+-- local request = http.get("https://example.computercraft.cc")
+-- print(textutils.serialize(request.getResponseHeaders()))
+-- -- => {
+-- --   [ "Content-Type" ] = "text/plain; charset=utf8",
+-- --   [ "content-length" ] = 17,
+-- --   ...
+-- -- }
+-- request.close()
+-- ```
+function Response.getResponseHeaders() end
+
+function Response.read(count) end
+function Response.readAll() end
+function Response.readLine(with_trailing) end
+function Response.seek(whence, offset) end
+function Response.close() end
+
 --- Asynchronously determine whether a URL can be requested.
 --
 -- If this returns `true`, one should also listen for [`http_check`
@@ -155,3 +198,32 @@ function websocket(url, headers) end
 -- @tparam[opt] { [string] = string } headers Additional headers to send as part
 -- of the initial websocket connection.
 function websocketAsync(url, headers) end
+
+--- A websocket, which can be used to send an receive messages with a web
+-- server.
+--
+-- @type Websocket
+-- @see http.websocket On how to open a websocket.
+local Websocket = {}
+
+--- Send a websocket message to the connected server.
+--
+-- @tparam string message The message to send.
+-- @tparam[opt] boolean binary Whether this message should be treated as a
+-- binary string, rather than encoded text.
+-- @throws If the websocket has been closed.
+function Websocket.send(message, binary) end
+
+--- Wait for a message from the server.
+--
+-- @tparam[opt] number timeout The number of seconds to wait if no message is
+-- received.
+-- @treturn[1] string The received message.
+-- @treturn boolean If this was a binary message.
+-- @treturn[2] nil If the websocket was closed while waiting, or if we timed out.
+-- @throws If the websocket has been closed.
+function Websocket.receive(timeout) end
+
+--- Close this websocket. This will terminate the connection, meaning messages
+-- can no longer be sent or received along it.
+function Websocket.close() end

doc/stub/os.lua

@@ -1,125 +1,24 @@
+function queueEvent(event, ...) end
+function startTimer(delay) end
+function setAlarm(time) end
+function shutdown() end
+function reboot() end
+function getComputerID() end
+computerID = getComputerID
+function setComputerLabel(label) end
+function getComputerLabel() end
+computerLabel = getComputerLabel
+function clock() end
+function time(timezone) end
+function day(timezone) end
+function cancelTimer(id) end
+function cancelAlarm(id) end
+function epoch(timezone) end
+function date(format, time) end
+
 -- Defined in bios.lua
-
---[[- 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.
-
-@tparam string path The path of the API to load.
-@treturn boolean Whether or not the API was successfully loaded.
-
-@deprecated Use @{require}.
-]]
 function loadAPI(path) end
-
---- Unloads an API which was loaded by @{os.loadAPI}.
---
--- This effectively removes the specified table from `_G`.
---
--- @tparam string name The name of the API to unload.
--- @deprecated Use @{require}.
-function unloadAPI(name) end
-
---[[- Pause execution of the current thread and waits for any events matching
-`filter`.
-
-This function @{coroutine.yield|yields} the current process and waits for it
-to be resumed with a vararg list where the first element matches `filter`.
-If no `filter` is supplied, this will match all events.
-
-Unlike @{os.pullEventRaw}, it will stop the application upon a "terminate"
-event, printing the error "Terminated".
-
-@tparam[opt] string filter Event to filter for.
-@treturn string event The name of the event that fired.
-@treturn any param... Optional additional parameters of the event.
-@usage Listen for `mouse_click` events.
-
-    while true do
-        local event, button, x, y = os.pullEvent("mouse_click")
-        print("Button", button, "was clicked at", x, ",", y)
-    end
-
-@usage Listen for multiple events.
-
-    while true do
-        local eventData = {os.pullEvent()}
-        local event = eventData[1]
-
-        if event == "mouse_click" then
-            print("Button", eventData[2], "was clicked at", eventData[3], ",", eventData[4])
-        elseif event == "key" then
-            print("Key code", eventData[2], "was pressed")
-        end
-    end
-
-@see os.pullEventRaw To pull the terminate event.
-]]
 function pullEvent(filter) end
-
---[[- Pause execution of the current thread and waits for events, including the
-`terminate` event.
-
-This behaves almost the same as @{os.pullEvent}, except it allows you to handle
-the `terminate` event yourself - the program will not stop execution when
-<kbd>Ctrl+T</kbd> is pressed.
-
-@tparam[opt] string filter Event to filter for.
-@treturn string event The name of the event that fired.
-@treturn any param... Optional additional parameters of the event.
-@usage Listen for `terminate` events.
-
-    while true do
-        local event = os.pullEventRaw()
-        if event == "terminate" then
-            print("Caught terminate event!")
-        end
-    end
-
-@see os.pullEvent To pull events normally.
-]]
 function pullEventRaw(filter) end
-
---- Pauses execution for the specified number of seconds, alias of @{_G.sleep}.
---
--- @tparam number time The number of seconds to sleep for, rounded up to the
--- nearest multiple of 0.05.
-function sleep(time) end
-
---- Get the current CraftOS version (for example, `CraftOS 1.8`).
---
--- This is defined by `bios.lua`. For the current version of CC:Tweaked, this
--- should return `CraftOS 1.8`.
---
--- @treturn string The current CraftOS version.
--- @usage os.version()
 function version() end
-
---[[- Run the program at the given path with the specified environment and
-arguments.
-
-This function does not resolve program names like the shell does. This means
-that, for example, `os.run("edit")` will not work. As well as this, it does not
-provide access to the @{shell} API in the environment. For this behaviour, use
-@{shell.run} instead.
-
-If the program cannot be found, or failed to run, it will print the error and
-return `false`. If you want to handle this more gracefully, use an alternative
-such as @{loadfile}.
-
-@tparam table env The environment to run the program with.
-@tparam string path The exact path of the program to run.
-@param ... The arguments to pass to the program.
-@treturn boolean Whether or not the program ran successfully.
-@usage Run the default shell from within your program:
-
-    os.run({}, "/rom/programs/shell.lua")
-
-@see shell.run
-@see loadfile
-]]
 function run(env, path, ...) end

doc/stub/pocket.lua

@@ -0,0 +1,28 @@
+--[[-
+Control the current pocket computer, adding or removing upgrades.
+
+This API is only available on pocket computers. As such, you may use its
+presence to determine what kind of computer you are using:
+
+```lua
+if pocket then
+  print("On a pocket computer")
+else
+  print("On something else")
+end
+```
+]]
+
+--- Search the player's inventory for another upgrade, replacing the existing
+-- one with that item if found.
+--
+-- This inventory search starts from the player's currently selected slot,
+-- allowing you to prioritise upgrades.
+--
+-- @throws If an upgrade cannot be found.
+function equipBack() end
+
+--- Remove the pocket computer's current upgrade.
+--
+-- @throws If this pocket computer does not currently have an upgrade.
+function unequipBack() end

doc/stub/redstone.lua

@@ -0,0 +1,120 @@
+--[[- Interact with redstone attached to this computer.
+
+The @{redstone} library exposes three "types" of redstone control:
+ - Binary input/output (@{setOutput}/@{getInput}): These simply check if a
+   redstone wire has any input or output. A signal strength of 1 and 15 are
+   treated the same.
+ - Analogue input/output (@{setAnalogueOutput}/@{getAnalogueInput}): These
+   work with the actual signal strength of the redstone wired, from 0 to 15.
+ - Bundled cables (@{setBundledOutput}/@{getBundledInput}): These interact with
+   "bundled" cables, such as those from Project:Red. These allow you to send
+   16 separate on/off signals. Each channel corresponds to a colour, with the
+   first being @{colors.white} and the last @{colors.black}.
+
+Whenever a redstone input changes, a `redstone` event will be fired. This may
+be used in or
+
+This module may also be referred to as `rs`. For example, one may call
+`rs.getSides()` instead of @{redstone.getSides}.
+
+@module redstone
+@usage Toggle the redstone signal above the computer every 0.5 seconds.
+
+    while true do
+        redstone.setOutput("top", not redstone.getOutput("top"))
+        sleep(0.5)
+    end
+@usage Mimic a redstone comparator in [subtraction mode][comparator].
+
+    while true do
+      local rear = rs.getAnalogueInput("back")
+      local sides = math.max(rs.getAnalogueInput("left"), rs.getAnalogueInput("right"))
+      rs.setAnalogueOutput("front", math.max(rear - sides, 0))
+
+      os.pullEvent("redstone") -- Wait for a change to inputs.
+    end
+
+[comparator]: https://minecraft.gamepedia.com/Redstone_Comparator#Subtract_signal_strength "Redstone Comparator on the Minecraft wiki."
+]]
+
+--- Returns a table containing the six sides of the computer. Namely, "top",
+-- "bottom", "left", "right", "front" and "back".
+--
+-- @treturn { string... } A table of valid sides.
+function getSides() end
+
+--- Turn the redstone signal of a specific side on or off.
+--
+-- @tparam string side The side to set.
+-- @tparam boolean on Whether the redstone signal should be on or off. When on,
+-- a signal strength of 15 is emitted.
+function setOutput(side, on) end
+
+--- Get the current redstone output of a specific side.
+--
+-- @tparam string side The side to get.
+-- @treturn boolean Whether the redstone output is on or off.
+-- @see setOutput
+function getOutput(side) end
+
+--- Get the current redstone input of a specific side.
+--
+-- @tparam string side The side to get.
+-- @treturn boolean Whether the redstone input is on or off.
+function getInput(side) end
+
+--- Set the redstone signal strength for a specific side.
+--
+-- @tparam string side The side to set.
+-- @tparam number value The signal strength, between 0 and 15.
+-- @throws If `value` is not between 0 and 15.
+function setAnalogOutput(side, value) end
+setAnalogueOutput = setAnalogOutput
+
+--- Get the redstone output signal strength for a specific side.
+--
+-- @tparam string side The side to get.
+-- @treturn number The output signal strength, between 0 and 15.
+-- @see setAnalogueOutput
+function getAnalogOutput(sid) end
+getAnalogueOutput = getAnalogOutput
+
+--- Get the redstone input signal strength for a specific side.
+--
+-- @tparam string side The side to get.
+-- @treturn number The input signal strength, between 0 and 15.
+function getAnalogInput(side) end
+getAnalogueInput = getAnalogInput
+
+--- Set the bundled cable output for a specific side.
+--
+-- @tparam string side The side to set.
+-- @tparam number The colour bitmask to set.
+-- @see colors.subtract For removing a colour from the bitmask.
+-- @see colors.combine For adding a colour to the bitmask.
+function setBundledOutput(side, output) end
+
+--- Get the bundled cable output for a specific side.
+--
+-- @tparam string side The side to get.
+-- @treturn number The bundled cable's output.
+function getBundledOutput(side) end
+
+--- Get the bundled cable input for a specific side.
+--
+-- @tparam string side The side to get.
+-- @treturn number The bundled cable's input.
+-- @see testBundledInput To determine if a specific colour is set.
+function getBundledInput(side) end
+
+--- Determine if a specific combination of colours are on for the given side.
+--
+-- @tparam string side The side to test.
+-- @tparam number mask The mask to test.
+-- @see getBundledInput
+-- @see colors.combine For adding a colour to the bitmask.
+-- @usage Check if @{colors.white} and @{colors.black} are on for above the
+-- computer.
+--
+--     print(redstone.testBundledInput("top", colors.combine(colors.white, colors.black)))
+function testBundledInput(side, mask) end

doc/stub/term.lua

@@ -0,0 +1,52 @@
+function write(text) end
+function scroll(lines) end
+function setCursorPos(x, y) end
+function setCursorBlink(blink) end
+function getCursorPos() end
+function getSize() end
+function clear() end
+function clearLine() end
+function setTextColour(colour) end
+setTextColor = setTextColour
+function setBackgroundColour(colour) end
+setBackgroundColor = setBackgroundColour
+function isColour() end
+isColor = isColour
+function getTextColour() end
+getTextColor = getTextColor
+function getBackgroundColour() end
+getBackgroundColor = getBackgroundColour
+function blit(text, text_colours, background_colours) end
+function setPaletteColour(colour, ...) end
+setPaletteColor = setPaletteColour
+function getPaletteColour(colour, ...) end
+getPaletteColor = getPaletteColour
+function nativePaletteColour(colour) end
+nativePaletteColor = nativePaletteColour
+
+--- @type Redirect
+local Redirect = {}
+
+Redirect.write = write
+Redirect.scroll = scroll
+Redirect.setCursorPos = setCursorPos
+Redirect.setCursorBlink = setCursorBlink
+Redirect.getCursorPos = getCursorPos
+Redirect.getSize = getSize
+Redirect.clear = clear
+Redirect.clearLine = clearLine
+Redirect.setTextColour = setTextColour
+Redirect.setTextColor = setTextColor
+Redirect.setBackgroundColour = setBackgroundColour
+Redirect.setBackgroundColor = setBackgroundColor
+Redirect.isColour = isColour
+Redirect.isColor = isColor
+Redirect.getTextColour = getTextColour
+Redirect.getTextColor = getTextColor
+Redirect.getBackgroundColour = getBackgroundColour
+Redirect.getBackgroundColor = getBackgroundColor
+Redirect.blit = blit
+Redirect.setPaletteColour = setPaletteColour
+Redirect.setPaletteColor = setPaletteColor
+Redirect.getPaletteColour = getPaletteColour
+Redirect.getPaletteColor = getPaletteColor

doc/stub/turtle.lua

@@ -1 +1,230 @@
+--- Move the turtle forward one block.
+-- @treturn boolean Whether the turtle could successfully move.
+-- @treturn string|nil The reason the turtle could not move.
+function forward() end
+
+--- Move the turtle backwards one block.
+-- @treturn boolean Whether the turtle could successfully move.
+-- @treturn string|nil The reason the turtle could not move.
+function back() end
+
+--- Move the turtle up one block.
+-- @treturn boolean Whether the turtle could successfully move.
+-- @treturn string|nil The reason the turtle could not move.
+function up() end
+
+--- Move the turtle down one block.
+-- @treturn boolean Whether the turtle could successfully move.
+-- @treturn string|nil The reason the turtle could not move.
+function down() end
+
+--- Rotate the turtle 90 degress to the left.
+function turnLeft() end
+
+--- Rotate the turtle 90 degress to the right.
+function turnRight() end
+
+--- Attempt to break the block in front of the turtle.
+--
+-- This requires a turtle tool capable of breaking the block. Diamond pickaxes
+-- (mining turtles) can break any vanilla block, but other tools (such as axes)
+-- are more limited.
+--
+-- @tparam[opt] "left"|"right" side The specific tool to use.
+-- @treturn boolean Whether a block was broken.
+-- @treturn string|nil The reason no block was broken.
+function dig(side) end
+
+--- Attempt to break the block above the turtle. See @{dig} for full details.
+--
+-- @tparam[opt] "left"|"right" side The specific tool to use.
+-- @treturn boolean Whether a block was broken.
+-- @treturn string|nil The reason no block was broken.
+function digUp(side) end
+
+--- Attempt to break the block below the turtle. See @{dig} for full details.
+--
+-- @tparam[opt] "left"|"right" side The specific tool to use.
+-- @treturn boolean Whether a block was broken.
+-- @treturn string|nil The reason no block was broken.
+function digDown(side) end
+
+--- Attack the entity in front of the turtle.
+--
+-- @tparam[opt] "left"|"right" side The specific tool to use.
+-- @treturn boolean Whether an entity was attacked.
+-- @treturn string|nil The reason nothing was attacked.
+function attack(side) end
+
+--- Attack the entity above the turtle.
+--
+-- @tparam[opt] "left"|"right" side The specific tool to use.
+-- @treturn boolean Whether an entity was attacked.
+-- @treturn string|nil The reason nothing was attacked.
+function attackUp(side) end
+
+--- Attack the entity below the turtle.
+--
+-- @tparam[opt] "left"|"right" side The specific tool to use.
+-- @treturn boolean Whether an entity was attacked.
+-- @treturn string|nil The reason nothing was attacked.
+function attackDown(side) end
+
+--- Place a block or item into the world in front of the turtle.
+--
+-- @treturn boolean Whether the block could be placed.
+-- @treturn string|nil The reason the block was not placed.
+function place() end
+
+--- Place a block or item into the world above the turtle.
+--
+-- @treturn boolean Whether the block could be placed.
+-- @treturn string|nil The reason the block was not placed.
+function placeUp() end
+
+--- Place a block or item into the world below the turtle.
+--
+-- @treturn boolean Whether the block could be placed.
+-- @treturn string|nil The reason the block was not placed.
+function placeDown() end
+
+--- Drop the currently selected stack into the inventory in front of the turtle,
+-- or as an item into the world if there is no inventory.
+--
+-- @tparam[opt] number count The number of items to drop. If not given, the
+-- entire stack will be dropped.
+-- @treturn boolean Whether items were dropped.
+-- @treturn string|nil The reason the no items were dropped.
+-- @see select
+function drop(count) end
+
+--- Drop the currently selected stack into the inventory above the turtle, or as
+-- an item into the world if there is no inventory.
+--
+-- @tparam[opt] number count The number of items to drop. If not given, the
+-- entire stack will be dropped.
+-- @treturn boolean Whether items were dropped.
+-- @treturn string|nil The reason the no items were dropped.
+-- @see select
+function dropUp(count) end
+
+--- Drop the currently selected stack into the inventory below the turtle, or as
+-- an item into the world if there is no inventory.
+--
+-- @tparam[opt] number count The number of items to drop. If not given, the
+-- entire stack will be dropped.
+-- @treturn boolean Whether items were dropped.
+-- @treturn string|nil The reason the no items were dropped.
+-- @see select
+function dropDown(count) end
+
+--- Suck an item from the inventory in front of the turtle, or from an item
+-- floating in the world.
+--
+-- This will pull items into the first acceptable slot, starting at the
+-- @{select|currently selected} one.
+--
+-- @tparam[opt] number count The number of items to suck. If not given, up to a
+-- stack of items will be picked up.
+-- @treturn boolean Whether items were picked up.
+-- @treturn string|nil The reason the no items were picked up.
+function suck(count) end
+
+--- Suck an item from the inventory above the turtle, or from an item floating
+-- in the world.
+--
+-- @tparam[opt] number count The number of items to suck. If not given, up to a
+-- stack of items will be picked up.
+-- @treturn boolean Whether items were picked up.
+-- @treturn string|nil The reason the no items were picked up.
+function suckUp(count) end
+
+--- Suck an item from the inventory below the turtle, or from an item floating
+-- in the world.
+--
+-- @tparam[opt] number count The number of items to suck. If not given, up to a
+-- stack of items will be picked up.
+-- @treturn boolean Whether items were picked up.
+-- @treturn string|nil The reason the no items were picked up.
+function suckDown(count) end
+
+--- Check if there is a solid block in front of the turtle. In this case, solid
+-- refers to any non-air or liquid block.
+--
+-- @treturn boolean If there is a solid block in front.
+function detect() end
+
+--- Check if there is a solid block above the turtle.
+--
+-- @treturn boolean If there is a solid block above.
+function detectUp() end
+
+--- Check if there is a solid block below the turtle.
+--
+-- @treturn boolean If there is a solid block below.
+function detectDown() end
+
+function compare() end
+function compareUp() end
+function compareDown() end
+
+function inspect() end
+function inspectUp() end
+function inspectDown() end
+
+
+--- Change the currently selected slot.
+--
+-- The selected slot is determines what slot actions like @{drop} or
+-- @{getItemCount} act on.
+--
+-- @tparam number slot The slot to select.
+-- @see getSelectedSlot
+function select(slot) end
+
+--- Get the currently selected slot.
+--
+-- @treturn number The current slot.
+-- @see select
+function getSelectedSlot() end
+
+--- Get the number of items in the given slot.
+--
+-- @tparam[opt] number slot The slot we wish to check. Defaults to the @{turtle.select|selected slot}.
+-- @treturn number The number of items in this slot.
+function getItemCount(slot) end
+
+--- Get the remaining number of items which may be stored in this stack.
+--
+-- For instance, if a slot contains 13 blocks of dirt, it has room for another 51.
+--
+-- @tparam[opt] number slot The slot we wish to check. Defaults to the @{turtle.select|selected slot}.
+-- @treturn number The space left in this slot.
+function getItemSpace(slot) end
+
+
+--- Get detailed information about the items in the given slot.
+--
+-- @tparam[opt] number slot The slot to get information about. Defaults to the @{turtle.select|selected slot}.
+-- @treturn nil|table Information about the given slot, or @{nil} if it is empty.
+-- @usage Print the current slot, assuming it contains 13 dirt.
+--
+--     print(textutils.serialize(turtle.getItemDetail()))
+--     -- => {
+--     --    name = "minecraft:dirt",
+--     --    damage = 0,
+--     --    count = 13,
+--     -- }
+function getItemDetail(slot) end
+
+function getFuelLevel() end
+
+function refuel(count) end
+function compareTo(slot) end
+function transferTo(slot, count) end
+
+function getFuelLimit() end
+function equipLeft() end
+function equipRight() end
+
 function craft(limit) end

doc/styles.css

@@ -0,0 +1,186 @@
+/* Basic reset on elements */
+h1, h2, h3, h4, p, table, div, body {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    font-size: 100%;
+    font: inherit;
+    vertical-align: baseline;
+}
+/* Make the page a little more airy */
+body {
+    margin: 20px auto;
+    max-width: 1200px;
+    padding: 0 10px;
+    line-height: 1.6;
+    color: #222;
+    background: #fff;
+}
+
+/* Try to use system default fonts. */
+body {
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans",
+                 "Droid Sans", "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+}
+
+code, pre, .parameter, .type, .definition-name, .reference-code {
+    font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
+}
+
+/* Some definitions of basic tags */
+code {
+    color: #c7254e;
+    background-color: #f9f2f4;
+}
+
+p {
+    margin: 0.9em 0;
+}
+
+h1 {
+    font-size: 1.5em;
+    font-weight: lighter;
+    border-bottom: solid 1px #aaa;
+}
+
+h2, h3, h4 { margin: 1.4em 0 0.3em;}
+h2 { font-size: 1.25em; }
+h3 { font-size: 1.15em; font-weight: bold; }
+h4 { font-size: 1.06em; }
+
+a, a:visited, a:active { font-weight: bold; color: #004080; text-decoration: none; }
+a:hover { text-decoration: underline; }
+
+blockquote { margin-left: 3em; }
+
+/* Stop sublists from having initial vertical space */
+ul ul { margin-top: 0px; }
+ol ul { margin-top: 0px; }
+ol ol { margin-top: 0px; }
+ul ol { margin-top: 0px; }
+
+/* Make the target distinct; helps when we're navigating to a function */
+a:target + * { background-color: #FFFF99; }
+
+/* Allow linking to any subsection */
+a[name]::before { content: "#"; }
+
+/* Layout */
+#main {
+    display: flex;
+    flex-wrap: nowrap;
+    justify-content: space-between;
+    min-height: calc(100vh - 100px);
+}
+
+#main > nav {
+    flex-basis: 30%;
+    min-width: 150px;
+    max-width: 250px;
+    background-color: #f0f0f0;
+}
+
+nav h1, nav ul { padding: 0em 10px; }
+
+nav h2 {
+    background-color:#e7e7e7;
+    font-size: 1.1em;
+    color:#000000;
+    padding: 5px 10px;
+}
+
+nav ul {
+    list-style-type: none;
+    margin: 0;
+}
+
+#content {
+    flex-shrink: 1;
+    flex-basis: 80%;
+    padding: 0px 10px;
+}
+
+footer {
+    text-align: right;
+    font-size: 0.8em;
+}
+
+/* The definition lists at the top of each page */
+table.definition-list {
+    border-collapse: collapse;
+    width: 100%;
+}
+
+table.definition-list td, table.definition-list th {
+    border: 1px solid #cccccc;
+    padding: 5px;
+}
+
+table.definition-list th {
+    background-color: #f0f0f0;
+    min-width: 200px;
+    white-space: nowrap;
+    text-align: right;
+}
+
+table.definition-list td { width: 100%; }
+
+dl.definition dt {
+    border-top: 1px solid #ccc;
+    padding-top: 1em;
+    display: flex;
+}
+
+dl.definition dt .definition-name {
+    padding: 0 0.1em;
+    margin: 0 0.1em;
+    flex-grow: 1;
+}
+
+
+dl.definition dd {
+    padding-bottom: 1em;
+    margin: 10px 0 0 20px;
+}
+
+dl.definition h3 {
+    font-size: .95em;
+}
+
+/* Links to source-code */
+.source-link { font-size: 0.8em; }
+.source-link::before { content: '[' }
+.source-link::after  { content: ']' }
+a.source-link, a.source-link:visited, a.source-link:active { color: #505050; }
+
+/* Method definitions */
+span.parameter:after { content:":"; padding-left: 0.3em; }
+.optional { text-decoration: underline dotted; }
+
+/** Fancy colour display. */
+.colour-ref {
+    display: inline-block;
+    width: 0.8em;
+    height: 0.8em;
+    margin: 0.1em 0.1em 0.3em 0.1em; /* Terrrible hack to force vertical alignment. */
+    border: solid 1px black;
+    box-sizing: border-box;
+    vertical-align: middle;
+}
+
+/* styles for prettification of source */
+.highlight .comment { color: #558817; }
+.highlight .constant { color: #a8660d; }
+.highlight .escape { color: #844631; }
+.highlight .keyword { color: #aa5050; font-weight: bold; }
+.highlight .library { color: #0e7c6b; }
+.highlight .marker { color: #512b1e; background: #fedc56; font-weight: bold; }
+.highlight .string { color: #8080ff; }
+.highlight .literal-kw { color: #8080ff; }
+.highlight .number { color: #f8660d; }
+.highlight .operator { color: #2239a8; font-weight: bold; }
+.highlight .preprocessor, pre .prepro { color: #a33243; }
+.highlight .global { color: #800080; }
+.highlight .user-keyword { color: #800080; }
+.highlight .prompt { color: #558817; }
+.highlight .url { color: #272fc2; text-decoration: underline; }

gradle.properties

@@ -1,7 +1,7 @@
 # Mod properties
-mod_version=1.95.0
+mod_version=1.89.2
 
-# Minecraft properties (update mods.toml when changing)
-mc_version=1.16.4
-forge_version=35.0.1
-mappings_version=20201028-1.16.3
+# Minecraft properties
+mc_version=1.12.2
+forge_version=14.23.4.2749
+mappings_version=snapshot_20180724

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip

illuaminate.sexp

@@ -2,29 +2,18 @@
 
 (sources
   /doc/stub/
-  /build/docs/luaJavadoc/
   /src/main/resources/*/computercraft/lua/bios.lua
   /src/main/resources/*/computercraft/lua/rom/
-  /src/test/resources/test-rom
-  /src/web/mount)
+  /src/test/resources/test-rom)
 
 
 (doc
   (title "CC: Tweaked")
-  (destination build/docs/lua)
-  (logo src/main/resources/pack.png)
   (index doc/index.md)
-  (styles src/web/styles.css)
-  (scripts build/rollup/index.js)
   (source-link https://github.com/SquidDev-CC/CC-Tweaked/blob/${commit}/${path}#L${line})
 
-  (module-kinds
-    (peripheral Peripherals)
-    (generic_peripheral "Generic Peripherals"))
-
   (library-path
     /doc/stub/
-    /build/docs/luaJavadoc/
 
     /src/main/resources/*/computercraft/lua/rom/apis
     /src/main/resources/*/computercraft/lua/rom/apis/command
@@ -56,7 +45,7 @@
 
     ;; colours imports from colors, and we don't handle that right now.
     ;; keys is entirely dynamic, so we skip it.
-    (dynamic-modules colours keys _G)
+    (dynamic-modules colours keys)
 
     (globals
       :max
@@ -75,42 +64,32 @@
   (lint (allow-toplevel-global true)))
 
 ;; Silence some variable warnings in documentation stubs.
-(at (/doc/stub/ /build/docs/luaJavadoc/)
+(at /doc/stub
   (linters -var:unused-global)
   (lint (allow-toplevel-global true)))
 
 ;; Suppress warnings for currently undocumented modules.
 (at
-  (; Java APIs
+  (/doc/stub/fs.lua
    /doc/stub/http.lua
    /doc/stub/os.lua
+   /doc/stub/term.lua
    /doc/stub/turtle.lua
-   /doc/stub/global.lua
-   ; Java generated APIs
-   /build/docs/luaJavadoc/turtle.lua
-   ; Peripherals
-   /build/docs/luaJavadoc/drive.lua
-   /build/docs/luaJavadoc/speaker.lua
-   /build/docs/luaJavadoc/printer.lua
-   ; Generic peripherals
-   /build/docs/luaJavadoc/fluid_storage.lua
-   ; Lua APIs
    /src/main/resources/*/computercraft/lua/rom/apis/io.lua
    /src/main/resources/*/computercraft/lua/rom/apis/window.lua)
 
-  (linters -doc:undocumented -doc:undocumented-arg -doc:undocumented-return))
+  (linters -doc:undocumented -doc:undocumented-arg))
 
-;; Suppress warnings for the BIOS using its own deprecated members for now.
-(at /src/main/resources/*/computercraft/lua/bios.lua
-  (linters -var:deprecated))
+;; These currently rely on unknown references.
+(at
+  (/src/main/resources/*/computercraft/lua/rom/apis/textutils.lua
+   /src/main/resources/*/computercraft/lua/rom/modules/main/cc/completion.lua
+   /src/main/resources/*/computercraft/lua/rom/modules/main/cc/shell/completion.lua
+   /src/main/resources/*/computercraft/lua/rom/programs/shell.lua)
+  (linters -doc:unresolved-reference))
 
 (at /src/test/resources/test-rom
-  ; We should still be able to test deprecated members.
-  (linters -var:deprecated)
-
   (lint
     (globals
       :max sleep write
       cct_test describe expect howlci fail it pending stub)))
-
-(at /src/web/mount/expr_template.lua (lint (globals :max __expr__)))

package-lock.json

@@ -1,172 +0,0 @@
-{
-  "name": "tweaked.cc",
-  "version": "1.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "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==",
-      "dev": true,
-      "requires": {
-        "@rollup/pluginutils": "^3.1.0",
-        "resolve": "^1.17.0"
-      }
-    },
-    "@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,
-      "requires": {
-        "@types/estree": "0.0.39",
-        "estree-walker": "^1.0.1",
-        "picomatch": "^2.2.2"
-      }
-    },
-    "@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
-    },
-    "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==",
-      "dev": true
-    },
-    "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
-    },
-    "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
-    },
-    "fsevents": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-      "dev": true,
-      "optional": true
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "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==",
-      "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==",
-      "dev": true
-    },
-    "picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-      "dev": true
-    },
-    "preact": {
-      "version": "10.5.5",
-      "resolved": "https://registry.npmjs.org/preact/-/preact-10.5.5.tgz",
-      "integrity": "sha512-5ONLNH1SXMzzbQoExZX4TELemNt+TEDb622xXFNfZngjjM9qtrzseJt+EfiUu4TZ6EJ95X5sE1ES4yqHFSIdhg=="
-    },
-    "requirejs": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz",
-      "integrity": "sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
-      "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
-      "dev": true,
-      "requires": {
-        "is-core-module": "^2.0.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==",
-      "dev": true,
-      "requires": {
-        "fsevents": "~2.1.2"
-      }
-    },
-    "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
-    },
-    "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,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "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
-        }
-      }
-    },
-    "terser": {
-      "version": "5.3.8",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.8.tgz",
-      "integrity": "sha512-zVotuHoIfnYjtlurOouTazciEfL7V38QMAOhGqpXDEg6yT13cF4+fEP9b0rrCEQTn+tT46uxgFsTZzhygk+CzQ==",
-      "dev": true,
-      "requires": {
-        "commander": "^2.20.0",
-        "source-map": "~0.7.2",
-        "source-map-support": "~0.5.19"
-      }
-    },
-    "tslib": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
-    },
-    "typescript": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz",
-      "integrity": "sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==",
-      "dev": true
-    }
-  }
-}

package.json

@@ -1,18 +0,0 @@
-{
-  "name": "tweaked.cc",
-  "version": "1.0.0",
-  "description": "Website additions for tweaked.cc",
-  "author": "SquidDev",
-  "license": "BSD-3-Clause",
-  "dependencies": {
-    "preact": "^10.5.5",
-    "tslib": "^2.0.3"
-  },
-  "devDependencies": {
-    "@rollup/plugin-typescript": "^6.1.0",
-    "requirejs": "^2.3.6",
-    "rollup": "^2.33.1",
-    "terser": "^5.3.8",
-    "typescript": "^4.0.5"
-  }
-}

rollup.config.js

@@ -1,55 +0,0 @@
-import { readFileSync, promises as fs } from "fs";
-import path from "path";
-
-import typescript from "@rollup/plugin-typescript";
-
-const input = "src/web";
-const requirejs = readFileSync("node_modules/requirejs/require.js");
-
-export default {
-    input: [`${input}/index.tsx`],
-    output: {
-        file: "build/rollup/index.js",
-        // We bundle requirejs (and config) into the header. It's rather gross
-        // but also works reasonably well.
-        banner: `${requirejs}\nrequire.config({ paths: { copycat: "https://copy-cat.squiddev.cc" } });`,
-        format: "amd",
-        preferConst: true,
-        amd: {
-            define: "require",
-        }
-    },
-    context: "window",
-    external: ["copycat/embed"],
-
-    plugins: [
-        typescript(),
-
-        {
-            name: "cc-tweaked",
-            async options(options) {
-                // Generate .d.ts files for all /mount files. This is the worst way to do it,
-                // but we need to run before the TS pass.
-                const template = "declare const contents : string;\nexport default contents;\n";
-                const files = await fs.readdir(`${input}/mount`);
-
-                await Promise.all(files
-                    .filter(x => path.extname(x) !== ".ts")
-                    .map(async file => {
-                        const path = `${input}/mount/${file}.d.ts`;
-                        const contents = await fs.readFile(path, { encoding: "utf-8" }).catch(() => "");
-                        if (contents !== template) await fs.writeFile(path, template);
-                    })
-                );
-                return options;
-            },
-            async transform(code, file) {
-                // Allow loading files in /mount.
-                const ext = path.extname(file);
-                return ext != '.tsx' && ext != '.ts' && path.dirname(file) === path.resolve(`${input}/mount`)
-                    ? `export default ${JSON.stringify(code)};\n`
-                    : null;
-            },
-        }
-    ],
-};

src/generated/resources/assets/computercraft/blockstates/computer_advanced.json

@@ -1,49 +0,0 @@
-{
-  "variants": {
-    "facing=north,state=off": {
-      "model": "computercraft:block/computer_advanced_off"
-    },
-    "facing=south,state=off": {
-      "model": "computercraft:block/computer_advanced_off",
-      "y": 180
-    },
-    "facing=west,state=off": {
-      "model": "computercraft:block/computer_advanced_off",
-      "y": 270
-    },
-    "facing=east,state=off": {
-      "model": "computercraft:block/computer_advanced_off",
-      "y": 90
-    },
-    "facing=north,state=on": {
-      "model": "computercraft:block/computer_advanced_on"
-    },
-    "facing=south,state=on": {
-      "model": "computercraft:block/computer_advanced_on",
-      "y": 180
-    },
-    "facing=west,state=on": {
-      "model": "computercraft:block/computer_advanced_on",
-      "y": 270
-    },
-    "facing=east,state=on": {
-      "model": "computercraft:block/computer_advanced_on",
-      "y": 90
-    },
-    "facing=north,state=blinking": {
-      "model": "computercraft:block/computer_advanced_blinking"
-    },
-    "facing=south,state=blinking": {
-      "model": "computercraft:block/computer_advanced_blinking",
-      "y": 180
-    },
-    "facing=west,state=blinking": {
-      "model": "computercraft:block/computer_advanced_blinking",
-      "y": 270
-    },
-    "facing=east,state=blinking": {
-      "model": "computercraft:block/computer_advanced_blinking",
-      "y": 90
-    }
-  }
-}

src/generated/resources/assets/computercraft/blockstates/computer_command.json

@@ -1,49 +0,0 @@
-{
-  "variants": {
-    "facing=north,state=off": {
-      "model": "computercraft:block/computer_command_off"
-    },
-    "facing=south,state=off": {
-      "model": "computercraft:block/computer_command_off",
-      "y": 180
-    },
-    "facing=west,state=off": {
-      "model": "computercraft:block/computer_command_off",
-      "y": 270
-    },
-    "facing=east,state=off": {
-      "model": "computercraft:block/computer_command_off",
-      "y": 90
-    },
-    "facing=north,state=on": {
-      "model": "computercraft:block/computer_command_on"
-    },
-    "facing=south,state=on": {
-      "model": "computercraft:block/computer_command_on",
-      "y": 180
-    },
-    "facing=west,state=on": {
-      "model": "computercraft:block/computer_command_on",
-      "y": 270
-    },
-    "facing=east,state=on": {
-      "model": "computercraft:block/computer_command_on",
-      "y": 90
-    },
-    "facing=north,state=blinking": {
-      "model": "computercraft:block/computer_command_blinking"
-    },
-    "facing=south,state=blinking": {
-      "model": "computercraft:block/computer_command_blinking",
-      "y": 180
-    },
-    "facing=west,state=blinking": {
-      "model": "computercraft:block/computer_command_blinking",
-      "y": 270
-    },
-    "facing=east,state=blinking": {
-      "model": "computercraft:block/computer_command_blinking",
-      "y": 90
-    }
-  }
-}

src/generated/resources/assets/computercraft/blockstates/computer_normal.json

@@ -1,49 +0,0 @@
-{
-  "variants": {
-    "facing=north,state=off": {
-      "model": "computercraft:block/computer_normal_off"
-    },
-    "facing=south,state=off": {
-      "model": "computercraft:block/computer_normal_off",
-      "y": 180
-    },
-    "facing=west,state=off": {
-      "model": "computercraft:block/computer_normal_off",
-      "y": 270
-    },
-    "facing=east,state=off": {
-      "model": "computercraft:block/computer_normal_off",
-      "y": 90
-    },
-    "facing=north,state=on": {
-      "model": "computercraft:block/computer_normal_on"
-    },
-    "facing=south,state=on": {
-      "model": "computercraft:block/computer_normal_on",
-      "y": 180
-    },
-    "facing=west,state=on": {
-      "model": "computercraft:block/computer_normal_on",
-      "y": 270
-    },
-    "facing=east,state=on": {
-      "model": "computercraft:block/computer_normal_on",
-      "y": 90
-    },
-    "facing=north,state=blinking": {
-      "model": "computercraft:block/computer_normal_blinking"
-    },
-    "facing=south,state=blinking": {
-      "model": "computercraft:block/computer_normal_blinking",
-      "y": 180
-    },
-    "facing=west,state=blinking": {
-      "model": "computercraft:block/computer_normal_blinking",
-      "y": 270
-    },
-    "facing=east,state=blinking": {
-      "model": "computercraft:block/computer_normal_blinking",
-      "y": 90
-    }
-  }
-}

src/generated/resources/assets/computercraft/blockstates/monitor_advanced.json

@@ -1,852 +0,0 @@
-{
-  "variants": {
-    "facing=north,orientation=down,state=none": {
-      "model": "computercraft:block/monitor_advanced",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=none": {
-      "model": "computercraft:block/monitor_advanced",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=none": {
-      "model": "computercraft:block/monitor_advanced",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=none": {
-      "model": "computercraft:block/monitor_advanced",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=none": {
-      "model": "computercraft:block/monitor_advanced",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=none": {
-      "model": "computercraft:block/monitor_advanced",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=none": {
-      "model": "computercraft:block/monitor_advanced",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=none": {
-      "model": "computercraft:block/monitor_advanced",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=none": {
-      "model": "computercraft:block/monitor_advanced"
-    },
-    "facing=south,orientation=north,state=none": {
-      "model": "computercraft:block/monitor_advanced",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=none": {
-      "model": "computercraft:block/monitor_advanced",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=none": {
-      "model": "computercraft:block/monitor_advanced",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=l": {
-      "model": "computercraft:block/monitor_advanced_l",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=l": {
-      "model": "computercraft:block/monitor_advanced_l",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=l": {
-      "model": "computercraft:block/monitor_advanced_l",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=l": {
-      "model": "computercraft:block/monitor_advanced_l",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=l": {
-      "model": "computercraft:block/monitor_advanced_l",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=l": {
-      "model": "computercraft:block/monitor_advanced_l",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=l": {
-      "model": "computercraft:block/monitor_advanced_l",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=l": {
-      "model": "computercraft:block/monitor_advanced_l",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=l": {
-      "model": "computercraft:block/monitor_advanced_l"
-    },
-    "facing=south,orientation=north,state=l": {
-      "model": "computercraft:block/monitor_advanced_l",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=l": {
-      "model": "computercraft:block/monitor_advanced_l",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=l": {
-      "model": "computercraft:block/monitor_advanced_l",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=r": {
-      "model": "computercraft:block/monitor_advanced_r",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=r": {
-      "model": "computercraft:block/monitor_advanced_r",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=r": {
-      "model": "computercraft:block/monitor_advanced_r",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=r": {
-      "model": "computercraft:block/monitor_advanced_r",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=r": {
-      "model": "computercraft:block/monitor_advanced_r",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=r": {
-      "model": "computercraft:block/monitor_advanced_r",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=r": {
-      "model": "computercraft:block/monitor_advanced_r",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=r": {
-      "model": "computercraft:block/monitor_advanced_r",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=r": {
-      "model": "computercraft:block/monitor_advanced_r"
-    },
-    "facing=south,orientation=north,state=r": {
-      "model": "computercraft:block/monitor_advanced_r",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=r": {
-      "model": "computercraft:block/monitor_advanced_r",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=r": {
-      "model": "computercraft:block/monitor_advanced_r",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=lr": {
-      "model": "computercraft:block/monitor_advanced_lr",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=lr": {
-      "model": "computercraft:block/monitor_advanced_lr",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=lr": {
-      "model": "computercraft:block/monitor_advanced_lr",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=lr": {
-      "model": "computercraft:block/monitor_advanced_lr",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=lr": {
-      "model": "computercraft:block/monitor_advanced_lr",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=lr": {
-      "model": "computercraft:block/monitor_advanced_lr",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=lr": {
-      "model": "computercraft:block/monitor_advanced_lr",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=lr": {
-      "model": "computercraft:block/monitor_advanced_lr",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=lr": {
-      "model": "computercraft:block/monitor_advanced_lr"
-    },
-    "facing=south,orientation=north,state=lr": {
-      "model": "computercraft:block/monitor_advanced_lr",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=lr": {
-      "model": "computercraft:block/monitor_advanced_lr",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=lr": {
-      "model": "computercraft:block/monitor_advanced_lr",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=u": {
-      "model": "computercraft:block/monitor_advanced_u",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=u": {
-      "model": "computercraft:block/monitor_advanced_u",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=u": {
-      "model": "computercraft:block/monitor_advanced_u",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=u": {
-      "model": "computercraft:block/monitor_advanced_u",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=u": {
-      "model": "computercraft:block/monitor_advanced_u",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=u": {
-      "model": "computercraft:block/monitor_advanced_u",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=u": {
-      "model": "computercraft:block/monitor_advanced_u",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=u": {
-      "model": "computercraft:block/monitor_advanced_u",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=u": {
-      "model": "computercraft:block/monitor_advanced_u"
-    },
-    "facing=south,orientation=north,state=u": {
-      "model": "computercraft:block/monitor_advanced_u",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=u": {
-      "model": "computercraft:block/monitor_advanced_u",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=u": {
-      "model": "computercraft:block/monitor_advanced_u",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=d": {
-      "model": "computercraft:block/monitor_advanced_d",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=d": {
-      "model": "computercraft:block/monitor_advanced_d",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=d": {
-      "model": "computercraft:block/monitor_advanced_d",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=d": {
-      "model": "computercraft:block/monitor_advanced_d",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=d": {
-      "model": "computercraft:block/monitor_advanced_d",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=d": {
-      "model": "computercraft:block/monitor_advanced_d",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=d": {
-      "model": "computercraft:block/monitor_advanced_d",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=d": {
-      "model": "computercraft:block/monitor_advanced_d",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=d": {
-      "model": "computercraft:block/monitor_advanced_d"
-    },
-    "facing=south,orientation=north,state=d": {
-      "model": "computercraft:block/monitor_advanced_d",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=d": {
-      "model": "computercraft:block/monitor_advanced_d",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=d": {
-      "model": "computercraft:block/monitor_advanced_d",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=ud": {
-      "model": "computercraft:block/monitor_advanced_ud",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=ud": {
-      "model": "computercraft:block/monitor_advanced_ud",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=ud": {
-      "model": "computercraft:block/monitor_advanced_ud",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=ud": {
-      "model": "computercraft:block/monitor_advanced_ud",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=ud": {
-      "model": "computercraft:block/monitor_advanced_ud",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=ud": {
-      "model": "computercraft:block/monitor_advanced_ud",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=ud": {
-      "model": "computercraft:block/monitor_advanced_ud",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=ud": {
-      "model": "computercraft:block/monitor_advanced_ud",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=ud": {
-      "model": "computercraft:block/monitor_advanced_ud"
-    },
-    "facing=south,orientation=north,state=ud": {
-      "model": "computercraft:block/monitor_advanced_ud",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=ud": {
-      "model": "computercraft:block/monitor_advanced_ud",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=ud": {
-      "model": "computercraft:block/monitor_advanced_ud",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=rd": {
-      "model": "computercraft:block/monitor_advanced_rd",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=rd": {
-      "model": "computercraft:block/monitor_advanced_rd",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=rd": {
-      "model": "computercraft:block/monitor_advanced_rd",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=rd": {
-      "model": "computercraft:block/monitor_advanced_rd",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=rd": {
-      "model": "computercraft:block/monitor_advanced_rd",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=rd": {
-      "model": "computercraft:block/monitor_advanced_rd",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=rd": {
-      "model": "computercraft:block/monitor_advanced_rd",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=rd": {
-      "model": "computercraft:block/monitor_advanced_rd",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=rd": {
-      "model": "computercraft:block/monitor_advanced_rd"
-    },
-    "facing=south,orientation=north,state=rd": {
-      "model": "computercraft:block/monitor_advanced_rd",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=rd": {
-      "model": "computercraft:block/monitor_advanced_rd",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=rd": {
-      "model": "computercraft:block/monitor_advanced_rd",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=ld": {
-      "model": "computercraft:block/monitor_advanced_ld",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=ld": {
-      "model": "computercraft:block/monitor_advanced_ld",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=ld": {
-      "model": "computercraft:block/monitor_advanced_ld",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=ld": {
-      "model": "computercraft:block/monitor_advanced_ld",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=ld": {
-      "model": "computercraft:block/monitor_advanced_ld",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=ld": {
-      "model": "computercraft:block/monitor_advanced_ld",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=ld": {
-      "model": "computercraft:block/monitor_advanced_ld",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=ld": {
-      "model": "computercraft:block/monitor_advanced_ld",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=ld": {
-      "model": "computercraft:block/monitor_advanced_ld"
-    },
-    "facing=south,orientation=north,state=ld": {
-      "model": "computercraft:block/monitor_advanced_ld",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=ld": {
-      "model": "computercraft:block/monitor_advanced_ld",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=ld": {
-      "model": "computercraft:block/monitor_advanced_ld",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=ru": {
-      "model": "computercraft:block/monitor_advanced_ru",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=ru": {
-      "model": "computercraft:block/monitor_advanced_ru",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=ru": {
-      "model": "computercraft:block/monitor_advanced_ru",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=ru": {
-      "model": "computercraft:block/monitor_advanced_ru",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=ru": {
-      "model": "computercraft:block/monitor_advanced_ru",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=ru": {
-      "model": "computercraft:block/monitor_advanced_ru",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=ru": {
-      "model": "computercraft:block/monitor_advanced_ru",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=ru": {
-      "model": "computercraft:block/monitor_advanced_ru",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=ru": {
-      "model": "computercraft:block/monitor_advanced_ru"
-    },
-    "facing=south,orientation=north,state=ru": {
-      "model": "computercraft:block/monitor_advanced_ru",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=ru": {
-      "model": "computercraft:block/monitor_advanced_ru",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=ru": {
-      "model": "computercraft:block/monitor_advanced_ru",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=lu": {
-      "model": "computercraft:block/monitor_advanced_lu",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=lu": {
-      "model": "computercraft:block/monitor_advanced_lu",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=lu": {
-      "model": "computercraft:block/monitor_advanced_lu",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=lu": {
-      "model": "computercraft:block/monitor_advanced_lu",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=lu": {
-      "model": "computercraft:block/monitor_advanced_lu",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=lu": {
-      "model": "computercraft:block/monitor_advanced_lu",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=lu": {
-      "model": "computercraft:block/monitor_advanced_lu",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=lu": {
-      "model": "computercraft:block/monitor_advanced_lu",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=lu": {
-      "model": "computercraft:block/monitor_advanced_lu"
-    },
-    "facing=south,orientation=north,state=lu": {
-      "model": "computercraft:block/monitor_advanced_lu",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=lu": {
-      "model": "computercraft:block/monitor_advanced_lu",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=lu": {
-      "model": "computercraft:block/monitor_advanced_lu",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=lrd": {
-      "model": "computercraft:block/monitor_advanced_lrd",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=lrd": {
-      "model": "computercraft:block/monitor_advanced_lrd",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=lrd": {
-      "model": "computercraft:block/monitor_advanced_lrd",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=lrd": {
-      "model": "computercraft:block/monitor_advanced_lrd",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=lrd": {
-      "model": "computercraft:block/monitor_advanced_lrd",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=lrd": {
-      "model": "computercraft:block/monitor_advanced_lrd",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=lrd": {
-      "model": "computercraft:block/monitor_advanced_lrd",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=lrd": {
-      "model": "computercraft:block/monitor_advanced_lrd",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=lrd": {
-      "model": "computercraft:block/monitor_advanced_lrd"
-    },
-    "facing=south,orientation=north,state=lrd": {
-      "model": "computercraft:block/monitor_advanced_lrd",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=lrd": {
-      "model": "computercraft:block/monitor_advanced_lrd",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=lrd": {
-      "model": "computercraft:block/monitor_advanced_lrd",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=rud": {
-      "model": "computercraft:block/monitor_advanced_rud",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=rud": {
-      "model": "computercraft:block/monitor_advanced_rud",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=rud": {
-      "model": "computercraft:block/monitor_advanced_rud",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=rud": {
-      "model": "computercraft:block/monitor_advanced_rud",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=rud": {
-      "model": "computercraft:block/monitor_advanced_rud",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=rud": {
-      "model": "computercraft:block/monitor_advanced_rud",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=rud": {
-      "model": "computercraft:block/monitor_advanced_rud",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=rud": {
-      "model": "computercraft:block/monitor_advanced_rud",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=rud": {
-      "model": "computercraft:block/monitor_advanced_rud"
-    },
-    "facing=south,orientation=north,state=rud": {
-      "model": "computercraft:block/monitor_advanced_rud",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=rud": {
-      "model": "computercraft:block/monitor_advanced_rud",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=rud": {
-      "model": "computercraft:block/monitor_advanced_rud",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=lud": {
-      "model": "computercraft:block/monitor_advanced_lud",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=lud": {
-      "model": "computercraft:block/monitor_advanced_lud",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=lud": {
-      "model": "computercraft:block/monitor_advanced_lud",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=lud": {
-      "model": "computercraft:block/monitor_advanced_lud",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=lud": {
-      "model": "computercraft:block/monitor_advanced_lud",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=lud": {
-      "model": "computercraft:block/monitor_advanced_lud",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=lud": {
-      "model": "computercraft:block/monitor_advanced_lud",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=lud": {
-      "model": "computercraft:block/monitor_advanced_lud",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=lud": {
-      "model": "computercraft:block/monitor_advanced_lud"
-    },
-    "facing=south,orientation=north,state=lud": {
-      "model": "computercraft:block/monitor_advanced_lud",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=lud": {
-      "model": "computercraft:block/monitor_advanced_lud",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=lud": {
-      "model": "computercraft:block/monitor_advanced_lud",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=lru": {
-      "model": "computercraft:block/monitor_advanced_lru",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=lru": {
-      "model": "computercraft:block/monitor_advanced_lru",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=lru": {
-      "model": "computercraft:block/monitor_advanced_lru",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=lru": {
-      "model": "computercraft:block/monitor_advanced_lru",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=lru": {
-      "model": "computercraft:block/monitor_advanced_lru",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=lru": {
-      "model": "computercraft:block/monitor_advanced_lru",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=lru": {
-      "model": "computercraft:block/monitor_advanced_lru",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=lru": {
-      "model": "computercraft:block/monitor_advanced_lru",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=lru": {
-      "model": "computercraft:block/monitor_advanced_lru"
-    },
-    "facing=south,orientation=north,state=lru": {
-      "model": "computercraft:block/monitor_advanced_lru",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=lru": {
-      "model": "computercraft:block/monitor_advanced_lru",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=lru": {
-      "model": "computercraft:block/monitor_advanced_lru",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=lrud": {
-      "model": "computercraft:block/monitor_advanced_lrud",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=lrud": {
-      "model": "computercraft:block/monitor_advanced_lrud",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=lrud": {
-      "model": "computercraft:block/monitor_advanced_lrud",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=lrud": {
-      "model": "computercraft:block/monitor_advanced_lrud",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=lrud": {
-      "model": "computercraft:block/monitor_advanced_lrud",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=lrud": {
-      "model": "computercraft:block/monitor_advanced_lrud",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=lrud": {
-      "model": "computercraft:block/monitor_advanced_lrud",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=lrud": {
-      "model": "computercraft:block/monitor_advanced_lrud",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=lrud": {
-      "model": "computercraft:block/monitor_advanced_lrud"
-    },
-    "facing=south,orientation=north,state=lrud": {
-      "model": "computercraft:block/monitor_advanced_lrud",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=lrud": {
-      "model": "computercraft:block/monitor_advanced_lrud",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=lrud": {
-      "model": "computercraft:block/monitor_advanced_lrud",
-      "y": 90
-    }
-  }
-}

src/generated/resources/assets/computercraft/blockstates/monitor_normal.json

@@ -1,852 +0,0 @@
-{
-  "variants": {
-    "facing=north,orientation=down,state=none": {
-      "model": "computercraft:block/monitor_normal",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=none": {
-      "model": "computercraft:block/monitor_normal",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=none": {
-      "model": "computercraft:block/monitor_normal",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=none": {
-      "model": "computercraft:block/monitor_normal",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=none": {
-      "model": "computercraft:block/monitor_normal",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=none": {
-      "model": "computercraft:block/monitor_normal",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=none": {
-      "model": "computercraft:block/monitor_normal",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=none": {
-      "model": "computercraft:block/monitor_normal",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=none": {
-      "model": "computercraft:block/monitor_normal"
-    },
-    "facing=south,orientation=north,state=none": {
-      "model": "computercraft:block/monitor_normal",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=none": {
-      "model": "computercraft:block/monitor_normal",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=none": {
-      "model": "computercraft:block/monitor_normal",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=l": {
-      "model": "computercraft:block/monitor_normal_l",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=l": {
-      "model": "computercraft:block/monitor_normal_l",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=l": {
-      "model": "computercraft:block/monitor_normal_l",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=l": {
-      "model": "computercraft:block/monitor_normal_l",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=l": {
-      "model": "computercraft:block/monitor_normal_l",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=l": {
-      "model": "computercraft:block/monitor_normal_l",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=l": {
-      "model": "computercraft:block/monitor_normal_l",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=l": {
-      "model": "computercraft:block/monitor_normal_l",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=l": {
-      "model": "computercraft:block/monitor_normal_l"
-    },
-    "facing=south,orientation=north,state=l": {
-      "model": "computercraft:block/monitor_normal_l",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=l": {
-      "model": "computercraft:block/monitor_normal_l",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=l": {
-      "model": "computercraft:block/monitor_normal_l",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=r": {
-      "model": "computercraft:block/monitor_normal_r",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=r": {
-      "model": "computercraft:block/monitor_normal_r",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=r": {
-      "model": "computercraft:block/monitor_normal_r",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=r": {
-      "model": "computercraft:block/monitor_normal_r",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=r": {
-      "model": "computercraft:block/monitor_normal_r",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=r": {
-      "model": "computercraft:block/monitor_normal_r",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=r": {
-      "model": "computercraft:block/monitor_normal_r",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=r": {
-      "model": "computercraft:block/monitor_normal_r",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=r": {
-      "model": "computercraft:block/monitor_normal_r"
-    },
-    "facing=south,orientation=north,state=r": {
-      "model": "computercraft:block/monitor_normal_r",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=r": {
-      "model": "computercraft:block/monitor_normal_r",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=r": {
-      "model": "computercraft:block/monitor_normal_r",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=lr": {
-      "model": "computercraft:block/monitor_normal_lr",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=lr": {
-      "model": "computercraft:block/monitor_normal_lr",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=lr": {
-      "model": "computercraft:block/monitor_normal_lr",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=lr": {
-      "model": "computercraft:block/monitor_normal_lr",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=lr": {
-      "model": "computercraft:block/monitor_normal_lr",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=lr": {
-      "model": "computercraft:block/monitor_normal_lr",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=lr": {
-      "model": "computercraft:block/monitor_normal_lr",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=lr": {
-      "model": "computercraft:block/monitor_normal_lr",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=lr": {
-      "model": "computercraft:block/monitor_normal_lr"
-    },
-    "facing=south,orientation=north,state=lr": {
-      "model": "computercraft:block/monitor_normal_lr",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=lr": {
-      "model": "computercraft:block/monitor_normal_lr",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=lr": {
-      "model": "computercraft:block/monitor_normal_lr",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=u": {
-      "model": "computercraft:block/monitor_normal_u",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=u": {
-      "model": "computercraft:block/monitor_normal_u",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=u": {
-      "model": "computercraft:block/monitor_normal_u",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=u": {
-      "model": "computercraft:block/monitor_normal_u",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=u": {
-      "model": "computercraft:block/monitor_normal_u",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=u": {
-      "model": "computercraft:block/monitor_normal_u",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=u": {
-      "model": "computercraft:block/monitor_normal_u",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=u": {
-      "model": "computercraft:block/monitor_normal_u",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=u": {
-      "model": "computercraft:block/monitor_normal_u"
-    },
-    "facing=south,orientation=north,state=u": {
-      "model": "computercraft:block/monitor_normal_u",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=u": {
-      "model": "computercraft:block/monitor_normal_u",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=u": {
-      "model": "computercraft:block/monitor_normal_u",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=d": {
-      "model": "computercraft:block/monitor_normal_d",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=d": {
-      "model": "computercraft:block/monitor_normal_d",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=d": {
-      "model": "computercraft:block/monitor_normal_d",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=d": {
-      "model": "computercraft:block/monitor_normal_d",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=d": {
-      "model": "computercraft:block/monitor_normal_d",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=d": {
-      "model": "computercraft:block/monitor_normal_d",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=d": {
-      "model": "computercraft:block/monitor_normal_d",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=d": {
-      "model": "computercraft:block/monitor_normal_d",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=d": {
-      "model": "computercraft:block/monitor_normal_d"
-    },
-    "facing=south,orientation=north,state=d": {
-      "model": "computercraft:block/monitor_normal_d",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=d": {
-      "model": "computercraft:block/monitor_normal_d",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=d": {
-      "model": "computercraft:block/monitor_normal_d",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=ud": {
-      "model": "computercraft:block/monitor_normal_ud",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=ud": {
-      "model": "computercraft:block/monitor_normal_ud",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=ud": {
-      "model": "computercraft:block/monitor_normal_ud",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=ud": {
-      "model": "computercraft:block/monitor_normal_ud",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=ud": {
-      "model": "computercraft:block/monitor_normal_ud",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=ud": {
-      "model": "computercraft:block/monitor_normal_ud",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=ud": {
-      "model": "computercraft:block/monitor_normal_ud",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=ud": {
-      "model": "computercraft:block/monitor_normal_ud",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=ud": {
-      "model": "computercraft:block/monitor_normal_ud"
-    },
-    "facing=south,orientation=north,state=ud": {
-      "model": "computercraft:block/monitor_normal_ud",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=ud": {
-      "model": "computercraft:block/monitor_normal_ud",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=ud": {
-      "model": "computercraft:block/monitor_normal_ud",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=rd": {
-      "model": "computercraft:block/monitor_normal_rd",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=rd": {
-      "model": "computercraft:block/monitor_normal_rd",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=rd": {
-      "model": "computercraft:block/monitor_normal_rd",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=rd": {
-      "model": "computercraft:block/monitor_normal_rd",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=rd": {
-      "model": "computercraft:block/monitor_normal_rd",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=rd": {
-      "model": "computercraft:block/monitor_normal_rd",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=rd": {
-      "model": "computercraft:block/monitor_normal_rd",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=rd": {
-      "model": "computercraft:block/monitor_normal_rd",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=rd": {
-      "model": "computercraft:block/monitor_normal_rd"
-    },
-    "facing=south,orientation=north,state=rd": {
-      "model": "computercraft:block/monitor_normal_rd",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=rd": {
-      "model": "computercraft:block/monitor_normal_rd",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=rd": {
-      "model": "computercraft:block/monitor_normal_rd",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=ld": {
-      "model": "computercraft:block/monitor_normal_ld",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=ld": {
-      "model": "computercraft:block/monitor_normal_ld",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=ld": {
-      "model": "computercraft:block/monitor_normal_ld",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=ld": {
-      "model": "computercraft:block/monitor_normal_ld",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=ld": {
-      "model": "computercraft:block/monitor_normal_ld",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=ld": {
-      "model": "computercraft:block/monitor_normal_ld",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=ld": {
-      "model": "computercraft:block/monitor_normal_ld",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=ld": {
-      "model": "computercraft:block/monitor_normal_ld",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=ld": {
-      "model": "computercraft:block/monitor_normal_ld"
-    },
-    "facing=south,orientation=north,state=ld": {
-      "model": "computercraft:block/monitor_normal_ld",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=ld": {
-      "model": "computercraft:block/monitor_normal_ld",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=ld": {
-      "model": "computercraft:block/monitor_normal_ld",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=ru": {
-      "model": "computercraft:block/monitor_normal_ru",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=ru": {
-      "model": "computercraft:block/monitor_normal_ru",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=ru": {
-      "model": "computercraft:block/monitor_normal_ru",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=ru": {
-      "model": "computercraft:block/monitor_normal_ru",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=ru": {
-      "model": "computercraft:block/monitor_normal_ru",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=ru": {
-      "model": "computercraft:block/monitor_normal_ru",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=ru": {
-      "model": "computercraft:block/monitor_normal_ru",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=ru": {
-      "model": "computercraft:block/monitor_normal_ru",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=ru": {
-      "model": "computercraft:block/monitor_normal_ru"
-    },
-    "facing=south,orientation=north,state=ru": {
-      "model": "computercraft:block/monitor_normal_ru",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=ru": {
-      "model": "computercraft:block/monitor_normal_ru",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=ru": {
-      "model": "computercraft:block/monitor_normal_ru",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=lu": {
-      "model": "computercraft:block/monitor_normal_lu",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=lu": {
-      "model": "computercraft:block/monitor_normal_lu",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=lu": {
-      "model": "computercraft:block/monitor_normal_lu",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=lu": {
-      "model": "computercraft:block/monitor_normal_lu",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=lu": {
-      "model": "computercraft:block/monitor_normal_lu",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=lu": {
-      "model": "computercraft:block/monitor_normal_lu",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=lu": {
-      "model": "computercraft:block/monitor_normal_lu",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=lu": {
-      "model": "computercraft:block/monitor_normal_lu",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=lu": {
-      "model": "computercraft:block/monitor_normal_lu"
-    },
-    "facing=south,orientation=north,state=lu": {
-      "model": "computercraft:block/monitor_normal_lu",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=lu": {
-      "model": "computercraft:block/monitor_normal_lu",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=lu": {
-      "model": "computercraft:block/monitor_normal_lu",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=lrd": {
-      "model": "computercraft:block/monitor_normal_lrd",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=lrd": {
-      "model": "computercraft:block/monitor_normal_lrd",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=lrd": {
-      "model": "computercraft:block/monitor_normal_lrd",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=lrd": {
-      "model": "computercraft:block/monitor_normal_lrd",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=lrd": {
-      "model": "computercraft:block/monitor_normal_lrd",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=lrd": {
-      "model": "computercraft:block/monitor_normal_lrd",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=lrd": {
-      "model": "computercraft:block/monitor_normal_lrd",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=lrd": {
-      "model": "computercraft:block/monitor_normal_lrd",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=lrd": {
-      "model": "computercraft:block/monitor_normal_lrd"
-    },
-    "facing=south,orientation=north,state=lrd": {
-      "model": "computercraft:block/monitor_normal_lrd",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=lrd": {
-      "model": "computercraft:block/monitor_normal_lrd",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=lrd": {
-      "model": "computercraft:block/monitor_normal_lrd",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=rud": {
-      "model": "computercraft:block/monitor_normal_rud",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=rud": {
-      "model": "computercraft:block/monitor_normal_rud",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=rud": {
-      "model": "computercraft:block/monitor_normal_rud",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=rud": {
-      "model": "computercraft:block/monitor_normal_rud",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=rud": {
-      "model": "computercraft:block/monitor_normal_rud",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=rud": {
-      "model": "computercraft:block/monitor_normal_rud",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=rud": {
-      "model": "computercraft:block/monitor_normal_rud",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=rud": {
-      "model": "computercraft:block/monitor_normal_rud",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=rud": {
-      "model": "computercraft:block/monitor_normal_rud"
-    },
-    "facing=south,orientation=north,state=rud": {
-      "model": "computercraft:block/monitor_normal_rud",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=rud": {
-      "model": "computercraft:block/monitor_normal_rud",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=rud": {
-      "model": "computercraft:block/monitor_normal_rud",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=lud": {
-      "model": "computercraft:block/monitor_normal_lud",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=lud": {
-      "model": "computercraft:block/monitor_normal_lud",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=lud": {
-      "model": "computercraft:block/monitor_normal_lud",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=lud": {
-      "model": "computercraft:block/monitor_normal_lud",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=lud": {
-      "model": "computercraft:block/monitor_normal_lud",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=lud": {
-      "model": "computercraft:block/monitor_normal_lud",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=lud": {
-      "model": "computercraft:block/monitor_normal_lud",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=lud": {
-      "model": "computercraft:block/monitor_normal_lud",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=lud": {
-      "model": "computercraft:block/monitor_normal_lud"
-    },
-    "facing=south,orientation=north,state=lud": {
-      "model": "computercraft:block/monitor_normal_lud",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=lud": {
-      "model": "computercraft:block/monitor_normal_lud",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=lud": {
-      "model": "computercraft:block/monitor_normal_lud",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=lru": {
-      "model": "computercraft:block/monitor_normal_lru",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=lru": {
-      "model": "computercraft:block/monitor_normal_lru",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=lru": {
-      "model": "computercraft:block/monitor_normal_lru",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=lru": {
-      "model": "computercraft:block/monitor_normal_lru",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=lru": {
-      "model": "computercraft:block/monitor_normal_lru",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=lru": {
-      "model": "computercraft:block/monitor_normal_lru",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=lru": {
-      "model": "computercraft:block/monitor_normal_lru",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=lru": {
-      "model": "computercraft:block/monitor_normal_lru",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=lru": {
-      "model": "computercraft:block/monitor_normal_lru"
-    },
-    "facing=south,orientation=north,state=lru": {
-      "model": "computercraft:block/monitor_normal_lru",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=lru": {
-      "model": "computercraft:block/monitor_normal_lru",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=lru": {
-      "model": "computercraft:block/monitor_normal_lru",
-      "y": 90
-    },
-    "facing=north,orientation=down,state=lrud": {
-      "model": "computercraft:block/monitor_normal_lrud",
-      "x": 90
-    },
-    "facing=south,orientation=down,state=lrud": {
-      "model": "computercraft:block/monitor_normal_lrud",
-      "x": 90,
-      "y": 180
-    },
-    "facing=west,orientation=down,state=lrud": {
-      "model": "computercraft:block/monitor_normal_lrud",
-      "x": 90,
-      "y": 270
-    },
-    "facing=east,orientation=down,state=lrud": {
-      "model": "computercraft:block/monitor_normal_lrud",
-      "x": 90,
-      "y": 90
-    },
-    "facing=north,orientation=up,state=lrud": {
-      "model": "computercraft:block/monitor_normal_lrud",
-      "x": 270
-    },
-    "facing=south,orientation=up,state=lrud": {
-      "model": "computercraft:block/monitor_normal_lrud",
-      "x": 270,
-      "y": 180
-    },
-    "facing=west,orientation=up,state=lrud": {
-      "model": "computercraft:block/monitor_normal_lrud",
-      "x": 270,
-      "y": 270
-    },
-    "facing=east,orientation=up,state=lrud": {
-      "model": "computercraft:block/monitor_normal_lrud",
-      "x": 270,
-      "y": 90
-    },
-    "facing=north,orientation=north,state=lrud": {
-      "model": "computercraft:block/monitor_normal_lrud"
-    },
-    "facing=south,orientation=north,state=lrud": {
-      "model": "computercraft:block/monitor_normal_lrud",
-      "y": 180
-    },
-    "facing=west,orientation=north,state=lrud": {
-      "model": "computercraft:block/monitor_normal_lrud",
-      "y": 270
-    },
-    "facing=east,orientation=north,state=lrud": {
-      "model": "computercraft:block/monitor_normal_lrud",
-      "y": 90
-    }
-  }
-}

src/generated/resources/assets/computercraft/models/block/computer_advanced_blinking.json

@@ -1,8 +0,0 @@
-{
-  "parent": "block/orientable",
-  "textures": {
-    "top": "computercraft:block/computer_advanced_top",
-    "side": "computercraft:block/computer_advanced_side",
-    "front": "computercraft:block/computer_advanced_front_blink"
-  }
-}

src/generated/resources/assets/computercraft/models/block/computer_advanced_off.json

@@ -1,8 +0,0 @@
-{
-  "parent": "block/orientable",
-  "textures": {
-    "top": "computercraft:block/computer_advanced_top",
-    "side": "computercraft:block/computer_advanced_side",
-    "front": "computercraft:block/computer_advanced_front"
-  }
-}

src/generated/resources/assets/computercraft/models/block/computer_advanced_on.json

@@ -1,8 +0,0 @@
-{
-  "parent": "block/orientable",
-  "textures": {
-    "top": "computercraft:block/computer_advanced_top",
-    "side": "computercraft:block/computer_advanced_side",
-    "front": "computercraft:block/computer_advanced_front_on"
-  }
-}

src/generated/resources/assets/computercraft/models/block/computer_command_blinking.json

@@ -1,8 +0,0 @@
-{
-  "parent": "block/orientable",
-  "textures": {
-    "top": "computercraft:block/computer_command_top",
-    "side": "computercraft:block/computer_command_side",
-    "front": "computercraft:block/computer_command_front_blink"
-  }
-}

src/generated/resources/assets/computercraft/models/block/computer_command_off.json

@@ -1,8 +0,0 @@
-{
-  "parent": "block/orientable",
-  "textures": {
-    "top": "computercraft:block/computer_command_top",
-    "side": "computercraft:block/computer_command_side",
-    "front": "computercraft:block/computer_command_front"
-  }
-}

src/generated/resources/assets/computercraft/models/block/computer_command_on.json

@@ -1,8 +0,0 @@
-{
-  "parent": "block/orientable",
-  "textures": {
-    "top": "computercraft:block/computer_command_top",
-    "side": "computercraft:block/computer_command_side",
-    "front": "computercraft:block/computer_command_front_on"
-  }
-}

src/generated/resources/assets/computercraft/models/block/computer_normal_blinking.json

@@ -1,8 +0,0 @@
-{
-  "parent": "block/orientable",
-  "textures": {
-    "top": "computercraft:block/computer_normal_top",
-    "side": "computercraft:block/computer_normal_side",
-    "front": "computercraft:block/computer_normal_front_blink"
-  }
-}

src/generated/resources/assets/computercraft/models/block/computer_normal_off.json

@@ -1,8 +0,0 @@
-{
-  "parent": "block/orientable",
-  "textures": {
-    "top": "computercraft:block/computer_normal_top",
-    "side": "computercraft:block/computer_normal_side",
-    "front": "computercraft:block/computer_normal_front"
-  }
-}

src/generated/resources/assets/computercraft/models/block/computer_normal_on.json

@@ -1,8 +0,0 @@
-{
-  "parent": "block/orientable",
-  "textures": {
-    "top": "computercraft:block/computer_normal_top",
-    "side": "computercraft:block/computer_normal_side",
-    "front": "computercraft:block/computer_normal_front_on"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_advanced.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_advanced_16",
-    "side": "computercraft:block/monitor_advanced_4",
-    "top": "computercraft:block/monitor_advanced_0",
-    "back": "computercraft:block/monitor_advanced_32"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_d.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_advanced_20",
-    "side": "computercraft:block/monitor_advanced_7",
-    "top": "computercraft:block/monitor_advanced_0",
-    "back": "computercraft:block/monitor_advanced_36"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_l.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_advanced_19",
-    "side": "computercraft:block/monitor_advanced_4",
-    "top": "computercraft:block/monitor_advanced_1",
-    "back": "computercraft:block/monitor_advanced_33"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_ld.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_advanced_31",
-    "side": "computercraft:block/monitor_advanced_7",
-    "top": "computercraft:block/monitor_advanced_1",
-    "back": "computercraft:block/monitor_advanced_45"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_lr.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_advanced_18",
-    "side": "computercraft:block/monitor_advanced_4",
-    "top": "computercraft:block/monitor_advanced_2",
-    "back": "computercraft:block/monitor_advanced_34"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_lrd.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_advanced_30",
-    "side": "computercraft:block/monitor_advanced_7",
-    "top": "computercraft:block/monitor_advanced_2",
-    "back": "computercraft:block/monitor_advanced_46"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_lru.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_advanced_24",
-    "side": "computercraft:block/monitor_advanced_5",
-    "top": "computercraft:block/monitor_advanced_2",
-    "back": "computercraft:block/monitor_advanced_40"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_lrud.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_advanced_27",
-    "side": "computercraft:block/monitor_advanced_6",
-    "top": "computercraft:block/monitor_advanced_2",
-    "back": "computercraft:block/monitor_advanced_43"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_lu.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_advanced_25",
-    "side": "computercraft:block/monitor_advanced_5",
-    "top": "computercraft:block/monitor_advanced_1",
-    "back": "computercraft:block/monitor_advanced_39"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_lud.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_advanced_28",
-    "side": "computercraft:block/monitor_advanced_6",
-    "top": "computercraft:block/monitor_advanced_1",
-    "back": "computercraft:block/monitor_advanced_42"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_r.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_advanced_17",
-    "side": "computercraft:block/monitor_advanced_4",
-    "top": "computercraft:block/monitor_advanced_3",
-    "back": "computercraft:block/monitor_advanced_35"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_rd.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_advanced_29",
-    "side": "computercraft:block/monitor_advanced_7",
-    "top": "computercraft:block/monitor_advanced_3",
-    "back": "computercraft:block/monitor_advanced_47"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_ru.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_advanced_23",
-    "side": "computercraft:block/monitor_advanced_5",
-    "top": "computercraft:block/monitor_advanced_3",
-    "back": "computercraft:block/monitor_advanced_41"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_rud.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_advanced_26",
-    "side": "computercraft:block/monitor_advanced_6",
-    "top": "computercraft:block/monitor_advanced_3",
-    "back": "computercraft:block/monitor_advanced_44"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_u.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_advanced_22",
-    "side": "computercraft:block/monitor_advanced_5",
-    "top": "computercraft:block/monitor_advanced_0",
-    "back": "computercraft:block/monitor_advanced_38"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_advanced_ud.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_advanced_21",
-    "side": "computercraft:block/monitor_advanced_6",
-    "top": "computercraft:block/monitor_advanced_0",
-    "back": "computercraft:block/monitor_advanced_37"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_normal.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_normal_16",
-    "side": "computercraft:block/monitor_normal_4",
-    "top": "computercraft:block/monitor_normal_0",
-    "back": "computercraft:block/monitor_normal_32"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_normal_d.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_normal_20",
-    "side": "computercraft:block/monitor_normal_7",
-    "top": "computercraft:block/monitor_normal_0",
-    "back": "computercraft:block/monitor_normal_36"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_normal_l.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_normal_19",
-    "side": "computercraft:block/monitor_normal_4",
-    "top": "computercraft:block/monitor_normal_1",
-    "back": "computercraft:block/monitor_normal_33"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_normal_ld.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_normal_31",
-    "side": "computercraft:block/monitor_normal_7",
-    "top": "computercraft:block/monitor_normal_1",
-    "back": "computercraft:block/monitor_normal_45"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_normal_lr.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_normal_18",
-    "side": "computercraft:block/monitor_normal_4",
-    "top": "computercraft:block/monitor_normal_2",
-    "back": "computercraft:block/monitor_normal_34"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_normal_lrd.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_normal_30",
-    "side": "computercraft:block/monitor_normal_7",
-    "top": "computercraft:block/monitor_normal_2",
-    "back": "computercraft:block/monitor_normal_46"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_normal_lru.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_normal_24",
-    "side": "computercraft:block/monitor_normal_5",
-    "top": "computercraft:block/monitor_normal_2",
-    "back": "computercraft:block/monitor_normal_40"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_normal_lrud.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_normal_27",
-    "side": "computercraft:block/monitor_normal_6",
-    "top": "computercraft:block/monitor_normal_2",
-    "back": "computercraft:block/monitor_normal_43"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_normal_lu.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_normal_25",
-    "side": "computercraft:block/monitor_normal_5",
-    "top": "computercraft:block/monitor_normal_1",
-    "back": "computercraft:block/monitor_normal_39"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_normal_lud.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_normal_28",
-    "side": "computercraft:block/monitor_normal_6",
-    "top": "computercraft:block/monitor_normal_1",
-    "back": "computercraft:block/monitor_normal_42"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_normal_r.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_normal_17",
-    "side": "computercraft:block/monitor_normal_4",
-    "top": "computercraft:block/monitor_normal_3",
-    "back": "computercraft:block/monitor_normal_35"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_normal_rd.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_normal_29",
-    "side": "computercraft:block/monitor_normal_7",
-    "top": "computercraft:block/monitor_normal_3",
-    "back": "computercraft:block/monitor_normal_47"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_normal_ru.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_normal_23",
-    "side": "computercraft:block/monitor_normal_5",
-    "top": "computercraft:block/monitor_normal_3",
-    "back": "computercraft:block/monitor_normal_41"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_normal_rud.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_normal_26",
-    "side": "computercraft:block/monitor_normal_6",
-    "top": "computercraft:block/monitor_normal_3",
-    "back": "computercraft:block/monitor_normal_44"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_normal_u.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_normal_22",
-    "side": "computercraft:block/monitor_normal_5",
-    "top": "computercraft:block/monitor_normal_0",
-    "back": "computercraft:block/monitor_normal_38"
-  }
-}

src/generated/resources/assets/computercraft/models/block/monitor_normal_ud.json

@@ -1,9 +0,0 @@
-{
-  "parent": "computercraft:block/monitor_base",
-  "textures": {
-    "front": "computercraft:block/monitor_normal_21",
-    "side": "computercraft:block/monitor_normal_6",
-    "top": "computercraft:block/monitor_normal_0",
-    "back": "computercraft:block/monitor_normal_37"
-  }
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/cable.json

@@ -1,43 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:cable"
-    ]
-  },
-  "criteria": {
-    "has_computer": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "tag": "computercraft:computer"
-          }
-        ]
-      }
-    },
-    "has_modem": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "tag": "computercraft:computer"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:cable"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_computer",
-      "has_modem",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_advanced.json

@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:computer_advanced"
-    ]
-  },
-  "criteria": {
-    "has_components": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "minecraft:redstone"
-          },
-          {
-            "item": "minecraft:gold_ingot"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:computer_advanced"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_components",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_command.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:computer_command"
-    ]
-  },
-  "criteria": {
-    "has_components": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "minecraft:command_block"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:computer_command"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_components",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_normal.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:computer_normal"
-    ]
-  },
-  "criteria": {
-    "has_redstone": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "tag": "forge:dusts/redstone"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:computer_normal"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_redstone",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_1.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:disk_1"
-    ]
-  },
-  "criteria": {
-    "has_drive": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:disk_drive"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:disk_1"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_drive",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_10.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:disk_10"
-    ]
-  },
-  "criteria": {
-    "has_drive": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:disk_drive"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:disk_10"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_drive",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_11.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:disk_11"
-    ]
-  },
-  "criteria": {
-    "has_drive": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:disk_drive"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:disk_11"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_drive",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_12.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:disk_12"
-    ]
-  },
-  "criteria": {
-    "has_drive": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:disk_drive"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:disk_12"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_drive",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_13.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:disk_13"
-    ]
-  },
-  "criteria": {
-    "has_drive": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:disk_drive"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:disk_13"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_drive",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_14.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:disk_14"
-    ]
-  },
-  "criteria": {
-    "has_drive": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:disk_drive"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:disk_14"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_drive",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_15.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:disk_15"
-    ]
-  },
-  "criteria": {
-    "has_drive": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:disk_drive"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:disk_15"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_drive",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_16.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:disk_16"
-    ]
-  },
-  "criteria": {
-    "has_drive": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:disk_drive"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:disk_16"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_drive",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_2.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:disk_2"
-    ]
-  },
-  "criteria": {
-    "has_drive": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:disk_drive"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:disk_2"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_drive",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_3.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:disk_3"
-    ]
-  },
-  "criteria": {
-    "has_drive": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:disk_drive"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:disk_3"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_drive",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_4.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:disk_4"
-    ]
-  },
-  "criteria": {
-    "has_drive": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:disk_drive"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:disk_4"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_drive",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_5.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:disk_5"
-    ]
-  },
-  "criteria": {
-    "has_drive": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:disk_drive"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:disk_5"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_drive",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_6.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:disk_6"
-    ]
-  },
-  "criteria": {
-    "has_drive": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:disk_drive"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:disk_6"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_drive",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_7.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:disk_7"
-    ]
-  },
-  "criteria": {
-    "has_drive": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:disk_drive"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:disk_7"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_drive",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_8.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:disk_8"
-    ]
-  },
-  "criteria": {
-    "has_drive": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:disk_drive"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:disk_8"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_drive",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_9.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:disk_9"
-    ]
-  },
-  "criteria": {
-    "has_drive": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:disk_drive"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:disk_9"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_drive",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_drive.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:disk_drive"
-    ]
-  },
-  "criteria": {
-    "has_computer": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "tag": "computercraft:computer"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:disk_drive"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_computer",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/monitor_advanced.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:monitor_advanced"
-    ]
-  },
-  "criteria": {
-    "has_computer": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "tag": "computercraft:computer"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:monitor_advanced"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_computer",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/monitor_normal.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:monitor_normal"
-    ]
-  },
-  "criteria": {
-    "has_computer": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "tag": "computercraft:computer"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:monitor_normal"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_computer",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/speaker.json

@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_advanced/computercraft/speaker"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:pocket_computer_advanced"
-          },
-          {
-            "item": "computercraft:speaker"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_advanced/computercraft/speaker"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}

src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_advanced.json

@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_advanced/computercraft/wireless_modem_advanced"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:pocket_computer_advanced"
-          },
-          {
-            "item": "computercraft:wireless_modem_advanced"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_advanced/computercraft/wireless_modem_advanced"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}