Merge branch 'mc-1.13.x' into mc-1.14-fabric

Add highlight rendering for monitors and cables
Correctly offset touch position on a monitor
2025-11-03 15:13:07 +00:00 · 2019-06-02 18:41:53 +01:00 · 2019-06-02 18:24:08 +01:00 · 2019-06-02 18:06:24 +01:00 · 2019-06-02 17:54:00 +01:00 · 2019-06-02 17:42:07 +01:00
1361 changed files with 33227 additions and 37009 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,12 +11,5 @@ insert_final_newline = true
 [*.md]
 trim_trailing_whitespace = false

-[*.sexp]
-indent_size = 2
-
-[*.yml]
-indent_size = 2
-
-
 [*.properties]
 insert_final_newline = false
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +0,0 @@
-# Ignore changes in generated files
-src/generated/resources/data/** linguist-generated
--- a/.github/workflows/main-ci.yml
+++ b/.github/workflows/main-ci.yml
@@ -1,49 +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)
-
-    - 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
--- a/.github/workflows/make-doc.sh
+++ b/.github/workflows/make-doc.sh
@@ -1,16 +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/doc/" \
-      "$SSH_USER@$SSH_HOST:/var/www/tweaked.cc/$DEST"
--- a/.github/workflows/make-doc.yml
+++ b/.github/workflows/make-doc.yml
@@ -1,52 +0,0 @@
-name: Build documentation
-
-on:
-  push:
-    branches:
-    - master
-    - mc-1.15.x
-    tags:
-  release:
-    types: [ published ]
-
-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: Build with Gradle
-      run: ./gradlew compileJava --no-daemon || ./gradlew compileJava --no-daemon
-
-    - name: Generate Java documentation stubs
-      run: ./gradlew luaJavadoc --no-daemon
-
-    - name: Build documentation
-      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 doc-gen
-
-    - 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 }}
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,6 @@
 /logs
 /build
 /out
-/doc/**/*.html
-/doc/javadoc/
-/doc/index.json

 # Runtime directories
 /run
@@ -18,11 +15,3 @@
 .idea
 .gradle
 *.DS_Store
-
-.classpath
-.project
-.settings/
-bin/
-*.launch
-
-/src/generated/resources/.cache
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -0,0 +1,34 @@
+std = "max"
+
+ignore = {
+    -- Allow access to undefined globals or their fields. In the future we'll
+    -- define all of CC's globals within this file
+    '113', '143',
+
+    -- FIXME: Ignore unused arguments and loop variables
+    '212', '213',
+
+    -- Disable line is too long for now. It would be possible to clean
+    -- this up in the future.
+    '631',
+}
+
+-- Only run the linter on ROM and bios for now, as the treasure disks
+-- are largely unsupported.
+include_files = {
+    'src/main/resources/assets/computercraft/lua/rom',
+    'src/main/resources/assets/computercraft/lua/bios.lua'
+}
+
+files['src/main/resources/assets/computercraft/lua/bios.lua'] = {
+    -- Allow declaring and mutating globals
+    allow_defined_top = true,
+    ignore = { '112', '121', '122', '131', '142' },
+}
+
+files['src/main/resources/assets/computercraft/lua/rom/apis'] = {
+    -- APIs may define globals on the top level. We'll ignore unused globals,
+    -- as obviously they may be used outside that API.
+    allow_defined_top = true,
+    ignore = { '131' },
+}
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,14 @@
+language: java
+
+script: ./gradlew build --no-daemon
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/s
+
+jdk:
+    - oraclejdk8
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,41 +0,0 @@
-# Contributing to CC: Tweaked
-As with many open source projects, CC: Tweaked thrives on contributions from other people! This document (hopefully)
-provides an introduction as to how to get started in helping out.
-
-If you've any other questions, [just ask the community][community] or [open an issue][new-issue].
-
-## Reporting issues
-If you have a bug, suggestion, or other feedback, the best thing to do is [file an issue][new-issue]. When doing so,
-do use the issue templates - they provide a useful hint on what information to provide.
-
-## 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`.
-
- - **Clone the repository:** `git clone https://github.com/SquidDev-CC/CC-Tweaked.git && cd CC-Tweaked`
- - **Setup Forge:** `./gradlew build`
- - **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`.
-These commands may take a few minutes to run the first time, as the environment is set up, but should be much faster
-afterwards.
-
-### Code linters
-CC: Tweaked uses a couple of "linters" on its source code, to enforce a consistent style across the project. While these
-are run whenever you submit a PR, it's often useful to run this before committing.
-
- - **[Checkstyle]:** Checks Java code to ensure it is consistently formatted. This can be run with `./gradlew build` or
-   `./gradle check`.
- - **[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/
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # ![CC: Tweaked](logo.png)
-[![Current build status](https://github.com/SquidDev-CC/CC-Tweaked/workflows/Build/badge.svg)](https://github.com/SquidDev-CC/CC-Tweaked/actions "Current build status") [![Download CC: Tweaked on CurseForge](http://cf.way2muchnoise.eu/title/cc-tweaked.svg)](https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked on CurseForge")
+[![Current build status](https://travis-ci.org/SquidDev-CC/CC-Tweaked.svg?branch=master)](https://travis-ci.org/SquidDev-CC/CC-Tweaked "Current build status") [![Download CC: Tweaked on CurseForge](https://cf.way2muchnoise.eu/title/cc-tweaked.svg)](https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked on CurseForge")

 CC: Tweaked is a fork of [ComputerCraft](https://github.com/dan200/ComputerCraft), adding programmable computers,
 turtles and more to Minecraft.
@@ -37,14 +37,20 @@ several features have been included, such as full block modems, the Cobalt runti
 computers.

 ## Contributing
-Any contribution is welcome, be that using the mod, reporting bugs or contributing code. If you want to get started
-developing the mod, [check out the instructions here](CONTRIBUTING.md#developing).
+Any contribution is welcome, be that using the mod, reporting bugs or contributing code. In order to start helping
+develop CC:T, you'll need to follow these steps:
+
+ - **Clone the repository:** `git clone https://github.com/SquidDev-CC/CC-Tweaked.git && cd CC-Tweaked`
+ - **Setup Forge:** `./gradlew setupDecompWorkspace`
+ - **Test your changes:** `./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`.

 ## Community
 If you need help getting started with CC: Tweaked, want to show off your latest project, or just want to chat about
-ComputerCraft we have a [forum](https://forums.computercraft.cc/) and [Discord guild](https://discord.computercraft.cc)!
-There's also a fairly populated, albeit quiet [IRC channel](http://webchat.esper.net/?channels=computercraft), if that's
-more your cup of tea.
+ComputerCraft we have a [forum](https://forums.computercraft.cc/) and [Discord guild](https://discord.gg/H2UyJXe)!
+There's also a fairly populated, albeit quiet [IRC channel](http://webchat.esper.net/?channels=#computercraft), if
+that's more your cup of tea.

 I'd generally recommend you don't contact me directly (email, DM, etc...) unless absolutely necessary (i.e. in order to
 report exploits). You'll get a far quicker response if you ask the whole community!
@@ -60,7 +66,7 @@ dependencies {
 }

 dependencies {
-  implementation fg.deobf("org.squiddev:cc-tweaked-${mc_version}:${cct_version}")
+  implementation "org.squiddev:cc-tweaked-${mc_version}:${cct_version}"
 }
 ```

--- a/build.gradle
+++ b/build.gradle
@@ -1,29 +1,17 @@
 buildscript {
-    repositories {
-        jcenter()
-        mavenCentral()
-        maven {
-            name = "forge"
-            url = "https://files.minecraftforge.net/maven"
-        }
-    }
    dependencies {
        classpath 'com.google.code.gson:gson:2.8.1'
-        classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.181'
        classpath 'net.sf.proguard:proguard-gradle:6.1.0beta2'
        classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
    }
 }

 plugins {
-    id "checkstyle"
-    id "jacoco"
-    id "com.github.hierynomus.license" version "0.15.0"
-    id "com.matthewprenger.cursegradle" version "1.3.0"
+    id 'fabric-loom' version '0.2.3-SNAPSHOT'
+    id 'com.matthewprenger.cursegradle' version '1.2.0'
    id "com.github.breadmoirai.github-release" version "2.2.4"
 }

-apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.ajoberstar.grgit'
 apply plugin: 'maven-publish'
 apply plugin: 'maven'
@@ -33,129 +21,71 @@ 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'
-
-            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'
-    }
 }

 repositories {
    mavenCentral()
+    maven {
+        name "JEI"
+        url  "http://dvs1.progwml6.com/files/maven"
+    }
    maven {
        name "SquidDev"
        url "https://squiddev.cc/maven"
    }
+    ivy {
+        name "Charset"
+        artifactPattern "https://asie.pl/files/mods/Charset/LibOnly/[module]-[revision](-[classifier]).[ext]"
+    }
+    maven {
+        name "Amadornes"
+        url "http://maven.amadornes.com/"
+    }
 }

 configurations {
    shade
    compile.extendsFrom shade
    deployerJars
-    cctJavadoc
 }

 dependencies {
-    checkstyle "com.puppycrawl.tools:checkstyle:8.25"
+    minecraft "com.mojang:minecraft:${mc_version}"
+    mappings "net.fabricmc:yarn:${mc_version}+build.${mappings_version}"
+    modCompile "net.fabricmc:fabric-loader:0.4.8+build.153"
+    modCompile "net.fabricmc.fabric-api:fabric-api:0.3.0+build.175"

-    minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
+    implementation 'com.google.code.findbugs:jsr305:3.0.2'

-    compileOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.3:api")
-    compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.15.2:6.0.0.9")
+    shade 'org.squiddev:Cobalt:0.5.0-SNAPSHOT'
+    shade 'javax.vecmath:vecmath:1.5.2'

-    // runtimeOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.3")
-
-    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.4.2'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.2'
-    testImplementation 'org.hamcrest:hamcrest:2.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.1.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.1.0'

    deployerJars "org.apache.maven.wagon:wagon-ssh:3.0.0"
-
-    cctJavadoc 'cc.tweaked:cct-javadoc:1.1.0'
 }

-// Compile tasks
+sourceSets {
+    main {
+        java {
+            exclude 'dan200/computercraft/shared/integration'
+        }
+    }
+}

 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("doc/javadoc")
-    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",
+                    "Specification-Version": "25.0",
                    "Implementation-Title": "CC: Tweaked",
                    "Implementation-Version": "${mod_version}",
                    "Implementation-Vendor" :"SquidDev",
@@ -169,20 +99,12 @@ jar {
    from configurations.shade.collect { it.isDirectory() ? it : zipTree(it) }
 }

-[compileJava, compileTestJava].forEach {
-    it.configure {
-        options.compilerArgs << "-Xlint" << "-Xlint:-processing"
-    }
-}
-
 import java.nio.charset.StandardCharsets
 import java.nio.file.*
 import java.util.zip.*

 import com.google.gson.GsonBuilder
 import com.google.gson.JsonElement
-import com.hierynomus.gradle.license.tasks.LicenseCheck
-import com.hierynomus.gradle.license.tasks.LicenseFormat
 import org.ajoberstar.grgit.Grgit
 import proguard.gradle.ProGuardTask

@@ -190,12 +112,14 @@ task proguard(type: ProGuardTask, dependsOn: jar) {
    description "Removes unused shadowed classes from the jar"
    group "compact"

-    injars jar.archivePath
-    outjars "${jar.archivePath.absolutePath.replace(".jar", "")}-min.jar"
+    afterEvaluate {
+        // Fabric changes the jar's classifier so we to do this after evaluating!
+        injars jar.archivePath
+        outjars "${jar.archivePath.absolutePath.replace(".jar", "")}-min.jar"
+    }

    // Add the main runtime jar and all non-shadowed dependencies
    libraryjars "${System.getProperty('java.home')}/lib/rt.jar"
-    libraryjars "${System.getProperty('java.home')}/lib/jce.jar"
    doFirst {
        sourceSets.main.compileClasspath
            .filter { !it.name.contains("Cobalt") }
@@ -211,9 +135,12 @@ task proguard(type: ProGuardTask, dependsOn: jar) {
    // Preserve ComputerCraft classes - we only want to strip shadowed files.
    keep 'class dan200.computercraft.** { *; }'

+    // Preserve the constructors in Cobalt library class, as we init them via reflection
+    keepclassmembers 'class org.squiddev.cobalt.lib.** { <init>(...); }'
+
    // LWJGL and Apache bundle Java 9 versions, which is great, but rather breaks Proguard
    dontwarn 'module-info'
-    dontwarn 'org.apache.**,org.lwjgl.**'
+    dontwarn 'org.apache.**,org.lwjgl.**,javax.crypto.SecretKey'
 }

 task proguardMove(dependsOn: proguard) {
@@ -229,6 +156,8 @@ task proguardMove(dependsOn: proguard) {
    }
 }

+remapJar.dependsOn proguardMove
+
 processResources {
    inputs.property "version", mod_version
    inputs.property "mcversion", mc_version
@@ -249,7 +178,7 @@ processResources {
    inputs.property "commithash", hash

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

        expand 'version': mod_version,
@@ -258,12 +187,12 @@ processResources {
    }

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

-task compressJson(dependsOn: jar) {
+task compressJson(dependsOn: remapJar) {
    group "compact"
    description "Minifies all JSON files, stripping whitespace"

@@ -278,7 +207,6 @@ task compressJson(dependsOn: jar) {
        // Copy over all files in the current jar to the new one, running json files from GSON. As pretty printing
        // is turned off, they should be minified.
        new ZipFile(jarPath).withCloseable { inJar ->
-            tempPath.getParentFile().mkdirs()
            new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(tempPath))).withCloseable { outJar ->
                inJar.entries().each { entry ->
                    if(entry.directory) {
@@ -306,65 +234,6 @@ task compressJson(dependsOn: jar) {

 assemble.dependsOn compressJson

-// Check tasks
-
-test {
-    useJUnitPlatform()
-    testLogging {
-        events "skipped", "failed"
-    }
-}
-
-jacocoTestReport {
-    reports {
-        xml.enabled true
-        html.enabled true
-    }
-}
-
-check.dependsOn jacocoTestReport
-
-license {
-    mapping("java", "SLASHSTAR_STYLE")
-    strictCheck true
-
-    ext.year = Calendar.getInstance().get(Calendar.YEAR)
-}
-
-[licenseMain, licenseFormatMain].forEach {
-    it.configure {
-        include("**/*.java")
-        exclude("dan200/computercraft/api/**")
-        header rootProject.file('config/license/main.txt')
-    }
-}
-
-[licenseTest, licenseFormatTest].forEach {
-    it.configure {
-        include("**/*.java")
-        header rootProject.file('config/license/main.txt')
-    }
-}
-
-gradle.projectsEvaluated {
-    tasks.withType(LicenseFormat) {
-        outputs.upToDateWhen { false }
-    }
-}
-
-
-task licenseAPI(type: LicenseCheck);
-task licenseFormatAPI(type: LicenseFormat);
-[licenseAPI, licenseFormatAPI].forEach {
-    it.configure {
-        source = sourceSets.main.java
-        include("dan200/computercraft/api/**")
-        header rootProject.file('config/license/api.txt')
-    }
-}
-
-// Upload tasks
-
 task checkRelease {
    group "upload"
    description "Verifies that everything is ready for a release"
@@ -403,18 +272,28 @@ task checkRelease {
        if (!ok) throw new IllegalStateException("Could not check release")
    }
 }
-check.dependsOn checkRelease
+

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

        relations {
            incompatible "computercraft"
+            requiredDependency "fabric"
        }
+        afterEvaluate {
+            mainArtifact(remapJar.output)
+            uploadTask.dependsOn(remapJar)
+        }
+    }
+
+    options {
+        forgeGradleIntegration = false
    }
 }

@@ -475,9 +354,7 @@ githubRelease {
    token project.hasProperty('githubApiKey') ? project.githubApiKey : ''
    owner 'SquidDev-CC'
    repo 'CC-Tweaked'
-    try {
-        targetCommitish = Grgit.open(dir: '.').branch.current().name
-    } catch(Exception ignored) { }
+    targetCommitish { Grgit.open(dir: '.').branch.current().name }

    tagName "v${mc_version}-${mod_version}"
    releaseName "[${mc_version}] ${mod_version}"
@@ -487,13 +364,27 @@ githubRelease {
            .takeWhile { it != 'Type "help changelog" to see the full version history.' }
            .join("\n").trim()
    }
-    prerelease true
+    prerelease false
 }

 def uploadTasks = ["uploadArchives", "curseforge", "githubRelease"]
 uploadTasks.forEach { tasks.getByName(it).dependsOn checkRelease }

-task uploadAll(dependsOn: uploadTasks) {
+task uploadAll(dependsOn: [remapJar] + uploadTasks) {
    group "upload"
    description "Uploads to all repositories (Maven, Curse, GitHub release)"
 }
+
+test {
+    useJUnitPlatform()
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+}
+
+gradle.projectsEvaluated {
+    tasks.withType(JavaCompile) {
+        options.compilerArgs << "-Xlint" << "-Xlint:-processing" // Causes Forge build to fail << "-Werror"
+    }
+}
+
--- a/config/idea/codeInspectionSettings.xml
+++ b/config/idea/codeInspectionSettings.xml
--- a/config/idea/codeStyleSettings.xml
+++ b/config/idea/codeStyleSettings.xml
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC
-    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-    "https://checkstyle.org/dtds/configuration_1_3.dtd">
-<module name="Checker">
-    <property name="tabWidth" value="4"/>
-    <property name="charset" value="UTF-8" />
-
-    <module name="SuppressionFilter">
-        <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" />
-        <module name="AnnotationUseStyle" />
-        <module name="MissingDeprecated" />
-        <module name="MissingOverride" />
-
-        <!-- Blocks -->
-        <module name="EmptyBlock" />
-        <module name="EmptyCatchBlock">
-            <property name="exceptionVariableName" value="ignored" />
-        </module>
-        <module name="LeftCurly">
-            <property name="option" value="nl" />
-            <!-- The defaults, minus lambdas. -->
-            <property name="tokens" value="ANNOTATION_DEF,CLASS_DEF,CTOR_DEF,ENUM_CONSTANT_DEF,ENUM_DEF,INTERFACE_DEF,LITERAL_CASE,LITERAL_CATCH,LITERAL_DEFAULT,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,METHOD_DEF,OBJBLOCK,STATIC_INIT" />
-        </module>
-        <module name="NeedBraces">
-            <property name="allowSingleLineStatement" value="true"/>
-        </module>
-        <module name="RightCurly">
-            <property name="option" value="alone" />
-        </module>
-
-        <!-- Class design. As if we've ever followed good practice here. -->
-        <module name="FinalClass" />
-        <module name="InterfaceIsType" />
-        <module name="MutableException" />
-        <module name="OneTopLevelClass" />
-
-        <!-- Coding -->
-        <module name="ArrayTrailingComma" />
-        <module name="EqualsHashCode" />
-        <!-- FallThrough does not handle unreachable code well -->
-        <module name="IllegalInstantiation" />
-        <module name="IllegalThrows" />
-        <module name="ModifiedControlVariable" />
-        <module name="NoClone" />
-        <module name="NoFinalizer" />
-        <module name="OneStatementPerLine" />
-        <module name="PackageDeclaration" />
-        <module name="SimplifyBooleanExpression" />
-        <module name="SimplifyBooleanReturn" />
-        <module name="StringLiteralEquality" />
-        <module name="UnnecessaryParentheses" />
-        <module name="UnnecessarySemicolonAfterTypeMemberDeclaration" />
-        <module name="UnnecessarySemicolonInTryWithResources" />
-        <module name="UnnecessarySemicolonInEnumeration" />
-
-        <!-- Imports -->
-        <module name="CustomImportOrder" />
-        <module name="IllegalImport" />
-        <module name="RedundantImport" />
-        <module name="UnusedImports" />
-
-        <!-- Javadoc -->
-        <!-- TODO: Missing* checks for the dan200.computercraft.api package? -->
-        <module name="AtclauseOrder" />
-        <module name="InvalidJavadocPosition" />
-        <module name="JavadocBlockTagLocation" />
-        <module name="JavadocMethod"/>
-        <module name="JavadocType"/>
-        <module name="JavadocStyle" />
-        <module name="NonEmptyAtclauseDescription" />
-        <module name="SingleLineJavadoc" />
-        <module name="SummaryJavadocCheck"/>
-
-        <!-- Misc -->
-        <module name="ArrayTypeStyle" />
-        <module name="CommentsIndentation" />
-        <module name="Indentation" />
-        <module name="OuterTypeFilename" />
-
-        <!-- Modifiers -->
-        <module name="ModifierOrder" />
-        <module name="RedundantModifier" />
-
-        <!-- Naming -->
-        <module name="ClassTypeParameterName" />
-        <module name="InterfaceTypeParameterName" />
-        <module name="LambdaParameterName" />
-        <module name="LocalFinalVariableName" />
-        <module name="LocalVariableName" />
-        <!-- Allow an optional m_ on private members -->
-        <module name="MemberName">
-            <property name="applyToPrivate" value="false" />
-            <property name="applyToPackage" value="false" />
-        </module>
-        <module name="MemberName">
-            <property name="format" value="^(m_)?[a-z][a-zA-Z0-9]*$" />
-            <property name="applyToPrivate" value="true" />
-            <property name="applyToPackage" value="true" />
-        </module>
-        <module name="MethodName" />
-        <module name="MethodTypeParameterName" />
-        <module name="PackageName">
-            <property name="format" value="^dan200\.computercraf(\.[a-z][a-z0-9]*)*" />
-        </module>
-        <module name="ParameterName" />
-        <module name="StaticVariableName">
-            <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="applyToPrivate" value="true" />
-        </module>
-        <module name="TypeName" />
-
-        <!-- Whitespace -->
-        <module name="EmptyForInitializerPad"/>
-        <module name="EmptyForIteratorPad">
-            <property name="option" value="space"/>
-        </module>
-        <module name="GenericWhitespace" />
-        <module name="MethodParamPad" />
-        <module name="NoLineWrap" />
-        <module name="NoWhitespaceAfter">
-            <property name="tokens" value="AT,INC,DEC,UNARY_MINUS,UNARY_PLUS,BNOT,LNOT,DOT,ARRAY_DECLARATOR,INDEX_OP" />
-        </module>
-        <module name="NoWhitespaceBefore" />
-        <!-- TODO: Decide on an OperatorWrap style. -->
-        <module name="ParenPad">
-            <property name="option" value="space" />
-            <property name="tokens" value="ANNOTATION,ANNOTATION_FIELD_DEF,CTOR_CALL,CTOR_DEF,ENUM_CONSTANT_DEF,LITERAL_CATCH,LITERAL_DO,LITERAL_FOR,LITERAL_IF,LITERAL_NEW,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_WHILE,METHOD_CALL,METHOD_DEF,RESOURCE_SPECIFICATION,SUPER_CTOR_CALL,LAMBDA" />
-        </module>
-        <module name="ParenPad">
-            <property name="option" value="nospace" />
-            <property name="tokens" value="DOT,EXPR,QUESTION" />
-        </module>
-        <module name="SeparatorWrap">
-            <property name="option" value="eol" />
-            <property name="tokens" value="COMMA,SEMI,ELLIPSIS,ARRAY_DECLARATOR,RBRACK,METHOD_REF" />
-        </module>
-        <module name="SeparatorWrap">
-            <property name="option" value="nl" />
-            <property name="tokens" value="DOT,AT" />
-        </module>
-        <module name="SingleSpaceSeparator" />
-        <module name="TypecastParenPad" />
-        <module name="WhitespaceAfter">
-            <property name="tokens" value="COMMA" />
-        </module>
-        <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" />
-        </module>
-    </module>
-
-    <module name="FileTabCharacter" />
-    <module name="NewlineAtEndOfFile" />
-    <module name="RegexpSingleline">
-        <property name="format" value="\s+$"/>
-        <property name="message" value="Trailing whitespace"/>
-    </module>
-</module>
--- a/config/checkstyle/suppressions.xml
+++ b/config/checkstyle/suppressions.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suppressions PUBLIC
-    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
-    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
-<suppressions>
-    <!-- All the config options and method fields. -->
-    <suppress checks="StaticVariableName" files=".*[\\/]ComputerCraft.java" />
-    <suppress checks="StaticVariableName" files=".*[\\/]ComputerCraftAPI.java" />
-
-    <!-- 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>
--- a/config/license/api.txt
+++ b/config/license/api.txt
@@ -1,3 +0,0 @@
-This file is part of the public ComputerCraft API - http://www.computercraft.info
-Copyright Daniel Ratcliffe, 2011-${year}. This API may be redistributed unmodified and in full only.
-For help using the API, and posting your mods, visit the forums at computercraft.info.
--- a/config/license/main.txt
+++ b/config/license/main.txt
@@ -1,3 +0,0 @@
-This file is part of ComputerCraft - http://www.computercraft.info
-Copyright Daniel Ratcliffe, 2011-${year}. Do not distribute without permission.
-Send enquiries to dratcliffe@gmail.com
--- a/doc/index.md
+++ b/doc/index.md
@@ -1,11 +0,0 @@
-# ![CC: Tweaked](logo.png) [![Download CC: Tweaked on CurseForge](https://cf.way2muchnoise.eu/title/cc-tweaked.svg)](https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked on CurseForge")
-
-CC: Tweaked is a fork of [ComputerCraft], adding programmable computers, turtles and more to Minecraft.
-
-This website contains documentation for all Lua libraries and APIs from the latest version of CC: Tweaked. This
-documentation is still in development, so will most likely be incomplete. If you've found something you think is wrong,
-or would like to help out [please get in touch on GitHub][gh].
-
-[bug]: https://github.com/SquidDev-CC/CC-Tweaked/issues/new/choose
-[computercraft]: https://github.com/dan200/ComputerCraft "ComputerCraft on GitHub"
-[gh]: https://github.com/SquidDev-CC/CC-Tweaked "CC:Tweaked on GitHub"
--- a/doc/stub/fs.lua
+++ b/doc/stub/fs.lua
@@ -1,34 +0,0 @@
---  The FS API allows you to manipulate files and the filesystem.
--
-- @module fs
-
--- Returns true if a path is mounted to the parent filesystem.
--
-- The root filesystem "/" is considered a mount, along with disk folders and
-- the rom folder. Other programs (such as network shares) can exstend this to
-- make other mount types by correctly assigning their return value for getDrive.
--
-- @tparam string path The path to check.
-- @treturn boolean If the path is mounted, rather than a normal file/folder.
-- @throws If the path does not exist.
-- @see getDrive
-function isDriveRoot(path) end
-
--[[- Provides completion for a file or directory name, suitable for use with
-@{read}.
-
-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.
-
-@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
--- a/doc/stub/http.lua
+++ b/doc/stub/http.lua
@@ -1,159 +0,0 @@
--- 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.
--
-- This returns immediately, a [`http_success`](#http-success-event) or
-- [`http_failure`](#http-failure-event) will be queued once the request has
-- completed.
--
-- @tparam      string url   The url to request
-- @tparam[opt] string body  An optional string containing the body of the
-- request. If specified, a `POST` request will be made instead.
-- @tparam[opt] { [string] = string } headers Additional headers to send as part
-- of this request.
-- @tparam[opt] boolean binary Whether to make a binary HTTP request. If true,
-- the body will not be UTF-8 encoded, and the received response will not be
-- decoded.
--
-- @tparam[2] {
--   url = string, body? = string, headers? = { [string] = string },
--   binary? = boolean, method? = string, redirect? = boolean,
-- } request Options for the request.
--
-- This table form is an expanded version of the previous syntax. All arguments
-- from above are passed in as fields instead (for instance,
-- `http.request("https://example.com")` becomes `http.request { url =
-- "https://example.com" }`).
--
-- This table also accepts several additional options:
--
--  - `method`: Which HTTP method to use, for instance `"PATCH"` or `"DELETE"`.
--  - `redirect`: Whether to follow HTTP redirects. Defaults to true.
--
-- @see http.get  For a synchronous way to make GET requests.
-- @see http.post For a synchronous way to make POST requests.
-function request(...) end
-
--- Make a HTTP GET request to the given url.
--
-- @tparam string url   The url to request
-- @tparam[opt] { [string] = string } headers Additional headers to send as part
-- of this request.
-- @tparam[opt] boolean binary Whether to make a binary HTTP request. If true,
-- the body will not be UTF-8 encoded, and the received response will not be
-- decoded.
--
-- @tparam[2] {
--   url = string, headers? = { [string] = string },
--   binary? = boolean, method? = string, redirect? = boolean,
-- } request Options for the request. See @{http.request} for details on how
-- these options behave.
--
-- @treturn Response The resulting http response, which can be read from.
-- @treturn[2] nil When the http request failed, such as in the event of a 404
-- error or connection timeout.
-- @treturn string A message detailing why the request failed.
-- @treturn Response|nil The failing http response, if available.
--
-- @usage Make a request to [example.computercraft.cc](https://example.computercraft.cc),
-- and print the returned page.
-- ```lua
-- local request = http.get("https://example.computercraft.cc")
-- print(request.readAll())
-- -- => HTTP is working!
-- request.close()
-- ```
-function get(...) end
-
--- Make a HTTP POST request to the given url.
--
-- @tparam string url   The url to request
-- @tparam string body  The body of the POST request.
-- @tparam[opt] { [string] = string } headers Additional headers to send as part
-- of this request.
-- @tparam[opt] boolean binary Whether to make a binary HTTP request. If true,
-- the body will not be UTF-8 encoded, and the received response will not be
-- decoded.
--
-- @tparam[2] {
--   url = string, body? = string, headers? = { [string] = string },
--   binary? = boolean, method? = string, redirect? = boolean,
-- } request Options for the request. See @{http.request} for details on how
-- these options behave.
--
-- @treturn Response The resulting http response, which can be read from.
-- @treturn[2] nil When the http request failed, such as in the event of a 404
-- error or connection timeout.
-- @treturn string A message detailing why the request failed.
-- @treturn Response|nil The failing http response, if available.
-function post(...) end
-
--- Asynchronously determine whether a URL can be requested.
--
-- If this returns `true`, one should also listen for [`http_check`
-- events](#http-check-event) which will container further information about
-- whether the URL is allowed or not.
--
-- @tparam string url The URL to check.
-- @treturn true When this url is not invalid. This does not imply that it is
-- allowed - see the comment above.
-- @treturn[2] false When this url is invalid.
-- @treturn string A reason why this URL is not valid (for instance, if it is
-- malformed, or blocked).
--
-- @see http.checkURL For a synchronous version.
-function checkURLAsync(url) end
-
--- Determine whether a URL can be requested.
--
-- If this returns `true`, one should also listen for [`http_check`
-- events](#http-check-event) which will container further information about
-- whether the URL is allowed or not.
--
-- @tparam string url The URL to check.
-- @treturn true When this url is valid and can be requested via @{http.request}.
-- @treturn[2] false When this url is invalid.
-- @treturn string A reason why this URL is not valid (for instance, if it is
-- malformed, or blocked).
--
-- @see http.checkURLAsync For an asynchronous version.
--
-- @usage
-- ```lua
-- print(http.checkURL("https://example.computercraft.cc/"))
-- -- => true
-- print(http.checkURL("http://localhost/"))
-- -- => false Domain not permitted
-- print(http.checkURL("not a url"))
-- -- => false URL malformed
-- ```
-function checkURL(url) end
-
--- Open a websocket.
--
-- @tparam string url The websocket url to connect to. This should have the
-- `ws://` or `wss://` protocol.
-- @tparam[opt] { [string] = string } headers Additional headers to send as part
-- of the initial websocket connection.
--
-- @treturn Websocket The websocket connection.
-- @treturn[2] false If the websocket connection failed.
-- @treturn string An error message describing why the connection failed.
-function websocket(url, headers) end
-
--- Asynchronously open a websocket.
--
-- This returns immediately, a [`websocket_success`](#websocket-success-event)
-- or [`websocket_failure`](#websocket-failure-event) will be queued once the
-- request has completed.
--
-- @tparam string url The websocket url to connect to. This should have the
-- `ws://` or `wss://` protocol.
-- @tparam[opt] { [string] = string } headers Additional headers to send as part
-- of the initial websocket connection.
-function websocketAsync(url, headers) end
--- a/doc/stub/os.lua
+++ b/doc/stub/os.lua
@@ -1,6 +0,0 @@
-- Defined in bios.lua
-function loadAPI(path) end
-function pullEvent(filter) end
-function pullEventRaw(filter) end
-function version() end
-function run(env, path, ...) end
--- a/doc/stub/turtle.lua
+++ b/doc/stub/turtle.lua
@@ -1 +0,0 @@
-function craft(limit) end
--- a/doc/styles.css
+++ b/doc/styles.css
@@ -1,191 +0,0 @@
-/* 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 {
-    padding: 0.3em;
-    margin: 1em 0;
-    background: #f0f0f0;
-    border-left: solid 0.5em #ccc;
-}
-
-/* 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; }
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,6 @@
 # Mod properties
-mod_version=1.90.2
+mod_version=1.83.1

-# Minecraft properties (update mods.toml when changing)
-mc_version=1.16.1
-forge_version=32.0.75
-mappings_version=20200707-1.16.1
+# Minecraft properties
+mc_version=1.14.2
+mappings_version=2
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/illuaminate.sexp
+++ b/illuaminate.sexp
@@ -1,107 +0,0 @@
-; -*- mode: Lisp;-*-
-
-(sources
-  /doc/stub/
-  /doc/javadoc/
-  /src/main/resources/*/computercraft/lua/bios.lua
-  /src/main/resources/*/computercraft/lua/rom/
-  /src/test/resources/test-rom)
-
-
-(doc
-  (title "CC: Tweaked")
-  (index doc/index.md)
-  (source-link https://github.com/SquidDev-CC/CC-Tweaked/blob/${commit}/${path}#L${line})
-
-  (module-kinds
-    (peripheral Peripherals))
-
-  (library-path
-    /doc/stub/
-    /doc/javadoc/
-
-    /src/main/resources/*/computercraft/lua/rom/apis
-    /src/main/resources/*/computercraft/lua/rom/apis/command
-    /src/main/resources/*/computercraft/lua/rom/apis/turtle
-
-    /src/main/resources/*/computercraft/lua/rom/modules/main
-    /src/main/resources/*/computercraft/lua/rom/modules/command
-    /src/main/resources/*/computercraft/lua/rom/modules/turtle))
-
-(at /
-  (linters
-    syntax:string-index
-
-    ;; It'd be nice to avoid this, but right now there's a lot of instances of
-    ;; it.
-    -var:set-loop
-
-    ;; It's useful to name arguments for documentation, so we allow this. It'd
-    ;; be good to find a compromise in the future, but this works for now.
-    -var:unused-arg)
-
-  (lint
-    (bracket-spaces
-      (call no-space)
-      (function-args no-space)
-      (parens no-space)
-      (table space)
-      (index no-space))
-
-    ;; colours imports from colors, and we don't handle that right now.
-    ;; keys is entirely dynamic, so we skip it.
-    (dynamic-modules colours keys)
-
-    (globals
-      :max
-      _CC_DEFAULT_SETTINGS
-      _CC_DISABLE_LUA51_FEATURES
-      ;; Ideally we'd pick these up from bios.lua, but illuaminate currently
-      ;; isn't smart enough.
-      sleep write printError read rs)))
-
-;; We disable the unused global linter in bios.lua and the APIs. In the future
-;; hopefully we'll get illuaminate to handle this.
-(at
-  (/src/main/resources/*/computercraft/lua/bios.lua
-   /src/main/resources/*/computercraft/lua/rom/apis/)
-  (linters -var:unused-global)
-  (lint (allow-toplevel-global true)))
-
-;; Silence some variable warnings in documentation stubs.
-(at (/doc/stub/ /doc/javadoc/)
-  (linters -var:unused-global)
-  (lint (allow-toplevel-global true)))
-
-;; Suppress warnings for currently undocumented modules.
-(at
-  (; Java APIs
-   /doc/stub/http.lua
-   /doc/stub/os.lua
-   /doc/stub/turtle.lua
-   ; Java generated APIs
-   /doc/javadoc/turtle.lua
-   ; Peripherals
-   /doc/javadoc/drive.lua
-   /doc/javadoc/speaker.lua
-   /doc/javadoc/printer.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))
-
-;; 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
-   /doc/stub/fs.lua)
-  (linters -doc:unresolved-reference))
-
-(at /src/test/resources/test-rom
-  (lint
-    (globals
-      :max sleep write
-      cct_test describe expect howlci fail it pending stub)))
--- a/doc/logo.png
+++ b/doc/logo.png
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,12 @@
-rootProject.name = "cc-tweaked-${mc_version}"
+pluginManagement {
+    repositories {
+        jcenter()
+        maven {
+            name = 'Fabric'
+            url = 'https://maven.fabricmc.net/'
+        }
+        gradlePluginPortal()
+    }
+}
+
+rootProject.name = "cc-tweaked-${mc_version}-fabric"
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/cable.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_advanced.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_command.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_normal.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_1.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_10.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_11.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_12.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_13.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_14.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_15.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_16.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_2.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_3.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_4.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_5.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_6.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_7.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_8.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_9.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_drive.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/monitor_advanced.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/monitor_normal.json
+++ b/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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/speaker.json
@@ -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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_advanced.json
@@ -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"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_normal.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_advanced/computercraft/wireless_modem_normal"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:pocket_computer_advanced"
-          },
-          {
-            "item": "computercraft:wireless_modem_normal"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_advanced/computercraft/wireless_modem_normal"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/crafting_table.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/crafting_table.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_advanced/minecraft/crafting_table"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:pocket_computer_advanced"
-          },
-          {
-            "item": "minecraft:crafting_table"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_advanced/minecraft/crafting_table"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_axe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_axe.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_advanced/minecraft/diamond_axe"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:pocket_computer_advanced"
-          },
-          {
-            "item": "minecraft:diamond_axe"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_advanced/minecraft/diamond_axe"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_hoe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_hoe.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_advanced/minecraft/diamond_hoe"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:pocket_computer_advanced"
-          },
-          {
-            "item": "minecraft:diamond_hoe"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_advanced/minecraft/diamond_hoe"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_pickaxe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_pickaxe.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_advanced/minecraft/diamond_pickaxe"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:pocket_computer_advanced"
-          },
-          {
-            "item": "minecraft:diamond_pickaxe"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_advanced/minecraft/diamond_pickaxe"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_shovel.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_shovel.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_advanced/minecraft/diamond_shovel"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:pocket_computer_advanced"
-          },
-          {
-            "item": "minecraft:diamond_shovel"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_advanced/minecraft/diamond_shovel"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_sword.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_sword.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_advanced/minecraft/diamond_sword"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:pocket_computer_advanced"
-          },
-          {
-            "item": "minecraft:diamond_sword"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_advanced/minecraft/diamond_sword"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_advanced.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_advanced.json
@@ -1,43 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_computer_advanced"
-    ]
-  },
-  "criteria": {
-    "has_computer": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "tag": "computercraft:computer"
-          }
-        ]
-      }
-    },
-    "has_apple": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "minecraft:golden_apple"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_computer_advanced"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_computer",
-      "has_apple",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_normal.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_normal.json
@@ -1,43 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_computer_normal"
-    ]
-  },
-  "criteria": {
-    "has_computer": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "tag": "computercraft:computer"
-          }
-        ]
-      }
-    },
-    "has_apple": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "minecraft:golden_apple"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_computer_normal"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_computer",
-      "has_apple",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/speaker.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_normal/computercraft/speaker"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:pocket_computer_normal"
-          },
-          {
-            "item": "computercraft:speaker"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_normal/computercraft/speaker"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/wireless_modem_advanced.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_normal/computercraft/wireless_modem_advanced"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:pocket_computer_normal"
-          },
-          {
-            "item": "computercraft:wireless_modem_advanced"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_normal/computercraft/wireless_modem_advanced"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/wireless_modem_normal.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_normal/computercraft/wireless_modem_normal"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:pocket_computer_normal"
-          },
-          {
-            "item": "computercraft:wireless_modem_normal"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_normal/computercraft/wireless_modem_normal"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/crafting_table.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/crafting_table.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_normal/minecraft/crafting_table"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:pocket_computer_normal"
-          },
-          {
-            "item": "minecraft:crafting_table"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_normal/minecraft/crafting_table"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_axe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_axe.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_normal/minecraft/diamond_axe"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:pocket_computer_normal"
-          },
-          {
-            "item": "minecraft:diamond_axe"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_normal/minecraft/diamond_axe"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_hoe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_hoe.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_normal/minecraft/diamond_hoe"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:pocket_computer_normal"
-          },
-          {
-            "item": "minecraft:diamond_hoe"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_normal/minecraft/diamond_hoe"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_pickaxe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_pickaxe.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_normal/minecraft/diamond_pickaxe"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:pocket_computer_normal"
-          },
-          {
-            "item": "minecraft:diamond_pickaxe"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_normal/minecraft/diamond_pickaxe"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_shovel.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_shovel.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_normal/minecraft/diamond_shovel"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:pocket_computer_normal"
-          },
-          {
-            "item": "minecraft:diamond_shovel"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_normal/minecraft/diamond_shovel"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_sword.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_sword.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:pocket_normal/minecraft/diamond_sword"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:pocket_computer_normal"
-          },
-          {
-            "item": "minecraft:diamond_sword"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:pocket_normal/minecraft/diamond_sword"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printer.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printer.json
@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:printer"
-    ]
-  },
-  "criteria": {
-    "has_computer": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "tag": "computercraft:computer"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:printer"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_computer",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/speaker.json
@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:speaker"
-    ]
-  },
-  "criteria": {
-    "has_computer": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "tag": "computercraft:computer"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:speaker"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_computer",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/speaker.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:turtle_advanced/computercraft/speaker"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:turtle_advanced"
-          },
-          {
-            "item": "computercraft:speaker"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:turtle_advanced/computercraft/speaker"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/wireless_modem_advanced.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:turtle_advanced/computercraft/wireless_modem_advanced"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:turtle_advanced"
-          },
-          {
-            "item": "computercraft:wireless_modem_advanced"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:turtle_advanced/computercraft/wireless_modem_advanced"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/wireless_modem_normal.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:turtle_advanced/computercraft/wireless_modem_normal"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:turtle_advanced"
-          },
-          {
-            "item": "computercraft:wireless_modem_normal"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:turtle_advanced/computercraft/wireless_modem_normal"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/crafting_table.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/crafting_table.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:turtle_advanced/minecraft/crafting_table"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:turtle_advanced"
-          },
-          {
-            "item": "minecraft:crafting_table"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:turtle_advanced/minecraft/crafting_table"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_axe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_axe.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:turtle_advanced/minecraft/diamond_axe"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:turtle_advanced"
-          },
-          {
-            "item": "minecraft:diamond_axe"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:turtle_advanced/minecraft/diamond_axe"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_hoe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_hoe.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:turtle_advanced/minecraft/diamond_hoe"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:turtle_advanced"
-          },
-          {
-            "item": "minecraft:diamond_hoe"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:turtle_advanced/minecraft/diamond_hoe"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_pickaxe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_pickaxe.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:turtle_advanced/minecraft/diamond_pickaxe"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:turtle_advanced"
-          },
-          {
-            "item": "minecraft:diamond_pickaxe"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:turtle_advanced/minecraft/diamond_pickaxe"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_shovel.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_shovel.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:turtle_advanced/minecraft/diamond_shovel"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:turtle_advanced"
-          },
-          {
-            "item": "minecraft:diamond_shovel"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:turtle_advanced/minecraft/diamond_shovel"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_sword.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_sword.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:turtle_advanced/minecraft/diamond_sword"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:turtle_advanced"
-          },
-          {
-            "item": "minecraft:diamond_sword"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:turtle_advanced/minecraft/diamond_sword"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/speaker.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/speaker.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:turtle_normal/computercraft/speaker"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:turtle_normal"
-          },
-          {
-            "item": "computercraft:speaker"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:turtle_normal/computercraft/speaker"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/wireless_modem_advanced.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:turtle_normal/computercraft/wireless_modem_advanced"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:turtle_normal"
-          },
-          {
-            "item": "computercraft:wireless_modem_advanced"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:turtle_normal/computercraft/wireless_modem_advanced"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/wireless_modem_normal.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:turtle_normal/computercraft/wireless_modem_normal"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:turtle_normal"
-          },
-          {
-            "item": "computercraft:wireless_modem_normal"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:turtle_normal/computercraft/wireless_modem_normal"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/crafting_table.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/crafting_table.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:turtle_normal/minecraft/crafting_table"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:turtle_normal"
-          },
-          {
-            "item": "minecraft:crafting_table"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:turtle_normal/minecraft/crafting_table"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_axe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_axe.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:turtle_normal/minecraft/diamond_axe"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:turtle_normal"
-          },
-          {
-            "item": "minecraft:diamond_axe"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:turtle_normal/minecraft/diamond_axe"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_hoe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_hoe.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:turtle_normal/minecraft/diamond_hoe"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:turtle_normal"
-          },
-          {
-            "item": "minecraft:diamond_hoe"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:turtle_normal/minecraft/diamond_hoe"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_pickaxe.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_pickaxe.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:turtle_normal/minecraft/diamond_pickaxe"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:turtle_normal"
-          },
-          {
-            "item": "minecraft:diamond_pickaxe"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:turtle_normal/minecraft/diamond_pickaxe"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_shovel.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_shovel.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:turtle_normal/minecraft/diamond_shovel"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:turtle_normal"
-          },
-          {
-            "item": "minecraft:diamond_shovel"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:turtle_normal/minecraft/diamond_shovel"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_sword.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_sword.json
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:turtle_normal/minecraft/diamond_sword"
-    ]
-  },
-  "criteria": {
-    "has_items": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:turtle_normal"
-          },
-          {
-            "item": "minecraft:diamond_sword"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:turtle_normal/minecraft/diamond_sword"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_items",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem.json
@@ -1,43 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:wired_modem"
-    ]
-  },
-  "criteria": {
-    "has_computer": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "tag": "computercraft:computer"
-          }
-        ]
-      }
-    },
-    "has_cable": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:cable"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:wired_modem"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_computer",
-      "has_cable",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem_full_from.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem_full_from.json
@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:wired_modem_full_from"
-    ]
-  },
-  "criteria": {
-    "has_modem": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "tag": "computercraft:wired_modem"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:wired_modem_full_from"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_modem",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem_full_to.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem_full_to.json
@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:wired_modem_full_to"
-    ]
-  },
-  "criteria": {
-    "has_modem": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "tag": "computercraft:wired_modem"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:wired_modem_full_to"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_modem",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wireless_modem_advanced.json
@@ -1,43 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:wireless_modem_advanced"
-    ]
-  },
-  "criteria": {
-    "has_computer": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "tag": "computercraft:computer"
-          }
-        ]
-      }
-    },
-    "has_wireless": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "computercraft:wireless_modem_normal"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:wireless_modem_advanced"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_computer",
-      "has_wireless",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wireless_modem_normal.json
@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "computercraft:wireless_modem_normal"
-    ]
-  },
-  "criteria": {
-    "has_computer": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "tag": "computercraft:computer"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "computercraft:wireless_modem_normal"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_computer",
-      "has_the_recipe"
-    ]
-  ]
-}
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/computer_advanced.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_advanced.json
@@ -1,34 +0,0 @@
-{
-  "type": "minecraft:block",
-  "pools": [
-    {
-      "name": "main",
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "minecraft:dynamic",
-          "name": "computercraft:computer"
-        }
-      ],
-      "conditions": [
-        {
-          "condition": "minecraft:alternative",
-          "terms": [
-            {
-              "condition": "computercraft:block_named"
-            },
-            {
-              "condition": "computercraft:has_id"
-            },
-            {
-              "condition": "minecraft:inverted",
-              "term": {
-                "condition": "computercraft:player_creative"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/computer_normal.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_normal.json
@@ -1,34 +0,0 @@
-{
-  "type": "minecraft:block",
-  "pools": [
-    {
-      "name": "main",
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "minecraft:dynamic",
-          "name": "computercraft:computer"
-        }
-      ],
-      "conditions": [
-        {
-          "condition": "minecraft:alternative",
-          "terms": [
-            {
-              "condition": "computercraft:block_named"
-            },
-            {
-              "condition": "computercraft:has_id"
-            },
-            {
-              "condition": "minecraft:inverted",
-              "term": {
-                "condition": "computercraft:player_creative"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/disk_drive.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/disk_drive.json
@@ -1,20 +0,0 @@
-{
-  "type": "minecraft:block",
-  "pools": [
-    {
-      "name": "main",
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "minecraft:item",
-          "name": "computercraft:disk_drive"
-        }
-      ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
-    }
-  ]
-}
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json
@@ -1,20 +0,0 @@
-{
-  "type": "minecraft:block",
-  "pools": [
-    {
-      "name": "main",
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "minecraft:item",
-          "name": "computercraft:monitor_advanced"
-        }
-      ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
-    }
-  ]
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
SquidDev	45e84e1ede	Merge branch 'mc-1.13.x' into mc-1.14-fabric	2019-06-02 18:41:53 +01:00
SquidDev	725dfa764f	Add highlight rendering for monitors and cables	2019-06-02 18:24:08 +01:00
SquidDev	c221502ec9	Correctly offset touch position on a monitor Fixes #223	2019-06-02 18:06:24 +01:00
SquidDev	234f18c228	Merge branch 'mc-1.13.x' into mc-1.14-fabric	2019-06-02 17:54:00 +01:00
SquidDev	006ad109cb	Update to 1.14.2 Ughr, mapping changes. Though this time they weren't too bad I guess.	2019-06-02 17:42:07 +01:00
SquidDev	0db080154c	Fix incorrect inventory check Closes #209	2019-05-26 16:29:28 +01:00
SquidDev	200311033f	Small bodgey patch to fix NPEs when turtles place tiles	2019-05-14 17:17:34 +01:00
SquidDev	3192dc81ac	Bump to 1.14.1	2019-05-14 16:35:40 +01:00
SquidDev	b11d4bb209	Bump to 1.14.1pr1 Which means bumping mappings version. Oh boy, this was not a bundle of laughs...	2019-05-07 20:40:55 +01:00
SquidDev	2a716244e9	Don't use the TileTurtle as our property source We probably need to do this for some other inventories too - to investigate. Fixes #198	2019-05-06 22:59:44 +01:00
SquidDev	19b7ed538a	Hopefuly stub out all the network methods Fixes #197	2019-05-06 22:46:44 +01:00
SquidDev	b0d9dc0b88	Merge branch 'mc-1.13.x' into mc-1.14-fabric	2019-05-06 21:53:59 +01:00
SquidDev	e6094a59fa	Get us booting on a dedicated server It doesn't appear that blocks are syncing, so we'll need to look into that. Hopefully fixes #193	2019-04-29 08:04:24 +01:00
SquidDev	e8d7e6a562	Fix a whole bunch of bugs	2019-04-25 11:31:40 +01:00
SquidDev	536c2d9b2d	Merge branch 'mc-1.13.x' into mc-1.14-fabric	2019-04-25 08:39:32 +01:00
SquidDev	f15a278f3b	Bump versions	2019-04-24 11:54:03 +01:00
SquidDev	26b73c2ff3	Merge branch 'mc-1.13.x' into mc-1.14-fabric	2019-04-24 10:53:28 +01:00
SquidDev	c1e08fc3c7	Fix computer block drops not being handles This is still not 100% perfect - we don't drop them when in creative. However, it's a notable improvement on what it was. Closes #174	2019-04-12 19:54:08 +01:00
SquidDev	b9ec6f236d	Update to 1.14pr2	2019-04-12 19:49:39 +01:00
SquidDev	b1fff97bff	Bump to 1.14pr1	2019-04-11 09:40:32 +01:00
SquidDev	c81bc70475	Merge branch 'mc-1.13.x' into mc-1.14-fabric	2019-04-11 08:57:04 +01:00
SquidDev	55a7ee4acf	Initial update to Fabric	2019-04-03 23:27:10 +01:00