From 419f29321adbc1bb5370788cf5e83b23f1827656 Mon Sep 17 00:00:00 2001 From: SquidDev Date: Sat, 8 Feb 2020 23:26:05 +0000 Subject: [PATCH] Port most recipes to use generators Closes #354 --- .../recipes/computercraft/cable.json | 43 ++++ .../computercraft/computer_advanced.json | 35 ++++ .../computercraft/computer_command.json | 32 +++ .../computercraft/computer_normal.json | 32 +++ .../recipes/computercraft/disk_drive.json | 32 +++ .../computercraft/monitor_advanced.json | 32 +++ .../recipes/computercraft/monitor_normal.json | 32 +++ .../pocket_computer_advanced.json | 43 ++++ .../computercraft/pocket_computer_normal.json | 43 ++++ .../recipes/computercraft/printer.json | 32 +++ .../recipes/computercraft/speaker.json | 32 +++ .../recipes/computercraft/wired_modem.json | 43 ++++ .../computercraft/wired_modem_full_from.json | 32 +++ .../computercraft/wired_modem_full_to.json | 32 +++ .../wireless_modem_advanced.json | 43 ++++ .../computercraft/wireless_modem_normal.json | 32 +++ .../data/computercraft/recipes/cable.json | 20 ++ .../recipes/computer_advanced.json | 22 ++ .../recipes/computer_command.json | 22 ++ .../recipes/computer_normal.json | 22 ++ .../computercraft/recipes/disk_drive.json | 19 ++ .../recipes/monitor_advanced.json | 20 ++ .../computercraft/recipes/monitor_normal.json | 19 ++ .../recipes/pocket_computer_advanced.json | 22 ++ .../recipes/pocket_computer_normal.json | 22 ++ .../data/computercraft/recipes/printer.json | 22 ++ .../data/computercraft/recipes/speaker.json | 22 ++ .../computercraft/recipes/wired_modem.json | 19 ++ .../recipes/wired_modem_full_from.json | 11 + .../recipes/wired_modem_full_to.json | 11 + .../recipes/wireless_modem_advanced.json | 19 ++ .../recipes/wireless_modem_normal.json | 19 ++ .../computercraft/tags/items/computer.json | 8 + .../computercraft/tags/items/monitor.json | 7 + .../data/computercraft/tags/items/turtle.json | 7 + .../computercraft/tags/items/wired_modem.json | 7 + .../dan200/computercraft/data/Generators.java | 1 + .../dan200/computercraft/data/Recipes.java | 193 +++++++++++++++++- .../java/dan200/computercraft/data/Tags.java | 52 +++++ .../advancements/recipes/cable.json | 38 ---- .../recipes/command_computer.json | 24 --- .../recipes/computer_advanced.json | 24 --- .../advancements/recipes/computer_normal.json | 24 --- .../advancements/recipes/disk_drive.json | 31 --- .../recipes/monitor_advanced.json | 31 --- .../advancements/recipes/monitor_normal.json | 31 --- .../recipes/pocket_computer_advanced.json | 38 ---- .../recipes/pocket_computer_normal.json | 38 ---- .../advancements/recipes/printer.json | 31 --- .../advancements/recipes/speaker.json | 38 ---- .../recipes/wireless_modem_advanced.json | 38 ---- .../recipes/wireless_modem_normal.json | 31 --- .../data/computercraft/recipes/cable.json | 13 -- .../recipes/computer_advanced.json | 14 -- .../recipes/computer_command.json | 14 -- .../recipes/computer_normal.json | 14 -- .../computercraft/recipes/disk_drive.json | 13 -- .../recipes/monitor_advanced.json | 13 -- .../computercraft/recipes/monitor_normal.json | 13 -- .../recipes/pocket_computer_advanced.json | 14 -- .../recipes/pocket_computer_normal.json | 14 -- .../data/computercraft/recipes/printer.json | 14 -- .../data/computercraft/recipes/speaker.json | 14 -- .../computercraft/recipes/wired_modem.json | 13 -- .../recipes/wired_modem_full_from.json | 7 - .../recipes/wired_modem_full_to.json | 7 - .../recipes/wireless_modem_advanced.json | 13 -- .../recipes/wireless_modem_normal.json | 13 -- 68 files changed, 1149 insertions(+), 627 deletions(-) create mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/cable.json create mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_advanced.json create mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_command.json create mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_normal.json create mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_drive.json create mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/monitor_advanced.json create mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/monitor_normal.json create mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_advanced.json create mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_normal.json create mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/printer.json create mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/speaker.json create mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem.json create mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem_full_from.json create mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem_full_to.json create mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/wireless_modem_advanced.json create mode 100644 src/generated/resources/data/computercraft/advancements/recipes/computercraft/wireless_modem_normal.json create mode 100644 src/generated/resources/data/computercraft/recipes/cable.json create mode 100644 src/generated/resources/data/computercraft/recipes/computer_advanced.json create mode 100644 src/generated/resources/data/computercraft/recipes/computer_command.json create mode 100644 src/generated/resources/data/computercraft/recipes/computer_normal.json create mode 100644 src/generated/resources/data/computercraft/recipes/disk_drive.json create mode 100644 src/generated/resources/data/computercraft/recipes/monitor_advanced.json create mode 100644 src/generated/resources/data/computercraft/recipes/monitor_normal.json create mode 100644 src/generated/resources/data/computercraft/recipes/pocket_computer_advanced.json create mode 100644 src/generated/resources/data/computercraft/recipes/pocket_computer_normal.json create mode 100644 src/generated/resources/data/computercraft/recipes/printer.json create mode 100644 src/generated/resources/data/computercraft/recipes/speaker.json create mode 100644 src/generated/resources/data/computercraft/recipes/wired_modem.json create mode 100644 src/generated/resources/data/computercraft/recipes/wired_modem_full_from.json create mode 100644 src/generated/resources/data/computercraft/recipes/wired_modem_full_to.json create mode 100644 src/generated/resources/data/computercraft/recipes/wireless_modem_advanced.json create mode 100644 src/generated/resources/data/computercraft/recipes/wireless_modem_normal.json create mode 100644 src/generated/resources/data/computercraft/tags/items/computer.json create mode 100644 src/generated/resources/data/computercraft/tags/items/monitor.json create mode 100644 src/generated/resources/data/computercraft/tags/items/turtle.json create mode 100644 src/generated/resources/data/computercraft/tags/items/wired_modem.json create mode 100644 src/main/java/dan200/computercraft/data/Tags.java delete mode 100644 src/main/resources/data/computercraft/advancements/recipes/cable.json delete mode 100644 src/main/resources/data/computercraft/advancements/recipes/command_computer.json delete mode 100644 src/main/resources/data/computercraft/advancements/recipes/computer_advanced.json delete mode 100644 src/main/resources/data/computercraft/advancements/recipes/computer_normal.json delete mode 100644 src/main/resources/data/computercraft/advancements/recipes/disk_drive.json delete mode 100644 src/main/resources/data/computercraft/advancements/recipes/monitor_advanced.json delete mode 100644 src/main/resources/data/computercraft/advancements/recipes/monitor_normal.json delete mode 100644 src/main/resources/data/computercraft/advancements/recipes/pocket_computer_advanced.json delete mode 100644 src/main/resources/data/computercraft/advancements/recipes/pocket_computer_normal.json delete mode 100644 src/main/resources/data/computercraft/advancements/recipes/printer.json delete mode 100644 src/main/resources/data/computercraft/advancements/recipes/speaker.json delete mode 100644 src/main/resources/data/computercraft/advancements/recipes/wireless_modem_advanced.json delete mode 100644 src/main/resources/data/computercraft/advancements/recipes/wireless_modem_normal.json delete mode 100644 src/main/resources/data/computercraft/recipes/cable.json delete mode 100644 src/main/resources/data/computercraft/recipes/computer_advanced.json delete mode 100644 src/main/resources/data/computercraft/recipes/computer_command.json delete mode 100644 src/main/resources/data/computercraft/recipes/computer_normal.json delete mode 100644 src/main/resources/data/computercraft/recipes/disk_drive.json delete mode 100644 src/main/resources/data/computercraft/recipes/monitor_advanced.json delete mode 100644 src/main/resources/data/computercraft/recipes/monitor_normal.json delete mode 100644 src/main/resources/data/computercraft/recipes/pocket_computer_advanced.json delete mode 100644 src/main/resources/data/computercraft/recipes/pocket_computer_normal.json delete mode 100644 src/main/resources/data/computercraft/recipes/printer.json delete mode 100644 src/main/resources/data/computercraft/recipes/speaker.json delete mode 100644 src/main/resources/data/computercraft/recipes/wired_modem.json delete mode 100644 src/main/resources/data/computercraft/recipes/wired_modem_full_from.json delete mode 100644 src/main/resources/data/computercraft/recipes/wired_modem_full_to.json delete mode 100644 src/main/resources/data/computercraft/recipes/wireless_modem_advanced.json delete mode 100644 src/main/resources/data/computercraft/recipes/wireless_modem_normal.json diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/cable.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/cable.json new file mode 100644 index 000000000..69ed2c857 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/cable.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "computercraft:cable" + ] + }, + "criteria": { + "has_computer": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "computercraft:computer" + } + ] + } + }, + "has_modem": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "computercraft:computer" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "computercraft:cable" + } + } + }, + "requirements": [ + [ + "has_computer", + "has_modem", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_advanced.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_advanced.json new file mode 100644 index 000000000..2f4cebec8 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_advanced.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "computercraft:computer_advanced" + ] + }, + "criteria": { + "has_components": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:redstone" + }, + { + "item": "minecraft:gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "computercraft:computer_advanced" + } + } + }, + "requirements": [ + [ + "has_components", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_command.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_command.json new file mode 100644 index 000000000..82a335701 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_command.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "computercraft:computer_command" + ] + }, + "criteria": { + "has_components": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:command_block" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "computercraft:computer_command" + } + } + }, + "requirements": [ + [ + "has_components", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_normal.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_normal.json new file mode 100644 index 000000000..df587895f --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_normal.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "computercraft:computer_normal" + ] + }, + "criteria": { + "has_redstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:dusts/redstone" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "computercraft:computer_normal" + } + } + }, + "requirements": [ + [ + "has_redstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_drive.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_drive.json new file mode 100644 index 000000000..7fb18766e --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_drive.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "computercraft:disk_drive" + ] + }, + "criteria": { + "has_computer": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "computercraft:computer" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "computercraft:disk_drive" + } + } + }, + "requirements": [ + [ + "has_computer", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/monitor_advanced.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/monitor_advanced.json new file mode 100644 index 000000000..dab4faad3 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/monitor_advanced.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "computercraft:monitor_advanced" + ] + }, + "criteria": { + "has_computer": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "computercraft:computer" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "computercraft:monitor_advanced" + } + } + }, + "requirements": [ + [ + "has_computer", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/monitor_normal.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/monitor_normal.json new file mode 100644 index 000000000..fdd3c274c --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/monitor_normal.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "computercraft:monitor_normal" + ] + }, + "criteria": { + "has_computer": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "computercraft:computer" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "computercraft:monitor_normal" + } + } + }, + "requirements": [ + [ + "has_computer", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_advanced.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_advanced.json new file mode 100644 index 000000000..468d54cc9 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_advanced.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "computercraft:pocket_computer_advanced" + ] + }, + "criteria": { + "has_computer": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "computercraft:computer" + } + ] + } + }, + "has_apple": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:golden_apple" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "computercraft:pocket_computer_advanced" + } + } + }, + "requirements": [ + [ + "has_computer", + "has_apple", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_normal.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_normal.json new file mode 100644 index 000000000..4d40913a7 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_normal.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "computercraft:pocket_computer_normal" + ] + }, + "criteria": { + "has_computer": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "computercraft:computer" + } + ] + } + }, + "has_apple": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:golden_apple" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "computercraft:pocket_computer_normal" + } + } + }, + "requirements": [ + [ + "has_computer", + "has_apple", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printer.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printer.json new file mode 100644 index 000000000..08a2ffeba --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "computercraft:printer" + ] + }, + "criteria": { + "has_computer": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "computercraft:computer" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "computercraft:printer" + } + } + }, + "requirements": [ + [ + "has_computer", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/speaker.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/speaker.json new file mode 100644 index 000000000..194f7caec --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/speaker.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "computercraft:speaker" + ] + }, + "criteria": { + "has_computer": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "computercraft:computer" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "computercraft:speaker" + } + } + }, + "requirements": [ + [ + "has_computer", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem.json new file mode 100644 index 000000000..f78501816 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "computercraft:wired_modem" + ] + }, + "criteria": { + "has_computer": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "computercraft:computer" + } + ] + } + }, + "has_cable": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "computercraft:cable" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "computercraft:wired_modem" + } + } + }, + "requirements": [ + [ + "has_computer", + "has_cable", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem_full_from.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem_full_from.json new file mode 100644 index 000000000..a54c82034 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem_full_from.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "computercraft:wired_modem_full_from" + ] + }, + "criteria": { + "has_modem": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "computercraft:wired_modem" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "computercraft:wired_modem_full_from" + } + } + }, + "requirements": [ + [ + "has_modem", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem_full_to.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem_full_to.json new file mode 100644 index 000000000..c0eaec110 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem_full_to.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "computercraft:wired_modem_full_to" + ] + }, + "criteria": { + "has_modem": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "computercraft:wired_modem" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "computercraft:wired_modem_full_to" + } + } + }, + "requirements": [ + [ + "has_modem", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wireless_modem_advanced.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wireless_modem_advanced.json new file mode 100644 index 000000000..5941483e3 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wireless_modem_advanced.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "computercraft:wireless_modem_advanced" + ] + }, + "criteria": { + "has_computer": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "computercraft:computer" + } + ] + } + }, + "has_wireless": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "computercraft:wireless_modem_normal" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "computercraft:wireless_modem_advanced" + } + } + }, + "requirements": [ + [ + "has_computer", + "has_wireless", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wireless_modem_normal.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wireless_modem_normal.json new file mode 100644 index 000000000..b0ce1c994 --- /dev/null +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wireless_modem_normal.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "computercraft:wireless_modem_normal" + ] + }, + "criteria": { + "has_computer": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "computercraft:computer" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "computercraft:wireless_modem_normal" + } + } + }, + "requirements": [ + [ + "has_computer", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/cable.json b/src/generated/resources/data/computercraft/recipes/cable.json new file mode 100644 index 000000000..357212509 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/cable.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " # ", + "#R#", + " # " + ], + "key": { + "#": { + "tag": "forge:stone" + }, + "R": { + "tag": "forge:dusts/redstone" + } + }, + "result": { + "item": "computercraft:cable", + "count": 6 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/computer_advanced.json b/src/generated/resources/data/computercraft/recipes/computer_advanced.json new file mode 100644 index 000000000..d004a6c78 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/computer_advanced.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#R#", + "#G#" + ], + "key": { + "#": { + "tag": "forge:ingots/gold" + }, + "R": { + "tag": "forge:dusts/redstone" + }, + "G": { + "tag": "forge:glass_panes" + } + }, + "result": { + "item": "computercraft:computer_advanced" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/computer_command.json b/src/generated/resources/data/computercraft/recipes/computer_command.json new file mode 100644 index 000000000..c3f71b49b --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/computer_command.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#R#", + "#G#" + ], + "key": { + "#": { + "tag": "forge:ingots/gold" + }, + "R": { + "item": "minecraft:command_block" + }, + "G": { + "tag": "forge:glass_panes" + } + }, + "result": { + "item": "computercraft:computer_command" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/computer_normal.json b/src/generated/resources/data/computercraft/recipes/computer_normal.json new file mode 100644 index 000000000..661f4945f --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/computer_normal.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#R#", + "#G#" + ], + "key": { + "#": { + "tag": "forge:stone" + }, + "R": { + "tag": "forge:dusts/redstone" + }, + "G": { + "tag": "forge:glass_panes" + } + }, + "result": { + "item": "computercraft:computer_normal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_drive.json b/src/generated/resources/data/computercraft/recipes/disk_drive.json new file mode 100644 index 000000000..a217fc712 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/disk_drive.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#R#", + "#R#" + ], + "key": { + "#": { + "tag": "forge:stone" + }, + "R": { + "tag": "forge:dusts/redstone" + } + }, + "result": { + "item": "computercraft:disk_drive" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/monitor_advanced.json b/src/generated/resources/data/computercraft/recipes/monitor_advanced.json new file mode 100644 index 000000000..7588676cd --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/monitor_advanced.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#G#", + "###" + ], + "key": { + "#": { + "tag": "forge:ingots/gold" + }, + "G": { + "tag": "forge:glass_panes" + } + }, + "result": { + "item": "computercraft:monitor_advanced", + "count": 4 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/monitor_normal.json b/src/generated/resources/data/computercraft/recipes/monitor_normal.json new file mode 100644 index 000000000..2ded57d08 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/monitor_normal.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#G#", + "###" + ], + "key": { + "#": { + "tag": "forge:stone" + }, + "G": { + "tag": "forge:glass_panes" + } + }, + "result": { + "item": "computercraft:monitor_normal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_computer_advanced.json b/src/generated/resources/data/computercraft/recipes/pocket_computer_advanced.json new file mode 100644 index 000000000..b8c65358d --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_computer_advanced.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#A#", + "#G#" + ], + "key": { + "#": { + "tag": "forge:ingots/gold" + }, + "A": { + "item": "minecraft:golden_apple" + }, + "G": { + "tag": "forge:glass_panes" + } + }, + "result": { + "item": "computercraft:pocket_computer_advanced" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/pocket_computer_normal.json b/src/generated/resources/data/computercraft/recipes/pocket_computer_normal.json new file mode 100644 index 000000000..c18f0252a --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/pocket_computer_normal.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#A#", + "#G#" + ], + "key": { + "#": { + "tag": "forge:stone" + }, + "A": { + "item": "minecraft:golden_apple" + }, + "G": { + "tag": "forge:glass_panes" + } + }, + "result": { + "item": "computercraft:pocket_computer_normal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/printer.json b/src/generated/resources/data/computercraft/recipes/printer.json new file mode 100644 index 000000000..5f0072676 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/printer.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#R#", + "#D#" + ], + "key": { + "#": { + "tag": "forge:stone" + }, + "R": { + "tag": "forge:dusts/redstone" + }, + "D": { + "tag": "forge:dyes" + } + }, + "result": { + "item": "computercraft:printer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/speaker.json b/src/generated/resources/data/computercraft/recipes/speaker.json new file mode 100644 index 000000000..c1ede5db7 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/speaker.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#N#", + "#R#" + ], + "key": { + "#": { + "tag": "forge:stone" + }, + "N": { + "item": "minecraft:note_block" + }, + "R": { + "tag": "forge:dusts/redstone" + } + }, + "result": { + "item": "computercraft:speaker" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/wired_modem.json b/src/generated/resources/data/computercraft/recipes/wired_modem.json new file mode 100644 index 000000000..7494043b4 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/wired_modem.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#R#", + "###" + ], + "key": { + "#": { + "tag": "forge:stone" + }, + "R": { + "tag": "forge:dusts/redstone" + } + }, + "result": { + "item": "computercraft:wired_modem" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/wired_modem_full_from.json b/src/generated/resources/data/computercraft/recipes/wired_modem_full_from.json new file mode 100644 index 000000000..7865f45de --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/wired_modem_full_from.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "computercraft:wired_modem" + } + ], + "result": { + "item": "computercraft:wired_modem_full" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/wired_modem_full_to.json b/src/generated/resources/data/computercraft/recipes/wired_modem_full_to.json new file mode 100644 index 000000000..8c303ebb4 --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/wired_modem_full_to.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "computercraft:wired_modem_full" + } + ], + "result": { + "item": "computercraft:wired_modem" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/wireless_modem_advanced.json b/src/generated/resources/data/computercraft/recipes/wireless_modem_advanced.json new file mode 100644 index 000000000..a274aa73d --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/wireless_modem_advanced.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#E#", + "###" + ], + "key": { + "#": { + "tag": "forge:ingots/gold" + }, + "E": { + "item": "minecraft:ender_eye" + } + }, + "result": { + "item": "computercraft:wireless_modem_advanced" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/wireless_modem_normal.json b/src/generated/resources/data/computercraft/recipes/wireless_modem_normal.json new file mode 100644 index 000000000..e2041f59e --- /dev/null +++ b/src/generated/resources/data/computercraft/recipes/wireless_modem_normal.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#E#", + "###" + ], + "key": { + "#": { + "tag": "forge:stone" + }, + "E": { + "tag": "forge:ender_pearls" + } + }, + "result": { + "item": "computercraft:wireless_modem_normal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/tags/items/computer.json b/src/generated/resources/data/computercraft/tags/items/computer.json new file mode 100644 index 000000000..bcd0e8037 --- /dev/null +++ b/src/generated/resources/data/computercraft/tags/items/computer.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "computercraft:computer_normal", + "computercraft:computer_advanced", + "computercraft:computer_command" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/tags/items/monitor.json b/src/generated/resources/data/computercraft/tags/items/monitor.json new file mode 100644 index 000000000..babaefa8b --- /dev/null +++ b/src/generated/resources/data/computercraft/tags/items/monitor.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "computercraft:monitor_normal", + "computercraft:monitor_advanced" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/tags/items/turtle.json b/src/generated/resources/data/computercraft/tags/items/turtle.json new file mode 100644 index 000000000..e4277edfe --- /dev/null +++ b/src/generated/resources/data/computercraft/tags/items/turtle.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "computercraft:turtle_normal", + "computercraft:turtle_advanced" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/tags/items/wired_modem.json b/src/generated/resources/data/computercraft/tags/items/wired_modem.json new file mode 100644 index 000000000..57db1557f --- /dev/null +++ b/src/generated/resources/data/computercraft/tags/items/wired_modem.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "computercraft:wired_modem", + "computercraft:wired_modem_full" + ] +} \ 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 index 1506661a1..69ef83b78 100644 --- a/src/main/java/dan200/computercraft/data/Generators.java +++ b/src/main/java/dan200/computercraft/data/Generators.java @@ -23,5 +23,6 @@ public static void gather( GatherDataEvent event ) DataGenerator generator = event.getGenerator(); generator.addProvider( new Recipes( generator ) ); generator.addProvider( new LootTables( generator ) ); + generator.addProvider( new Tags( generator ) ); } } diff --git a/src/main/java/dan200/computercraft/data/Recipes.java b/src/main/java/dan200/computercraft/data/Recipes.java index 7146e829d..9523d80ac 100644 --- a/src/main/java/dan200/computercraft/data/Recipes.java +++ b/src/main/java/dan200/computercraft/data/Recipes.java @@ -7,6 +7,7 @@ package dan200.computercraft.data; import dan200.computercraft.ComputerCraft; +import dan200.computercraft.data.Tags.CCTags; import dan200.computercraft.shared.TurtleUpgrades; import dan200.computercraft.shared.computer.core.ComputerFamily; import dan200.computercraft.shared.pocket.items.PocketComputerItemFactory; @@ -15,11 +16,12 @@ import dan200.computercraft.shared.util.ImpostorRecipe; import dan200.computercraft.shared.util.ImpostorShapelessRecipe; import net.minecraft.advancements.criterion.InventoryChangeTrigger; +import net.minecraft.advancements.criterion.ItemPredicate; +import net.minecraft.block.Blocks; 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.item.*; +import net.minecraft.tags.Tag; +import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.Tags; @@ -37,6 +39,7 @@ public Recipes( DataGenerator generator ) @Override protected void registerRecipes( @Nonnull Consumer add ) { + basicRecipes( add ); diskColours( add ); pocketUpgrades( add ); turtleUpgrades( add ); @@ -57,7 +60,7 @@ private void diskColours( @Nonnull Consumer add ) .addIngredient( Items.PAPER ) .addIngredient( DyeItem.getItem( ofColour( colour ) ) ) .setGroup( "computercraft:disk" ) - .addCriterion( "has_drive", InventoryChangeTrigger.Instance.forItems( ComputerCraft.Blocks.diskDrive ) ) + .addCriterion( "has_drive", inventoryChange( ComputerCraft.Blocks.diskDrive ) ) .build( RecipeWrapper.wrap( ImpostorShapelessRecipe.SERIALIZER, add, x -> x.putInt( "color", colour.getHex() ) @@ -88,7 +91,7 @@ private void turtleUpgrades( @Nonnull Consumer add ) .key( '#', base.getItem() ) .key( 'T', upgrade.getCraftingItem().getItem() ) .addCriterion( "has_items", - InventoryChangeTrigger.Instance.forItems( base.getItem(), upgrade.getCraftingItem().getItem() ) ) + inventoryChange( base.getItem(), upgrade.getCraftingItem().getItem() ) ) .build( RecipeWrapper.wrap( ImpostorRecipe.SERIALIZER, add, result.getTag() ), new ResourceLocation( ComputerCraft.MOD_ID, String.format( "turtle_%s/%s/%s", @@ -123,7 +126,7 @@ private void pocketUpgrades( @Nonnull Consumer add ) .key( '#', base.getItem() ) .key( 'P', upgrade.getCraftingItem().getItem() ) .addCriterion( "has_items", - InventoryChangeTrigger.Instance.forItems( base.getItem(), upgrade.getCraftingItem().getItem() ) ) + inventoryChange( base.getItem(), upgrade.getCraftingItem().getItem() ) ) .build( RecipeWrapper.wrap( ImpostorRecipe.SERIALIZER, add, result.getTag() ), new ResourceLocation( ComputerCraft.MOD_ID, String.format( "pocket_%s/%s/%s", @@ -134,8 +137,184 @@ private void pocketUpgrades( @Nonnull Consumer add ) } } + private void basicRecipes( @Nonnull Consumer add ) + { + ShapedRecipeBuilder + .shapedRecipe( ComputerCraft.Items.cable, 6 ) + .patternLine( " # " ) + .patternLine( "#R#" ) + .patternLine( " # " ) + .key( '#', Tags.Items.STONE ) + .key( 'R', Tags.Items.DUSTS_REDSTONE ) + .addCriterion( "has_computer", inventoryChange( CCTags.COMPUTER ) ) + .addCriterion( "has_modem", inventoryChange( CCTags.COMPUTER ) ) + .build( add ); + + ShapedRecipeBuilder + .shapedRecipe( ComputerCraft.Blocks.computerNormal ) + .patternLine( "###" ) + .patternLine( "#R#" ) + .patternLine( "#G#" ) + .key( '#', Tags.Items.STONE ) + .key( 'R', Tags.Items.DUSTS_REDSTONE ) + .key( 'G', Tags.Items.GLASS_PANES ) + .addCriterion( "has_redstone", inventoryChange( Tags.Items.DUSTS_REDSTONE ) ) + .build( add ); + + ShapedRecipeBuilder + .shapedRecipe( ComputerCraft.Blocks.computerAdvanced ) + .patternLine( "###" ) + .patternLine( "#R#" ) + .patternLine( "#G#" ) + .key( '#', Tags.Items.INGOTS_GOLD ) + .key( 'R', Tags.Items.DUSTS_REDSTONE ) + .key( 'G', Tags.Items.GLASS_PANES ) + .addCriterion( "has_components", inventoryChange( Items.REDSTONE, Items.GOLD_INGOT ) ) + .build( add ); + + ShapedRecipeBuilder + .shapedRecipe( ComputerCraft.Blocks.computerCommand ) + .patternLine( "###" ) + .patternLine( "#R#" ) + .patternLine( "#G#" ) + .key( '#', Tags.Items.INGOTS_GOLD ) + .key( 'R', Blocks.COMMAND_BLOCK ) + .key( 'G', Tags.Items.GLASS_PANES ) + .addCriterion( "has_components", inventoryChange( Blocks.COMMAND_BLOCK ) ) + .build( add ); + + ShapedRecipeBuilder + .shapedRecipe( ComputerCraft.Blocks.diskDrive ) + .patternLine( "###" ) + .patternLine( "#R#" ) + .patternLine( "#R#" ) + .key( '#', Tags.Items.STONE ) + .key( 'R', Tags.Items.DUSTS_REDSTONE ) + .addCriterion( "has_computer", inventoryChange( CCTags.COMPUTER ) ) + .build( add ); + + ShapedRecipeBuilder + .shapedRecipe( ComputerCraft.Blocks.monitorNormal ) + .patternLine( "###" ) + .patternLine( "#G#" ) + .patternLine( "###" ) + .key( '#', Tags.Items.STONE ) + .key( 'G', Tags.Items.GLASS_PANES ) + .addCriterion( "has_computer", inventoryChange( CCTags.COMPUTER ) ) + .build( add ); + + ShapedRecipeBuilder + .shapedRecipe( ComputerCraft.Blocks.monitorAdvanced, 4 ) + .patternLine( "###" ) + .patternLine( "#G#" ) + .patternLine( "###" ) + .key( '#', Tags.Items.INGOTS_GOLD ) + .key( 'G', Tags.Items.GLASS_PANES ) + .addCriterion( "has_computer", inventoryChange( CCTags.COMPUTER ) ) + .build( add ); + + ShapedRecipeBuilder + .shapedRecipe( ComputerCraft.Items.pocketComputerNormal ) + .patternLine( "###" ) + .patternLine( "#A#" ) + .patternLine( "#G#" ) + .key( '#', Tags.Items.STONE ) + .key( 'A', Items.GOLDEN_APPLE ) + .key( 'G', Tags.Items.GLASS_PANES ) + .addCriterion( "has_computer", inventoryChange( CCTags.COMPUTER ) ) + .addCriterion( "has_apple", inventoryChange( Items.GOLDEN_APPLE ) ) + .build( add ); + + ShapedRecipeBuilder + .shapedRecipe( ComputerCraft.Items.pocketComputerAdvanced ) + .patternLine( "###" ) + .patternLine( "#A#" ) + .patternLine( "#G#" ) + .key( '#', Tags.Items.INGOTS_GOLD ) + .key( 'A', Items.GOLDEN_APPLE ) + .key( 'G', Tags.Items.GLASS_PANES ) + .addCriterion( "has_computer", inventoryChange( CCTags.COMPUTER ) ) + .addCriterion( "has_apple", inventoryChange( Items.GOLDEN_APPLE ) ) + .build( add ); + + ShapedRecipeBuilder + .shapedRecipe( ComputerCraft.Blocks.printer ) + .patternLine( "###" ) + .patternLine( "#R#" ) + .patternLine( "#D#" ) + .key( '#', Tags.Items.STONE ) + .key( 'R', Tags.Items.DUSTS_REDSTONE ) + .key( 'D', Tags.Items.DYES ) + .addCriterion( "has_computer", inventoryChange( CCTags.COMPUTER ) ) + .build( add ); + + ShapedRecipeBuilder + .shapedRecipe( ComputerCraft.Blocks.speaker ) + .patternLine( "###" ) + .patternLine( "#N#" ) + .patternLine( "#R#" ) + .key( '#', Tags.Items.STONE ) + .key( 'N', Blocks.NOTE_BLOCK ) + .key( 'R', Tags.Items.DUSTS_REDSTONE ) + .addCriterion( "has_computer", inventoryChange( CCTags.COMPUTER ) ) + .build( add ); + + ShapedRecipeBuilder + .shapedRecipe( ComputerCraft.Items.wiredModem ) + .patternLine( "###" ) + .patternLine( "#R#" ) + .patternLine( "###" ) + .key( '#', Tags.Items.STONE ) + .key( 'R', Tags.Items.DUSTS_REDSTONE ) + .addCriterion( "has_computer", inventoryChange( CCTags.COMPUTER ) ) + .addCriterion( "has_cable", inventoryChange( ComputerCraft.Items.cable ) ) + .build( add ); + + ShapelessRecipeBuilder + .shapelessRecipe( ComputerCraft.Blocks.wiredModemFull ) + .addIngredient( ComputerCraft.Items.wiredModem ) + .addCriterion( "has_modem", inventoryChange( CCTags.WIRED_MODEM ) ) + .build( add, new ResourceLocation( ComputerCraft.MOD_ID, "wired_modem_full_from" ) ); + ShapelessRecipeBuilder + .shapelessRecipe( ComputerCraft.Items.wiredModem ) + .addIngredient( ComputerCraft.Blocks.wiredModemFull ) + .addCriterion( "has_modem", inventoryChange( CCTags.WIRED_MODEM ) ) + .build( add, new ResourceLocation( ComputerCraft.MOD_ID, "wired_modem_full_to" ) ); + + ShapedRecipeBuilder + .shapedRecipe( ComputerCraft.Blocks.wirelessModemNormal ) + .patternLine( "###" ) + .patternLine( "#E#" ) + .patternLine( "###" ) + .key( '#', Tags.Items.STONE ) + .key( 'E', Tags.Items.ENDER_PEARLS ) + .addCriterion( "has_computer", inventoryChange( CCTags.COMPUTER ) ) + .build( add ); + + ShapedRecipeBuilder + .shapedRecipe( ComputerCraft.Blocks.wirelessModemAdvanced ) + .patternLine( "###" ) + .patternLine( "#E#" ) + .patternLine( "###" ) + .key( '#', Tags.Items.INGOTS_GOLD ) + .key( 'E', Items.ENDER_EYE ) + .addCriterion( "has_computer", inventoryChange( CCTags.COMPUTER ) ) + .addCriterion( "has_wireless", inventoryChange( ComputerCraft.Blocks.wirelessModemNormal ) ) + .build( add ); + } + private static DyeColor ofColour( Colour colour ) { return DyeColor.byId( 15 - colour.ordinal() ); } + + private static InventoryChangeTrigger.Instance inventoryChange( Tag stack ) + { + return InventoryChangeTrigger.Instance.forItems( ItemPredicate.Builder.create().tag( stack ).build() ); + } + + private static InventoryChangeTrigger.Instance inventoryChange( IItemProvider... stack ) + { + return InventoryChangeTrigger.Instance.forItems( stack ); + } } diff --git a/src/main/java/dan200/computercraft/data/Tags.java b/src/main/java/dan200/computercraft/data/Tags.java new file mode 100644 index 000000000..bc78e3e7b --- /dev/null +++ b/src/main/java/dan200/computercraft/data/Tags.java @@ -0,0 +1,52 @@ +/* + * 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 net.minecraft.data.DataGenerator; +import net.minecraft.data.ItemTagsProvider; +import net.minecraft.item.Item; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.Tag; +import net.minecraft.util.ResourceLocation; + +import static dan200.computercraft.data.Tags.CCTags.*; + +public class Tags extends ItemTagsProvider +{ + public static class CCTags + { + public static final Tag COMPUTER = item( "computer" ); + public static final Tag TURTLE = item( "turtle" ); + public static final Tag WIRED_MODEM = item( "wired_modem" ); + public static final Tag MONITOR = item( "monitor" ); + } + + public Tags( DataGenerator generator ) + { + super( generator ); + } + + @Override + protected void registerTags() + { + getBuilder( COMPUTER ) + .add( ComputerCraft.Items.computerNormal ) + .add( ComputerCraft.Items.computerAdvanced ) + .add( ComputerCraft.Items.computerCommand ); + getBuilder( TURTLE ).add( ComputerCraft.Items.turtleNormal, ComputerCraft.Items.turtleAdvanced ); + getBuilder( WIRED_MODEM ).add( ComputerCraft.Items.wiredModem, ComputerCraft.Blocks.wiredModemFull.asItem() ); + getBuilder( MONITOR ) + .add( ComputerCraft.Blocks.monitorNormal.asItem() ) + .add( ComputerCraft.Blocks.monitorAdvanced.asItem() ); + } + + private static Tag item( String name ) + { + return new ItemTags.Wrapper( new ResourceLocation( ComputerCraft.MOD_ID, name ) ); + } +} diff --git a/src/main/resources/data/computercraft/advancements/recipes/cable.json b/src/main/resources/data/computercraft/advancements/recipes/cable.json deleted file mode 100644 index e0aeae8ba..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/cable.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:cable" ] - }, - "criteria": { - "has_normal": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_normal" } ] - } - }, - "has_advanced": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_advanced" } ] - } - }, - "has_modem": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:cable" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:cable" } - } - }, - "requirements": [ - [ - "has_normal", - "has_advanced", - "has_modem", - "has_the_recipe" - ] - ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/command_computer.json b/src/main/resources/data/computercraft/advancements/recipes/command_computer.json deleted file mode 100644 index 692278666..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/command_computer.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:command_computer" ] - }, - "criteria": { - "has_redstone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "minecraft:command_block" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:command_computer" } - } - }, - "requirements": [ - [ - "has_redstone", - "has_the_recipe" - ] - ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/computer_advanced.json b/src/main/resources/data/computercraft/advancements/recipes/computer_advanced.json deleted file mode 100644 index fa3783c51..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/computer_advanced.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:advanced_computer" ] - }, - "criteria": { - "has_redstone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "tag": "forge:dusts/redstone" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:advanced_computer" } - } - }, - "requirements": [ - [ - "has_redstone", - "has_the_recipe" - ] - ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/computer_normal.json b/src/main/resources/data/computercraft/advancements/recipes/computer_normal.json deleted file mode 100644 index 1ad34028d..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/computer_normal.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:normal_computer" ] - }, - "criteria": { - "has_redstone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "tag": "forge:dusts/redstone" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:normal_computer" } - } - }, - "requirements": [ - [ - "has_redstone", - "has_the_recipe" - ] - ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/disk_drive.json b/src/main/resources/data/computercraft/advancements/recipes/disk_drive.json deleted file mode 100644 index b1225ca70..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/disk_drive.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:disk_drive" ] - }, - "criteria": { - "has_normal": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_normal" } ] - } - }, - "has_advanced": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_advanced" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:disk_drive" } - } - }, - "requirements": [ - [ - "has_normal", - "has_advanced", - "has_the_recipe" - ] - ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/monitor_advanced.json b/src/main/resources/data/computercraft/advancements/recipes/monitor_advanced.json deleted file mode 100644 index 270f01765..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/monitor_advanced.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:monitor_advanced" ] - }, - "criteria": { - "has_normal": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_normal" } ] - } - }, - "has_advanced": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_advanced" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:monitor_advanced" } - } - }, - "requirements": [ - [ - "has_normal", - "has_advanced", - "has_the_recipe" - ] - ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/monitor_normal.json b/src/main/resources/data/computercraft/advancements/recipes/monitor_normal.json deleted file mode 100644 index b1076ddf0..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/monitor_normal.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:normal_monitor" ] - }, - "criteria": { - "has_normal": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_normal" } ] - } - }, - "has_advanced": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_advanced" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:normal_monitor" } - } - }, - "requirements": [ - [ - "has_normal", - "has_advanced", - "has_the_recipe" - ] - ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/pocket_computer_advanced.json b/src/main/resources/data/computercraft/advancements/recipes/pocket_computer_advanced.json deleted file mode 100644 index b74f2d529..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/pocket_computer_advanced.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:pocket_computer_advanced" ] - }, - "criteria": { - "has_normal": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_normal" } ] - } - }, - "has_advanced": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_advanced" } ] - } - }, - "has_apple": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "minecraft:golden_apple" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:pocket_computer_advanced" } - } - }, - "requirements": [ - [ - "has_normal", - "has_advanced", - "has_apple", - "has_the_recipe" - ] - ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/pocket_computer_normal.json b/src/main/resources/data/computercraft/advancements/recipes/pocket_computer_normal.json deleted file mode 100644 index 02f6be078..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/pocket_computer_normal.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:normal_pocket_computer_normal" ] - }, - "criteria": { - "has_normal": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_normal" } ] - } - }, - "has_advanced": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_advanced" } ] - } - }, - "has_apple": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "minecraft:golden_apple" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:pocket_computer_normal" } - } - }, - "requirements": [ - [ - "has_normal", - "has_advanced", - "has_apple", - "has_the_recipe" - ] - ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/printer.json b/src/main/resources/data/computercraft/advancements/recipes/printer.json deleted file mode 100644 index 9e00f37a7..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/printer.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:printer" ] - }, - "criteria": { - "has_normal": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_normal" } ] - } - }, - "has_advanced": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_advanced" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:printer" } - } - }, - "requirements": [ - [ - "has_normal", - "has_advanced", - "has_the_recipe" - ] - ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/speaker.json b/src/main/resources/data/computercraft/advancements/recipes/speaker.json deleted file mode 100644 index 721c93595..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/speaker.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:speaker" ] - }, - "criteria": { - "has_normal": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_normal" } ] - } - }, - "has_advanced": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_advanced" } ] - } - }, - "has_noteblock": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "minecraft:note_block" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:speaker" } - } - }, - "requirements": [ - [ - "has_normal", - "has_advanced", - "has_noteblock", - "has_the_recipe" - ] - ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/wireless_modem_advanced.json b/src/main/resources/data/computercraft/advancements/recipes/wireless_modem_advanced.json deleted file mode 100644 index 8819a76f5..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/wireless_modem_advanced.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:wireless_modem_advanced" ] - }, - "criteria": { - "has_normal": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_normal" } ] - } - }, - "has_advanced": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_advanced" } ] - } - }, - "has_wireless": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:wireless_modem_normal" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:wireless_modem_advanced" } - } - }, - "requirements": [ - [ - "has_normal", - "has_advanced", - "has_wireless", - "has_the_recipe" - ] - ] -} diff --git a/src/main/resources/data/computercraft/advancements/recipes/wireless_modem_normal.json b/src/main/resources/data/computercraft/advancements/recipes/wireless_modem_normal.json deleted file mode 100644 index f82624da3..000000000 --- a/src/main/resources/data/computercraft/advancements/recipes/wireless_modem_normal.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ "computercraft:wireless_modem_normal" ] - }, - "criteria": { - "has_normal": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_normal" } ] - } - }, - "has_advanced": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ { "item": "computercraft:computer_advanced" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:wireless_modem_normal" } - } - }, - "requirements": [ - [ - "has_normal", - "has_advanced", - "has_the_recipe" - ] - ] -} diff --git a/src/main/resources/data/computercraft/recipes/cable.json b/src/main/resources/data/computercraft/recipes/cable.json deleted file mode 100644 index 09115ec12..000000000 --- a/src/main/resources/data/computercraft/recipes/cable.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - " # ", - "#R#", - " # " - ], - "key": { - "#": { "tag": "forge:stone" }, - "R": { "tag": "forge:dusts/redstone" } - }, - "result": { "item": "computercraft:cable", "count": 6 } -} diff --git a/src/main/resources/data/computercraft/recipes/computer_advanced.json b/src/main/resources/data/computercraft/recipes/computer_advanced.json deleted file mode 100644 index 81afaad43..000000000 --- a/src/main/resources/data/computercraft/recipes/computer_advanced.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "###", - "#R#", - "#G#" - ], - "key": { - "#": { "tag": "forge:ingots/gold" }, - "R": { "tag": "forge:dusts/redstone" }, - "G": { "item": "minecraft:glass_pane" } - }, - "result": { "item": "computercraft:computer_advanced" } -} diff --git a/src/main/resources/data/computercraft/recipes/computer_command.json b/src/main/resources/data/computercraft/recipes/computer_command.json deleted file mode 100644 index c89aa7f6d..000000000 --- a/src/main/resources/data/computercraft/recipes/computer_command.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "###", - "#R#", - "#G#" - ], - "key": { - "#": { "tag": "forge:stone" }, - "R": { "item": "minecraft:command_block" }, - "G": { "item": "minecraft:glass_pane" } - }, - "result": { "item": "computercraft:computer_command" } -} diff --git a/src/main/resources/data/computercraft/recipes/computer_normal.json b/src/main/resources/data/computercraft/recipes/computer_normal.json deleted file mode 100644 index 1761701bc..000000000 --- a/src/main/resources/data/computercraft/recipes/computer_normal.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "###", - "#R#", - "#G#" - ], - "key": { - "#": { "tag": "forge:stone" }, - "R": { "tag": "forge:dusts/redstone" }, - "G": { "item": "minecraft:glass_pane" } - }, - "result": { "item": "computercraft:computer_normal" } -} diff --git a/src/main/resources/data/computercraft/recipes/disk_drive.json b/src/main/resources/data/computercraft/recipes/disk_drive.json deleted file mode 100644 index 59c78b50f..000000000 --- a/src/main/resources/data/computercraft/recipes/disk_drive.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "###", - "#R#", - "#R#" - ], - "key": { - "#": { "tag": "forge:stone" }, - "R": { "tag": "forge:dusts/redstone" } - }, - "result": { "item": "computercraft:disk_drive" } -} diff --git a/src/main/resources/data/computercraft/recipes/monitor_advanced.json b/src/main/resources/data/computercraft/recipes/monitor_advanced.json deleted file mode 100644 index 6dc27ecff..000000000 --- a/src/main/resources/data/computercraft/recipes/monitor_advanced.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "###", - "#G#", - "###" - ], - "key": { - "#": { "tag": "forge:ingots/gold" }, - "G": { "item": "minecraft:glass_pane" } - }, - "result": { "item": "computercraft:monitor_advanced", "count": 4 } -} diff --git a/src/main/resources/data/computercraft/recipes/monitor_normal.json b/src/main/resources/data/computercraft/recipes/monitor_normal.json deleted file mode 100644 index 8ee786686..000000000 --- a/src/main/resources/data/computercraft/recipes/monitor_normal.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "###", - "#G#", - "###" - ], - "key": { - "#": { "tag": "forge:stone" }, - "G": { "item": "minecraft:glass_pane" } - }, - "result": { "item": "computercraft:monitor_normal" } -} diff --git a/src/main/resources/data/computercraft/recipes/pocket_computer_advanced.json b/src/main/resources/data/computercraft/recipes/pocket_computer_advanced.json deleted file mode 100644 index f4119b18b..000000000 --- a/src/main/resources/data/computercraft/recipes/pocket_computer_advanced.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "###", - "#A#", - "#G#" - ], - "key": { - "#": { "tag": "forge:ingots/gold" }, - "G": { "item": "minecraft:glass_pane" }, - "A": { "item": "minecraft:golden_apple" } - }, - "result": { "item": "computercraft:pocket_computer_advanced" } -} diff --git a/src/main/resources/data/computercraft/recipes/pocket_computer_normal.json b/src/main/resources/data/computercraft/recipes/pocket_computer_normal.json deleted file mode 100644 index f01612779..000000000 --- a/src/main/resources/data/computercraft/recipes/pocket_computer_normal.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "###", - "#A#", - "#G#" - ], - "key": { - "#": { "tag": "forge:stone" }, - "G": { "item": "minecraft:glass_pane" }, - "A": { "item": "minecraft:golden_apple" } - }, - "result": { "item": "computercraft:pocket_computer_normal" } -} diff --git a/src/main/resources/data/computercraft/recipes/printer.json b/src/main/resources/data/computercraft/recipes/printer.json deleted file mode 100644 index 4d120a541..000000000 --- a/src/main/resources/data/computercraft/recipes/printer.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "###", - "#R#", - "#D#" - ], - "key": { - "#": { "tag": "forge:stone" }, - "R": { "item": "minecraft:glass_pane" }, - "D": { "tag": "forge:dyes" } - }, - "result": { "item": "computercraft:printer" } -} diff --git a/src/main/resources/data/computercraft/recipes/speaker.json b/src/main/resources/data/computercraft/recipes/speaker.json deleted file mode 100644 index 6c0cf7595..000000000 --- a/src/main/resources/data/computercraft/recipes/speaker.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "###", - "#N#", - "#R#" - ], - "key": { - "#": { "tag": "forge:stone" }, - "R": { "tag": "forge:dusts/redstone" }, - "N": { "item": "minecraft:note_block" } - }, - "result": { "item": "computercraft:speaker" } -} diff --git a/src/main/resources/data/computercraft/recipes/wired_modem.json b/src/main/resources/data/computercraft/recipes/wired_modem.json deleted file mode 100644 index fa9e47af2..000000000 --- a/src/main/resources/data/computercraft/recipes/wired_modem.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "###", - "#R#", - "###" - ], - "key": { - "#": { "tag": "forge:stone" }, - "R": { "tag": "forge:dusts/redstone" } - }, - "result": { "item": "computercraft:wired_modem" } -} diff --git a/src/main/resources/data/computercraft/recipes/wired_modem_full_from.json b/src/main/resources/data/computercraft/recipes/wired_modem_full_from.json deleted file mode 100644 index f9579b354..000000000 --- a/src/main/resources/data/computercraft/recipes/wired_modem_full_from.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "crafting_shapeless", - "ingredients": [ - { "item": "computercraft:wired_modem_full" } - ], - "result": { "item": "computercraft:wired_modem" } -} diff --git a/src/main/resources/data/computercraft/recipes/wired_modem_full_to.json b/src/main/resources/data/computercraft/recipes/wired_modem_full_to.json deleted file mode 100644 index 204170660..000000000 --- a/src/main/resources/data/computercraft/recipes/wired_modem_full_to.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "crafting_shapeless", - "ingredients": [ - { "item": "computercraft:wired_modem" } - ], - "result": { "item": "computercraft:wired_modem_full" } -} diff --git a/src/main/resources/data/computercraft/recipes/wireless_modem_advanced.json b/src/main/resources/data/computercraft/recipes/wireless_modem_advanced.json deleted file mode 100644 index 3d3297d6c..000000000 --- a/src/main/resources/data/computercraft/recipes/wireless_modem_advanced.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "###", - "#E#", - "###" - ], - "key": { - "#": { "tag": "forge:ingots/gold" }, - "E": { "item": "minecraft:ender_eye" } - }, - "result": { "item": "computercraft:wireless_modem_advanced" } -} diff --git a/src/main/resources/data/computercraft/recipes/wireless_modem_normal.json b/src/main/resources/data/computercraft/recipes/wireless_modem_normal.json deleted file mode 100644 index 3005edd7d..000000000 --- a/src/main/resources/data/computercraft/recipes/wireless_modem_normal.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "###", - "#E#", - "###" - ], - "key": { - "#": { "tag": "forge:stone" }, - "E": { "item": "minecraft:ender_pearl" } - }, - "result": { "item": "computercraft:wireless_modem_normal" } -}