From a9ef8741745cbb3981fe14108b95d802a15d4561 Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Wed, 26 Oct 2022 18:38:20 +0100 Subject: [PATCH] Regenerate assets using our new JSON printer Haha. Hahahaah. I've gone mad with power. --- .../computercraft/blockstates/cable.json | 150 +++---- .../blockstates/computer_advanced.json | 26 +- .../blockstates/computer_command.json | 26 +- .../blockstates/computer_normal.json | 26 +- .../computercraft/blockstates/disk_drive.json | 26 +- .../blockstates/monitor_advanced.json | 422 +++++++++--------- .../blockstates/monitor_normal.json | 390 ++++++++-------- .../computercraft/blockstates/printer.json | 34 +- .../computercraft/blockstates/speaker.json | 2 +- .../blockstates/turtle_advanced.json | 2 +- .../blockstates/turtle_normal.json | 2 +- .../blockstates/wired_modem_full.json | 2 +- .../blockstates/wireless_modem_advanced.json | 26 +- .../blockstates/wireless_modem_normal.json | 26 +- .../block/computer_advanced_blinking.json | 6 +- .../models/block/computer_advanced_off.json | 6 +- .../models/block/computer_advanced_on.json | 6 +- .../block/computer_command_blinking.json | 6 +- .../models/block/computer_command_off.json | 6 +- .../models/block/computer_command_on.json | 6 +- .../block/computer_normal_blinking.json | 6 +- .../models/block/computer_normal_off.json | 6 +- .../models/block/computer_normal_on.json | 6 +- .../models/block/disk_drive_empty.json | 6 +- .../models/block/disk_drive_full.json | 6 +- .../models/block/disk_drive_invalid.json | 6 +- .../models/block/monitor_advanced.json | 6 +- .../models/block/monitor_advanced_d.json | 6 +- .../models/block/monitor_advanced_item.json | 6 +- .../models/block/monitor_advanced_l.json | 6 +- .../models/block/monitor_advanced_ld.json | 6 +- .../models/block/monitor_advanced_lr.json | 6 +- .../models/block/monitor_advanced_lrd.json | 6 +- .../models/block/monitor_advanced_lru.json | 6 +- .../models/block/monitor_advanced_lrud.json | 6 +- .../models/block/monitor_advanced_lu.json | 6 +- .../models/block/monitor_advanced_lud.json | 6 +- .../models/block/monitor_advanced_r.json | 6 +- .../models/block/monitor_advanced_rd.json | 6 +- .../models/block/monitor_advanced_ru.json | 6 +- .../models/block/monitor_advanced_rud.json | 6 +- .../models/block/monitor_advanced_u.json | 6 +- .../models/block/monitor_advanced_ud.json | 6 +- .../models/block/monitor_normal.json | 6 +- .../models/block/monitor_normal_d.json | 6 +- .../models/block/monitor_normal_item.json | 6 +- .../models/block/monitor_normal_l.json | 6 +- .../models/block/monitor_normal_ld.json | 6 +- .../models/block/monitor_normal_lr.json | 6 +- .../models/block/monitor_normal_lrd.json | 6 +- .../models/block/monitor_normal_lru.json | 6 +- .../models/block/monitor_normal_lrud.json | 6 +- .../models/block/monitor_normal_lu.json | 6 +- .../models/block/monitor_normal_lud.json | 6 +- .../models/block/monitor_normal_r.json | 6 +- .../models/block/monitor_normal_rd.json | 6 +- .../models/block/monitor_normal_ru.json | 6 +- .../models/block/monitor_normal_rud.json | 6 +- .../models/block/monitor_normal_u.json | 6 +- .../models/block/monitor_normal_ud.json | 6 +- .../models/block/printer_both_full.json | 6 +- .../models/block/printer_bottom_full.json | 6 +- .../models/block/printer_empty.json | 6 +- .../models/block/printer_top_full.json | 6 +- .../computercraft/models/block/speaker.json | 6 +- .../models/block/turtle_advanced.json | 2 +- .../block/turtle_crafting_table_left.json | 2 +- .../block/turtle_crafting_table_right.json | 2 +- .../block/turtle_modem_advanced_off_left.json | 2 +- .../turtle_modem_advanced_off_right.json | 2 +- .../block/turtle_modem_advanced_on_left.json | 2 +- .../block/turtle_modem_advanced_on_right.json | 2 +- .../block/turtle_modem_normal_off_left.json | 2 +- .../block/turtle_modem_normal_off_right.json | 2 +- .../block/turtle_modem_normal_on_left.json | 2 +- .../block/turtle_modem_normal_on_right.json | 2 +- .../models/block/turtle_normal.json | 2 +- .../models/block/turtle_speaker_left.json | 2 +- .../models/block/turtle_speaker_right.json | 2 +- .../models/block/wired_modem_full_off.json | 2 +- .../wired_modem_full_off_peripheral.json | 2 +- .../models/block/wired_modem_full_on.json | 2 +- .../block/wired_modem_full_on_peripheral.json | 2 +- .../models/block/wired_modem_off.json | 4 +- .../block/wired_modem_off_peripheral.json | 4 +- .../models/block/wired_modem_on.json | 4 +- .../block/wired_modem_on_peripheral.json | 6 +- .../block/wireless_modem_advanced_off.json | 4 +- .../block/wireless_modem_advanced_on.json | 6 +- .../block/wireless_modem_normal_off.json | 4 +- .../block/wireless_modem_normal_on.json | 4 +- .../models/item/computer_advanced.json | 2 +- .../models/item/computer_command.json | 2 +- .../models/item/computer_normal.json | 2 +- .../computercraft/models/item/disk.json | 2 +- .../computercraft/models/item/disk_drive.json | 2 +- .../models/item/monitor_advanced.json | 2 +- .../models/item/monitor_normal.json | 2 +- .../pocket_computer_advanced_blinking.json | 2 +- .../item/pocket_computer_advanced_on.json | 2 +- .../models/item/pocket_computer_colour.json | 2 +- .../item/pocket_computer_colour_blinking.json | 2 +- .../item/pocket_computer_colour_on.json | 2 +- .../item/pocket_computer_normal_blinking.json | 2 +- .../item/pocket_computer_normal_on.json | 2 +- .../models/item/printed_book.json | 2 +- .../models/item/printed_page.json | 2 +- .../models/item/printed_pages.json | 2 +- .../computercraft/models/item/printer.json | 2 +- .../computercraft/models/item/speaker.json | 2 +- .../models/item/treasure_disk.json | 2 +- .../models/item/turtle_advanced.json | 2 +- .../models/item/turtle_normal.json | 2 +- .../models/item/wired_modem.json | 2 +- .../models/item/wired_modem_full.json | 2 +- .../models/item/wireless_modem_advanced.json | 2 +- .../models/item/wireless_modem_normal.json | 2 +- .../recipes/computercraft/cable.json | 43 +- .../computercraft/computer_advanced.json | 38 +- .../computer_advanced_upgrade.json | 36 +- .../computercraft/computer_command.json | 33 +- .../computercraft/computer_normal.json | 31 +- .../recipes/computercraft/disk_1.json | 34 +- .../recipes/computercraft/disk_10.json | 34 +- .../recipes/computercraft/disk_11.json | 34 +- .../recipes/computercraft/disk_12.json | 34 +- .../recipes/computercraft/disk_13.json | 34 +- .../recipes/computercraft/disk_14.json | 34 +- .../recipes/computercraft/disk_15.json | 34 +- .../recipes/computercraft/disk_16.json | 34 +- .../recipes/computercraft/disk_2.json | 34 +- .../recipes/computercraft/disk_3.json | 34 +- .../recipes/computercraft/disk_4.json | 34 +- .../recipes/computercraft/disk_5.json | 34 +- .../recipes/computercraft/disk_6.json | 34 +- .../recipes/computercraft/disk_7.json | 34 +- .../recipes/computercraft/disk_8.json | 34 +- .../recipes/computercraft/disk_9.json | 34 +- .../recipes/computercraft/disk_drive.json | 32 +- .../computercraft/monitor_advanced.json | 31 +- .../recipes/computercraft/monitor_normal.json | 31 +- .../computercraft/speaker.json | 38 +- .../wireless_modem_advanced.json | 37 +- .../computercraft/wireless_modem_normal.json | 37 +- .../pocket_computer_advanced.json | 48 +- .../pocket_computer_advanced_upgrade.json | 36 +- .../computercraft/pocket_computer_normal.json | 48 +- .../pocket_normal/computercraft/speaker.json | 38 +- .../wireless_modem_advanced.json | 37 +- .../computercraft/wireless_modem_normal.json | 37 +- .../recipes/computercraft/printed_book.json | 33 +- .../recipes/computercraft/printed_pages.json | 33 +- .../recipes/computercraft/printer.json | 32 +- .../recipes/computercraft/speaker.json | 32 +- .../computercraft/turtle_advanced.json | 33 +- .../computercraft/speaker.json | 38 +- .../wireless_modem_advanced.json | 37 +- .../computercraft/wireless_modem_normal.json | 37 +- .../minecraft/crafting_table.json | 38 +- .../minecraft/diamond_axe.json | 38 +- .../minecraft/diamond_hoe.json | 38 +- .../minecraft/diamond_pickaxe.json | 38 +- .../minecraft/diamond_shovel.json | 38 +- .../minecraft/diamond_sword.json | 38 +- .../turtle_advanced_upgrade.json | 36 +- .../recipes/computercraft/turtle_normal.json | 33 +- .../turtle_normal/computercraft/speaker.json | 38 +- .../wireless_modem_advanced.json | 37 +- .../computercraft/wireless_modem_normal.json | 37 +- .../minecraft/crafting_table.json | 38 +- .../turtle_normal/minecraft/diamond_axe.json | 38 +- .../turtle_normal/minecraft/diamond_hoe.json | 38 +- .../minecraft/diamond_pickaxe.json | 38 +- .../minecraft/diamond_shovel.json | 38 +- .../minecraft/diamond_sword.json | 38 +- .../recipes/computercraft/wired_modem.json | 48 +- .../computercraft/wired_modem_full_from.json | 31 +- .../computercraft/wired_modem_full_to.json | 31 +- .../wireless_modem_advanced.json | 48 +- .../computercraft/wireless_modem_normal.json | 31 +- .../recipes/decorations/skull_cloudy.json | 33 +- .../recipes/decorations/skull_dan200.json | 33 +- .../pocket_upgrades/speaker.json | 5 +- .../wireless_modem_advanced.json | 5 +- .../wireless_modem_normal.json | 5 +- .../turtle_upgrades/speaker.json | 5 +- .../wireless_modem_advanced.json | 5 +- .../wireless_modem_normal.json | 5 +- .../loot_tables/blocks/cable.json | 46 +- .../loot_tables/blocks/computer_advanced.json | 28 +- .../loot_tables/blocks/computer_command.json | 28 +- .../loot_tables/blocks/computer_normal.json | 28 +- .../loot_tables/blocks/disk_drive.json | 17 +- .../loot_tables/blocks/monitor_advanced.json | 17 +- .../loot_tables/blocks/monitor_normal.json | 17 +- .../loot_tables/blocks/printer.json | 17 +- .../loot_tables/blocks/speaker.json | 17 +- .../loot_tables/blocks/turtle_advanced.json | 28 +- .../loot_tables/blocks/turtle_normal.json | 28 +- .../loot_tables/blocks/wired_modem_full.json | 17 +- .../blocks/wireless_modem_advanced.json | 17 +- .../blocks/wireless_modem_normal.json | 17 +- .../loot_tables/treasure_disk.json | 2 +- .../data/computercraft/recipes/cable.json | 22 +- .../data/computercraft/recipes/colour.json | 4 +- .../recipes/computer_advanced.json | 24 +- .../recipes/computer_advanced_upgrade.json | 23 +- .../recipes/computer_command.json | 24 +- .../recipes/computer_normal.json | 24 +- .../data/computercraft/recipes/disk.json | 4 +- .../data/computercraft/recipes/disk_1.json | 19 +- .../data/computercraft/recipes/disk_10.json | 19 +- .../data/computercraft/recipes/disk_11.json | 19 +- .../data/computercraft/recipes/disk_12.json | 19 +- .../data/computercraft/recipes/disk_13.json | 19 +- .../data/computercraft/recipes/disk_14.json | 19 +- .../data/computercraft/recipes/disk_15.json | 19 +- .../data/computercraft/recipes/disk_16.json | 19 +- .../data/computercraft/recipes/disk_2.json | 19 +- .../data/computercraft/recipes/disk_3.json | 19 +- .../data/computercraft/recipes/disk_4.json | 19 +- .../data/computercraft/recipes/disk_5.json | 19 +- .../data/computercraft/recipes/disk_6.json | 19 +- .../data/computercraft/recipes/disk_7.json | 19 +- .../data/computercraft/recipes/disk_8.json | 19 +- .../data/computercraft/recipes/disk_9.json | 19 +- .../computercraft/recipes/disk_drive.json | 21 +- .../recipes/monitor_advanced.json | 22 +- .../computercraft/recipes/monitor_normal.json | 21 +- .../computercraft/speaker.json | 21 +- .../wireless_modem_advanced.json | 15 +- .../computercraft/wireless_modem_normal.json | 15 +- .../recipes/pocket_computer_advanced.json | 24 +- .../pocket_computer_advanced_upgrade.json | 23 +- .../recipes/pocket_computer_normal.json | 24 +- .../recipes/pocket_computer_upgrade.json | 4 +- .../pocket_normal/computercraft/speaker.json | 21 +- .../wireless_modem_advanced.json | 15 +- .../computercraft/wireless_modem_normal.json | 15 +- .../computercraft/recipes/printed_book.json | 18 +- .../computercraft/recipes/printed_pages.json | 18 +- .../data/computercraft/recipes/printer.json | 24 +- .../data/computercraft/recipes/printout.json | 4 +- .../computercraft/recipes/skull_cloudy.json | 11 +- .../computercraft/recipes/skull_dan200.json | 11 +- .../data/computercraft/recipes/speaker.json | 24 +- .../recipes/turtle_advanced.json | 26 +- .../computercraft/speaker.json | 20 +- .../wireless_modem_advanced.json | 15 +- .../computercraft/wireless_modem_normal.json | 20 +- .../minecraft/crafting_table.json | 20 +- .../minecraft/diamond_axe.json | 20 +- .../minecraft/diamond_hoe.json | 20 +- .../minecraft/diamond_pickaxe.json | 20 +- .../minecraft/diamond_shovel.json | 20 +- .../minecraft/diamond_sword.json | 20 +- .../recipes/turtle_advanced_upgrade.json | 26 +- .../computercraft/recipes/turtle_normal.json | 26 +- .../turtle_normal/computercraft/speaker.json | 20 +- .../wireless_modem_advanced.json | 20 +- .../computercraft/wireless_modem_normal.json | 20 +- .../minecraft/crafting_table.json | 20 +- .../turtle_normal/minecraft/diamond_axe.json | 20 +- .../turtle_normal/minecraft/diamond_hoe.json | 20 +- .../minecraft/diamond_pickaxe.json | 20 +- .../minecraft/diamond_shovel.json | 20 +- .../minecraft/diamond_sword.json | 20 +- .../computercraft/recipes/turtle_upgrade.json | 4 +- .../computercraft/recipes/wired_modem.json | 21 +- .../recipes/wired_modem_full_from.json | 12 +- .../recipes/wired_modem_full_to.json | 12 +- .../recipes/wireless_modem_advanced.json | 21 +- .../recipes/wireless_modem_normal.json | 21 +- .../computercraft/tags/blocks/computer.json | 9 +- .../computercraft/tags/blocks/monitor.json | 8 +- .../computercraft/tags/blocks/turtle.json | 8 +- .../tags/blocks/turtle_always_breakable.json | 9 +- .../tags/blocks/turtle_hoe_harvestable.json | 3 +- .../blocks/turtle_shovel_harvestable.json | 3 +- .../tags/blocks/turtle_sword_harvestable.json | 8 +- .../tags/blocks/wired_modem.json | 8 +- .../computercraft/tags/items/computer.json | 9 +- .../computercraft/tags/items/monitor.json | 8 +- .../data/computercraft/tags/items/turtle.json | 8 +- .../computercraft/tags/items/wired_modem.json | 8 +- .../turtle_upgrades/crafting_table.json | 5 +- .../turtle_upgrades/diamond_axe.json | 6 +- .../turtle_upgrades/diamond_hoe.json | 6 +- .../turtle_upgrades/diamond_pickaxe.json | 5 +- .../turtle_upgrades/diamond_shovel.json | 6 +- .../turtle_upgrades/diamond_sword.json | 6 +- .../tags/blocks/mineable/pickaxe.json | 3 +- .../minecraft/tags/items/piglin_loved.json | 3 +- .../computercraft/data/PrettyJsonWriter.java | 4 +- .../mixin/CacheUpdaterMixin.java | 28 ++ src/main/resources/computercraft.mixins.json | 5 +- 296 files changed, 1703 insertions(+), 4053 deletions(-) create mode 100644 src/main/java/dan200/computercraft/mixin/CacheUpdaterMixin.java diff --git a/src/generated/resources/assets/computercraft/blockstates/cable.json b/src/generated/resources/assets/computercraft/blockstates/cable.json index e8af5d957..a440c3e2c 100644 --- a/src/generated/resources/assets/computercraft/blockstates/cable.json +++ b/src/generated/resources/assets/computercraft/blockstates/cable.json @@ -1,125 +1,125 @@ { "multipart": [ { + "apply": {"model": "computercraft:block/cable_core_facing", "x": 90}, "when": { "OR": [ - {"up": "true", "north": "false", "west": "false", "south": "false", "east": "false", "cable": "true"}, - {"north": "false", "west": "false", "south": "false", "east": "false", "down": "true", "cable": "true"} + {"cable": "true", "east": "false", "north": "false", "south": "false", "up": "true", "west": "false"}, + {"cable": "true", "down": "true", "east": "false", "north": "false", "south": "false", "west": "false"} ] - }, - "apply": {"model": "computercraft:block/cable_core_facing", "x": 90} + } }, { + "apply": {"model": "computercraft:block/cable_core_facing", "y": 0}, "when": { "OR": [ { - "up": "false", - "north": "false", - "west": "false", - "south": "false", - "east": "false", + "cable": "true", "down": "false", - "cable": "true" + "east": "false", + "north": "false", + "south": "false", + "up": "false", + "west": "false" }, - {"up": "false", "west": "false", "north": "true", "east": "false", "down": "false", "cable": "true"}, - {"up": "false", "west": "false", "south": "true", "east": "false", "down": "false", "cable": "true"} + {"cable": "true", "down": "false", "east": "false", "north": "true", "up": "false", "west": "false"}, + {"cable": "true", "down": "false", "east": "false", "south": "true", "up": "false", "west": "false"} ] - }, - "apply": {"model": "computercraft:block/cable_core_facing", "y": 0} + } }, { + "apply": {"model": "computercraft:block/cable_core_facing", "y": 90}, "when": { "OR": [ - {"up": "false", "north": "false", "south": "false", "east": "true", "down": "false", "cable": "true"}, - {"up": "false", "north": "false", "west": "true", "south": "false", "down": "false", "cable": "true"} + {"cable": "true", "down": "false", "east": "true", "north": "false", "south": "false", "up": "false"}, + {"cable": "true", "down": "false", "north": "false", "south": "false", "up": "false", "west": "true"} ] - }, - "apply": {"model": "computercraft:block/cable_core_facing", "y": 90} + } }, { + "apply": {"model": "computercraft:block/cable_core_any"}, "when": { "OR": [ - {"north": "true", "down": "true", "cable": "true"}, - {"south": "true", "down": "true", "cable": "true"}, - {"west": "true", "down": "true", "cable": "true"}, - {"east": "true", "down": "true", "cable": "true"}, - {"up": "true", "north": "true", "cable": "true"}, - {"up": "true", "south": "true", "cable": "true"}, - {"up": "true", "west": "true", "cable": "true"}, - {"up": "true", "east": "true", "cable": "true"}, - {"north": "true", "west": "true", "cable": "true"}, - {"north": "true", "east": "true", "cable": "true"}, - {"west": "true", "south": "true", "cable": "true"}, - {"south": "true", "east": "true", "cable": "true"} + {"cable": "true", "down": "true", "north": "true"}, + {"cable": "true", "down": "true", "south": "true"}, + {"cable": "true", "down": "true", "west": "true"}, + {"cable": "true", "down": "true", "east": "true"}, + {"cable": "true", "north": "true", "up": "true"}, + {"cable": "true", "south": "true", "up": "true"}, + {"cable": "true", "up": "true", "west": "true"}, + {"cable": "true", "east": "true", "up": "true"}, + {"cable": "true", "north": "true", "west": "true"}, + {"cable": "true", "east": "true", "north": "true"}, + {"cable": "true", "south": "true", "west": "true"}, + {"cable": "true", "east": "true", "south": "true"} ] - }, - "apply": {"model": "computercraft:block/cable_core_any"} + } }, - {"when": {"down": "true"}, "apply": {"model": "computercraft:block/cable_arm", "x": 270, "y": 0}}, - {"when": {"up": "true"}, "apply": {"model": "computercraft:block/cable_arm", "x": 90, "y": 0}}, - {"when": {"north": "true"}, "apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 180}}, - {"when": {"south": "true"}, "apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 0}}, - {"when": {"west": "true"}, "apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 90}}, - {"when": {"east": "true"}, "apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 270}}, - {"when": {"modem": "down_off"}, "apply": {"model": "computercraft:block/wired_modem_off", "x": 90, "y": 0}}, + {"apply": {"model": "computercraft:block/cable_arm", "x": 270, "y": 0}, "when": {"down": "true"}}, + {"apply": {"model": "computercraft:block/cable_arm", "x": 90, "y": 0}, "when": {"up": "true"}}, + {"apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 180}, "when": {"north": "true"}}, + {"apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 0}, "when": {"south": "true"}}, + {"apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 90}, "when": {"west": "true"}}, + {"apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 270}, "when": {"east": "true"}}, + {"apply": {"model": "computercraft:block/wired_modem_off", "x": 90, "y": 0}, "when": {"modem": "down_off"}}, { - "when": {"modem": "down_off_peripheral"}, - "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 90, "y": 0} + "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 90, "y": 0}, + "when": {"modem": "down_off_peripheral"} }, - {"when": {"modem": "down_on"}, "apply": {"model": "computercraft:block/wired_modem_on", "x": 90, "y": 0}}, + {"apply": {"model": "computercraft:block/wired_modem_on", "x": 90, "y": 0}, "when": {"modem": "down_on"}}, { - "when": {"modem": "down_on_peripheral"}, - "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 90, "y": 0} + "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 90, "y": 0}, + "when": {"modem": "down_on_peripheral"} }, - {"when": {"modem": "up_off"}, "apply": {"model": "computercraft:block/wired_modem_off", "x": 270, "y": 0}}, + {"apply": {"model": "computercraft:block/wired_modem_off", "x": 270, "y": 0}, "when": {"modem": "up_off"}}, { - "when": {"modem": "up_off_peripheral"}, - "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 270, "y": 0} + "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 270, "y": 0}, + "when": {"modem": "up_off_peripheral"} }, - {"when": {"modem": "up_on"}, "apply": {"model": "computercraft:block/wired_modem_on", "x": 270, "y": 0}}, + {"apply": {"model": "computercraft:block/wired_modem_on", "x": 270, "y": 0}, "when": {"modem": "up_on"}}, { - "when": {"modem": "up_on_peripheral"}, - "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 270, "y": 0} + "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 270, "y": 0}, + "when": {"modem": "up_on_peripheral"} }, - {"when": {"modem": "north_off"}, "apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 0}}, + {"apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 0}, "when": {"modem": "north_off"}}, { - "when": {"modem": "north_off_peripheral"}, - "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 0} + "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 0}, + "when": {"modem": "north_off_peripheral"} }, - {"when": {"modem": "north_on"}, "apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 0}}, + {"apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 0}, "when": {"modem": "north_on"}}, { - "when": {"modem": "north_on_peripheral"}, - "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 0} + "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 0}, + "when": {"modem": "north_on_peripheral"} }, - {"when": {"modem": "south_off"}, "apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 180}}, + {"apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 180}, "when": {"modem": "south_off"}}, { - "when": {"modem": "south_off_peripheral"}, - "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 180} + "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 180}, + "when": {"modem": "south_off_peripheral"} }, - {"when": {"modem": "south_on"}, "apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 180}}, + {"apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 180}, "when": {"modem": "south_on"}}, { - "when": {"modem": "south_on_peripheral"}, - "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 180} + "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 180}, + "when": {"modem": "south_on_peripheral"} }, - {"when": {"modem": "west_off"}, "apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 270}}, + {"apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 270}, "when": {"modem": "west_off"}}, { - "when": {"modem": "west_off_peripheral"}, - "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 270} + "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 270}, + "when": {"modem": "west_off_peripheral"} }, - {"when": {"modem": "west_on"}, "apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 270}}, + {"apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 270}, "when": {"modem": "west_on"}}, { - "when": {"modem": "west_on_peripheral"}, - "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 270} + "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 270}, + "when": {"modem": "west_on_peripheral"} }, - {"when": {"modem": "east_off"}, "apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 90}}, + {"apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 90}, "when": {"modem": "east_off"}}, { - "when": {"modem": "east_off_peripheral"}, - "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 90} + "apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 90}, + "when": {"modem": "east_off_peripheral"} }, - {"when": {"modem": "east_on"}, "apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 90}}, + {"apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 90}, "when": {"modem": "east_on"}}, { - "when": {"modem": "east_on_peripheral"}, - "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 90} + "apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 90}, + "when": {"modem": "east_on_peripheral"} } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/blockstates/computer_advanced.json b/src/generated/resources/assets/computercraft/blockstates/computer_advanced.json index 9d49529ec..5f5960311 100644 --- a/src/generated/resources/assets/computercraft/blockstates/computer_advanced.json +++ b/src/generated/resources/assets/computercraft/blockstates/computer_advanced.json @@ -1,16 +1,16 @@ { "variants": { - "facing=east,state=blinking": {"y": 90, "model": "computercraft:block/computer_advanced_blinking"}, - "facing=east,state=off": {"y": 90, "model": "computercraft:block/computer_advanced_off"}, - "facing=east,state=on": {"y": 90, "model": "computercraft:block/computer_advanced_on"}, - "facing=north,state=blinking": {"y": 0, "model": "computercraft:block/computer_advanced_blinking"}, - "facing=north,state=off": {"y": 0, "model": "computercraft:block/computer_advanced_off"}, - "facing=north,state=on": {"y": 0, "model": "computercraft:block/computer_advanced_on"}, - "facing=south,state=blinking": {"y": 180, "model": "computercraft:block/computer_advanced_blinking"}, - "facing=south,state=off": {"y": 180, "model": "computercraft:block/computer_advanced_off"}, - "facing=south,state=on": {"y": 180, "model": "computercraft:block/computer_advanced_on"}, - "facing=west,state=blinking": {"y": 270, "model": "computercraft:block/computer_advanced_blinking"}, - "facing=west,state=off": {"y": 270, "model": "computercraft:block/computer_advanced_off"}, - "facing=west,state=on": {"y": 270, "model": "computercraft:block/computer_advanced_on"} + "facing=east,state=blinking": {"model": "computercraft:block/computer_advanced_blinking", "y": 90}, + "facing=east,state=off": {"model": "computercraft:block/computer_advanced_off", "y": 90}, + "facing=east,state=on": {"model": "computercraft:block/computer_advanced_on", "y": 90}, + "facing=north,state=blinking": {"model": "computercraft:block/computer_advanced_blinking", "y": 0}, + "facing=north,state=off": {"model": "computercraft:block/computer_advanced_off", "y": 0}, + "facing=north,state=on": {"model": "computercraft:block/computer_advanced_on", "y": 0}, + "facing=south,state=blinking": {"model": "computercraft:block/computer_advanced_blinking", "y": 180}, + "facing=south,state=off": {"model": "computercraft:block/computer_advanced_off", "y": 180}, + "facing=south,state=on": {"model": "computercraft:block/computer_advanced_on", "y": 180}, + "facing=west,state=blinking": {"model": "computercraft:block/computer_advanced_blinking", "y": 270}, + "facing=west,state=off": {"model": "computercraft:block/computer_advanced_off", "y": 270}, + "facing=west,state=on": {"model": "computercraft:block/computer_advanced_on", "y": 270} } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/blockstates/computer_command.json b/src/generated/resources/assets/computercraft/blockstates/computer_command.json index fb5881042..2077c3fbf 100644 --- a/src/generated/resources/assets/computercraft/blockstates/computer_command.json +++ b/src/generated/resources/assets/computercraft/blockstates/computer_command.json @@ -1,16 +1,16 @@ { "variants": { - "facing=east,state=blinking": {"y": 90, "model": "computercraft:block/computer_command_blinking"}, - "facing=east,state=off": {"y": 90, "model": "computercraft:block/computer_command_off"}, - "facing=east,state=on": {"y": 90, "model": "computercraft:block/computer_command_on"}, - "facing=north,state=blinking": {"y": 0, "model": "computercraft:block/computer_command_blinking"}, - "facing=north,state=off": {"y": 0, "model": "computercraft:block/computer_command_off"}, - "facing=north,state=on": {"y": 0, "model": "computercraft:block/computer_command_on"}, - "facing=south,state=blinking": {"y": 180, "model": "computercraft:block/computer_command_blinking"}, - "facing=south,state=off": {"y": 180, "model": "computercraft:block/computer_command_off"}, - "facing=south,state=on": {"y": 180, "model": "computercraft:block/computer_command_on"}, - "facing=west,state=blinking": {"y": 270, "model": "computercraft:block/computer_command_blinking"}, - "facing=west,state=off": {"y": 270, "model": "computercraft:block/computer_command_off"}, - "facing=west,state=on": {"y": 270, "model": "computercraft:block/computer_command_on"} + "facing=east,state=blinking": {"model": "computercraft:block/computer_command_blinking", "y": 90}, + "facing=east,state=off": {"model": "computercraft:block/computer_command_off", "y": 90}, + "facing=east,state=on": {"model": "computercraft:block/computer_command_on", "y": 90}, + "facing=north,state=blinking": {"model": "computercraft:block/computer_command_blinking", "y": 0}, + "facing=north,state=off": {"model": "computercraft:block/computer_command_off", "y": 0}, + "facing=north,state=on": {"model": "computercraft:block/computer_command_on", "y": 0}, + "facing=south,state=blinking": {"model": "computercraft:block/computer_command_blinking", "y": 180}, + "facing=south,state=off": {"model": "computercraft:block/computer_command_off", "y": 180}, + "facing=south,state=on": {"model": "computercraft:block/computer_command_on", "y": 180}, + "facing=west,state=blinking": {"model": "computercraft:block/computer_command_blinking", "y": 270}, + "facing=west,state=off": {"model": "computercraft:block/computer_command_off", "y": 270}, + "facing=west,state=on": {"model": "computercraft:block/computer_command_on", "y": 270} } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/blockstates/computer_normal.json b/src/generated/resources/assets/computercraft/blockstates/computer_normal.json index c64ad7417..534584f1d 100644 --- a/src/generated/resources/assets/computercraft/blockstates/computer_normal.json +++ b/src/generated/resources/assets/computercraft/blockstates/computer_normal.json @@ -1,16 +1,16 @@ { "variants": { - "facing=east,state=blinking": {"y": 90, "model": "computercraft:block/computer_normal_blinking"}, - "facing=east,state=off": {"y": 90, "model": "computercraft:block/computer_normal_off"}, - "facing=east,state=on": {"y": 90, "model": "computercraft:block/computer_normal_on"}, - "facing=north,state=blinking": {"y": 0, "model": "computercraft:block/computer_normal_blinking"}, - "facing=north,state=off": {"y": 0, "model": "computercraft:block/computer_normal_off"}, - "facing=north,state=on": {"y": 0, "model": "computercraft:block/computer_normal_on"}, - "facing=south,state=blinking": {"y": 180, "model": "computercraft:block/computer_normal_blinking"}, - "facing=south,state=off": {"y": 180, "model": "computercraft:block/computer_normal_off"}, - "facing=south,state=on": {"y": 180, "model": "computercraft:block/computer_normal_on"}, - "facing=west,state=blinking": {"y": 270, "model": "computercraft:block/computer_normal_blinking"}, - "facing=west,state=off": {"y": 270, "model": "computercraft:block/computer_normal_off"}, - "facing=west,state=on": {"y": 270, "model": "computercraft:block/computer_normal_on"} + "facing=east,state=blinking": {"model": "computercraft:block/computer_normal_blinking", "y": 90}, + "facing=east,state=off": {"model": "computercraft:block/computer_normal_off", "y": 90}, + "facing=east,state=on": {"model": "computercraft:block/computer_normal_on", "y": 90}, + "facing=north,state=blinking": {"model": "computercraft:block/computer_normal_blinking", "y": 0}, + "facing=north,state=off": {"model": "computercraft:block/computer_normal_off", "y": 0}, + "facing=north,state=on": {"model": "computercraft:block/computer_normal_on", "y": 0}, + "facing=south,state=blinking": {"model": "computercraft:block/computer_normal_blinking", "y": 180}, + "facing=south,state=off": {"model": "computercraft:block/computer_normal_off", "y": 180}, + "facing=south,state=on": {"model": "computercraft:block/computer_normal_on", "y": 180}, + "facing=west,state=blinking": {"model": "computercraft:block/computer_normal_blinking", "y": 270}, + "facing=west,state=off": {"model": "computercraft:block/computer_normal_off", "y": 270}, + "facing=west,state=on": {"model": "computercraft:block/computer_normal_on", "y": 270} } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/blockstates/disk_drive.json b/src/generated/resources/assets/computercraft/blockstates/disk_drive.json index 79754ae03..ea03105fb 100644 --- a/src/generated/resources/assets/computercraft/blockstates/disk_drive.json +++ b/src/generated/resources/assets/computercraft/blockstates/disk_drive.json @@ -1,16 +1,16 @@ { "variants": { - "facing=east,state=empty": {"y": 90, "model": "computercraft:block/disk_drive_empty"}, - "facing=east,state=full": {"y": 90, "model": "computercraft:block/disk_drive_full"}, - "facing=east,state=invalid": {"y": 90, "model": "computercraft:block/disk_drive_invalid"}, - "facing=north,state=empty": {"y": 0, "model": "computercraft:block/disk_drive_empty"}, - "facing=north,state=full": {"y": 0, "model": "computercraft:block/disk_drive_full"}, - "facing=north,state=invalid": {"y": 0, "model": "computercraft:block/disk_drive_invalid"}, - "facing=south,state=empty": {"y": 180, "model": "computercraft:block/disk_drive_empty"}, - "facing=south,state=full": {"y": 180, "model": "computercraft:block/disk_drive_full"}, - "facing=south,state=invalid": {"y": 180, "model": "computercraft:block/disk_drive_invalid"}, - "facing=west,state=empty": {"y": 270, "model": "computercraft:block/disk_drive_empty"}, - "facing=west,state=full": {"y": 270, "model": "computercraft:block/disk_drive_full"}, - "facing=west,state=invalid": {"y": 270, "model": "computercraft:block/disk_drive_invalid"} + "facing=east,state=empty": {"model": "computercraft:block/disk_drive_empty", "y": 90}, + "facing=east,state=full": {"model": "computercraft:block/disk_drive_full", "y": 90}, + "facing=east,state=invalid": {"model": "computercraft:block/disk_drive_invalid", "y": 90}, + "facing=north,state=empty": {"model": "computercraft:block/disk_drive_empty", "y": 0}, + "facing=north,state=full": {"model": "computercraft:block/disk_drive_full", "y": 0}, + "facing=north,state=invalid": {"model": "computercraft:block/disk_drive_invalid", "y": 0}, + "facing=south,state=empty": {"model": "computercraft:block/disk_drive_empty", "y": 180}, + "facing=south,state=full": {"model": "computercraft:block/disk_drive_full", "y": 180}, + "facing=south,state=invalid": {"model": "computercraft:block/disk_drive_invalid", "y": 180}, + "facing=west,state=empty": {"model": "computercraft:block/disk_drive_empty", "y": 270}, + "facing=west,state=full": {"model": "computercraft:block/disk_drive_full", "y": 270}, + "facing=west,state=invalid": {"model": "computercraft:block/disk_drive_invalid", "y": 270} } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/blockstates/monitor_advanced.json b/src/generated/resources/assets/computercraft/blockstates/monitor_advanced.json index a13125041..7f85fcc59 100644 --- a/src/generated/resources/assets/computercraft/blockstates/monitor_advanced.json +++ b/src/generated/resources/assets/computercraft/blockstates/monitor_advanced.json @@ -1,268 +1,268 @@ { "variants": { - "facing=east,orientation=down,state=d": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_d"}, - "facing=east,orientation=down,state=l": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_l"}, - "facing=east,orientation=down,state=ld": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_ld"}, - "facing=east,orientation=down,state=lr": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_lr"}, - "facing=east,orientation=down,state=lrd": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_lrd"}, - "facing=east,orientation=down,state=lru": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_lru"}, + "facing=east,orientation=down,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 90, "y": 90}, + "facing=east,orientation=down,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 90, "y": 90}, + "facing=east,orientation=down,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 90, "y": 90}, + "facing=east,orientation=down,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 90, "y": 90}, + "facing=east,orientation=down,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 90, "y": 90}, + "facing=east,orientation=down,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 90, "y": 90}, "facing=east,orientation=down,state=lrud": { - "y": 90, + "model": "computercraft:block/monitor_advanced_lrud", "x": 90, - "model": "computercraft:block/monitor_advanced_lrud" + "y": 90 }, - "facing=east,orientation=down,state=lu": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_lu"}, - "facing=east,orientation=down,state=lud": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_lud"}, - "facing=east,orientation=down,state=none": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced"}, - "facing=east,orientation=down,state=r": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_r"}, - "facing=east,orientation=down,state=rd": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_rd"}, - "facing=east,orientation=down,state=ru": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_ru"}, - "facing=east,orientation=down,state=rud": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_rud"}, - "facing=east,orientation=down,state=u": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_u"}, - "facing=east,orientation=down,state=ud": {"y": 90, "x": 90, "model": "computercraft:block/monitor_advanced_ud"}, - "facing=east,orientation=north,state=d": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_d"}, - "facing=east,orientation=north,state=l": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_l"}, - "facing=east,orientation=north,state=ld": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_ld"}, - "facing=east,orientation=north,state=lr": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_lr"}, - "facing=east,orientation=north,state=lrd": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_lrd"}, - "facing=east,orientation=north,state=lru": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_lru"}, + "facing=east,orientation=down,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 90, "y": 90}, + "facing=east,orientation=down,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 90, "y": 90}, + "facing=east,orientation=down,state=none": {"model": "computercraft:block/monitor_advanced", "x": 90, "y": 90}, + "facing=east,orientation=down,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 90, "y": 90}, + "facing=east,orientation=down,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 90, "y": 90}, + "facing=east,orientation=down,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 90, "y": 90}, + "facing=east,orientation=down,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 90, "y": 90}, + "facing=east,orientation=down,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 90, "y": 90}, + "facing=east,orientation=down,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 90, "y": 90}, + "facing=east,orientation=north,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 0, "y": 90}, + "facing=east,orientation=north,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 0, "y": 90}, + "facing=east,orientation=north,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 0, "y": 90}, + "facing=east,orientation=north,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 0, "y": 90}, + "facing=east,orientation=north,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 0, "y": 90}, + "facing=east,orientation=north,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 0, "y": 90}, "facing=east,orientation=north,state=lrud": { - "y": 90, + "model": "computercraft:block/monitor_advanced_lrud", "x": 0, - "model": "computercraft:block/monitor_advanced_lrud" + "y": 90 }, - "facing=east,orientation=north,state=lu": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_lu"}, - "facing=east,orientation=north,state=lud": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_lud"}, - "facing=east,orientation=north,state=none": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced"}, - "facing=east,orientation=north,state=r": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_r"}, - "facing=east,orientation=north,state=rd": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_rd"}, - "facing=east,orientation=north,state=ru": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_ru"}, - "facing=east,orientation=north,state=rud": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_rud"}, - "facing=east,orientation=north,state=u": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_u"}, - "facing=east,orientation=north,state=ud": {"y": 90, "x": 0, "model": "computercraft:block/monitor_advanced_ud"}, - "facing=east,orientation=up,state=d": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_d"}, - "facing=east,orientation=up,state=l": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_l"}, - "facing=east,orientation=up,state=ld": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_ld"}, - "facing=east,orientation=up,state=lr": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_lr"}, - "facing=east,orientation=up,state=lrd": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_lrd"}, - "facing=east,orientation=up,state=lru": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_lru"}, - "facing=east,orientation=up,state=lrud": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_lrud"}, - "facing=east,orientation=up,state=lu": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_lu"}, - "facing=east,orientation=up,state=lud": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_lud"}, - "facing=east,orientation=up,state=none": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced"}, - "facing=east,orientation=up,state=r": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_r"}, - "facing=east,orientation=up,state=rd": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_rd"}, - "facing=east,orientation=up,state=ru": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_ru"}, - "facing=east,orientation=up,state=rud": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_rud"}, - "facing=east,orientation=up,state=u": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_u"}, - "facing=east,orientation=up,state=ud": {"y": 90, "x": 270, "model": "computercraft:block/monitor_advanced_ud"}, - "facing=north,orientation=down,state=d": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_d"}, - "facing=north,orientation=down,state=l": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_l"}, - "facing=north,orientation=down,state=ld": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_ld"}, - "facing=north,orientation=down,state=lr": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_lr"}, - "facing=north,orientation=down,state=lrd": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_lrd"}, - "facing=north,orientation=down,state=lru": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_lru"}, + "facing=east,orientation=north,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 0, "y": 90}, + "facing=east,orientation=north,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 0, "y": 90}, + "facing=east,orientation=north,state=none": {"model": "computercraft:block/monitor_advanced", "x": 0, "y": 90}, + "facing=east,orientation=north,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 0, "y": 90}, + "facing=east,orientation=north,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 0, "y": 90}, + "facing=east,orientation=north,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 0, "y": 90}, + "facing=east,orientation=north,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 0, "y": 90}, + "facing=east,orientation=north,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 0, "y": 90}, + "facing=east,orientation=north,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 0, "y": 90}, + "facing=east,orientation=up,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 270, "y": 90}, + "facing=east,orientation=up,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 270, "y": 90}, + "facing=east,orientation=up,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 270, "y": 90}, + "facing=east,orientation=up,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 270, "y": 90}, + "facing=east,orientation=up,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 270, "y": 90}, + "facing=east,orientation=up,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 270, "y": 90}, + "facing=east,orientation=up,state=lrud": {"model": "computercraft:block/monitor_advanced_lrud", "x": 270, "y": 90}, + "facing=east,orientation=up,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 270, "y": 90}, + "facing=east,orientation=up,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 270, "y": 90}, + "facing=east,orientation=up,state=none": {"model": "computercraft:block/monitor_advanced", "x": 270, "y": 90}, + "facing=east,orientation=up,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 270, "y": 90}, + "facing=east,orientation=up,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 270, "y": 90}, + "facing=east,orientation=up,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 270, "y": 90}, + "facing=east,orientation=up,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 270, "y": 90}, + "facing=east,orientation=up,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 270, "y": 90}, + "facing=east,orientation=up,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 270, "y": 90}, + "facing=north,orientation=down,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 90, "y": 0}, + "facing=north,orientation=down,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 90, "y": 0}, + "facing=north,orientation=down,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 90, "y": 0}, + "facing=north,orientation=down,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 90, "y": 0}, + "facing=north,orientation=down,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 90, "y": 0}, + "facing=north,orientation=down,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 90, "y": 0}, "facing=north,orientation=down,state=lrud": { - "y": 0, + "model": "computercraft:block/monitor_advanced_lrud", "x": 90, - "model": "computercraft:block/monitor_advanced_lrud" + "y": 0 }, - "facing=north,orientation=down,state=lu": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_lu"}, - "facing=north,orientation=down,state=lud": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_lud"}, - "facing=north,orientation=down,state=none": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced"}, - "facing=north,orientation=down,state=r": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_r"}, - "facing=north,orientation=down,state=rd": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_rd"}, - "facing=north,orientation=down,state=ru": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_ru"}, - "facing=north,orientation=down,state=rud": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_rud"}, - "facing=north,orientation=down,state=u": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_u"}, - "facing=north,orientation=down,state=ud": {"y": 0, "x": 90, "model": "computercraft:block/monitor_advanced_ud"}, - "facing=north,orientation=north,state=d": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_d"}, - "facing=north,orientation=north,state=l": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_l"}, - "facing=north,orientation=north,state=ld": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_ld"}, - "facing=north,orientation=north,state=lr": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_lr"}, - "facing=north,orientation=north,state=lrd": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_lrd"}, - "facing=north,orientation=north,state=lru": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_lru"}, + "facing=north,orientation=down,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 90, "y": 0}, + "facing=north,orientation=down,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 90, "y": 0}, + "facing=north,orientation=down,state=none": {"model": "computercraft:block/monitor_advanced", "x": 90, "y": 0}, + "facing=north,orientation=down,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 90, "y": 0}, + "facing=north,orientation=down,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 90, "y": 0}, + "facing=north,orientation=down,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 90, "y": 0}, + "facing=north,orientation=down,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 90, "y": 0}, + "facing=north,orientation=down,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 90, "y": 0}, + "facing=north,orientation=down,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 90, "y": 0}, + "facing=north,orientation=north,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 0, "y": 0}, + "facing=north,orientation=north,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 0, "y": 0}, + "facing=north,orientation=north,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 0, "y": 0}, + "facing=north,orientation=north,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 0, "y": 0}, + "facing=north,orientation=north,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 0, "y": 0}, + "facing=north,orientation=north,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 0, "y": 0}, "facing=north,orientation=north,state=lrud": { - "y": 0, + "model": "computercraft:block/monitor_advanced_lrud", "x": 0, - "model": "computercraft:block/monitor_advanced_lrud" + "y": 0 }, - "facing=north,orientation=north,state=lu": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_lu"}, - "facing=north,orientation=north,state=lud": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_lud"}, - "facing=north,orientation=north,state=none": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced"}, - "facing=north,orientation=north,state=r": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_r"}, - "facing=north,orientation=north,state=rd": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_rd"}, - "facing=north,orientation=north,state=ru": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_ru"}, - "facing=north,orientation=north,state=rud": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_rud"}, - "facing=north,orientation=north,state=u": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_u"}, - "facing=north,orientation=north,state=ud": {"y": 0, "x": 0, "model": "computercraft:block/monitor_advanced_ud"}, - "facing=north,orientation=up,state=d": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_d"}, - "facing=north,orientation=up,state=l": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_l"}, - "facing=north,orientation=up,state=ld": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_ld"}, - "facing=north,orientation=up,state=lr": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_lr"}, - "facing=north,orientation=up,state=lrd": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_lrd"}, - "facing=north,orientation=up,state=lru": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_lru"}, - "facing=north,orientation=up,state=lrud": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_lrud"}, - "facing=north,orientation=up,state=lu": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_lu"}, - "facing=north,orientation=up,state=lud": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_lud"}, - "facing=north,orientation=up,state=none": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced"}, - "facing=north,orientation=up,state=r": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_r"}, - "facing=north,orientation=up,state=rd": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_rd"}, - "facing=north,orientation=up,state=ru": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_ru"}, - "facing=north,orientation=up,state=rud": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_rud"}, - "facing=north,orientation=up,state=u": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_u"}, - "facing=north,orientation=up,state=ud": {"y": 0, "x": 270, "model": "computercraft:block/monitor_advanced_ud"}, - "facing=south,orientation=down,state=d": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_d"}, - "facing=south,orientation=down,state=l": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_l"}, - "facing=south,orientation=down,state=ld": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_ld"}, - "facing=south,orientation=down,state=lr": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_lr"}, + "facing=north,orientation=north,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 0, "y": 0}, + "facing=north,orientation=north,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 0, "y": 0}, + "facing=north,orientation=north,state=none": {"model": "computercraft:block/monitor_advanced", "x": 0, "y": 0}, + "facing=north,orientation=north,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 0, "y": 0}, + "facing=north,orientation=north,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 0, "y": 0}, + "facing=north,orientation=north,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 0, "y": 0}, + "facing=north,orientation=north,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 0, "y": 0}, + "facing=north,orientation=north,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 0, "y": 0}, + "facing=north,orientation=north,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 0, "y": 0}, + "facing=north,orientation=up,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 270, "y": 0}, + "facing=north,orientation=up,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 270, "y": 0}, + "facing=north,orientation=up,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 270, "y": 0}, + "facing=north,orientation=up,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 270, "y": 0}, + "facing=north,orientation=up,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 270, "y": 0}, + "facing=north,orientation=up,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 270, "y": 0}, + "facing=north,orientation=up,state=lrud": {"model": "computercraft:block/monitor_advanced_lrud", "x": 270, "y": 0}, + "facing=north,orientation=up,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 270, "y": 0}, + "facing=north,orientation=up,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 270, "y": 0}, + "facing=north,orientation=up,state=none": {"model": "computercraft:block/monitor_advanced", "x": 270, "y": 0}, + "facing=north,orientation=up,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 270, "y": 0}, + "facing=north,orientation=up,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 270, "y": 0}, + "facing=north,orientation=up,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 270, "y": 0}, + "facing=north,orientation=up,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 270, "y": 0}, + "facing=north,orientation=up,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 270, "y": 0}, + "facing=north,orientation=up,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 270, "y": 0}, + "facing=south,orientation=down,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 90, "y": 180}, + "facing=south,orientation=down,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 90, "y": 180}, + "facing=south,orientation=down,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 90, "y": 180}, + "facing=south,orientation=down,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 90, "y": 180}, "facing=south,orientation=down,state=lrd": { - "y": 180, + "model": "computercraft:block/monitor_advanced_lrd", "x": 90, - "model": "computercraft:block/monitor_advanced_lrd" + "y": 180 }, "facing=south,orientation=down,state=lru": { - "y": 180, + "model": "computercraft:block/monitor_advanced_lru", "x": 90, - "model": "computercraft:block/monitor_advanced_lru" + "y": 180 }, "facing=south,orientation=down,state=lrud": { - "y": 180, + "model": "computercraft:block/monitor_advanced_lrud", "x": 90, - "model": "computercraft:block/monitor_advanced_lrud" + "y": 180 }, - "facing=south,orientation=down,state=lu": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_lu"}, + "facing=south,orientation=down,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 90, "y": 180}, "facing=south,orientation=down,state=lud": { - "y": 180, + "model": "computercraft:block/monitor_advanced_lud", "x": 90, - "model": "computercraft:block/monitor_advanced_lud" + "y": 180 }, - "facing=south,orientation=down,state=none": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced"}, - "facing=south,orientation=down,state=r": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_r"}, - "facing=south,orientation=down,state=rd": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_rd"}, - "facing=south,orientation=down,state=ru": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_ru"}, + "facing=south,orientation=down,state=none": {"model": "computercraft:block/monitor_advanced", "x": 90, "y": 180}, + "facing=south,orientation=down,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 90, "y": 180}, + "facing=south,orientation=down,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 90, "y": 180}, + "facing=south,orientation=down,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 90, "y": 180}, "facing=south,orientation=down,state=rud": { - "y": 180, + "model": "computercraft:block/monitor_advanced_rud", "x": 90, - "model": "computercraft:block/monitor_advanced_rud" + "y": 180 }, - "facing=south,orientation=down,state=u": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_u"}, - "facing=south,orientation=down,state=ud": {"y": 180, "x": 90, "model": "computercraft:block/monitor_advanced_ud"}, - "facing=south,orientation=north,state=d": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_d"}, - "facing=south,orientation=north,state=l": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_l"}, - "facing=south,orientation=north,state=ld": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_ld"}, - "facing=south,orientation=north,state=lr": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_lr"}, + "facing=south,orientation=down,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 90, "y": 180}, + "facing=south,orientation=down,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 90, "y": 180}, + "facing=south,orientation=north,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 0, "y": 180}, + "facing=south,orientation=north,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 0, "y": 180}, + "facing=south,orientation=north,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 0, "y": 180}, + "facing=south,orientation=north,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 0, "y": 180}, "facing=south,orientation=north,state=lrd": { - "y": 180, + "model": "computercraft:block/monitor_advanced_lrd", "x": 0, - "model": "computercraft:block/monitor_advanced_lrd" + "y": 180 }, "facing=south,orientation=north,state=lru": { - "y": 180, + "model": "computercraft:block/monitor_advanced_lru", "x": 0, - "model": "computercraft:block/monitor_advanced_lru" + "y": 180 }, "facing=south,orientation=north,state=lrud": { - "y": 180, + "model": "computercraft:block/monitor_advanced_lrud", "x": 0, - "model": "computercraft:block/monitor_advanced_lrud" + "y": 180 }, - "facing=south,orientation=north,state=lu": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_lu"}, + "facing=south,orientation=north,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 0, "y": 180}, "facing=south,orientation=north,state=lud": { - "y": 180, + "model": "computercraft:block/monitor_advanced_lud", "x": 0, - "model": "computercraft:block/monitor_advanced_lud" + "y": 180 }, - "facing=south,orientation=north,state=none": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced"}, - "facing=south,orientation=north,state=r": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_r"}, - "facing=south,orientation=north,state=rd": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_rd"}, - "facing=south,orientation=north,state=ru": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_ru"}, + "facing=south,orientation=north,state=none": {"model": "computercraft:block/monitor_advanced", "x": 0, "y": 180}, + "facing=south,orientation=north,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 0, "y": 180}, + "facing=south,orientation=north,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 0, "y": 180}, + "facing=south,orientation=north,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 0, "y": 180}, "facing=south,orientation=north,state=rud": { - "y": 180, + "model": "computercraft:block/monitor_advanced_rud", "x": 0, - "model": "computercraft:block/monitor_advanced_rud" + "y": 180 }, - "facing=south,orientation=north,state=u": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_u"}, - "facing=south,orientation=north,state=ud": {"y": 180, "x": 0, "model": "computercraft:block/monitor_advanced_ud"}, - "facing=south,orientation=up,state=d": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_d"}, - "facing=south,orientation=up,state=l": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_l"}, - "facing=south,orientation=up,state=ld": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_ld"}, - "facing=south,orientation=up,state=lr": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_lr"}, - "facing=south,orientation=up,state=lrd": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_lrd"}, - "facing=south,orientation=up,state=lru": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_lru"}, + "facing=south,orientation=north,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 0, "y": 180}, + "facing=south,orientation=north,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 0, "y": 180}, + "facing=south,orientation=up,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 270, "y": 180}, + "facing=south,orientation=up,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 270, "y": 180}, + "facing=south,orientation=up,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 270, "y": 180}, + "facing=south,orientation=up,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 270, "y": 180}, + "facing=south,orientation=up,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 270, "y": 180}, + "facing=south,orientation=up,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 270, "y": 180}, "facing=south,orientation=up,state=lrud": { - "y": 180, + "model": "computercraft:block/monitor_advanced_lrud", "x": 270, - "model": "computercraft:block/monitor_advanced_lrud" + "y": 180 }, - "facing=south,orientation=up,state=lu": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_lu"}, - "facing=south,orientation=up,state=lud": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_lud"}, - "facing=south,orientation=up,state=none": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced"}, - "facing=south,orientation=up,state=r": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_r"}, - "facing=south,orientation=up,state=rd": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_rd"}, - "facing=south,orientation=up,state=ru": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_ru"}, - "facing=south,orientation=up,state=rud": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_rud"}, - "facing=south,orientation=up,state=u": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_u"}, - "facing=south,orientation=up,state=ud": {"y": 180, "x": 270, "model": "computercraft:block/monitor_advanced_ud"}, - "facing=west,orientation=down,state=d": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_d"}, - "facing=west,orientation=down,state=l": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_l"}, - "facing=west,orientation=down,state=ld": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_ld"}, - "facing=west,orientation=down,state=lr": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_lr"}, - "facing=west,orientation=down,state=lrd": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_lrd"}, - "facing=west,orientation=down,state=lru": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_lru"}, + "facing=south,orientation=up,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 270, "y": 180}, + "facing=south,orientation=up,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 270, "y": 180}, + "facing=south,orientation=up,state=none": {"model": "computercraft:block/monitor_advanced", "x": 270, "y": 180}, + "facing=south,orientation=up,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 270, "y": 180}, + "facing=south,orientation=up,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 270, "y": 180}, + "facing=south,orientation=up,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 270, "y": 180}, + "facing=south,orientation=up,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 270, "y": 180}, + "facing=south,orientation=up,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 270, "y": 180}, + "facing=south,orientation=up,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 270, "y": 180}, + "facing=west,orientation=down,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 90, "y": 270}, + "facing=west,orientation=down,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 90, "y": 270}, + "facing=west,orientation=down,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 90, "y": 270}, + "facing=west,orientation=down,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 90, "y": 270}, + "facing=west,orientation=down,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 90, "y": 270}, + "facing=west,orientation=down,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 90, "y": 270}, "facing=west,orientation=down,state=lrud": { - "y": 270, + "model": "computercraft:block/monitor_advanced_lrud", "x": 90, - "model": "computercraft:block/monitor_advanced_lrud" + "y": 270 }, - "facing=west,orientation=down,state=lu": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_lu"}, - "facing=west,orientation=down,state=lud": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_lud"}, - "facing=west,orientation=down,state=none": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced"}, - "facing=west,orientation=down,state=r": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_r"}, - "facing=west,orientation=down,state=rd": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_rd"}, - "facing=west,orientation=down,state=ru": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_ru"}, - "facing=west,orientation=down,state=rud": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_rud"}, - "facing=west,orientation=down,state=u": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_u"}, - "facing=west,orientation=down,state=ud": {"y": 270, "x": 90, "model": "computercraft:block/monitor_advanced_ud"}, - "facing=west,orientation=north,state=d": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_d"}, - "facing=west,orientation=north,state=l": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_l"}, - "facing=west,orientation=north,state=ld": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_ld"}, - "facing=west,orientation=north,state=lr": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_lr"}, - "facing=west,orientation=north,state=lrd": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_lrd"}, - "facing=west,orientation=north,state=lru": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_lru"}, + "facing=west,orientation=down,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 90, "y": 270}, + "facing=west,orientation=down,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 90, "y": 270}, + "facing=west,orientation=down,state=none": {"model": "computercraft:block/monitor_advanced", "x": 90, "y": 270}, + "facing=west,orientation=down,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 90, "y": 270}, + "facing=west,orientation=down,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 90, "y": 270}, + "facing=west,orientation=down,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 90, "y": 270}, + "facing=west,orientation=down,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 90, "y": 270}, + "facing=west,orientation=down,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 90, "y": 270}, + "facing=west,orientation=down,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 90, "y": 270}, + "facing=west,orientation=north,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 0, "y": 270}, + "facing=west,orientation=north,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 0, "y": 270}, + "facing=west,orientation=north,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 0, "y": 270}, + "facing=west,orientation=north,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 0, "y": 270}, + "facing=west,orientation=north,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 0, "y": 270}, + "facing=west,orientation=north,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 0, "y": 270}, "facing=west,orientation=north,state=lrud": { - "y": 270, + "model": "computercraft:block/monitor_advanced_lrud", "x": 0, - "model": "computercraft:block/monitor_advanced_lrud" + "y": 270 }, - "facing=west,orientation=north,state=lu": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_lu"}, - "facing=west,orientation=north,state=lud": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_lud"}, - "facing=west,orientation=north,state=none": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced"}, - "facing=west,orientation=north,state=r": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_r"}, - "facing=west,orientation=north,state=rd": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_rd"}, - "facing=west,orientation=north,state=ru": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_ru"}, - "facing=west,orientation=north,state=rud": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_rud"}, - "facing=west,orientation=north,state=u": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_u"}, - "facing=west,orientation=north,state=ud": {"y": 270, "x": 0, "model": "computercraft:block/monitor_advanced_ud"}, - "facing=west,orientation=up,state=d": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_d"}, - "facing=west,orientation=up,state=l": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_l"}, - "facing=west,orientation=up,state=ld": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_ld"}, - "facing=west,orientation=up,state=lr": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_lr"}, - "facing=west,orientation=up,state=lrd": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_lrd"}, - "facing=west,orientation=up,state=lru": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_lru"}, + "facing=west,orientation=north,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 0, "y": 270}, + "facing=west,orientation=north,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 0, "y": 270}, + "facing=west,orientation=north,state=none": {"model": "computercraft:block/monitor_advanced", "x": 0, "y": 270}, + "facing=west,orientation=north,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 0, "y": 270}, + "facing=west,orientation=north,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 0, "y": 270}, + "facing=west,orientation=north,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 0, "y": 270}, + "facing=west,orientation=north,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 0, "y": 270}, + "facing=west,orientation=north,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 0, "y": 270}, + "facing=west,orientation=north,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 0, "y": 270}, + "facing=west,orientation=up,state=d": {"model": "computercraft:block/monitor_advanced_d", "x": 270, "y": 270}, + "facing=west,orientation=up,state=l": {"model": "computercraft:block/monitor_advanced_l", "x": 270, "y": 270}, + "facing=west,orientation=up,state=ld": {"model": "computercraft:block/monitor_advanced_ld", "x": 270, "y": 270}, + "facing=west,orientation=up,state=lr": {"model": "computercraft:block/monitor_advanced_lr", "x": 270, "y": 270}, + "facing=west,orientation=up,state=lrd": {"model": "computercraft:block/monitor_advanced_lrd", "x": 270, "y": 270}, + "facing=west,orientation=up,state=lru": {"model": "computercraft:block/monitor_advanced_lru", "x": 270, "y": 270}, "facing=west,orientation=up,state=lrud": { - "y": 270, + "model": "computercraft:block/monitor_advanced_lrud", "x": 270, - "model": "computercraft:block/monitor_advanced_lrud" + "y": 270 }, - "facing=west,orientation=up,state=lu": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_lu"}, - "facing=west,orientation=up,state=lud": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_lud"}, - "facing=west,orientation=up,state=none": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced"}, - "facing=west,orientation=up,state=r": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_r"}, - "facing=west,orientation=up,state=rd": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_rd"}, - "facing=west,orientation=up,state=ru": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_ru"}, - "facing=west,orientation=up,state=rud": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_rud"}, - "facing=west,orientation=up,state=u": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_u"}, - "facing=west,orientation=up,state=ud": {"y": 270, "x": 270, "model": "computercraft:block/monitor_advanced_ud"} + "facing=west,orientation=up,state=lu": {"model": "computercraft:block/monitor_advanced_lu", "x": 270, "y": 270}, + "facing=west,orientation=up,state=lud": {"model": "computercraft:block/monitor_advanced_lud", "x": 270, "y": 270}, + "facing=west,orientation=up,state=none": {"model": "computercraft:block/monitor_advanced", "x": 270, "y": 270}, + "facing=west,orientation=up,state=r": {"model": "computercraft:block/monitor_advanced_r", "x": 270, "y": 270}, + "facing=west,orientation=up,state=rd": {"model": "computercraft:block/monitor_advanced_rd", "x": 270, "y": 270}, + "facing=west,orientation=up,state=ru": {"model": "computercraft:block/monitor_advanced_ru", "x": 270, "y": 270}, + "facing=west,orientation=up,state=rud": {"model": "computercraft:block/monitor_advanced_rud", "x": 270, "y": 270}, + "facing=west,orientation=up,state=u": {"model": "computercraft:block/monitor_advanced_u", "x": 270, "y": 270}, + "facing=west,orientation=up,state=ud": {"model": "computercraft:block/monitor_advanced_ud", "x": 270, "y": 270} } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/blockstates/monitor_normal.json b/src/generated/resources/assets/computercraft/blockstates/monitor_normal.json index a92b23f98..6c966368b 100644 --- a/src/generated/resources/assets/computercraft/blockstates/monitor_normal.json +++ b/src/generated/resources/assets/computercraft/blockstates/monitor_normal.json @@ -1,204 +1,204 @@ { "variants": { - "facing=east,orientation=down,state=d": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_d"}, - "facing=east,orientation=down,state=l": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_l"}, - "facing=east,orientation=down,state=ld": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_ld"}, - "facing=east,orientation=down,state=lr": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_lr"}, - "facing=east,orientation=down,state=lrd": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_lrd"}, - "facing=east,orientation=down,state=lru": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_lru"}, - "facing=east,orientation=down,state=lrud": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_lrud"}, - "facing=east,orientation=down,state=lu": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_lu"}, - "facing=east,orientation=down,state=lud": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_lud"}, - "facing=east,orientation=down,state=none": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal"}, - "facing=east,orientation=down,state=r": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_r"}, - "facing=east,orientation=down,state=rd": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_rd"}, - "facing=east,orientation=down,state=ru": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_ru"}, - "facing=east,orientation=down,state=rud": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_rud"}, - "facing=east,orientation=down,state=u": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_u"}, - "facing=east,orientation=down,state=ud": {"y": 90, "x": 90, "model": "computercraft:block/monitor_normal_ud"}, - "facing=east,orientation=north,state=d": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_d"}, - "facing=east,orientation=north,state=l": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_l"}, - "facing=east,orientation=north,state=ld": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_ld"}, - "facing=east,orientation=north,state=lr": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_lr"}, - "facing=east,orientation=north,state=lrd": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_lrd"}, - "facing=east,orientation=north,state=lru": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_lru"}, - "facing=east,orientation=north,state=lrud": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_lrud"}, - "facing=east,orientation=north,state=lu": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_lu"}, - "facing=east,orientation=north,state=lud": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_lud"}, - "facing=east,orientation=north,state=none": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal"}, - "facing=east,orientation=north,state=r": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_r"}, - "facing=east,orientation=north,state=rd": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_rd"}, - "facing=east,orientation=north,state=ru": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_ru"}, - "facing=east,orientation=north,state=rud": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_rud"}, - "facing=east,orientation=north,state=u": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_u"}, - "facing=east,orientation=north,state=ud": {"y": 90, "x": 0, "model": "computercraft:block/monitor_normal_ud"}, - "facing=east,orientation=up,state=d": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_d"}, - "facing=east,orientation=up,state=l": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_l"}, - "facing=east,orientation=up,state=ld": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_ld"}, - "facing=east,orientation=up,state=lr": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_lr"}, - "facing=east,orientation=up,state=lrd": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_lrd"}, - "facing=east,orientation=up,state=lru": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_lru"}, - "facing=east,orientation=up,state=lrud": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_lrud"}, - "facing=east,orientation=up,state=lu": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_lu"}, - "facing=east,orientation=up,state=lud": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_lud"}, - "facing=east,orientation=up,state=none": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal"}, - "facing=east,orientation=up,state=r": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_r"}, - "facing=east,orientation=up,state=rd": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_rd"}, - "facing=east,orientation=up,state=ru": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_ru"}, - "facing=east,orientation=up,state=rud": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_rud"}, - "facing=east,orientation=up,state=u": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_u"}, - "facing=east,orientation=up,state=ud": {"y": 90, "x": 270, "model": "computercraft:block/monitor_normal_ud"}, - "facing=north,orientation=down,state=d": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_d"}, - "facing=north,orientation=down,state=l": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_l"}, - "facing=north,orientation=down,state=ld": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_ld"}, - "facing=north,orientation=down,state=lr": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_lr"}, - "facing=north,orientation=down,state=lrd": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_lrd"}, - "facing=north,orientation=down,state=lru": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_lru"}, - "facing=north,orientation=down,state=lrud": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_lrud"}, - "facing=north,orientation=down,state=lu": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_lu"}, - "facing=north,orientation=down,state=lud": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_lud"}, - "facing=north,orientation=down,state=none": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal"}, - "facing=north,orientation=down,state=r": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_r"}, - "facing=north,orientation=down,state=rd": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_rd"}, - "facing=north,orientation=down,state=ru": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_ru"}, - "facing=north,orientation=down,state=rud": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_rud"}, - "facing=north,orientation=down,state=u": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_u"}, - "facing=north,orientation=down,state=ud": {"y": 0, "x": 90, "model": "computercraft:block/monitor_normal_ud"}, - "facing=north,orientation=north,state=d": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_d"}, - "facing=north,orientation=north,state=l": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_l"}, - "facing=north,orientation=north,state=ld": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_ld"}, - "facing=north,orientation=north,state=lr": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_lr"}, - "facing=north,orientation=north,state=lrd": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_lrd"}, - "facing=north,orientation=north,state=lru": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_lru"}, - "facing=north,orientation=north,state=lrud": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_lrud"}, - "facing=north,orientation=north,state=lu": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_lu"}, - "facing=north,orientation=north,state=lud": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_lud"}, - "facing=north,orientation=north,state=none": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal"}, - "facing=north,orientation=north,state=r": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_r"}, - "facing=north,orientation=north,state=rd": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_rd"}, - "facing=north,orientation=north,state=ru": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_ru"}, - "facing=north,orientation=north,state=rud": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_rud"}, - "facing=north,orientation=north,state=u": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_u"}, - "facing=north,orientation=north,state=ud": {"y": 0, "x": 0, "model": "computercraft:block/monitor_normal_ud"}, - "facing=north,orientation=up,state=d": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_d"}, - "facing=north,orientation=up,state=l": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_l"}, - "facing=north,orientation=up,state=ld": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_ld"}, - "facing=north,orientation=up,state=lr": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_lr"}, - "facing=north,orientation=up,state=lrd": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_lrd"}, - "facing=north,orientation=up,state=lru": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_lru"}, - "facing=north,orientation=up,state=lrud": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_lrud"}, - "facing=north,orientation=up,state=lu": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_lu"}, - "facing=north,orientation=up,state=lud": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_lud"}, - "facing=north,orientation=up,state=none": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal"}, - "facing=north,orientation=up,state=r": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_r"}, - "facing=north,orientation=up,state=rd": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_rd"}, - "facing=north,orientation=up,state=ru": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_ru"}, - "facing=north,orientation=up,state=rud": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_rud"}, - "facing=north,orientation=up,state=u": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_u"}, - "facing=north,orientation=up,state=ud": {"y": 0, "x": 270, "model": "computercraft:block/monitor_normal_ud"}, - "facing=south,orientation=down,state=d": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_d"}, - "facing=south,orientation=down,state=l": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_l"}, - "facing=south,orientation=down,state=ld": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_ld"}, - "facing=south,orientation=down,state=lr": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_lr"}, - "facing=south,orientation=down,state=lrd": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_lrd"}, - "facing=south,orientation=down,state=lru": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_lru"}, + "facing=east,orientation=down,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 90, "y": 90}, + "facing=east,orientation=down,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 90, "y": 90}, + "facing=east,orientation=down,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 90, "y": 90}, + "facing=east,orientation=down,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 90, "y": 90}, + "facing=east,orientation=down,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 90, "y": 90}, + "facing=east,orientation=down,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 90, "y": 90}, + "facing=east,orientation=down,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 90, "y": 90}, + "facing=east,orientation=down,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 90, "y": 90}, + "facing=east,orientation=down,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 90, "y": 90}, + "facing=east,orientation=down,state=none": {"model": "computercraft:block/monitor_normal", "x": 90, "y": 90}, + "facing=east,orientation=down,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 90, "y": 90}, + "facing=east,orientation=down,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 90, "y": 90}, + "facing=east,orientation=down,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 90, "y": 90}, + "facing=east,orientation=down,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 90, "y": 90}, + "facing=east,orientation=down,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 90, "y": 90}, + "facing=east,orientation=down,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 90, "y": 90}, + "facing=east,orientation=north,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 0, "y": 90}, + "facing=east,orientation=north,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 0, "y": 90}, + "facing=east,orientation=north,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 0, "y": 90}, + "facing=east,orientation=north,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 0, "y": 90}, + "facing=east,orientation=north,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 0, "y": 90}, + "facing=east,orientation=north,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 0, "y": 90}, + "facing=east,orientation=north,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 0, "y": 90}, + "facing=east,orientation=north,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 0, "y": 90}, + "facing=east,orientation=north,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 0, "y": 90}, + "facing=east,orientation=north,state=none": {"model": "computercraft:block/monitor_normal", "x": 0, "y": 90}, + "facing=east,orientation=north,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 0, "y": 90}, + "facing=east,orientation=north,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 0, "y": 90}, + "facing=east,orientation=north,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 0, "y": 90}, + "facing=east,orientation=north,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 0, "y": 90}, + "facing=east,orientation=north,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 0, "y": 90}, + "facing=east,orientation=north,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 0, "y": 90}, + "facing=east,orientation=up,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 270, "y": 90}, + "facing=east,orientation=up,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 270, "y": 90}, + "facing=east,orientation=up,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 270, "y": 90}, + "facing=east,orientation=up,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 270, "y": 90}, + "facing=east,orientation=up,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 270, "y": 90}, + "facing=east,orientation=up,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 270, "y": 90}, + "facing=east,orientation=up,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 270, "y": 90}, + "facing=east,orientation=up,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 270, "y": 90}, + "facing=east,orientation=up,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 270, "y": 90}, + "facing=east,orientation=up,state=none": {"model": "computercraft:block/monitor_normal", "x": 270, "y": 90}, + "facing=east,orientation=up,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 270, "y": 90}, + "facing=east,orientation=up,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 270, "y": 90}, + "facing=east,orientation=up,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 270, "y": 90}, + "facing=east,orientation=up,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 270, "y": 90}, + "facing=east,orientation=up,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 270, "y": 90}, + "facing=east,orientation=up,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 270, "y": 90}, + "facing=north,orientation=down,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 90, "y": 0}, + "facing=north,orientation=down,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 90, "y": 0}, + "facing=north,orientation=down,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 90, "y": 0}, + "facing=north,orientation=down,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 90, "y": 0}, + "facing=north,orientation=down,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 90, "y": 0}, + "facing=north,orientation=down,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 90, "y": 0}, + "facing=north,orientation=down,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 90, "y": 0}, + "facing=north,orientation=down,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 90, "y": 0}, + "facing=north,orientation=down,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 90, "y": 0}, + "facing=north,orientation=down,state=none": {"model": "computercraft:block/monitor_normal", "x": 90, "y": 0}, + "facing=north,orientation=down,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 90, "y": 0}, + "facing=north,orientation=down,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 90, "y": 0}, + "facing=north,orientation=down,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 90, "y": 0}, + "facing=north,orientation=down,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 90, "y": 0}, + "facing=north,orientation=down,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 90, "y": 0}, + "facing=north,orientation=down,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 90, "y": 0}, + "facing=north,orientation=north,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 0, "y": 0}, + "facing=north,orientation=north,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 0, "y": 0}, + "facing=north,orientation=north,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 0, "y": 0}, + "facing=north,orientation=north,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 0, "y": 0}, + "facing=north,orientation=north,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 0, "y": 0}, + "facing=north,orientation=north,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 0, "y": 0}, + "facing=north,orientation=north,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 0, "y": 0}, + "facing=north,orientation=north,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 0, "y": 0}, + "facing=north,orientation=north,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 0, "y": 0}, + "facing=north,orientation=north,state=none": {"model": "computercraft:block/monitor_normal", "x": 0, "y": 0}, + "facing=north,orientation=north,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 0, "y": 0}, + "facing=north,orientation=north,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 0, "y": 0}, + "facing=north,orientation=north,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 0, "y": 0}, + "facing=north,orientation=north,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 0, "y": 0}, + "facing=north,orientation=north,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 0, "y": 0}, + "facing=north,orientation=north,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 0, "y": 0}, + "facing=north,orientation=up,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 270, "y": 0}, + "facing=north,orientation=up,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 270, "y": 0}, + "facing=north,orientation=up,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 270, "y": 0}, + "facing=north,orientation=up,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 270, "y": 0}, + "facing=north,orientation=up,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 270, "y": 0}, + "facing=north,orientation=up,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 270, "y": 0}, + "facing=north,orientation=up,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 270, "y": 0}, + "facing=north,orientation=up,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 270, "y": 0}, + "facing=north,orientation=up,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 270, "y": 0}, + "facing=north,orientation=up,state=none": {"model": "computercraft:block/monitor_normal", "x": 270, "y": 0}, + "facing=north,orientation=up,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 270, "y": 0}, + "facing=north,orientation=up,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 270, "y": 0}, + "facing=north,orientation=up,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 270, "y": 0}, + "facing=north,orientation=up,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 270, "y": 0}, + "facing=north,orientation=up,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 270, "y": 0}, + "facing=north,orientation=up,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 270, "y": 0}, + "facing=south,orientation=down,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 90, "y": 180}, + "facing=south,orientation=down,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 90, "y": 180}, + "facing=south,orientation=down,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 90, "y": 180}, + "facing=south,orientation=down,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 90, "y": 180}, + "facing=south,orientation=down,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 90, "y": 180}, + "facing=south,orientation=down,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 90, "y": 180}, "facing=south,orientation=down,state=lrud": { - "y": 180, + "model": "computercraft:block/monitor_normal_lrud", "x": 90, - "model": "computercraft:block/monitor_normal_lrud" + "y": 180 }, - "facing=south,orientation=down,state=lu": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_lu"}, - "facing=south,orientation=down,state=lud": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_lud"}, - "facing=south,orientation=down,state=none": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal"}, - "facing=south,orientation=down,state=r": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_r"}, - "facing=south,orientation=down,state=rd": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_rd"}, - "facing=south,orientation=down,state=ru": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_ru"}, - "facing=south,orientation=down,state=rud": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_rud"}, - "facing=south,orientation=down,state=u": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_u"}, - "facing=south,orientation=down,state=ud": {"y": 180, "x": 90, "model": "computercraft:block/monitor_normal_ud"}, - "facing=south,orientation=north,state=d": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_d"}, - "facing=south,orientation=north,state=l": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_l"}, - "facing=south,orientation=north,state=ld": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_ld"}, - "facing=south,orientation=north,state=lr": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_lr"}, - "facing=south,orientation=north,state=lrd": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_lrd"}, - "facing=south,orientation=north,state=lru": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_lru"}, + "facing=south,orientation=down,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 90, "y": 180}, + "facing=south,orientation=down,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 90, "y": 180}, + "facing=south,orientation=down,state=none": {"model": "computercraft:block/monitor_normal", "x": 90, "y": 180}, + "facing=south,orientation=down,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 90, "y": 180}, + "facing=south,orientation=down,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 90, "y": 180}, + "facing=south,orientation=down,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 90, "y": 180}, + "facing=south,orientation=down,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 90, "y": 180}, + "facing=south,orientation=down,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 90, "y": 180}, + "facing=south,orientation=down,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 90, "y": 180}, + "facing=south,orientation=north,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 0, "y": 180}, + "facing=south,orientation=north,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 0, "y": 180}, + "facing=south,orientation=north,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 0, "y": 180}, + "facing=south,orientation=north,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 0, "y": 180}, + "facing=south,orientation=north,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 0, "y": 180}, + "facing=south,orientation=north,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 0, "y": 180}, "facing=south,orientation=north,state=lrud": { - "y": 180, + "model": "computercraft:block/monitor_normal_lrud", "x": 0, - "model": "computercraft:block/monitor_normal_lrud" + "y": 180 }, - "facing=south,orientation=north,state=lu": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_lu"}, - "facing=south,orientation=north,state=lud": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_lud"}, - "facing=south,orientation=north,state=none": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal"}, - "facing=south,orientation=north,state=r": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_r"}, - "facing=south,orientation=north,state=rd": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_rd"}, - "facing=south,orientation=north,state=ru": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_ru"}, - "facing=south,orientation=north,state=rud": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_rud"}, - "facing=south,orientation=north,state=u": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_u"}, - "facing=south,orientation=north,state=ud": {"y": 180, "x": 0, "model": "computercraft:block/monitor_normal_ud"}, - "facing=south,orientation=up,state=d": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_d"}, - "facing=south,orientation=up,state=l": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_l"}, - "facing=south,orientation=up,state=ld": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_ld"}, - "facing=south,orientation=up,state=lr": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_lr"}, - "facing=south,orientation=up,state=lrd": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_lrd"}, - "facing=south,orientation=up,state=lru": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_lru"}, - "facing=south,orientation=up,state=lrud": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_lrud"}, - "facing=south,orientation=up,state=lu": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_lu"}, - "facing=south,orientation=up,state=lud": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_lud"}, - "facing=south,orientation=up,state=none": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal"}, - "facing=south,orientation=up,state=r": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_r"}, - "facing=south,orientation=up,state=rd": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_rd"}, - "facing=south,orientation=up,state=ru": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_ru"}, - "facing=south,orientation=up,state=rud": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_rud"}, - "facing=south,orientation=up,state=u": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_u"}, - "facing=south,orientation=up,state=ud": {"y": 180, "x": 270, "model": "computercraft:block/monitor_normal_ud"}, - "facing=west,orientation=down,state=d": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_d"}, - "facing=west,orientation=down,state=l": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_l"}, - "facing=west,orientation=down,state=ld": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_ld"}, - "facing=west,orientation=down,state=lr": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_lr"}, - "facing=west,orientation=down,state=lrd": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_lrd"}, - "facing=west,orientation=down,state=lru": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_lru"}, - "facing=west,orientation=down,state=lrud": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_lrud"}, - "facing=west,orientation=down,state=lu": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_lu"}, - "facing=west,orientation=down,state=lud": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_lud"}, - "facing=west,orientation=down,state=none": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal"}, - "facing=west,orientation=down,state=r": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_r"}, - "facing=west,orientation=down,state=rd": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_rd"}, - "facing=west,orientation=down,state=ru": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_ru"}, - "facing=west,orientation=down,state=rud": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_rud"}, - "facing=west,orientation=down,state=u": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_u"}, - "facing=west,orientation=down,state=ud": {"y": 270, "x": 90, "model": "computercraft:block/monitor_normal_ud"}, - "facing=west,orientation=north,state=d": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_d"}, - "facing=west,orientation=north,state=l": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_l"}, - "facing=west,orientation=north,state=ld": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_ld"}, - "facing=west,orientation=north,state=lr": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_lr"}, - "facing=west,orientation=north,state=lrd": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_lrd"}, - "facing=west,orientation=north,state=lru": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_lru"}, - "facing=west,orientation=north,state=lrud": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_lrud"}, - "facing=west,orientation=north,state=lu": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_lu"}, - "facing=west,orientation=north,state=lud": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_lud"}, - "facing=west,orientation=north,state=none": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal"}, - "facing=west,orientation=north,state=r": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_r"}, - "facing=west,orientation=north,state=rd": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_rd"}, - "facing=west,orientation=north,state=ru": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_ru"}, - "facing=west,orientation=north,state=rud": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_rud"}, - "facing=west,orientation=north,state=u": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_u"}, - "facing=west,orientation=north,state=ud": {"y": 270, "x": 0, "model": "computercraft:block/monitor_normal_ud"}, - "facing=west,orientation=up,state=d": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_d"}, - "facing=west,orientation=up,state=l": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_l"}, - "facing=west,orientation=up,state=ld": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_ld"}, - "facing=west,orientation=up,state=lr": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_lr"}, - "facing=west,orientation=up,state=lrd": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_lrd"}, - "facing=west,orientation=up,state=lru": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_lru"}, - "facing=west,orientation=up,state=lrud": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_lrud"}, - "facing=west,orientation=up,state=lu": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_lu"}, - "facing=west,orientation=up,state=lud": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_lud"}, - "facing=west,orientation=up,state=none": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal"}, - "facing=west,orientation=up,state=r": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_r"}, - "facing=west,orientation=up,state=rd": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_rd"}, - "facing=west,orientation=up,state=ru": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_ru"}, - "facing=west,orientation=up,state=rud": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_rud"}, - "facing=west,orientation=up,state=u": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_u"}, - "facing=west,orientation=up,state=ud": {"y": 270, "x": 270, "model": "computercraft:block/monitor_normal_ud"} + "facing=south,orientation=north,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 0, "y": 180}, + "facing=south,orientation=north,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 0, "y": 180}, + "facing=south,orientation=north,state=none": {"model": "computercraft:block/monitor_normal", "x": 0, "y": 180}, + "facing=south,orientation=north,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 0, "y": 180}, + "facing=south,orientation=north,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 0, "y": 180}, + "facing=south,orientation=north,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 0, "y": 180}, + "facing=south,orientation=north,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 0, "y": 180}, + "facing=south,orientation=north,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 0, "y": 180}, + "facing=south,orientation=north,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 0, "y": 180}, + "facing=south,orientation=up,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 270, "y": 180}, + "facing=south,orientation=up,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 270, "y": 180}, + "facing=south,orientation=up,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 270, "y": 180}, + "facing=south,orientation=up,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 270, "y": 180}, + "facing=south,orientation=up,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 270, "y": 180}, + "facing=south,orientation=up,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 270, "y": 180}, + "facing=south,orientation=up,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 270, "y": 180}, + "facing=south,orientation=up,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 270, "y": 180}, + "facing=south,orientation=up,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 270, "y": 180}, + "facing=south,orientation=up,state=none": {"model": "computercraft:block/monitor_normal", "x": 270, "y": 180}, + "facing=south,orientation=up,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 270, "y": 180}, + "facing=south,orientation=up,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 270, "y": 180}, + "facing=south,orientation=up,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 270, "y": 180}, + "facing=south,orientation=up,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 270, "y": 180}, + "facing=south,orientation=up,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 270, "y": 180}, + "facing=south,orientation=up,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 270, "y": 180}, + "facing=west,orientation=down,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 90, "y": 270}, + "facing=west,orientation=down,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 90, "y": 270}, + "facing=west,orientation=down,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 90, "y": 270}, + "facing=west,orientation=down,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 90, "y": 270}, + "facing=west,orientation=down,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 90, "y": 270}, + "facing=west,orientation=down,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 90, "y": 270}, + "facing=west,orientation=down,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 90, "y": 270}, + "facing=west,orientation=down,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 90, "y": 270}, + "facing=west,orientation=down,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 90, "y": 270}, + "facing=west,orientation=down,state=none": {"model": "computercraft:block/monitor_normal", "x": 90, "y": 270}, + "facing=west,orientation=down,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 90, "y": 270}, + "facing=west,orientation=down,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 90, "y": 270}, + "facing=west,orientation=down,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 90, "y": 270}, + "facing=west,orientation=down,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 90, "y": 270}, + "facing=west,orientation=down,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 90, "y": 270}, + "facing=west,orientation=down,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 90, "y": 270}, + "facing=west,orientation=north,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 0, "y": 270}, + "facing=west,orientation=north,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 0, "y": 270}, + "facing=west,orientation=north,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 0, "y": 270}, + "facing=west,orientation=north,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 0, "y": 270}, + "facing=west,orientation=north,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 0, "y": 270}, + "facing=west,orientation=north,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 0, "y": 270}, + "facing=west,orientation=north,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 0, "y": 270}, + "facing=west,orientation=north,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 0, "y": 270}, + "facing=west,orientation=north,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 0, "y": 270}, + "facing=west,orientation=north,state=none": {"model": "computercraft:block/monitor_normal", "x": 0, "y": 270}, + "facing=west,orientation=north,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 0, "y": 270}, + "facing=west,orientation=north,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 0, "y": 270}, + "facing=west,orientation=north,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 0, "y": 270}, + "facing=west,orientation=north,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 0, "y": 270}, + "facing=west,orientation=north,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 0, "y": 270}, + "facing=west,orientation=north,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 0, "y": 270}, + "facing=west,orientation=up,state=d": {"model": "computercraft:block/monitor_normal_d", "x": 270, "y": 270}, + "facing=west,orientation=up,state=l": {"model": "computercraft:block/monitor_normal_l", "x": 270, "y": 270}, + "facing=west,orientation=up,state=ld": {"model": "computercraft:block/monitor_normal_ld", "x": 270, "y": 270}, + "facing=west,orientation=up,state=lr": {"model": "computercraft:block/monitor_normal_lr", "x": 270, "y": 270}, + "facing=west,orientation=up,state=lrd": {"model": "computercraft:block/monitor_normal_lrd", "x": 270, "y": 270}, + "facing=west,orientation=up,state=lru": {"model": "computercraft:block/monitor_normal_lru", "x": 270, "y": 270}, + "facing=west,orientation=up,state=lrud": {"model": "computercraft:block/monitor_normal_lrud", "x": 270, "y": 270}, + "facing=west,orientation=up,state=lu": {"model": "computercraft:block/monitor_normal_lu", "x": 270, "y": 270}, + "facing=west,orientation=up,state=lud": {"model": "computercraft:block/monitor_normal_lud", "x": 270, "y": 270}, + "facing=west,orientation=up,state=none": {"model": "computercraft:block/monitor_normal", "x": 270, "y": 270}, + "facing=west,orientation=up,state=r": {"model": "computercraft:block/monitor_normal_r", "x": 270, "y": 270}, + "facing=west,orientation=up,state=rd": {"model": "computercraft:block/monitor_normal_rd", "x": 270, "y": 270}, + "facing=west,orientation=up,state=ru": {"model": "computercraft:block/monitor_normal_ru", "x": 270, "y": 270}, + "facing=west,orientation=up,state=rud": {"model": "computercraft:block/monitor_normal_rud", "x": 270, "y": 270}, + "facing=west,orientation=up,state=u": {"model": "computercraft:block/monitor_normal_u", "x": 270, "y": 270}, + "facing=west,orientation=up,state=ud": {"model": "computercraft:block/monitor_normal_ud", "x": 270, "y": 270} } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/blockstates/printer.json b/src/generated/resources/assets/computercraft/blockstates/printer.json index 25c1fc3d1..2166b5f04 100644 --- a/src/generated/resources/assets/computercraft/blockstates/printer.json +++ b/src/generated/resources/assets/computercraft/blockstates/printer.json @@ -1,20 +1,20 @@ { "variants": { - "bottom=false,facing=east,top=false": {"y": 90, "model": "computercraft:block/printer_empty"}, - "bottom=false,facing=east,top=true": {"y": 90, "model": "computercraft:block/printer_top_full"}, - "bottom=false,facing=north,top=false": {"y": 0, "model": "computercraft:block/printer_empty"}, - "bottom=false,facing=north,top=true": {"y": 0, "model": "computercraft:block/printer_top_full"}, - "bottom=false,facing=south,top=false": {"y": 180, "model": "computercraft:block/printer_empty"}, - "bottom=false,facing=south,top=true": {"y": 180, "model": "computercraft:block/printer_top_full"}, - "bottom=false,facing=west,top=false": {"y": 270, "model": "computercraft:block/printer_empty"}, - "bottom=false,facing=west,top=true": {"y": 270, "model": "computercraft:block/printer_top_full"}, - "bottom=true,facing=east,top=false": {"y": 90, "model": "computercraft:block/printer_bottom_full"}, - "bottom=true,facing=east,top=true": {"y": 90, "model": "computercraft:block/printer_both_full"}, - "bottom=true,facing=north,top=false": {"y": 0, "model": "computercraft:block/printer_bottom_full"}, - "bottom=true,facing=north,top=true": {"y": 0, "model": "computercraft:block/printer_both_full"}, - "bottom=true,facing=south,top=false": {"y": 180, "model": "computercraft:block/printer_bottom_full"}, - "bottom=true,facing=south,top=true": {"y": 180, "model": "computercraft:block/printer_both_full"}, - "bottom=true,facing=west,top=false": {"y": 270, "model": "computercraft:block/printer_bottom_full"}, - "bottom=true,facing=west,top=true": {"y": 270, "model": "computercraft:block/printer_both_full"} + "bottom=false,facing=east,top=false": {"model": "computercraft:block/printer_empty", "y": 90}, + "bottom=false,facing=east,top=true": {"model": "computercraft:block/printer_top_full", "y": 90}, + "bottom=false,facing=north,top=false": {"model": "computercraft:block/printer_empty", "y": 0}, + "bottom=false,facing=north,top=true": {"model": "computercraft:block/printer_top_full", "y": 0}, + "bottom=false,facing=south,top=false": {"model": "computercraft:block/printer_empty", "y": 180}, + "bottom=false,facing=south,top=true": {"model": "computercraft:block/printer_top_full", "y": 180}, + "bottom=false,facing=west,top=false": {"model": "computercraft:block/printer_empty", "y": 270}, + "bottom=false,facing=west,top=true": {"model": "computercraft:block/printer_top_full", "y": 270}, + "bottom=true,facing=east,top=false": {"model": "computercraft:block/printer_bottom_full", "y": 90}, + "bottom=true,facing=east,top=true": {"model": "computercraft:block/printer_both_full", "y": 90}, + "bottom=true,facing=north,top=false": {"model": "computercraft:block/printer_bottom_full", "y": 0}, + "bottom=true,facing=north,top=true": {"model": "computercraft:block/printer_both_full", "y": 0}, + "bottom=true,facing=south,top=false": {"model": "computercraft:block/printer_bottom_full", "y": 180}, + "bottom=true,facing=south,top=true": {"model": "computercraft:block/printer_both_full", "y": 180}, + "bottom=true,facing=west,top=false": {"model": "computercraft:block/printer_bottom_full", "y": 270}, + "bottom=true,facing=west,top=true": {"model": "computercraft:block/printer_both_full", "y": 270} } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/blockstates/speaker.json b/src/generated/resources/assets/computercraft/blockstates/speaker.json index ff125706a..10220f79b 100644 --- a/src/generated/resources/assets/computercraft/blockstates/speaker.json +++ b/src/generated/resources/assets/computercraft/blockstates/speaker.json @@ -5,4 +5,4 @@ "facing=south": {"model": "computercraft:block/speaker", "y": 180}, "facing=west": {"model": "computercraft:block/speaker", "y": 270} } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/blockstates/turtle_advanced.json b/src/generated/resources/assets/computercraft/blockstates/turtle_advanced.json index cf29ddebd..8cbf6f159 100644 --- a/src/generated/resources/assets/computercraft/blockstates/turtle_advanced.json +++ b/src/generated/resources/assets/computercraft/blockstates/turtle_advanced.json @@ -5,4 +5,4 @@ "facing=south": {"model": "computercraft:block/turtle_advanced", "y": 180}, "facing=west": {"model": "computercraft:block/turtle_advanced", "y": 270} } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/blockstates/turtle_normal.json b/src/generated/resources/assets/computercraft/blockstates/turtle_normal.json index 9f97633b8..86962020f 100644 --- a/src/generated/resources/assets/computercraft/blockstates/turtle_normal.json +++ b/src/generated/resources/assets/computercraft/blockstates/turtle_normal.json @@ -5,4 +5,4 @@ "facing=south": {"model": "computercraft:block/turtle_normal", "y": 180}, "facing=west": {"model": "computercraft:block/turtle_normal", "y": 270} } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/blockstates/wired_modem_full.json b/src/generated/resources/assets/computercraft/blockstates/wired_modem_full.json index 13859d95b..9e0fa205a 100644 --- a/src/generated/resources/assets/computercraft/blockstates/wired_modem_full.json +++ b/src/generated/resources/assets/computercraft/blockstates/wired_modem_full.json @@ -5,4 +5,4 @@ "modem=true,peripheral=false": {"model": "computercraft:block/wired_modem_full_on"}, "modem=true,peripheral=true": {"model": "computercraft:block/wired_modem_full_on_peripheral"} } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/blockstates/wireless_modem_advanced.json b/src/generated/resources/assets/computercraft/blockstates/wireless_modem_advanced.json index df1032ec9..9f029e6da 100644 --- a/src/generated/resources/assets/computercraft/blockstates/wireless_modem_advanced.json +++ b/src/generated/resources/assets/computercraft/blockstates/wireless_modem_advanced.json @@ -1,16 +1,16 @@ { "variants": { - "facing=down,on=false": {"y": 0, "x": 90, "model": "computercraft:block/wireless_modem_advanced_off"}, - "facing=down,on=true": {"y": 0, "x": 90, "model": "computercraft:block/wireless_modem_advanced_on"}, - "facing=east,on=false": {"y": 90, "x": 0, "model": "computercraft:block/wireless_modem_advanced_off"}, - "facing=east,on=true": {"y": 90, "x": 0, "model": "computercraft:block/wireless_modem_advanced_on"}, - "facing=north,on=false": {"y": 0, "x": 0, "model": "computercraft:block/wireless_modem_advanced_off"}, - "facing=north,on=true": {"y": 0, "x": 0, "model": "computercraft:block/wireless_modem_advanced_on"}, - "facing=south,on=false": {"y": 180, "x": 0, "model": "computercraft:block/wireless_modem_advanced_off"}, - "facing=south,on=true": {"y": 180, "x": 0, "model": "computercraft:block/wireless_modem_advanced_on"}, - "facing=up,on=false": {"y": 0, "x": 270, "model": "computercraft:block/wireless_modem_advanced_off"}, - "facing=up,on=true": {"y": 0, "x": 270, "model": "computercraft:block/wireless_modem_advanced_on"}, - "facing=west,on=false": {"y": 270, "x": 0, "model": "computercraft:block/wireless_modem_advanced_off"}, - "facing=west,on=true": {"y": 270, "x": 0, "model": "computercraft:block/wireless_modem_advanced_on"} + "facing=down,on=false": {"model": "computercraft:block/wireless_modem_advanced_off", "x": 90, "y": 0}, + "facing=down,on=true": {"model": "computercraft:block/wireless_modem_advanced_on", "x": 90, "y": 0}, + "facing=east,on=false": {"model": "computercraft:block/wireless_modem_advanced_off", "x": 0, "y": 90}, + "facing=east,on=true": {"model": "computercraft:block/wireless_modem_advanced_on", "x": 0, "y": 90}, + "facing=north,on=false": {"model": "computercraft:block/wireless_modem_advanced_off", "x": 0, "y": 0}, + "facing=north,on=true": {"model": "computercraft:block/wireless_modem_advanced_on", "x": 0, "y": 0}, + "facing=south,on=false": {"model": "computercraft:block/wireless_modem_advanced_off", "x": 0, "y": 180}, + "facing=south,on=true": {"model": "computercraft:block/wireless_modem_advanced_on", "x": 0, "y": 180}, + "facing=up,on=false": {"model": "computercraft:block/wireless_modem_advanced_off", "x": 270, "y": 0}, + "facing=up,on=true": {"model": "computercraft:block/wireless_modem_advanced_on", "x": 270, "y": 0}, + "facing=west,on=false": {"model": "computercraft:block/wireless_modem_advanced_off", "x": 0, "y": 270}, + "facing=west,on=true": {"model": "computercraft:block/wireless_modem_advanced_on", "x": 0, "y": 270} } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/blockstates/wireless_modem_normal.json b/src/generated/resources/assets/computercraft/blockstates/wireless_modem_normal.json index 9bd457efc..09623ddbf 100644 --- a/src/generated/resources/assets/computercraft/blockstates/wireless_modem_normal.json +++ b/src/generated/resources/assets/computercraft/blockstates/wireless_modem_normal.json @@ -1,16 +1,16 @@ { "variants": { - "facing=down,on=false": {"y": 0, "x": 90, "model": "computercraft:block/wireless_modem_normal_off"}, - "facing=down,on=true": {"y": 0, "x": 90, "model": "computercraft:block/wireless_modem_normal_on"}, - "facing=east,on=false": {"y": 90, "x": 0, "model": "computercraft:block/wireless_modem_normal_off"}, - "facing=east,on=true": {"y": 90, "x": 0, "model": "computercraft:block/wireless_modem_normal_on"}, - "facing=north,on=false": {"y": 0, "x": 0, "model": "computercraft:block/wireless_modem_normal_off"}, - "facing=north,on=true": {"y": 0, "x": 0, "model": "computercraft:block/wireless_modem_normal_on"}, - "facing=south,on=false": {"y": 180, "x": 0, "model": "computercraft:block/wireless_modem_normal_off"}, - "facing=south,on=true": {"y": 180, "x": 0, "model": "computercraft:block/wireless_modem_normal_on"}, - "facing=up,on=false": {"y": 0, "x": 270, "model": "computercraft:block/wireless_modem_normal_off"}, - "facing=up,on=true": {"y": 0, "x": 270, "model": "computercraft:block/wireless_modem_normal_on"}, - "facing=west,on=false": {"y": 270, "x": 0, "model": "computercraft:block/wireless_modem_normal_off"}, - "facing=west,on=true": {"y": 270, "x": 0, "model": "computercraft:block/wireless_modem_normal_on"} + "facing=down,on=false": {"model": "computercraft:block/wireless_modem_normal_off", "x": 90, "y": 0}, + "facing=down,on=true": {"model": "computercraft:block/wireless_modem_normal_on", "x": 90, "y": 0}, + "facing=east,on=false": {"model": "computercraft:block/wireless_modem_normal_off", "x": 0, "y": 90}, + "facing=east,on=true": {"model": "computercraft:block/wireless_modem_normal_on", "x": 0, "y": 90}, + "facing=north,on=false": {"model": "computercraft:block/wireless_modem_normal_off", "x": 0, "y": 0}, + "facing=north,on=true": {"model": "computercraft:block/wireless_modem_normal_on", "x": 0, "y": 0}, + "facing=south,on=false": {"model": "computercraft:block/wireless_modem_normal_off", "x": 0, "y": 180}, + "facing=south,on=true": {"model": "computercraft:block/wireless_modem_normal_on", "x": 0, "y": 180}, + "facing=up,on=false": {"model": "computercraft:block/wireless_modem_normal_off", "x": 270, "y": 0}, + "facing=up,on=true": {"model": "computercraft:block/wireless_modem_normal_on", "x": 270, "y": 0}, + "facing=west,on=false": {"model": "computercraft:block/wireless_modem_normal_off", "x": 0, "y": 270}, + "facing=west,on=true": {"model": "computercraft:block/wireless_modem_normal_on", "x": 0, "y": 270} } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/computer_advanced_blinking.json b/src/generated/resources/assets/computercraft/models/block/computer_advanced_blinking.json index 8f38a1426..e9fccca86 100644 --- a/src/generated/resources/assets/computercraft/models/block/computer_advanced_blinking.json +++ b/src/generated/resources/assets/computercraft/models/block/computer_advanced_blinking.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "computercraft:block/computer_advanced_top", "front": "computercraft:block/computer_advanced_front_blink", - "side": "computercraft:block/computer_advanced_side" + "side": "computercraft:block/computer_advanced_side", + "top": "computercraft:block/computer_advanced_top" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/computer_advanced_off.json b/src/generated/resources/assets/computercraft/models/block/computer_advanced_off.json index a5f377ce2..f83e08db4 100644 --- a/src/generated/resources/assets/computercraft/models/block/computer_advanced_off.json +++ b/src/generated/resources/assets/computercraft/models/block/computer_advanced_off.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "computercraft:block/computer_advanced_top", "front": "computercraft:block/computer_advanced_front", - "side": "computercraft:block/computer_advanced_side" + "side": "computercraft:block/computer_advanced_side", + "top": "computercraft:block/computer_advanced_top" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/computer_advanced_on.json b/src/generated/resources/assets/computercraft/models/block/computer_advanced_on.json index b85966988..497c1337d 100644 --- a/src/generated/resources/assets/computercraft/models/block/computer_advanced_on.json +++ b/src/generated/resources/assets/computercraft/models/block/computer_advanced_on.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "computercraft:block/computer_advanced_top", "front": "computercraft:block/computer_advanced_front_on", - "side": "computercraft:block/computer_advanced_side" + "side": "computercraft:block/computer_advanced_side", + "top": "computercraft:block/computer_advanced_top" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/computer_command_blinking.json b/src/generated/resources/assets/computercraft/models/block/computer_command_blinking.json index 991b698f0..62d746878 100644 --- a/src/generated/resources/assets/computercraft/models/block/computer_command_blinking.json +++ b/src/generated/resources/assets/computercraft/models/block/computer_command_blinking.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "computercraft:block/computer_command_top", "front": "computercraft:block/computer_command_front_blink", - "side": "computercraft:block/computer_command_side" + "side": "computercraft:block/computer_command_side", + "top": "computercraft:block/computer_command_top" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/computer_command_off.json b/src/generated/resources/assets/computercraft/models/block/computer_command_off.json index 35021b763..d23eeb90b 100644 --- a/src/generated/resources/assets/computercraft/models/block/computer_command_off.json +++ b/src/generated/resources/assets/computercraft/models/block/computer_command_off.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "computercraft:block/computer_command_top", "front": "computercraft:block/computer_command_front", - "side": "computercraft:block/computer_command_side" + "side": "computercraft:block/computer_command_side", + "top": "computercraft:block/computer_command_top" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/computer_command_on.json b/src/generated/resources/assets/computercraft/models/block/computer_command_on.json index 57016e47a..36c6f0fa6 100644 --- a/src/generated/resources/assets/computercraft/models/block/computer_command_on.json +++ b/src/generated/resources/assets/computercraft/models/block/computer_command_on.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "computercraft:block/computer_command_top", "front": "computercraft:block/computer_command_front_on", - "side": "computercraft:block/computer_command_side" + "side": "computercraft:block/computer_command_side", + "top": "computercraft:block/computer_command_top" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/computer_normal_blinking.json b/src/generated/resources/assets/computercraft/models/block/computer_normal_blinking.json index b56958cc2..7250268d7 100644 --- a/src/generated/resources/assets/computercraft/models/block/computer_normal_blinking.json +++ b/src/generated/resources/assets/computercraft/models/block/computer_normal_blinking.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "computercraft:block/computer_normal_top", "front": "computercraft:block/computer_normal_front_blink", - "side": "computercraft:block/computer_normal_side" + "side": "computercraft:block/computer_normal_side", + "top": "computercraft:block/computer_normal_top" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/computer_normal_off.json b/src/generated/resources/assets/computercraft/models/block/computer_normal_off.json index a0b673d23..658fcc187 100644 --- a/src/generated/resources/assets/computercraft/models/block/computer_normal_off.json +++ b/src/generated/resources/assets/computercraft/models/block/computer_normal_off.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "computercraft:block/computer_normal_top", "front": "computercraft:block/computer_normal_front", - "side": "computercraft:block/computer_normal_side" + "side": "computercraft:block/computer_normal_side", + "top": "computercraft:block/computer_normal_top" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/computer_normal_on.json b/src/generated/resources/assets/computercraft/models/block/computer_normal_on.json index 662c3bef5..da2e671fe 100644 --- a/src/generated/resources/assets/computercraft/models/block/computer_normal_on.json +++ b/src/generated/resources/assets/computercraft/models/block/computer_normal_on.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "computercraft:block/computer_normal_top", "front": "computercraft:block/computer_normal_front_on", - "side": "computercraft:block/computer_normal_side" + "side": "computercraft:block/computer_normal_side", + "top": "computercraft:block/computer_normal_top" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/disk_drive_empty.json b/src/generated/resources/assets/computercraft/models/block/disk_drive_empty.json index 640ae6792..161051750 100644 --- a/src/generated/resources/assets/computercraft/models/block/disk_drive_empty.json +++ b/src/generated/resources/assets/computercraft/models/block/disk_drive_empty.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "computercraft:block/disk_drive_top", "front": "computercraft:block/disk_drive_front", - "side": "computercraft:block/disk_drive_side" + "side": "computercraft:block/disk_drive_side", + "top": "computercraft:block/disk_drive_top" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/disk_drive_full.json b/src/generated/resources/assets/computercraft/models/block/disk_drive_full.json index 275dc2069..940c8fc1a 100644 --- a/src/generated/resources/assets/computercraft/models/block/disk_drive_full.json +++ b/src/generated/resources/assets/computercraft/models/block/disk_drive_full.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "computercraft:block/disk_drive_top", "front": "computercraft:block/disk_drive_front_accepted", - "side": "computercraft:block/disk_drive_side" + "side": "computercraft:block/disk_drive_side", + "top": "computercraft:block/disk_drive_top" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/disk_drive_invalid.json b/src/generated/resources/assets/computercraft/models/block/disk_drive_invalid.json index 75563afd1..f8e91b267 100644 --- a/src/generated/resources/assets/computercraft/models/block/disk_drive_invalid.json +++ b/src/generated/resources/assets/computercraft/models/block/disk_drive_invalid.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "computercraft:block/disk_drive_top", "front": "computercraft:block/disk_drive_front_rejected", - "side": "computercraft:block/disk_drive_side" + "side": "computercraft:block/disk_drive_side", + "top": "computercraft:block/disk_drive_top" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_advanced.json b/src/generated/resources/assets/computercraft/models/block/monitor_advanced.json index a13f34e05..dd6a8cbb6 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_advanced.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_advanced.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_advanced_32", "front": "computercraft:block/monitor_advanced_16", "side": "computercraft:block/monitor_advanced_4", - "top": "computercraft:block/monitor_advanced_0", - "back": "computercraft:block/monitor_advanced_32" + "top": "computercraft:block/monitor_advanced_0" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_d.json b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_d.json index ff39d102c..d21a5f0f2 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_d.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_d.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_advanced_36", "front": "computercraft:block/monitor_advanced_20", "side": "computercraft:block/monitor_advanced_7", - "top": "computercraft:block/monitor_advanced_0", - "back": "computercraft:block/monitor_advanced_36" + "top": "computercraft:block/monitor_advanced_0" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_item.json b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_item.json index aad0ced5f..50b557339 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_item.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_item.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_advanced_32", "front": "computercraft:block/monitor_advanced_15", "side": "computercraft:block/monitor_advanced_4", - "top": "computercraft:block/monitor_advanced_0", - "back": "computercraft:block/monitor_advanced_32" + "top": "computercraft:block/monitor_advanced_0" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_l.json b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_l.json index 3bfb91292..58695f253 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_l.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_l.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_advanced_33", "front": "computercraft:block/monitor_advanced_19", "side": "computercraft:block/monitor_advanced_4", - "top": "computercraft:block/monitor_advanced_1", - "back": "computercraft:block/monitor_advanced_33" + "top": "computercraft:block/monitor_advanced_1" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_ld.json b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_ld.json index 25269670d..8915909d3 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_ld.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_ld.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_advanced_45", "front": "computercraft:block/monitor_advanced_31", "side": "computercraft:block/monitor_advanced_7", - "top": "computercraft:block/monitor_advanced_1", - "back": "computercraft:block/monitor_advanced_45" + "top": "computercraft:block/monitor_advanced_1" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lr.json b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lr.json index d94c3a5cf..3300d5ba2 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lr.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lr.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_advanced_34", "front": "computercraft:block/monitor_advanced_18", "side": "computercraft:block/monitor_advanced_4", - "top": "computercraft:block/monitor_advanced_2", - "back": "computercraft:block/monitor_advanced_34" + "top": "computercraft:block/monitor_advanced_2" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lrd.json b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lrd.json index 0de1d3268..6a419c181 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lrd.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lrd.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_advanced_46", "front": "computercraft:block/monitor_advanced_30", "side": "computercraft:block/monitor_advanced_7", - "top": "computercraft:block/monitor_advanced_2", - "back": "computercraft:block/monitor_advanced_46" + "top": "computercraft:block/monitor_advanced_2" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lru.json b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lru.json index a28abc853..29d00af1a 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lru.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lru.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_advanced_40", "front": "computercraft:block/monitor_advanced_24", "side": "computercraft:block/monitor_advanced_5", - "top": "computercraft:block/monitor_advanced_2", - "back": "computercraft:block/monitor_advanced_40" + "top": "computercraft:block/monitor_advanced_2" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lrud.json b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lrud.json index 9759d442e..57f44fa6c 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lrud.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lrud.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_advanced_43", "front": "computercraft:block/monitor_advanced_27", "side": "computercraft:block/monitor_advanced_6", - "top": "computercraft:block/monitor_advanced_2", - "back": "computercraft:block/monitor_advanced_43" + "top": "computercraft:block/monitor_advanced_2" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lu.json b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lu.json index 038626c68..157af4dbd 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lu.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lu.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_advanced_39", "front": "computercraft:block/monitor_advanced_25", "side": "computercraft:block/monitor_advanced_5", - "top": "computercraft:block/monitor_advanced_1", - "back": "computercraft:block/monitor_advanced_39" + "top": "computercraft:block/monitor_advanced_1" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lud.json b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lud.json index 38e9374aa..056c55965 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lud.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_lud.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_advanced_42", "front": "computercraft:block/monitor_advanced_28", "side": "computercraft:block/monitor_advanced_6", - "top": "computercraft:block/monitor_advanced_1", - "back": "computercraft:block/monitor_advanced_42" + "top": "computercraft:block/monitor_advanced_1" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_r.json b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_r.json index 555aab92c..8b152928a 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_r.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_r.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_advanced_35", "front": "computercraft:block/monitor_advanced_17", "side": "computercraft:block/monitor_advanced_4", - "top": "computercraft:block/monitor_advanced_3", - "back": "computercraft:block/monitor_advanced_35" + "top": "computercraft:block/monitor_advanced_3" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_rd.json b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_rd.json index 22e0195b7..f56d3d1be 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_rd.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_rd.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_advanced_47", "front": "computercraft:block/monitor_advanced_29", "side": "computercraft:block/monitor_advanced_7", - "top": "computercraft:block/monitor_advanced_3", - "back": "computercraft:block/monitor_advanced_47" + "top": "computercraft:block/monitor_advanced_3" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_ru.json b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_ru.json index 6a503312a..fbf2107b2 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_ru.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_ru.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_advanced_41", "front": "computercraft:block/monitor_advanced_23", "side": "computercraft:block/monitor_advanced_5", - "top": "computercraft:block/monitor_advanced_3", - "back": "computercraft:block/monitor_advanced_41" + "top": "computercraft:block/monitor_advanced_3" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_rud.json b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_rud.json index 70cd94b68..179d84971 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_rud.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_rud.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_advanced_44", "front": "computercraft:block/monitor_advanced_26", "side": "computercraft:block/monitor_advanced_6", - "top": "computercraft:block/monitor_advanced_3", - "back": "computercraft:block/monitor_advanced_44" + "top": "computercraft:block/monitor_advanced_3" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_u.json b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_u.json index 8c2271ce7..c4d91bba1 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_u.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_u.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_advanced_38", "front": "computercraft:block/monitor_advanced_22", "side": "computercraft:block/monitor_advanced_5", - "top": "computercraft:block/monitor_advanced_0", - "back": "computercraft:block/monitor_advanced_38" + "top": "computercraft:block/monitor_advanced_0" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_ud.json b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_ud.json index 481c8402d..88279af77 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_advanced_ud.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_advanced_ud.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_advanced_37", "front": "computercraft:block/monitor_advanced_21", "side": "computercraft:block/monitor_advanced_6", - "top": "computercraft:block/monitor_advanced_0", - "back": "computercraft:block/monitor_advanced_37" + "top": "computercraft:block/monitor_advanced_0" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_normal.json b/src/generated/resources/assets/computercraft/models/block/monitor_normal.json index b08678497..a1c7e9685 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_normal.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_normal.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_normal_32", "front": "computercraft:block/monitor_normal_16", "side": "computercraft:block/monitor_normal_4", - "top": "computercraft:block/monitor_normal_0", - "back": "computercraft:block/monitor_normal_32" + "top": "computercraft:block/monitor_normal_0" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_normal_d.json b/src/generated/resources/assets/computercraft/models/block/monitor_normal_d.json index 3d6137782..43db90bed 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_normal_d.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_normal_d.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_normal_36", "front": "computercraft:block/monitor_normal_20", "side": "computercraft:block/monitor_normal_7", - "top": "computercraft:block/monitor_normal_0", - "back": "computercraft:block/monitor_normal_36" + "top": "computercraft:block/monitor_normal_0" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_normal_item.json b/src/generated/resources/assets/computercraft/models/block/monitor_normal_item.json index 167ef1121..d40cc2732 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_normal_item.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_normal_item.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_normal_32", "front": "computercraft:block/monitor_normal_15", "side": "computercraft:block/monitor_normal_4", - "top": "computercraft:block/monitor_normal_0", - "back": "computercraft:block/monitor_normal_32" + "top": "computercraft:block/monitor_normal_0" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_normal_l.json b/src/generated/resources/assets/computercraft/models/block/monitor_normal_l.json index 3f863819a..de9639620 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_normal_l.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_normal_l.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_normal_33", "front": "computercraft:block/monitor_normal_19", "side": "computercraft:block/monitor_normal_4", - "top": "computercraft:block/monitor_normal_1", - "back": "computercraft:block/monitor_normal_33" + "top": "computercraft:block/monitor_normal_1" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_normal_ld.json b/src/generated/resources/assets/computercraft/models/block/monitor_normal_ld.json index 860b84d7d..c99dc337a 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_normal_ld.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_normal_ld.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_normal_45", "front": "computercraft:block/monitor_normal_31", "side": "computercraft:block/monitor_normal_7", - "top": "computercraft:block/monitor_normal_1", - "back": "computercraft:block/monitor_normal_45" + "top": "computercraft:block/monitor_normal_1" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_normal_lr.json b/src/generated/resources/assets/computercraft/models/block/monitor_normal_lr.json index c69bab42d..e43d2f210 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_normal_lr.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_normal_lr.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_normal_34", "front": "computercraft:block/monitor_normal_18", "side": "computercraft:block/monitor_normal_4", - "top": "computercraft:block/monitor_normal_2", - "back": "computercraft:block/monitor_normal_34" + "top": "computercraft:block/monitor_normal_2" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_normal_lrd.json b/src/generated/resources/assets/computercraft/models/block/monitor_normal_lrd.json index 3dd8543a7..147a107ad 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_normal_lrd.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_normal_lrd.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_normal_46", "front": "computercraft:block/monitor_normal_30", "side": "computercraft:block/monitor_normal_7", - "top": "computercraft:block/monitor_normal_2", - "back": "computercraft:block/monitor_normal_46" + "top": "computercraft:block/monitor_normal_2" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_normal_lru.json b/src/generated/resources/assets/computercraft/models/block/monitor_normal_lru.json index c0fe995ee..504c4f26d 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_normal_lru.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_normal_lru.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_normal_40", "front": "computercraft:block/monitor_normal_24", "side": "computercraft:block/monitor_normal_5", - "top": "computercraft:block/monitor_normal_2", - "back": "computercraft:block/monitor_normal_40" + "top": "computercraft:block/monitor_normal_2" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_normal_lrud.json b/src/generated/resources/assets/computercraft/models/block/monitor_normal_lrud.json index 61545472f..d01afdd18 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_normal_lrud.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_normal_lrud.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_normal_43", "front": "computercraft:block/monitor_normal_27", "side": "computercraft:block/monitor_normal_6", - "top": "computercraft:block/monitor_normal_2", - "back": "computercraft:block/monitor_normal_43" + "top": "computercraft:block/monitor_normal_2" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_normal_lu.json b/src/generated/resources/assets/computercraft/models/block/monitor_normal_lu.json index 5572eb3bc..feac7281d 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_normal_lu.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_normal_lu.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_normal_39", "front": "computercraft:block/monitor_normal_25", "side": "computercraft:block/monitor_normal_5", - "top": "computercraft:block/monitor_normal_1", - "back": "computercraft:block/monitor_normal_39" + "top": "computercraft:block/monitor_normal_1" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_normal_lud.json b/src/generated/resources/assets/computercraft/models/block/monitor_normal_lud.json index ba56cd1cd..aa330ffa7 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_normal_lud.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_normal_lud.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_normal_42", "front": "computercraft:block/monitor_normal_28", "side": "computercraft:block/monitor_normal_6", - "top": "computercraft:block/monitor_normal_1", - "back": "computercraft:block/monitor_normal_42" + "top": "computercraft:block/monitor_normal_1" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_normal_r.json b/src/generated/resources/assets/computercraft/models/block/monitor_normal_r.json index bcbb7ef76..d0059b4bb 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_normal_r.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_normal_r.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_normal_35", "front": "computercraft:block/monitor_normal_17", "side": "computercraft:block/monitor_normal_4", - "top": "computercraft:block/monitor_normal_3", - "back": "computercraft:block/monitor_normal_35" + "top": "computercraft:block/monitor_normal_3" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_normal_rd.json b/src/generated/resources/assets/computercraft/models/block/monitor_normal_rd.json index 469f486c0..374387ae1 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_normal_rd.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_normal_rd.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_normal_47", "front": "computercraft:block/monitor_normal_29", "side": "computercraft:block/monitor_normal_7", - "top": "computercraft:block/monitor_normal_3", - "back": "computercraft:block/monitor_normal_47" + "top": "computercraft:block/monitor_normal_3" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_normal_ru.json b/src/generated/resources/assets/computercraft/models/block/monitor_normal_ru.json index ca937ffa3..b1b1cc8a5 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_normal_ru.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_normal_ru.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_normal_41", "front": "computercraft:block/monitor_normal_23", "side": "computercraft:block/monitor_normal_5", - "top": "computercraft:block/monitor_normal_3", - "back": "computercraft:block/monitor_normal_41" + "top": "computercraft:block/monitor_normal_3" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_normal_rud.json b/src/generated/resources/assets/computercraft/models/block/monitor_normal_rud.json index 21fb19602..9fc4af9b4 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_normal_rud.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_normal_rud.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_normal_44", "front": "computercraft:block/monitor_normal_26", "side": "computercraft:block/monitor_normal_6", - "top": "computercraft:block/monitor_normal_3", - "back": "computercraft:block/monitor_normal_44" + "top": "computercraft:block/monitor_normal_3" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_normal_u.json b/src/generated/resources/assets/computercraft/models/block/monitor_normal_u.json index a93b45be8..c729a0a27 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_normal_u.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_normal_u.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_normal_38", "front": "computercraft:block/monitor_normal_22", "side": "computercraft:block/monitor_normal_5", - "top": "computercraft:block/monitor_normal_0", - "back": "computercraft:block/monitor_normal_38" + "top": "computercraft:block/monitor_normal_0" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/monitor_normal_ud.json b/src/generated/resources/assets/computercraft/models/block/monitor_normal_ud.json index ff10350c8..ce23c66c2 100644 --- a/src/generated/resources/assets/computercraft/models/block/monitor_normal_ud.json +++ b/src/generated/resources/assets/computercraft/models/block/monitor_normal_ud.json @@ -1,9 +1,9 @@ { "parent": "computercraft:block/monitor_base", "textures": { + "back": "computercraft:block/monitor_normal_37", "front": "computercraft:block/monitor_normal_21", "side": "computercraft:block/monitor_normal_6", - "top": "computercraft:block/monitor_normal_0", - "back": "computercraft:block/monitor_normal_37" + "top": "computercraft:block/monitor_normal_0" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/printer_both_full.json b/src/generated/resources/assets/computercraft/models/block/printer_both_full.json index ee5fe9b36..a6b2659f6 100644 --- a/src/generated/resources/assets/computercraft/models/block/printer_both_full.json +++ b/src/generated/resources/assets/computercraft/models/block/printer_both_full.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "computercraft:block/printer_top", "front": "computercraft:block/printer_front_both_trays", - "side": "computercraft:block/printer_side" + "side": "computercraft:block/printer_side", + "top": "computercraft:block/printer_top" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/printer_bottom_full.json b/src/generated/resources/assets/computercraft/models/block/printer_bottom_full.json index da3947591..e45d7850b 100644 --- a/src/generated/resources/assets/computercraft/models/block/printer_bottom_full.json +++ b/src/generated/resources/assets/computercraft/models/block/printer_bottom_full.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "computercraft:block/printer_top", "front": "computercraft:block/printer_front_bottom_tray", - "side": "computercraft:block/printer_side" + "side": "computercraft:block/printer_side", + "top": "computercraft:block/printer_top" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/printer_empty.json b/src/generated/resources/assets/computercraft/models/block/printer_empty.json index 81c3fc9f8..fe489fe22 100644 --- a/src/generated/resources/assets/computercraft/models/block/printer_empty.json +++ b/src/generated/resources/assets/computercraft/models/block/printer_empty.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "computercraft:block/printer_top", "front": "computercraft:block/printer_front_empty", - "side": "computercraft:block/printer_side" + "side": "computercraft:block/printer_side", + "top": "computercraft:block/printer_top" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/printer_top_full.json b/src/generated/resources/assets/computercraft/models/block/printer_top_full.json index dc933ec7d..1d33e804f 100644 --- a/src/generated/resources/assets/computercraft/models/block/printer_top_full.json +++ b/src/generated/resources/assets/computercraft/models/block/printer_top_full.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "computercraft:block/printer_top", "front": "computercraft:block/printer_front_top_tray", - "side": "computercraft:block/printer_side" + "side": "computercraft:block/printer_side", + "top": "computercraft:block/printer_top" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/speaker.json b/src/generated/resources/assets/computercraft/models/block/speaker.json index 340881c78..f0116b421 100644 --- a/src/generated/resources/assets/computercraft/models/block/speaker.json +++ b/src/generated/resources/assets/computercraft/models/block/speaker.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "computercraft:block/speaker_top", "front": "computercraft:block/speaker_front", - "side": "computercraft:block/speaker_side" + "side": "computercraft:block/speaker_side", + "top": "computercraft:block/speaker_top" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/turtle_advanced.json b/src/generated/resources/assets/computercraft/models/block/turtle_advanced.json index f29fd9847..99ba96d2c 100644 --- a/src/generated/resources/assets/computercraft/models/block/turtle_advanced.json +++ b/src/generated/resources/assets/computercraft/models/block/turtle_advanced.json @@ -1 +1 @@ -{"parent": "computercraft:block/turtle_base", "textures": {"texture": "computercraft:block/turtle_advanced"}} \ No newline at end of file +{"parent": "computercraft:block/turtle_base", "textures": {"texture": "computercraft:block/turtle_advanced"}} diff --git a/src/generated/resources/assets/computercraft/models/block/turtle_crafting_table_left.json b/src/generated/resources/assets/computercraft/models/block/turtle_crafting_table_left.json index f6459f6f4..89b5a6972 100644 --- a/src/generated/resources/assets/computercraft/models/block/turtle_crafting_table_left.json +++ b/src/generated/resources/assets/computercraft/models/block/turtle_crafting_table_left.json @@ -1,4 +1,4 @@ { "parent": "computercraft:block/turtle_upgrade_base_left", "textures": {"texture": "computercraft:block/turtle_crafty_face"} -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/turtle_crafting_table_right.json b/src/generated/resources/assets/computercraft/models/block/turtle_crafting_table_right.json index 65f180993..a180f3411 100644 --- a/src/generated/resources/assets/computercraft/models/block/turtle_crafting_table_right.json +++ b/src/generated/resources/assets/computercraft/models/block/turtle_crafting_table_right.json @@ -1,4 +1,4 @@ { "parent": "computercraft:block/turtle_upgrade_base_right", "textures": {"texture": "computercraft:block/turtle_crafty_face"} -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_off_left.json b/src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_off_left.json index be51e6521..0e7d2d00d 100644 --- a/src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_off_left.json +++ b/src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_off_left.json @@ -1,4 +1,4 @@ { "parent": "computercraft:block/turtle_upgrade_base_left", "textures": {"texture": "computercraft:block/wireless_modem_advanced_face"} -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_off_right.json b/src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_off_right.json index 5e9f89ec2..08393a37c 100644 --- a/src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_off_right.json +++ b/src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_off_right.json @@ -1,4 +1,4 @@ { "parent": "computercraft:block/turtle_upgrade_base_right", "textures": {"texture": "computercraft:block/wireless_modem_advanced_face"} -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_on_left.json b/src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_on_left.json index 2d53e8696..2a615f20f 100644 --- a/src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_on_left.json +++ b/src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_on_left.json @@ -1,4 +1,4 @@ { "parent": "computercraft:block/turtle_upgrade_base_left", "textures": {"texture": "computercraft:block/wireless_modem_advanced_face_on"} -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_on_right.json b/src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_on_right.json index f565b5ac6..657668a74 100644 --- a/src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_on_right.json +++ b/src/generated/resources/assets/computercraft/models/block/turtle_modem_advanced_on_right.json @@ -1,4 +1,4 @@ { "parent": "computercraft:block/turtle_upgrade_base_right", "textures": {"texture": "computercraft:block/wireless_modem_advanced_face_on"} -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_off_left.json b/src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_off_left.json index 678750e90..34dbe1630 100644 --- a/src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_off_left.json +++ b/src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_off_left.json @@ -1,4 +1,4 @@ { "parent": "computercraft:block/turtle_upgrade_base_left", "textures": {"texture": "computercraft:block/wireless_modem_normal_face"} -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_off_right.json b/src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_off_right.json index 2e76166f6..49869b795 100644 --- a/src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_off_right.json +++ b/src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_off_right.json @@ -1,4 +1,4 @@ { "parent": "computercraft:block/turtle_upgrade_base_right", "textures": {"texture": "computercraft:block/wireless_modem_normal_face"} -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_on_left.json b/src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_on_left.json index 4b7116053..9ac52442c 100644 --- a/src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_on_left.json +++ b/src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_on_left.json @@ -1,4 +1,4 @@ { "parent": "computercraft:block/turtle_upgrade_base_left", "textures": {"texture": "computercraft:block/wireless_modem_normal_face_on"} -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_on_right.json b/src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_on_right.json index 4e85c0784..a82ef9362 100644 --- a/src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_on_right.json +++ b/src/generated/resources/assets/computercraft/models/block/turtle_modem_normal_on_right.json @@ -1,4 +1,4 @@ { "parent": "computercraft:block/turtle_upgrade_base_right", "textures": {"texture": "computercraft:block/wireless_modem_normal_face_on"} -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/turtle_normal.json b/src/generated/resources/assets/computercraft/models/block/turtle_normal.json index 9bda0ac95..a3ea9a7f4 100644 --- a/src/generated/resources/assets/computercraft/models/block/turtle_normal.json +++ b/src/generated/resources/assets/computercraft/models/block/turtle_normal.json @@ -1 +1 @@ -{"parent": "computercraft:block/turtle_base", "textures": {"texture": "computercraft:block/turtle_normal"}} \ No newline at end of file +{"parent": "computercraft:block/turtle_base", "textures": {"texture": "computercraft:block/turtle_normal"}} diff --git a/src/generated/resources/assets/computercraft/models/block/turtle_speaker_left.json b/src/generated/resources/assets/computercraft/models/block/turtle_speaker_left.json index 22536e01c..0db150830 100644 --- a/src/generated/resources/assets/computercraft/models/block/turtle_speaker_left.json +++ b/src/generated/resources/assets/computercraft/models/block/turtle_speaker_left.json @@ -1,4 +1,4 @@ { "parent": "computercraft:block/turtle_upgrade_base_left", "textures": {"texture": "computercraft:block/turtle_speaker_face"} -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/turtle_speaker_right.json b/src/generated/resources/assets/computercraft/models/block/turtle_speaker_right.json index 56affb6b7..e0ba3df5f 100644 --- a/src/generated/resources/assets/computercraft/models/block/turtle_speaker_right.json +++ b/src/generated/resources/assets/computercraft/models/block/turtle_speaker_right.json @@ -1,4 +1,4 @@ { "parent": "computercraft:block/turtle_upgrade_base_right", "textures": {"texture": "computercraft:block/turtle_speaker_face"} -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/wired_modem_full_off.json b/src/generated/resources/assets/computercraft/models/block/wired_modem_full_off.json index 525942ea7..1f1d6fff5 100644 --- a/src/generated/resources/assets/computercraft/models/block/wired_modem_full_off.json +++ b/src/generated/resources/assets/computercraft/models/block/wired_modem_full_off.json @@ -1 +1 @@ -{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face"}} \ No newline at end of file +{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face"}} diff --git a/src/generated/resources/assets/computercraft/models/block/wired_modem_full_off_peripheral.json b/src/generated/resources/assets/computercraft/models/block/wired_modem_full_off_peripheral.json index 768fce161..5ee712104 100644 --- a/src/generated/resources/assets/computercraft/models/block/wired_modem_full_off_peripheral.json +++ b/src/generated/resources/assets/computercraft/models/block/wired_modem_full_off_peripheral.json @@ -1 +1 @@ -{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face_peripheral"}} \ No newline at end of file +{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face_peripheral"}} diff --git a/src/generated/resources/assets/computercraft/models/block/wired_modem_full_on.json b/src/generated/resources/assets/computercraft/models/block/wired_modem_full_on.json index d5543b299..92dfa3104 100644 --- a/src/generated/resources/assets/computercraft/models/block/wired_modem_full_on.json +++ b/src/generated/resources/assets/computercraft/models/block/wired_modem_full_on.json @@ -1 +1 @@ -{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face_on"}} \ No newline at end of file +{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face_on"}} diff --git a/src/generated/resources/assets/computercraft/models/block/wired_modem_full_on_peripheral.json b/src/generated/resources/assets/computercraft/models/block/wired_modem_full_on_peripheral.json index ab3e1c4dd..da484b389 100644 --- a/src/generated/resources/assets/computercraft/models/block/wired_modem_full_on_peripheral.json +++ b/src/generated/resources/assets/computercraft/models/block/wired_modem_full_on_peripheral.json @@ -1 +1 @@ -{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face_peripheral_on"}} \ No newline at end of file +{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face_peripheral_on"}} diff --git a/src/generated/resources/assets/computercraft/models/block/wired_modem_off.json b/src/generated/resources/assets/computercraft/models/block/wired_modem_off.json index f461bd796..fda71616f 100644 --- a/src/generated/resources/assets/computercraft/models/block/wired_modem_off.json +++ b/src/generated/resources/assets/computercraft/models/block/wired_modem_off.json @@ -1,4 +1,4 @@ { "parent": "computercraft:block/modem", - "textures": {"front": "computercraft:block/wired_modem_face", "back": "computercraft:block/modem_back"} -} \ No newline at end of file + "textures": {"back": "computercraft:block/modem_back", "front": "computercraft:block/wired_modem_face"} +} diff --git a/src/generated/resources/assets/computercraft/models/block/wired_modem_off_peripheral.json b/src/generated/resources/assets/computercraft/models/block/wired_modem_off_peripheral.json index 65c8622a0..d1e1c9dce 100644 --- a/src/generated/resources/assets/computercraft/models/block/wired_modem_off_peripheral.json +++ b/src/generated/resources/assets/computercraft/models/block/wired_modem_off_peripheral.json @@ -1,4 +1,4 @@ { "parent": "computercraft:block/modem", - "textures": {"front": "computercraft:block/wired_modem_face_peripheral", "back": "computercraft:block/modem_back"} -} \ No newline at end of file + "textures": {"back": "computercraft:block/modem_back", "front": "computercraft:block/wired_modem_face_peripheral"} +} diff --git a/src/generated/resources/assets/computercraft/models/block/wired_modem_on.json b/src/generated/resources/assets/computercraft/models/block/wired_modem_on.json index 81ecd54f6..abd9e04f4 100644 --- a/src/generated/resources/assets/computercraft/models/block/wired_modem_on.json +++ b/src/generated/resources/assets/computercraft/models/block/wired_modem_on.json @@ -1,4 +1,4 @@ { "parent": "computercraft:block/modem", - "textures": {"front": "computercraft:block/wired_modem_face_on", "back": "computercraft:block/modem_back"} -} \ No newline at end of file + "textures": {"back": "computercraft:block/modem_back", "front": "computercraft:block/wired_modem_face_on"} +} diff --git a/src/generated/resources/assets/computercraft/models/block/wired_modem_on_peripheral.json b/src/generated/resources/assets/computercraft/models/block/wired_modem_on_peripheral.json index 32cf21f24..58be99ef4 100644 --- a/src/generated/resources/assets/computercraft/models/block/wired_modem_on_peripheral.json +++ b/src/generated/resources/assets/computercraft/models/block/wired_modem_on_peripheral.json @@ -1,7 +1,7 @@ { "parent": "computercraft:block/modem", "textures": { - "front": "computercraft:block/wired_modem_face_peripheral_on", - "back": "computercraft:block/modem_back" + "back": "computercraft:block/modem_back", + "front": "computercraft:block/wired_modem_face_peripheral_on" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/wireless_modem_advanced_off.json b/src/generated/resources/assets/computercraft/models/block/wireless_modem_advanced_off.json index 047839c3f..54980c936 100644 --- a/src/generated/resources/assets/computercraft/models/block/wireless_modem_advanced_off.json +++ b/src/generated/resources/assets/computercraft/models/block/wireless_modem_advanced_off.json @@ -1,4 +1,4 @@ { "parent": "computercraft:block/modem", - "textures": {"front": "computercraft:block/wireless_modem_advanced_face", "back": "computercraft:block/modem_back"} -} \ No newline at end of file + "textures": {"back": "computercraft:block/modem_back", "front": "computercraft:block/wireless_modem_advanced_face"} +} diff --git a/src/generated/resources/assets/computercraft/models/block/wireless_modem_advanced_on.json b/src/generated/resources/assets/computercraft/models/block/wireless_modem_advanced_on.json index c57b07dd9..f99a7e66a 100644 --- a/src/generated/resources/assets/computercraft/models/block/wireless_modem_advanced_on.json +++ b/src/generated/resources/assets/computercraft/models/block/wireless_modem_advanced_on.json @@ -1,7 +1,7 @@ { "parent": "computercraft:block/modem", "textures": { - "front": "computercraft:block/wireless_modem_advanced_face_on", - "back": "computercraft:block/modem_back" + "back": "computercraft:block/modem_back", + "front": "computercraft:block/wireless_modem_advanced_face_on" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/block/wireless_modem_normal_off.json b/src/generated/resources/assets/computercraft/models/block/wireless_modem_normal_off.json index 5a11715c9..e1422447b 100644 --- a/src/generated/resources/assets/computercraft/models/block/wireless_modem_normal_off.json +++ b/src/generated/resources/assets/computercraft/models/block/wireless_modem_normal_off.json @@ -1,4 +1,4 @@ { "parent": "computercraft:block/modem", - "textures": {"front": "computercraft:block/wireless_modem_normal_face", "back": "computercraft:block/modem_back"} -} \ No newline at end of file + "textures": {"back": "computercraft:block/modem_back", "front": "computercraft:block/wireless_modem_normal_face"} +} diff --git a/src/generated/resources/assets/computercraft/models/block/wireless_modem_normal_on.json b/src/generated/resources/assets/computercraft/models/block/wireless_modem_normal_on.json index 0f7902f4d..77feccc24 100644 --- a/src/generated/resources/assets/computercraft/models/block/wireless_modem_normal_on.json +++ b/src/generated/resources/assets/computercraft/models/block/wireless_modem_normal_on.json @@ -1,4 +1,4 @@ { "parent": "computercraft:block/modem", - "textures": {"front": "computercraft:block/wireless_modem_normal_face_on", "back": "computercraft:block/modem_back"} -} \ No newline at end of file + "textures": {"back": "computercraft:block/modem_back", "front": "computercraft:block/wireless_modem_normal_face_on"} +} diff --git a/src/generated/resources/assets/computercraft/models/item/computer_advanced.json b/src/generated/resources/assets/computercraft/models/item/computer_advanced.json index 3a418487e..57ff7311d 100644 --- a/src/generated/resources/assets/computercraft/models/item/computer_advanced.json +++ b/src/generated/resources/assets/computercraft/models/item/computer_advanced.json @@ -1 +1 @@ -{"parent": "computercraft:block/computer_advanced_blinking"} \ No newline at end of file +{"parent": "computercraft:block/computer_advanced_blinking"} diff --git a/src/generated/resources/assets/computercraft/models/item/computer_command.json b/src/generated/resources/assets/computercraft/models/item/computer_command.json index 79f15adfb..fac0decda 100644 --- a/src/generated/resources/assets/computercraft/models/item/computer_command.json +++ b/src/generated/resources/assets/computercraft/models/item/computer_command.json @@ -1 +1 @@ -{"parent": "computercraft:block/computer_command_blinking"} \ No newline at end of file +{"parent": "computercraft:block/computer_command_blinking"} diff --git a/src/generated/resources/assets/computercraft/models/item/computer_normal.json b/src/generated/resources/assets/computercraft/models/item/computer_normal.json index 2a93d21b2..e69fc6cb4 100644 --- a/src/generated/resources/assets/computercraft/models/item/computer_normal.json +++ b/src/generated/resources/assets/computercraft/models/item/computer_normal.json @@ -1 +1 @@ -{"parent": "computercraft:block/computer_normal_blinking"} \ No newline at end of file +{"parent": "computercraft:block/computer_normal_blinking"} diff --git a/src/generated/resources/assets/computercraft/models/item/disk.json b/src/generated/resources/assets/computercraft/models/item/disk.json index 56c6fb122..d4d1f96f1 100644 --- a/src/generated/resources/assets/computercraft/models/item/disk.json +++ b/src/generated/resources/assets/computercraft/models/item/disk.json @@ -1,4 +1,4 @@ { "parent": "minecraft:item/generated", "textures": {"layer0": "computercraft:item/disk_frame", "layer1": "computercraft:item/disk_colour"} -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/item/disk_drive.json b/src/generated/resources/assets/computercraft/models/item/disk_drive.json index 42c9ed010..3d648a9b3 100644 --- a/src/generated/resources/assets/computercraft/models/item/disk_drive.json +++ b/src/generated/resources/assets/computercraft/models/item/disk_drive.json @@ -1 +1 @@ -{"parent": "computercraft:block/disk_drive_empty"} \ No newline at end of file +{"parent": "computercraft:block/disk_drive_empty"} diff --git a/src/generated/resources/assets/computercraft/models/item/monitor_advanced.json b/src/generated/resources/assets/computercraft/models/item/monitor_advanced.json index 1d6e470e2..f60c0313f 100644 --- a/src/generated/resources/assets/computercraft/models/item/monitor_advanced.json +++ b/src/generated/resources/assets/computercraft/models/item/monitor_advanced.json @@ -1 +1 @@ -{"parent": "computercraft:block/monitor_advanced_item"} \ No newline at end of file +{"parent": "computercraft:block/monitor_advanced_item"} diff --git a/src/generated/resources/assets/computercraft/models/item/monitor_normal.json b/src/generated/resources/assets/computercraft/models/item/monitor_normal.json index e221021db..fed49936d 100644 --- a/src/generated/resources/assets/computercraft/models/item/monitor_normal.json +++ b/src/generated/resources/assets/computercraft/models/item/monitor_normal.json @@ -1 +1 @@ -{"parent": "computercraft:block/monitor_normal_item"} \ No newline at end of file +{"parent": "computercraft:block/monitor_normal_item"} diff --git a/src/generated/resources/assets/computercraft/models/item/pocket_computer_advanced_blinking.json b/src/generated/resources/assets/computercraft/models/item/pocket_computer_advanced_blinking.json index ad74c2177..b9504d340 100644 --- a/src/generated/resources/assets/computercraft/models/item/pocket_computer_advanced_blinking.json +++ b/src/generated/resources/assets/computercraft/models/item/pocket_computer_advanced_blinking.json @@ -5,4 +5,4 @@ "layer1": "computercraft:item/pocket_computer_advanced", "layer2": "computercraft:item/pocket_computer_light" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/item/pocket_computer_advanced_on.json b/src/generated/resources/assets/computercraft/models/item/pocket_computer_advanced_on.json index af0b12f43..3a24c8822 100644 --- a/src/generated/resources/assets/computercraft/models/item/pocket_computer_advanced_on.json +++ b/src/generated/resources/assets/computercraft/models/item/pocket_computer_advanced_on.json @@ -5,4 +5,4 @@ "layer1": "computercraft:item/pocket_computer_advanced", "layer2": "computercraft:item/pocket_computer_light" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/item/pocket_computer_colour.json b/src/generated/resources/assets/computercraft/models/item/pocket_computer_colour.json index e010c77ae..57d323094 100644 --- a/src/generated/resources/assets/computercraft/models/item/pocket_computer_colour.json +++ b/src/generated/resources/assets/computercraft/models/item/pocket_computer_colour.json @@ -4,4 +4,4 @@ "layer0": "computercraft:item/pocket_computer_frame", "layer1": "computercraft:item/pocket_computer_colour" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/item/pocket_computer_colour_blinking.json b/src/generated/resources/assets/computercraft/models/item/pocket_computer_colour_blinking.json index 05f8d2f00..a3cd99df6 100644 --- a/src/generated/resources/assets/computercraft/models/item/pocket_computer_colour_blinking.json +++ b/src/generated/resources/assets/computercraft/models/item/pocket_computer_colour_blinking.json @@ -5,4 +5,4 @@ "layer1": "computercraft:item/pocket_computer_colour", "layer2": "computercraft:item/pocket_computer_light" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/item/pocket_computer_colour_on.json b/src/generated/resources/assets/computercraft/models/item/pocket_computer_colour_on.json index 7c77c6faa..af3b82e8e 100644 --- a/src/generated/resources/assets/computercraft/models/item/pocket_computer_colour_on.json +++ b/src/generated/resources/assets/computercraft/models/item/pocket_computer_colour_on.json @@ -5,4 +5,4 @@ "layer1": "computercraft:item/pocket_computer_colour", "layer2": "computercraft:item/pocket_computer_light" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/item/pocket_computer_normal_blinking.json b/src/generated/resources/assets/computercraft/models/item/pocket_computer_normal_blinking.json index 1977f6e3a..0685ea28a 100644 --- a/src/generated/resources/assets/computercraft/models/item/pocket_computer_normal_blinking.json +++ b/src/generated/resources/assets/computercraft/models/item/pocket_computer_normal_blinking.json @@ -5,4 +5,4 @@ "layer1": "computercraft:item/pocket_computer_normal", "layer2": "computercraft:item/pocket_computer_light" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/item/pocket_computer_normal_on.json b/src/generated/resources/assets/computercraft/models/item/pocket_computer_normal_on.json index 832ef44c3..2cf505505 100644 --- a/src/generated/resources/assets/computercraft/models/item/pocket_computer_normal_on.json +++ b/src/generated/resources/assets/computercraft/models/item/pocket_computer_normal_on.json @@ -5,4 +5,4 @@ "layer1": "computercraft:item/pocket_computer_normal", "layer2": "computercraft:item/pocket_computer_light" } -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/item/printed_book.json b/src/generated/resources/assets/computercraft/models/item/printed_book.json index a9b28587a..5ef52a307 100644 --- a/src/generated/resources/assets/computercraft/models/item/printed_book.json +++ b/src/generated/resources/assets/computercraft/models/item/printed_book.json @@ -1 +1 @@ -{"parent": "minecraft:item/generated", "textures": {"layer0": "computercraft:item/printed_book"}} \ No newline at end of file +{"parent": "minecraft:item/generated", "textures": {"layer0": "computercraft:item/printed_book"}} diff --git a/src/generated/resources/assets/computercraft/models/item/printed_page.json b/src/generated/resources/assets/computercraft/models/item/printed_page.json index a5fc28b95..60eb97790 100644 --- a/src/generated/resources/assets/computercraft/models/item/printed_page.json +++ b/src/generated/resources/assets/computercraft/models/item/printed_page.json @@ -1 +1 @@ -{"parent": "minecraft:item/generated", "textures": {"layer0": "computercraft:item/printed_page"}} \ No newline at end of file +{"parent": "minecraft:item/generated", "textures": {"layer0": "computercraft:item/printed_page"}} diff --git a/src/generated/resources/assets/computercraft/models/item/printed_pages.json b/src/generated/resources/assets/computercraft/models/item/printed_pages.json index 84499dbf2..c427068e6 100644 --- a/src/generated/resources/assets/computercraft/models/item/printed_pages.json +++ b/src/generated/resources/assets/computercraft/models/item/printed_pages.json @@ -1 +1 @@ -{"parent": "minecraft:item/generated", "textures": {"layer0": "computercraft:item/printed_pages"}} \ No newline at end of file +{"parent": "minecraft:item/generated", "textures": {"layer0": "computercraft:item/printed_pages"}} diff --git a/src/generated/resources/assets/computercraft/models/item/printer.json b/src/generated/resources/assets/computercraft/models/item/printer.json index 794d0c58f..24dfc6509 100644 --- a/src/generated/resources/assets/computercraft/models/item/printer.json +++ b/src/generated/resources/assets/computercraft/models/item/printer.json @@ -1 +1 @@ -{"parent": "computercraft:block/printer_empty"} \ No newline at end of file +{"parent": "computercraft:block/printer_empty"} diff --git a/src/generated/resources/assets/computercraft/models/item/speaker.json b/src/generated/resources/assets/computercraft/models/item/speaker.json index ae66da5cb..44743735a 100644 --- a/src/generated/resources/assets/computercraft/models/item/speaker.json +++ b/src/generated/resources/assets/computercraft/models/item/speaker.json @@ -1 +1 @@ -{"parent": "computercraft:block/speaker"} \ No newline at end of file +{"parent": "computercraft:block/speaker"} diff --git a/src/generated/resources/assets/computercraft/models/item/treasure_disk.json b/src/generated/resources/assets/computercraft/models/item/treasure_disk.json index 56c6fb122..d4d1f96f1 100644 --- a/src/generated/resources/assets/computercraft/models/item/treasure_disk.json +++ b/src/generated/resources/assets/computercraft/models/item/treasure_disk.json @@ -1,4 +1,4 @@ { "parent": "minecraft:item/generated", "textures": {"layer0": "computercraft:item/disk_frame", "layer1": "computercraft:item/disk_colour"} -} \ No newline at end of file +} diff --git a/src/generated/resources/assets/computercraft/models/item/turtle_advanced.json b/src/generated/resources/assets/computercraft/models/item/turtle_advanced.json index 66ad045a2..9ad8aedec 100644 --- a/src/generated/resources/assets/computercraft/models/item/turtle_advanced.json +++ b/src/generated/resources/assets/computercraft/models/item/turtle_advanced.json @@ -1 +1 @@ -{"loader": "computercraft:turtle", "model": "computercraft:block/turtle_advanced"} \ No newline at end of file +{"loader": "computercraft:turtle", "model": "computercraft:block/turtle_advanced"} diff --git a/src/generated/resources/assets/computercraft/models/item/turtle_normal.json b/src/generated/resources/assets/computercraft/models/item/turtle_normal.json index 18e686a8c..b7af990fd 100644 --- a/src/generated/resources/assets/computercraft/models/item/turtle_normal.json +++ b/src/generated/resources/assets/computercraft/models/item/turtle_normal.json @@ -1 +1 @@ -{"loader": "computercraft:turtle", "model": "computercraft:block/turtle_normal"} \ No newline at end of file +{"loader": "computercraft:turtle", "model": "computercraft:block/turtle_normal"} diff --git a/src/generated/resources/assets/computercraft/models/item/wired_modem.json b/src/generated/resources/assets/computercraft/models/item/wired_modem.json index 487b1d0f1..c03843813 100644 --- a/src/generated/resources/assets/computercraft/models/item/wired_modem.json +++ b/src/generated/resources/assets/computercraft/models/item/wired_modem.json @@ -1 +1 @@ -{"parent": "computercraft:block/wired_modem_off"} \ No newline at end of file +{"parent": "computercraft:block/wired_modem_off"} diff --git a/src/generated/resources/assets/computercraft/models/item/wired_modem_full.json b/src/generated/resources/assets/computercraft/models/item/wired_modem_full.json index 42c866124..8f120c233 100644 --- a/src/generated/resources/assets/computercraft/models/item/wired_modem_full.json +++ b/src/generated/resources/assets/computercraft/models/item/wired_modem_full.json @@ -1 +1 @@ -{"parent": "computercraft:block/wired_modem_full_off"} \ No newline at end of file +{"parent": "computercraft:block/wired_modem_full_off"} diff --git a/src/generated/resources/assets/computercraft/models/item/wireless_modem_advanced.json b/src/generated/resources/assets/computercraft/models/item/wireless_modem_advanced.json index ed9a5d3c0..8c1e90e9d 100644 --- a/src/generated/resources/assets/computercraft/models/item/wireless_modem_advanced.json +++ b/src/generated/resources/assets/computercraft/models/item/wireless_modem_advanced.json @@ -1 +1 @@ -{"parent": "computercraft:block/wireless_modem_advanced_off"} \ No newline at end of file +{"parent": "computercraft:block/wireless_modem_advanced_off"} diff --git a/src/generated/resources/assets/computercraft/models/item/wireless_modem_normal.json b/src/generated/resources/assets/computercraft/models/item/wireless_modem_normal.json index 93263f0ed..6c3d1dff5 100644 --- a/src/generated/resources/assets/computercraft/models/item/wireless_modem_normal.json +++ b/src/generated/resources/assets/computercraft/models/item/wireless_modem_normal.json @@ -1 +1 @@ -{"parent": "computercraft:block/wireless_modem_normal_off"} \ No newline at end of file +{"parent": "computercraft:block/wireless_modem_normal_off"} diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/cable.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/cable.json index ecec5122c..c0ca963cc 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/cable.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/cable.json @@ -1,43 +1,16 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:cable" - ] - }, "criteria": { "has_computer": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "computercraft:computer" - } - ] - } + "conditions": {"items": [{"tag": "computercraft:computer"}]}, + "trigger": "minecraft:inventory_changed" }, "has_modem": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "computercraft:wired_modem" - } - ] - } + "conditions": {"items": [{"tag": "computercraft:wired_modem"}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:cable" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:cable"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_computer", - "has_modem", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_computer", "has_modem", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:cable"]} +} 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 index 99eeaf6f2..26a24584f 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_advanced.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_advanced.json @@ -1,39 +1,15 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:computer_advanced" - ] - }, "criteria": { "has_components": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:redstone" - ] - }, - { - "items": [ - "minecraft:gold_ingot" - ] - } - ] - } + "conditions": {"items": [{"items": ["minecraft:redstone"]}, {"items": ["minecraft:gold_ingot"]}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:computer_advanced" - } + "conditions": {"recipe": "computercraft:computer_advanced"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_components", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_components", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:computer_advanced"]} +} diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_advanced_upgrade.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_advanced_upgrade.json index ec38e5ec7..1ca5940d2 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_advanced_upgrade.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_advanced_upgrade.json @@ -1,37 +1,15 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:computer_advanced_upgrade" - ] - }, "criteria": { "has_components": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:computer_normal" - ] - }, - { - "tag": "forge:ingots/gold" - } - ] - } + "conditions": {"items": [{"items": ["computercraft:computer_normal"]}, {"tag": "forge:ingots/gold"}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:computer_advanced_upgrade" - } + "conditions": {"recipe": "computercraft:computer_advanced_upgrade"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_components", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_components", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:computer_advanced_upgrade"]} +} 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 index 9ea24782f..39bb35ac5 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_command.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_command.json @@ -1,34 +1,15 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:computer_command" - ] - }, "criteria": { "has_components": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:command_block" - ] - } - ] - } + "conditions": {"items": [{"items": ["minecraft:command_block"]}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:computer_command" - } + "conditions": {"recipe": "computercraft:computer_command"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_components", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_components", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:computer_command"]} +} 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 index df587895f..a9acd2996 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_normal.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/computer_normal.json @@ -1,32 +1,15 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:computer_normal" - ] - }, "criteria": { "has_redstone": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "forge:dusts/redstone" - } - ] - } + "conditions": {"items": [{"tag": "forge:dusts/redstone"}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:computer_normal" - } + "conditions": {"recipe": "computercraft:computer_normal"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_redstone", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_redstone", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:computer_normal"]} +} 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 index 9f34f0132..6efbaf513 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_1.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_1.json @@ -1,34 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:disk_1" - ] - }, "criteria": { "has_drive": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:disk_drive" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:disk_drive"]}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:disk_1" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:disk_1"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_drive", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_drive", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:disk_1"]} +} 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 index 00b6063f7..59eb9ab39 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_10.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_10.json @@ -1,34 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:disk_10" - ] - }, "criteria": { "has_drive": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:disk_drive" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:disk_drive"]}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:disk_10" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:disk_10"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_drive", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_drive", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:disk_10"]} +} 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 index 38561cda0..4b85efc3e 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_11.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_11.json @@ -1,34 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:disk_11" - ] - }, "criteria": { "has_drive": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:disk_drive" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:disk_drive"]}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:disk_11" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:disk_11"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_drive", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_drive", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:disk_11"]} +} 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 index e88addd4f..9c497cee1 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_12.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_12.json @@ -1,34 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:disk_12" - ] - }, "criteria": { "has_drive": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:disk_drive" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:disk_drive"]}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:disk_12" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:disk_12"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_drive", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_drive", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:disk_12"]} +} 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 index cd19ae33f..2a469f0b1 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_13.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_13.json @@ -1,34 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:disk_13" - ] - }, "criteria": { "has_drive": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:disk_drive" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:disk_drive"]}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:disk_13" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:disk_13"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_drive", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_drive", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:disk_13"]} +} 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 index ef0f17843..623a68038 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_14.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_14.json @@ -1,34 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:disk_14" - ] - }, "criteria": { "has_drive": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:disk_drive" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:disk_drive"]}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:disk_14" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:disk_14"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_drive", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_drive", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:disk_14"]} +} 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 index 678d48d21..6f237ae70 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_15.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_15.json @@ -1,34 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:disk_15" - ] - }, "criteria": { "has_drive": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:disk_drive" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:disk_drive"]}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:disk_15" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:disk_15"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_drive", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_drive", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:disk_15"]} +} 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 index f5d5d597a..7b8081291 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_16.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_16.json @@ -1,34 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:disk_16" - ] - }, "criteria": { "has_drive": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:disk_drive" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:disk_drive"]}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:disk_16" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:disk_16"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_drive", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_drive", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:disk_16"]} +} 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 index 089eefa55..c3fc5d11c 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_2.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_2.json @@ -1,34 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:disk_2" - ] - }, "criteria": { "has_drive": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:disk_drive" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:disk_drive"]}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:disk_2" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:disk_2"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_drive", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_drive", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:disk_2"]} +} 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 index 01ba3291e..ee780b872 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_3.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_3.json @@ -1,34 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:disk_3" - ] - }, "criteria": { "has_drive": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:disk_drive" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:disk_drive"]}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:disk_3" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:disk_3"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_drive", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_drive", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:disk_3"]} +} 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 index f9fb5a70e..442b0fc67 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_4.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_4.json @@ -1,34 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:disk_4" - ] - }, "criteria": { "has_drive": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:disk_drive" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:disk_drive"]}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:disk_4" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:disk_4"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_drive", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_drive", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:disk_4"]} +} 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 index d0d8b138e..d09c33282 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_5.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_5.json @@ -1,34 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:disk_5" - ] - }, "criteria": { "has_drive": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:disk_drive" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:disk_drive"]}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:disk_5" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:disk_5"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_drive", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_drive", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:disk_5"]} +} 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 index d8c18541f..f697bf18c 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_6.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_6.json @@ -1,34 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:disk_6" - ] - }, "criteria": { "has_drive": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:disk_drive" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:disk_drive"]}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:disk_6" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:disk_6"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_drive", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_drive", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:disk_6"]} +} 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 index 1d4936bf6..5ebd52ec7 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_7.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_7.json @@ -1,34 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:disk_7" - ] - }, "criteria": { "has_drive": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:disk_drive" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:disk_drive"]}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:disk_7" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:disk_7"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_drive", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_drive", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:disk_7"]} +} 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 index dac96a1f1..05fcbde12 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_8.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_8.json @@ -1,34 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:disk_8" - ] - }, "criteria": { "has_drive": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:disk_drive" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:disk_drive"]}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:disk_8" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:disk_8"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_drive", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_drive", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:disk_8"]} +} 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 index bcb7a3b4f..309e0d497 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_9.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_9.json @@ -1,34 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:disk_9" - ] - }, "criteria": { "has_drive": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:disk_drive" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:disk_drive"]}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:disk_9" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:disk_9"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_drive", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_drive", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:disk_9"]} +} 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 index 7fb18766e..31ce50828 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_drive.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/disk_drive.json @@ -1,32 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:disk_drive" - ] - }, "criteria": { "has_computer": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "computercraft:computer" - } - ] - } + "conditions": {"items": [{"tag": "computercraft:computer"}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:disk_drive" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:disk_drive"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_computer", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_computer", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:disk_drive"]} +} 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 index dab4faad3..7fc8c04f4 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/monitor_advanced.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/monitor_advanced.json @@ -1,32 +1,15 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:monitor_advanced" - ] - }, "criteria": { "has_computer": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "computercraft:computer" - } - ] - } + "conditions": {"items": [{"tag": "computercraft:computer"}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:monitor_advanced" - } + "conditions": {"recipe": "computercraft:monitor_advanced"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_computer", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_computer", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:monitor_advanced"]} +} 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 index fdd3c274c..54c4ca3e6 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/monitor_normal.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/monitor_normal.json @@ -1,32 +1,15 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:monitor_normal" - ] - }, "criteria": { "has_computer": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "computercraft:computer" - } - ] - } + "conditions": {"items": [{"tag": "computercraft:computer"}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:monitor_normal" - } + "conditions": {"recipe": "computercraft:monitor_normal"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_computer", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_computer", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:monitor_normal"]} +} 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 index 90a8720e5..a140b16db 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/speaker.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/speaker.json @@ -1,39 +1,17 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_advanced/computercraft/speaker" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ - { - "items": [ - "computercraft:pocket_computer_advanced" - ] - }, - { - "items": [ - "computercraft:speaker" - ] - } - ] - } + "items": [{"items": ["computercraft:pocket_computer_advanced"]}, {"items": ["computercraft:speaker"]}] + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_advanced/computercraft/speaker" - } + "conditions": {"recipe": "computercraft:pocket_advanced/computercraft/speaker"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:pocket_advanced/computercraft/speaker"]} +} 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 index d2c68d9c2..a7b7f80f0 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_advanced.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_advanced.json @@ -1,39 +1,20 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_advanced/computercraft/wireless_modem_advanced" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { - "items": [ - "computercraft:pocket_computer_advanced" - ] - }, - { - "items": [ - "computercraft:wireless_modem_advanced" - ] - } + {"items": ["computercraft:pocket_computer_advanced"]}, + {"items": ["computercraft:wireless_modem_advanced"]} ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_advanced/computercraft/wireless_modem_advanced" - } + "conditions": {"recipe": "computercraft:pocket_advanced/computercraft/wireless_modem_advanced"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:pocket_advanced/computercraft/wireless_modem_advanced"]} +} 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 index c43257316..1e256df89 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_normal.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/computercraft/wireless_modem_normal.json @@ -1,39 +1,20 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_advanced/computercraft/wireless_modem_normal" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { - "items": [ - "computercraft:pocket_computer_advanced" - ] - }, - { - "items": [ - "computercraft:wireless_modem_normal" - ] - } + {"items": ["computercraft:pocket_computer_advanced"]}, + {"items": ["computercraft:wireless_modem_normal"]} ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_advanced/computercraft/wireless_modem_normal" - } + "conditions": {"recipe": "computercraft:pocket_advanced/computercraft/wireless_modem_normal"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:pocket_advanced/computercraft/wireless_modem_normal"]} +} 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 index 7fba02295..43ddc1ffe 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_advanced.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_advanced.json @@ -1,45 +1,19 @@ { "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": [ - { - "items": [ - "minecraft:golden_apple" - ] - } - ] - } + "conditions": {"items": [{"items": ["minecraft:golden_apple"]}]}, + "trigger": "minecraft:inventory_changed" + }, + "has_computer": { + "conditions": {"items": [{"tag": "computercraft:computer"}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_computer_advanced" - } + "conditions": {"recipe": "computercraft:pocket_computer_advanced"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_computer", - "has_apple", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_computer", "has_apple", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:pocket_computer_advanced"]} +} diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_advanced_upgrade.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_advanced_upgrade.json index d78ca5d9e..4d3e3e4ed 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_advanced_upgrade.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_advanced_upgrade.json @@ -1,37 +1,17 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_computer_advanced_upgrade" - ] - }, "criteria": { "has_components": { - "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ - { - "items": [ - "computercraft:pocket_computer_normal" - ] - }, - { - "tag": "forge:ingots/gold" - } - ] - } + "items": [{"items": ["computercraft:pocket_computer_normal"]}, {"tag": "forge:ingots/gold"}] + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_computer_advanced_upgrade" - } + "conditions": {"recipe": "computercraft:pocket_computer_advanced_upgrade"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_components", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_components", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:pocket_computer_advanced_upgrade"]} +} 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 index 5a775c486..d471e5d8c 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_normal.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_computer_normal.json @@ -1,45 +1,19 @@ { "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": [ - { - "items": [ - "minecraft:golden_apple" - ] - } - ] - } + "conditions": {"items": [{"items": ["minecraft:golden_apple"]}]}, + "trigger": "minecraft:inventory_changed" + }, + "has_computer": { + "conditions": {"items": [{"tag": "computercraft:computer"}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_computer_normal" - } + "conditions": {"recipe": "computercraft:pocket_computer_normal"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_computer", - "has_apple", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_computer", "has_apple", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:pocket_computer_normal"]} +} 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 index c7f1206aa..336423ac1 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/speaker.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/speaker.json @@ -1,39 +1,17 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_normal/computercraft/speaker" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ - { - "items": [ - "computercraft:pocket_computer_normal" - ] - }, - { - "items": [ - "computercraft:speaker" - ] - } - ] - } + "items": [{"items": ["computercraft:pocket_computer_normal"]}, {"items": ["computercraft:speaker"]}] + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_normal/computercraft/speaker" - } + "conditions": {"recipe": "computercraft:pocket_normal/computercraft/speaker"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:pocket_normal/computercraft/speaker"]} +} 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 index ece1617c1..4f05e22e5 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/wireless_modem_advanced.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/wireless_modem_advanced.json @@ -1,39 +1,20 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_normal/computercraft/wireless_modem_advanced" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { - "items": [ - "computercraft:pocket_computer_normal" - ] - }, - { - "items": [ - "computercraft:wireless_modem_advanced" - ] - } + {"items": ["computercraft:pocket_computer_normal"]}, + {"items": ["computercraft:wireless_modem_advanced"]} ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_normal/computercraft/wireless_modem_advanced" - } + "conditions": {"recipe": "computercraft:pocket_normal/computercraft/wireless_modem_advanced"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:pocket_normal/computercraft/wireless_modem_advanced"]} +} 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 index bef52186e..488075e42 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/wireless_modem_normal.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/computercraft/wireless_modem_normal.json @@ -1,39 +1,20 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:pocket_normal/computercraft/wireless_modem_normal" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { - "items": [ - "computercraft:pocket_computer_normal" - ] - }, - { - "items": [ - "computercraft:wireless_modem_normal" - ] - } + {"items": ["computercraft:pocket_computer_normal"]}, + {"items": ["computercraft:wireless_modem_normal"]} ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:pocket_normal/computercraft/wireless_modem_normal" - } + "conditions": {"recipe": "computercraft:pocket_normal/computercraft/wireless_modem_normal"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:pocket_normal/computercraft/wireless_modem_normal"]} +} diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printed_book.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printed_book.json index 5435f8029..ab5743fa3 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printed_book.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printed_book.json @@ -1,34 +1,15 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:printed_book" - ] - }, "criteria": { "has_printer": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:printer" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:printer"]}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:printed_book" - } + "conditions": {"recipe": "computercraft:printed_book"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_printer", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_printer", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:printed_book"]} +} diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printed_pages.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printed_pages.json index c02672917..7ee19a946 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printed_pages.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printed_pages.json @@ -1,34 +1,15 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:printed_pages" - ] - }, "criteria": { "has_printer": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:printer" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:printer"]}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:printed_pages" - } + "conditions": {"recipe": "computercraft:printed_pages"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_printer", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_printer", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:printed_pages"]} +} diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printer.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printer.json index 08a2ffeba..7760559b5 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printer.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/printer.json @@ -1,32 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:printer" - ] - }, "criteria": { "has_computer": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "computercraft:computer" - } - ] - } + "conditions": {"items": [{"tag": "computercraft:computer"}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:printer" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:printer"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_computer", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_computer", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:printer"]} +} diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/speaker.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/speaker.json index 194f7caec..a4cfa68a3 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/speaker.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/speaker.json @@ -1,32 +1,12 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:speaker" - ] - }, "criteria": { "has_computer": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "computercraft:computer" - } - ] - } + "conditions": {"items": [{"tag": "computercraft:computer"}]}, + "trigger": "minecraft:inventory_changed" }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:speaker" - } - } + "has_the_recipe": {"conditions": {"recipe": "computercraft:speaker"}, "trigger": "minecraft:recipe_unlocked"} }, - "requirements": [ - [ - "has_computer", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_computer", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:speaker"]} +} diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced.json index 06e0affc0..25ddb95fd 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced.json @@ -1,34 +1,15 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_advanced" - ] - }, "criteria": { "has_computer": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:computer_normal" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:computer_normal"]}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_advanced" - } + "conditions": {"recipe": "computercraft:turtle_advanced"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_computer", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_computer", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_advanced"]} +} 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 index c54721424..fe5ecf99f 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/speaker.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/speaker.json @@ -1,39 +1,17 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_advanced/computercraft/speaker" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ - { - "items": [ - "computercraft:turtle_advanced" - ] - }, - { - "items": [ - "computercraft:speaker" - ] - } - ] - } + "items": [{"items": ["computercraft:turtle_advanced"]}, {"items": ["computercraft:speaker"]}] + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_advanced/computercraft/speaker" - } + "conditions": {"recipe": "computercraft:turtle_advanced/computercraft/speaker"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_advanced/computercraft/speaker"]} +} 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 index 66ee37549..c987dd29d 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/wireless_modem_advanced.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/wireless_modem_advanced.json @@ -1,39 +1,20 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_advanced/computercraft/wireless_modem_advanced" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { - "items": [ - "computercraft:turtle_advanced" - ] - }, - { - "items": [ - "computercraft:wireless_modem_advanced" - ] - } + {"items": ["computercraft:turtle_advanced"]}, + {"items": ["computercraft:wireless_modem_advanced"]} ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_advanced/computercraft/wireless_modem_advanced" - } + "conditions": {"recipe": "computercraft:turtle_advanced/computercraft/wireless_modem_advanced"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_advanced/computercraft/wireless_modem_advanced"]} +} 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 index ae2c6c4ab..0b7325811 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/wireless_modem_normal.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/computercraft/wireless_modem_normal.json @@ -1,39 +1,20 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_advanced/computercraft/wireless_modem_normal" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { - "items": [ - "computercraft:turtle_advanced" - ] - }, - { - "items": [ - "computercraft:wireless_modem_normal" - ] - } + {"items": ["computercraft:turtle_advanced"]}, + {"items": ["computercraft:wireless_modem_normal"]} ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_advanced/computercraft/wireless_modem_normal" - } + "conditions": {"recipe": "computercraft:turtle_advanced/computercraft/wireless_modem_normal"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_advanced/computercraft/wireless_modem_normal"]} +} 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 index 39187358f..4ec2f683b 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/crafting_table.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/crafting_table.json @@ -1,39 +1,17 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_advanced/minecraft/crafting_table" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ - { - "items": [ - "computercraft:turtle_advanced" - ] - }, - { - "items": [ - "minecraft:crafting_table" - ] - } - ] - } + "items": [{"items": ["computercraft:turtle_advanced"]}, {"items": ["minecraft:crafting_table"]}] + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_advanced/minecraft/crafting_table" - } + "conditions": {"recipe": "computercraft:turtle_advanced/minecraft/crafting_table"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_advanced/minecraft/crafting_table"]} +} 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 index e026aaf7e..e59726271 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_axe.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_axe.json @@ -1,39 +1,17 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_advanced/minecraft/diamond_axe" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ - { - "items": [ - "computercraft:turtle_advanced" - ] - }, - { - "items": [ - "minecraft:diamond_axe" - ] - } - ] - } + "items": [{"items": ["computercraft:turtle_advanced"]}, {"items": ["minecraft:diamond_axe"]}] + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_advanced/minecraft/diamond_axe" - } + "conditions": {"recipe": "computercraft:turtle_advanced/minecraft/diamond_axe"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_advanced/minecraft/diamond_axe"]} +} 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 index 22c965bb3..458c5e577 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_hoe.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_hoe.json @@ -1,39 +1,17 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_advanced/minecraft/diamond_hoe" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ - { - "items": [ - "computercraft:turtle_advanced" - ] - }, - { - "items": [ - "minecraft:diamond_hoe" - ] - } - ] - } + "items": [{"items": ["computercraft:turtle_advanced"]}, {"items": ["minecraft:diamond_hoe"]}] + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_advanced/minecraft/diamond_hoe" - } + "conditions": {"recipe": "computercraft:turtle_advanced/minecraft/diamond_hoe"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_advanced/minecraft/diamond_hoe"]} +} 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 index 796b0cae0..ed390b830 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_pickaxe.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_pickaxe.json @@ -1,39 +1,17 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_advanced/minecraft/diamond_pickaxe" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ - { - "items": [ - "computercraft:turtle_advanced" - ] - }, - { - "items": [ - "minecraft:diamond_pickaxe" - ] - } - ] - } + "items": [{"items": ["computercraft:turtle_advanced"]}, {"items": ["minecraft:diamond_pickaxe"]}] + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_advanced/minecraft/diamond_pickaxe" - } + "conditions": {"recipe": "computercraft:turtle_advanced/minecraft/diamond_pickaxe"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_advanced/minecraft/diamond_pickaxe"]} +} 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 index 6f5105d04..d9d643ce4 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_shovel.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_shovel.json @@ -1,39 +1,17 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_advanced/minecraft/diamond_shovel" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ - { - "items": [ - "computercraft:turtle_advanced" - ] - }, - { - "items": [ - "minecraft:diamond_shovel" - ] - } - ] - } + "items": [{"items": ["computercraft:turtle_advanced"]}, {"items": ["minecraft:diamond_shovel"]}] + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_advanced/minecraft/diamond_shovel" - } + "conditions": {"recipe": "computercraft:turtle_advanced/minecraft/diamond_shovel"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_advanced/minecraft/diamond_shovel"]} +} 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 index feaaa0562..095ab5657 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_sword.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced/minecraft/diamond_sword.json @@ -1,39 +1,17 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_advanced/minecraft/diamond_sword" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ - { - "items": [ - "computercraft:turtle_advanced" - ] - }, - { - "items": [ - "minecraft:diamond_sword" - ] - } - ] - } + "items": [{"items": ["computercraft:turtle_advanced"]}, {"items": ["minecraft:diamond_sword"]}] + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_advanced/minecraft/diamond_sword" - } + "conditions": {"recipe": "computercraft:turtle_advanced/minecraft/diamond_sword"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_advanced/minecraft/diamond_sword"]} +} diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced_upgrade.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced_upgrade.json index 96db81057..b7b683a03 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced_upgrade.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_advanced_upgrade.json @@ -1,37 +1,15 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_advanced_upgrade" - ] - }, "criteria": { "has_components": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:turtle_normal" - ] - }, - { - "tag": "forge:ingots/gold" - } - ] - } + "conditions": {"items": [{"items": ["computercraft:turtle_normal"]}, {"tag": "forge:ingots/gold"}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_advanced_upgrade" - } + "conditions": {"recipe": "computercraft:turtle_advanced_upgrade"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_components", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_components", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_advanced_upgrade"]} +} diff --git a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal.json b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal.json index f3ffab142..61e6213cc 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal.json @@ -1,34 +1,15 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_normal" - ] - }, "criteria": { "has_computer": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:computer_normal" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:computer_normal"]}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_normal" - } + "conditions": {"recipe": "computercraft:turtle_normal"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_computer", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_computer", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_normal"]} +} 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 index 9580aa6c1..3559d8032 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/speaker.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/speaker.json @@ -1,39 +1,17 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_normal/computercraft/speaker" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ - { - "items": [ - "computercraft:turtle_normal" - ] - }, - { - "items": [ - "computercraft:speaker" - ] - } - ] - } + "items": [{"items": ["computercraft:turtle_normal"]}, {"items": ["computercraft:speaker"]}] + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_normal/computercraft/speaker" - } + "conditions": {"recipe": "computercraft:turtle_normal/computercraft/speaker"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_normal/computercraft/speaker"]} +} 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 index 7b26f6f86..1c8fdf045 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/wireless_modem_advanced.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/wireless_modem_advanced.json @@ -1,39 +1,20 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_normal/computercraft/wireless_modem_advanced" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { - "items": [ - "computercraft:turtle_normal" - ] - }, - { - "items": [ - "computercraft:wireless_modem_advanced" - ] - } + {"items": ["computercraft:turtle_normal"]}, + {"items": ["computercraft:wireless_modem_advanced"]} ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_normal/computercraft/wireless_modem_advanced" - } + "conditions": {"recipe": "computercraft:turtle_normal/computercraft/wireless_modem_advanced"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_normal/computercraft/wireless_modem_advanced"]} +} 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 index 3e1817136..dd96c072f 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/wireless_modem_normal.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/computercraft/wireless_modem_normal.json @@ -1,39 +1,20 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_normal/computercraft/wireless_modem_normal" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { - "items": [ - "computercraft:turtle_normal" - ] - }, - { - "items": [ - "computercraft:wireless_modem_normal" - ] - } + {"items": ["computercraft:turtle_normal"]}, + {"items": ["computercraft:wireless_modem_normal"]} ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_normal/computercraft/wireless_modem_normal" - } + "conditions": {"recipe": "computercraft:turtle_normal/computercraft/wireless_modem_normal"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_normal/computercraft/wireless_modem_normal"]} +} 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 index a499c785c..ad5023dab 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/crafting_table.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/crafting_table.json @@ -1,39 +1,17 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_normal/minecraft/crafting_table" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ - { - "items": [ - "computercraft:turtle_normal" - ] - }, - { - "items": [ - "minecraft:crafting_table" - ] - } - ] - } + "items": [{"items": ["computercraft:turtle_normal"]}, {"items": ["minecraft:crafting_table"]}] + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_normal/minecraft/crafting_table" - } + "conditions": {"recipe": "computercraft:turtle_normal/minecraft/crafting_table"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_normal/minecraft/crafting_table"]} +} 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 index 3b3218736..af5bc1f06 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_axe.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_axe.json @@ -1,39 +1,17 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_normal/minecraft/diamond_axe" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ - { - "items": [ - "computercraft:turtle_normal" - ] - }, - { - "items": [ - "minecraft:diamond_axe" - ] - } - ] - } + "items": [{"items": ["computercraft:turtle_normal"]}, {"items": ["minecraft:diamond_axe"]}] + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_normal/minecraft/diamond_axe" - } + "conditions": {"recipe": "computercraft:turtle_normal/minecraft/diamond_axe"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_normal/minecraft/diamond_axe"]} +} 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 index 898fb3b0f..72733b768 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_hoe.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_hoe.json @@ -1,39 +1,17 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_normal/minecraft/diamond_hoe" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ - { - "items": [ - "computercraft:turtle_normal" - ] - }, - { - "items": [ - "minecraft:diamond_hoe" - ] - } - ] - } + "items": [{"items": ["computercraft:turtle_normal"]}, {"items": ["minecraft:diamond_hoe"]}] + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_normal/minecraft/diamond_hoe" - } + "conditions": {"recipe": "computercraft:turtle_normal/minecraft/diamond_hoe"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_normal/minecraft/diamond_hoe"]} +} 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 index 3ec2cbd33..2b64875f6 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_pickaxe.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_pickaxe.json @@ -1,39 +1,17 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_normal/minecraft/diamond_pickaxe" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ - { - "items": [ - "computercraft:turtle_normal" - ] - }, - { - "items": [ - "minecraft:diamond_pickaxe" - ] - } - ] - } + "items": [{"items": ["computercraft:turtle_normal"]}, {"items": ["minecraft:diamond_pickaxe"]}] + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_normal/minecraft/diamond_pickaxe" - } + "conditions": {"recipe": "computercraft:turtle_normal/minecraft/diamond_pickaxe"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_normal/minecraft/diamond_pickaxe"]} +} 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 index 5991f2b95..2df36f6ec 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_shovel.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_shovel.json @@ -1,39 +1,17 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_normal/minecraft/diamond_shovel" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ - { - "items": [ - "computercraft:turtle_normal" - ] - }, - { - "items": [ - "minecraft:diamond_shovel" - ] - } - ] - } + "items": [{"items": ["computercraft:turtle_normal"]}, {"items": ["minecraft:diamond_shovel"]}] + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_normal/minecraft/diamond_shovel" - } + "conditions": {"recipe": "computercraft:turtle_normal/minecraft/diamond_shovel"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_normal/minecraft/diamond_shovel"]} +} 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 index 1e4db9448..38ca7d929 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_sword.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/turtle_normal/minecraft/diamond_sword.json @@ -1,39 +1,17 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:turtle_normal/minecraft/diamond_sword" - ] - }, "criteria": { "has_items": { - "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ - { - "items": [ - "computercraft:turtle_normal" - ] - }, - { - "items": [ - "minecraft:diamond_sword" - ] - } - ] - } + "items": [{"items": ["computercraft:turtle_normal"]}, {"items": ["minecraft:diamond_sword"]}] + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:turtle_normal/minecraft/diamond_sword" - } + "conditions": {"recipe": "computercraft:turtle_normal/minecraft/diamond_sword"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_items", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_items", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:turtle_normal/minecraft/diamond_sword"]} +} 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 index 861de293d..84150e066 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem.json @@ -1,45 +1,19 @@ { "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": [ - { - "items": [ - "computercraft:cable" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:cable"]}]}, + "trigger": "minecraft:inventory_changed" + }, + "has_computer": { + "conditions": {"items": [{"tag": "computercraft:computer"}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:wired_modem" - } + "conditions": {"recipe": "computercraft:wired_modem"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_computer", - "has_cable", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_computer", "has_cable", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:wired_modem"]} +} 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 index a54c82034..c01263d50 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem_full_from.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem_full_from.json @@ -1,32 +1,15 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:wired_modem_full_from" - ] - }, "criteria": { "has_modem": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "computercraft:wired_modem" - } - ] - } + "conditions": {"items": [{"tag": "computercraft:wired_modem"}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:wired_modem_full_from" - } + "conditions": {"recipe": "computercraft:wired_modem_full_from"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_modem", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_modem", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:wired_modem_full_from"]} +} 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 index c0eaec110..bbf3d594d 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem_full_to.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wired_modem_full_to.json @@ -1,32 +1,15 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:wired_modem_full_to" - ] - }, "criteria": { "has_modem": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "computercraft:wired_modem" - } - ] - } + "conditions": {"items": [{"tag": "computercraft:wired_modem"}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:wired_modem_full_to" - } + "conditions": {"recipe": "computercraft:wired_modem_full_to"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_modem", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_modem", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:wired_modem_full_to"]} +} 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 index 4b738939f..bde8f9ab0 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wireless_modem_advanced.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wireless_modem_advanced.json @@ -1,45 +1,19 @@ { "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": [ - { - "items": [ - "computercraft:wireless_modem_normal" - ] - } - ] - } + "conditions": {"items": [{"tag": "computercraft:computer"}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:wireless_modem_advanced" - } + "conditions": {"recipe": "computercraft:wireless_modem_advanced"}, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wireless": { + "conditions": {"items": [{"items": ["computercraft:wireless_modem_normal"]}]}, + "trigger": "minecraft:inventory_changed" } }, - "requirements": [ - [ - "has_computer", - "has_wireless", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_computer", "has_wireless", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:wireless_modem_advanced"]} +} 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 index b0ce1c994..69165dfde 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wireless_modem_normal.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/computercraft/wireless_modem_normal.json @@ -1,32 +1,15 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:wireless_modem_normal" - ] - }, "criteria": { "has_computer": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "computercraft:computer" - } - ] - } + "conditions": {"items": [{"tag": "computercraft:computer"}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:wireless_modem_normal" - } + "conditions": {"recipe": "computercraft:wireless_modem_normal"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_computer", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_computer", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:wireless_modem_normal"]} +} diff --git a/src/generated/resources/data/computercraft/advancements/recipes/decorations/skull_cloudy.json b/src/generated/resources/data/computercraft/advancements/recipes/decorations/skull_cloudy.json index d6b316cee..7a91a3f2b 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/decorations/skull_cloudy.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/decorations/skull_cloudy.json @@ -1,34 +1,15 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:skull_cloudy" - ] - }, "criteria": { "has_monitor": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:monitor_normal" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:monitor_normal"]}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:skull_cloudy" - } + "conditions": {"recipe": "computercraft:skull_cloudy"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_monitor", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_monitor", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:skull_cloudy"]} +} diff --git a/src/generated/resources/data/computercraft/advancements/recipes/decorations/skull_dan200.json b/src/generated/resources/data/computercraft/advancements/recipes/decorations/skull_dan200.json index 899b4610b..1e3705a92 100644 --- a/src/generated/resources/data/computercraft/advancements/recipes/decorations/skull_dan200.json +++ b/src/generated/resources/data/computercraft/advancements/recipes/decorations/skull_dan200.json @@ -1,34 +1,15 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "computercraft:skull_dan200" - ] - }, "criteria": { "has_computer": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "computercraft:computer_advanced" - ] - } - ] - } + "conditions": {"items": [{"items": ["computercraft:computer_advanced"]}]}, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "computercraft:skull_dan200" - } + "conditions": {"recipe": "computercraft:skull_dan200"}, + "trigger": "minecraft:recipe_unlocked" } }, - "requirements": [ - [ - "has_computer", - "has_the_recipe" - ] - ] -} \ No newline at end of file + "requirements": [["has_computer", "has_the_recipe"]], + "rewards": {"recipes": ["computercraft:skull_dan200"]} +} diff --git a/src/generated/resources/data/computercraft/computercraft/pocket_upgrades/speaker.json b/src/generated/resources/data/computercraft/computercraft/pocket_upgrades/speaker.json index 6e1e40437..a0bf2c67a 100644 --- a/src/generated/resources/data/computercraft/computercraft/pocket_upgrades/speaker.json +++ b/src/generated/resources/data/computercraft/computercraft/pocket_upgrades/speaker.json @@ -1,4 +1 @@ -{ - "type": "computercraft:speaker", - "item": "computercraft:speaker" -} \ No newline at end of file +{"type": "computercraft:speaker", "item": "computercraft:speaker"} diff --git a/src/generated/resources/data/computercraft/computercraft/pocket_upgrades/wireless_modem_advanced.json b/src/generated/resources/data/computercraft/computercraft/pocket_upgrades/wireless_modem_advanced.json index 48dcf7bc9..8d9466900 100644 --- a/src/generated/resources/data/computercraft/computercraft/pocket_upgrades/wireless_modem_advanced.json +++ b/src/generated/resources/data/computercraft/computercraft/pocket_upgrades/wireless_modem_advanced.json @@ -1,4 +1 @@ -{ - "type": "computercraft:wireless_modem_advanced", - "item": "computercraft:wireless_modem_advanced" -} \ No newline at end of file +{"type": "computercraft:wireless_modem_advanced", "item": "computercraft:wireless_modem_advanced"} diff --git a/src/generated/resources/data/computercraft/computercraft/pocket_upgrades/wireless_modem_normal.json b/src/generated/resources/data/computercraft/computercraft/pocket_upgrades/wireless_modem_normal.json index 3463d7dde..2c1a9cbd1 100644 --- a/src/generated/resources/data/computercraft/computercraft/pocket_upgrades/wireless_modem_normal.json +++ b/src/generated/resources/data/computercraft/computercraft/pocket_upgrades/wireless_modem_normal.json @@ -1,4 +1 @@ -{ - "type": "computercraft:wireless_modem_normal", - "item": "computercraft:wireless_modem_normal" -} \ No newline at end of file +{"type": "computercraft:wireless_modem_normal", "item": "computercraft:wireless_modem_normal"} diff --git a/src/generated/resources/data/computercraft/computercraft/turtle_upgrades/speaker.json b/src/generated/resources/data/computercraft/computercraft/turtle_upgrades/speaker.json index 6e1e40437..a0bf2c67a 100644 --- a/src/generated/resources/data/computercraft/computercraft/turtle_upgrades/speaker.json +++ b/src/generated/resources/data/computercraft/computercraft/turtle_upgrades/speaker.json @@ -1,4 +1 @@ -{ - "type": "computercraft:speaker", - "item": "computercraft:speaker" -} \ No newline at end of file +{"type": "computercraft:speaker", "item": "computercraft:speaker"} diff --git a/src/generated/resources/data/computercraft/computercraft/turtle_upgrades/wireless_modem_advanced.json b/src/generated/resources/data/computercraft/computercraft/turtle_upgrades/wireless_modem_advanced.json index 48dcf7bc9..8d9466900 100644 --- a/src/generated/resources/data/computercraft/computercraft/turtle_upgrades/wireless_modem_advanced.json +++ b/src/generated/resources/data/computercraft/computercraft/turtle_upgrades/wireless_modem_advanced.json @@ -1,4 +1 @@ -{ - "type": "computercraft:wireless_modem_advanced", - "item": "computercraft:wireless_modem_advanced" -} \ No newline at end of file +{"type": "computercraft:wireless_modem_advanced", "item": "computercraft:wireless_modem_advanced"} diff --git a/src/generated/resources/data/computercraft/computercraft/turtle_upgrades/wireless_modem_normal.json b/src/generated/resources/data/computercraft/computercraft/turtle_upgrades/wireless_modem_normal.json index 3463d7dde..2c1a9cbd1 100644 --- a/src/generated/resources/data/computercraft/computercraft/turtle_upgrades/wireless_modem_normal.json +++ b/src/generated/resources/data/computercraft/computercraft/turtle_upgrades/wireless_modem_normal.json @@ -1,4 +1 @@ -{ - "type": "computercraft:wireless_modem_normal", - "item": "computercraft:wireless_modem_normal" -} \ No newline at end of file +{"type": "computercraft:wireless_modem_normal", "item": "computercraft:wireless_modem_normal"} diff --git a/src/generated/resources/data/computercraft/loot_tables/blocks/cable.json b/src/generated/resources/data/computercraft/loot_tables/blocks/cable.json index 7addfe9db..3095afc7c 100644 --- a/src/generated/resources/data/computercraft/loot_tables/blocks/cable.json +++ b/src/generated/resources/data/computercraft/loot_tables/blocks/cable.json @@ -2,51 +2,33 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ + "conditions": [ + {"condition": "minecraft:survives_explosion"}, { - "type": "minecraft:item", - "name": "computercraft:cable" + "block": "computercraft:cable", + "condition": "minecraft:block_state_property", + "properties": {"cable": "true"} } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:block_state_property", - "block": "computercraft:cable", - "properties": { - "cable": "true" - } - } - ] + "entries": [{"type": "minecraft:item", "name": "computercraft:cable"}], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "computercraft:wired_modem" - } - ], "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, + {"condition": "minecraft:survives_explosion"}, { "condition": "minecraft:inverted", "term": { - "condition": "minecraft:block_state_property", "block": "computercraft:cable", - "properties": { - "modem": "none" - } + "condition": "minecraft:block_state_property", + "properties": {"modem": "none"} } } - ] + ], + "entries": [{"type": "minecraft:item", "name": "computercraft:wired_modem"}], + "rolls": 1.0 } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/computercraft/loot_tables/blocks/computer_advanced.json b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_advanced.json index cdf402d03..cfeeb00d0 100644 --- a/src/generated/resources/data/computercraft/loot_tables/blocks/computer_advanced.json +++ b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_advanced.json @@ -2,33 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:dynamic", - "name": "computercraft:computer" - } - ], "conditions": [ { "condition": "minecraft:alternative", "terms": [ - { - "condition": "computercraft:block_named" - }, - { - "condition": "computercraft:has_id" - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "computercraft:player_creative" - } - } + {"condition": "computercraft:block_named"}, + {"condition": "computercraft:has_id"}, + {"condition": "minecraft:inverted", "term": {"condition": "computercraft:player_creative"}} ] } - ] + ], + "entries": [{"type": "minecraft:dynamic", "name": "computercraft:computer"}], + "rolls": 1.0 } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/computercraft/loot_tables/blocks/computer_command.json b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_command.json index cdf402d03..cfeeb00d0 100644 --- a/src/generated/resources/data/computercraft/loot_tables/blocks/computer_command.json +++ b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_command.json @@ -2,33 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:dynamic", - "name": "computercraft:computer" - } - ], "conditions": [ { "condition": "minecraft:alternative", "terms": [ - { - "condition": "computercraft:block_named" - }, - { - "condition": "computercraft:has_id" - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "computercraft:player_creative" - } - } + {"condition": "computercraft:block_named"}, + {"condition": "computercraft:has_id"}, + {"condition": "minecraft:inverted", "term": {"condition": "computercraft:player_creative"}} ] } - ] + ], + "entries": [{"type": "minecraft:dynamic", "name": "computercraft:computer"}], + "rolls": 1.0 } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/computercraft/loot_tables/blocks/computer_normal.json b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_normal.json index cdf402d03..cfeeb00d0 100644 --- a/src/generated/resources/data/computercraft/loot_tables/blocks/computer_normal.json +++ b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_normal.json @@ -2,33 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:dynamic", - "name": "computercraft:computer" - } - ], "conditions": [ { "condition": "minecraft:alternative", "terms": [ - { - "condition": "computercraft:block_named" - }, - { - "condition": "computercraft:has_id" - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "computercraft:player_creative" - } - } + {"condition": "computercraft:block_named"}, + {"condition": "computercraft:has_id"}, + {"condition": "minecraft:inverted", "term": {"condition": "computercraft:player_creative"}} ] } - ] + ], + "entries": [{"type": "minecraft:dynamic", "name": "computercraft:computer"}], + "rolls": 1.0 } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/computercraft/loot_tables/blocks/disk_drive.json b/src/generated/resources/data/computercraft/loot_tables/blocks/disk_drive.json index 1b4d0ed44..463610e17 100644 --- a/src/generated/resources/data/computercraft/loot_tables/blocks/disk_drive.json +++ b/src/generated/resources/data/computercraft/loot_tables/blocks/disk_drive.json @@ -2,25 +2,16 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [{"condition": "minecraft:survives_explosion"}], "entries": [ { "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:copy_name", - "source": "block_entity" - } - ], + "functions": [{"function": "minecraft:copy_name", "source": "block_entity"}], "name": "computercraft:disk_drive" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json b/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json index 8df3e7df6..dc41695fc 100644 --- a/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json +++ b/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json @@ -2,19 +2,10 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "computercraft:monitor_advanced" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "conditions": [{"condition": "minecraft:survives_explosion"}], + "entries": [{"type": "minecraft:item", "name": "computercraft:monitor_advanced"}], + "rolls": 1.0 } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_normal.json b/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_normal.json index d190321ba..a82a28db3 100644 --- a/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_normal.json +++ b/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_normal.json @@ -2,19 +2,10 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "computercraft:monitor_normal" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "conditions": [{"condition": "minecraft:survives_explosion"}], + "entries": [{"type": "minecraft:item", "name": "computercraft:monitor_normal"}], + "rolls": 1.0 } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/computercraft/loot_tables/blocks/printer.json b/src/generated/resources/data/computercraft/loot_tables/blocks/printer.json index 7d8c3820d..4ca01144d 100644 --- a/src/generated/resources/data/computercraft/loot_tables/blocks/printer.json +++ b/src/generated/resources/data/computercraft/loot_tables/blocks/printer.json @@ -2,25 +2,16 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [{"condition": "minecraft:survives_explosion"}], "entries": [ { "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:copy_name", - "source": "block_entity" - } - ], + "functions": [{"function": "minecraft:copy_name", "source": "block_entity"}], "name": "computercraft:printer" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/computercraft/loot_tables/blocks/speaker.json b/src/generated/resources/data/computercraft/loot_tables/blocks/speaker.json index d3323bde2..cd383f39c 100644 --- a/src/generated/resources/data/computercraft/loot_tables/blocks/speaker.json +++ b/src/generated/resources/data/computercraft/loot_tables/blocks/speaker.json @@ -2,19 +2,10 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "computercraft:speaker" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "conditions": [{"condition": "minecraft:survives_explosion"}], + "entries": [{"type": "minecraft:item", "name": "computercraft:speaker"}], + "rolls": 1.0 } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_advanced.json b/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_advanced.json index cdf402d03..cfeeb00d0 100644 --- a/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_advanced.json +++ b/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_advanced.json @@ -2,33 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:dynamic", - "name": "computercraft:computer" - } - ], "conditions": [ { "condition": "minecraft:alternative", "terms": [ - { - "condition": "computercraft:block_named" - }, - { - "condition": "computercraft:has_id" - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "computercraft:player_creative" - } - } + {"condition": "computercraft:block_named"}, + {"condition": "computercraft:has_id"}, + {"condition": "minecraft:inverted", "term": {"condition": "computercraft:player_creative"}} ] } - ] + ], + "entries": [{"type": "minecraft:dynamic", "name": "computercraft:computer"}], + "rolls": 1.0 } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_normal.json b/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_normal.json index cdf402d03..cfeeb00d0 100644 --- a/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_normal.json +++ b/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_normal.json @@ -2,33 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:dynamic", - "name": "computercraft:computer" - } - ], "conditions": [ { "condition": "minecraft:alternative", "terms": [ - { - "condition": "computercraft:block_named" - }, - { - "condition": "computercraft:has_id" - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "computercraft:player_creative" - } - } + {"condition": "computercraft:block_named"}, + {"condition": "computercraft:has_id"}, + {"condition": "minecraft:inverted", "term": {"condition": "computercraft:player_creative"}} ] } - ] + ], + "entries": [{"type": "minecraft:dynamic", "name": "computercraft:computer"}], + "rolls": 1.0 } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/computercraft/loot_tables/blocks/wired_modem_full.json b/src/generated/resources/data/computercraft/loot_tables/blocks/wired_modem_full.json index 7ba86d6d6..1858357d0 100644 --- a/src/generated/resources/data/computercraft/loot_tables/blocks/wired_modem_full.json +++ b/src/generated/resources/data/computercraft/loot_tables/blocks/wired_modem_full.json @@ -2,19 +2,10 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "computercraft:wired_modem_full" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "conditions": [{"condition": "minecraft:survives_explosion"}], + "entries": [{"type": "minecraft:item", "name": "computercraft:wired_modem_full"}], + "rolls": 1.0 } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json b/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json index 3e2daf5e5..3b125e5a7 100644 --- a/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json +++ b/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json @@ -2,19 +2,10 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "computercraft:wireless_modem_advanced" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "conditions": [{"condition": "minecraft:survives_explosion"}], + "entries": [{"type": "minecraft:item", "name": "computercraft:wireless_modem_advanced"}], + "rolls": 1.0 } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json b/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json index 0fba46907..071f48592 100644 --- a/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json +++ b/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json @@ -2,19 +2,10 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "computercraft:wireless_modem_normal" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "conditions": [{"condition": "minecraft:survives_explosion"}], + "entries": [{"type": "minecraft:item", "name": "computercraft:wireless_modem_normal"}], + "rolls": 1.0 } ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/computercraft/loot_tables/treasure_disk.json b/src/generated/resources/data/computercraft/loot_tables/treasure_disk.json index 9e26dfeeb..0967ef424 100644 --- a/src/generated/resources/data/computercraft/loot_tables/treasure_disk.json +++ b/src/generated/resources/data/computercraft/loot_tables/treasure_disk.json @@ -1 +1 @@ -{} \ 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 index 357212509..50d0e0a5a 100644 --- a/src/generated/resources/data/computercraft/recipes/cable.json +++ b/src/generated/resources/data/computercraft/recipes/cable.json @@ -1,20 +1,6 @@ { "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 + "key": {"#": {"tag": "forge:stone"}, "R": {"tag": "forge:dusts/redstone"}}, + "pattern": [" # ", "#R#", " # "], + "result": {"count": 6, "item": "computercraft:cable"} +} diff --git a/src/generated/resources/data/computercraft/recipes/colour.json b/src/generated/resources/data/computercraft/recipes/colour.json index f8e494be2..d1952921d 100644 --- a/src/generated/resources/data/computercraft/recipes/colour.json +++ b/src/generated/resources/data/computercraft/recipes/colour.json @@ -1,3 +1 @@ -{ - "type": "computercraft:colour" -} \ No newline at end of file +{"type": "computercraft:colour"} diff --git a/src/generated/resources/data/computercraft/recipes/computer_advanced.json b/src/generated/resources/data/computercraft/recipes/computer_advanced.json index d004a6c78..b9ae58575 100644 --- a/src/generated/resources/data/computercraft/recipes/computer_advanced.json +++ b/src/generated/resources/data/computercraft/recipes/computer_advanced.json @@ -1,22 +1,10 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "#R#", - "#G#" - ], "key": { - "#": { - "tag": "forge:ingots/gold" - }, - "R": { - "tag": "forge:dusts/redstone" - }, - "G": { - "tag": "forge:glass_panes" - } + "#": {"tag": "forge:ingots/gold"}, + "G": {"tag": "forge:glass_panes"}, + "R": {"tag": "forge:dusts/redstone"} }, - "result": { - "item": "computercraft:computer_advanced" - } -} \ No newline at end of file + "pattern": ["###", "#R#", "#G#"], + "result": {"item": "computercraft:computer_advanced"} +} diff --git a/src/generated/resources/data/computercraft/recipes/computer_advanced_upgrade.json b/src/generated/resources/data/computercraft/recipes/computer_advanced_upgrade.json index 7e9781e3f..98e94d6fa 100644 --- a/src/generated/resources/data/computercraft/recipes/computer_advanced_upgrade.json +++ b/src/generated/resources/data/computercraft/recipes/computer_advanced_upgrade.json @@ -1,20 +1,7 @@ { "type": "computercraft:computer_upgrade", - "pattern": [ - "###", - "#C#", - "# #" - ], - "key": { - "#": { - "tag": "forge:ingots/gold" - }, - "C": { - "item": "computercraft:computer_advanced" - } - }, - "result": { - "item": "computercraft:computer_advanced" - }, - "family": "ADVANCED" -} \ No newline at end of file + "family": "ADVANCED", + "key": {"#": {"tag": "forge:ingots/gold"}, "C": {"item": "computercraft:computer_advanced"}}, + "pattern": ["###", "#C#", "# #"], + "result": {"item": "computercraft:computer_advanced"} +} diff --git a/src/generated/resources/data/computercraft/recipes/computer_command.json b/src/generated/resources/data/computercraft/recipes/computer_command.json index c3f71b49b..1613f6a49 100644 --- a/src/generated/resources/data/computercraft/recipes/computer_command.json +++ b/src/generated/resources/data/computercraft/recipes/computer_command.json @@ -1,22 +1,10 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "#R#", - "#G#" - ], "key": { - "#": { - "tag": "forge:ingots/gold" - }, - "R": { - "item": "minecraft:command_block" - }, - "G": { - "tag": "forge:glass_panes" - } + "#": {"tag": "forge:ingots/gold"}, + "G": {"tag": "forge:glass_panes"}, + "R": {"item": "minecraft:command_block"} }, - "result": { - "item": "computercraft:computer_command" - } -} \ No newline at end of file + "pattern": ["###", "#R#", "#G#"], + "result": {"item": "computercraft:computer_command"} +} diff --git a/src/generated/resources/data/computercraft/recipes/computer_normal.json b/src/generated/resources/data/computercraft/recipes/computer_normal.json index 661f4945f..f7b6f6833 100644 --- a/src/generated/resources/data/computercraft/recipes/computer_normal.json +++ b/src/generated/resources/data/computercraft/recipes/computer_normal.json @@ -1,22 +1,6 @@ { "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 + "key": {"#": {"tag": "forge:stone"}, "G": {"tag": "forge:glass_panes"}, "R": {"tag": "forge:dusts/redstone"}}, + "pattern": ["###", "#R#", "#G#"], + "result": {"item": "computercraft:computer_normal"} +} diff --git a/src/generated/resources/data/computercraft/recipes/disk.json b/src/generated/resources/data/computercraft/recipes/disk.json index 32c3a567d..6b973d871 100644 --- a/src/generated/resources/data/computercraft/recipes/disk.json +++ b/src/generated/resources/data/computercraft/recipes/disk.json @@ -1,3 +1 @@ -{ - "type": "computercraft:disk" -} \ No newline at end of file +{"type": "computercraft:disk"} diff --git a/src/generated/resources/data/computercraft/recipes/disk_1.json b/src/generated/resources/data/computercraft/recipes/disk_1.json index f062cd66f..b7b1215e1 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_1.json +++ b/src/generated/resources/data/computercraft/recipes/disk_1.json @@ -1,19 +1,6 @@ { "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 + "ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:black_dye"}], + "result": {"item": "computercraft:disk", "nbt": "{Color:1118481}"} +} diff --git a/src/generated/resources/data/computercraft/recipes/disk_10.json b/src/generated/resources/data/computercraft/recipes/disk_10.json index 45771c169..1d75173be 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_10.json +++ b/src/generated/resources/data/computercraft/recipes/disk_10.json @@ -1,19 +1,6 @@ { "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 + "ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:pink_dye"}], + "result": {"item": "computercraft:disk", "nbt": "{Color:15905484}"} +} diff --git a/src/generated/resources/data/computercraft/recipes/disk_11.json b/src/generated/resources/data/computercraft/recipes/disk_11.json index d86dbf599..0e3f9e072 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_11.json +++ b/src/generated/resources/data/computercraft/recipes/disk_11.json @@ -1,19 +1,6 @@ { "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 + "ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:lime_dye"}], + "result": {"item": "computercraft:disk", "nbt": "{Color:8375321}"} +} diff --git a/src/generated/resources/data/computercraft/recipes/disk_12.json b/src/generated/resources/data/computercraft/recipes/disk_12.json index b1306ad27..2d0e84597 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_12.json +++ b/src/generated/resources/data/computercraft/recipes/disk_12.json @@ -2,18 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { - "tag": "forge:dusts/redstone" - }, - { - "item": "minecraft:paper" - }, - { - "item": "minecraft:yellow_dye" - } + {"tag": "forge:dusts/redstone"}, + {"item": "minecraft:paper"}, + {"item": "minecraft:yellow_dye"} ], - "result": { - "item": "computercraft:disk", - "nbt": "{Color:14605932}" - } -} \ No newline at end of file + "result": {"item": "computercraft:disk", "nbt": "{Color:14605932}"} +} diff --git a/src/generated/resources/data/computercraft/recipes/disk_13.json b/src/generated/resources/data/computercraft/recipes/disk_13.json index 3305efea1..823177c78 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_13.json +++ b/src/generated/resources/data/computercraft/recipes/disk_13.json @@ -2,18 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { - "tag": "forge:dusts/redstone" - }, - { - "item": "minecraft:paper" - }, - { - "item": "minecraft:light_blue_dye" - } + {"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 + "result": {"item": "computercraft:disk", "nbt": "{Color:10072818}"} +} diff --git a/src/generated/resources/data/computercraft/recipes/disk_14.json b/src/generated/resources/data/computercraft/recipes/disk_14.json index d5ed6873b..04834024d 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_14.json +++ b/src/generated/resources/data/computercraft/recipes/disk_14.json @@ -2,18 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { - "tag": "forge:dusts/redstone" - }, - { - "item": "minecraft:paper" - }, - { - "item": "minecraft:magenta_dye" - } + {"tag": "forge:dusts/redstone"}, + {"item": "minecraft:paper"}, + {"item": "minecraft:magenta_dye"} ], - "result": { - "item": "computercraft:disk", - "nbt": "{Color:15040472}" - } -} \ No newline at end of file + "result": {"item": "computercraft:disk", "nbt": "{Color:15040472}"} +} diff --git a/src/generated/resources/data/computercraft/recipes/disk_15.json b/src/generated/resources/data/computercraft/recipes/disk_15.json index e296c592a..cf4ae159a 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_15.json +++ b/src/generated/resources/data/computercraft/recipes/disk_15.json @@ -2,18 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { - "tag": "forge:dusts/redstone" - }, - { - "item": "minecraft:paper" - }, - { - "item": "minecraft:orange_dye" - } + {"tag": "forge:dusts/redstone"}, + {"item": "minecraft:paper"}, + {"item": "minecraft:orange_dye"} ], - "result": { - "item": "computercraft:disk", - "nbt": "{Color:15905331}" - } -} \ No newline at end of file + "result": {"item": "computercraft:disk", "nbt": "{Color:15905331}"} +} diff --git a/src/generated/resources/data/computercraft/recipes/disk_16.json b/src/generated/resources/data/computercraft/recipes/disk_16.json index e62f6c34f..a557786b6 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_16.json +++ b/src/generated/resources/data/computercraft/recipes/disk_16.json @@ -1,19 +1,6 @@ { "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 + "ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:white_dye"}], + "result": {"item": "computercraft:disk", "nbt": "{Color:15790320}"} +} diff --git a/src/generated/resources/data/computercraft/recipes/disk_2.json b/src/generated/resources/data/computercraft/recipes/disk_2.json index ee4f4ba1d..5eaf5171a 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_2.json +++ b/src/generated/resources/data/computercraft/recipes/disk_2.json @@ -1,19 +1,6 @@ { "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 + "ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:red_dye"}], + "result": {"item": "computercraft:disk", "nbt": "{Color:13388876}"} +} diff --git a/src/generated/resources/data/computercraft/recipes/disk_3.json b/src/generated/resources/data/computercraft/recipes/disk_3.json index c8a8fae24..f3d6e3cca 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_3.json +++ b/src/generated/resources/data/computercraft/recipes/disk_3.json @@ -1,19 +1,6 @@ { "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 + "ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:green_dye"}], + "result": {"item": "computercraft:disk", "nbt": "{Color:5744206}"} +} diff --git a/src/generated/resources/data/computercraft/recipes/disk_4.json b/src/generated/resources/data/computercraft/recipes/disk_4.json index 109934949..daef5eca4 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_4.json +++ b/src/generated/resources/data/computercraft/recipes/disk_4.json @@ -1,19 +1,6 @@ { "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 + "ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:brown_dye"}], + "result": {"item": "computercraft:disk", "nbt": "{Color:8349260}"} +} diff --git a/src/generated/resources/data/computercraft/recipes/disk_5.json b/src/generated/resources/data/computercraft/recipes/disk_5.json index 53b5186b4..a4be889f8 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_5.json +++ b/src/generated/resources/data/computercraft/recipes/disk_5.json @@ -1,19 +1,6 @@ { "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 + "ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:blue_dye"}], + "result": {"item": "computercraft:disk", "nbt": "{Color:3368652}"} +} diff --git a/src/generated/resources/data/computercraft/recipes/disk_6.json b/src/generated/resources/data/computercraft/recipes/disk_6.json index b45ca974c..3819bd0f6 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_6.json +++ b/src/generated/resources/data/computercraft/recipes/disk_6.json @@ -2,18 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { - "tag": "forge:dusts/redstone" - }, - { - "item": "minecraft:paper" - }, - { - "item": "minecraft:purple_dye" - } + {"tag": "forge:dusts/redstone"}, + {"item": "minecraft:paper"}, + {"item": "minecraft:purple_dye"} ], - "result": { - "item": "computercraft:disk", - "nbt": "{Color:11691749}" - } -} \ No newline at end of file + "result": {"item": "computercraft:disk", "nbt": "{Color:11691749}"} +} diff --git a/src/generated/resources/data/computercraft/recipes/disk_7.json b/src/generated/resources/data/computercraft/recipes/disk_7.json index 1fb41dea8..7384128eb 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_7.json +++ b/src/generated/resources/data/computercraft/recipes/disk_7.json @@ -1,19 +1,6 @@ { "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 + "ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:cyan_dye"}], + "result": {"item": "computercraft:disk", "nbt": "{Color:5020082}"} +} diff --git a/src/generated/resources/data/computercraft/recipes/disk_8.json b/src/generated/resources/data/computercraft/recipes/disk_8.json index 8043bf87f..c8c1c6502 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_8.json +++ b/src/generated/resources/data/computercraft/recipes/disk_8.json @@ -2,18 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { - "tag": "forge:dusts/redstone" - }, - { - "item": "minecraft:paper" - }, - { - "item": "minecraft:light_gray_dye" - } + {"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 + "result": {"item": "computercraft:disk", "nbt": "{Color:10066329}"} +} diff --git a/src/generated/resources/data/computercraft/recipes/disk_9.json b/src/generated/resources/data/computercraft/recipes/disk_9.json index c9593d5f2..6405228b5 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_9.json +++ b/src/generated/resources/data/computercraft/recipes/disk_9.json @@ -1,19 +1,6 @@ { "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 + "ingredients": [{"tag": "forge:dusts/redstone"}, {"item": "minecraft:paper"}, {"item": "minecraft:gray_dye"}], + "result": {"item": "computercraft:disk", "nbt": "{Color:5000268}"} +} diff --git a/src/generated/resources/data/computercraft/recipes/disk_drive.json b/src/generated/resources/data/computercraft/recipes/disk_drive.json index a217fc712..78a632f8d 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_drive.json +++ b/src/generated/resources/data/computercraft/recipes/disk_drive.json @@ -1,19 +1,6 @@ { "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 + "key": {"#": {"tag": "forge:stone"}, "R": {"tag": "forge:dusts/redstone"}}, + "pattern": ["###", "#R#", "#R#"], + "result": {"item": "computercraft:disk_drive"} +} diff --git a/src/generated/resources/data/computercraft/recipes/monitor_advanced.json b/src/generated/resources/data/computercraft/recipes/monitor_advanced.json index 7588676cd..fdc1f42e5 100644 --- a/src/generated/resources/data/computercraft/recipes/monitor_advanced.json +++ b/src/generated/resources/data/computercraft/recipes/monitor_advanced.json @@ -1,20 +1,6 @@ { "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 + "key": {"#": {"tag": "forge:ingots/gold"}, "G": {"tag": "forge:glass_panes"}}, + "pattern": ["###", "#G#", "###"], + "result": {"count": 4, "item": "computercraft:monitor_advanced"} +} diff --git a/src/generated/resources/data/computercraft/recipes/monitor_normal.json b/src/generated/resources/data/computercraft/recipes/monitor_normal.json index 2ded57d08..1a82254e1 100644 --- a/src/generated/resources/data/computercraft/recipes/monitor_normal.json +++ b/src/generated/resources/data/computercraft/recipes/monitor_normal.json @@ -1,19 +1,6 @@ { "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 + "key": {"#": {"tag": "forge:stone"}, "G": {"tag": "forge:glass_panes"}}, + "pattern": ["###", "#G#", "###"], + "result": {"item": "computercraft:monitor_normal"} +} 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 index 567e5aea4..3e9ffc667 100644 --- a/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/speaker.json +++ b/src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/speaker.json @@ -1,20 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:pocket_advanced", - "pattern": [ - "#", - "P" - ], - "key": { - "P": { - "item": "computercraft:pocket_computer_advanced" - }, - "#": { - "item": "computercraft:speaker" - } - }, - "result": { - "item": "computercraft:pocket_computer_advanced", - "nbt": "{Upgrade:\"computercraft:speaker\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "computercraft:speaker"}, "P": {"item": "computercraft:pocket_computer_advanced"}}, + "pattern": ["#", "P"], + "result": {"item": "computercraft:pocket_computer_advanced", "nbt": "{Upgrade:\"computercraft:speaker\"}"} +} 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 index 222c93ae6..c421eb36a 100644 --- 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 @@ -1,20 +1,13 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:pocket_advanced", - "pattern": [ - "#", - "P" - ], "key": { - "P": { - "item": "computercraft:pocket_computer_advanced" - }, - "#": { - "item": "computercraft:wireless_modem_advanced" - } + "#": {"item": "computercraft:wireless_modem_advanced"}, + "P": {"item": "computercraft:pocket_computer_advanced"} }, + "pattern": ["#", "P"], "result": { "item": "computercraft:pocket_computer_advanced", "nbt": "{Upgrade:\"computercraft:wireless_modem_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 index cd9ff2d17..a649307b0 100644 --- 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 @@ -1,20 +1,13 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:pocket_advanced", - "pattern": [ - "#", - "P" - ], "key": { - "P": { - "item": "computercraft:pocket_computer_advanced" - }, - "#": { - "item": "computercraft:wireless_modem_normal" - } + "#": {"item": "computercraft:wireless_modem_normal"}, + "P": {"item": "computercraft:pocket_computer_advanced"} }, + "pattern": ["#", "P"], "result": { "item": "computercraft:pocket_computer_advanced", "nbt": "{Upgrade:\"computercraft:wireless_modem_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 index b8c65358d..4e8ca64df 100644 --- a/src/generated/resources/data/computercraft/recipes/pocket_computer_advanced.json +++ b/src/generated/resources/data/computercraft/recipes/pocket_computer_advanced.json @@ -1,22 +1,10 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "#A#", - "#G#" - ], "key": { - "#": { - "tag": "forge:ingots/gold" - }, - "A": { - "item": "minecraft:golden_apple" - }, - "G": { - "tag": "forge:glass_panes" - } + "#": {"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 + "pattern": ["###", "#A#", "#G#"], + "result": {"item": "computercraft:pocket_computer_advanced"} +} diff --git a/src/generated/resources/data/computercraft/recipes/pocket_computer_advanced_upgrade.json b/src/generated/resources/data/computercraft/recipes/pocket_computer_advanced_upgrade.json index e98691a5b..7c1011b9a 100644 --- a/src/generated/resources/data/computercraft/recipes/pocket_computer_advanced_upgrade.json +++ b/src/generated/resources/data/computercraft/recipes/pocket_computer_advanced_upgrade.json @@ -1,20 +1,7 @@ { "type": "computercraft:computer_upgrade", - "pattern": [ - "###", - "#C#", - "# #" - ], - "key": { - "#": { - "tag": "forge:ingots/gold" - }, - "C": { - "item": "computercraft:pocket_computer_normal" - } - }, - "result": { - "item": "computercraft:pocket_computer_advanced" - }, - "family": "ADVANCED" -} \ No newline at end of file + "family": "ADVANCED", + "key": {"#": {"tag": "forge:ingots/gold"}, "C": {"item": "computercraft:pocket_computer_normal"}}, + "pattern": ["###", "#C#", "# #"], + "result": {"item": "computercraft:pocket_computer_advanced"} +} diff --git a/src/generated/resources/data/computercraft/recipes/pocket_computer_normal.json b/src/generated/resources/data/computercraft/recipes/pocket_computer_normal.json index c18f0252a..138e4ef6a 100644 --- a/src/generated/resources/data/computercraft/recipes/pocket_computer_normal.json +++ b/src/generated/resources/data/computercraft/recipes/pocket_computer_normal.json @@ -1,22 +1,10 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "#A#", - "#G#" - ], "key": { - "#": { - "tag": "forge:stone" - }, - "A": { - "item": "minecraft:golden_apple" - }, - "G": { - "tag": "forge:glass_panes" - } + "#": {"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 + "pattern": ["###", "#A#", "#G#"], + "result": {"item": "computercraft:pocket_computer_normal"} +} diff --git a/src/generated/resources/data/computercraft/recipes/pocket_computer_upgrade.json b/src/generated/resources/data/computercraft/recipes/pocket_computer_upgrade.json index 22fdf4c40..5c4c023dc 100644 --- a/src/generated/resources/data/computercraft/recipes/pocket_computer_upgrade.json +++ b/src/generated/resources/data/computercraft/recipes/pocket_computer_upgrade.json @@ -1,3 +1 @@ -{ - "type": "computercraft:pocket_computer_upgrade" -} \ No newline at end of file +{"type": "computercraft:pocket_computer_upgrade"} 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 index dc388cbd4..b3bb6806f 100644 --- a/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/speaker.json +++ b/src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/speaker.json @@ -1,20 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:pocket_normal", - "pattern": [ - "#", - "P" - ], - "key": { - "P": { - "item": "computercraft:pocket_computer_normal" - }, - "#": { - "item": "computercraft:speaker" - } - }, - "result": { - "item": "computercraft:pocket_computer_normal", - "nbt": "{Upgrade:\"computercraft:speaker\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "computercraft:speaker"}, "P": {"item": "computercraft:pocket_computer_normal"}}, + "pattern": ["#", "P"], + "result": {"item": "computercraft:pocket_computer_normal", "nbt": "{Upgrade:\"computercraft:speaker\"}"} +} 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 index c1e7ef083..96c9fb7ab 100644 --- 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 @@ -1,20 +1,13 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:pocket_normal", - "pattern": [ - "#", - "P" - ], "key": { - "P": { - "item": "computercraft:pocket_computer_normal" - }, - "#": { - "item": "computercraft:wireless_modem_advanced" - } + "#": {"item": "computercraft:wireless_modem_advanced"}, + "P": {"item": "computercraft:pocket_computer_normal"} }, + "pattern": ["#", "P"], "result": { "item": "computercraft:pocket_computer_normal", "nbt": "{Upgrade:\"computercraft:wireless_modem_advanced\"}" } -} \ 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 index bf12b0174..fdb82cf1e 100644 --- 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 @@ -1,20 +1,13 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:pocket_normal", - "pattern": [ - "#", - "P" - ], "key": { - "P": { - "item": "computercraft:pocket_computer_normal" - }, - "#": { - "item": "computercraft:wireless_modem_normal" - } + "#": {"item": "computercraft:wireless_modem_normal"}, + "P": {"item": "computercraft:pocket_computer_normal"} }, + "pattern": ["#", "P"], "result": { "item": "computercraft:pocket_computer_normal", "nbt": "{Upgrade:\"computercraft:wireless_modem_normal\"}" } -} \ No newline at end of file +} diff --git a/src/generated/resources/data/computercraft/recipes/printed_book.json b/src/generated/resources/data/computercraft/recipes/printed_book.json index f385a437c..687985dfe 100644 --- a/src/generated/resources/data/computercraft/recipes/printed_book.json +++ b/src/generated/resources/data/computercraft/recipes/printed_book.json @@ -1,17 +1,5 @@ { "type": "computercraft:impostor_shapeless", - "ingredients": [ - { - "tag": "forge:leather" - }, - { - "item": "computercraft:printed_page" - }, - { - "tag": "forge:string" - } - ], - "result": { - "item": "computercraft:printed_book" - } -} \ No newline at end of file + "ingredients": [{"tag": "forge:leather"}, {"item": "computercraft:printed_page"}, {"tag": "forge:string"}], + "result": {"item": "computercraft:printed_book"} +} diff --git a/src/generated/resources/data/computercraft/recipes/printed_pages.json b/src/generated/resources/data/computercraft/recipes/printed_pages.json index 8f206cbb1..53eec104b 100644 --- a/src/generated/resources/data/computercraft/recipes/printed_pages.json +++ b/src/generated/resources/data/computercraft/recipes/printed_pages.json @@ -1,17 +1,9 @@ { "type": "computercraft:impostor_shapeless", "ingredients": [ - { - "item": "computercraft:printed_page" - }, - { - "item": "computercraft:printed_page" - }, - { - "tag": "forge:string" - } + {"item": "computercraft:printed_page"}, + {"item": "computercraft:printed_page"}, + {"tag": "forge:string"} ], - "result": { - "item": "computercraft:printed_pages" - } -} \ No newline at end of file + "result": {"item": "computercraft:printed_pages"} +} diff --git a/src/generated/resources/data/computercraft/recipes/printer.json b/src/generated/resources/data/computercraft/recipes/printer.json index 5f0072676..9aac27b2d 100644 --- a/src/generated/resources/data/computercraft/recipes/printer.json +++ b/src/generated/resources/data/computercraft/recipes/printer.json @@ -1,22 +1,6 @@ { "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 + "key": {"#": {"tag": "forge:stone"}, "D": {"tag": "forge:dyes"}, "R": {"tag": "forge:dusts/redstone"}}, + "pattern": ["###", "#R#", "#D#"], + "result": {"item": "computercraft:printer"} +} diff --git a/src/generated/resources/data/computercraft/recipes/printout.json b/src/generated/resources/data/computercraft/recipes/printout.json index 0e1a02157..21e85df52 100644 --- a/src/generated/resources/data/computercraft/recipes/printout.json +++ b/src/generated/resources/data/computercraft/recipes/printout.json @@ -1,3 +1 @@ -{ - "type": "computercraft:printout" -} \ No newline at end of file +{"type": "computercraft:printout"} diff --git a/src/generated/resources/data/computercraft/recipes/skull_cloudy.json b/src/generated/resources/data/computercraft/recipes/skull_cloudy.json index 6532bd1e9..a21648a2d 100644 --- a/src/generated/resources/data/computercraft/recipes/skull_cloudy.json +++ b/src/generated/resources/data/computercraft/recipes/skull_cloudy.json @@ -1,15 +1,8 @@ { "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:heads" - }, - { - "item": "computercraft:monitor_normal" - } - ], + "ingredients": [{"tag": "forge:heads"}, {"item": "computercraft:monitor_normal"}], "result": { "item": "minecraft:player_head", "nbt": "{SkullOwner:{Id:\"6d074736-b1e9-4378-a99b-bd8777821c9c\",Name:\"Cloudhunter\"}}" } -} \ No newline at end of file +} diff --git a/src/generated/resources/data/computercraft/recipes/skull_dan200.json b/src/generated/resources/data/computercraft/recipes/skull_dan200.json index ee70c63ae..48f256700 100644 --- a/src/generated/resources/data/computercraft/recipes/skull_dan200.json +++ b/src/generated/resources/data/computercraft/recipes/skull_dan200.json @@ -1,15 +1,8 @@ { "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:heads" - }, - { - "item": "computercraft:computer_advanced" - } - ], + "ingredients": [{"tag": "forge:heads"}, {"item": "computercraft:computer_advanced"}], "result": { "item": "minecraft:player_head", "nbt": "{SkullOwner:{Id:\"f3c8d69b-0776-4512-8434-d1b2165909eb\",Name:\"dan200\"}}" } -} \ 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 index c1ede5db7..df8799068 100644 --- a/src/generated/resources/data/computercraft/recipes/speaker.json +++ b/src/generated/resources/data/computercraft/recipes/speaker.json @@ -1,22 +1,10 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "#N#", - "#R#" - ], "key": { - "#": { - "tag": "forge:stone" - }, - "N": { - "item": "minecraft:note_block" - }, - "R": { - "tag": "forge:dusts/redstone" - } + "#": {"tag": "forge:stone"}, + "N": {"item": "minecraft:note_block"}, + "R": {"tag": "forge:dusts/redstone"} }, - "result": { - "item": "computercraft:speaker" - } -} \ No newline at end of file + "pattern": ["###", "#N#", "#R#"], + "result": {"item": "computercraft:speaker"} +} diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced.json index 9423e8455..4533b5293 100644 --- a/src/generated/resources/data/computercraft/recipes/turtle_advanced.json +++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced.json @@ -1,23 +1,11 @@ { "type": "computercraft:turtle", - "pattern": [ - "###", - "#C#", - "#I#" - ], + "family": "ADVANCED", "key": { - "#": { - "tag": "forge:ingots/gold" - }, - "C": { - "item": "computercraft:computer_advanced" - }, - "I": { - "tag": "forge:chests/wooden" - } + "#": {"tag": "forge:ingots/gold"}, + "C": {"item": "computercraft:computer_advanced"}, + "I": {"tag": "forge:chests/wooden"} }, - "result": { - "item": "computercraft:turtle_advanced" - }, - "family": "ADVANCED" -} \ No newline at end of file + "pattern": ["###", "#C#", "#I#"], + "result": {"item": "computercraft:turtle_advanced"} +} 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 index 2cf9964a2..b03916f8e 100644 --- a/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/speaker.json +++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/speaker.json @@ -1,19 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "T": { - "item": "computercraft:turtle_advanced" - }, - "#": { - "item": "computercraft:speaker" - } - }, - "result": { - "item": "computercraft:turtle_advanced", - "nbt": "{RightUpgrade:\"computercraft:speaker\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "computercraft:speaker"}, "T": {"item": "computercraft:turtle_advanced"}}, + "pattern": ["#T"], + "result": {"item": "computercraft:turtle_advanced", "nbt": "{RightUpgrade:\"computercraft:speaker\"}"} +} 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 index c6cc910fe..30fa0de1f 100644 --- 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 @@ -1,19 +1,10 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "T": { - "item": "computercraft:turtle_advanced" - }, - "#": { - "item": "computercraft:wireless_modem_advanced" - } - }, + "key": {"#": {"item": "computercraft:wireless_modem_advanced"}, "T": {"item": "computercraft:turtle_advanced"}}, + "pattern": ["#T"], "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 index 7451f115f..59bee9b44 100644 --- 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 @@ -1,19 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "T": { - "item": "computercraft:turtle_advanced" - }, - "#": { - "item": "computercraft:wireless_modem_normal" - } - }, - "result": { - "item": "computercraft:turtle_advanced", - "nbt": "{RightUpgrade:\"computercraft:wireless_modem_normal\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "computercraft:wireless_modem_normal"}, "T": {"item": "computercraft:turtle_advanced"}}, + "pattern": ["#T"], + "result": {"item": "computercraft:turtle_advanced", "nbt": "{RightUpgrade:\"computercraft:wireless_modem_normal\"}"} +} 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 index 15d1993bf..f4b6fd0bd 100644 --- 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 @@ -1,19 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "T": { - "item": "computercraft:turtle_advanced" - }, - "#": { - "item": "minecraft:crafting_table" - } - }, - "result": { - "item": "computercraft:turtle_advanced", - "nbt": "{RightUpgrade:\"minecraft:crafting_table\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "minecraft:crafting_table"}, "T": {"item": "computercraft:turtle_advanced"}}, + "pattern": ["#T"], + "result": {"item": "computercraft:turtle_advanced", "nbt": "{RightUpgrade:\"minecraft:crafting_table\"}"} +} 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 index 774438beb..988e54d16 100644 --- 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 @@ -1,19 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "T": { - "item": "computercraft:turtle_advanced" - }, - "#": { - "item": "minecraft:diamond_axe" - } - }, - "result": { - "item": "computercraft:turtle_advanced", - "nbt": "{RightUpgrade:\"minecraft:diamond_axe\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "minecraft:diamond_axe"}, "T": {"item": "computercraft:turtle_advanced"}}, + "pattern": ["#T"], + "result": {"item": "computercraft:turtle_advanced", "nbt": "{RightUpgrade:\"minecraft:diamond_axe\"}"} +} 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 index cf00c7587..04ba561d6 100644 --- 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 @@ -1,19 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "T": { - "item": "computercraft:turtle_advanced" - }, - "#": { - "item": "minecraft:diamond_hoe" - } - }, - "result": { - "item": "computercraft:turtle_advanced", - "nbt": "{RightUpgrade:\"minecraft:diamond_hoe\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "minecraft:diamond_hoe"}, "T": {"item": "computercraft:turtle_advanced"}}, + "pattern": ["#T"], + "result": {"item": "computercraft:turtle_advanced", "nbt": "{RightUpgrade:\"minecraft:diamond_hoe\"}"} +} 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 index 58560f66c..ac9c03067 100644 --- 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 @@ -1,19 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "T": { - "item": "computercraft:turtle_advanced" - }, - "#": { - "item": "minecraft:diamond_pickaxe" - } - }, - "result": { - "item": "computercraft:turtle_advanced", - "nbt": "{RightUpgrade:\"minecraft:diamond_pickaxe\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "minecraft:diamond_pickaxe"}, "T": {"item": "computercraft:turtle_advanced"}}, + "pattern": ["#T"], + "result": {"item": "computercraft:turtle_advanced", "nbt": "{RightUpgrade:\"minecraft:diamond_pickaxe\"}"} +} 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 index 614e6178f..839eea44e 100644 --- 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 @@ -1,19 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "T": { - "item": "computercraft:turtle_advanced" - }, - "#": { - "item": "minecraft:diamond_shovel" - } - }, - "result": { - "item": "computercraft:turtle_advanced", - "nbt": "{RightUpgrade:\"minecraft:diamond_shovel\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "minecraft:diamond_shovel"}, "T": {"item": "computercraft:turtle_advanced"}}, + "pattern": ["#T"], + "result": {"item": "computercraft:turtle_advanced", "nbt": "{RightUpgrade:\"minecraft:diamond_shovel\"}"} +} 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 index 846b6bc8e..6b67bc7f6 100644 --- 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 @@ -1,19 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "T": { - "item": "computercraft:turtle_advanced" - }, - "#": { - "item": "minecraft:diamond_sword" - } - }, - "result": { - "item": "computercraft:turtle_advanced", - "nbt": "{RightUpgrade:\"minecraft:diamond_sword\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "minecraft:diamond_sword"}, "T": {"item": "computercraft:turtle_advanced"}}, + "pattern": ["#T"], + "result": {"item": "computercraft:turtle_advanced", "nbt": "{RightUpgrade:\"minecraft:diamond_sword\"}"} +} diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced_upgrade.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced_upgrade.json index 406f08a51..1a1fa7357 100644 --- a/src/generated/resources/data/computercraft/recipes/turtle_advanced_upgrade.json +++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced_upgrade.json @@ -1,23 +1,11 @@ { "type": "computercraft:computer_upgrade", - "pattern": [ - "###", - "#C#", - " B " - ], + "family": "ADVANCED", "key": { - "#": { - "tag": "forge:ingots/gold" - }, - "C": { - "item": "computercraft:computer_advanced" - }, - "B": { - "tag": "forge:storage_blocks/gold" - } + "#": {"tag": "forge:ingots/gold"}, + "B": {"tag": "forge:storage_blocks/gold"}, + "C": {"item": "computercraft:computer_advanced"} }, - "result": { - "item": "computercraft:turtle_advanced" - }, - "family": "ADVANCED" -} \ No newline at end of file + "pattern": ["###", "#C#", " B "], + "result": {"item": "computercraft:turtle_advanced"} +} diff --git a/src/generated/resources/data/computercraft/recipes/turtle_normal.json b/src/generated/resources/data/computercraft/recipes/turtle_normal.json index d796748ff..1201100ef 100644 --- a/src/generated/resources/data/computercraft/recipes/turtle_normal.json +++ b/src/generated/resources/data/computercraft/recipes/turtle_normal.json @@ -1,23 +1,11 @@ { "type": "computercraft:turtle", - "pattern": [ - "###", - "#C#", - "#I#" - ], + "family": "NORMAL", "key": { - "#": { - "tag": "forge:ingots/iron" - }, - "C": { - "item": "computercraft:computer_normal" - }, - "I": { - "tag": "forge:chests/wooden" - } + "#": {"tag": "forge:ingots/iron"}, + "C": {"item": "computercraft:computer_normal"}, + "I": {"tag": "forge:chests/wooden"} }, - "result": { - "item": "computercraft:turtle_normal" - }, - "family": "NORMAL" -} \ No newline at end of file + "pattern": ["###", "#C#", "#I#"], + "result": {"item": "computercraft:turtle_normal"} +} 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 index 39e3fa7e8..255a0c433 100644 --- a/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/speaker.json +++ b/src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/speaker.json @@ -1,19 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "T": { - "item": "computercraft:turtle_normal" - }, - "#": { - "item": "computercraft:speaker" - } - }, - "result": { - "item": "computercraft:turtle_normal", - "nbt": "{RightUpgrade:\"computercraft:speaker\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "computercraft:speaker"}, "T": {"item": "computercraft:turtle_normal"}}, + "pattern": ["#T"], + "result": {"item": "computercraft:turtle_normal", "nbt": "{RightUpgrade:\"computercraft:speaker\"}"} +} 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 index 7b6da28e4..d031e4afa 100644 --- 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 @@ -1,19 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "T": { - "item": "computercraft:turtle_normal" - }, - "#": { - "item": "computercraft:wireless_modem_advanced" - } - }, - "result": { - "item": "computercraft:turtle_normal", - "nbt": "{RightUpgrade:\"computercraft:wireless_modem_advanced\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "computercraft:wireless_modem_advanced"}, "T": {"item": "computercraft:turtle_normal"}}, + "pattern": ["#T"], + "result": {"item": "computercraft:turtle_normal", "nbt": "{RightUpgrade:\"computercraft:wireless_modem_advanced\"}"} +} 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 index 66d096584..07a32a048 100644 --- 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 @@ -1,19 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "T": { - "item": "computercraft:turtle_normal" - }, - "#": { - "item": "computercraft:wireless_modem_normal" - } - }, - "result": { - "item": "computercraft:turtle_normal", - "nbt": "{RightUpgrade:\"computercraft:wireless_modem_normal\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "computercraft:wireless_modem_normal"}, "T": {"item": "computercraft:turtle_normal"}}, + "pattern": ["#T"], + "result": {"item": "computercraft:turtle_normal", "nbt": "{RightUpgrade:\"computercraft:wireless_modem_normal\"}"} +} 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 index 31647e842..05365d33e 100644 --- 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 @@ -1,19 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "T": { - "item": "computercraft:turtle_normal" - }, - "#": { - "item": "minecraft:crafting_table" - } - }, - "result": { - "item": "computercraft:turtle_normal", - "nbt": "{RightUpgrade:\"minecraft:crafting_table\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "minecraft:crafting_table"}, "T": {"item": "computercraft:turtle_normal"}}, + "pattern": ["#T"], + "result": {"item": "computercraft:turtle_normal", "nbt": "{RightUpgrade:\"minecraft:crafting_table\"}"} +} 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 index a79534db6..59362e0c5 100644 --- 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 @@ -1,19 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "T": { - "item": "computercraft:turtle_normal" - }, - "#": { - "item": "minecraft:diamond_axe" - } - }, - "result": { - "item": "computercraft:turtle_normal", - "nbt": "{RightUpgrade:\"minecraft:diamond_axe\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "minecraft:diamond_axe"}, "T": {"item": "computercraft:turtle_normal"}}, + "pattern": ["#T"], + "result": {"item": "computercraft:turtle_normal", "nbt": "{RightUpgrade:\"minecraft:diamond_axe\"}"} +} 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 index 0c0fc1c39..7b3d28761 100644 --- 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 @@ -1,19 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "T": { - "item": "computercraft:turtle_normal" - }, - "#": { - "item": "minecraft:diamond_hoe" - } - }, - "result": { - "item": "computercraft:turtle_normal", - "nbt": "{RightUpgrade:\"minecraft:diamond_hoe\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "minecraft:diamond_hoe"}, "T": {"item": "computercraft:turtle_normal"}}, + "pattern": ["#T"], + "result": {"item": "computercraft:turtle_normal", "nbt": "{RightUpgrade:\"minecraft:diamond_hoe\"}"} +} 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 index 0490a1267..36f660f53 100644 --- 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 @@ -1,19 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "T": { - "item": "computercraft:turtle_normal" - }, - "#": { - "item": "minecraft:diamond_pickaxe" - } - }, - "result": { - "item": "computercraft:turtle_normal", - "nbt": "{RightUpgrade:\"minecraft:diamond_pickaxe\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "minecraft:diamond_pickaxe"}, "T": {"item": "computercraft:turtle_normal"}}, + "pattern": ["#T"], + "result": {"item": "computercraft:turtle_normal", "nbt": "{RightUpgrade:\"minecraft:diamond_pickaxe\"}"} +} 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 index 7bbe87284..e9e9bf05f 100644 --- 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 @@ -1,19 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "T": { - "item": "computercraft:turtle_normal" - }, - "#": { - "item": "minecraft:diamond_shovel" - } - }, - "result": { - "item": "computercraft:turtle_normal", - "nbt": "{RightUpgrade:\"minecraft:diamond_shovel\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "minecraft:diamond_shovel"}, "T": {"item": "computercraft:turtle_normal"}}, + "pattern": ["#T"], + "result": {"item": "computercraft:turtle_normal", "nbt": "{RightUpgrade:\"minecraft:diamond_shovel\"}"} +} 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 index ba893dc67..483b16b7d 100644 --- 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 @@ -1,19 +1,7 @@ { "type": "computercraft:impostor_shaped", "group": "computercraft:turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "T": { - "item": "computercraft:turtle_normal" - }, - "#": { - "item": "minecraft:diamond_sword" - } - }, - "result": { - "item": "computercraft:turtle_normal", - "nbt": "{RightUpgrade:\"minecraft:diamond_sword\"}" - } -} \ No newline at end of file + "key": {"#": {"item": "minecraft:diamond_sword"}, "T": {"item": "computercraft:turtle_normal"}}, + "pattern": ["#T"], + "result": {"item": "computercraft:turtle_normal", "nbt": "{RightUpgrade:\"minecraft:diamond_sword\"}"} +} diff --git a/src/generated/resources/data/computercraft/recipes/turtle_upgrade.json b/src/generated/resources/data/computercraft/recipes/turtle_upgrade.json index 62e103b60..1aa114c8b 100644 --- a/src/generated/resources/data/computercraft/recipes/turtle_upgrade.json +++ b/src/generated/resources/data/computercraft/recipes/turtle_upgrade.json @@ -1,3 +1 @@ -{ - "type": "computercraft:turtle_upgrade" -} \ No newline at end of file +{"type": "computercraft:turtle_upgrade"} diff --git a/src/generated/resources/data/computercraft/recipes/wired_modem.json b/src/generated/resources/data/computercraft/recipes/wired_modem.json index 7494043b4..d1ce1ff1b 100644 --- a/src/generated/resources/data/computercraft/recipes/wired_modem.json +++ b/src/generated/resources/data/computercraft/recipes/wired_modem.json @@ -1,19 +1,6 @@ { "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 + "key": {"#": {"tag": "forge:stone"}, "R": {"tag": "forge:dusts/redstone"}}, + "pattern": ["###", "#R#", "###"], + "result": {"item": "computercraft:wired_modem"} +} 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 index 7865f45de..843f6c344 100644 --- a/src/generated/resources/data/computercraft/recipes/wired_modem_full_from.json +++ b/src/generated/resources/data/computercraft/recipes/wired_modem_full_from.json @@ -1,11 +1,5 @@ { "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "computercraft:wired_modem" - } - ], - "result": { - "item": "computercraft:wired_modem_full" - } -} \ No newline at end of file + "ingredients": [{"item": "computercraft:wired_modem"}], + "result": {"item": "computercraft:wired_modem_full"} +} 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 index 8c303ebb4..aca1cc1f1 100644 --- a/src/generated/resources/data/computercraft/recipes/wired_modem_full_to.json +++ b/src/generated/resources/data/computercraft/recipes/wired_modem_full_to.json @@ -1,11 +1,5 @@ { "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "computercraft:wired_modem_full" - } - ], - "result": { - "item": "computercraft:wired_modem" - } -} \ No newline at end of file + "ingredients": [{"item": "computercraft:wired_modem_full"}], + "result": {"item": "computercraft:wired_modem"} +} diff --git a/src/generated/resources/data/computercraft/recipes/wireless_modem_advanced.json b/src/generated/resources/data/computercraft/recipes/wireless_modem_advanced.json index a274aa73d..c5704363d 100644 --- a/src/generated/resources/data/computercraft/recipes/wireless_modem_advanced.json +++ b/src/generated/resources/data/computercraft/recipes/wireless_modem_advanced.json @@ -1,19 +1,6 @@ { "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 + "key": {"#": {"tag": "forge:ingots/gold"}, "E": {"item": "minecraft:ender_eye"}}, + "pattern": ["###", "#E#", "###"], + "result": {"item": "computercraft:wireless_modem_advanced"} +} diff --git a/src/generated/resources/data/computercraft/recipes/wireless_modem_normal.json b/src/generated/resources/data/computercraft/recipes/wireless_modem_normal.json index e2041f59e..a328c977c 100644 --- a/src/generated/resources/data/computercraft/recipes/wireless_modem_normal.json +++ b/src/generated/resources/data/computercraft/recipes/wireless_modem_normal.json @@ -1,19 +1,6 @@ { "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 + "key": {"#": {"tag": "forge:stone"}, "E": {"tag": "forge:ender_pearls"}}, + "pattern": ["###", "#E#", "###"], + "result": {"item": "computercraft:wireless_modem_normal"} +} diff --git a/src/generated/resources/data/computercraft/tags/blocks/computer.json b/src/generated/resources/data/computercraft/tags/blocks/computer.json index bcd0e8037..b3acd11d5 100644 --- a/src/generated/resources/data/computercraft/tags/blocks/computer.json +++ b/src/generated/resources/data/computercraft/tags/blocks/computer.json @@ -1,8 +1 @@ -{ - "replace": false, - "values": [ - "computercraft:computer_normal", - "computercraft:computer_advanced", - "computercraft:computer_command" - ] -} \ No newline at end of file +{"values": ["computercraft:computer_normal", "computercraft:computer_advanced", "computercraft:computer_command"]} diff --git a/src/generated/resources/data/computercraft/tags/blocks/monitor.json b/src/generated/resources/data/computercraft/tags/blocks/monitor.json index babaefa8b..c785ed666 100644 --- a/src/generated/resources/data/computercraft/tags/blocks/monitor.json +++ b/src/generated/resources/data/computercraft/tags/blocks/monitor.json @@ -1,7 +1 @@ -{ - "replace": false, - "values": [ - "computercraft:monitor_normal", - "computercraft:monitor_advanced" - ] -} \ No newline at end of file +{"values": ["computercraft:monitor_normal", "computercraft:monitor_advanced"]} diff --git a/src/generated/resources/data/computercraft/tags/blocks/turtle.json b/src/generated/resources/data/computercraft/tags/blocks/turtle.json index e4277edfe..10ee058bf 100644 --- a/src/generated/resources/data/computercraft/tags/blocks/turtle.json +++ b/src/generated/resources/data/computercraft/tags/blocks/turtle.json @@ -1,7 +1 @@ -{ - "replace": false, - "values": [ - "computercraft:turtle_normal", - "computercraft:turtle_advanced" - ] -} \ No newline at end of file +{"values": ["computercraft:turtle_normal", "computercraft:turtle_advanced"]} diff --git a/src/generated/resources/data/computercraft/tags/blocks/turtle_always_breakable.json b/src/generated/resources/data/computercraft/tags/blocks/turtle_always_breakable.json index 1d795dcef..0a7481abd 100644 --- a/src/generated/resources/data/computercraft/tags/blocks/turtle_always_breakable.json +++ b/src/generated/resources/data/computercraft/tags/blocks/turtle_always_breakable.json @@ -1,8 +1 @@ -{ - "replace": false, - "values": [ - "#minecraft:leaves", - "minecraft:bamboo", - "minecraft:bamboo_sapling" - ] -} \ No newline at end of file +{"values": ["#minecraft:leaves", "minecraft:bamboo", "minecraft:bamboo_sapling"]} diff --git a/src/generated/resources/data/computercraft/tags/blocks/turtle_hoe_harvestable.json b/src/generated/resources/data/computercraft/tags/blocks/turtle_hoe_harvestable.json index 10e786424..14565b30d 100644 --- a/src/generated/resources/data/computercraft/tags/blocks/turtle_hoe_harvestable.json +++ b/src/generated/resources/data/computercraft/tags/blocks/turtle_hoe_harvestable.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:crops", "#minecraft:mineable/hoe", @@ -9,4 +8,4 @@ "minecraft:carved_pumpkin", "minecraft:jack_o_lantern" ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/computercraft/tags/blocks/turtle_shovel_harvestable.json b/src/generated/resources/data/computercraft/tags/blocks/turtle_shovel_harvestable.json index f6a10bb7f..3538ae3a5 100644 --- a/src/generated/resources/data/computercraft/tags/blocks/turtle_shovel_harvestable.json +++ b/src/generated/resources/data/computercraft/tags/blocks/turtle_shovel_harvestable.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:mineable/shovel", "minecraft:melon", @@ -7,4 +6,4 @@ "minecraft:carved_pumpkin", "minecraft:jack_o_lantern" ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/computercraft/tags/blocks/turtle_sword_harvestable.json b/src/generated/resources/data/computercraft/tags/blocks/turtle_sword_harvestable.json index c38f1efd8..6dd8645bf 100644 --- a/src/generated/resources/data/computercraft/tags/blocks/turtle_sword_harvestable.json +++ b/src/generated/resources/data/computercraft/tags/blocks/turtle_sword_harvestable.json @@ -1,7 +1 @@ -{ - "replace": false, - "values": [ - "#minecraft:wool", - "minecraft:cobweb" - ] -} \ No newline at end of file +{"values": ["#minecraft:wool", "minecraft:cobweb"]} diff --git a/src/generated/resources/data/computercraft/tags/blocks/wired_modem.json b/src/generated/resources/data/computercraft/tags/blocks/wired_modem.json index 10ade37b3..f37071ed7 100644 --- a/src/generated/resources/data/computercraft/tags/blocks/wired_modem.json +++ b/src/generated/resources/data/computercraft/tags/blocks/wired_modem.json @@ -1,7 +1 @@ -{ - "replace": false, - "values": [ - "computercraft:cable", - "computercraft:wired_modem_full" - ] -} \ No newline at end of file +{"values": ["computercraft:cable", "computercraft:wired_modem_full"]} diff --git a/src/generated/resources/data/computercraft/tags/items/computer.json b/src/generated/resources/data/computercraft/tags/items/computer.json index bcd0e8037..b3acd11d5 100644 --- a/src/generated/resources/data/computercraft/tags/items/computer.json +++ b/src/generated/resources/data/computercraft/tags/items/computer.json @@ -1,8 +1 @@ -{ - "replace": false, - "values": [ - "computercraft:computer_normal", - "computercraft:computer_advanced", - "computercraft:computer_command" - ] -} \ No newline at end of file +{"values": ["computercraft:computer_normal", "computercraft:computer_advanced", "computercraft:computer_command"]} diff --git a/src/generated/resources/data/computercraft/tags/items/monitor.json b/src/generated/resources/data/computercraft/tags/items/monitor.json index babaefa8b..c785ed666 100644 --- a/src/generated/resources/data/computercraft/tags/items/monitor.json +++ b/src/generated/resources/data/computercraft/tags/items/monitor.json @@ -1,7 +1 @@ -{ - "replace": false, - "values": [ - "computercraft:monitor_normal", - "computercraft:monitor_advanced" - ] -} \ No newline at end of file +{"values": ["computercraft:monitor_normal", "computercraft:monitor_advanced"]} diff --git a/src/generated/resources/data/computercraft/tags/items/turtle.json b/src/generated/resources/data/computercraft/tags/items/turtle.json index e4277edfe..10ee058bf 100644 --- a/src/generated/resources/data/computercraft/tags/items/turtle.json +++ b/src/generated/resources/data/computercraft/tags/items/turtle.json @@ -1,7 +1 @@ -{ - "replace": false, - "values": [ - "computercraft:turtle_normal", - "computercraft:turtle_advanced" - ] -} \ No newline at end of file +{"values": ["computercraft:turtle_normal", "computercraft:turtle_advanced"]} diff --git a/src/generated/resources/data/computercraft/tags/items/wired_modem.json b/src/generated/resources/data/computercraft/tags/items/wired_modem.json index 57db1557f..02f492412 100644 --- a/src/generated/resources/data/computercraft/tags/items/wired_modem.json +++ b/src/generated/resources/data/computercraft/tags/items/wired_modem.json @@ -1,7 +1 @@ -{ - "replace": false, - "values": [ - "computercraft:wired_modem", - "computercraft:wired_modem_full" - ] -} \ No newline at end of file +{"values": ["computercraft:wired_modem", "computercraft:wired_modem_full"]} diff --git a/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/crafting_table.json b/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/crafting_table.json index aa80f52c9..2e981355e 100644 --- a/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/crafting_table.json +++ b/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/crafting_table.json @@ -1,4 +1 @@ -{ - "type": "computercraft:workbench", - "item": "minecraft:crafting_table" -} \ No newline at end of file +{"type": "computercraft:workbench", "item": "minecraft:crafting_table"} diff --git a/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_axe.json b/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_axe.json index d5c70daba..5ecefb5e6 100644 --- a/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_axe.json +++ b/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_axe.json @@ -1,5 +1 @@ -{ - "type": "computercraft:tool", - "item": "minecraft:diamond_axe", - "damageMultiplier": 6.0 -} \ No newline at end of file +{"type": "computercraft:tool", "damageMultiplier": 6.0, "item": "minecraft:diamond_axe"} diff --git a/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_hoe.json b/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_hoe.json index a5450d17e..66a5cf9fa 100644 --- a/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_hoe.json +++ b/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_hoe.json @@ -1,5 +1 @@ -{ - "type": "computercraft:tool", - "item": "minecraft:diamond_hoe", - "breakable": "computercraft:turtle_hoe_harvestable" -} \ No newline at end of file +{"type": "computercraft:tool", "breakable": "computercraft:turtle_hoe_harvestable", "item": "minecraft:diamond_hoe"} diff --git a/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_pickaxe.json b/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_pickaxe.json index 76a2dd9b1..1bced4e59 100644 --- a/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_pickaxe.json +++ b/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_pickaxe.json @@ -1,4 +1 @@ -{ - "type": "computercraft:tool", - "item": "minecraft:diamond_pickaxe" -} \ No newline at end of file +{"type": "computercraft:tool", "item": "minecraft:diamond_pickaxe"} diff --git a/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_shovel.json b/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_shovel.json index 91e35aee1..c3d57f601 100644 --- a/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_shovel.json +++ b/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_shovel.json @@ -1,5 +1,5 @@ { "type": "computercraft:tool", - "item": "minecraft:diamond_shovel", - "breakable": "computercraft:turtle_shovel_harvestable" -} \ No newline at end of file + "breakable": "computercraft:turtle_shovel_harvestable", + "item": "minecraft:diamond_shovel" +} diff --git a/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_sword.json b/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_sword.json index bd54fb305..2899cfd19 100644 --- a/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_sword.json +++ b/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_sword.json @@ -1,6 +1,6 @@ { "type": "computercraft:tool", - "item": "minecraft:diamond_sword", + "breakable": "computercraft:turtle_sword_harvestable", "damageMultiplier": 9.0, - "breakable": "computercraft:turtle_sword_harvestable" -} \ No newline at end of file + "item": "minecraft:diamond_sword" +} diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index bb1e60dbc..e5a4c9d20 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "computercraft:computer_normal", "computercraft:computer_advanced", @@ -15,4 +14,4 @@ "computercraft:wired_modem_full", "computercraft:cable" ] -} \ No newline at end of file +} diff --git a/src/generated/resources/data/minecraft/tags/items/piglin_loved.json b/src/generated/resources/data/minecraft/tags/items/piglin_loved.json index 8eedcc427..73068ed5d 100644 --- a/src/generated/resources/data/minecraft/tags/items/piglin_loved.json +++ b/src/generated/resources/data/minecraft/tags/items/piglin_loved.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "computercraft:computer_advanced", "computercraft:turtle_advanced", @@ -7,4 +6,4 @@ "computercraft:pocket_computer_advanced", "computercraft:monitor_advanced" ] -} \ No newline at end of file +} diff --git a/src/main/java/dan200/computercraft/data/PrettyJsonWriter.java b/src/main/java/dan200/computercraft/data/PrettyJsonWriter.java index 1393a276d..fed7fde69 100644 --- a/src/main/java/dan200/computercraft/data/PrettyJsonWriter.java +++ b/src/main/java/dan200/computercraft/data/PrettyJsonWriter.java @@ -11,6 +11,8 @@ import com.google.gson.JsonElement; import com.google.gson.JsonSyntaxException; import com.google.gson.stream.JsonWriter; +import net.minecraft.data.DataProvider; +import net.minecraft.util.GsonHelper; import javax.annotation.Nullable; import java.io.*; @@ -85,7 +87,7 @@ public static byte[] reformat( byte[] contents ) var out = new ByteArrayOutputStream(); try( var writer = new PrettyJsonWriter( new OutputStreamWriter( out, StandardCharsets.UTF_8 ) ) ) { - GSON.toJson( object, writer ); + GsonHelper.writeValue( writer, object, DataProvider.KEY_COMPARATOR ); } catch( IOException e ) { diff --git a/src/main/java/dan200/computercraft/mixin/CacheUpdaterMixin.java b/src/main/java/dan200/computercraft/mixin/CacheUpdaterMixin.java new file mode 100644 index 000000000..853d9eda8 --- /dev/null +++ b/src/main/java/dan200/computercraft/mixin/CacheUpdaterMixin.java @@ -0,0 +1,28 @@ +/* + * This file is part of ComputerCraft - http://www.computercraft.info + * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission. + * Send enquiries to dratcliffe@gmail.com + */ +package dan200.computercraft.mixin; + +import dan200.computercraft.data.PrettyJsonWriter; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArg; + +@Mixin( targets = "net/minecraft/data/HashCache$CacheUpdater" ) +class CacheUpdaterMixin +{ + @SuppressWarnings( "UnusedMethod" ) + @ModifyArg( + method = "writeIfNeeded", + at = @At( value = "INVOKE", target = "Ljava/nio/file/Files;write(Ljava/nio/file/Path;[B[Ljava/nio/file/OpenOption;)Ljava/nio/file/Path;" ), + require = 0 + ) + private byte[] reformatJson( byte[] contents ) + { + // It would be cleaner to do this inside DataProvider.saveStable, but Forge's version of Mixin doesn't allow us + // to inject into interfaces. + return PrettyJsonWriter.reformat( contents ); + } +} diff --git a/src/main/resources/computercraft.mixins.json b/src/main/resources/computercraft.mixins.json index 1e6fb5def..d0cee8b3a 100644 --- a/src/main/resources/computercraft.mixins.json +++ b/src/main/resources/computercraft.mixins.json @@ -1,12 +1,15 @@ { "minVersion": "0.8", "required": true, - "compatibilityLevel": "JAVA_8", + "compatibilityLevel": "JAVA_17", "refmap": "computercraft.mixins.refmap.json", "package": "dan200.computercraft.mixin", "client": [ "BlockRenderDispatcherMixin" ], + "mixins": [ + "CacheUpdaterMixin" + ], "injectors": { "defaultRequire": 1 }