diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..e05a3a6dd --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Ignore changes in generated files +src/generated/resources/data/** linguist-generated diff --git a/.gitignore b/.gitignore index 80c50f9b8..ef694a3ef 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ .settings/ bin/ *.launch + +/src/generated/resources/.cache diff --git a/build.gradle b/build.gradle index 10b5f77f8..52840a644 100644 --- a/build.gradle +++ b/build.gradle @@ -57,6 +57,19 @@ } } } + + data { + workingDirectory project.file('run') + property 'forge.logging.markers', 'SCAN,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() @@ -64,6 +77,10 @@ accessTransformer file('src/main/resources/META-INF/accesstransformer.cfg') } +sourceSets.main.resources { + srcDir 'src/generated/resources' +} + repositories { maven { name "JEI" diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_1.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_1.json new file mode 100644 index 000000000..4a511c507 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_1.json @@ -0,0 +1,32 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_10.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_10.json new file mode 100644 index 000000000..9d97d1db1 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_10.json @@ -0,0 +1,32 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_11.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_11.json new file mode 100644 index 000000000..4dc510b4e --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_11.json @@ -0,0 +1,32 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_12.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_12.json new file mode 100644 index 000000000..f5238fae6 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_12.json @@ -0,0 +1,32 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_13.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_13.json new file mode 100644 index 000000000..e81b64991 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_13.json @@ -0,0 +1,32 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_14.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_14.json new file mode 100644 index 000000000..a7322e1fa --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_14.json @@ -0,0 +1,32 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_15.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_15.json new file mode 100644 index 000000000..6ead3487a --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_15.json @@ -0,0 +1,32 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_16.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_16.json new file mode 100644 index 000000000..7bc970fc6 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_16.json @@ -0,0 +1,32 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_2.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_2.json new file mode 100644 index 000000000..b8671733b --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_2.json @@ -0,0 +1,32 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_3.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_3.json new file mode 100644 index 000000000..f646f0d05 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_3.json @@ -0,0 +1,32 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_4.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_4.json new file mode 100644 index 000000000..4b348588a --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_4.json @@ -0,0 +1,32 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_5.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_5.json new file mode 100644 index 000000000..40f6ef7de --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_5.json @@ -0,0 +1,32 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_6.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_6.json new file mode 100644 index 000000000..1b23baeec --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_6.json @@ -0,0 +1,32 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_7.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_7.json new file mode 100644 index 000000000..2cf60f3ac --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_7.json @@ -0,0 +1,32 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_8.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_8.json new file mode 100644 index 000000000..fac9be366 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_8.json @@ -0,0 +1,32 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_9.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_9.json new file mode 100644 index 000000000..b1eb4a9b5 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_9.json @@ -0,0 +1,32 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..043371408 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/speaker.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..7c77d28a2 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_advanced.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..e072333c9 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_normal.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..112ba7081 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/crafting_table.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..7b5c315e4 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_axe.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..9f5872d9f --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_hoe.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..7e1930b03 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_pickaxe.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..05222ce97 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_shovel.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..413e0375d --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_sword.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..35ab06eea --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/speaker.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..104f9d30e --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/wireless_modem_advanced.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..5f7431ad7 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/wireless_modem_normal.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..c507d2563 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/crafting_table.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..a14901a3e --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_axe.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..5dba7dcd6 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_hoe.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..06a10b8ec --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_pickaxe.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..22ccd7e60 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_shovel.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..74378a20c --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_sword.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..c5ddd2003 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/speaker.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..b429cf9e6 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/wireless_modem_advanced.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..6ac217096 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/wireless_modem_normal.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..b2bb0df1a --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/crafting_table.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..b11436e4b --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_axe.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..5808c4ed5 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_hoe.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..2cf9a608b --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_pickaxe.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..c36478843 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_shovel.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..664b9f9e8 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_sword.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..dfd1b4664 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/speaker.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..74c5dac34 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/wireless_modem_advanced.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..e54be71d1 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/wireless_modem_normal.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..fe1c547eb --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/crafting_table.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..afd62779d --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_axe.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..a6a16729e --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_hoe.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..e26cd09cf --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_pickaxe.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..3d6b54ec4 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_shovel.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..ab64bae40 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_sword.json @@ -0,0 +1,35 @@ +{ + "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" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/loot_tables/computer_advanced.json b/src/generated/resources/data/computercraft/loot_tables/computer_advanced.json new file mode 100644 index 000000000..09dac48f6 --- /dev/null +++ b/src/generated/resources/data/computercraft/loot_tables/computer_advanced.json @@ -0,0 +1,30 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "minecraft:dynamic", + "name": "computercraft:computer" + } + ], + "conditions": [ + { + "condition": "minecraft:alternative", + "terms": [ + { + "condition": "computercraft:block_named" + }, + { + "condition": "minecraft:inverted", + "term": { + "condition": "computercraft:player_creative" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/loot_tables/computer_normal.json b/src/generated/resources/data/computercraft/loot_tables/computer_normal.json new file mode 100644 index 000000000..09dac48f6 --- /dev/null +++ b/src/generated/resources/data/computercraft/loot_tables/computer_normal.json @@ -0,0 +1,30 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "minecraft:dynamic", + "name": "computercraft:computer" + } + ], + "conditions": [ + { + "condition": "minecraft:alternative", + "terms": [ + { + "condition": "computercraft:block_named" + }, + { + "condition": "minecraft:inverted", + "term": { + "condition": "computercraft:player_creative" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/loot_tables/disk_drive.json b/src/generated/resources/data/computercraft/loot_tables/disk_drive.json new file mode 100644 index 000000000..675f3cf78 --- /dev/null +++ b/src/generated/resources/data/computercraft/loot_tables/disk_drive.json @@ -0,0 +1,19 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "computercraft:disk_drive" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/loot_tables/monitor_advanced.json b/src/generated/resources/data/computercraft/loot_tables/monitor_advanced.json new file mode 100644 index 000000000..e5c1b82b1 --- /dev/null +++ b/src/generated/resources/data/computercraft/loot_tables/monitor_advanced.json @@ -0,0 +1,19 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "computercraft:monitor_advanced" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/loot_tables/monitor_normal.json b/src/generated/resources/data/computercraft/loot_tables/monitor_normal.json new file mode 100644 index 000000000..f27f7adcf --- /dev/null +++ b/src/generated/resources/data/computercraft/loot_tables/monitor_normal.json @@ -0,0 +1,19 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "computercraft:monitor_normal" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/loot_tables/printer.json b/src/generated/resources/data/computercraft/loot_tables/printer.json new file mode 100644 index 000000000..c632c9d67 --- /dev/null +++ b/src/generated/resources/data/computercraft/loot_tables/printer.json @@ -0,0 +1,19 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "computercraft:printer" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/loot_tables/speaker.json b/src/generated/resources/data/computercraft/loot_tables/speaker.json new file mode 100644 index 000000000..5b6d03f9a --- /dev/null +++ b/src/generated/resources/data/computercraft/loot_tables/speaker.json @@ -0,0 +1,19 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "computercraft:speaker" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/loot_tables/turtle_advanced.json b/src/generated/resources/data/computercraft/loot_tables/turtle_advanced.json new file mode 100644 index 000000000..09dac48f6 --- /dev/null +++ b/src/generated/resources/data/computercraft/loot_tables/turtle_advanced.json @@ -0,0 +1,30 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "minecraft:dynamic", + "name": "computercraft:computer" + } + ], + "conditions": [ + { + "condition": "minecraft:alternative", + "terms": [ + { + "condition": "computercraft:block_named" + }, + { + "condition": "minecraft:inverted", + "term": { + "condition": "computercraft:player_creative" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/loot_tables/turtle_normal.json b/src/generated/resources/data/computercraft/loot_tables/turtle_normal.json new file mode 100644 index 000000000..09dac48f6 --- /dev/null +++ b/src/generated/resources/data/computercraft/loot_tables/turtle_normal.json @@ -0,0 +1,30 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "minecraft:dynamic", + "name": "computercraft:computer" + } + ], + "conditions": [ + { + "condition": "minecraft:alternative", + "terms": [ + { + "condition": "computercraft:block_named" + }, + { + "condition": "minecraft:inverted", + "term": { + "condition": "computercraft:player_creative" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/loot_tables/wired_modem_full.json b/src/generated/resources/data/computercraft/loot_tables/wired_modem_full.json new file mode 100644 index 000000000..02bd68624 --- /dev/null +++ b/src/generated/resources/data/computercraft/loot_tables/wired_modem_full.json @@ -0,0 +1,19 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "computercraft:wired_modem_full" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/loot_tables/wireless_modem_advanced.json b/src/generated/resources/data/computercraft/loot_tables/wireless_modem_advanced.json new file mode 100644 index 000000000..4f46d4b0f --- /dev/null +++ b/src/generated/resources/data/computercraft/loot_tables/wireless_modem_advanced.json @@ -0,0 +1,19 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "computercraft:wireless_modem_advanced" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/loot_tables/wireless_modem_normal.json b/src/generated/resources/data/computercraft/loot_tables/wireless_modem_normal.json new file mode 100644 index 000000000..a9fdb21e7 --- /dev/null +++ b/src/generated/resources/data/computercraft/loot_tables/wireless_modem_normal.json @@ -0,0 +1,19 @@ +{ + "pools": [ + { + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "computercraft:wireless_modem_normal" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_1.json b/src/generated/resources/data/computercraft/recipes/disk_1.json new file mode 100644 index 000000000..66ce73a90 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/disk_1.json @@ -0,0 +1,19 @@ +{ + "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}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_10.json b/src/generated/resources/data/computercraft/recipes/disk_10.json new file mode 100644 index 000000000..9c064f0fb --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/disk_10.json @@ -0,0 +1,19 @@ +{ + "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}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_11.json b/src/generated/resources/data/computercraft/recipes/disk_11.json new file mode 100644 index 000000000..bfd6b21dc --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/disk_11.json @@ -0,0 +1,19 @@ +{ + "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}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_12.json b/src/generated/resources/data/computercraft/recipes/disk_12.json new file mode 100644 index 000000000..7fa0ff4be --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/disk_12.json @@ -0,0 +1,19 @@ +{ + "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}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_13.json b/src/generated/resources/data/computercraft/recipes/disk_13.json new file mode 100644 index 000000000..ab237e75c --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/disk_13.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shapeless", + "group": "computercraft:disk", + "ingredients": [ + { + "tag": "forge:dusts/redstone" + }, + { + "item": "minecraft:paper" + }, + { + "item": "minecraft:light_blue_dye" + } + ], + "result": { + "item": "computercraft:disk", + "nbt": "{color:10072818}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_14.json b/src/generated/resources/data/computercraft/recipes/disk_14.json new file mode 100644 index 000000000..458ad2a71 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/disk_14.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shapeless", + "group": "computercraft:disk", + "ingredients": [ + { + "tag": "forge:dusts/redstone" + }, + { + "item": "minecraft:paper" + }, + { + "item": "minecraft:magenta_dye" + } + ], + "result": { + "item": "computercraft:disk", + "nbt": "{color:15040472}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_15.json b/src/generated/resources/data/computercraft/recipes/disk_15.json new file mode 100644 index 000000000..35147838e --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/disk_15.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shapeless", + "group": "computercraft:disk", + "ingredients": [ + { + "tag": "forge:dusts/redstone" + }, + { + "item": "minecraft:paper" + }, + { + "item": "minecraft:orange_dye" + } + ], + "result": { + "item": "computercraft:disk", + "nbt": "{color:15905331}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_16.json b/src/generated/resources/data/computercraft/recipes/disk_16.json new file mode 100644 index 000000000..1f86b573a --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/disk_16.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shapeless", + "group": "computercraft:disk", + "ingredients": [ + { + "tag": "forge:dusts/redstone" + }, + { + "item": "minecraft:paper" + }, + { + "item": "minecraft:white_dye" + } + ], + "result": { + "item": "computercraft:disk", + "nbt": "{color:15790320}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_2.json b/src/generated/resources/data/computercraft/recipes/disk_2.json new file mode 100644 index 000000000..40f55f5a4 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/disk_2.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shapeless", + "group": "computercraft:disk", + "ingredients": [ + { + "tag": "forge:dusts/redstone" + }, + { + "item": "minecraft:paper" + }, + { + "item": "minecraft:red_dye" + } + ], + "result": { + "item": "computercraft:disk", + "nbt": "{color:13388876}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_3.json b/src/generated/resources/data/computercraft/recipes/disk_3.json new file mode 100644 index 000000000..5ed4b4d72 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/disk_3.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shapeless", + "group": "computercraft:disk", + "ingredients": [ + { + "tag": "forge:dusts/redstone" + }, + { + "item": "minecraft:paper" + }, + { + "item": "minecraft:green_dye" + } + ], + "result": { + "item": "computercraft:disk", + "nbt": "{color:5744206}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_4.json b/src/generated/resources/data/computercraft/recipes/disk_4.json new file mode 100644 index 000000000..ecc80c9e2 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/disk_4.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shapeless", + "group": "computercraft:disk", + "ingredients": [ + { + "tag": "forge:dusts/redstone" + }, + { + "item": "minecraft:paper" + }, + { + "item": "minecraft:brown_dye" + } + ], + "result": { + "item": "computercraft:disk", + "nbt": "{color:8349260}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_5.json b/src/generated/resources/data/computercraft/recipes/disk_5.json new file mode 100644 index 000000000..94beac68a --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/disk_5.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shapeless", + "group": "computercraft:disk", + "ingredients": [ + { + "tag": "forge:dusts/redstone" + }, + { + "item": "minecraft:paper" + }, + { + "item": "minecraft:blue_dye" + } + ], + "result": { + "item": "computercraft:disk", + "nbt": "{color:3368652}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_6.json b/src/generated/resources/data/computercraft/recipes/disk_6.json new file mode 100644 index 000000000..0416fba6e --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/disk_6.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shapeless", + "group": "computercraft:disk", + "ingredients": [ + { + "tag": "forge:dusts/redstone" + }, + { + "item": "minecraft:paper" + }, + { + "item": "minecraft:purple_dye" + } + ], + "result": { + "item": "computercraft:disk", + "nbt": "{color:11691749}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_7.json b/src/generated/resources/data/computercraft/recipes/disk_7.json new file mode 100644 index 000000000..99f64b544 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/disk_7.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shapeless", + "group": "computercraft:disk", + "ingredients": [ + { + "tag": "forge:dusts/redstone" + }, + { + "item": "minecraft:paper" + }, + { + "item": "minecraft:cyan_dye" + } + ], + "result": { + "item": "computercraft:disk", + "nbt": "{color:5020082}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_8.json b/src/generated/resources/data/computercraft/recipes/disk_8.json new file mode 100644 index 000000000..be1b7fea9 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/disk_8.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shapeless", + "group": "computercraft:disk", + "ingredients": [ + { + "tag": "forge:dusts/redstone" + }, + { + "item": "minecraft:paper" + }, + { + "item": "minecraft:light_gray_dye" + } + ], + "result": { + "item": "computercraft:disk", + "nbt": "{color:10066329}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_9.json b/src/generated/resources/data/computercraft/recipes/disk_9.json new file mode 100644 index 000000000..48620dbdd --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/disk_9.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shapeless", + "group": "computercraft:disk", + "ingredients": [ + { + "tag": "forge:dusts/redstone" + }, + { + "item": "minecraft:paper" + }, + { + "item": "minecraft:gray_dye" + } + ], + "result": { + "item": "computercraft:disk", + "nbt": "{color:5000268}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/speaker.json b/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/speaker.json new file mode 100644 index 000000000..350a5019b --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/speaker.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:pocket_advanced", + "pattern": [ + "#", + "P" + ], + "key": { + "#": { + "item": "computercraft:pocket_computer_advanced" + }, + "P": { + "item": "computercraft:speaker" + } + }, + "result": { + "item": "computercraft:pocket_computer_advanced" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_advanced.json b/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_advanced.json new file mode 100644 index 000000000..8896bd062 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_advanced.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:pocket_advanced", + "pattern": [ + "#", + "P" + ], + "key": { + "#": { + "item": "computercraft:pocket_computer_advanced" + }, + "P": { + "item": "computercraft:wireless_modem_advanced" + } + }, + "result": { + "item": "computercraft:pocket_computer_advanced" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_normal.json b/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_normal.json new file mode 100644 index 000000000..9e007b1cd --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_normal.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:pocket_advanced", + "pattern": [ + "#", + "P" + ], + "key": { + "#": { + "item": "computercraft:pocket_computer_advanced" + }, + "P": { + "item": "computercraft:wireless_modem_normal" + } + }, + "result": { + "item": "computercraft:pocket_computer_advanced" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/crafting_table.json b/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/crafting_table.json new file mode 100644 index 000000000..0cd065680 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/crafting_table.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:pocket_advanced", + "pattern": [ + "#", + "P" + ], + "key": { + "#": { + "item": "computercraft:pocket_computer_advanced" + }, + "P": { + "item": "minecraft:crafting_table" + } + }, + "result": { + "item": "computercraft:pocket_computer_advanced" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_axe.json b/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_axe.json new file mode 100644 index 000000000..7b8fa8a24 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_axe.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:pocket_advanced", + "pattern": [ + "#", + "P" + ], + "key": { + "#": { + "item": "computercraft:pocket_computer_advanced" + }, + "P": { + "item": "minecraft:diamond_axe" + } + }, + "result": { + "item": "computercraft:pocket_computer_advanced" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_hoe.json b/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_hoe.json new file mode 100644 index 000000000..9514a59cd --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_hoe.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:pocket_advanced", + "pattern": [ + "#", + "P" + ], + "key": { + "#": { + "item": "computercraft:pocket_computer_advanced" + }, + "P": { + "item": "minecraft:diamond_hoe" + } + }, + "result": { + "item": "computercraft:pocket_computer_advanced" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_pickaxe.json b/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_pickaxe.json new file mode 100644 index 000000000..e28008623 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:pocket_advanced", + "pattern": [ + "#", + "P" + ], + "key": { + "#": { + "item": "computercraft:pocket_computer_advanced" + }, + "P": { + "item": "minecraft:diamond_pickaxe" + } + }, + "result": { + "item": "computercraft:pocket_computer_advanced" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_shovel.json b/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_shovel.json new file mode 100644 index 000000000..b0ddf3016 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:pocket_advanced", + "pattern": [ + "#", + "P" + ], + "key": { + "#": { + "item": "computercraft:pocket_computer_advanced" + }, + "P": { + "item": "minecraft:diamond_shovel" + } + }, + "result": { + "item": "computercraft:pocket_computer_advanced" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_sword.json b/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_sword.json new file mode 100644 index 000000000..cea0b2a0f --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_sword.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:pocket_advanced", + "pattern": [ + "#", + "P" + ], + "key": { + "#": { + "item": "computercraft:pocket_computer_advanced" + }, + "P": { + "item": "minecraft:diamond_sword" + } + }, + "result": { + "item": "computercraft:pocket_computer_advanced" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/speaker.json b/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/speaker.json new file mode 100644 index 000000000..b5fb937a4 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/speaker.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:pocket_normal", + "pattern": [ + "#", + "P" + ], + "key": { + "#": { + "item": "computercraft:pocket_computer_normal" + }, + "P": { + "item": "computercraft:speaker" + } + }, + "result": { + "item": "computercraft:pocket_computer_normal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_advanced.json b/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_advanced.json new file mode 100644 index 000000000..d8e9518e4 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_advanced.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:pocket_normal", + "pattern": [ + "#", + "P" + ], + "key": { + "#": { + "item": "computercraft:pocket_computer_normal" + }, + "P": { + "item": "computercraft:wireless_modem_advanced" + } + }, + "result": { + "item": "computercraft:pocket_computer_normal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_normal.json b/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_normal.json new file mode 100644 index 000000000..736753136 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_normal.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:pocket_normal", + "pattern": [ + "#", + "P" + ], + "key": { + "#": { + "item": "computercraft:pocket_computer_normal" + }, + "P": { + "item": "computercraft:wireless_modem_normal" + } + }, + "result": { + "item": "computercraft:pocket_computer_normal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/crafting_table.json b/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/crafting_table.json new file mode 100644 index 000000000..dc1ddd884 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/crafting_table.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:pocket_normal", + "pattern": [ + "#", + "P" + ], + "key": { + "#": { + "item": "computercraft:pocket_computer_normal" + }, + "P": { + "item": "minecraft:crafting_table" + } + }, + "result": { + "item": "computercraft:pocket_computer_normal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_axe.json b/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_axe.json new file mode 100644 index 000000000..686d9d890 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_axe.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:pocket_normal", + "pattern": [ + "#", + "P" + ], + "key": { + "#": { + "item": "computercraft:pocket_computer_normal" + }, + "P": { + "item": "minecraft:diamond_axe" + } + }, + "result": { + "item": "computercraft:pocket_computer_normal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_hoe.json b/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_hoe.json new file mode 100644 index 000000000..905a2640a --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_hoe.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:pocket_normal", + "pattern": [ + "#", + "P" + ], + "key": { + "#": { + "item": "computercraft:pocket_computer_normal" + }, + "P": { + "item": "minecraft:diamond_hoe" + } + }, + "result": { + "item": "computercraft:pocket_computer_normal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_pickaxe.json b/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_pickaxe.json new file mode 100644 index 000000000..200d15862 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:pocket_normal", + "pattern": [ + "#", + "P" + ], + "key": { + "#": { + "item": "computercraft:pocket_computer_normal" + }, + "P": { + "item": "minecraft:diamond_pickaxe" + } + }, + "result": { + "item": "computercraft:pocket_computer_normal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_shovel.json b/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_shovel.json new file mode 100644 index 000000000..fcae256c7 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:pocket_normal", + "pattern": [ + "#", + "P" + ], + "key": { + "#": { + "item": "computercraft:pocket_computer_normal" + }, + "P": { + "item": "minecraft:diamond_shovel" + } + }, + "result": { + "item": "computercraft:pocket_computer_normal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_sword.json b/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_sword.json new file mode 100644 index 000000000..564dbf7e5 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_sword.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:pocket_normal", + "pattern": [ + "#", + "P" + ], + "key": { + "#": { + "item": "computercraft:pocket_computer_normal" + }, + "P": { + "item": "minecraft:diamond_sword" + } + }, + "result": { + "item": "computercraft:pocket_computer_normal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/speaker.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/speaker.json new file mode 100644 index 000000000..6526349af --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/speaker.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:turtle_advanced", + "pattern": [ + "#T" + ], + "key": { + "#": { + "item": "computercraft:turtle_advanced" + }, + "T": { + "item": "computercraft:speaker" + } + }, + "result": { + "item": "computercraft:turtle_advanced", + "nbt": "{RightUpgrade:\"computercraft:speaker\"}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_advanced.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_advanced.json new file mode 100644 index 000000000..2aea48cae --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_advanced.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:turtle_advanced", + "pattern": [ + "#T" + ], + "key": { + "#": { + "item": "computercraft:turtle_advanced" + }, + "T": { + "item": "computercraft:wireless_modem_advanced" + } + }, + "result": { + "item": "computercraft:turtle_advanced", + "nbt": "{RightUpgrade:\"computercraft:wireless_modem_advanced\"}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_normal.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_normal.json new file mode 100644 index 000000000..39c434755 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_normal.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:turtle_advanced", + "pattern": [ + "#T" + ], + "key": { + "#": { + "item": "computercraft:turtle_advanced" + }, + "T": { + "item": "computercraft:wireless_modem_normal" + } + }, + "result": { + "item": "computercraft:turtle_advanced", + "nbt": "{RightUpgrade:\"computercraft:wireless_modem_normal\"}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/crafting_table.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/crafting_table.json new file mode 100644 index 000000000..f7178ff09 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/crafting_table.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:turtle_advanced", + "pattern": [ + "#T" + ], + "key": { + "#": { + "item": "computercraft:turtle_advanced" + }, + "T": { + "item": "minecraft:crafting_table" + } + }, + "result": { + "item": "computercraft:turtle_advanced", + "nbt": "{RightUpgrade:\"minecraft:crafting_table\"}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_axe.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_axe.json new file mode 100644 index 000000000..ab2831b56 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_axe.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:turtle_advanced", + "pattern": [ + "#T" + ], + "key": { + "#": { + "item": "computercraft:turtle_advanced" + }, + "T": { + "item": "minecraft:diamond_axe" + } + }, + "result": { + "item": "computercraft:turtle_advanced", + "nbt": "{RightUpgrade:\"minecraft:diamond_axe\"}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_hoe.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_hoe.json new file mode 100644 index 000000000..13c2f694c --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_hoe.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:turtle_advanced", + "pattern": [ + "#T" + ], + "key": { + "#": { + "item": "computercraft:turtle_advanced" + }, + "T": { + "item": "minecraft:diamond_hoe" + } + }, + "result": { + "item": "computercraft:turtle_advanced", + "nbt": "{RightUpgrade:\"minecraft:diamond_hoe\"}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_pickaxe.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_pickaxe.json new file mode 100644 index 000000000..3f3763457 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:turtle_advanced", + "pattern": [ + "#T" + ], + "key": { + "#": { + "item": "computercraft:turtle_advanced" + }, + "T": { + "item": "minecraft:diamond_pickaxe" + } + }, + "result": { + "item": "computercraft:turtle_advanced", + "nbt": "{RightUpgrade:\"minecraft:diamond_pickaxe\"}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_shovel.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_shovel.json new file mode 100644 index 000000000..248f62209 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:turtle_advanced", + "pattern": [ + "#T" + ], + "key": { + "#": { + "item": "computercraft:turtle_advanced" + }, + "T": { + "item": "minecraft:diamond_shovel" + } + }, + "result": { + "item": "computercraft:turtle_advanced", + "nbt": "{RightUpgrade:\"minecraft:diamond_shovel\"}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_sword.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_sword.json new file mode 100644 index 000000000..8cab2a90b --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_sword.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:turtle_advanced", + "pattern": [ + "#T" + ], + "key": { + "#": { + "item": "computercraft:turtle_advanced" + }, + "T": { + "item": "minecraft:diamond_sword" + } + }, + "result": { + "item": "computercraft:turtle_advanced", + "nbt": "{RightUpgrade:\"minecraft:diamond_sword\"}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/speaker.json b/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/speaker.json new file mode 100644 index 000000000..28f425aec --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/speaker.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:turtle_normal", + "pattern": [ + "#T" + ], + "key": { + "#": { + "item": "computercraft:turtle_normal" + }, + "T": { + "item": "computercraft:speaker" + } + }, + "result": { + "item": "computercraft:turtle_normal", + "nbt": "{RightUpgrade:\"computercraft:speaker\"}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/wireless_modem_advanced.json b/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/wireless_modem_advanced.json new file mode 100644 index 000000000..3af190a52 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/wireless_modem_advanced.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:turtle_normal", + "pattern": [ + "#T" + ], + "key": { + "#": { + "item": "computercraft:turtle_normal" + }, + "T": { + "item": "computercraft:wireless_modem_advanced" + } + }, + "result": { + "item": "computercraft:turtle_normal", + "nbt": "{RightUpgrade:\"computercraft:wireless_modem_advanced\"}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/wireless_modem_normal.json b/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/wireless_modem_normal.json new file mode 100644 index 000000000..f387a143d --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/wireless_modem_normal.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:turtle_normal", + "pattern": [ + "#T" + ], + "key": { + "#": { + "item": "computercraft:turtle_normal" + }, + "T": { + "item": "computercraft:wireless_modem_normal" + } + }, + "result": { + "item": "computercraft:turtle_normal", + "nbt": "{RightUpgrade:\"computercraft:wireless_modem_normal\"}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/crafting_table.json b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/crafting_table.json new file mode 100644 index 000000000..8e8a1dcc9 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/crafting_table.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:turtle_normal", + "pattern": [ + "#T" + ], + "key": { + "#": { + "item": "computercraft:turtle_normal" + }, + "T": { + "item": "minecraft:crafting_table" + } + }, + "result": { + "item": "computercraft:turtle_normal", + "nbt": "{RightUpgrade:\"minecraft:crafting_table\"}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_axe.json b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_axe.json new file mode 100644 index 000000000..85a16309d --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_axe.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:turtle_normal", + "pattern": [ + "#T" + ], + "key": { + "#": { + "item": "computercraft:turtle_normal" + }, + "T": { + "item": "minecraft:diamond_axe" + } + }, + "result": { + "item": "computercraft:turtle_normal", + "nbt": "{RightUpgrade:\"minecraft:diamond_axe\"}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_hoe.json b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_hoe.json new file mode 100644 index 000000000..45491a5e8 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_hoe.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:turtle_normal", + "pattern": [ + "#T" + ], + "key": { + "#": { + "item": "computercraft:turtle_normal" + }, + "T": { + "item": "minecraft:diamond_hoe" + } + }, + "result": { + "item": "computercraft:turtle_normal", + "nbt": "{RightUpgrade:\"minecraft:diamond_hoe\"}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_pickaxe.json b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_pickaxe.json new file mode 100644 index 000000000..db9ef1ae6 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_pickaxe.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:turtle_normal", + "pattern": [ + "#T" + ], + "key": { + "#": { + "item": "computercraft:turtle_normal" + }, + "T": { + "item": "minecraft:diamond_pickaxe" + } + }, + "result": { + "item": "computercraft:turtle_normal", + "nbt": "{RightUpgrade:\"minecraft:diamond_pickaxe\"}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_shovel.json b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_shovel.json new file mode 100644 index 000000000..66f98c2c9 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:turtle_normal", + "pattern": [ + "#T" + ], + "key": { + "#": { + "item": "computercraft:turtle_normal" + }, + "T": { + "item": "minecraft:diamond_shovel" + } + }, + "result": { + "item": "computercraft:turtle_normal", + "nbt": "{RightUpgrade:\"minecraft:diamond_shovel\"}" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_sword.json b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_sword.json new file mode 100644 index 000000000..c99c73c03 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_sword.json @@ -0,0 +1,19 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:turtle_normal", + "pattern": [ + "#T" + ], + "key": { + "#": { + "item": "computercraft:turtle_normal" + }, + "T": { + "item": "minecraft:diamond_sword" + } + }, + "result": { + "item": "computercraft:turtle_normal", + "nbt": "{RightUpgrade:\"minecraft:diamond_sword\"}" + } +} \ No newline at end of file diff --git a/src/main/java/dan200/computercraft/data/Generators.java b/src/main/java/dan200/computercraft/data/Generators.java new file mode 100644 index 000000000..1506661a1 --- /dev/null +++ b/src/main/java/dan200/computercraft/data/Generators.java @@ -0,0 +1,27 @@ +/* + * This file is part of ComputerCraft - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission. + * Send enquiries to dratcliffe@gmail.com + */ + +package dan200.computercraft.data; + +import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon; +import net.minecraft.data.DataGenerator; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; + +@Mod.EventBusSubscriber( bus = Mod.EventBusSubscriber.Bus.MOD ) +public class Generators +{ + @SubscribeEvent + public static void gather( GatherDataEvent event ) + { + ComputerCraftProxyCommon.registerLoot(); + + DataGenerator generator = event.getGenerator(); + generator.addProvider( new Recipes( generator ) ); + generator.addProvider( new LootTables( generator ) ); + } +} diff --git a/src/main/java/dan200/computercraft/data/LootTableProvider.java b/src/main/java/dan200/computercraft/data/LootTableProvider.java new file mode 100644 index 000000000..54b47c42f --- /dev/null +++ b/src/main/java/dan200/computercraft/data/LootTableProvider.java @@ -0,0 +1,91 @@ +/* + * This file is part of ComputerCraft - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission. + * Send enquiries to dratcliffe@gmail.com + */ + +package dan200.computercraft.data; + +import com.google.common.collect.Multimap; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import dan200.computercraft.ComputerCraft; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.DirectoryCache; +import net.minecraft.data.IDataProvider; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.storage.loot.LootTable; +import net.minecraft.world.storage.loot.LootTableManager; +import net.minecraft.world.storage.loot.ValidationResults; + +import javax.annotation.Nonnull; +import java.io.IOException; +import java.nio.file.Path; +import java.util.HashMap; +import java.util.Map; +import java.util.function.BiConsumer; + +/** + * An alternative to {@link net.minecraft.data.LootTableProvider}, with a more flexible interface. + */ +public abstract class LootTableProvider implements IDataProvider +{ + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create(); + + private final DataGenerator generator; + + public LootTableProvider( DataGenerator generator ) + { + this.generator = generator; + } + + @Override + public void act( @Nonnull DirectoryCache cache ) + { + + ValidationResults validation = new ValidationResults(); + Map tables = new HashMap<>(); + registerLoot( ( id, table ) -> { + if( tables.containsKey( id ) ) validation.addProblem( "Duplicate loot tables for " + id ); + tables.put( id, table ); + } ); + + tables.forEach( ( key, value ) -> LootTableManager.func_215302_a( validation, key, value, tables::get ) ); + + Multimap problems = validation.getProblems(); + if( !problems.isEmpty() ) + { + problems.forEach( ( child, problem ) -> + ComputerCraft.log.warn( "Found validation problem in " + child + ": " + problem ) ); + throw new IllegalStateException( "Failed to validate loot tables, see logs" ); + } + + tables.forEach( ( key, value ) -> { + Path path = getPath( key ); + try + { + IDataProvider.save( GSON, cache, LootTableManager.toJson( value ), path ); + } + catch( IOException e ) + { + ComputerCraft.log.error( "Couldn't save loot table {}", path, e ); + } + } ); + } + + protected abstract void registerLoot( BiConsumer add ); + + @Nonnull + @Override + public String getName() + { + return "LootTables"; + } + + private Path getPath( ResourceLocation id ) + { + return generator.getOutputFolder() + .resolve( "data" ).resolve( id.getNamespace() ).resolve( "loot_tables" ) + .resolve( id.getPath() + ".json" ); + } +} diff --git a/src/main/java/dan200/computercraft/data/LootTables.java b/src/main/java/dan200/computercraft/data/LootTables.java new file mode 100644 index 000000000..f40295ccc --- /dev/null +++ b/src/main/java/dan200/computercraft/data/LootTables.java @@ -0,0 +1,72 @@ +/* + * This file is part of ComputerCraft - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission. + * Send enquiries to dratcliffe@gmail.com + */ + +package dan200.computercraft.data; + +import dan200.computercraft.ComputerCraft; +import dan200.computercraft.shared.data.BlockNamedEntityLootCondition; +import dan200.computercraft.shared.data.PlayerCreativeLootCondition; +import net.minecraft.block.Block; +import net.minecraft.data.DataGenerator; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.storage.loot.*; +import net.minecraft.world.storage.loot.conditions.Alternative; +import net.minecraft.world.storage.loot.conditions.SurvivesExplosion; + +import java.util.function.BiConsumer; + +public class LootTables extends LootTableProvider +{ + public LootTables( DataGenerator generator ) + { + super( generator ); + } + + @Override + protected void registerLoot( BiConsumer add ) + { + basicDrop( add, ComputerCraft.Blocks.diskDrive ); + basicDrop( add, ComputerCraft.Blocks.monitorNormal ); + basicDrop( add, ComputerCraft.Blocks.monitorAdvanced ); + basicDrop( add, ComputerCraft.Blocks.printer ); + basicDrop( add, ComputerCraft.Blocks.speaker ); + basicDrop( add, ComputerCraft.Blocks.wiredModemFull ); + basicDrop( add, ComputerCraft.Blocks.wirelessModemNormal ); + basicDrop( add, ComputerCraft.Blocks.wirelessModemAdvanced ); + + computerDrop( add, ComputerCraft.Blocks.computerNormal ); + computerDrop( add, ComputerCraft.Blocks.computerAdvanced ); + computerDrop( add, ComputerCraft.Blocks.turtleNormal ); + computerDrop( add, ComputerCraft.Blocks.turtleAdvanced ); + } + + private static void basicDrop( BiConsumer add, Block block ) + { + add.accept( block.getRegistryName(), LootTable + .builder() + .addLootPool( LootPool.builder() + .name( "main" ) + .rolls( ConstantRange.of( 1 ) ) + .addEntry( ItemLootEntry.builder( block ) ) + .acceptCondition( SurvivesExplosion.builder() ) + ).build() ); + } + + private static void computerDrop( BiConsumer add, Block block ) + { + add.accept( block.getRegistryName(), LootTable + .builder() + .addLootPool( LootPool.builder() + .name( "main" ) + .rolls( ConstantRange.of( 1 ) ) + .addEntry( DynamicLootEntry.func_216162_a( new ResourceLocation( ComputerCraft.MOD_ID, "computer" ) ) ) + .acceptCondition( Alternative.builder( + BlockNamedEntityLootCondition.builder(), + PlayerCreativeLootCondition.builder().inverted() + ) ) + ).build() ); + } +} diff --git a/src/main/java/dan200/computercraft/data/RecipeWrapper.java b/src/main/java/dan200/computercraft/data/RecipeWrapper.java new file mode 100644 index 000000000..f3252a39a --- /dev/null +++ b/src/main/java/dan200/computercraft/data/RecipeWrapper.java @@ -0,0 +1,92 @@ +/* + * This file is part of ComputerCraft - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission. + * Send enquiries to dratcliffe@gmail.com + */ + +package dan200.computercraft.data; + +import com.google.gson.JsonObject; +import net.minecraft.data.IFinishedRecipe; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.JSONUtils; +import net.minecraft.util.ResourceLocation; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.function.Consumer; + +/** + * Adapter for recipes which overrides the serializer and adds custom item NBT. + */ +public class RecipeWrapper implements IFinishedRecipe +{ + private final IFinishedRecipe recipe; + private final CompoundNBT resultData; + private final IRecipeSerializer serializer; + + private RecipeWrapper( IFinishedRecipe recipe, CompoundNBT resultData, IRecipeSerializer serializer ) + { + this.resultData = resultData; + this.recipe = recipe; + this.serializer = serializer; + } + + public static Consumer wrap( IRecipeSerializer serializer, Consumer original ) + { + return x -> original.accept( new RecipeWrapper( x, null, serializer ) ); + } + + public static Consumer wrap( IRecipeSerializer serializer, Consumer original, CompoundNBT resultData ) + { + return x -> original.accept( new RecipeWrapper( x, resultData, serializer ) ); + } + + public static Consumer wrap( IRecipeSerializer serializer, Consumer original, Consumer resultData ) + { + CompoundNBT tag = new CompoundNBT(); + resultData.accept( tag ); + return x -> original.accept( new RecipeWrapper( x, tag, serializer ) ); + } + + @Override + public void serialize( @Nonnull JsonObject jsonObject ) + { + recipe.serialize( jsonObject ); + + if( resultData != null ) + { + JsonObject object = JSONUtils.getJsonObject( jsonObject, "result" ); + object.addProperty( "nbt", resultData.toString() ); + } + } + + @Nonnull + @Override + public ResourceLocation getID() + { + return recipe.getID(); + } + + @Nonnull + @Override + public IRecipeSerializer getSerializer() + { + return serializer; + } + + @Nullable + @Override + public JsonObject getAdvancementJson() + { + return recipe.getAdvancementJson(); + } + + @Nullable + @Override + public ResourceLocation getAdvancementID() + { + return recipe.getAdvancementID(); + } +} diff --git a/src/main/java/dan200/computercraft/data/Recipes.java b/src/main/java/dan200/computercraft/data/Recipes.java new file mode 100644 index 000000000..7146e829d --- /dev/null +++ b/src/main/java/dan200/computercraft/data/Recipes.java @@ -0,0 +1,141 @@ +/* + * This file is part of ComputerCraft - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission. + * Send enquiries to dratcliffe@gmail.com + */ + +package dan200.computercraft.data; + +import dan200.computercraft.ComputerCraft; +import dan200.computercraft.shared.TurtleUpgrades; +import dan200.computercraft.shared.computer.core.ComputerFamily; +import dan200.computercraft.shared.pocket.items.PocketComputerItemFactory; +import dan200.computercraft.shared.turtle.items.TurtleItemFactory; +import dan200.computercraft.shared.util.Colour; +import dan200.computercraft.shared.util.ImpostorRecipe; +import dan200.computercraft.shared.util.ImpostorShapelessRecipe; +import net.minecraft.advancements.criterion.InventoryChangeTrigger; +import net.minecraft.data.*; +import net.minecraft.item.DyeColor; +import net.minecraft.item.DyeItem; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.Tags; + +import javax.annotation.Nonnull; +import java.util.Locale; +import java.util.function.Consumer; + +public class Recipes extends RecipeProvider +{ + public Recipes( DataGenerator generator ) + { + super( generator ); + } + + @Override + protected void registerRecipes( @Nonnull Consumer add ) + { + diskColours( add ); + pocketUpgrades( add ); + turtleUpgrades( add ); + } + + /** + * Register a crafting recipe for a disk of every dye colour. + * + * @param add The callback to add recipes. + */ + private void diskColours( @Nonnull Consumer add ) + { + for( Colour colour : Colour.VALUES ) + { + ShapelessRecipeBuilder + .shapelessRecipe( ComputerCraft.Items.disk ) + .addIngredient( Tags.Items.DUSTS_REDSTONE ) + .addIngredient( Items.PAPER ) + .addIngredient( DyeItem.getItem( ofColour( colour ) ) ) + .setGroup( "computercraft:disk" ) + .addCriterion( "has_drive", InventoryChangeTrigger.Instance.forItems( ComputerCraft.Blocks.diskDrive ) ) + .build( RecipeWrapper.wrap( + ImpostorShapelessRecipe.SERIALIZER, add, + x -> x.putInt( "color", colour.getHex() ) + ), new ResourceLocation( ComputerCraft.MOD_ID, "disk_" + (colour.ordinal() + 1) ) ); + } + } + + /** + * Register a crafting recipe for each turtle upgrade. + * + * @param add The callback to add recipes. + */ + private void turtleUpgrades( @Nonnull Consumer add ) + { + for( ComputerFamily family : ComputerFamily.values() ) + { + ItemStack base = TurtleItemFactory.create( -1, null, -1, family, null, null, 0, null ); + if( base.isEmpty() ) continue; + + String nameId = family.name().toLowerCase( Locale.ROOT ); + + TurtleUpgrades.getVanillaUpgrades().forEach( upgrade -> { + ItemStack result = TurtleItemFactory.create( -1, null, -1, family, null, upgrade, -1, null ); + ShapedRecipeBuilder + .shapedRecipe( result.getItem() ) + .setGroup( String.format( "%s:turtle_%s", ComputerCraft.MOD_ID, nameId ) ) + .patternLine( "#T" ) + .key( '#', base.getItem() ) + .key( 'T', upgrade.getCraftingItem().getItem() ) + .addCriterion( "has_items", + InventoryChangeTrigger.Instance.forItems( base.getItem(), upgrade.getCraftingItem().getItem() ) ) + .build( + RecipeWrapper.wrap( ImpostorRecipe.SERIALIZER, add, result.getTag() ), + new ResourceLocation( ComputerCraft.MOD_ID, String.format( "turtle_%s/%s/%s", + nameId, upgrade.getUpgradeID().getNamespace(), upgrade.getUpgradeID().getPath() + ) ) + ); + } ); + } + } + + /** + * Register a crafting recipe for each pocket upgrade. + * + * @param add The callback to add recipes. + */ + private void pocketUpgrades( @Nonnull Consumer add ) + { + for( ComputerFamily family : ComputerFamily.values() ) + { + ItemStack base = PocketComputerItemFactory.create( -1, null, -1, family, null ); + if( base.isEmpty() ) continue; + + String nameId = family.name().toLowerCase( Locale.ROOT ); + + TurtleUpgrades.getVanillaUpgrades().forEach( upgrade -> { + ItemStack result = PocketComputerItemFactory.create( -1, null, -1, family, null ); + ShapedRecipeBuilder + .shapedRecipe( result.getItem() ) + .setGroup( String.format( "%s:pocket_%s", ComputerCraft.MOD_ID, nameId ) ) + .patternLine( "#" ) + .patternLine( "P" ) + .key( '#', base.getItem() ) + .key( 'P', upgrade.getCraftingItem().getItem() ) + .addCriterion( "has_items", + InventoryChangeTrigger.Instance.forItems( base.getItem(), upgrade.getCraftingItem().getItem() ) ) + .build( + RecipeWrapper.wrap( ImpostorRecipe.SERIALIZER, add, result.getTag() ), + new ResourceLocation( ComputerCraft.MOD_ID, String.format( "pocket_%s/%s/%s", + nameId, upgrade.getUpgradeID().getNamespace(), upgrade.getUpgradeID().getPath() + ) ) + ); + } ); + } + } + + private static DyeColor ofColour( Colour colour ) + { + return DyeColor.byId( 15 - colour.ordinal() ); + } +} diff --git a/src/main/java/dan200/computercraft/shared/data/BlockNamedEntityLootCondition.java b/src/main/java/dan200/computercraft/shared/data/BlockNamedEntityLootCondition.java index c2842ff28..898c321ce 100644 --- a/src/main/java/dan200/computercraft/shared/data/BlockNamedEntityLootCondition.java +++ b/src/main/java/dan200/computercraft/shared/data/BlockNamedEntityLootCondition.java @@ -40,4 +40,9 @@ public Set> getRequiredParameters() { return Collections.singleton( LootParameters.BLOCK_ENTITY ); } + + public static IBuilder builder() + { + return () -> INSTANCE; + } } diff --git a/src/main/java/dan200/computercraft/shared/data/PlayerCreativeLootCondition.java b/src/main/java/dan200/computercraft/shared/data/PlayerCreativeLootCondition.java index 9055f3c17..6a91f90fe 100644 --- a/src/main/java/dan200/computercraft/shared/data/PlayerCreativeLootCondition.java +++ b/src/main/java/dan200/computercraft/shared/data/PlayerCreativeLootCondition.java @@ -40,4 +40,9 @@ public Set> getRequiredParameters() { return Collections.singleton( LootParameters.THIS_ENTITY ); } + + public static IBuilder builder() + { + return () -> INSTANCE; + } } diff --git a/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java b/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java index 2b3261491..70ddeca32 100644 --- a/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java +++ b/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java @@ -47,14 +47,20 @@ public final class ComputerCraftProxyCommon { @SubscribeEvent + @SuppressWarnings( "deprecation" ) public static void init( FMLCommonSetupEvent event ) { NetworkHandler.setup(); - registerProviders(); - - ArgumentSerializers.register(); + net.minecraftforge.fml.DeferredWorkQueue.runLater( () -> { + registerProviders(); + ArgumentSerializers.register(); + registerLoot(); + } ); + } + public static void registerLoot() + { LootConditionManager.registerCondition( ConstantLootConditionSerializer.of( new ResourceLocation( ComputerCraft.MOD_ID, "block_named" ), BlockNamedEntityLootCondition.class, diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/disk.json b/src/main/resources/data/computercraft/advancements/recipes/generated/disk.json deleted file mode 100644 index 94c07e6d9..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/disk.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:generated/disk/disk_1", - "computercraft:generated/disk/disk_2", - "computercraft:generated/disk/disk_3", - "computercraft:generated/disk/disk_4", - "computercraft:generated/disk/disk_5", - "computercraft:generated/disk/disk_6", - "computercraft:generated/disk/disk_7", - "computercraft:generated/disk/disk_8", - "computercraft:generated/disk/disk_9", - "computercraft:generated/disk/disk_10", - "computercraft:generated/disk/disk_11", - "computercraft:generated/disk/disk_12", - "computercraft:generated/disk/disk_13", - "computercraft:generated/disk/disk_14", - "computercraft:generated/disk/disk_15", - "computercraft:generated/disk/disk_16" - ] - }, - "criteria": { - "has_drive": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:disk_drive" } ] - } - }, - "has_recipe_1": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/disk/disk_1" } - }, - "has_recipe_2": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/disk/disk_2" } - }, - "has_recipe_3": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/disk/disk_3" } - }, - "has_recipe_4": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/disk/disk_4" } - }, - "has_recipe_5": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/disk/disk_5" } - }, - "has_recipe_6": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/disk/disk_6" } - }, - "has_recipe_7": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/disk/disk_7" } - }, - "has_recipe_8": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/disk/disk_8" } - }, - "has_recipe_9": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/disk/disk_9" } - }, - "has_recipe_10": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/disk/disk_10" } - }, - "has_recipe_11": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/disk/disk_11" } - }, - "has_recipe_12": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/disk/disk_12" } - }, - "has_recipe_13": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/disk/disk_13" } - }, - "has_recipe_14": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/disk/disk_14" } - }, - "has_recipe_15": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/disk/disk_15" } - }, - "has_recipe_16": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/disk/disk_16" } - } - }, - "requirements": [ - [ - "has_drive", - "has_recipe_1", - "has_recipe_2", - "has_recipe_3", - "has_recipe_4", - "has_recipe_5", - "has_recipe_6", - "has_recipe_7", - "has_recipe_8", - "has_recipe_9", - "has_recipe_10", - "has_recipe_11", - "has_recipe_12", - "has_recipe_13", - "has_recipe_14", - "has_recipe_15", - "has_recipe_16" - ] - ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_speaker.json b/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_speaker.json deleted file mode 100644 index 3b9da6c6f..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_speaker.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/pocket_advanced/computercraft_speaker" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_wireless_modem_advanced.json b/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_wireless_modem_advanced.json deleted file mode 100644 index ce426a0f9..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_wireless_modem_advanced.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/pocket_advanced/computercraft_wireless_modem_advanced" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_wireless_modem_normal.json b/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_wireless_modem_normal.json deleted file mode 100644 index d92bae7b0..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_wireless_modem_normal.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/pocket_advanced/computercraft_wireless_modem_normal" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_speaker.json b/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_speaker.json deleted file mode 100644 index a0fac97f9..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_speaker.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/pocket_normal/computercraft_speaker" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_wireless_modem_advanced.json b/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_wireless_modem_advanced.json deleted file mode 100644 index 29c8cb86b..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_wireless_modem_advanced.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/pocket_normal/computercraft_wireless_modem_advanced" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_wireless_modem_normal.json b/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_wireless_modem_normal.json deleted file mode 100644 index 19fe726ee..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_wireless_modem_normal.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/pocket_normal/computercraft_wireless_modem_normal" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_speaker.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_speaker.json deleted file mode 100644 index 09942d3d5..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_speaker.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/turtle_advanced/computercraft_speaker" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_wireless_modem_advanced.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_wireless_modem_advanced.json deleted file mode 100644 index 23ed3111c..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_wireless_modem_advanced.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/turtle_advanced/computercraft_wireless_modem_advanced" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_wireless_modem_normal.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_wireless_modem_normal.json deleted file mode 100644 index e2613b21f..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_wireless_modem_normal.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/turtle_advanced/computercraft_wireless_modem_normal" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_crafting_table.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_crafting_table.json deleted file mode 100644 index c6c86d47a..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/turtle_advanced/minecraft_crafting_table" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_axe.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_axe.json deleted file mode 100644 index 6c1adcd84..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_axe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/turtle_advanced/minecraft_diamond_axe" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_hoe.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_hoe.json deleted file mode 100644 index d906a8317..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_hoe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/turtle_advanced/minecraft_diamond_hoe" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_pickaxe.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_pickaxe.json deleted file mode 100644 index 9d59c615e..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_pickaxe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/turtle_advanced/minecraft_diamond_pickaxe" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_shovel.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_shovel.json deleted file mode 100644 index efc7a3fce..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_shovel.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/turtle_advanced/minecraft_diamond_shovel" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_sword.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_sword.json deleted file mode 100644 index ad9f19c17..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_sword.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/turtle_advanced/minecraft_diamond_sword" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_speaker.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_speaker.json deleted file mode 100644 index 6d18d9ee2..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_speaker.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/turtle_normal/computercraft_speaker" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_wireless_modem_advanced.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_wireless_modem_advanced.json deleted file mode 100644 index 5fe595acc..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_wireless_modem_advanced.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/turtle_normal/computercraft_wireless_modem_advanced" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_wireless_modem_normal.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_wireless_modem_normal.json deleted file mode 100644 index 8d43a7c65..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_wireless_modem_normal.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/turtle_normal/computercraft_wireless_modem_normal" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_crafting_table.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_crafting_table.json deleted file mode 100644 index 2bee28454..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/turtle_normal/minecraft_crafting_table" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_axe.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_axe.json deleted file mode 100644 index df0b816a6..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_axe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/turtle_normal/minecraft_diamond_axe" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_hoe.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_hoe.json deleted file mode 100644 index 8df26b012..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_hoe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/turtle_normal/minecraft_diamond_hoe" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_pickaxe.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_pickaxe.json deleted file mode 100644 index e83d19e7b..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_pickaxe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/turtle_normal/minecraft_diamond_pickaxe" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_shovel.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_shovel.json deleted file mode 100644 index abeddd89b..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_shovel.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/turtle_normal/minecraft_diamond_shovel" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_sword.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_sword.json deleted file mode 100644 index 8930c40dd..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_sword.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:generated/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:generated/turtle_normal/minecraft_diamond_sword" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/src/main/resources/data/computercraft/loot_tables/blocks/computer_advanced.json b/src/main/resources/data/computercraft/loot_tables/blocks/computer_advanced.json deleted file mode 100644 index 26cde0f50..000000000 --- a/src/main/resources/data/computercraft/loot_tables/blocks/computer_advanced.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ { "type": "minecraft:dynamic", "name": "computercraft:computer" } ], - "conditions": [ - { - "condition": "alternative", - "terms": [ - { "condition": "computercraft:block_named" }, - { "condition": "minecraft:inverted", "term": { "condition": "computercraft:player_creative" } } - ] - } - ] - } - ] -} diff --git a/src/main/resources/data/computercraft/loot_tables/blocks/computer_command.json b/src/main/resources/data/computercraft/loot_tables/blocks/computer_command.json deleted file mode 100644 index 26cde0f50..000000000 --- a/src/main/resources/data/computercraft/loot_tables/blocks/computer_command.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ { "type": "minecraft:dynamic", "name": "computercraft:computer" } ], - "conditions": [ - { - "condition": "alternative", - "terms": [ - { "condition": "computercraft:block_named" }, - { "condition": "minecraft:inverted", "term": { "condition": "computercraft:player_creative" } } - ] - } - ] - } - ] -} diff --git a/src/main/resources/data/computercraft/loot_tables/blocks/computer_normal.json b/src/main/resources/data/computercraft/loot_tables/blocks/computer_normal.json deleted file mode 100644 index 26cde0f50..000000000 --- a/src/main/resources/data/computercraft/loot_tables/blocks/computer_normal.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ { "type": "minecraft:dynamic", "name": "computercraft:computer" } ], - "conditions": [ - { - "condition": "alternative", - "terms": [ - { "condition": "computercraft:block_named" }, - { "condition": "minecraft:inverted", "term": { "condition": "computercraft:player_creative" } } - ] - } - ] - } - ] -} diff --git a/src/main/resources/data/computercraft/loot_tables/blocks/disk_drive.json b/src/main/resources/data/computercraft/loot_tables/blocks/disk_drive.json deleted file mode 100644 index 6575281bb..000000000 --- a/src/main/resources/data/computercraft/loot_tables/blocks/disk_drive.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ { "type": "minecraft:item", "name": "computercraft:disk_drive" } ], - "conditions": [ { "condition": "minecraft:survives_explosion" } ] - } - ] -} diff --git a/src/main/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json b/src/main/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json deleted file mode 100644 index f6f9710c5..000000000 --- a/src/main/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { "type": "minecraft:item", "name": "computercraft:monitor_advanced" } - ], - "conditions": [ { "condition": "minecraft:survives_explosion" } ] - } - ] -} diff --git a/src/main/resources/data/computercraft/loot_tables/blocks/monitor_normal.json b/src/main/resources/data/computercraft/loot_tables/blocks/monitor_normal.json deleted file mode 100644 index bff665f73..000000000 --- a/src/main/resources/data/computercraft/loot_tables/blocks/monitor_normal.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { "type": "minecraft:item", "name": "computercraft:monitor_normal" } - ], - "conditions": [ { "condition": "minecraft:survives_explosion" } ] - } - ] -} diff --git a/src/main/resources/data/computercraft/loot_tables/blocks/printer.json b/src/main/resources/data/computercraft/loot_tables/blocks/printer.json deleted file mode 100644 index fff10863c..000000000 --- a/src/main/resources/data/computercraft/loot_tables/blocks/printer.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ { "type": "minecraft:item", "name": "computercraft:printer" } ], - "conditions": [ { "condition": "minecraft:survives_explosion" } ] - } - ] -} diff --git a/src/main/resources/data/computercraft/loot_tables/blocks/speaker.json b/src/main/resources/data/computercraft/loot_tables/blocks/speaker.json deleted file mode 100644 index 735c12a91..000000000 --- a/src/main/resources/data/computercraft/loot_tables/blocks/speaker.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { "type": "minecraft:item", "name": "computercraft:speaker" } - ], - "conditions": [ { "condition": "minecraft:survives_explosion" } ] - } - ] -} diff --git a/src/main/resources/data/computercraft/loot_tables/blocks/turtle_advanced.json b/src/main/resources/data/computercraft/loot_tables/blocks/turtle_advanced.json deleted file mode 100644 index 26cde0f50..000000000 --- a/src/main/resources/data/computercraft/loot_tables/blocks/turtle_advanced.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ { "type": "minecraft:dynamic", "name": "computercraft:computer" } ], - "conditions": [ - { - "condition": "alternative", - "terms": [ - { "condition": "computercraft:block_named" }, - { "condition": "minecraft:inverted", "term": { "condition": "computercraft:player_creative" } } - ] - } - ] - } - ] -} diff --git a/src/main/resources/data/computercraft/loot_tables/blocks/turtle_normal.json b/src/main/resources/data/computercraft/loot_tables/blocks/turtle_normal.json deleted file mode 100644 index 26cde0f50..000000000 --- a/src/main/resources/data/computercraft/loot_tables/blocks/turtle_normal.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ { "type": "minecraft:dynamic", "name": "computercraft:computer" } ], - "conditions": [ - { - "condition": "alternative", - "terms": [ - { "condition": "computercraft:block_named" }, - { "condition": "minecraft:inverted", "term": { "condition": "computercraft:player_creative" } } - ] - } - ] - } - ] -} diff --git a/src/main/resources/data/computercraft/loot_tables/blocks/wired_modem_full.json b/src/main/resources/data/computercraft/loot_tables/blocks/wired_modem_full.json deleted file mode 100644 index 9a8a883df..000000000 --- a/src/main/resources/data/computercraft/loot_tables/blocks/wired_modem_full.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { "type": "minecraft:item", "name": "computercraft:wired_modem_full" } - ], - "conditions": [ { "condition": "minecraft:survives_explosion" } ] - } - ] -} diff --git a/src/main/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json b/src/main/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json deleted file mode 100644 index 00dae5bc8..000000000 --- a/src/main/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { "type": "minecraft:item", "name": "computercraft:wireless_modem_advanced" } - ], - "conditions": [ { "condition": "minecraft:survives_explosion" } ] - } - ] -} diff --git a/src/main/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json b/src/main/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json deleted file mode 100644 index cb88adee4..000000000 --- a/src/main/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { "type": "minecraft:item", "name": "computercraft:wireless_modem_normal" } - ], - "conditions": [ { "condition": "minecraft:survives_explosion" } ] - } - ] -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_1.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_1.json deleted file mode 100644 index a27ee37c6..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_1.json +++ /dev/null @@ -1,10 +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 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_10.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_10.json deleted file mode 100644 index 26b83fe6b..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_10.json +++ /dev/null @@ -1,10 +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 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_11.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_11.json deleted file mode 100644 index 40d6157c0..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_11.json +++ /dev/null @@ -1,10 +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 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_12.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_12.json deleted file mode 100644 index 505066e7a..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_12.json +++ /dev/null @@ -1,10 +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 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_13.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_13.json deleted file mode 100644 index e270135ef..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_13.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "tag": "forge:dusts/redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:light_blue_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 10072818 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_14.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_14.json deleted file mode 100644 index 73794dac1..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_14.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "tag": "forge:dusts/redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:magenta_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 15040472 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_15.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_15.json deleted file mode 100644 index 13ff4dd71..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_15.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "tag": "forge:dusts/redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:orange_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 15905331 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_16.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_16.json deleted file mode 100644 index 2fa82adad..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_16.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "tag": "forge:dusts/redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:white_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 15790320 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_2.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_2.json deleted file mode 100644 index 21ab48568..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_2.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "tag": "forge:dusts/redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:red_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 13388876 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_3.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_3.json deleted file mode 100644 index a164af6cb..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_3.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "tag": "forge:dusts/redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:green_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 5744206 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_4.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_4.json deleted file mode 100644 index 7109021e3..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_4.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "tag": "forge:dusts/redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:brown_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 8349260 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_5.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_5.json deleted file mode 100644 index 538f14349..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_5.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "tag": "forge:dusts/redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:blue_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 3368652 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_6.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_6.json deleted file mode 100644 index 6a9c1ed5b..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_6.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "tag": "forge:dusts/redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:purple_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 11691749 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_7.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_7.json deleted file mode 100644 index 6f6a442f7..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_7.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "tag": "forge:dusts/redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:cyan_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 5020082 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_8.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_8.json deleted file mode 100644 index bd8bc8f42..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_8.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "tag": "forge:dusts/redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:light_gray_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 10066329 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_9.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_9.json deleted file mode 100644 index 67ad7f58e..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_9.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "tag": "forge:dusts/redstone" }, - { "item": "minecraft:paper" }, - { "item": "minecraft:gray_dye" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": 5000268 } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_speaker.json b/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_speaker.json deleted file mode 100644 index e60e9ea93..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_speaker.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_pocket_advanced", - "pattern": [ - "#", - "T" - ], - "key": { - "#": { "item": "computercraft:speaker" }, - "T": { "item": "computercraft:pocket_computer_advanced" } - }, - "result": { "item": "computercraft:pocket_computer_advanced", "nbt": { "Upgrade": "computercraft:speaker" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_advanced.json b/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_advanced.json deleted file mode 100644 index 878afe1a5..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_advanced.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_pocket_advanced", - "pattern": [ - "#", - "T" - ], - "key": { - "#": { "item": "computercraft:wireless_modem_advanced" }, - "T": { "item": "computercraft:pocket_computer_advanced" } - }, - "result": { "item": "computercraft:pocket_computer_advanced", "nbt": { "Upgrade": "computercraft:wireless_modem_advanced" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_normal.json b/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_normal.json deleted file mode 100644 index 1bd86cca0..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_normal.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_pocket_advanced", - "pattern": [ - "#", - "T" - ], - "key": { - "#": { "item": "computercraft:wireless_modem_normal" }, - "T": { "item": "computercraft:pocket_computer_advanced" } - }, - "result": { "item": "computercraft:pocket_computer_advanced", "nbt": { "Upgrade": "computercraft:wireless_modem_normal" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_speaker.json b/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_speaker.json deleted file mode 100644 index ba569ec7a..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_speaker.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_pocket_normal", - "pattern": [ - "#", - "T" - ], - "key": { - "#": { "item": "computercraft:speaker" }, - "T": { "item": "computercraft:pocket_computer_normal" } - }, - "result": { "item": "computercraft:pocket_computer_normal", "nbt": { "Upgrade": "computercraft:speaker" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_advanced.json b/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_advanced.json deleted file mode 100644 index 3c008706d..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_advanced.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_pocket_normal", - "pattern": [ - "#", - "T" - ], - "key": { - "#": { "item": "computercraft:wireless_modem_advanced" }, - "T": { "item": "computercraft:pocket_computer_normal" } - }, - "result": { "item": "computercraft:pocket_computer_normal", "nbt": { "Upgrade": "computercraft:wireless_modem_advanced" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_normal.json b/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_normal.json deleted file mode 100644 index 85e7a1d5f..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_normal.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_pocket_normal", - "pattern": [ - "#", - "T" - ], - "key": { - "#": { "item": "computercraft:wireless_modem_normal" }, - "T": { "item": "computercraft:pocket_computer_normal" } - }, - "result": { "item": "computercraft:pocket_computer_normal", "nbt": { "Upgrade": "computercraft:wireless_modem_normal" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_speaker.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_speaker.json deleted file mode 100644 index fe43a6734..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_speaker.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "computercraft:speaker" }, - "T": { "item": "computercraft:turtle_advanced" } - }, - "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "computercraft:speaker" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_advanced.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_advanced.json deleted file mode 100644 index a6af8052c..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_advanced.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "computercraft:wireless_modem_advanced" }, - "T": { "item": "computercraft:turtle_advanced" } - }, - "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "computercraft:wireless_modem_advanced" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_normal.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_normal.json deleted file mode 100644 index 564e31980..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_normal.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "computercraft:wireless_modem_normal" }, - "T": { "item": "computercraft:turtle_advanced" } - }, - "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "computercraft:wireless_modem_normal" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_crafting_table.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_crafting_table.json deleted file mode 100644 index 3e44088ca..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:crafting_table" }, - "T": { "item": "computercraft:turtle_advanced" } - }, - "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "minecraft:crafting_table" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_axe.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_axe.json deleted file mode 100644 index 9727781b2..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_axe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_axe" }, - "T": { "item": "computercraft:turtle_advanced" } - }, - "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "minecraft:diamond_axe" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_hoe.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_hoe.json deleted file mode 100644 index a36a0b9f5..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_hoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_hoe" }, - "T": { "item": "computercraft:turtle_advanced" } - }, - "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "minecraft:diamond_hoe" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_pickaxe.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_pickaxe.json deleted file mode 100644 index 27da4aabd..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_pickaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_pickaxe" }, - "T": { "item": "computercraft:turtle_advanced" } - }, - "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "minecraft:diamond_pickaxe" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_shovel.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_shovel.json deleted file mode 100644 index 72bc79f11..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_shovel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_shovel" }, - "T": { "item": "computercraft:turtle_advanced" } - }, - "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "minecraft:diamond_shovel" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_sword.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_sword.json deleted file mode 100644 index 3035c91e0..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_sword.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_sword" }, - "T": { "item": "computercraft:turtle_advanced" } - }, - "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "minecraft:diamond_sword" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_speaker.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_speaker.json deleted file mode 100644 index 20788c88d..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_speaker.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "computercraft:speaker" }, - "T": { "item": "computercraft:turtle_normal" } - }, - "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "computercraft:speaker" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_advanced.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_advanced.json deleted file mode 100644 index b7b7e6ef1..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_advanced.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "computercraft:wireless_modem_advanced" }, - "T": { "item": "computercraft:turtle_normal" } - }, - "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "computercraft:wireless_modem_advanced" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_normal.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_normal.json deleted file mode 100644 index 5722d7029..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_normal.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "computercraft:wireless_modem_normal" }, - "T": { "item": "computercraft:turtle_normal" } - }, - "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "computercraft:wireless_modem_normal" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_crafting_table.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_crafting_table.json deleted file mode 100644 index 14c8f23e3..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:crafting_table" }, - "T": { "item": "computercraft:turtle_normal" } - }, - "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "minecraft:crafting_table" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_axe.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_axe.json deleted file mode 100644 index e0c2104d2..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_axe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_axe" }, - "T": { "item": "computercraft:turtle_normal" } - }, - "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "minecraft:diamond_axe" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_hoe.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_hoe.json deleted file mode 100644 index 981e41774..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_hoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_hoe" }, - "T": { "item": "computercraft:turtle_normal" } - }, - "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "minecraft:diamond_hoe" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_pickaxe.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_pickaxe.json deleted file mode 100644 index 459ca8233..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_pickaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_pickaxe" }, - "T": { "item": "computercraft:turtle_normal" } - }, - "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "minecraft:diamond_pickaxe" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_shovel.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_shovel.json deleted file mode 100644 index fc414008b..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_shovel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_shovel" }, - "T": { "item": "computercraft:turtle_normal" } - }, - "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "minecraft:diamond_shovel" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_sword.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_sword.json deleted file mode 100644 index 0c2321121..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_sword.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "minecraft:diamond_sword" }, - "T": { "item": "computercraft:turtle_normal" } - }, - "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "minecraft:diamond_sword" } } -} diff --git a/tools/disk_recipe.json b/tools/disk_recipe.json deleted file mode 100644 index c6a67ab7a..000000000 --- a/tools/disk_recipe.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "computercraft:impostor_shapeless", - "group": "computercraft:disk", - "ingredients": [ - { "tag": "forge:dusts/redstone" }, - { "item": "minecraft:paper" }, - { "item": "${dye}" } - ], - "result": { "item": "computercraft:disk", "nbt": { "color": ${colour} } } -} diff --git a/tools/pocket_upgrade_advancement.json b/tools/pocket_upgrade_advancement.json deleted file mode 100644 index 2fd25329f..000000000 --- a/tools/pocket_upgrade_advancement.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:${path}" ] - }, - "criteria": { - "has_items": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { "item": "computercraft:pocket_computer_${pocket_family}" }, - { "item": "${upgrade_item}" } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:${path}" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/tools/pocket_upgrade_recipe.json b/tools/pocket_upgrade_recipe.json deleted file mode 100644 index 354015b2a..000000000 --- a/tools/pocket_upgrade_recipe.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_pocket_${pocket_family}", - "pattern": [ - "#", - "T" - ], - "key": { - "#": { "item": "${upgrade_item}" }, - "T": { "item": "computercraft:pocket_computer_${pocket_family}" } - }, - "result": { "item": "computercraft:pocket_computer_${pocket_family}", "nbt": { "Upgrade": "${upgrade_id}" } } -} diff --git a/tools/recipes.lua b/tools/recipes.lua deleted file mode 100644 index d2c007523..000000000 --- a/tools/recipes.lua +++ /dev/null @@ -1,136 +0,0 @@ ---- Generates impostor recipes and advancements for several dynamic recipes. --- --- Namely: --- - Turtle upgrades --- - Pocket upgrades --- - Disk (each colour) --- --- Note, this is largely intended for the recipe book, as that requires a fixed --- set of recipes. - ---- All turtle upgrades, and an optional item for this upgrade. -local turtle_upgrades = { - { "computercraft:wireless_modem_normal" }, - { "computercraft:wireless_modem_advanced" }, - { "computercraft:speaker" }, - { "minecraft:crafting_table" }, - { "minecraft:diamond_sword" }, - { "minecraft:diamond_shovel" }, - { "minecraft:diamond_pickaxe" }, - { "minecraft:diamond_axe" }, - { "minecraft:diamond_hoe" }, -} - ---- All pocket upgrades, and an optional item for this upgrade. -local pocket_upgrades = { - { "computercraft:wireless_modem_normal" }, - { "computercraft:wireless_modem_advanced" }, - { "computercraft:speaker" }, -} - ---- All dye/disk colours -local colours = { - { 0x111111, "minecraft:black_dye" }, - { 0xcc4c4c, "minecraft:red_dye" }, - { 0x57A64E, "minecraft:green_dye" }, - { 0x7f664c, "minecraft:brown_dye" }, - { 0x3366cc, "minecraft:blue_dye" }, - { 0xb266e5, "minecraft:purple_dye" }, - { 0x4c99b2, "minecraft:cyan_dye" }, - { 0x999999, "minecraft:light_gray_dye" }, - { 0x4c4c4c, "minecraft:gray_dye" }, - { 0xf2b2cc, "minecraft:pink_dye" }, - { 0x7fcc19, "minecraft:lime_dye" }, - { 0xdede6c, "minecraft:yellow_dye" }, - { 0x99b2f2, "minecraft:light_blue_dye" }, - { 0xe57fd8, "minecraft:magenta_dye" }, - { 0xf2b233, "minecraft:orange_dye" }, - { 0xf0f0f0, "minecraft:white_dye" }, -} - ---- Read the provided file into a string, exiting the program if not found. --- --- @tparam string file The file to read --- @treturn string The file's contents -local function read_all(file) - local h, e = io.open(file, "rb") - if not h then - io.stderr:write("Cannot open " .. file .. ": " .. tostring(e)) - os.exit(1) - end - - local c = h:read "*a" - h:close() - return c -end - ---- Write the provided string into a file, exiting on failure. --- --- @tparam string file The file to read --- @tparam string contents The new contents -local function write_all(file, contents) - local h, e = io.open(file, "wb") - if not h then - io.stderr:write("Cannot open " .. file .. ": " .. tostring(e)) - os.exit(1) - end - - h:write(contents) - h:close() -end - ---- Format template strings of the form `${key}` using the given substituion --- table. -local function template(str, subs) - return str:gsub("%$%{([^}]+)%}", function(k) - return subs[k] or error("Unknown key " .. k) - end) -end - --- Write turtle upgrades -local turtle_recipe = read_all "tools/turtle_upgrade_recipe.json" -local turtle_advance = read_all "tools/turtle_upgrade_advancement.json" -for _, turtle_family in ipairs { "normal", "advanced" } do - for _, upgrade in ipairs(turtle_upgrades) do - local upgrade_id, upgrade_item = upgrade[1], upgrade[2] or upgrade[1] - local path = ("generated/turtle_%s/%s"):format(turtle_family, (upgrade_id:gsub(":", "_"))) - local keys = { - upgrade_id = upgrade_id, upgrade_item = upgrade_item, - turtle_family = turtle_family, - path = path, - } - - write_all("src/main/resources/data/computercraft/recipes/" .. path .. ".json", template(turtle_recipe, keys)) - write_all("src/main/resources/data/computercraft/advancements/recipes/" .. path .. ".json", template(turtle_advance, keys)) - end -end - --- Write pocket upgrades -local pocket_recipe = read_all "tools/pocket_upgrade_recipe.json" -local pocket_advance = read_all "tools/pocket_upgrade_advancement.json" -for _, pocket_family in ipairs { "normal", "advanced" } do - for _, upgrade in ipairs(pocket_upgrades) do - local upgrade_id, upgrade_item = upgrade[1], upgrade[2] or upgrade[1] - local path = ("generated/pocket_%s/%s"):format(pocket_family, (upgrade_id:gsub(":", "_"))) - local keys = { - upgrade_id = upgrade_id, upgrade_item = upgrade_item, - pocket_family = pocket_family, - path = path, - } - - write_all("src/main/resources/data/computercraft/recipes/" .. path .. ".json", template(pocket_recipe, keys)) - write_all("src/main/resources/data/computercraft/advancements/recipes/" .. path .. ".json", template(pocket_advance, keys)) - end -end - --- Write disk recipe -local disk_recipe = read_all "tools/disk_recipe.json" -for i, colour in ipairs(colours) do - local path = ("generated/disk/disk_%s"):format(i) - local keys = { - dye = colour[2], colour = colour[1], - path = path, - } - - write_all("src/main/resources/data/computercraft/recipes/" .. path .. ".json", template(disk_recipe, keys)) -end diff --git a/tools/turtle_upgrade_advancement.json b/tools/turtle_upgrade_advancement.json deleted file mode 100644 index c671f4874..000000000 --- a/tools/turtle_upgrade_advancement.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:${path}" ] - }, - "criteria": { - "has_items": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { "item": "computercraft:turtle_${turtle_family}" }, - { "item": "${upgrade_item}" } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:${path}" } - } - }, - "requirements": [ [ "has_items", "has_the_recipe" ] ] -} diff --git a/tools/turtle_upgrade_recipe.json b/tools/turtle_upgrade_recipe.json deleted file mode 100644 index d81b346cd..000000000 --- a/tools/turtle_upgrade_recipe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_${turtle_family}", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "${upgrade_item}" }, - "T": { "item": "computercraft:turtle_${turtle_family}" } - }, - "result": { "item": "computercraft:turtle_${turtle_family}", "nbt": { "RightUpgrade": "${upgrade_id}" } } -}