Don't run CI on 1.12

Use a simpler getRenderBoundingBox method for cables
Our cable has a rather complex getCollisionBoundingBox implementation, which (combined with computing the actual block state) ends up taking an awful lot of time. This shaves 9% off each frame. I don't miss 1.12 one bit.
2025-10-16 14:37:39 +00:00 · 2022-05-07 16:56:00 +01:00 · 2022-05-07 16:50:48 +01:00 · 2022-05-07 16:50:40 +01:00 · 2022-05-07 16:50:07 +01:00 · 2022-05-07 16:49:07 +01:00
1222 changed files with 18227 additions and 18127 deletions
--- 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,53 +0,0 @@
-name: Build
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.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)
-
-  lint-lua:
-    name: Lint Lua
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-
-    - 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,31 +0,0 @@
-name: Build documentation
-
-on:
-  push:
-    branches: [ master ]
-    tags:
-  release:
-    types: [ published ]
-
-jobs:
-  make_doc:
-    name: Build
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-
-    - 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
@@ -23,5 +23,3 @@
 .settings/
 bin/
 *.launch
-
-/src/generated/resources/.cache
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,7 +13,7 @@ In order to develop CC: Tweaked, you'll need to download the source code and the
 process.

 - **Clone the repository:** `git clone https://github.com/SquidDev-CC/CC-Tweaked.git && cd CC-Tweaked`
- - **Setup Forge:** `./gradlew build`
+ - **Setup Forge:** `./gradlew setupDecompWorkspace`
 - **Run Minecraft:** `./gradlew runClient` (or run the `GradleStart` class from your IDE).

 If you want to run CC:T in a normal Minecraft instance, run `./gradlew build` and copy the `.jar` from `build/libs`.
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ![CC: Tweaked](logo.png)
+# ![CC: Tweaked](doc/logo.png)
 [![Current build status](https://github.com/SquidDev-CC/CC-Tweaked/workflows/Build/badge.svg)](https://github.com/SquidDev-CC/CC-Tweaked/actions "Current build status") [![Download CC: Tweaked on CurseForge](http://cf.way2muchnoise.eu/title/cc-tweaked.svg)](https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked on CurseForge")

 CC: Tweaked is a fork of [ComputerCraft](https://github.com/dan200/ComputerCraft), adding programmable computers,
@@ -60,7 +60,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,7 +1,8 @@
+
+// For those who want the bleeding edge
 buildscript {
    repositories {
        jcenter()
-        mavenCentral()
        maven {
            name = "forge"
            url = "https://files.minecraftforge.net/maven"
@@ -9,8 +10,8 @@ buildscript {
    }
    dependencies {
        classpath 'com.google.code.gson:gson:2.8.1'
-        classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.154'
-        classpath 'net.sf.proguard:proguard-gradle:6.1.0beta2'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+        classpath 'net.sf.proguard:proguard-gradle:6.1.0beta1'
        classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
    }
 }
@@ -23,7 +24,7 @@ plugins {
    id "com.github.breadmoirai.github-release" version "2.2.4"
 }

-apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'org.ajoberstar.grgit'
 apply plugin: 'maven-publish'
 apply plugin: 'maven'
@@ -34,52 +35,12 @@ group = "org.squiddev"
 archivesBaseName = "cc-tweaked-${mc_version}"

 minecraft {
-    runs {
-        client {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
+    version = "${mc_version}-${forge_version}"
+    runDir = "run"
+    replace '${version}', mod_version

-            mods {
-                computercraft {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        server {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                computercraft {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        data {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
-            property 'forge.logging.console.level', 'debug'
-
-            args '--mod', 'computercraft', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-            mods {
-                computercraft {
-                    source sourceSets.main
-                }
-            }
-        }
-    }
-
-    mappings channel: 'snapshot', version: "${mappings_version}".toString()
-
-    accessTransformer file('src/main/resources/META-INF/accesstransformer.cfg')
-}
-
-sourceSets.main.resources {
-    srcDir 'src/generated/resources'
+    mappings = mappings_version
+    makeObfSourceJar = false
 }

 repositories {
@@ -87,6 +48,10 @@ repositories {
        name "SquidDev"
        url "https://squiddev.cc/maven"
    }
+    ivy {
+        name "Charset"
+        artifactPattern "https://asie.pl/files/mods/Charset/LibOnly/[module]-[revision](-[classifier]).[ext]"
+    }
 }

 configurations {
@@ -98,14 +63,14 @@ configurations {
 dependencies {
    checkstyle "com.puppycrawl.tools:checkstyle:8.25"

-    minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
+    deobfProvided "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.554"
+    deobfProvided "MCMultiPart2:MCMultiPart:2.5.3"
+    deobfProvided "mezz.jei:jei_1.12.2:4.15.0.269:api"
+    deobfProvided "pl.asie:Charset-Lib:0.5.4.6"

-    compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.27:api")
-    compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.14.4:5.0.1.162")
+    runtime "mezz.jei:jei_1.12.2:4.15.0.269"

-    runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.27")
-
-    shade 'org.squiddev:Cobalt:0.5.1-SNAPSHOT'
+    shade 'org.squiddev:Cobalt:0.5.5'

    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.2'
    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.2'
@@ -123,13 +88,7 @@ jar {
    dependsOn javadoc

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

    from (sourceSets.main.allSource) {
@@ -141,7 +100,7 @@ jar {

 [compileJava, compileTestJava].forEach {
    it.configure {
-        options.compilerArgs << "-Xlint" << "-Xlint:-processing"
+        options.compilerArgs << "-Xlint" << "-Xlint:-processing" << "-Werror"
    }
 }

@@ -177,15 +136,14 @@ task proguard(type: ProGuardTask, dependsOn: jar) {
    // We want to avoid as much obfuscation as possible. We're only doing this to shrink code size.
    dontobfuscate; dontoptimize; keepattributes; keepparameternames

+    // Tell ProGuard to shut up
+    dontwarn 'org.checkerframework.**'
+
    // Proguard will remove directories by default, but that breaks JarMount.
-    keepdirectories 'data/computercraft/lua**'
+    keepdirectories 'assets/computercraft/lua**'

    // Preserve ComputerCraft classes - we only want to strip shadowed files.
    keep 'class dan200.computercraft.** { *; }'
-
-    // LWJGL and Apache bundle Java 9 versions, which is great, but rather breaks Proguard
-    dontwarn 'module-info'
-    dontwarn 'org.apache.**,org.lwjgl.**'
 }

 task proguardMove(dependsOn: proguard) {
@@ -201,7 +159,7 @@ task proguardMove(dependsOn: proguard) {
    }
 }

-
+reobfJar.dependsOn proguardMove

 processResources {
    inputs.property "version", mod_version
@@ -223,8 +181,8 @@ processResources {
    inputs.property "commithash", hash

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

        expand 'version': mod_version,
               'mcversion': mc_version,
@@ -232,12 +190,12 @@ processResources {
    }

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

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

@@ -302,7 +260,7 @@ license {
    mapping("java", "SLASHSTAR_STYLE")
    strictCheck true

-    ext.year = Calendar.getInstance().get(Calendar.YEAR)
+    ext.year = 2020
 }

 [licenseMain, licenseFormatMain].forEach {
@@ -344,14 +302,14 @@ task checkRelease {
    description "Verifies that everything is ready for a release"

    inputs.property "version", mod_version
-    inputs.file("src/main/resources/data/computercraft/lua/rom/help/changelog.txt")
-    inputs.file("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt")
+    inputs.file("src/main/resources/assets/computercraft/lua/rom/help/changelog.txt")
+    inputs.file("src/main/resources/assets/computercraft/lua/rom/help/whatsnew.txt")

    doLast {
        def ok = true

        // Check we're targetting the current version
-        def whatsnew = new File("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt").readLines()
+        def whatsnew = new File("src/main/resources/assets/computercraft/lua/rom/help/whatsnew.txt").readLines()
        if (whatsnew[0] != "New features in CC: Tweaked $mod_version") {
            ok = false
            project.logger.error("Expected `whatsnew.txt' to target $mod_version.")
@@ -368,7 +326,7 @@ task checkRelease {

        // Check whatsnew and changelog match.
        def versionChangelog = "# " + whatsnew.join("\n")
-        def changelog = new File("src/main/resources/data/computercraft/lua/rom/help/changelog.txt").getText()
+        def changelog = new File("src/main/resources/assets/computercraft/lua/rom/help/changelog.txt").getText()
        if (!changelog.startsWith(versionChangelog)) {
            ok = false
            project.logger.error("whatsnew and changelog are not in sync")
@@ -396,7 +354,7 @@ publishing {
    publications {
        mavenJava(MavenPublication) {
            from components.java
-            // artifact sourceJar
+            artifact sourceJar
        }
    }
 }
@@ -456,7 +414,7 @@ githubRelease {
    tagName "v${mc_version}-${mod_version}"
    releaseName "[${mc_version}] ${mod_version}"
    body {
-        "## " + new File("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt")
+        "## " + new File("src/main/resources/assets/computercraft/lua/rom/help/whatsnew.txt")
            .readLines()
            .takeWhile { it != 'Type "help changelog" to see the full version history.' }
            .join("\n").trim()
@@ -471,3 +429,6 @@ task uploadAll(dependsOn: uploadTasks) {
    group "upload"
    description "Uploads to all repositories (Maven, Curse, GitHub release)"
 }
+
+runClient.outputs.upToDateWhen { false }
+runServer.outputs.upToDateWhen { false }
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -156,7 +156,7 @@
        <module name="WhitespaceAround">
            <property name="allowEmptyConstructors" value="true" />
            <property name="ignoreEnhancedForColon" value="false" />
-            <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAMBDA,LAND,LCURLY,LE,LITERAL_RETURN,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND" />
+            <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,DO_WHILE,EQUAL,GE,GT,LAMBDA,LAND,LCURLY,LE,LITERAL_RETURN,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND" />
        </module>
    </module>

--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 # Mod properties
-mod_version=1.89.1
+mod_version=1.89.2

-# Minecraft properties (update mods.toml when changing)
-mc_version=1.14.4
-forge_version=28.1.71
-mappings_version=20191123-1.14.3
+# Minecraft properties
+mc_version=1.12.2
+forge_version=14.23.4.2749
+mappings_version=snapshot_20180724
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
--- 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/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_normal.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_normal.json
@@ -1,20 +0,0 @@
-{
-  "type": "minecraft:block",
-  "pools": [
-    {
-      "name": "main",
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "minecraft:item",
-          "name": "computercraft:monitor_normal"
-        }
-      ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
-    }
-  ]
-}
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/printer.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/printer.json
@@ -1,20 +0,0 @@
-{
-  "type": "minecraft:block",
-  "pools": [
-    {
-      "name": "main",
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "minecraft:item",
-          "name": "computercraft:printer"
-        }
-      ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
-    }
-  ]
-}
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/speaker.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/speaker.json
@@ -1,20 +0,0 @@
-{
-  "type": "minecraft:block",
-  "pools": [
-    {
-      "name": "main",
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "minecraft:item",
-          "name": "computercraft:speaker"
-        }
-      ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
-    }
-  ]
-}
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_advanced.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_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/turtle_normal.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_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/wired_modem_full.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/wired_modem_full.json
@@ -1,20 +0,0 @@
-{
-  "type": "minecraft:block",
-  "pools": [
-    {
-      "name": "main",
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "minecraft:item",
-          "name": "computercraft:wired_modem_full"
-        }
-      ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
-    }
-  ]
-}
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json
@@ -1,20 +0,0 @@
-{
-  "type": "minecraft:block",
-  "pools": [
-    {
-      "name": "main",
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "minecraft:item",
-          "name": "computercraft:wireless_modem_advanced"
-        }
-      ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
-    }
-  ]
-}
--- a/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json
@@ -1,20 +0,0 @@
-{
-  "type": "minecraft:block",
-  "pools": [
-    {
-      "name": "main",
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "minecraft:item",
-          "name": "computercraft:wireless_modem_normal"
-        }
-      ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
-    }
-  ]
-}
--- a/src/generated/resources/data/computercraft/recipes/cable.json
+++ b/src/generated/resources/data/computercraft/recipes/cable.json
@@ -1,20 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    " # ",
-    "#R#",
-    " # "
-  ],
-  "key": {
-    "#": {
-      "tag": "forge:stone"
-    },
-    "R": {
-      "tag": "forge:dusts/redstone"
-    }
-  },
-  "result": {
-    "item": "computercraft:cable",
-    "count": 6
-  }
-}
--- a/src/generated/resources/data/computercraft/recipes/computer_advanced.json
+++ b/src/generated/resources/data/computercraft/recipes/computer_advanced.json
@@ -1,22 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "###",
-    "#R#",
-    "#G#"
-  ],
-  "key": {
-    "#": {
-      "tag": "forge:ingots/gold"
-    },
-    "R": {
-      "tag": "forge:dusts/redstone"
-    },
-    "G": {
-      "tag": "forge:glass_panes"
-    }
-  },
-  "result": {
-    "item": "computercraft:computer_advanced"
-  }
-}
--- a/src/generated/resources/data/computercraft/recipes/computer_command.json
+++ b/src/generated/resources/data/computercraft/recipes/computer_command.json
@@ -1,22 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "###",
-    "#R#",
-    "#G#"
-  ],
-  "key": {
-    "#": {
-      "tag": "forge:ingots/gold"
-    },
-    "R": {
-      "item": "minecraft:command_block"
-    },
-    "G": {
-      "tag": "forge:glass_panes"
-    }
-  },
-  "result": {
-    "item": "computercraft:computer_command"
-  }
-}
--- a/src/generated/resources/data/computercraft/recipes/computer_normal.json
+++ b/src/generated/resources/data/computercraft/recipes/computer_normal.json
@@ -1,22 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "###",
-    "#R#",
-    "#G#"
-  ],
-  "key": {
-    "#": {
-      "tag": "forge:stone"
-    },
-    "R": {
-      "tag": "forge:dusts/redstone"
-    },
-    "G": {
-      "tag": "forge:glass_panes"
-    }
-  },
-  "result": {
-    "item": "computercraft:computer_normal"
-  }
-}
--- a/src/generated/resources/data/computercraft/recipes/disk_1.json
+++ b/src/generated/resources/data/computercraft/recipes/disk_1.json
@@ -1,19 +0,0 @@
-{
-  "type": "computercraft:impostor_shapeless",
-  "group": "computercraft:disk",
-  "ingredients": [
-    {
-      "tag": "forge:dusts/redstone"
-    },
-    {
-      "item": "minecraft:paper"
-    },
-    {
-      "item": "minecraft:black_dye"
-    }
-  ],
-  "result": {
-    "item": "computercraft:disk",
-    "nbt": "{color:1118481}"
-  }
-}
--- a/src/generated/resources/data/computercraft/recipes/disk_10.json
+++ b/src/generated/resources/data/computercraft/recipes/disk_10.json
@@ -1,19 +0,0 @@
-{
-  "type": "computercraft:impostor_shapeless",
-  "group": "computercraft:disk",
-  "ingredients": [
-    {
-      "tag": "forge:dusts/redstone"
-    },
-    {
-      "item": "minecraft:paper"
-    },
-    {
-      "item": "minecraft:pink_dye"
-    }
-  ],
-  "result": {
-    "item": "computercraft:disk",
-    "nbt": "{color:15905484}"
-  }
-}
--- a/src/generated/resources/data/computercraft/recipes/disk_11.json
+++ b/src/generated/resources/data/computercraft/recipes/disk_11.json
@@ -1,19 +0,0 @@
-{
-  "type": "computercraft:impostor_shapeless",
-  "group": "computercraft:disk",
-  "ingredients": [
-    {
-      "tag": "forge:dusts/redstone"
-    },
-    {
-      "item": "minecraft:paper"
-    },
-    {
-      "item": "minecraft:lime_dye"
-    }
-  ],
-  "result": {
-    "item": "computercraft:disk",
-    "nbt": "{color:8375321}"
-  }
-}
--- a/src/generated/resources/data/computercraft/recipes/disk_12.json
+++ b/src/generated/resources/data/computercraft/recipes/disk_12.json
@@ -1,19 +0,0 @@
-{
-  "type": "computercraft:impostor_shapeless",
-  "group": "computercraft:disk",
-  "ingredients": [
-    {
-      "tag": "forge:dusts/redstone"
-    },
-    {
-      "item": "minecraft:paper"
-    },
-    {
-      "item": "minecraft:yellow_dye"
-    }
-  ],
-  "result": {
-    "item": "computercraft:disk",
-    "nbt": "{color:14605932}"
-  }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jonathan Coates	1da86d6f75	Don't run CI on 1.12	2022-05-07 16:56:00 +01:00
Jonathan Coates	53a23f8d3d	Use a simpler getRenderBoundingBox method for cables Our cable has a rather complex getCollisionBoundingBox implementation, which (combined with computing the actual block state) ends up taking an awful lot of time. This shaves 9% off each frame. I don't miss 1.12 one bit.	2022-05-07 16:50:48 +01:00
Jonathan Coates	550f63b1cb	Rethink how computer timeouts are handled Previously we would compute the current timeout flags every 128 instructions of the Lua machine. While computing these flags is _relatively_ cheap (just get the current time), it still all adds up. Instead we now set the timeout flags from the computer monitor/watchdog thread. This does mean that the monitor thread needs to wake up more often[^1] _if the queue is full_, otherwise we can sleep for 100ms as before. This does mean that pausing is a little less accurate (can technically take up 2*period instead). This isn't great, but in practice it seems fine - I've not noticed any playability issues. This offers a small (but measurable!) boost to computer performance. [^1]: We currently sleep for scaledPeriod, but we could choose to do less.	2022-05-07 16:50:40 +01:00
Jonathan Coates	416e87852e	Bump Cobalt version	2022-05-07 16:50:07 +01:00
Jonathan Coates	7940687df2	Get this building in the year of our lord 2022 - Force the license check to use 2020 - Tell Proguard to ignore some annotations	2022-05-07 16:49:07 +01:00
SquidDev	37a447e745	Bump version to 1.89.2 Somewhat reluctant to do this, but it's a pretty major bug.	2020-06-30 11:10:26 +01:00
SquidDev	9e2232d240	Clean up entity drop code We were incorrectly using captureDrops directly - it's more reasonable to listen to the drop event. Fixes #486	2020-06-30 11:10:24 +01:00