From 810258e9b8a9bd2c5238a6077ea482407aac36e2 Mon Sep 17 00:00:00 2001 From: SquidDev Date: Sun, 31 Mar 2019 10:22:33 +0100 Subject: [PATCH] Update and rename all resources - Languages are converted to JSON - Rename most *(_advanced) blocks to *_{advanced,normal}. It's more verbose, but means they're sorted together. - A couple of changes to the ROM to work with some Java changes. - Update recipes and advancements to not use damage values. --- .../resources/META-INF/accesstransformer.cfg | 23 + .../resources/META-INF/computercraft_at.cfg | 7 - src/main/resources/META-INF/mods.toml | 25 + .../blockstates/advanced_modem.json | 17 - .../computercraft/blockstates/cable.json | 68 +-- .../blockstates/command_computer.json | 18 - .../computercraft/blockstates/computer.json | 33 -- .../blockstates/computer_advanced.json | 18 + .../blockstates/computer_command.json | 19 + .../blockstates/computer_normal.json | 18 + .../computercraft/blockstates/disk_drive.json | 16 + .../blockstates/monitor_advanced.json | 364 ++++++++++++++ .../blockstates/monitor_normal.json | 296 ++++++++++++ .../computercraft/blockstates/peripheral.json | 455 ------------------ .../computercraft/blockstates/printer.json | 20 + .../computercraft/blockstates/speaker.json | 8 + .../computercraft/blockstates/turtle.json | 8 - .../blockstates/turtle_advanced.json | 8 +- .../blockstates/turtle_expanded.json | 8 - .../blockstates/turtle_normal.json | 8 + .../blockstates/turtle_normal_expanded.json | 8 + .../blockstates/wired_modem_full.json | 8 +- .../blockstates/wireless_modem_advanced.json | 17 + .../blockstates/wireless_modem_normal.json | 17 + .../assets/computercraft/lang/de_de.json | 79 +++ .../assets/computercraft/lang/de_de.lang | 190 -------- .../assets/computercraft/lang/en_us.json | 190 ++++++++ .../assets/computercraft/lang/en_us.lang | 195 -------- .../assets/computercraft/lang/es_es.json | 75 +++ .../assets/computercraft/lang/es_es.lang | 74 --- .../assets/computercraft/lang/fr_fr.json | 76 +++ .../assets/computercraft/lang/fr_fr.lang | 74 --- .../assets/computercraft/lang/it_it.json | 92 ++++ .../assets/computercraft/lang/it_it.lang | 90 ---- .../assets/computercraft/lang/pt_br.json | 93 ++++ .../assets/computercraft/lang/pt_br.lang | 90 ---- .../assets/computercraft/lang/sv_se.json | 93 ++++ .../assets/computercraft/lang/sv_se.lang | 90 ---- .../block/advanced_computer_blinking.json | 8 - .../models/block/advanced_computer_off.json | 8 - .../models/block/advanced_computer_on.json | 8 - .../models/block/advanced_modem_off.json | 7 - .../models/block/advanced_modem_on.json | 7 - .../models/block/advanced_monitor.json | 9 - .../models/block/advanced_monitor_d.json | 9 - .../models/block/advanced_monitor_item.json | 8 - .../models/block/advanced_monitor_l.json | 9 - .../models/block/advanced_monitor_ld.json | 9 - .../models/block/advanced_monitor_lr.json | 9 - .../models/block/advanced_monitor_lrd.json | 9 - .../models/block/advanced_monitor_lru.json | 9 - .../models/block/advanced_monitor_lrud.json | 9 - .../models/block/advanced_monitor_lu.json | 9 - .../models/block/advanced_monitor_lud.json | 9 - .../models/block/advanced_monitor_r.json | 9 - .../models/block/advanced_monitor_rd.json | 9 - .../models/block/advanced_monitor_ru.json | 9 - .../models/block/advanced_monitor_rud.json | 9 - .../models/block/advanced_monitor_u.json | 9 - .../models/block/advanced_monitor_ud.json | 9 - .../computercraft/models/block/cable_arm.json | 4 +- .../models/block/cable_core_any.json | 4 +- .../models/block/cable_core_facing.json | 6 +- .../models/block/cable_item.json | 6 +- .../block/command_computer_blinking.json | 8 - .../models/block/command_computer_off.json | 8 - .../models/block/command_computer_on.json | 8 - .../block/computer_advanced_blinking.json | 8 + .../models/block/computer_advanced_off.json | 8 + .../models/block/computer_advanced_on.json | 8 + .../models/block/computer_blinking.json | 8 - .../block/computer_command_blinking.json | 8 + .../models/block/computer_command_off.json | 8 + .../models/block/computer_command_on.json | 8 + .../block/computer_normal_blinking.json | 8 + .../models/block/computer_normal_off.json | 8 + .../models/block/computer_normal_on.json | 8 + .../models/block/computer_off.json | 8 - .../models/block/computer_on.json | 8 - .../models/block/disk_drive_empty.json | 6 +- .../models/block/disk_drive_full.json | 6 +- .../models/block/disk_drive_invalid.json | 6 +- .../computercraft/models/block/monitor.json | 9 - .../models/block/monitor_advanced.json | 9 + .../models/block/monitor_advanced_d.json | 9 + .../models/block/monitor_advanced_item.json | 8 + .../models/block/monitor_advanced_l.json | 9 + .../models/block/monitor_advanced_ld.json | 9 + .../models/block/monitor_advanced_lr.json | 9 + .../models/block/monitor_advanced_lrd.json | 9 + .../models/block/monitor_advanced_lru.json | 9 + .../models/block/monitor_advanced_lrud.json | 9 + .../models/block/monitor_advanced_lu.json | 9 + .../models/block/monitor_advanced_lud.json | 9 + .../models/block/monitor_advanced_r.json | 9 + .../models/block/monitor_advanced_rd.json | 9 + .../models/block/monitor_advanced_ru.json | 9 + .../models/block/monitor_advanced_rud.json | 9 + .../models/block/monitor_advanced_u.json | 9 + .../models/block/monitor_advanced_ud.json | 9 + .../computercraft/models/block/monitor_d.json | 9 - .../models/block/monitor_item.json | 8 - .../computercraft/models/block/monitor_l.json | 9 - .../models/block/monitor_ld.json | 9 - .../models/block/monitor_lr.json | 9 - .../models/block/monitor_lrd.json | 9 - .../models/block/monitor_lru.json | 9 - .../models/block/monitor_lrud.json | 9 - .../models/block/monitor_lu.json | 9 - .../models/block/monitor_lud.json | 9 - .../models/block/monitor_normal.json | 9 + .../models/block/monitor_normal_d.json | 9 + .../models/block/monitor_normal_item.json | 8 + .../models/block/monitor_normal_l.json | 9 + .../models/block/monitor_normal_ld.json | 9 + .../models/block/monitor_normal_lr.json | 9 + .../models/block/monitor_normal_lrd.json | 9 + .../models/block/monitor_normal_lru.json | 9 + .../models/block/monitor_normal_lrud.json | 9 + .../models/block/monitor_normal_lu.json | 9 + .../models/block/monitor_normal_lud.json | 9 + .../models/block/monitor_normal_r.json | 9 + .../models/block/monitor_normal_rd.json | 9 + .../models/block/monitor_normal_ru.json | 9 + .../models/block/monitor_normal_rud.json | 9 + .../models/block/monitor_normal_u.json | 9 + .../models/block/monitor_normal_ud.json | 9 + .../computercraft/models/block/monitor_r.json | 9 - .../models/block/monitor_rd.json | 9 - .../models/block/monitor_ru.json | 9 - .../models/block/monitor_rud.json | 9 - .../computercraft/models/block/monitor_u.json | 9 - .../models/block/monitor_ud.json | 9 - .../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 +- ...anced_turtle.json => turtle_advanced.json} | 2 +- .../{turtle_white.json => turtle_colour.json} | 2 +- .../models/block/turtle_elf_overlay.json | 4 +- .../models/block/turtle_modem_on_left.json | 6 - .../models/block/turtle_modem_on_right.json | 6 - .../block/{turtle.json => turtle_normal.json} | 2 +- ...verlay.json => turtle_normal_overlay.json} | 0 .../block/turtle_speaker_upgrade_left.json | 6 - .../block/turtle_speaker_upgrade_right.json | 6 - .../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 | 4 +- .../block/wireless_modem_advanced_off.json | 7 + .../block/wireless_modem_advanced_on.json | 7 + .../block/wireless_modem_normal_off.json | 7 + .../block/wireless_modem_normal_on.json | 7 + .../models/block/wireless_modem_off.json | 7 - .../models/block/wireless_modem_on.json | 7 - .../models/item/advanced_computer.json | 3 - .../models/item/advanced_modem.json | 3 - .../models/item/advanced_monitor.json | 3 - .../advanced_pocket_computer_blinking.json | 8 - .../item/advanced_pocket_computer_on.json | 8 - .../computercraft/models/item/cable.json | 21 +- .../models/item/command_computer.json | 3 - .../computercraft/models/item/computer.json | 13 - .../models/item/computer_advanced.json | 3 + .../models/item/computer_command.json | 3 + .../models/item/computer_normal.json | 3 + .../computercraft/models/item/disk.json | 4 +- .../item/{peripheral.json => disk_drive.json} | 0 .../models/item/disk_expanded.json | 7 - .../computercraft/models/item/monitor.json | 3 - .../models/item/monitor_advanced.json | 3 + .../models/item/monitor_normal.json | 3 + ...ter.json => pocket_computer_advanced.json} | 10 +- .../pocket_computer_advanced_blinking.json | 8 + .../item/pocket_computer_advanced_on.json | 8 + .../models/item/pocket_computer_blinking.json | 8 - .../models/item/pocket_computer_colour.json | 16 +- .../item/pocket_computer_colour_blinking.json | 6 +- .../item/pocket_computer_colour_on.json | 6 +- ...puter.json => pocket_computer_normal.json} | 10 +- .../item/pocket_computer_normal_blinking.json | 8 + .../item/pocket_computer_normal_on.json | 8 + .../models/item/pocket_computer_on.json | 8 - .../item/{printout.json => printed_book.json} | 2 +- .../item/{book.json => printed_page.json} | 2 +- .../item/{pages.json => printed_pages.json} | 2 +- .../models/item/treasure_disk.json | 4 +- .../computercraft/models/item/turtle.json | 3 - .../models/item/turtle_advanced.json | 2 +- .../models/item/turtle_colour.json | 3 + .../turtle_crafting_table_left.json | 2 +- .../turtle_crafting_table_right.json | 2 +- .../models/item/turtle_expanded.json | 3 - .../turtle_modem_advanced_off_left.json} | 2 +- .../turtle_modem_advanced_off_right.json} | 2 +- .../item/turtle_modem_advanced_on_left.json | 6 + .../item/turtle_modem_advanced_on_right.json | 6 + .../turtle_modem_normal_off_left.json} | 2 +- .../turtle_modem_normal_off_right.json} | 2 +- .../item/turtle_modem_normal_on_left.json | 6 + .../item/turtle_modem_normal_on_right.json | 6 + .../models/item/turtle_normal.json | 3 + .../turtle_speaker_upgrade_left.json} | 2 +- .../turtle_speaker_upgrade_right.json} | 2 +- .../models/item/turtle_white.json | 3 - .../models/item/wireless_modem.json | 3 - .../models/item/wireless_modem_advanced.json | 3 + .../models/item/wireless_modem_normal.json | 3 + ...vanced.png => computer_advanced_front.png} | Bin ....png => computer_advanced_front_blink.png} | Bin ... computer_advanced_front_blink.png.mcmeta} | 0 ...ced.png => computer_advanced_front_on.png} | Bin ...dvanced.png => computer_advanced_side.png} | Bin ...advanced.png => computer_advanced_top.png} | Bin ...r_front.png => computer_command_front.png} | Bin ...k.png => computer_command_front_blink.png} | Bin ...> computer_command_front_blink.png.mcmeta} | 0 ...t_on.png => computer_command_front_on.png} | Bin ...ter_side.png => computer_command_side.png} | Bin ...puter_top.png => computer_command_top.png} | Bin ...er_front.png => computer_normal_front.png} | Bin ...nk.png => computer_normal_front_blink.png} | Bin ...=> computer_normal_front_blink.png.mcmeta} | 0 ...nt_on.png => computer_normal_front_on.png} | Bin ...uter_side.png => computer_normal_side.png} | Bin ...mputer_top.png => computer_normal_top.png} | Bin ...dv_monitor0.png => monitor_advanced_0.png} | Bin ...dv_monitor1.png => monitor_advanced_1.png} | Bin ..._monitor15.png => monitor_advanced_15.png} | Bin ..._monitor16.png => monitor_advanced_16.png} | Bin ..._monitor17.png => monitor_advanced_17.png} | Bin ..._monitor18.png => monitor_advanced_18.png} | Bin ..._monitor19.png => monitor_advanced_19.png} | Bin ...dv_monitor2.png => monitor_advanced_2.png} | Bin ..._monitor20.png => monitor_advanced_20.png} | Bin ..._monitor21.png => monitor_advanced_21.png} | Bin ..._monitor22.png => monitor_advanced_22.png} | Bin ..._monitor23.png => monitor_advanced_23.png} | Bin ..._monitor24.png => monitor_advanced_24.png} | Bin ..._monitor25.png => monitor_advanced_25.png} | Bin ..._monitor26.png => monitor_advanced_26.png} | Bin ..._monitor27.png => monitor_advanced_27.png} | Bin ..._monitor28.png => monitor_advanced_28.png} | Bin ..._monitor29.png => monitor_advanced_29.png} | Bin ...dv_monitor3.png => monitor_advanced_3.png} | Bin ..._monitor30.png => monitor_advanced_30.png} | Bin ..._monitor31.png => monitor_advanced_31.png} | Bin ..._monitor32.png => monitor_advanced_32.png} | Bin ..._monitor33.png => monitor_advanced_33.png} | Bin ..._monitor34.png => monitor_advanced_34.png} | Bin ..._monitor35.png => monitor_advanced_35.png} | Bin ..._monitor36.png => monitor_advanced_36.png} | Bin ..._monitor37.png => monitor_advanced_37.png} | Bin ..._monitor38.png => monitor_advanced_38.png} | Bin ..._monitor39.png => monitor_advanced_39.png} | Bin ...dv_monitor4.png => monitor_advanced_4.png} | Bin ..._monitor40.png => monitor_advanced_40.png} | Bin ..._monitor41.png => monitor_advanced_41.png} | Bin ..._monitor42.png => monitor_advanced_42.png} | Bin ..._monitor43.png => monitor_advanced_43.png} | Bin ..._monitor44.png => monitor_advanced_44.png} | Bin ..._monitor45.png => monitor_advanced_45.png} | Bin ..._monitor46.png => monitor_advanced_46.png} | Bin ..._monitor47.png => monitor_advanced_47.png} | Bin ...dv_monitor5.png => monitor_advanced_5.png} | Bin ...dv_monitor6.png => monitor_advanced_6.png} | Bin ...dv_monitor7.png => monitor_advanced_7.png} | Bin .../{monitor0.png => monitor_normal_0.png} | Bin .../{monitor1.png => monitor_normal_1.png} | Bin .../{monitor15.png => monitor_normal_15.png} | Bin .../{monitor16.png => monitor_normal_16.png} | Bin .../{monitor17.png => monitor_normal_17.png} | Bin .../{monitor18.png => monitor_normal_18.png} | Bin .../{monitor19.png => monitor_normal_19.png} | Bin .../{monitor2.png => monitor_normal_2.png} | Bin .../{monitor20.png => monitor_normal_20.png} | Bin .../{monitor21.png => monitor_normal_21.png} | Bin .../{monitor22.png => monitor_normal_22.png} | Bin .../{monitor23.png => monitor_normal_23.png} | Bin .../{monitor24.png => monitor_normal_24.png} | Bin .../{monitor25.png => monitor_normal_25.png} | Bin .../{monitor26.png => monitor_normal_26.png} | Bin .../{monitor27.png => monitor_normal_27.png} | Bin .../{monitor28.png => monitor_normal_28.png} | Bin .../{monitor29.png => monitor_normal_29.png} | Bin .../{monitor3.png => monitor_normal_3.png} | Bin .../{monitor30.png => monitor_normal_30.png} | Bin .../{monitor31.png => monitor_normal_31.png} | Bin .../{monitor32.png => monitor_normal_32.png} | Bin .../{monitor33.png => monitor_normal_33.png} | Bin .../{monitor34.png => monitor_normal_34.png} | Bin .../{monitor35.png => monitor_normal_35.png} | Bin .../{monitor36.png => monitor_normal_36.png} | Bin .../{monitor37.png => monitor_normal_37.png} | Bin .../{monitor38.png => monitor_normal_38.png} | Bin .../{monitor39.png => monitor_normal_39.png} | Bin .../{monitor4.png => monitor_normal_4.png} | Bin .../{monitor40.png => monitor_normal_40.png} | Bin .../{monitor41.png => monitor_normal_41.png} | Bin .../{monitor42.png => monitor_normal_42.png} | Bin .../{monitor43.png => monitor_normal_43.png} | Bin .../{monitor44.png => monitor_normal_44.png} | Bin .../{monitor45.png => monitor_normal_45.png} | Bin .../{monitor46.png => monitor_normal_46.png} | Bin .../{monitor47.png => monitor_normal_47.png} | Bin .../{monitor5.png => monitor_normal_5.png} | Bin .../{monitor6.png => monitor_normal_6.png} | Bin .../{monitor7.png => monitor_normal_7.png} | Bin .../{turtle_white.png => turtle_colour.png} | Bin ...fty_upgrade.png => turtle_crafty_face.png} | Bin .../block/{turtle.png => turtle_normal.png} | Bin ...e.png => wireless_modem_advanced_face.png} | Bin ...ng => wireless_modem_advanced_face_on.png} | Bin ...ace.png => wireless_modem_normal_face.png} | Bin ....png => wireless_modem_normal_face_on.png} | Bin .../gui/{corners.png => corners_normal.png} | Bin .../gui/{diskdrive.png => disk_drive.png} | Bin .../gui/{turtle.png => turtle_normal.png} | Bin ...omputer.png => pocket_computer_normal.png} | Bin .../item/{book.png => printed_book.png} | Bin .../item/{page.png => printed_page.png} | Bin .../{page_bundle.png => printed_pages.png} | Bin .../recipes/advanced_computer.json | 2 +- .../advancements/recipes/generated/disk.json | 6 +- .../computercraft_speaker.json | 4 +- ...omputercraft_wireless_modem_advanced.json} | 8 +- ... computercraft_wireless_modem_normal.json} | 8 +- .../pocket_normal/computercraft_speaker.json | 4 +- ...omputercraft_wireless_modem_advanced.json} | 8 +- ... computercraft_wireless_modem_normal.json} | 8 +- .../computercraft_speaker.json | 4 +- ...omputercraft_wireless_modem_advanced.json} | 8 +- ... computercraft_wireless_modem_normal.json} | 8 +- .../minecraft_crafting_table.json | 2 +- .../minecraft_diamond_axe.json | 2 +- .../minecraft_diamond_hoe.json | 2 +- .../minecraft_diamond_pickaxe.json | 2 +- .../minecraft_diamond_shovel.json | 2 +- .../minecraft_diamond_sword.json | 2 +- .../turtle_normal/computercraft_speaker.json | 4 +- ...omputercraft_wireless_modem_advanced.json} | 8 +- ... computercraft_wireless_modem_normal.json} | 8 +- .../minecraft_crafting_table.json | 2 +- .../turtle_normal/minecraft_diamond_axe.json | 2 +- .../turtle_normal/minecraft_diamond_hoe.json | 2 +- .../minecraft_diamond_pickaxe.json | 2 +- .../minecraft_diamond_shovel.json | 2 +- .../minecraft_diamond_sword.json | 2 +- ...ced_monitor.json => monitor_advanced.json} | 4 +- .../advancements/recipes/normal_computer.json | 2 +- .../recipes/normal_pocket_computer.json | 4 +- ..._turtle.json => normal_turtle_normal.json} | 4 +- ...ter.json => pocket_computer_advanced.json} | 4 +- ...anced_turtle.json => turtle_advanced.json} | 4 +- ..._modem.json => wireless_modem_normal.json} | 4 +- .../lua/rom/apis/command/commands.lua | 63 ++- .../data/computercraft/lua/rom/apis/keys.lua | 185 +++++-- .../computercraft/recipes/_factories.json | 17 - .../recipes/advanced_computer.json | 14 - .../recipes/advanced_computer_upgrade.json | 14 - .../recipes/advanced_monitor.json | 13 - .../recipes/advanced_pocket_computer.json | 14 - .../advanced_pocket_computer_upgrade.json | 14 - .../recipes/advanced_turtle.json | 14 - .../recipes/advanced_turtle_upgrade.json | 18 - .../data/computercraft/recipes/cable.json | 8 +- .../recipes/command_computer.json | 14 - .../recipes/computer_advanced.json | 14 + .../recipes/computer_advanced_upgrade.json | 14 + .../recipes/computer_command.json | 14 + .../recipes/computer_normal.json | 14 + .../computercraft/recipes/disk_drive.json | 8 +- .../computercraft/recipes/ender_modem.json | 13 - .../recipes/generated/disk/disk_1.json | 8 +- .../recipes/generated/disk/disk_10.json | 8 +- .../recipes/generated/disk/disk_11.json | 8 +- .../recipes/generated/disk/disk_12.json | 8 +- .../recipes/generated/disk/disk_13.json | 8 +- .../recipes/generated/disk/disk_14.json | 8 +- .../recipes/generated/disk/disk_15.json | 8 +- .../recipes/generated/disk/disk_16.json | 8 +- .../recipes/generated/disk/disk_2.json | 8 +- .../recipes/generated/disk/disk_3.json | 8 +- .../recipes/generated/disk/disk_4.json | 8 +- .../recipes/generated/disk/disk_5.json | 8 +- .../recipes/generated/disk/disk_6.json | 8 +- .../recipes/generated/disk/disk_7.json | 8 +- .../recipes/generated/disk/disk_8.json | 8 +- .../recipes/generated/disk/disk_9.json | 8 +- .../computercraft_advanced_modem.json | 13 - .../computercraft_speaker.json | 6 +- .../computercraft_wireless_modem.json | 13 - ...computercraft_wireless_modem_advanced.json | 13 + .../computercraft_wireless_modem_normal.json | 13 + .../computercraft_advanced_modem.json | 13 - .../pocket_normal/computercraft_speaker.json | 6 +- .../computercraft_wireless_modem.json | 13 - ...computercraft_wireless_modem_advanced.json | 13 + .../computercraft_wireless_modem_normal.json | 13 + .../computercraft_advanced_modem.json | 12 - .../computercraft_speaker.json | 6 +- .../computercraft_wireless_modem.json | 12 - ...computercraft_wireless_modem_advanced.json | 12 + .../computercraft_wireless_modem_normal.json | 12 + .../minecraft_crafting_table.json | 4 +- .../minecraft_diamond_axe.json | 4 +- .../minecraft_diamond_hoe.json | 4 +- .../minecraft_diamond_pickaxe.json | 4 +- .../minecraft_diamond_shovel.json | 4 +- .../minecraft_diamond_sword.json | 4 +- .../computercraft_advanced_modem.json | 12 - .../turtle_normal/computercraft_speaker.json | 6 +- .../computercraft_wireless_modem.json | 12 - ...computercraft_wireless_modem_advanced.json | 12 + .../computercraft_wireless_modem_normal.json | 12 + .../minecraft_crafting_table.json | 4 +- .../turtle_normal/minecraft_diamond_axe.json | 4 +- .../turtle_normal/minecraft_diamond_hoe.json | 4 +- .../minecraft_diamond_pickaxe.json | 4 +- .../minecraft_diamond_shovel.json | 4 +- .../minecraft_diamond_sword.json | 4 +- .../recipes/monitor_advanced.json | 13 + .../computercraft/recipes/monitor_normal.json | 13 + .../recipes/normal_computer.json | 14 - .../computercraft/recipes/normal_monitor.json | 13 - .../recipes/normal_pocket_computer.json | 14 - .../computercraft/recipes/normal_turtle.json | 14 - .../recipes/pocket_computer_advanced.json | 14 + .../pocket_computer_advanced_upgrade.json | 14 + .../recipes/pocket_computer_normal.json | 14 + .../computercraft/recipes/printed_book.json | 8 +- .../computercraft/recipes/printed_pages.json | 8 +- .../data/computercraft/recipes/printer.json | 10 +- .../computercraft/recipes/skull_cloudy.json | 11 +- .../computercraft/recipes/skull_dan200.json | 11 +- .../data/computercraft/recipes/speaker.json | 10 +- .../recipes/turtle_advanced.json | 15 + .../recipes/turtle_advanced_upgrade.json | 15 + .../computercraft/recipes/turtle_normal.json | 15 + .../computercraft/recipes/wired_modem.json | 8 +- .../recipes/wired_modem_full_from.json | 4 +- .../recipes/wired_modem_full_to.json | 4 +- .../computercraft/recipes/wireless_modem.json | 13 - .../recipes/wireless_modem_advanced.json | 13 + .../recipes/wireless_modem_normal.json | 13 + src/main/resources/mcmod.info | 23 - src/main/resources/pack.mcmeta | 2 +- tools/disk_recipe.json | 8 +- tools/language.lua | 53 +- tools/pocket_upgrade_advancement.json | 4 +- tools/pocket_upgrade_recipe.json | 6 +- tools/recipes.lua | 78 +-- tools/turtle_upgrade_advancement.json | 4 +- tools/turtle_upgrade_recipe.json | 6 +- 460 files changed, 2975 insertions(+), 2678 deletions(-) create mode 100644 src/main/resources/META-INF/accesstransformer.cfg delete mode 100644 src/main/resources/META-INF/computercraft_at.cfg create mode 100644 src/main/resources/META-INF/mods.toml delete mode 100644 src/main/resources/assets/computercraft/blockstates/advanced_modem.json delete mode 100644 src/main/resources/assets/computercraft/blockstates/command_computer.json delete mode 100644 src/main/resources/assets/computercraft/blockstates/computer.json create mode 100644 src/main/resources/assets/computercraft/blockstates/computer_advanced.json create mode 100644 src/main/resources/assets/computercraft/blockstates/computer_command.json create mode 100644 src/main/resources/assets/computercraft/blockstates/computer_normal.json create mode 100644 src/main/resources/assets/computercraft/blockstates/disk_drive.json create mode 100644 src/main/resources/assets/computercraft/blockstates/monitor_advanced.json create mode 100644 src/main/resources/assets/computercraft/blockstates/monitor_normal.json delete mode 100644 src/main/resources/assets/computercraft/blockstates/peripheral.json create mode 100644 src/main/resources/assets/computercraft/blockstates/printer.json create mode 100644 src/main/resources/assets/computercraft/blockstates/speaker.json delete mode 100644 src/main/resources/assets/computercraft/blockstates/turtle.json delete mode 100644 src/main/resources/assets/computercraft/blockstates/turtle_expanded.json create mode 100644 src/main/resources/assets/computercraft/blockstates/turtle_normal.json create mode 100644 src/main/resources/assets/computercraft/blockstates/turtle_normal_expanded.json create mode 100644 src/main/resources/assets/computercraft/blockstates/wireless_modem_advanced.json create mode 100644 src/main/resources/assets/computercraft/blockstates/wireless_modem_normal.json create mode 100644 src/main/resources/assets/computercraft/lang/de_de.json delete mode 100644 src/main/resources/assets/computercraft/lang/de_de.lang create mode 100644 src/main/resources/assets/computercraft/lang/en_us.json delete mode 100644 src/main/resources/assets/computercraft/lang/en_us.lang create mode 100644 src/main/resources/assets/computercraft/lang/es_es.json delete mode 100644 src/main/resources/assets/computercraft/lang/es_es.lang create mode 100644 src/main/resources/assets/computercraft/lang/fr_fr.json delete mode 100644 src/main/resources/assets/computercraft/lang/fr_fr.lang create mode 100644 src/main/resources/assets/computercraft/lang/it_it.json delete mode 100644 src/main/resources/assets/computercraft/lang/it_it.lang create mode 100644 src/main/resources/assets/computercraft/lang/pt_br.json delete mode 100644 src/main/resources/assets/computercraft/lang/pt_br.lang create mode 100644 src/main/resources/assets/computercraft/lang/sv_se.json delete mode 100644 src/main/resources/assets/computercraft/lang/sv_se.lang delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_computer_blinking.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_computer_off.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_computer_on.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_modem_off.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_modem_on.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_monitor.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_monitor_d.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_monitor_item.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_monitor_l.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_monitor_ld.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_monitor_lr.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_monitor_lrd.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_monitor_lru.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_monitor_lrud.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_monitor_lu.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_monitor_lud.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_monitor_r.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_monitor_rd.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_monitor_ru.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_monitor_rud.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_monitor_u.json delete mode 100644 src/main/resources/assets/computercraft/models/block/advanced_monitor_ud.json delete mode 100644 src/main/resources/assets/computercraft/models/block/command_computer_blinking.json delete mode 100644 src/main/resources/assets/computercraft/models/block/command_computer_off.json delete mode 100644 src/main/resources/assets/computercraft/models/block/command_computer_on.json create mode 100644 src/main/resources/assets/computercraft/models/block/computer_advanced_blinking.json create mode 100644 src/main/resources/assets/computercraft/models/block/computer_advanced_off.json create mode 100644 src/main/resources/assets/computercraft/models/block/computer_advanced_on.json delete mode 100644 src/main/resources/assets/computercraft/models/block/computer_blinking.json create mode 100644 src/main/resources/assets/computercraft/models/block/computer_command_blinking.json create mode 100644 src/main/resources/assets/computercraft/models/block/computer_command_off.json create mode 100644 src/main/resources/assets/computercraft/models/block/computer_command_on.json create mode 100644 src/main/resources/assets/computercraft/models/block/computer_normal_blinking.json create mode 100644 src/main/resources/assets/computercraft/models/block/computer_normal_off.json create mode 100644 src/main/resources/assets/computercraft/models/block/computer_normal_on.json delete mode 100644 src/main/resources/assets/computercraft/models/block/computer_off.json delete mode 100644 src/main/resources/assets/computercraft/models/block/computer_on.json delete mode 100644 src/main/resources/assets/computercraft/models/block/monitor.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_advanced.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_advanced_d.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_advanced_item.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_advanced_l.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_advanced_ld.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_advanced_lr.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_advanced_lrd.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_advanced_lru.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_advanced_lrud.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_advanced_lu.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_advanced_lud.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_advanced_r.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_advanced_rd.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_advanced_ru.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_advanced_rud.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_advanced_u.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_advanced_ud.json delete mode 100644 src/main/resources/assets/computercraft/models/block/monitor_d.json delete mode 100644 src/main/resources/assets/computercraft/models/block/monitor_item.json delete mode 100644 src/main/resources/assets/computercraft/models/block/monitor_l.json delete mode 100644 src/main/resources/assets/computercraft/models/block/monitor_ld.json delete mode 100644 src/main/resources/assets/computercraft/models/block/monitor_lr.json delete mode 100644 src/main/resources/assets/computercraft/models/block/monitor_lrd.json delete mode 100644 src/main/resources/assets/computercraft/models/block/monitor_lru.json delete mode 100644 src/main/resources/assets/computercraft/models/block/monitor_lrud.json delete mode 100644 src/main/resources/assets/computercraft/models/block/monitor_lu.json delete mode 100644 src/main/resources/assets/computercraft/models/block/monitor_lud.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_normal.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_normal_d.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_normal_item.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_normal_l.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_normal_ld.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_normal_lr.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_normal_lrd.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_normal_lru.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_normal_lrud.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_normal_lu.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_normal_lud.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_normal_r.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_normal_rd.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_normal_ru.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_normal_rud.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_normal_u.json create mode 100644 src/main/resources/assets/computercraft/models/block/monitor_normal_ud.json delete mode 100644 src/main/resources/assets/computercraft/models/block/monitor_r.json delete mode 100644 src/main/resources/assets/computercraft/models/block/monitor_rd.json delete mode 100644 src/main/resources/assets/computercraft/models/block/monitor_ru.json delete mode 100644 src/main/resources/assets/computercraft/models/block/monitor_rud.json delete mode 100644 src/main/resources/assets/computercraft/models/block/monitor_u.json delete mode 100644 src/main/resources/assets/computercraft/models/block/monitor_ud.json rename src/main/resources/assets/computercraft/models/block/{advanced_turtle.json => turtle_advanced.json} (57%) rename src/main/resources/assets/computercraft/models/block/{turtle_white.json => turtle_colour.json} (97%) delete mode 100644 src/main/resources/assets/computercraft/models/block/turtle_modem_on_left.json delete mode 100644 src/main/resources/assets/computercraft/models/block/turtle_modem_on_right.json rename src/main/resources/assets/computercraft/models/block/{turtle.json => turtle_normal.json} (58%) rename src/main/resources/assets/computercraft/models/block/{turtle_overlay.json => turtle_normal_overlay.json} (100%) delete mode 100644 src/main/resources/assets/computercraft/models/block/turtle_speaker_upgrade_left.json delete mode 100644 src/main/resources/assets/computercraft/models/block/turtle_speaker_upgrade_right.json create mode 100644 src/main/resources/assets/computercraft/models/block/wireless_modem_advanced_off.json create mode 100644 src/main/resources/assets/computercraft/models/block/wireless_modem_advanced_on.json create mode 100644 src/main/resources/assets/computercraft/models/block/wireless_modem_normal_off.json create mode 100644 src/main/resources/assets/computercraft/models/block/wireless_modem_normal_on.json delete mode 100644 src/main/resources/assets/computercraft/models/block/wireless_modem_off.json delete mode 100644 src/main/resources/assets/computercraft/models/block/wireless_modem_on.json delete mode 100644 src/main/resources/assets/computercraft/models/item/advanced_computer.json delete mode 100644 src/main/resources/assets/computercraft/models/item/advanced_modem.json delete mode 100644 src/main/resources/assets/computercraft/models/item/advanced_monitor.json delete mode 100644 src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_blinking.json delete mode 100644 src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_on.json delete mode 100644 src/main/resources/assets/computercraft/models/item/command_computer.json delete mode 100644 src/main/resources/assets/computercraft/models/item/computer.json create mode 100644 src/main/resources/assets/computercraft/models/item/computer_advanced.json create mode 100644 src/main/resources/assets/computercraft/models/item/computer_command.json create mode 100644 src/main/resources/assets/computercraft/models/item/computer_normal.json rename src/main/resources/assets/computercraft/models/item/{peripheral.json => disk_drive.json} (100%) delete mode 100644 src/main/resources/assets/computercraft/models/item/disk_expanded.json delete mode 100644 src/main/resources/assets/computercraft/models/item/monitor.json create mode 100644 src/main/resources/assets/computercraft/models/item/monitor_advanced.json create mode 100644 src/main/resources/assets/computercraft/models/item/monitor_normal.json rename src/main/resources/assets/computercraft/models/item/{advanced_pocket_computer.json => pocket_computer_advanced.json} (72%) create mode 100644 src/main/resources/assets/computercraft/models/item/pocket_computer_advanced_blinking.json create mode 100644 src/main/resources/assets/computercraft/models/item/pocket_computer_advanced_on.json delete mode 100644 src/main/resources/assets/computercraft/models/item/pocket_computer_blinking.json rename src/main/resources/assets/computercraft/models/item/{pocket_computer.json => pocket_computer_normal.json} (73%) create mode 100644 src/main/resources/assets/computercraft/models/item/pocket_computer_normal_blinking.json create mode 100644 src/main/resources/assets/computercraft/models/item/pocket_computer_normal_on.json delete mode 100644 src/main/resources/assets/computercraft/models/item/pocket_computer_on.json rename src/main/resources/assets/computercraft/models/item/{printout.json => printed_book.json} (53%) rename src/main/resources/assets/computercraft/models/item/{book.json => printed_page.json} (53%) rename src/main/resources/assets/computercraft/models/item/{pages.json => printed_pages.json} (53%) delete mode 100644 src/main/resources/assets/computercraft/models/item/turtle.json create mode 100644 src/main/resources/assets/computercraft/models/item/turtle_colour.json rename src/main/resources/assets/computercraft/models/{block => item}/turtle_crafting_table_left.json (60%) rename src/main/resources/assets/computercraft/models/{block => item}/turtle_crafting_table_right.json (60%) delete mode 100644 src/main/resources/assets/computercraft/models/item/turtle_expanded.json rename src/main/resources/assets/computercraft/models/{block/turtle_modem_off_left.json => item/turtle_modem_advanced_off_left.json} (56%) rename src/main/resources/assets/computercraft/models/{block/turtle_modem_off_right.json => item/turtle_modem_advanced_off_right.json} (56%) create mode 100644 src/main/resources/assets/computercraft/models/item/turtle_modem_advanced_on_left.json create mode 100644 src/main/resources/assets/computercraft/models/item/turtle_modem_advanced_on_right.json rename src/main/resources/assets/computercraft/models/{block/advanced_turtle_modem_on_left.json => item/turtle_modem_normal_off_left.json} (56%) rename src/main/resources/assets/computercraft/models/{block/advanced_turtle_modem_off_right.json => item/turtle_modem_normal_off_right.json} (57%) create mode 100644 src/main/resources/assets/computercraft/models/item/turtle_modem_normal_on_left.json create mode 100644 src/main/resources/assets/computercraft/models/item/turtle_modem_normal_on_right.json create mode 100644 src/main/resources/assets/computercraft/models/item/turtle_normal.json rename src/main/resources/assets/computercraft/models/{block/advanced_turtle_modem_off_left.json => item/turtle_speaker_upgrade_left.json} (59%) rename src/main/resources/assets/computercraft/models/{block/advanced_turtle_modem_on_right.json => item/turtle_speaker_upgrade_right.json} (59%) delete mode 100644 src/main/resources/assets/computercraft/models/item/turtle_white.json delete mode 100644 src/main/resources/assets/computercraft/models/item/wireless_modem.json create mode 100644 src/main/resources/assets/computercraft/models/item/wireless_modem_advanced.json create mode 100644 src/main/resources/assets/computercraft/models/item/wireless_modem_normal.json rename src/main/resources/assets/computercraft/textures/block/{computer_front_advanced.png => computer_advanced_front.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{computer_front_blink_advanced.png => computer_advanced_front_blink.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{command_computer_front_blink.png.mcmeta => computer_advanced_front_blink.png.mcmeta} (100%) rename src/main/resources/assets/computercraft/textures/block/{computer_front_on_advanced.png => computer_advanced_front_on.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{computer_side_advanced.png => computer_advanced_side.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{computer_top_advanced.png => computer_advanced_top.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{command_computer_front.png => computer_command_front.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{command_computer_front_blink.png => computer_command_front_blink.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{computer_front_blink.png.mcmeta => computer_command_front_blink.png.mcmeta} (100%) rename src/main/resources/assets/computercraft/textures/block/{command_computer_front_on.png => computer_command_front_on.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{command_computer_side.png => computer_command_side.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{command_computer_top.png => computer_command_top.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{computer_front.png => computer_normal_front.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{computer_front_blink.png => computer_normal_front_blink.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{computer_front_blink_advanced.png.mcmeta => computer_normal_front_blink.png.mcmeta} (100%) rename src/main/resources/assets/computercraft/textures/block/{computer_front_on.png => computer_normal_front_on.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{computer_side.png => computer_normal_side.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{computer_top.png => computer_normal_top.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor0.png => monitor_advanced_0.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor1.png => monitor_advanced_1.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor15.png => monitor_advanced_15.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor16.png => monitor_advanced_16.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor17.png => monitor_advanced_17.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor18.png => monitor_advanced_18.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor19.png => monitor_advanced_19.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor2.png => monitor_advanced_2.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor20.png => monitor_advanced_20.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor21.png => monitor_advanced_21.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor22.png => monitor_advanced_22.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor23.png => monitor_advanced_23.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor24.png => monitor_advanced_24.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor25.png => monitor_advanced_25.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor26.png => monitor_advanced_26.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor27.png => monitor_advanced_27.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor28.png => monitor_advanced_28.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor29.png => monitor_advanced_29.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor3.png => monitor_advanced_3.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor30.png => monitor_advanced_30.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor31.png => monitor_advanced_31.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor32.png => monitor_advanced_32.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor33.png => monitor_advanced_33.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor34.png => monitor_advanced_34.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor35.png => monitor_advanced_35.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor36.png => monitor_advanced_36.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor37.png => monitor_advanced_37.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor38.png => monitor_advanced_38.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor39.png => monitor_advanced_39.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor4.png => monitor_advanced_4.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor40.png => monitor_advanced_40.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor41.png => monitor_advanced_41.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor42.png => monitor_advanced_42.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor43.png => monitor_advanced_43.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor44.png => monitor_advanced_44.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor45.png => monitor_advanced_45.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor46.png => monitor_advanced_46.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor47.png => monitor_advanced_47.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor5.png => monitor_advanced_5.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor6.png => monitor_advanced_6.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_monitor7.png => monitor_advanced_7.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor0.png => monitor_normal_0.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor1.png => monitor_normal_1.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor15.png => monitor_normal_15.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor16.png => monitor_normal_16.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor17.png => monitor_normal_17.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor18.png => monitor_normal_18.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor19.png => monitor_normal_19.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor2.png => monitor_normal_2.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor20.png => monitor_normal_20.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor21.png => monitor_normal_21.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor22.png => monitor_normal_22.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor23.png => monitor_normal_23.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor24.png => monitor_normal_24.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor25.png => monitor_normal_25.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor26.png => monitor_normal_26.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor27.png => monitor_normal_27.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor28.png => monitor_normal_28.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor29.png => monitor_normal_29.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor3.png => monitor_normal_3.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor30.png => monitor_normal_30.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor31.png => monitor_normal_31.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor32.png => monitor_normal_32.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor33.png => monitor_normal_33.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor34.png => monitor_normal_34.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor35.png => monitor_normal_35.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor36.png => monitor_normal_36.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor37.png => monitor_normal_37.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor38.png => monitor_normal_38.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor39.png => monitor_normal_39.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor4.png => monitor_normal_4.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor40.png => monitor_normal_40.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor41.png => monitor_normal_41.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor42.png => monitor_normal_42.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor43.png => monitor_normal_43.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor44.png => monitor_normal_44.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor45.png => monitor_normal_45.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor46.png => monitor_normal_46.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor47.png => monitor_normal_47.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor5.png => monitor_normal_5.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor6.png => monitor_normal_6.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{monitor7.png => monitor_normal_7.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{turtle_white.png => turtle_colour.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{crafty_upgrade.png => turtle_crafty_face.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{turtle.png => turtle_normal.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_modem_face.png => wireless_modem_advanced_face.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{adv_modem_face_on.png => wireless_modem_advanced_face_on.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{wireless_modem_face.png => wireless_modem_normal_face.png} (100%) rename src/main/resources/assets/computercraft/textures/block/{wireless_modem_face_on.png => wireless_modem_normal_face_on.png} (100%) rename src/main/resources/assets/computercraft/textures/gui/{corners.png => corners_normal.png} (100%) rename src/main/resources/assets/computercraft/textures/gui/{diskdrive.png => disk_drive.png} (100%) rename src/main/resources/assets/computercraft/textures/gui/{turtle.png => turtle_normal.png} (100%) rename src/main/resources/assets/computercraft/textures/item/{pocket_computer.png => pocket_computer_normal.png} (100%) rename src/main/resources/assets/computercraft/textures/item/{book.png => printed_book.png} (100%) rename src/main/resources/assets/computercraft/textures/item/{page.png => printed_page.png} (100%) rename src/main/resources/assets/computercraft/textures/item/{page_bundle.png => printed_pages.png} (100%) rename src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/{computercraft_advanced_modem.json => computercraft_wireless_modem_advanced.json} (69%) rename src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/{computercraft_wireless_modem.json => computercraft_wireless_modem_normal.json} (69%) rename src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/{computercraft_advanced_modem.json => computercraft_wireless_modem_advanced.json} (69%) rename src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/{computercraft_wireless_modem.json => computercraft_wireless_modem_normal.json} (70%) rename src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/{computercraft_wireless_modem.json => computercraft_wireless_modem_advanced.json} (70%) rename src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/{computercraft_advanced_modem.json => computercraft_wireless_modem_normal.json} (70%) rename src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/{computercraft_wireless_modem.json => computercraft_wireless_modem_advanced.json} (70%) rename src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/{computercraft_advanced_modem.json => computercraft_wireless_modem_normal.json} (71%) rename src/main/resources/data/computercraft/advancements/recipes/{advanced_monitor.json => monitor_advanced.json} (85%) rename src/main/resources/data/computercraft/advancements/recipes/{normal_turtle.json => normal_turtle_normal.json} (88%) rename src/main/resources/data/computercraft/advancements/recipes/{advanced_pocket_computer.json => pocket_computer_advanced.json} (86%) rename src/main/resources/data/computercraft/advancements/recipes/{advanced_turtle.json => turtle_advanced.json} (79%) rename src/main/resources/data/computercraft/advancements/recipes/{wireless_modem.json => wireless_modem_normal.json} (91%) delete mode 100644 src/main/resources/data/computercraft/recipes/_factories.json delete mode 100644 src/main/resources/data/computercraft/recipes/advanced_computer.json delete mode 100644 src/main/resources/data/computercraft/recipes/advanced_computer_upgrade.json delete mode 100644 src/main/resources/data/computercraft/recipes/advanced_monitor.json delete mode 100644 src/main/resources/data/computercraft/recipes/advanced_pocket_computer.json delete mode 100644 src/main/resources/data/computercraft/recipes/advanced_pocket_computer_upgrade.json delete mode 100644 src/main/resources/data/computercraft/recipes/advanced_turtle.json delete mode 100644 src/main/resources/data/computercraft/recipes/advanced_turtle_upgrade.json delete mode 100644 src/main/resources/data/computercraft/recipes/command_computer.json create mode 100644 src/main/resources/data/computercraft/recipes/computer_advanced.json create mode 100644 src/main/resources/data/computercraft/recipes/computer_advanced_upgrade.json create mode 100644 src/main/resources/data/computercraft/recipes/computer_command.json create mode 100644 src/main/resources/data/computercraft/recipes/computer_normal.json delete mode 100644 src/main/resources/data/computercraft/recipes/ender_modem.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_advanced_modem.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem.json create mode 100644 src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_advanced.json create mode 100644 src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_normal.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_advanced_modem.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem.json create mode 100644 src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_advanced.json create mode 100644 src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_normal.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_advanced_modem.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem.json create mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_advanced.json create mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_normal.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_advanced_modem.json delete mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem.json create mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_advanced.json create mode 100644 src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_normal.json create mode 100644 src/main/resources/data/computercraft/recipes/monitor_advanced.json create mode 100644 src/main/resources/data/computercraft/recipes/monitor_normal.json delete mode 100644 src/main/resources/data/computercraft/recipes/normal_computer.json delete mode 100644 src/main/resources/data/computercraft/recipes/normal_monitor.json delete mode 100644 src/main/resources/data/computercraft/recipes/normal_pocket_computer.json delete mode 100644 src/main/resources/data/computercraft/recipes/normal_turtle.json create mode 100644 src/main/resources/data/computercraft/recipes/pocket_computer_advanced.json create mode 100644 src/main/resources/data/computercraft/recipes/pocket_computer_advanced_upgrade.json create mode 100644 src/main/resources/data/computercraft/recipes/pocket_computer_normal.json create mode 100644 src/main/resources/data/computercraft/recipes/turtle_advanced.json create mode 100644 src/main/resources/data/computercraft/recipes/turtle_advanced_upgrade.json create mode 100644 src/main/resources/data/computercraft/recipes/turtle_normal.json delete mode 100644 src/main/resources/data/computercraft/recipes/wireless_modem.json create mode 100644 src/main/resources/data/computercraft/recipes/wireless_modem_advanced.json create mode 100644 src/main/resources/data/computercraft/recipes/wireless_modem_normal.json delete mode 100644 src/main/resources/mcmod.info diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg new file mode 100644 index 000000000..11a40d2cb --- /dev/null +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -0,0 +1,23 @@ +# ItemPocketRenderer/ItemPrintoutRenderer +public net.minecraft.client.renderer.FirstPersonRenderer func_187466_c()V # renderArms +public net.minecraft.client.renderer.FirstPersonRenderer func_178100_c(F)F # getMapAngleFromPitch +public net.minecraft.client.renderer.FirstPersonRenderer func_187456_a(FFLnet/minecraft/util/EnumHandSide;)V # renderArmFirstPerson + +# JEI ATs +public net.minecraft.client.renderer.ItemRenderer func_191965_a(Lnet/minecraft/client/renderer/model/IBakedModel;I)V # renderModel +public net.minecraft.client.renderer.ItemRenderer func_191961_a(Lnet/minecraft/client/renderer/model/IBakedModel;Lnet/minecraft/item/ItemStack;)V # renderModel +protected net.minecraft.client.renderer.texture.TextureMap field_94252_e # mapUploadedSprites +protected net.minecraft.client.renderer.texture.TextureMap field_94258_i # listAnimatedSprites +protected net.minecraft.client.renderer.texture.TextureMap field_94249_f # missingImage +protected net.minecraft.client.renderer.texture.TextureMap field_94254_c # basePath +protected net.minecraft.client.renderer.texture.TextureMap field_195427_i # sprites +protected net.minecraft.client.renderer.texture.TextureMap func_195422_a(Lnet/minecraft/resources/IResourceManager;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;)Z # loadSprite +public net.minecraft.client.renderer.texture.TextureAtlasSprite (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/PngSizeInfo;Lnet/minecraft/client/resources/data/AnimationMetadataSection;)V # constructor +public net.minecraft.client.renderer.texture.TextureAtlasSprite field_110975_c # x +public net.minecraft.client.renderer.texture.TextureAtlasSprite field_110974_d # y +public net.minecraft.client.KeyboardListener field_197973_b # repeatEventsEnabled +public net.minecraft.client.renderer.texture.TextureAtlasSprite field_195670_c # frames +public net.minecraft.client.gui.recipebook.GuiRecipeBook field_191904_o # width +public net.minecraft.client.gui.recipebook.GuiRecipeBook field_191905_p # height +public net.minecraft.client.gui.recipebook.GuiRecipeBook field_191903_n # xOffset +public net.minecraft.client.gui.recipebook.GuiRecipeBook field_193018_j # recipeTabs diff --git a/src/main/resources/META-INF/computercraft_at.cfg b/src/main/resources/META-INF/computercraft_at.cfg deleted file mode 100644 index 084487d52..000000000 --- a/src/main/resources/META-INF/computercraft_at.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# RecordMedia (and related methods) -public net.minecraft.item.ItemRecord field_185076_b # sound -public net.minecraft.item.ItemRecord field_185077_c # displayName -# ItemPocketRenderer/ItemPrintoutRenderer -public net.minecraft.client.renderer.ItemRenderer func_187466_c()V # renderArms -public net.minecraft.client.renderer.ItemRenderer func_178100_c(F)F # getMapAngleFromPitch -public net.minecraft.client.renderer.ItemRenderer func_187456_a(FFLnet/minecraft/util/EnumHandSide;)V # renderArmFirstPerson diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml new file mode 100644 index 000000000..5d5bffd89 --- /dev/null +++ b/src/main/resources/META-INF/mods.toml @@ -0,0 +1,25 @@ +modLoader="javafml" +loaderVersion="[25,)" + +# updateJSONURL="http://myurl.me/" #optional +issueTrackerURL="https://github.com/SquidDev-CC/CC-Tweaked/issues" +displayURL="https://github.com/SquidDev-CC/CC-Tweaked" +logoFile="pack.png" + +credits="Created by Daniel Ratcliffe (@DanTwoHundred)" +authors="Daniel Ratcliffe, Aaron Mills, SquidDev" + +[[mods]] +modId="computercraft" +version="${version}" +displayName="CC: Tweaked" +description=''' +CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles and more to Minecraft. +''' + +[[dependencies.computercraft]] + modId="forge" + mandatory=true + versionRange="[25,)" + ordering="NONE" + side="BOTH" diff --git a/src/main/resources/assets/computercraft/blockstates/advanced_modem.json b/src/main/resources/assets/computercraft/blockstates/advanced_modem.json deleted file mode 100644 index f69eb2120..000000000 --- a/src/main/resources/assets/computercraft/blockstates/advanced_modem.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "facing=up,on=false": { "model": "computercraft:advanced_modem_off", "x": 270 }, - "facing=down,on=false": { "model": "computercraft:advanced_modem_off", "x": 90 }, - "facing=north,on=false": { "model": "computercraft:advanced_modem_off" }, - "facing=south,on=false": { "model": "computercraft:advanced_modem_off", "y": 180 }, - "facing=west,on=false": { "model": "computercraft:advanced_modem_off", "y": 270 }, - "facing=east,on=false": { "model": "computercraft:advanced_modem_off", "y": 90 }, - - "facing=up,on=true": { "model": "computercraft:advanced_modem_on", "x": 270 }, - "facing=down,on=true": { "model": "computercraft:advanced_modem_on", "x": 90 }, - "facing=north,on=true": { "model": "computercraft:advanced_modem_on" }, - "facing=south,on=true": { "model": "computercraft:advanced_modem_on", "y": 180 }, - "facing=west,on=true": { "model": "computercraft:advanced_modem_on", "y": 270 }, - "facing=east,on=true": { "model": "computercraft:advanced_modem_on", "y": 90 } - } -} diff --git a/src/main/resources/assets/computercraft/blockstates/cable.json b/src/main/resources/assets/computercraft/blockstates/cable.json index 6bfa92a71..5f8c84a5d 100644 --- a/src/main/resources/assets/computercraft/blockstates/cable.json +++ b/src/main/resources/assets/computercraft/blockstates/cable.json @@ -13,7 +13,7 @@ } ] }, - "apply": { "model": "computercraft:cable_core_facing", "x": 90 } + "apply": { "model": "computercraft:block/cable_core_facing", "x": 90 } }, { @@ -33,7 +33,7 @@ } ] }, - "apply": { "model": "computercraft:cable_core_facing", "y": 0 } + "apply": { "model": "computercraft:block/cable_core_facing", "y": 0 } }, { @@ -49,7 +49,7 @@ } ] }, - "apply": { "model": "computercraft:cable_core_facing", "y": 90 } + "apply": { "model": "computercraft:block/cable_core_facing", "y": 90 } }, { @@ -69,129 +69,129 @@ { "cable": "true", "south": "true", "east": "true" } ] }, - "apply": { "model": "computercraft:cable_core_any" } + "apply": { "model": "computercraft:block/cable_core_any" } }, { "when": { "up": true }, - "apply": { "model": "computercraft:cable_arm", "x": 90 } + "apply": { "model": "computercraft:block/cable_arm", "x": 90 } }, { "when": { "down": true }, - "apply": { "model": "computercraft:cable_arm", "x": 270 } + "apply": { "model": "computercraft:block/cable_arm", "x": 270 } }, { "when": { "north": true }, - "apply": { "model": "computercraft:cable_arm", "y": 180 } + "apply": { "model": "computercraft:block/cable_arm", "y": 180 } }, { "when": { "south": true }, - "apply": { "model": "computercraft:cable_arm" } + "apply": { "model": "computercraft:block/cable_arm" } }, { "when": { "west": true }, - "apply": { "model": "computercraft:cable_arm", "y": 90 } + "apply": { "model": "computercraft:block/cable_arm", "y": 90 } }, { "when": { "east": true }, - "apply": { "model": "computercraft:cable_arm", "y": 270 } + "apply": { "model": "computercraft:block/cable_arm", "y": 270 } }, { "when": { "modem": "up_off" }, - "apply": { "model": "computercraft:wired_modem_off", "x": 270 } + "apply": { "model": "computercraft:block/wired_modem_off", "x": 270 } }, { "when": { "modem": "down_off" }, - "apply": { "model": "computercraft:wired_modem_off", "x": 90 } + "apply": { "model": "computercraft:block/wired_modem_off", "x": 90 } }, { "when": { "modem": "north_off" }, - "apply": { "model": "computercraft:wired_modem_off" } + "apply": { "model": "computercraft:block/wired_modem_off" } }, { "when": { "modem": "south_off" }, - "apply": { "model": "computercraft:wired_modem_off", "y": 180 } + "apply": { "model": "computercraft:block/wired_modem_off", "y": 180 } }, { "when": { "modem": "west_off" }, - "apply": { "model": "computercraft:wired_modem_off", "y": 270 } + "apply": { "model": "computercraft:block/wired_modem_off", "y": 270 } }, { "when": { "modem": "east_off" }, - "apply": { "model": "computercraft:wired_modem_off", "y": 90 } + "apply": { "model": "computercraft:block/wired_modem_off", "y": 90 } }, { "when": { "modem": "up_on" }, - "apply": { "model": "computercraft:wired_modem_on", "x": 270 } + "apply": { "model": "computercraft:block/wired_modem_on", "x": 270 } }, { "when": { "modem": "down_on" }, - "apply": { "model": "computercraft:wired_modem_on", "x": 90 } + "apply": { "model": "computercraft:block/wired_modem_on", "x": 90 } }, { "when": { "modem": "north_on" }, - "apply": { "model": "computercraft:wired_modem_on" } + "apply": { "model": "computercraft:block/wired_modem_on" } }, { "when": { "modem": "south_on" }, - "apply": { "model": "computercraft:wired_modem_on", "y": 180 } + "apply": { "model": "computercraft:block/wired_modem_on", "y": 180 } }, { "when": { "modem": "west_on" }, - "apply": { "model": "computercraft:wired_modem_on", "y": 270 } + "apply": { "model": "computercraft:block/wired_modem_on", "y": 270 } }, { "when": { "modem": "east_on" }, - "apply": { "model": "computercraft:wired_modem_on", "y": 90 } + "apply": { "model": "computercraft:block/wired_modem_on", "y": 90 } }, { "when": { "modem": "up_off_peripheral" }, - "apply": { "model": "computercraft:wired_modem_off_peripheral", "x": 270 } + "apply": { "model": "computercraft:block/wired_modem_off_peripheral", "x": 270 } }, { "when": { "modem": "down_off_peripheral" }, - "apply": { "model": "computercraft:wired_modem_off_peripheral", "x": 90 } + "apply": { "model": "computercraft:block/wired_modem_off_peripheral", "x": 90 } }, { "when": { "modem": "north_off_peripheral" }, - "apply": { "model": "computercraft:wired_modem_off_peripheral" } + "apply": { "model": "computercraft:block/wired_modem_off_peripheral" } }, { "when": { "modem": "south_off_peripheral" }, - "apply": { "model": "computercraft:wired_modem_off_peripheral", "y": 180 } + "apply": { "model": "computercraft:block/wired_modem_off_peripheral", "y": 180 } }, { "when": { "modem": "west_off_peripheral" }, - "apply": { "model": "computercraft:wired_modem_off_peripheral", "y": 270 } + "apply": { "model": "computercraft:block/wired_modem_off_peripheral", "y": 270 } }, { "when": { "modem": "east_off_peripheral" }, - "apply": { "model": "computercraft:wired_modem_off_peripheral", "y": 90 } + "apply": { "model": "computercraft:block/wired_modem_off_peripheral", "y": 90 } }, { "when": { "modem": "up_on_peripheral" }, - "apply": { "model": "computercraft:wired_modem_on_peripheral", "x": 270 } + "apply": { "model": "computercraft:block/wired_modem_on_peripheral", "x": 270 } }, { "when": { "modem": "down_on_peripheral" }, - "apply": { "model": "computercraft:wired_modem_on_peripheral", "x": 90 } + "apply": { "model": "computercraft:block/wired_modem_on_peripheral", "x": 90 } }, { "when": { "modem": "north_on_peripheral" }, - "apply": { "model": "computercraft:wired_modem_on_peripheral" } + "apply": { "model": "computercraft:block/wired_modem_on_peripheral" } }, { "when": { "modem": "south_on_peripheral" }, - "apply": { "model": "computercraft:wired_modem_on_peripheral", "y": 180 } + "apply": { "model": "computercraft:block/wired_modem_on_peripheral", "y": 180 } }, { "when": { "modem": "west_on_peripheral" }, - "apply": { "model": "computercraft:wired_modem_on_peripheral", "y": 270 } + "apply": { "model": "computercraft:block/wired_modem_on_peripheral", "y": 270 } }, { "when": { "modem": "east_on_peripheral" }, - "apply": { "model": "computercraft:wired_modem_on_peripheral", "y": 90 } + "apply": { "model": "computercraft:block/wired_modem_on_peripheral", "y": 90 } } ] } diff --git a/src/main/resources/assets/computercraft/blockstates/command_computer.json b/src/main/resources/assets/computercraft/blockstates/command_computer.json deleted file mode 100644 index 6845f3a60..000000000 --- a/src/main/resources/assets/computercraft/blockstates/command_computer.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "variants": { - "facing=north,state=off": { "model": "computercraft:command_computer_off" }, - "facing=south,state=off": { "model": "computercraft:command_computer_off", "y": 180 }, - "facing=west,state=off": { "model": "computercraft:command_computer_off", "y": 270 }, - "facing=east,state=off": { "model": "computercraft:command_computer_off", "y": 90 }, - - "facing=north,state=on": { "model": "computercraft:command_computer_on" }, - "facing=south,state=on": { "model": "computercraft:command_computer_on", "y": 180 }, - "facing=west,state=on": { "model": "computercraft:command_computer_on", "y": 270 }, - "facing=east,state=on": { "model": "computercraft:command_computer_on", "y": 90 }, - - "facing=north,state=blinking": { "model": "computercraft:command_computer_blinking" }, - "facing=south,state=blinking": { "model": "computercraft:command_computer_blinking", "y": 180 }, - "facing=west,state=blinking": { "model": "computercraft:command_computer_blinking", "y": 270 }, - "facing=east,state=blinking": { "model": "computercraft:command_computer_blinking", "y": 90 } - } -} diff --git a/src/main/resources/assets/computercraft/blockstates/computer.json b/src/main/resources/assets/computercraft/blockstates/computer.json deleted file mode 100644 index 9bd051689..000000000 --- a/src/main/resources/assets/computercraft/blockstates/computer.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "variants": { - "advanced=false,facing=north,state=off": { "model": "computercraft:computer_off" }, - "advanced=false,facing=south,state=off": { "model": "computercraft:computer_off", "y": 180 }, - "advanced=false,facing=west,state=off": { "model": "computercraft:computer_off", "y": 270 }, - "advanced=false,facing=east,state=off": { "model": "computercraft:computer_off", "y": 90 }, - - "advanced=false,facing=north,state=on": { "model": "computercraft:computer_on" }, - "advanced=false,facing=south,state=on": { "model": "computercraft:computer_on", "y": 180 }, - "advanced=false,facing=west,state=on": { "model": "computercraft:computer_on", "y": 270 }, - "advanced=false,facing=east,state=on": { "model": "computercraft:computer_on", "y": 90 }, - - "advanced=false,facing=north,state=blinking": { "model": "computercraft:computer_blinking" }, - "advanced=false,facing=south,state=blinking": { "model": "computercraft:computer_blinking", "y": 180 }, - "advanced=false,facing=west,state=blinking": { "model": "computercraft:computer_blinking", "y": 270 }, - "advanced=false,facing=east,state=blinking": { "model": "computercraft:computer_blinking", "y": 90 }, - - "advanced=true,facing=north,state=off": { "model": "computercraft:advanced_computer_off" }, - "advanced=true,facing=south,state=off": { "model": "computercraft:advanced_computer_off", "y": 180 }, - "advanced=true,facing=west,state=off": { "model": "computercraft:advanced_computer_off", "y": 270 }, - "advanced=true,facing=east,state=off": { "model": "computercraft:advanced_computer_off", "y": 90 }, - - "advanced=true,facing=north,state=on": { "model": "computercraft:advanced_computer_on" }, - "advanced=true,facing=south,state=on": { "model": "computercraft:advanced_computer_on", "y": 180 }, - "advanced=true,facing=west,state=on": { "model": "computercraft:advanced_computer_on", "y": 270 }, - "advanced=true,facing=east,state=on": { "model": "computercraft:advanced_computer_on", "y": 90 }, - - "advanced=true,facing=north,state=blinking": { "model": "computercraft:advanced_computer_blinking" }, - "advanced=true,facing=south,state=blinking": { "model": "computercraft:advanced_computer_blinking", "y": 180 }, - "advanced=true,facing=west,state=blinking": { "model": "computercraft:advanced_computer_blinking", "y": 270 }, - "advanced=true,facing=east,state=blinking": { "model": "computercraft:advanced_computer_blinking", "y": 90 } - } -} diff --git a/src/main/resources/assets/computercraft/blockstates/computer_advanced.json b/src/main/resources/assets/computercraft/blockstates/computer_advanced.json new file mode 100644 index 000000000..f438720d8 --- /dev/null +++ b/src/main/resources/assets/computercraft/blockstates/computer_advanced.json @@ -0,0 +1,18 @@ +{ + "variants": { + "facing=north,state=off": { "model": "computercraft:block/computer_advanced_off" }, + "facing=south,state=off": { "model": "computercraft:block/computer_advanced_off", "y": 180 }, + "facing=west,state=off": { "model": "computercraft:block/computer_advanced_off", "y": 270 }, + "facing=east,state=off": { "model": "computercraft:block/computer_advanced_off", "y": 90 }, + + "facing=north,state=on": { "model": "computercraft:block/computer_advanced_on" }, + "facing=south,state=on": { "model": "computercraft:block/computer_advanced_on", "y": 180 }, + "facing=west,state=on": { "model": "computercraft:block/computer_advanced_on", "y": 270 }, + "facing=east,state=on": { "model": "computercraft:block/computer_advanced_on", "y": 90 }, + + "facing=north,state=blinking": { "model": "computercraft:block/computer_advanced_blinking" }, + "facing=south,state=blinking": { "model": "computercraft:block/computer_advanced_blinking", "y": 180 }, + "facing=west,state=blinking": { "model": "computercraft:block/computer_advanced_blinking", "y": 270 }, + "facing=east,state=blinking": { "model": "computercraft:block/computer_advanced_blinking", "y": 90 } + } +} diff --git a/src/main/resources/assets/computercraft/blockstates/computer_command.json b/src/main/resources/assets/computercraft/blockstates/computer_command.json new file mode 100644 index 000000000..cb45d46c2 --- /dev/null +++ b/src/main/resources/assets/computercraft/blockstates/computer_command.json @@ -0,0 +1,19 @@ +{ + "variants": { + + "facing=north,state=off": { "model": "computercraft:block/computer_command_off" }, + "facing=south,state=off": { "model": "computercraft:block/computer_command_off", "y": 180 }, + "facing=west,state=off": { "model": "computercraft:block/computer_command_off", "y": 270 }, + "facing=east,state=off": { "model": "computercraft:block/computer_command_off", "y": 90 }, + + "facing=north,state=on": { "model": "computercraft:block/computer_command_on" }, + "facing=south,state=on": { "model": "computercraft:block/computer_command_on", "y": 180 }, + "facing=west,state=on": { "model": "computercraft:block/computer_command_on", "y": 270 }, + "facing=east,state=on": { "model": "computercraft:block/computer_command_on", "y": 90 }, + + "facing=north,state=blinking": { "model": "computercraft:block/computer_command_blinking" }, + "facing=south,state=blinking": { "model": "computercraft:block/computer_command_blinking", "y": 180 }, + "facing=west,state=blinking": { "model": "computercraft:block/computer_command_blinking", "y": 270 }, + "facing=east,state=blinking": { "model": "computercraft:block/computer_command_blinking", "y": 90 } + } +} diff --git a/src/main/resources/assets/computercraft/blockstates/computer_normal.json b/src/main/resources/assets/computercraft/blockstates/computer_normal.json new file mode 100644 index 000000000..95e521a7d --- /dev/null +++ b/src/main/resources/assets/computercraft/blockstates/computer_normal.json @@ -0,0 +1,18 @@ +{ + "variants": { + "facing=north,state=off": { "model": "computercraft:block/computer_normal_off" }, + "facing=south,state=off": { "model": "computercraft:block/computer_normal_off", "y": 180 }, + "facing=west,state=off": { "model": "computercraft:block/computer_normal_off", "y": 270 }, + "facing=east,state=off": { "model": "computercraft:block/computer_normal_off", "y": 90 }, + + "facing=north,state=on": { "model": "computercraft:block/computer_normal_on" }, + "facing=south,state=on": { "model": "computercraft:block/computer_normal_on", "y": 180 }, + "facing=west,state=on": { "model": "computercraft:block/computer_normal_on", "y": 270 }, + "facing=east,state=on": { "model": "computercraft:block/computer_normal_on", "y": 90 }, + + "facing=north,state=blinking": { "model": "computercraft:block/computer_normal_blinking" }, + "facing=south,state=blinking": { "model": "computercraft:block/computer_normal_blinking", "y": 180 }, + "facing=west,state=blinking": { "model": "computercraft:block/computer_normal_blinking", "y": 270 }, + "facing=east,state=blinking": { "model": "computercraft:block/computer_normal_blinking", "y": 90 } + } +} diff --git a/src/main/resources/assets/computercraft/blockstates/disk_drive.json b/src/main/resources/assets/computercraft/blockstates/disk_drive.json new file mode 100644 index 000000000..2ab35863c --- /dev/null +++ b/src/main/resources/assets/computercraft/blockstates/disk_drive.json @@ -0,0 +1,16 @@ +{ + "variants": { + "facing=north,state=empty": { "model": "computercraft:block/disk_drive_empty" }, + "facing=south,state=empty": { "model": "computercraft:block/disk_drive_empty", "y": 180 }, + "facing=west,state=empty": { "model": "computercraft:block/disk_drive_empty", "y": 270 }, + "facing=east,state=empty": { "model": "computercraft:block/disk_drive_empty", "y": 90 }, + "facing=north,state=full": { "model": "computercraft:block/disk_drive_full" }, + "facing=south,state=full": { "model": "computercraft:block/disk_drive_full", "y": 180 }, + "facing=west,state=full": { "model": "computercraft:block/disk_drive_full", "y": 270 }, + "facing=east,state=full": { "model": "computercraft:block/disk_drive_full", "y": 90 }, + "facing=north,state=invalid": { "model": "computercraft:block/disk_drive_invalid" }, + "facing=south,state=invalid": { "model": "computercraft:block/disk_drive_invalid", "y": 180 }, + "facing=west,state=invalid": { "model": "computercraft:block/disk_drive_invalid", "y": 270 }, + "facing=east,state=invalid": { "model": "computercraft:block/disk_drive_invalid", "y": 90 } + } +} diff --git a/src/main/resources/assets/computercraft/blockstates/monitor_advanced.json b/src/main/resources/assets/computercraft/blockstates/monitor_advanced.json new file mode 100644 index 000000000..b55870f67 --- /dev/null +++ b/src/main/resources/assets/computercraft/blockstates/monitor_advanced.json @@ -0,0 +1,364 @@ +{ + "variants": { + "facing=north,orientation=north,state=none": { "model": "computercraft:block/monitor_advanced" }, + "facing=south,orientation=north,state=none": { "model": "computercraft:block/monitor_advanced", "y": 180 }, + "facing=west,orientation=north,state=none": { "model": "computercraft:block/monitor_advanced", "y": 270 }, + "facing=east,orientation=north,state=none": { "model": "computercraft:block/monitor_advanced", "y": 90 }, + "facing=north,orientation=north,state=r": { "model": "computercraft:block/monitor_advanced_r" }, + "facing=south,orientation=north,state=r": { "model": "computercraft:block/monitor_advanced_r", "y": 180 }, + "facing=west,orientation=north,state=r": { "model": "computercraft:block/monitor_advanced_r", "y": 270 }, + "facing=east,orientation=north,state=r": { "model": "computercraft:block/monitor_advanced_r", "y": 90 }, + "facing=north,orientation=north,state=lr": { "model": "computercraft:block/monitor_advanced_lr" }, + "facing=south,orientation=north,state=lr": { "model": "computercraft:block/monitor_advanced_lr", "y": 180 }, + "facing=west,orientation=north,state=lr": { "model": "computercraft:block/monitor_advanced_lr", "y": 270 }, + "facing=east,orientation=north,state=lr": { "model": "computercraft:block/monitor_advanced_lr", "y": 90 }, + "facing=north,orientation=north,state=l": { "model": "computercraft:block/monitor_advanced_l" }, + "facing=south,orientation=north,state=l": { "model": "computercraft:block/monitor_advanced_l", "y": 180 }, + "facing=west,orientation=north,state=l": { "model": "computercraft:block/monitor_advanced_l", "y": 270 }, + "facing=east,orientation=north,state=l": { "model": "computercraft:block/monitor_advanced_l", "y": 90 }, + "facing=north,orientation=north,state=d": { "model": "computercraft:block/monitor_advanced_d" }, + "facing=south,orientation=north,state=d": { "model": "computercraft:block/monitor_advanced_d", "y": 180 }, + "facing=west,orientation=north,state=d": { "model": "computercraft:block/monitor_advanced_d", "y": 270 }, + "facing=east,orientation=north,state=d": { "model": "computercraft:block/monitor_advanced_d", "y": 90 }, + "facing=north,orientation=north,state=ud": { "model": "computercraft:block/monitor_advanced_ud" }, + "facing=south,orientation=north,state=ud": { "model": "computercraft:block/monitor_advanced_ud", "y": 180 }, + "facing=west,orientation=north,state=ud": { "model": "computercraft:block/monitor_advanced_ud", "y": 270 }, + "facing=east,orientation=north,state=ud": { "model": "computercraft:block/monitor_advanced_ud", "y": 90 }, + "facing=north,orientation=north,state=u": { "model": "computercraft:block/monitor_advanced_u" }, + "facing=south,orientation=north,state=u": { "model": "computercraft:block/monitor_advanced_u", "y": 180 }, + "facing=west,orientation=north,state=u": { "model": "computercraft:block/monitor_advanced_u", "y": 270 }, + "facing=east,orientation=north,state=u": { "model": "computercraft:block/monitor_advanced_u", "y": 90 }, + "facing=north,orientation=north,state=rd": { "model": "computercraft:block/monitor_advanced_rd" }, + "facing=south,orientation=north,state=rd": { "model": "computercraft:block/monitor_advanced_rd", "y": 180 }, + "facing=west,orientation=north,state=rd": { "model": "computercraft:block/monitor_advanced_rd", "y": 270 }, + "facing=east,orientation=north,state=rd": { "model": "computercraft:block/monitor_advanced_rd", "y": 90 }, + "facing=north,orientation=north,state=lrd": { "model": "computercraft:block/monitor_advanced_lrd" }, + "facing=south,orientation=north,state=lrd": { "model": "computercraft:block/monitor_advanced_lrd", "y": 180 }, + "facing=west,orientation=north,state=lrd": { "model": "computercraft:block/monitor_advanced_lrd", "y": 270 }, + "facing=east,orientation=north,state=lrd": { "model": "computercraft:block/monitor_advanced_lrd", "y": 90 }, + "facing=north,orientation=north,state=ld": { "model": "computercraft:block/monitor_advanced_ld" }, + "facing=south,orientation=north,state=ld": { "model": "computercraft:block/monitor_advanced_ld", "y": 180 }, + "facing=west,orientation=north,state=ld": { "model": "computercraft:block/monitor_advanced_ld", "y": 270 }, + "facing=east,orientation=north,state=ld": { "model": "computercraft:block/monitor_advanced_ld", "y": 90 }, + "facing=north,orientation=north,state=rud": { "model": "computercraft:block/monitor_advanced_rud" }, + "facing=south,orientation=north,state=rud": { "model": "computercraft:block/monitor_advanced_rud", "y": 180 }, + "facing=west,orientation=north,state=rud": { "model": "computercraft:block/monitor_advanced_rud", "y": 270 }, + "facing=east,orientation=north,state=rud": { "model": "computercraft:block/monitor_advanced_rud", "y": 90 }, + "facing=north,orientation=north,state=lrud": { "model": "computercraft:block/monitor_advanced_lrud" }, + "facing=south,orientation=north,state=lrud": { "model": "computercraft:block/monitor_advanced_lrud", "y": 180 }, + "facing=west,orientation=north,state=lrud": { "model": "computercraft:block/monitor_advanced_lrud", "y": 270 }, + "facing=east,orientation=north,state=lrud": { "model": "computercraft:block/monitor_advanced_lrud", "y": 90 }, + "facing=north,orientation=north,state=lud": { "model": "computercraft:block/monitor_advanced_lud" }, + "facing=south,orientation=north,state=lud": { "model": "computercraft:block/monitor_advanced_lud", "y": 180 }, + "facing=west,orientation=north,state=lud": { "model": "computercraft:block/monitor_advanced_lud", "y": 270 }, + "facing=east,orientation=north,state=lud": { "model": "computercraft:block/monitor_advanced_lud", "y": 90 }, + "facing=north,orientation=north,state=ru": { "model": "computercraft:block/monitor_advanced_ru" }, + "facing=south,orientation=north,state=ru": { "model": "computercraft:block/monitor_advanced_ru", "y": 180 }, + "facing=west,orientation=north,state=ru": { "model": "computercraft:block/monitor_advanced_ru", "y": 270 }, + "facing=east,orientation=north,state=ru": { "model": "computercraft:block/monitor_advanced_ru", "y": 90 }, + "facing=north,orientation=north,state=lru": { "model": "computercraft:block/monitor_advanced_lru" }, + "facing=south,orientation=north,state=lru": { "model": "computercraft:block/monitor_advanced_lru", "y": 180 }, + "facing=west,orientation=north,state=lru": { "model": "computercraft:block/monitor_advanced_lru", "y": 270 }, + "facing=east,orientation=north,state=lru": { "model": "computercraft:block/monitor_advanced_lru", "y": 90 }, + "facing=north,orientation=north,state=lu": { "model": "computercraft:block/monitor_advanced_lu" }, + "facing=south,orientation=north,state=lu": { "model": "computercraft:block/monitor_advanced_lu", "y": 180 }, + "facing=west,orientation=north,state=lu": { "model": "computercraft:block/monitor_advanced_lu", "y": 270 }, + "facing=east,orientation=north,state=lu": { "model": "computercraft:block/monitor_advanced_lu", "y": 90 }, + + "facing=north,orientation=up,state=none": { "model": "computercraft:block/monitor_advanced", "x": 270 }, + "facing=south,orientation=up,state=none": { + "model": "computercraft:block/monitor_advanced", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=none": { + "model": "computercraft:block/monitor_advanced", "y": 270, "x": 270 + }, + "facing=east,orientation=up,state=none": { "model": "computercraft:block/monitor_advanced", "y": 90, "x": 270 }, + "facing=north,orientation=up,state=r": { "model": "computercraft:block/monitor_advanced_r", "x": 270 }, + "facing=south,orientation=up,state=r": { + "model": "computercraft:block/monitor_advanced_r", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=r": { "model": "computercraft:block/monitor_advanced_r", "y": 270, "x": 270 }, + "facing=east,orientation=up,state=r": { "model": "computercraft:block/monitor_advanced_r", "y": 90, "x": 270 }, + "facing=north,orientation=up,state=lr": { "model": "computercraft:block/monitor_advanced_lr", "x": 270 }, + "facing=south,orientation=up,state=lr": { + "model": "computercraft:block/monitor_advanced_lr", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=lr": { + "model": "computercraft:block/monitor_advanced_lr", "y": 270, "x": 270 + }, + "facing=east,orientation=up,state=lr": { + "model": "computercraft:block/monitor_advanced_lr", "y": 90, "x": 270 + }, + "facing=north,orientation=up,state=l": { "model": "computercraft:block/monitor_advanced_l", "x": 270 }, + "facing=south,orientation=up,state=l": { + "model": "computercraft:block/monitor_advanced_l", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=l": { "model": "computercraft:block/monitor_advanced_l", "y": 270, "x": 270 }, + "facing=east,orientation=up,state=l": { "model": "computercraft:block/monitor_advanced_l", "y": 90, "x": 270 }, + "facing=north,orientation=up,state=d": { "model": "computercraft:block/monitor_advanced_d", "x": 270 }, + "facing=south,orientation=up,state=d": { + "model": "computercraft:block/monitor_advanced_d", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=d": { "model": "computercraft:block/monitor_advanced_d", "y": 270, "x": 270 }, + "facing=east,orientation=up,state=d": { "model": "computercraft:block/monitor_advanced_d", "y": 90, "x": 270 }, + "facing=north,orientation=up,state=ud": { "model": "computercraft:block/monitor_advanced_ud", "x": 270 }, + "facing=south,orientation=up,state=ud": { + "model": "computercraft:block/monitor_advanced_ud", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=ud": { + "model": "computercraft:block/monitor_advanced_ud", "y": 270, "x": 270 + }, + "facing=east,orientation=up,state=ud": { + "model": "computercraft:block/monitor_advanced_ud", "y": 90, "x": 270 + }, + "facing=north,orientation=up,state=u": { "model": "computercraft:block/monitor_advanced_u", "x": 270 }, + "facing=south,orientation=up,state=u": { + "model": "computercraft:block/monitor_advanced_u", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=u": { "model": "computercraft:block/monitor_advanced_u", "y": 270, "x": 270 }, + "facing=east,orientation=up,state=u": { "model": "computercraft:block/monitor_advanced_u", "y": 90, "x": 270 }, + "facing=north,orientation=up,state=rd": { "model": "computercraft:block/monitor_advanced_rd", "x": 270 }, + "facing=south,orientation=up,state=rd": { + "model": "computercraft:block/monitor_advanced_rd", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=rd": { + "model": "computercraft:block/monitor_advanced_rd", "y": 270, "x": 270 + }, + "facing=east,orientation=up,state=rd": { + "model": "computercraft:block/monitor_advanced_rd", "y": 90, "x": 270 + }, + "facing=north,orientation=up,state=lrd": { "model": "computercraft:block/monitor_advanced_lrd", "x": 270 }, + "facing=south,orientation=up,state=lrd": { + "model": "computercraft:block/monitor_advanced_lrd", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=lrd": { + "model": "computercraft:block/monitor_advanced_lrd", "y": 270, "x": 270 + }, + "facing=east,orientation=up,state=lrd": { + "model": "computercraft:block/monitor_advanced_lrd", "y": 90, "x": 270 + }, + "facing=north,orientation=up,state=ld": { "model": "computercraft:block/monitor_advanced_ld", "x": 270 }, + "facing=south,orientation=up,state=ld": { + "model": "computercraft:block/monitor_advanced_ld", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=ld": { + "model": "computercraft:block/monitor_advanced_ld", "y": 270, "x": 270 + }, + "facing=east,orientation=up,state=ld": { + "model": "computercraft:block/monitor_advanced_ld", "y": 90, "x": 270 + }, + "facing=north,orientation=up,state=rud": { "model": "computercraft:block/monitor_advanced_rud", "x": 270 }, + "facing=south,orientation=up,state=rud": { + "model": "computercraft:block/monitor_advanced_rud", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=rud": { + "model": "computercraft:block/monitor_advanced_rud", "y": 270, "x": 270 + }, + "facing=east,orientation=up,state=rud": { + "model": "computercraft:block/monitor_advanced_rud", "y": 90, "x": 270 + }, + "facing=north,orientation=up,state=lrud": { "model": "computercraft:block/monitor_advanced_lrud", "x": 270 }, + "facing=south,orientation=up,state=lrud": { + "model": "computercraft:block/monitor_advanced_lrud", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=lrud": { + "model": "computercraft:block/monitor_advanced_lrud", "y": 270, "x": 270 + }, + "facing=east,orientation=up,state=lrud": { + "model": "computercraft:block/monitor_advanced_lrud", "y": 90, "x": 270 + }, + "facing=north,orientation=up,state=lud": { "model": "computercraft:block/monitor_advanced_lud", "x": 270 }, + "facing=south,orientation=up,state=lud": { + "model": "computercraft:block/monitor_advanced_lud", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=lud": { + "model": "computercraft:block/monitor_advanced_lud", "y": 270, "x": 270 + }, + "facing=east,orientation=up,state=lud": { + "model": "computercraft:block/monitor_advanced_lud", "y": 90, "x": 270 + }, + "facing=north,orientation=up,state=ru": { "model": "computercraft:block/monitor_advanced_ru", "x": 270 }, + "facing=south,orientation=up,state=ru": { + "model": "computercraft:block/monitor_advanced_ru", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=ru": { + "model": "computercraft:block/monitor_advanced_ru", "y": 270, "x": 270 + }, + "facing=east,orientation=up,state=ru": { + "model": "computercraft:block/monitor_advanced_ru", "y": 90, "x": 270 + }, + "facing=north,orientation=up,state=lru": { "model": "computercraft:block/monitor_advanced_lru", "x": 270 }, + "facing=south,orientation=up,state=lru": { + "model": "computercraft:block/monitor_advanced_lru", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=lru": { + "model": "computercraft:block/monitor_advanced_lru", "y": 270, "x": 270 + }, + "facing=east,orientation=up,state=lru": { + "model": "computercraft:block/monitor_advanced_lru", "y": 90, "x": 270 + }, + "facing=north,orientation=up,state=lu": { "model": "computercraft:block/monitor_advanced_lu", "x": 270 }, + "facing=south,orientation=up,state=lu": { + "model": "computercraft:block/monitor_advanced_lu", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=lu": { + "model": "computercraft:block/monitor_advanced_lu", "y": 270, "x": 270 + }, + "facing=east,orientation=up,state=lu": { + "model": "computercraft:block/monitor_advanced_lu", "y": 90, "x": 270 + }, + + "facing=north,orientation=down,state=none": { "model": "computercraft:block/monitor_advanced", "x": 90 }, + "facing=south,orientation=down,state=none": { + "model": "computercraft:block/monitor_advanced", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=none": { + "model": "computercraft:block/monitor_advanced", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=none": { + "model": "computercraft:block/monitor_advanced", "y": 90, "x": 90 + }, + "facing=north,orientation=down,state=r": { "model": "computercraft:block/monitor_advanced_r", "x": 90 }, + "facing=south,orientation=down,state=r": { + "model": "computercraft:block/monitor_advanced_r", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=r": { + "model": "computercraft:block/monitor_advanced_r", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=r": { "model": "computercraft:block/monitor_advanced_r", "y": 90, "x": 90 }, + "facing=north,orientation=down,state=lr": { "model": "computercraft:block/monitor_advanced_lr", "x": 90 }, + "facing=south,orientation=down,state=lr": { + "model": "computercraft:block/monitor_advanced_lr", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=lr": { + "model": "computercraft:block/monitor_advanced_lr", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=lr": { + "model": "computercraft:block/monitor_advanced_lr", "y": 90, "x": 90 + }, + "facing=north,orientation=down,state=l": { "model": "computercraft:block/monitor_advanced_l", "x": 90 }, + "facing=south,orientation=down,state=l": { + "model": "computercraft:block/monitor_advanced_l", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=l": { + "model": "computercraft:block/monitor_advanced_l", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=l": { "model": "computercraft:block/monitor_advanced_l", "y": 90, "x": 90 }, + "facing=north,orientation=down,state=d": { "model": "computercraft:block/monitor_advanced_d", "x": 90 }, + "facing=south,orientation=down,state=d": { + "model": "computercraft:block/monitor_advanced_d", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=d": { + "model": "computercraft:block/monitor_advanced_d", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=d": { "model": "computercraft:block/monitor_advanced_d", "y": 90, "x": 90 }, + "facing=north,orientation=down,state=ud": { "model": "computercraft:block/monitor_advanced_ud", "x": 90 }, + "facing=south,orientation=down,state=ud": { + "model": "computercraft:block/monitor_advanced_ud", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=ud": { + "model": "computercraft:block/monitor_advanced_ud", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=ud": { + "model": "computercraft:block/monitor_advanced_ud", "y": 90, "x": 90 + }, + "facing=north,orientation=down,state=u": { "model": "computercraft:block/monitor_advanced_u", "x": 90 }, + "facing=south,orientation=down,state=u": { + "model": "computercraft:block/monitor_advanced_u", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=u": { + "model": "computercraft:block/monitor_advanced_u", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=u": { "model": "computercraft:block/monitor_advanced_u", "y": 90, "x": 90 }, + "facing=north,orientation=down,state=rd": { "model": "computercraft:block/monitor_advanced_rd", "x": 90 }, + "facing=south,orientation=down,state=rd": { + "model": "computercraft:block/monitor_advanced_rd", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=rd": { + "model": "computercraft:block/monitor_advanced_rd", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=rd": { + "model": "computercraft:block/monitor_advanced_rd", "y": 90, "x": 90 + }, + "facing=north,orientation=down,state=lrd": { "model": "computercraft:block/monitor_advanced_lrd", "x": 90 }, + "facing=south,orientation=down,state=lrd": { + "model": "computercraft:block/monitor_advanced_lrd", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=lrd": { + "model": "computercraft:block/monitor_advanced_lrd", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=lrd": { + "model": "computercraft:block/monitor_advanced_lrd", "y": 90, "x": 90 + }, + "facing=north,orientation=down,state=ld": { "model": "computercraft:block/monitor_advanced_ld", "x": 90 }, + "facing=south,orientation=down,state=ld": { + "model": "computercraft:block/monitor_advanced_ld", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=ld": { + "model": "computercraft:block/monitor_advanced_ld", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=ld": { + "model": "computercraft:block/monitor_advanced_ld", "y": 90, "x": 90 + }, + "facing=north,orientation=down,state=rud": { "model": "computercraft:block/monitor_advanced_rud", "x": 90 }, + "facing=south,orientation=down,state=rud": { + "model": "computercraft:block/monitor_advanced_rud", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=rud": { + "model": "computercraft:block/monitor_advanced_rud", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=rud": { + "model": "computercraft:block/monitor_advanced_rud", "y": 90, "x": 90 + }, + "facing=north,orientation=down,state=lrud": { "model": "computercraft:block/monitor_advanced_lrud", "x": 90 }, + "facing=south,orientation=down,state=lrud": { + "model": "computercraft:block/monitor_advanced_lrud", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=lrud": { + "model": "computercraft:block/monitor_advanced_lrud", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=lrud": { + "model": "computercraft:block/monitor_advanced_lrud", "y": 90, "x": 90 + }, + "facing=north,orientation=down,state=lud": { "model": "computercraft:block/monitor_advanced_lud", "x": 90 }, + "facing=south,orientation=down,state=lud": { + "model": "computercraft:block/monitor_advanced_lud", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=lud": { + "model": "computercraft:block/monitor_advanced_lud", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=lud": { + "model": "computercraft:block/monitor_advanced_lud", "y": 90, "x": 90 + }, + "facing=north,orientation=down,state=ru": { "model": "computercraft:block/monitor_advanced_ru", "x": 90 }, + "facing=south,orientation=down,state=ru": { + "model": "computercraft:block/monitor_advanced_ru", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=ru": { + "model": "computercraft:block/monitor_advanced_ru", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=ru": { + "model": "computercraft:block/monitor_advanced_ru", "y": 90, "x": 90 + }, + "facing=north,orientation=down,state=lru": { "model": "computercraft:block/monitor_advanced_lru", "x": 90 }, + "facing=south,orientation=down,state=lru": { + "model": "computercraft:block/monitor_advanced_lru", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=lru": { + "model": "computercraft:block/monitor_advanced_lru", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=lru": { + "model": "computercraft:block/monitor_advanced_lru", "y": 90, "x": 90 + }, + "facing=north,orientation=down,state=lu": { "model": "computercraft:block/monitor_advanced_lu", "x": 90 }, + "facing=south,orientation=down,state=lu": { + "model": "computercraft:block/monitor_advanced_lu", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=lu": { + "model": "computercraft:block/monitor_advanced_lu", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=lu": { + "model": "computercraft:block/monitor_advanced_lu", "y": 90, "x": 90 + } + } +} diff --git a/src/main/resources/assets/computercraft/blockstates/monitor_normal.json b/src/main/resources/assets/computercraft/blockstates/monitor_normal.json new file mode 100644 index 000000000..b14a45a21 --- /dev/null +++ b/src/main/resources/assets/computercraft/blockstates/monitor_normal.json @@ -0,0 +1,296 @@ +{ + "variants": { + "facing=north,orientation=north,state=none": { "model": "computercraft:block/monitor_normal" }, + "facing=south,orientation=north,state=none": { "model": "computercraft:block/monitor_normal", "y": 180 }, + "facing=west,orientation=north,state=none": { "model": "computercraft:block/monitor_normal", "y": 270 }, + "facing=east,orientation=north,state=none": { "model": "computercraft:block/monitor_normal", "y": 90 }, + "facing=north,orientation=north,state=r": { "model": "computercraft:block/monitor_normal_r" }, + "facing=south,orientation=north,state=r": { "model": "computercraft:block/monitor_normal_r", "y": 180 }, + "facing=west,orientation=north,state=r": { "model": "computercraft:block/monitor_normal_r", "y": 270 }, + "facing=east,orientation=north,state=r": { "model": "computercraft:block/monitor_normal_r", "y": 90 }, + "facing=north,orientation=north,state=lr": { "model": "computercraft:block/monitor_normal_lr" }, + "facing=south,orientation=north,state=lr": { "model": "computercraft:block/monitor_normal_lr", "y": 180 }, + "facing=west,orientation=north,state=lr": { "model": "computercraft:block/monitor_normal_lr", "y": 270 }, + "facing=east,orientation=north,state=lr": { "model": "computercraft:block/monitor_normal_lr", "y": 90 }, + "facing=north,orientation=north,state=l": { "model": "computercraft:block/monitor_normal_l" }, + "facing=south,orientation=north,state=l": { "model": "computercraft:block/monitor_normal_l", "y": 180 }, + "facing=west,orientation=north,state=l": { "model": "computercraft:block/monitor_normal_l", "y": 270 }, + "facing=east,orientation=north,state=l": { "model": "computercraft:block/monitor_normal_l", "y": 90 }, + "facing=north,orientation=north,state=d": { "model": "computercraft:block/monitor_normal_d" }, + "facing=south,orientation=north,state=d": { "model": "computercraft:block/monitor_normal_d", "y": 180 }, + "facing=west,orientation=north,state=d": { "model": "computercraft:block/monitor_normal_d", "y": 270 }, + "facing=east,orientation=north,state=d": { "model": "computercraft:block/monitor_normal_d", "y": 90 }, + "facing=north,orientation=north,state=ud": { "model": "computercraft:block/monitor_normal_ud" }, + "facing=south,orientation=north,state=ud": { "model": "computercraft:block/monitor_normal_ud", "y": 180 }, + "facing=west,orientation=north,state=ud": { "model": "computercraft:block/monitor_normal_ud", "y": 270 }, + "facing=east,orientation=north,state=ud": { "model": "computercraft:block/monitor_normal_ud", "y": 90 }, + "facing=north,orientation=north,state=u": { "model": "computercraft:block/monitor_normal_u" }, + "facing=south,orientation=north,state=u": { "model": "computercraft:block/monitor_normal_u", "y": 180 }, + "facing=west,orientation=north,state=u": { "model": "computercraft:block/monitor_normal_u", "y": 270 }, + "facing=east,orientation=north,state=u": { "model": "computercraft:block/monitor_normal_u", "y": 90 }, + "facing=north,orientation=north,state=rd": { "model": "computercraft:block/monitor_normal_rd" }, + "facing=south,orientation=north,state=rd": { "model": "computercraft:block/monitor_normal_rd", "y": 180 }, + "facing=west,orientation=north,state=rd": { "model": "computercraft:block/monitor_normal_rd", "y": 270 }, + "facing=east,orientation=north,state=rd": { "model": "computercraft:block/monitor_normal_rd", "y": 90 }, + "facing=north,orientation=north,state=lrd": { "model": "computercraft:block/monitor_normal_lrd" }, + "facing=south,orientation=north,state=lrd": { "model": "computercraft:block/monitor_normal_lrd", "y": 180 }, + "facing=west,orientation=north,state=lrd": { "model": "computercraft:block/monitor_normal_lrd", "y": 270 }, + "facing=east,orientation=north,state=lrd": { "model": "computercraft:block/monitor_normal_lrd", "y": 90 }, + "facing=north,orientation=north,state=ld": { "model": "computercraft:block/monitor_normal_ld" }, + "facing=south,orientation=north,state=ld": { "model": "computercraft:block/monitor_normal_ld", "y": 180 }, + "facing=west,orientation=north,state=ld": { "model": "computercraft:block/monitor_normal_ld", "y": 270 }, + "facing=east,orientation=north,state=ld": { "model": "computercraft:block/monitor_normal_ld", "y": 90 }, + "facing=north,orientation=north,state=rud": { "model": "computercraft:block/monitor_normal_rud" }, + "facing=south,orientation=north,state=rud": { "model": "computercraft:block/monitor_normal_rud", "y": 180 }, + "facing=west,orientation=north,state=rud": { "model": "computercraft:block/monitor_normal_rud", "y": 270 }, + "facing=east,orientation=north,state=rud": { "model": "computercraft:block/monitor_normal_rud", "y": 90 }, + "facing=north,orientation=north,state=lrud": { "model": "computercraft:block/monitor_normal_lrud" }, + "facing=south,orientation=north,state=lrud": { "model": "computercraft:block/monitor_normal_lrud", "y": 180 }, + "facing=west,orientation=north,state=lrud": { "model": "computercraft:block/monitor_normal_lrud", "y": 270 }, + "facing=east,orientation=north,state=lrud": { "model": "computercraft:block/monitor_normal_lrud", "y": 90 }, + "facing=north,orientation=north,state=lud": { "model": "computercraft:block/monitor_normal_lud" }, + "facing=south,orientation=north,state=lud": { "model": "computercraft:block/monitor_normal_lud", "y": 180 }, + "facing=west,orientation=north,state=lud": { "model": "computercraft:block/monitor_normal_lud", "y": 270 }, + "facing=east,orientation=north,state=lud": { "model": "computercraft:block/monitor_normal_lud", "y": 90 }, + "facing=north,orientation=north,state=ru": { "model": "computercraft:block/monitor_normal_ru" }, + "facing=south,orientation=north,state=ru": { "model": "computercraft:block/monitor_normal_ru", "y": 180 }, + "facing=west,orientation=north,state=ru": { "model": "computercraft:block/monitor_normal_ru", "y": 270 }, + "facing=east,orientation=north,state=ru": { "model": "computercraft:block/monitor_normal_ru", "y": 90 }, + "facing=north,orientation=north,state=lru": { "model": "computercraft:block/monitor_normal_lru" }, + "facing=south,orientation=north,state=lru": { "model": "computercraft:block/monitor_normal_lru", "y": 180 }, + "facing=west,orientation=north,state=lru": { "model": "computercraft:block/monitor_normal_lru", "y": 270 }, + "facing=east,orientation=north,state=lru": { "model": "computercraft:block/monitor_normal_lru", "y": 90 }, + "facing=north,orientation=north,state=lu": { "model": "computercraft:block/monitor_normal_lu" }, + "facing=south,orientation=north,state=lu": { "model": "computercraft:block/monitor_normal_lu", "y": 180 }, + "facing=west,orientation=north,state=lu": { "model": "computercraft:block/monitor_normal_lu", "y": 270 }, + "facing=east,orientation=north,state=lu": { "model": "computercraft:block/monitor_normal_lu", "y": 90 }, + + "facing=north,orientation=up,state=none": { "model": "computercraft:block/monitor_normal", "x": 270 }, + "facing=south,orientation=up,state=none": { "model": "computercraft:block/monitor_normal", "y": 180, "x": 270 }, + "facing=west,orientation=up,state=none": { "model": "computercraft:block/monitor_normal", "y": 270, "x": 270 }, + "facing=east,orientation=up,state=none": { "model": "computercraft:block/monitor_normal", "y": 90, "x": 270 }, + "facing=north,orientation=up,state=r": { "model": "computercraft:block/monitor_normal_r", "x": 270 }, + "facing=south,orientation=up,state=r": { "model": "computercraft:block/monitor_normal_r", "y": 180, "x": 270 }, + "facing=west,orientation=up,state=r": { "model": "computercraft:block/monitor_normal_r", "y": 270, "x": 270 }, + "facing=east,orientation=up,state=r": { "model": "computercraft:block/monitor_normal_r", "y": 90, "x": 270 }, + "facing=north,orientation=up,state=lr": { "model": "computercraft:block/monitor_normal_lr", "x": 270 }, + "facing=south,orientation=up,state=lr": { + "model": "computercraft:block/monitor_normal_lr", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=lr": { "model": "computercraft:block/monitor_normal_lr", "y": 270, "x": 270 }, + "facing=east,orientation=up,state=lr": { "model": "computercraft:block/monitor_normal_lr", "y": 90, "x": 270 }, + "facing=north,orientation=up,state=l": { "model": "computercraft:block/monitor_normal_l", "x": 270 }, + "facing=south,orientation=up,state=l": { "model": "computercraft:block/monitor_normal_l", "y": 180, "x": 270 }, + "facing=west,orientation=up,state=l": { "model": "computercraft:block/monitor_normal_l", "y": 270, "x": 270 }, + "facing=east,orientation=up,state=l": { "model": "computercraft:block/monitor_normal_l", "y": 90, "x": 270 }, + "facing=north,orientation=up,state=d": { "model": "computercraft:block/monitor_normal_d", "x": 270 }, + "facing=south,orientation=up,state=d": { "model": "computercraft:block/monitor_normal_d", "y": 180, "x": 270 }, + "facing=west,orientation=up,state=d": { "model": "computercraft:block/monitor_normal_d", "y": 270, "x": 270 }, + "facing=east,orientation=up,state=d": { "model": "computercraft:block/monitor_normal_d", "y": 90, "x": 270 }, + "facing=north,orientation=up,state=ud": { "model": "computercraft:block/monitor_normal_ud", "x": 270 }, + "facing=south,orientation=up,state=ud": { + "model": "computercraft:block/monitor_normal_ud", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=ud": { "model": "computercraft:block/monitor_normal_ud", "y": 270, "x": 270 }, + "facing=east,orientation=up,state=ud": { "model": "computercraft:block/monitor_normal_ud", "y": 90, "x": 270 }, + "facing=north,orientation=up,state=u": { "model": "computercraft:block/monitor_normal_u", "x": 270 }, + "facing=south,orientation=up,state=u": { "model": "computercraft:block/monitor_normal_u", "y": 180, "x": 270 }, + "facing=west,orientation=up,state=u": { "model": "computercraft:block/monitor_normal_u", "y": 270, "x": 270 }, + "facing=east,orientation=up,state=u": { "model": "computercraft:block/monitor_normal_u", "y": 90, "x": 270 }, + "facing=north,orientation=up,state=rd": { "model": "computercraft:block/monitor_normal_rd", "x": 270 }, + "facing=south,orientation=up,state=rd": { + "model": "computercraft:block/monitor_normal_rd", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=rd": { "model": "computercraft:block/monitor_normal_rd", "y": 270, "x": 270 }, + "facing=east,orientation=up,state=rd": { "model": "computercraft:block/monitor_normal_rd", "y": 90, "x": 270 }, + "facing=north,orientation=up,state=lrd": { "model": "computercraft:block/monitor_normal_lrd", "x": 270 }, + "facing=south,orientation=up,state=lrd": { + "model": "computercraft:block/monitor_normal_lrd", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=lrd": { + "model": "computercraft:block/monitor_normal_lrd", "y": 270, "x": 270 + }, + "facing=east,orientation=up,state=lrd": { + "model": "computercraft:block/monitor_normal_lrd", "y": 90, "x": 270 + }, + "facing=north,orientation=up,state=ld": { "model": "computercraft:block/monitor_normal_ld", "x": 270 }, + "facing=south,orientation=up,state=ld": { + "model": "computercraft:block/monitor_normal_ld", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=ld": { "model": "computercraft:block/monitor_normal_ld", "y": 270, "x": 270 }, + "facing=east,orientation=up,state=ld": { "model": "computercraft:block/monitor_normal_ld", "y": 90, "x": 270 }, + "facing=north,orientation=up,state=rud": { "model": "computercraft:block/monitor_normal_rud", "x": 270 }, + "facing=south,orientation=up,state=rud": { + "model": "computercraft:block/monitor_normal_rud", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=rud": { + "model": "computercraft:block/monitor_normal_rud", "y": 270, "x": 270 + }, + "facing=east,orientation=up,state=rud": { + "model": "computercraft:block/monitor_normal_rud", "y": 90, "x": 270 + }, + "facing=north,orientation=up,state=lrud": { "model": "computercraft:block/monitor_normal_lrud", "x": 270 }, + "facing=south,orientation=up,state=lrud": { + "model": "computercraft:block/monitor_normal_lrud", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=lrud": { + "model": "computercraft:block/monitor_normal_lrud", "y": 270, "x": 270 + }, + "facing=east,orientation=up,state=lrud": { + "model": "computercraft:block/monitor_normal_lrud", "y": 90, "x": 270 + }, + "facing=north,orientation=up,state=lud": { "model": "computercraft:block/monitor_normal_lud", "x": 270 }, + "facing=south,orientation=up,state=lud": { + "model": "computercraft:block/monitor_normal_lud", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=lud": { + "model": "computercraft:block/monitor_normal_lud", "y": 270, "x": 270 + }, + "facing=east,orientation=up,state=lud": { + "model": "computercraft:block/monitor_normal_lud", "y": 90, "x": 270 + }, + "facing=north,orientation=up,state=ru": { "model": "computercraft:block/monitor_normal_ru", "x": 270 }, + "facing=south,orientation=up,state=ru": { + "model": "computercraft:block/monitor_normal_ru", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=ru": { "model": "computercraft:block/monitor_normal_ru", "y": 270, "x": 270 }, + "facing=east,orientation=up,state=ru": { "model": "computercraft:block/monitor_normal_ru", "y": 90, "x": 270 }, + "facing=north,orientation=up,state=lru": { "model": "computercraft:block/monitor_normal_lru", "x": 270 }, + "facing=south,orientation=up,state=lru": { + "model": "computercraft:block/monitor_normal_lru", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=lru": { + "model": "computercraft:block/monitor_normal_lru", "y": 270, "x": 270 + }, + "facing=east,orientation=up,state=lru": { + "model": "computercraft:block/monitor_normal_lru", "y": 90, "x": 270 + }, + "facing=north,orientation=up,state=lu": { "model": "computercraft:block/monitor_normal_lu", "x": 270 }, + "facing=south,orientation=up,state=lu": { + "model": "computercraft:block/monitor_normal_lu", "y": 180, "x": 270 + }, + "facing=west,orientation=up,state=lu": { "model": "computercraft:block/monitor_normal_lu", "y": 270, "x": 270 }, + "facing=east,orientation=up,state=lu": { "model": "computercraft:block/monitor_normal_lu", "y": 90, "x": 270 }, + + "facing=north,orientation=down,state=none": { "model": "computercraft:block/monitor_normal", "x": 90 }, + "facing=south,orientation=down,state=none": { + "model": "computercraft:block/monitor_normal", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=none": { "model": "computercraft:block/monitor_normal", "y": 270, "x": 90 }, + "facing=east,orientation=down,state=none": { "model": "computercraft:block/monitor_normal", "y": 90, "x": 90 }, + "facing=north,orientation=down,state=r": { "model": "computercraft:block/monitor_normal_r", "x": 90 }, + "facing=south,orientation=down,state=r": { "model": "computercraft:block/monitor_normal_r", "y": 180, "x": 90 }, + "facing=west,orientation=down,state=r": { "model": "computercraft:block/monitor_normal_r", "y": 270, "x": 90 }, + "facing=east,orientation=down,state=r": { "model": "computercraft:block/monitor_normal_r", "y": 90, "x": 90 }, + "facing=north,orientation=down,state=lr": { "model": "computercraft:block/monitor_normal_lr", "x": 90 }, + "facing=south,orientation=down,state=lr": { + "model": "computercraft:block/monitor_normal_lr", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=lr": { + "model": "computercraft:block/monitor_normal_lr", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=lr": { "model": "computercraft:block/monitor_normal_lr", "y": 90, "x": 90 }, + "facing=north,orientation=down,state=l": { "model": "computercraft:block/monitor_normal_l", "x": 90 }, + "facing=south,orientation=down,state=l": { "model": "computercraft:block/monitor_normal_l", "y": 180, "x": 90 }, + "facing=west,orientation=down,state=l": { "model": "computercraft:block/monitor_normal_l", "y": 270, "x": 90 }, + "facing=east,orientation=down,state=l": { "model": "computercraft:block/monitor_normal_l", "y": 90, "x": 90 }, + "facing=north,orientation=down,state=d": { "model": "computercraft:block/monitor_normal_d", "x": 90 }, + "facing=south,orientation=down,state=d": { "model": "computercraft:block/monitor_normal_d", "y": 180, "x": 90 }, + "facing=west,orientation=down,state=d": { "model": "computercraft:block/monitor_normal_d", "y": 270, "x": 90 }, + "facing=east,orientation=down,state=d": { "model": "computercraft:block/monitor_normal_d", "y": 90, "x": 90 }, + "facing=north,orientation=down,state=ud": { "model": "computercraft:block/monitor_normal_ud", "x": 90 }, + "facing=south,orientation=down,state=ud": { + "model": "computercraft:block/monitor_normal_ud", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=ud": { + "model": "computercraft:block/monitor_normal_ud", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=ud": { "model": "computercraft:block/monitor_normal_ud", "y": 90, "x": 90 }, + "facing=north,orientation=down,state=u": { "model": "computercraft:block/monitor_normal_u", "x": 90 }, + "facing=south,orientation=down,state=u": { "model": "computercraft:block/monitor_normal_u", "y": 180, "x": 90 }, + "facing=west,orientation=down,state=u": { "model": "computercraft:block/monitor_normal_u", "y": 270, "x": 90 }, + "facing=east,orientation=down,state=u": { "model": "computercraft:block/monitor_normal_u", "y": 90, "x": 90 }, + "facing=north,orientation=down,state=rd": { "model": "computercraft:block/monitor_normal_rd", "x": 90 }, + "facing=south,orientation=down,state=rd": { + "model": "computercraft:block/monitor_normal_rd", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=rd": { + "model": "computercraft:block/monitor_normal_rd", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=rd": { "model": "computercraft:block/monitor_normal_rd", "y": 90, "x": 90 }, + "facing=north,orientation=down,state=lrd": { "model": "computercraft:block/monitor_normal_lrd", "x": 90 }, + "facing=south,orientation=down,state=lrd": { + "model": "computercraft:block/monitor_normal_lrd", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=lrd": { + "model": "computercraft:block/monitor_normal_lrd", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=lrd": { + "model": "computercraft:block/monitor_normal_lrd", "y": 90, "x": 90 + }, + "facing=north,orientation=down,state=ld": { "model": "computercraft:block/monitor_normal_ld", "x": 90 }, + "facing=south,orientation=down,state=ld": { + "model": "computercraft:block/monitor_normal_ld", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=ld": { + "model": "computercraft:block/monitor_normal_ld", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=ld": { "model": "computercraft:block/monitor_normal_ld", "y": 90, "x": 90 }, + "facing=north,orientation=down,state=rud": { "model": "computercraft:block/monitor_normal_rud", "x": 90 }, + "facing=south,orientation=down,state=rud": { + "model": "computercraft:block/monitor_normal_rud", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=rud": { + "model": "computercraft:block/monitor_normal_rud", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=rud": { + "model": "computercraft:block/monitor_normal_rud", "y": 90, "x": 90 + }, + "facing=north,orientation=down,state=lrud": { "model": "computercraft:block/monitor_normal_lrud", "x": 90 }, + "facing=south,orientation=down,state=lrud": { + "model": "computercraft:block/monitor_normal_lrud", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=lrud": { + "model": "computercraft:block/monitor_normal_lrud", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=lrud": { + "model": "computercraft:block/monitor_normal_lrud", "y": 90, "x": 90 + }, + "facing=north,orientation=down,state=lud": { "model": "computercraft:block/monitor_normal_lud", "x": 90 }, + "facing=south,orientation=down,state=lud": { + "model": "computercraft:block/monitor_normal_lud", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=lud": { + "model": "computercraft:block/monitor_normal_lud", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=lud": { + "model": "computercraft:block/monitor_normal_lud", "y": 90, "x": 90 + }, + "facing=north,orientation=down,state=ru": { "model": "computercraft:block/monitor_normal_ru", "x": 90 }, + "facing=south,orientation=down,state=ru": { + "model": "computercraft:block/monitor_normal_ru", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=ru": { + "model": "computercraft:block/monitor_normal_ru", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=ru": { "model": "computercraft:block/monitor_normal_ru", "y": 90, "x": 90 }, + "facing=north,orientation=down,state=lru": { "model": "computercraft:block/monitor_normal_lru", "x": 90 }, + "facing=south,orientation=down,state=lru": { + "model": "computercraft:block/monitor_normal_lru", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=lru": { + "model": "computercraft:block/monitor_normal_lru", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=lru": { + "model": "computercraft:block/monitor_normal_lru", "y": 90, "x": 90 + }, + "facing=north,orientation=down,state=lu": { "model": "computercraft:block/monitor_normal_lu", "x": 90 }, + "facing=south,orientation=down,state=lu": { + "model": "computercraft:block/monitor_normal_lu", "y": 180, "x": 90 + }, + "facing=west,orientation=down,state=lu": { + "model": "computercraft:block/monitor_normal_lu", "y": 270, "x": 90 + }, + "facing=east,orientation=down,state=lu": { "model": "computercraft:block/monitor_normal_lu", "y": 90, "x": 90 } + } +} diff --git a/src/main/resources/assets/computercraft/blockstates/peripheral.json b/src/main/resources/assets/computercraft/blockstates/peripheral.json deleted file mode 100644 index 506ad4f46..000000000 --- a/src/main/resources/assets/computercraft/blockstates/peripheral.json +++ /dev/null @@ -1,455 +0,0 @@ -{ - "variants": { - "facing=north,variant=disk_drive_empty": { "model": "computercraft:disk_drive_empty" }, - "facing=south,variant=disk_drive_empty": { "model": "computercraft:disk_drive_empty", "y": 180 }, - "facing=west,variant=disk_drive_empty": { "model": "computercraft:disk_drive_empty", "y": 270 }, - "facing=east,variant=disk_drive_empty": { "model": "computercraft:disk_drive_empty", "y": 90 }, - "facing=north,variant=disk_drive_full": { "model": "computercraft:disk_drive_full" }, - "facing=south,variant=disk_drive_full": { "model": "computercraft:disk_drive_full", "y": 180 }, - "facing=west,variant=disk_drive_full": { "model": "computercraft:disk_drive_full", "y": 270 }, - "facing=east,variant=disk_drive_full": { "model": "computercraft:disk_drive_full", "y": 90 }, - "facing=north,variant=disk_drive_invalid": { "model": "computercraft:disk_drive_invalid" }, - "facing=south,variant=disk_drive_invalid": { "model": "computercraft:disk_drive_invalid", "y": 180 }, - "facing=west,variant=disk_drive_invalid": { "model": "computercraft:disk_drive_invalid", "y": 270 }, - "facing=east,variant=disk_drive_invalid": { "model": "computercraft:disk_drive_invalid", "y": 90 }, - - "facing=north,variant=speaker": { "model": "computercraft:speaker" }, - "facing=south,variant=speaker": { "model": "computercraft:speaker", "y": 180 }, - "facing=west,variant=speaker": { "model": "computercraft:speaker", "y": 270 }, - "facing=east,variant=speaker": { "model": "computercraft:speaker", "y": 90 }, - - "facing=north,variant=printer_empty": { "model": "computercraft:printer_empty" }, - "facing=south,variant=printer_empty": { "model": "computercraft:printer_empty", "y": 180 }, - "facing=west,variant=printer_empty": { "model": "computercraft:printer_empty", "y": 270 }, - "facing=east,variant=printer_empty": { "model": "computercraft:printer_empty", "y": 90 }, - "facing=north,variant=printer_top_full": { "model": "computercraft:printer_top_full" }, - "facing=south,variant=printer_top_full": { "model": "computercraft:printer_top_full", "y": 180 }, - "facing=west,variant=printer_top_full": { "model": "computercraft:printer_top_full", "y": 270 }, - "facing=east,variant=printer_top_full": { "model": "computercraft:printer_top_full", "y": 90 }, - "facing=north,variant=printer_bottom_full": { "model": "computercraft:printer_bottom_full" }, - "facing=south,variant=printer_bottom_full": { "model": "computercraft:printer_bottom_full", "y": 180 }, - "facing=west,variant=printer_bottom_full": { "model": "computercraft:printer_bottom_full", "y": 270 }, - "facing=east,variant=printer_bottom_full": { "model": "computercraft:printer_bottom_full", "y": 90 }, - "facing=north,variant=printer_both_full": { "model": "computercraft:printer_both_full" }, - "facing=south,variant=printer_both_full": { "model": "computercraft:printer_both_full", "y": 180 }, - "facing=west,variant=printer_both_full": { "model": "computercraft:printer_both_full", "y": 270 }, - "facing=east,variant=printer_both_full": { "model": "computercraft:printer_both_full", "y": 90 }, - - "facing=north,variant=wireless_modem_off": { "model": "computercraft:wireless_modem_off" }, - "facing=south,variant=wireless_modem_off": { "model": "computercraft:wireless_modem_off", "y": 180 }, - "facing=west,variant=wireless_modem_off": { "model": "computercraft:wireless_modem_off", "y": 270 }, - "facing=east,variant=wireless_modem_off": { "model": "computercraft:wireless_modem_off", "y": 90 }, - "facing=north,variant=wireless_modem_on": { "model": "computercraft:wireless_modem_on" }, - "facing=south,variant=wireless_modem_on": { "model": "computercraft:wireless_modem_on", "y": 180 }, - "facing=west,variant=wireless_modem_on": { "model": "computercraft:wireless_modem_on", "y": 270 }, - "facing=east,variant=wireless_modem_on": { "model": "computercraft:wireless_modem_on", "y": 90 }, - - "facing=north,variant=wireless_modem_up_off": { "model": "computercraft:wireless_modem_off", "x": 270 }, - "facing=south,variant=wireless_modem_up_off": { "model": "computercraft:wireless_modem_off", "x": 270 }, - "facing=west,variant=wireless_modem_up_off": { "model": "computercraft:wireless_modem_off", "x": 270 }, - "facing=east,variant=wireless_modem_up_off": { "model": "computercraft:wireless_modem_off", "x": 270 }, - "facing=north,variant=wireless_modem_up_on": { "model": "computercraft:wireless_modem_on", "x": 270 }, - "facing=south,variant=wireless_modem_up_on": { "model": "computercraft:wireless_modem_on", "x": 270 }, - "facing=west,variant=wireless_modem_up_on": { "model": "computercraft:wireless_modem_on", "x": 270 }, - "facing=east,variant=wireless_modem_up_on": { "model": "computercraft:wireless_modem_on", "x": 270 }, - - "facing=north,variant=wireless_modem_down_off": { "model": "computercraft:wireless_modem_off", "x": 90 }, - "facing=south,variant=wireless_modem_down_off": { "model": "computercraft:wireless_modem_off", "x": 90 }, - "facing=west,variant=wireless_modem_down_off": { "model": "computercraft:wireless_modem_off", "x": 90 }, - "facing=east,variant=wireless_modem_down_off": { "model": "computercraft:wireless_modem_off", "x": 90 }, - "facing=north,variant=wireless_modem_down_on": { "model": "computercraft:wireless_modem_on", "x": 90 }, - "facing=south,variant=wireless_modem_down_on": { "model": "computercraft:wireless_modem_on", "x": 90 }, - "facing=west,variant=wireless_modem_down_on": { "model": "computercraft:wireless_modem_on", "x": 90 }, - "facing=east,variant=wireless_modem_down_on": { "model": "computercraft:wireless_modem_on", "x": 90 }, - - "facing=north,variant=monitor": { "model": "computercraft:monitor" }, - "facing=south,variant=monitor": { "model": "computercraft:monitor", "y": 180 }, - "facing=west,variant=monitor": { "model": "computercraft:monitor", "y": 270 }, - "facing=east,variant=monitor": { "model": "computercraft:monitor", "y": 90 }, - "facing=north,variant=monitor_r": { "model": "computercraft:monitor_r" }, - "facing=south,variant=monitor_r": { "model": "computercraft:monitor_r", "y": 180 }, - "facing=west,variant=monitor_r": { "model": "computercraft:monitor_r", "y": 270 }, - "facing=east,variant=monitor_r": { "model": "computercraft:monitor_r", "y": 90 }, - "facing=north,variant=monitor_lr": { "model": "computercraft:monitor_lr" }, - "facing=south,variant=monitor_lr": { "model": "computercraft:monitor_lr", "y": 180 }, - "facing=west,variant=monitor_lr": { "model": "computercraft:monitor_lr", "y": 270 }, - "facing=east,variant=monitor_lr": { "model": "computercraft:monitor_lr", "y": 90 }, - "facing=north,variant=monitor_l": { "model": "computercraft:monitor_l" }, - "facing=south,variant=monitor_l": { "model": "computercraft:monitor_l", "y": 180 }, - "facing=west,variant=monitor_l": { "model": "computercraft:monitor_l", "y": 270 }, - "facing=east,variant=monitor_l": { "model": "computercraft:monitor_l", "y": 90 }, - "facing=north,variant=monitor_d": { "model": "computercraft:monitor_d" }, - "facing=south,variant=monitor_d": { "model": "computercraft:monitor_d", "y": 180 }, - "facing=west,variant=monitor_d": { "model": "computercraft:monitor_d", "y": 270 }, - "facing=east,variant=monitor_d": { "model": "computercraft:monitor_d", "y": 90 }, - "facing=north,variant=monitor_ud": { "model": "computercraft:monitor_ud" }, - "facing=south,variant=monitor_ud": { "model": "computercraft:monitor_ud", "y": 180 }, - "facing=west,variant=monitor_ud": { "model": "computercraft:monitor_ud", "y": 270 }, - "facing=east,variant=monitor_ud": { "model": "computercraft:monitor_ud", "y": 90 }, - "facing=north,variant=monitor_u": { "model": "computercraft:monitor_u" }, - "facing=south,variant=monitor_u": { "model": "computercraft:monitor_u", "y": 180 }, - "facing=west,variant=monitor_u": { "model": "computercraft:monitor_u", "y": 270 }, - "facing=east,variant=monitor_u": { "model": "computercraft:monitor_u", "y": 90 }, - "facing=north,variant=monitor_rd": { "model": "computercraft:monitor_rd" }, - "facing=south,variant=monitor_rd": { "model": "computercraft:monitor_rd", "y": 180 }, - "facing=west,variant=monitor_rd": { "model": "computercraft:monitor_rd", "y": 270 }, - "facing=east,variant=monitor_rd": { "model": "computercraft:monitor_rd", "y": 90 }, - "facing=north,variant=monitor_lrd": { "model": "computercraft:monitor_lrd" }, - "facing=south,variant=monitor_lrd": { "model": "computercraft:monitor_lrd", "y": 180 }, - "facing=west,variant=monitor_lrd": { "model": "computercraft:monitor_lrd", "y": 270 }, - "facing=east,variant=monitor_lrd": { "model": "computercraft:monitor_lrd", "y": 90 }, - "facing=north,variant=monitor_ld": { "model": "computercraft:monitor_ld" }, - "facing=south,variant=monitor_ld": { "model": "computercraft:monitor_ld", "y": 180 }, - "facing=west,variant=monitor_ld": { "model": "computercraft:monitor_ld", "y": 270 }, - "facing=east,variant=monitor_ld": { "model": "computercraft:monitor_ld", "y": 90 }, - "facing=north,variant=monitor_rud": { "model": "computercraft:monitor_rud" }, - "facing=south,variant=monitor_rud": { "model": "computercraft:monitor_rud", "y": 180 }, - "facing=west,variant=monitor_rud": { "model": "computercraft:monitor_rud", "y": 270 }, - "facing=east,variant=monitor_rud": { "model": "computercraft:monitor_rud", "y": 90 }, - "facing=north,variant=monitor_lrud": { "model": "computercraft:monitor_lrud" }, - "facing=south,variant=monitor_lrud": { "model": "computercraft:monitor_lrud", "y": 180 }, - "facing=west,variant=monitor_lrud": { "model": "computercraft:monitor_lrud", "y": 270 }, - "facing=east,variant=monitor_lrud": { "model": "computercraft:monitor_lrud", "y": 90 }, - "facing=north,variant=monitor_lud": { "model": "computercraft:monitor_lud" }, - "facing=south,variant=monitor_lud": { "model": "computercraft:monitor_lud", "y": 180 }, - "facing=west,variant=monitor_lud": { "model": "computercraft:monitor_lud", "y": 270 }, - "facing=east,variant=monitor_lud": { "model": "computercraft:monitor_lud", "y": 90 }, - "facing=north,variant=monitor_ru": { "model": "computercraft:monitor_ru" }, - "facing=south,variant=monitor_ru": { "model": "computercraft:monitor_ru", "y": 180 }, - "facing=west,variant=monitor_ru": { "model": "computercraft:monitor_ru", "y": 270 }, - "facing=east,variant=monitor_ru": { "model": "computercraft:monitor_ru", "y": 90 }, - "facing=north,variant=monitor_lru": { "model": "computercraft:monitor_lru" }, - "facing=south,variant=monitor_lru": { "model": "computercraft:monitor_lru", "y": 180 }, - "facing=west,variant=monitor_lru": { "model": "computercraft:monitor_lru", "y": 270 }, - "facing=east,variant=monitor_lru": { "model": "computercraft:monitor_lru", "y": 90 }, - "facing=north,variant=monitor_lu": { "model": "computercraft:monitor_lu" }, - "facing=south,variant=monitor_lu": { "model": "computercraft:monitor_lu", "y": 180 }, - "facing=west,variant=monitor_lu": { "model": "computercraft:monitor_lu", "y": 270 }, - "facing=east,variant=monitor_lu": { "model": "computercraft:monitor_lu", "y": 90 }, - - "facing=north,variant=monitor_up": { "model": "computercraft:monitor", "x": 270 }, - "facing=south,variant=monitor_up": { "model": "computercraft:monitor", "y": 180, "x": 270 }, - "facing=west,variant=monitor_up": { "model": "computercraft:monitor", "y": 270, "x": 270 }, - "facing=east,variant=monitor_up": { "model": "computercraft:monitor", "y": 90, "x": 270 }, - "facing=north,variant=monitor_up_r": { "model": "computercraft:monitor_r", "x": 270 }, - "facing=south,variant=monitor_up_r": { "model": "computercraft:monitor_r", "y": 180, "x": 270 }, - "facing=west,variant=monitor_up_r": { "model": "computercraft:monitor_r", "y": 270, "x": 270 }, - "facing=east,variant=monitor_up_r": { "model": "computercraft:monitor_r", "y": 90, "x": 270 }, - "facing=north,variant=monitor_up_lr": { "model": "computercraft:monitor_lr", "x": 270 }, - "facing=south,variant=monitor_up_lr": { "model": "computercraft:monitor_lr", "y": 180, "x": 270 }, - "facing=west,variant=monitor_up_lr": { "model": "computercraft:monitor_lr", "y": 270, "x": 270 }, - "facing=east,variant=monitor_up_lr": { "model": "computercraft:monitor_lr", "y": 90, "x": 270 }, - "facing=north,variant=monitor_up_l": { "model": "computercraft:monitor_l", "x": 270 }, - "facing=south,variant=monitor_up_l": { "model": "computercraft:monitor_l", "y": 180, "x": 270 }, - "facing=west,variant=monitor_up_l": { "model": "computercraft:monitor_l", "y": 270, "x": 270 }, - "facing=east,variant=monitor_up_l": { "model": "computercraft:monitor_l", "y": 90, "x": 270 }, - "facing=north,variant=monitor_up_d": { "model": "computercraft:monitor_d", "x": 270 }, - "facing=south,variant=monitor_up_d": { "model": "computercraft:monitor_d", "y": 180, "x": 270 }, - "facing=west,variant=monitor_up_d": { "model": "computercraft:monitor_d", "y": 270, "x": 270 }, - "facing=east,variant=monitor_up_d": { "model": "computercraft:monitor_d", "y": 90, "x": 270 }, - "facing=north,variant=monitor_up_ud": { "model": "computercraft:monitor_ud", "x": 270 }, - "facing=south,variant=monitor_up_ud": { "model": "computercraft:monitor_ud", "y": 180, "x": 270 }, - "facing=west,variant=monitor_up_ud": { "model": "computercraft:monitor_ud", "y": 270, "x": 270 }, - "facing=east,variant=monitor_up_ud": { "model": "computercraft:monitor_ud", "y": 90, "x": 270 }, - "facing=north,variant=monitor_up_u": { "model": "computercraft:monitor_u", "x": 270 }, - "facing=south,variant=monitor_up_u": { "model": "computercraft:monitor_u", "y": 180, "x": 270 }, - "facing=west,variant=monitor_up_u": { "model": "computercraft:monitor_u", "y": 270, "x": 270 }, - "facing=east,variant=monitor_up_u": { "model": "computercraft:monitor_u", "y": 90, "x": 270 }, - "facing=north,variant=monitor_up_rd": { "model": "computercraft:monitor_rd", "x": 270 }, - "facing=south,variant=monitor_up_rd": { "model": "computercraft:monitor_rd", "y": 180, "x": 270 }, - "facing=west,variant=monitor_up_rd": { "model": "computercraft:monitor_rd", "y": 270, "x": 270 }, - "facing=east,variant=monitor_up_rd": { "model": "computercraft:monitor_rd", "y": 90, "x": 270 }, - "facing=north,variant=monitor_up_lrd": { "model": "computercraft:monitor_lrd", "x": 270 }, - "facing=south,variant=monitor_up_lrd": { "model": "computercraft:monitor_lrd", "y": 180, "x": 270 }, - "facing=west,variant=monitor_up_lrd": { "model": "computercraft:monitor_lrd", "y": 270, "x": 270 }, - "facing=east,variant=monitor_up_lrd": { "model": "computercraft:monitor_lrd", "y": 90, "x": 270 }, - "facing=north,variant=monitor_up_ld": { "model": "computercraft:monitor_ld", "x": 270 }, - "facing=south,variant=monitor_up_ld": { "model": "computercraft:monitor_ld", "y": 180, "x": 270 }, - "facing=west,variant=monitor_up_ld": { "model": "computercraft:monitor_ld", "y": 270, "x": 270 }, - "facing=east,variant=monitor_up_ld": { "model": "computercraft:monitor_ld", "y": 90, "x": 270 }, - "facing=north,variant=monitor_up_rud": { "model": "computercraft:monitor_rud", "x": 270 }, - "facing=south,variant=monitor_up_rud": { "model": "computercraft:monitor_rud", "y": 180, "x": 270 }, - "facing=west,variant=monitor_up_rud": { "model": "computercraft:monitor_rud", "y": 270, "x": 270 }, - "facing=east,variant=monitor_up_rud": { "model": "computercraft:monitor_rud", "y": 90, "x": 270 }, - "facing=north,variant=monitor_up_lrud": { "model": "computercraft:monitor_lrud", "x": 270 }, - "facing=south,variant=monitor_up_lrud": { "model": "computercraft:monitor_lrud", "y": 180, "x": 270 }, - "facing=west,variant=monitor_up_lrud": { "model": "computercraft:monitor_lrud", "y": 270, "x": 270 }, - "facing=east,variant=monitor_up_lrud": { "model": "computercraft:monitor_lrud", "y": 90, "x": 270 }, - "facing=north,variant=monitor_up_lud": { "model": "computercraft:monitor_lud", "x": 270 }, - "facing=south,variant=monitor_up_lud": { "model": "computercraft:monitor_lud", "y": 180, "x": 270 }, - "facing=west,variant=monitor_up_lud": { "model": "computercraft:monitor_lud", "y": 270, "x": 270 }, - "facing=east,variant=monitor_up_lud": { "model": "computercraft:monitor_lud", "y": 90, "x": 270 }, - "facing=north,variant=monitor_up_ru": { "model": "computercraft:monitor_ru", "x": 270 }, - "facing=south,variant=monitor_up_ru": { "model": "computercraft:monitor_ru", "y": 180, "x": 270 }, - "facing=west,variant=monitor_up_ru": { "model": "computercraft:monitor_ru", "y": 270, "x": 270 }, - "facing=east,variant=monitor_up_ru": { "model": "computercraft:monitor_ru", "y": 90, "x": 270 }, - "facing=north,variant=monitor_up_lru": { "model": "computercraft:monitor_lru", "x": 270 }, - "facing=south,variant=monitor_up_lru": { "model": "computercraft:monitor_lru", "y": 180, "x": 270 }, - "facing=west,variant=monitor_up_lru": { "model": "computercraft:monitor_lru", "y": 270, "x": 270 }, - "facing=east,variant=monitor_up_lru": { "model": "computercraft:monitor_lru", "y": 90, "x": 270 }, - "facing=north,variant=monitor_up_lu": { "model": "computercraft:monitor_lu", "x": 270 }, - "facing=south,variant=monitor_up_lu": { "model": "computercraft:monitor_lu", "y": 180, "x": 270 }, - "facing=west,variant=monitor_up_lu": { "model": "computercraft:monitor_lu", "y": 270, "x": 270 }, - "facing=east,variant=monitor_up_lu": { "model": "computercraft:monitor_lu", "y": 90, "x": 270 }, - - "facing=north,variant=monitor_down": { "model": "computercraft:monitor", "x": 90 }, - "facing=south,variant=monitor_down": { "model": "computercraft:monitor", "y": 180, "x": 90 }, - "facing=west,variant=monitor_down": { "model": "computercraft:monitor", "y": 270, "x": 90 }, - "facing=east,variant=monitor_down": { "model": "computercraft:monitor", "y": 90, "x": 90 }, - "facing=north,variant=monitor_down_r": { "model": "computercraft:monitor_r", "x": 90 }, - "facing=south,variant=monitor_down_r": { "model": "computercraft:monitor_r", "y": 180, "x": 90 }, - "facing=west,variant=monitor_down_r": { "model": "computercraft:monitor_r", "y": 270, "x": 90 }, - "facing=east,variant=monitor_down_r": { "model": "computercraft:monitor_r", "y": 90, "x": 90 }, - "facing=north,variant=monitor_down_lr": { "model": "computercraft:monitor_lr", "x": 90 }, - "facing=south,variant=monitor_down_lr": { "model": "computercraft:monitor_lr", "y": 180, "x": 90 }, - "facing=west,variant=monitor_down_lr": { "model": "computercraft:monitor_lr", "y": 270, "x": 90 }, - "facing=east,variant=monitor_down_lr": { "model": "computercraft:monitor_lr", "y": 90, "x": 90 }, - "facing=north,variant=monitor_down_l": { "model": "computercraft:monitor_l", "x": 90 }, - "facing=south,variant=monitor_down_l": { "model": "computercraft:monitor_l", "y": 180, "x": 90 }, - "facing=west,variant=monitor_down_l": { "model": "computercraft:monitor_l", "y": 270, "x": 90 }, - "facing=east,variant=monitor_down_l": { "model": "computercraft:monitor_l", "y": 90, "x": 90 }, - "facing=north,variant=monitor_down_d": { "model": "computercraft:monitor_d", "x": 90 }, - "facing=south,variant=monitor_down_d": { "model": "computercraft:monitor_d", "y": 180, "x": 90 }, - "facing=west,variant=monitor_down_d": { "model": "computercraft:monitor_d", "y": 270, "x": 90 }, - "facing=east,variant=monitor_down_d": { "model": "computercraft:monitor_d", "y": 90, "x": 90 }, - "facing=north,variant=monitor_down_ud": { "model": "computercraft:monitor_ud", "x": 90 }, - "facing=south,variant=monitor_down_ud": { "model": "computercraft:monitor_ud", "y": 180, "x": 90 }, - "facing=west,variant=monitor_down_ud": { "model": "computercraft:monitor_ud", "y": 270, "x": 90 }, - "facing=east,variant=monitor_down_ud": { "model": "computercraft:monitor_ud", "y": 90, "x": 90 }, - "facing=north,variant=monitor_down_u": { "model": "computercraft:monitor_u", "x": 90 }, - "facing=south,variant=monitor_down_u": { "model": "computercraft:monitor_u", "y": 180, "x": 90 }, - "facing=west,variant=monitor_down_u": { "model": "computercraft:monitor_u", "y": 270, "x": 90 }, - "facing=east,variant=monitor_down_u": { "model": "computercraft:monitor_u", "y": 90, "x": 90 }, - "facing=north,variant=monitor_down_rd": { "model": "computercraft:monitor_rd", "x": 90 }, - "facing=south,variant=monitor_down_rd": { "model": "computercraft:monitor_rd", "y": 180, "x": 90 }, - "facing=west,variant=monitor_down_rd": { "model": "computercraft:monitor_rd", "y": 270, "x": 90 }, - "facing=east,variant=monitor_down_rd": { "model": "computercraft:monitor_rd", "y": 90, "x": 90 }, - "facing=north,variant=monitor_down_lrd": { "model": "computercraft:monitor_lrd", "x": 90 }, - "facing=south,variant=monitor_down_lrd": { "model": "computercraft:monitor_lrd", "y": 180, "x": 90 }, - "facing=west,variant=monitor_down_lrd": { "model": "computercraft:monitor_lrd", "y": 270, "x": 90 }, - "facing=east,variant=monitor_down_lrd": { "model": "computercraft:monitor_lrd", "y": 90, "x": 90 }, - "facing=north,variant=monitor_down_ld": { "model": "computercraft:monitor_ld", "x": 90 }, - "facing=south,variant=monitor_down_ld": { "model": "computercraft:monitor_ld", "y": 180, "x": 90 }, - "facing=west,variant=monitor_down_ld": { "model": "computercraft:monitor_ld", "y": 270, "x": 90 }, - "facing=east,variant=monitor_down_ld": { "model": "computercraft:monitor_ld", "y": 90, "x": 90 }, - "facing=north,variant=monitor_down_rud": { "model": "computercraft:monitor_rud", "x": 90 }, - "facing=south,variant=monitor_down_rud": { "model": "computercraft:monitor_rud", "y": 180, "x": 90 }, - "facing=west,variant=monitor_down_rud": { "model": "computercraft:monitor_rud", "y": 270, "x": 90 }, - "facing=east,variant=monitor_down_rud": { "model": "computercraft:monitor_rud", "y": 90, "x": 90 }, - "facing=north,variant=monitor_down_lrud": { "model": "computercraft:monitor_lrud", "x": 90 }, - "facing=south,variant=monitor_down_lrud": { "model": "computercraft:monitor_lrud", "y": 180, "x": 90 }, - "facing=west,variant=monitor_down_lrud": { "model": "computercraft:monitor_lrud", "y": 270, "x": 90 }, - "facing=east,variant=monitor_down_lrud": { "model": "computercraft:monitor_lrud", "y": 90, "x": 90 }, - "facing=north,variant=monitor_down_lud": { "model": "computercraft:monitor_lud", "x": 90 }, - "facing=south,variant=monitor_down_lud": { "model": "computercraft:monitor_lud", "y": 180, "x": 90 }, - "facing=west,variant=monitor_down_lud": { "model": "computercraft:monitor_lud", "y": 270, "x": 90 }, - "facing=east,variant=monitor_down_lud": { "model": "computercraft:monitor_lud", "y": 90, "x": 90 }, - "facing=north,variant=monitor_down_ru": { "model": "computercraft:monitor_ru", "x": 90 }, - "facing=south,variant=monitor_down_ru": { "model": "computercraft:monitor_ru", "y": 180, "x": 90 }, - "facing=west,variant=monitor_down_ru": { "model": "computercraft:monitor_ru", "y": 270, "x": 90 }, - "facing=east,variant=monitor_down_ru": { "model": "computercraft:monitor_ru", "y": 90, "x": 90 }, - "facing=north,variant=monitor_down_lru": { "model": "computercraft:monitor_lru", "x": 90 }, - "facing=south,variant=monitor_down_lru": { "model": "computercraft:monitor_lru", "y": 180, "x": 90 }, - "facing=west,variant=monitor_down_lru": { "model": "computercraft:monitor_lru", "y": 270, "x": 90 }, - "facing=east,variant=monitor_down_lru": { "model": "computercraft:monitor_lru", "y": 90, "x": 90 }, - "facing=north,variant=monitor_down_lu": { "model": "computercraft:monitor_lu", "x": 90 }, - "facing=south,variant=monitor_down_lu": { "model": "computercraft:monitor_lu", "y": 180, "x": 90 }, - "facing=west,variant=monitor_down_lu": { "model": "computercraft:monitor_lu", "y": 270, "x": 90 }, - "facing=east,variant=monitor_down_lu": { "model": "computercraft:monitor_lu", "y": 90, "x": 90 }, - - "facing=north,variant=advanced_monitor": { "model": "computercraft:advanced_monitor" }, - "facing=south,variant=advanced_monitor": { "model": "computercraft:advanced_monitor", "y": 180 }, - "facing=west,variant=advanced_monitor": { "model": "computercraft:advanced_monitor", "y": 270 }, - "facing=east,variant=advanced_monitor": { "model": "computercraft:advanced_monitor", "y": 90 }, - "facing=north,variant=advanced_monitor_r": { "model": "computercraft:advanced_monitor_r" }, - "facing=south,variant=advanced_monitor_r": { "model": "computercraft:advanced_monitor_r", "y": 180 }, - "facing=west,variant=advanced_monitor_r": { "model": "computercraft:advanced_monitor_r", "y": 270 }, - "facing=east,variant=advanced_monitor_r": { "model": "computercraft:advanced_monitor_r", "y": 90 }, - "facing=north,variant=advanced_monitor_lr": { "model": "computercraft:advanced_monitor_lr" }, - "facing=south,variant=advanced_monitor_lr": { "model": "computercraft:advanced_monitor_lr", "y": 180 }, - "facing=west,variant=advanced_monitor_lr": { "model": "computercraft:advanced_monitor_lr", "y": 270 }, - "facing=east,variant=advanced_monitor_lr": { "model": "computercraft:advanced_monitor_lr", "y": 90 }, - "facing=north,variant=advanced_monitor_l": { "model": "computercraft:advanced_monitor_l" }, - "facing=south,variant=advanced_monitor_l": { "model": "computercraft:advanced_monitor_l", "y": 180 }, - "facing=west,variant=advanced_monitor_l": { "model": "computercraft:advanced_monitor_l", "y": 270 }, - "facing=east,variant=advanced_monitor_l": { "model": "computercraft:advanced_monitor_l", "y": 90 }, - "facing=north,variant=advanced_monitor_d": { "model": "computercraft:advanced_monitor_d" }, - "facing=south,variant=advanced_monitor_d": { "model": "computercraft:advanced_monitor_d", "y": 180 }, - "facing=west,variant=advanced_monitor_d": { "model": "computercraft:advanced_monitor_d", "y": 270 }, - "facing=east,variant=advanced_monitor_d": { "model": "computercraft:advanced_monitor_d", "y": 90 }, - "facing=north,variant=advanced_monitor_ud": { "model": "computercraft:advanced_monitor_ud" }, - "facing=south,variant=advanced_monitor_ud": { "model": "computercraft:advanced_monitor_ud", "y": 180 }, - "facing=west,variant=advanced_monitor_ud": { "model": "computercraft:advanced_monitor_ud", "y": 270 }, - "facing=east,variant=advanced_monitor_ud": { "model": "computercraft:advanced_monitor_ud", "y": 90 }, - "facing=north,variant=advanced_monitor_u": { "model": "computercraft:advanced_monitor_u" }, - "facing=south,variant=advanced_monitor_u": { "model": "computercraft:advanced_monitor_u", "y": 180 }, - "facing=west,variant=advanced_monitor_u": { "model": "computercraft:advanced_monitor_u", "y": 270 }, - "facing=east,variant=advanced_monitor_u": { "model": "computercraft:advanced_monitor_u", "y": 90 }, - "facing=north,variant=advanced_monitor_rd": { "model": "computercraft:advanced_monitor_rd" }, - "facing=south,variant=advanced_monitor_rd": { "model": "computercraft:advanced_monitor_rd", "y": 180 }, - "facing=west,variant=advanced_monitor_rd": { "model": "computercraft:advanced_monitor_rd", "y": 270 }, - "facing=east,variant=advanced_monitor_rd": { "model": "computercraft:advanced_monitor_rd", "y": 90 }, - "facing=north,variant=advanced_monitor_lrd": { "model": "computercraft:advanced_monitor_lrd" }, - "facing=south,variant=advanced_monitor_lrd": { "model": "computercraft:advanced_monitor_lrd", "y": 180 }, - "facing=west,variant=advanced_monitor_lrd": { "model": "computercraft:advanced_monitor_lrd", "y": 270 }, - "facing=east,variant=advanced_monitor_lrd": { "model": "computercraft:advanced_monitor_lrd", "y": 90 }, - "facing=north,variant=advanced_monitor_ld": { "model": "computercraft:advanced_monitor_ld" }, - "facing=south,variant=advanced_monitor_ld": { "model": "computercraft:advanced_monitor_ld", "y": 180 }, - "facing=west,variant=advanced_monitor_ld": { "model": "computercraft:advanced_monitor_ld", "y": 270 }, - "facing=east,variant=advanced_monitor_ld": { "model": "computercraft:advanced_monitor_ld", "y": 90 }, - "facing=north,variant=advanced_monitor_rud": { "model": "computercraft:advanced_monitor_rud" }, - "facing=south,variant=advanced_monitor_rud": { "model": "computercraft:advanced_monitor_rud", "y": 180 }, - "facing=west,variant=advanced_monitor_rud": { "model": "computercraft:advanced_monitor_rud", "y": 270 }, - "facing=east,variant=advanced_monitor_rud": { "model": "computercraft:advanced_monitor_rud", "y": 90 }, - "facing=north,variant=advanced_monitor_lrud": { "model": "computercraft:advanced_monitor_lrud" }, - "facing=south,variant=advanced_monitor_lrud": { "model": "computercraft:advanced_monitor_lrud", "y": 180 }, - "facing=west,variant=advanced_monitor_lrud": { "model": "computercraft:advanced_monitor_lrud", "y": 270 }, - "facing=east,variant=advanced_monitor_lrud": { "model": "computercraft:advanced_monitor_lrud", "y": 90 }, - "facing=north,variant=advanced_monitor_lud": { "model": "computercraft:advanced_monitor_lud" }, - "facing=south,variant=advanced_monitor_lud": { "model": "computercraft:advanced_monitor_lud", "y": 180 }, - "facing=west,variant=advanced_monitor_lud": { "model": "computercraft:advanced_monitor_lud", "y": 270 }, - "facing=east,variant=advanced_monitor_lud": { "model": "computercraft:advanced_monitor_lud", "y": 90 }, - "facing=north,variant=advanced_monitor_ru": { "model": "computercraft:advanced_monitor_ru" }, - "facing=south,variant=advanced_monitor_ru": { "model": "computercraft:advanced_monitor_ru", "y": 180 }, - "facing=west,variant=advanced_monitor_ru": { "model": "computercraft:advanced_monitor_ru", "y": 270 }, - "facing=east,variant=advanced_monitor_ru": { "model": "computercraft:advanced_monitor_ru", "y": 90 }, - "facing=north,variant=advanced_monitor_lru": { "model": "computercraft:advanced_monitor_lru" }, - "facing=south,variant=advanced_monitor_lru": { "model": "computercraft:advanced_monitor_lru", "y": 180 }, - "facing=west,variant=advanced_monitor_lru": { "model": "computercraft:advanced_monitor_lru", "y": 270 }, - "facing=east,variant=advanced_monitor_lru": { "model": "computercraft:advanced_monitor_lru", "y": 90 }, - "facing=north,variant=advanced_monitor_lu": { "model": "computercraft:advanced_monitor_lu" }, - "facing=south,variant=advanced_monitor_lu": { "model": "computercraft:advanced_monitor_lu", "y": 180 }, - "facing=west,variant=advanced_monitor_lu": { "model": "computercraft:advanced_monitor_lu", "y": 270 }, - "facing=east,variant=advanced_monitor_lu": { "model": "computercraft:advanced_monitor_lu", "y": 90 }, - - "facing=north,variant=advanced_monitor_up": { "model": "computercraft:advanced_monitor", "x": 270 }, - "facing=south,variant=advanced_monitor_up": { "model": "computercraft:advanced_monitor", "y": 180, "x": 270 }, - "facing=west,variant=advanced_monitor_up": { "model": "computercraft:advanced_monitor", "y": 270, "x": 270 }, - "facing=east,variant=advanced_monitor_up": { "model": "computercraft:advanced_monitor", "y": 90, "x": 270 }, - "facing=north,variant=advanced_monitor_up_r": { "model": "computercraft:advanced_monitor_r", "x": 270 }, - "facing=south,variant=advanced_monitor_up_r": { "model": "computercraft:advanced_monitor_r", "y": 180, "x": 270 }, - "facing=west,variant=advanced_monitor_up_r": { "model": "computercraft:advanced_monitor_r", "y": 270, "x": 270 }, - "facing=east,variant=advanced_monitor_up_r": { "model": "computercraft:advanced_monitor_r", "y": 90, "x": 270 }, - "facing=north,variant=advanced_monitor_up_lr": { "model": "computercraft:advanced_monitor_lr", "x": 270 }, - "facing=south,variant=advanced_monitor_up_lr": { "model": "computercraft:advanced_monitor_lr", "y": 180, "x": 270 }, - "facing=west,variant=advanced_monitor_up_lr": { "model": "computercraft:advanced_monitor_lr", "y": 270, "x": 270 }, - "facing=east,variant=advanced_monitor_up_lr": { "model": "computercraft:advanced_monitor_lr", "y": 90, "x": 270 }, - "facing=north,variant=advanced_monitor_up_l": { "model": "computercraft:advanced_monitor_l", "x": 270 }, - "facing=south,variant=advanced_monitor_up_l": { "model": "computercraft:advanced_monitor_l", "y": 180, "x": 270 }, - "facing=west,variant=advanced_monitor_up_l": { "model": "computercraft:advanced_monitor_l", "y": 270, "x": 270 }, - "facing=east,variant=advanced_monitor_up_l": { "model": "computercraft:advanced_monitor_l", "y": 90, "x": 270 }, - "facing=north,variant=advanced_monitor_up_d": { "model": "computercraft:advanced_monitor_d", "x": 270 }, - "facing=south,variant=advanced_monitor_up_d": { "model": "computercraft:advanced_monitor_d", "y": 180, "x": 270 }, - "facing=west,variant=advanced_monitor_up_d": { "model": "computercraft:advanced_monitor_d", "y": 270, "x": 270 }, - "facing=east,variant=advanced_monitor_up_d": { "model": "computercraft:advanced_monitor_d", "y": 90, "x": 270 }, - "facing=north,variant=advanced_monitor_up_ud": { "model": "computercraft:advanced_monitor_ud", "x": 270 }, - "facing=south,variant=advanced_monitor_up_ud": { "model": "computercraft:advanced_monitor_ud", "y": 180, "x": 270 }, - "facing=west,variant=advanced_monitor_up_ud": { "model": "computercraft:advanced_monitor_ud", "y": 270, "x": 270 }, - "facing=east,variant=advanced_monitor_up_ud": { "model": "computercraft:advanced_monitor_ud", "y": 90, "x": 270 }, - "facing=north,variant=advanced_monitor_up_u": { "model": "computercraft:advanced_monitor_u", "x": 270 }, - "facing=south,variant=advanced_monitor_up_u": { "model": "computercraft:advanced_monitor_u", "y": 180, "x": 270 }, - "facing=west,variant=advanced_monitor_up_u": { "model": "computercraft:advanced_monitor_u", "y": 270, "x": 270 }, - "facing=east,variant=advanced_monitor_up_u": { "model": "computercraft:advanced_monitor_u", "y": 90, "x": 270 }, - "facing=north,variant=advanced_monitor_up_rd": { "model": "computercraft:advanced_monitor_rd", "x": 270 }, - "facing=south,variant=advanced_monitor_up_rd": { "model": "computercraft:advanced_monitor_rd", "y": 180, "x": 270 }, - "facing=west,variant=advanced_monitor_up_rd": { "model": "computercraft:advanced_monitor_rd", "y": 270, "x": 270 }, - "facing=east,variant=advanced_monitor_up_rd": { "model": "computercraft:advanced_monitor_rd", "y": 90, "x": 270 }, - "facing=north,variant=advanced_monitor_up_lrd": { "model": "computercraft:advanced_monitor_lrd", "x": 270 }, - "facing=south,variant=advanced_monitor_up_lrd": { "model": "computercraft:advanced_monitor_lrd", "y": 180, "x": 270 }, - "facing=west,variant=advanced_monitor_up_lrd": { "model": "computercraft:advanced_monitor_lrd", "y": 270, "x": 270 }, - "facing=east,variant=advanced_monitor_up_lrd": { "model": "computercraft:advanced_monitor_lrd", "y": 90, "x": 270 }, - "facing=north,variant=advanced_monitor_up_ld": { "model": "computercraft:advanced_monitor_ld", "x": 270 }, - "facing=south,variant=advanced_monitor_up_ld": { "model": "computercraft:advanced_monitor_ld", "y": 180, "x": 270 }, - "facing=west,variant=advanced_monitor_up_ld": { "model": "computercraft:advanced_monitor_ld", "y": 270, "x": 270 }, - "facing=east,variant=advanced_monitor_up_ld": { "model": "computercraft:advanced_monitor_ld", "y": 90, "x": 270 }, - "facing=north,variant=advanced_monitor_up_rud": { "model": "computercraft:advanced_monitor_rud", "x": 270 }, - "facing=south,variant=advanced_monitor_up_rud": { "model": "computercraft:advanced_monitor_rud", "y": 180, "x": 270 }, - "facing=west,variant=advanced_monitor_up_rud": { "model": "computercraft:advanced_monitor_rud", "y": 270, "x": 270 }, - "facing=east,variant=advanced_monitor_up_rud": { "model": "computercraft:advanced_monitor_rud", "y": 90, "x": 270 }, - "facing=north,variant=advanced_monitor_up_lrud": { "model": "computercraft:advanced_monitor_lrud", "x": 270 }, - "facing=south,variant=advanced_monitor_up_lrud": { "model": "computercraft:advanced_monitor_lrud", "y": 180, "x": 270 }, - "facing=west,variant=advanced_monitor_up_lrud": { "model": "computercraft:advanced_monitor_lrud", "y": 270, "x": 270 }, - "facing=east,variant=advanced_monitor_up_lrud": { "model": "computercraft:advanced_monitor_lrud", "y": 90, "x": 270 }, - "facing=north,variant=advanced_monitor_up_lud": { "model": "computercraft:advanced_monitor_lud", "x": 270 }, - "facing=south,variant=advanced_monitor_up_lud": { "model": "computercraft:advanced_monitor_lud", "y": 180, "x": 270 }, - "facing=west,variant=advanced_monitor_up_lud": { "model": "computercraft:advanced_monitor_lud", "y": 270, "x": 270 }, - "facing=east,variant=advanced_monitor_up_lud": { "model": "computercraft:advanced_monitor_lud", "y": 90, "x": 270 }, - "facing=north,variant=advanced_monitor_up_ru": { "model": "computercraft:advanced_monitor_ru", "x": 270 }, - "facing=south,variant=advanced_monitor_up_ru": { "model": "computercraft:advanced_monitor_ru", "y": 180, "x": 270 }, - "facing=west,variant=advanced_monitor_up_ru": { "model": "computercraft:advanced_monitor_ru", "y": 270, "x": 270 }, - "facing=east,variant=advanced_monitor_up_ru": { "model": "computercraft:advanced_monitor_ru", "y": 90, "x": 270 }, - "facing=north,variant=advanced_monitor_up_lru": { "model": "computercraft:advanced_monitor_lru", "x": 270 }, - "facing=south,variant=advanced_monitor_up_lru": { "model": "computercraft:advanced_monitor_lru", "y": 180, "x": 270 }, - "facing=west,variant=advanced_monitor_up_lru": { "model": "computercraft:advanced_monitor_lru", "y": 270, "x": 270 }, - "facing=east,variant=advanced_monitor_up_lru": { "model": "computercraft:advanced_monitor_lru", "y": 90, "x": 270 }, - "facing=north,variant=advanced_monitor_up_lu": { "model": "computercraft:advanced_monitor_lu", "x": 270 }, - "facing=south,variant=advanced_monitor_up_lu": { "model": "computercraft:advanced_monitor_lu", "y": 180, "x": 270 }, - "facing=west,variant=advanced_monitor_up_lu": { "model": "computercraft:advanced_monitor_lu", "y": 270, "x": 270 }, - "facing=east,variant=advanced_monitor_up_lu": { "model": "computercraft:advanced_monitor_lu", "y": 90, "x": 270 }, - - "facing=north,variant=advanced_monitor_down": { "model": "computercraft:advanced_monitor", "x": 90 }, - "facing=south,variant=advanced_monitor_down": { "model": "computercraft:advanced_monitor", "y": 180, "x": 90 }, - "facing=west,variant=advanced_monitor_down": { "model": "computercraft:advanced_monitor", "y": 270, "x": 90 }, - "facing=east,variant=advanced_monitor_down": { "model": "computercraft:advanced_monitor", "y": 90, "x": 90 }, - "facing=north,variant=advanced_monitor_down_r": { "model": "computercraft:advanced_monitor_r", "x": 90 }, - "facing=south,variant=advanced_monitor_down_r": { "model": "computercraft:advanced_monitor_r", "y": 180, "x": 90 }, - "facing=west,variant=advanced_monitor_down_r": { "model": "computercraft:advanced_monitor_r", "y": 270, "x": 90 }, - "facing=east,variant=advanced_monitor_down_r": { "model": "computercraft:advanced_monitor_r", "y": 90, "x": 90 }, - "facing=north,variant=advanced_monitor_down_lr": { "model": "computercraft:advanced_monitor_lr", "x": 90 }, - "facing=south,variant=advanced_monitor_down_lr": { "model": "computercraft:advanced_monitor_lr", "y": 180, "x": 90 }, - "facing=west,variant=advanced_monitor_down_lr": { "model": "computercraft:advanced_monitor_lr", "y": 270, "x": 90 }, - "facing=east,variant=advanced_monitor_down_lr": { "model": "computercraft:advanced_monitor_lr", "y": 90, "x": 90 }, - "facing=north,variant=advanced_monitor_down_l": { "model": "computercraft:advanced_monitor_l", "x": 90 }, - "facing=south,variant=advanced_monitor_down_l": { "model": "computercraft:advanced_monitor_l", "y": 180, "x": 90 }, - "facing=west,variant=advanced_monitor_down_l": { "model": "computercraft:advanced_monitor_l", "y": 270, "x": 90 }, - "facing=east,variant=advanced_monitor_down_l": { "model": "computercraft:advanced_monitor_l", "y": 90, "x": 90 }, - "facing=north,variant=advanced_monitor_down_d": { "model": "computercraft:advanced_monitor_d", "x": 90 }, - "facing=south,variant=advanced_monitor_down_d": { "model": "computercraft:advanced_monitor_d", "y": 180, "x": 90 }, - "facing=west,variant=advanced_monitor_down_d": { "model": "computercraft:advanced_monitor_d", "y": 270, "x": 90 }, - "facing=east,variant=advanced_monitor_down_d": { "model": "computercraft:advanced_monitor_d", "y": 90, "x": 90 }, - "facing=north,variant=advanced_monitor_down_ud": { "model": "computercraft:advanced_monitor_ud", "x": 90 }, - "facing=south,variant=advanced_monitor_down_ud": { "model": "computercraft:advanced_monitor_ud", "y": 180, "x": 90 }, - "facing=west,variant=advanced_monitor_down_ud": { "model": "computercraft:advanced_monitor_ud", "y": 270, "x": 90 }, - "facing=east,variant=advanced_monitor_down_ud": { "model": "computercraft:advanced_monitor_ud", "y": 90, "x": 90 }, - "facing=north,variant=advanced_monitor_down_u": { "model": "computercraft:advanced_monitor_u", "x": 90 }, - "facing=south,variant=advanced_monitor_down_u": { "model": "computercraft:advanced_monitor_u", "y": 180, "x": 90 }, - "facing=west,variant=advanced_monitor_down_u": { "model": "computercraft:advanced_monitor_u", "y": 270, "x": 90 }, - "facing=east,variant=advanced_monitor_down_u": { "model": "computercraft:advanced_monitor_u", "y": 90, "x": 90 }, - "facing=north,variant=advanced_monitor_down_rd": { "model": "computercraft:advanced_monitor_rd", "x": 90 }, - "facing=south,variant=advanced_monitor_down_rd": { "model": "computercraft:advanced_monitor_rd", "y": 180, "x": 90 }, - "facing=west,variant=advanced_monitor_down_rd": { "model": "computercraft:advanced_monitor_rd", "y": 270, "x": 90 }, - "facing=east,variant=advanced_monitor_down_rd": { "model": "computercraft:advanced_monitor_rd", "y": 90, "x": 90 }, - "facing=north,variant=advanced_monitor_down_lrd": { "model": "computercraft:advanced_monitor_lrd", "x": 90 }, - "facing=south,variant=advanced_monitor_down_lrd": { "model": "computercraft:advanced_monitor_lrd", "y": 180, "x": 90 }, - "facing=west,variant=advanced_monitor_down_lrd": { "model": "computercraft:advanced_monitor_lrd", "y": 270, "x": 90 }, - "facing=east,variant=advanced_monitor_down_lrd": { "model": "computercraft:advanced_monitor_lrd", "y": 90, "x": 90 }, - "facing=north,variant=advanced_monitor_down_ld": { "model": "computercraft:advanced_monitor_ld", "x": 90 }, - "facing=south,variant=advanced_monitor_down_ld": { "model": "computercraft:advanced_monitor_ld", "y": 180, "x": 90 }, - "facing=west,variant=advanced_monitor_down_ld": { "model": "computercraft:advanced_monitor_ld", "y": 270, "x": 90 }, - "facing=east,variant=advanced_monitor_down_ld": { "model": "computercraft:advanced_monitor_ld", "y": 90, "x": 90 }, - "facing=north,variant=advanced_monitor_down_rud": { "model": "computercraft:advanced_monitor_rud", "x": 90 }, - "facing=south,variant=advanced_monitor_down_rud": { "model": "computercraft:advanced_monitor_rud", "y": 180, "x": 90 }, - "facing=west,variant=advanced_monitor_down_rud": { "model": "computercraft:advanced_monitor_rud", "y": 270, "x": 90 }, - "facing=east,variant=advanced_monitor_down_rud": { "model": "computercraft:advanced_monitor_rud", "y": 90, "x": 90 }, - "facing=north,variant=advanced_monitor_down_lrud": { "model": "computercraft:advanced_monitor_lrud", "x": 90 }, - "facing=south,variant=advanced_monitor_down_lrud": { "model": "computercraft:advanced_monitor_lrud", "y": 180, "x": 90 }, - "facing=west,variant=advanced_monitor_down_lrud": { "model": "computercraft:advanced_monitor_lrud", "y": 270, "x": 90 }, - "facing=east,variant=advanced_monitor_down_lrud": { "model": "computercraft:advanced_monitor_lrud", "y": 90, "x": 90 }, - "facing=north,variant=advanced_monitor_down_lud": { "model": "computercraft:advanced_monitor_lud", "x": 90 }, - "facing=south,variant=advanced_monitor_down_lud": { "model": "computercraft:advanced_monitor_lud", "y": 180, "x": 90 }, - "facing=west,variant=advanced_monitor_down_lud": { "model": "computercraft:advanced_monitor_lud", "y": 270, "x": 90 }, - "facing=east,variant=advanced_monitor_down_lud": { "model": "computercraft:advanced_monitor_lud", "y": 90, "x": 90 }, - "facing=north,variant=advanced_monitor_down_ru": { "model": "computercraft:advanced_monitor_ru", "x": 90 }, - "facing=south,variant=advanced_monitor_down_ru": { "model": "computercraft:advanced_monitor_ru", "y": 180, "x": 90 }, - "facing=west,variant=advanced_monitor_down_ru": { "model": "computercraft:advanced_monitor_ru", "y": 270, "x": 90 }, - "facing=east,variant=advanced_monitor_down_ru": { "model": "computercraft:advanced_monitor_ru", "y": 90, "x": 90 }, - "facing=north,variant=advanced_monitor_down_lru": { "model": "computercraft:advanced_monitor_lru", "x": 90 }, - "facing=south,variant=advanced_monitor_down_lru": { "model": "computercraft:advanced_monitor_lru", "y": 180, "x": 90 }, - "facing=west,variant=advanced_monitor_down_lru": { "model": "computercraft:advanced_monitor_lru", "y": 270, "x": 90 }, - "facing=east,variant=advanced_monitor_down_lru": { "model": "computercraft:advanced_monitor_lru", "y": 90, "x": 90 }, - "facing=north,variant=advanced_monitor_down_lu": { "model": "computercraft:advanced_monitor_lu", "x": 90 }, - "facing=south,variant=advanced_monitor_down_lu": { "model": "computercraft:advanced_monitor_lu", "y": 180, "x": 90 }, - "facing=west,variant=advanced_monitor_down_lu": { "model": "computercraft:advanced_monitor_lu", "y": 270, "x": 90 }, - "facing=east,variant=advanced_monitor_down_lu": { "model": "computercraft:advanced_monitor_lu", "y": 90, "x": 90 } - } -} diff --git a/src/main/resources/assets/computercraft/blockstates/printer.json b/src/main/resources/assets/computercraft/blockstates/printer.json new file mode 100644 index 000000000..b07cd1bbd --- /dev/null +++ b/src/main/resources/assets/computercraft/blockstates/printer.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=north,bottom=false,top=false": { "model": "computercraft:block/printer_empty" }, + "facing=south,bottom=false,top=false": { "model": "computercraft:block/printer_empty", "y": 180 }, + "facing=west,bottom=false,top=false": { "model": "computercraft:block/printer_empty", "y": 270 }, + "facing=east,bottom=false,top=false": { "model": "computercraft:block/printer_empty", "y": 90 }, + "facing=north,bottom=false,top=true": { "model": "computercraft:block/printer_top_full" }, + "facing=south,bottom=false,top=true": { "model": "computercraft:block/printer_top_full", "y": 180 }, + "facing=west,bottom=false,top=true": { "model": "computercraft:block/printer_top_full", "y": 270 }, + "facing=east,bottom=false,top=true": { "model": "computercraft:block/printer_top_full", "y": 90 }, + "facing=north,bottom=true,top=false": { "model": "computercraft:block/printer_bottom_full" }, + "facing=south,bottom=true,top=false": { "model": "computercraft:block/printer_bottom_full", "y": 180 }, + "facing=west,bottom=true,top=false": { "model": "computercraft:block/printer_bottom_full", "y": 270 }, + "facing=east,bottom=true,top=false": { "model": "computercraft:block/printer_bottom_full", "y": 90 }, + "facing=north,bottom=true,top=true": { "model": "computercraft:block/printer_both_full" }, + "facing=south,bottom=true,top=true": { "model": "computercraft:block/printer_both_full", "y": 180 }, + "facing=west,bottom=true,top=true": { "model": "computercraft:block/printer_both_full", "y": 270 }, + "facing=east,bottom=true,top=true": { "model": "computercraft:block/printer_both_full", "y": 90 } + } +} diff --git a/src/main/resources/assets/computercraft/blockstates/speaker.json b/src/main/resources/assets/computercraft/blockstates/speaker.json new file mode 100644 index 000000000..4b3935a54 --- /dev/null +++ b/src/main/resources/assets/computercraft/blockstates/speaker.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "computercraft:block/speaker" }, + "facing=south": { "model": "computercraft:block/speaker", "y": 180 }, + "facing=west": { "model": "computercraft:block/speaker", "y": 270 }, + "facing=east": { "model": "computercraft:block/speaker", "y": 90 } + } +} diff --git a/src/main/resources/assets/computercraft/blockstates/turtle.json b/src/main/resources/assets/computercraft/blockstates/turtle.json deleted file mode 100644 index 3eac3d2fb..000000000 --- a/src/main/resources/assets/computercraft/blockstates/turtle.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "computercraft:turtle" }, - "facing=south": { "model": "computercraft:turtle", "y": 180 }, - "facing=west": { "model": "computercraft:turtle", "y": 270 }, - "facing=east": { "model": "computercraft:turtle", "y": 90 } - } -} diff --git a/src/main/resources/assets/computercraft/blockstates/turtle_advanced.json b/src/main/resources/assets/computercraft/blockstates/turtle_advanced.json index 90e1ecb52..6d0f48560 100644 --- a/src/main/resources/assets/computercraft/blockstates/turtle_advanced.json +++ b/src/main/resources/assets/computercraft/blockstates/turtle_advanced.json @@ -1,8 +1,8 @@ { "variants": { - "facing=north": { "model": "computercraft:advanced_turtle" }, - "facing=south": { "model": "computercraft:advanced_turtle", "y": 180 }, - "facing=west": { "model": "computercraft:advanced_turtle", "y": 270 }, - "facing=east": { "model": "computercraft:advanced_turtle", "y": 90 } + "facing=north": { "model": "computercraft:block/turtle_advanced" }, + "facing=south": { "model": "computercraft:block/turtle_advanced", "y": 180 }, + "facing=west": { "model": "computercraft:block/turtle_advanced", "y": 270 }, + "facing=east": { "model": "computercraft:block/turtle_advanced", "y": 90 } } } diff --git a/src/main/resources/assets/computercraft/blockstates/turtle_expanded.json b/src/main/resources/assets/computercraft/blockstates/turtle_expanded.json deleted file mode 100644 index 3eac3d2fb..000000000 --- a/src/main/resources/assets/computercraft/blockstates/turtle_expanded.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "computercraft:turtle" }, - "facing=south": { "model": "computercraft:turtle", "y": 180 }, - "facing=west": { "model": "computercraft:turtle", "y": 270 }, - "facing=east": { "model": "computercraft:turtle", "y": 90 } - } -} diff --git a/src/main/resources/assets/computercraft/blockstates/turtle_normal.json b/src/main/resources/assets/computercraft/blockstates/turtle_normal.json new file mode 100644 index 000000000..1c85e13ae --- /dev/null +++ b/src/main/resources/assets/computercraft/blockstates/turtle_normal.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "computercraft:block/turtle_normal" }, + "facing=south": { "model": "computercraft:block/turtle_normal", "y": 180 }, + "facing=west": { "model": "computercraft:block/turtle_normal", "y": 270 }, + "facing=east": { "model": "computercraft:block/turtle_normal", "y": 90 } + } +} diff --git a/src/main/resources/assets/computercraft/blockstates/turtle_normal_expanded.json b/src/main/resources/assets/computercraft/blockstates/turtle_normal_expanded.json new file mode 100644 index 000000000..dfc53d067 --- /dev/null +++ b/src/main/resources/assets/computercraft/blockstates/turtle_normal_expanded.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "computercraft:turtle_normal" }, + "facing=south": { "model": "computercraft:turtle_normal", "y": 180 }, + "facing=west": { "model": "computercraft:turtle_normal", "y": 270 }, + "facing=east": { "model": "computercraft:turtle_normal", "y": 90 } + } +} diff --git a/src/main/resources/assets/computercraft/blockstates/wired_modem_full.json b/src/main/resources/assets/computercraft/blockstates/wired_modem_full.json index d2f6fb31c..2bd7372d2 100644 --- a/src/main/resources/assets/computercraft/blockstates/wired_modem_full.json +++ b/src/main/resources/assets/computercraft/blockstates/wired_modem_full.json @@ -1,9 +1,9 @@ { "variants": { - "modem=false,peripheral=false": { "model": "computercraft:wired_modem_full_off" }, - "modem=false,peripheral=true": { "model": "computercraft:wired_modem_full_off_peripheral" }, - "modem=true,peripheral=false": { "model": "computercraft:wired_modem_full_on" }, - "modem=true,peripheral=true": { "model": "computercraft:wired_modem_full_on_peripheral" } + "modem=false,peripheral=false": { "model": "computercraft:block/wired_modem_full_off" }, + "modem=false,peripheral=true": { "model": "computercraft:block/wired_modem_full_off_peripheral" }, + "modem=true,peripheral=false": { "model": "computercraft:block/wired_modem_full_on" }, + "modem=true,peripheral=true": { "model": "computercraft:block/wired_modem_full_on_peripheral" } } } diff --git a/src/main/resources/assets/computercraft/blockstates/wireless_modem_advanced.json b/src/main/resources/assets/computercraft/blockstates/wireless_modem_advanced.json new file mode 100644 index 000000000..375ca9646 --- /dev/null +++ b/src/main/resources/assets/computercraft/blockstates/wireless_modem_advanced.json @@ -0,0 +1,17 @@ +{ + "variants": { + "facing=up,on=false": { "model": "computercraft:block/wireless_modem_advanced_off", "x": 270 }, + "facing=down,on=false": { "model": "computercraft:block/wireless_modem_advanced_off", "x": 90 }, + "facing=north,on=false": { "model": "computercraft:block/wireless_modem_advanced_off" }, + "facing=south,on=false": { "model": "computercraft:block/wireless_modem_advanced_off", "y": 180 }, + "facing=west,on=false": { "model": "computercraft:block/wireless_modem_advanced_off", "y": 270 }, + "facing=east,on=false": { "model": "computercraft:block/wireless_modem_advanced_off", "y": 90 }, + + "facing=up,on=true": { "model": "computercraft:block/wireless_modem_advanced_on", "x": 270 }, + "facing=down,on=true": { "model": "computercraft:block/wireless_modem_advanced_on", "x": 90 }, + "facing=north,on=true": { "model": "computercraft:block/wireless_modem_advanced_on" }, + "facing=south,on=true": { "model": "computercraft:block/wireless_modem_advanced_on", "y": 180 }, + "facing=west,on=true": { "model": "computercraft:block/wireless_modem_advanced_on", "y": 270 }, + "facing=east,on=true": { "model": "computercraft:block/wireless_modem_advanced_on", "y": 90 } + } +} diff --git a/src/main/resources/assets/computercraft/blockstates/wireless_modem_normal.json b/src/main/resources/assets/computercraft/blockstates/wireless_modem_normal.json new file mode 100644 index 000000000..e39561423 --- /dev/null +++ b/src/main/resources/assets/computercraft/blockstates/wireless_modem_normal.json @@ -0,0 +1,17 @@ +{ + "variants": { + "facing=up,on=false": { "model": "computercraft:block/wireless_modem_normal_off", "x": 270 }, + "facing=down,on=false": { "model": "computercraft:block/wireless_modem_normal_off", "x": 90 }, + "facing=north,on=false": { "model": "computercraft:block/wireless_modem_normal_off" }, + "facing=south,on=false": { "model": "computercraft:block/wireless_modem_normal_off", "y": 180 }, + "facing=west,on=false": { "model": "computercraft:block/wireless_modem_normal_off", "y": 270 }, + "facing=east,on=false": { "model": "computercraft:block/wireless_modem_normal_off", "y": 90 }, + + "facing=up,on=true": { "model": "computercraft:block/wireless_modem_normal_on", "x": 270 }, + "facing=down,on=true": { "model": "computercraft:block/wireless_modem_normal_on", "x": 90 }, + "facing=north,on=true": { "model": "computercraft:block/wireless_modem_normal_on" }, + "facing=south,on=true": { "model": "computercraft:block/wireless_modem_normal_on", "y": 180 }, + "facing=west,on=true": { "model": "computercraft:block/wireless_modem_normal_on", "y": 270 }, + "facing=east,on=true": { "model": "computercraft:block/wireless_modem_normal_on", "y": 90 } + } +} diff --git a/src/main/resources/assets/computercraft/lang/de_de.json b/src/main/resources/assets/computercraft/lang/de_de.json new file mode 100644 index 000000000..329d6d17b --- /dev/null +++ b/src/main/resources/assets/computercraft/lang/de_de.json @@ -0,0 +1,79 @@ +{ + + "block.computercraft.computer_normal": "Computer", + "block.computercraft.computer_advanced": "Erweiterter Computer", + "block.computercraft.computer_command": "Befehlscomputer", + + "block.computercraft.disk_drive": "Diskettenlaufwerk", + "block.computercraft.printer": "Drucker", + "block.computercraft.speaker": "Lautsprecher", + + "block.computercraft.monitor_normal": "Monitor", + "block.computercraft.monitor_advanced": "Erweiterter Monitor", + + "block.computercraft.wireless_modem_normal": "Kabelloses Modem", + "block.computercraft.wireless_modem_advanced": "Endermodem", + + "block.computercraft.wired_modem": "Kabelmodem", + "block.computercraft.cable": "Netzwerkkabel", + "block.computercraft.wired_modem_full": "Kabelmodem", + + "block.computercraft.turtle_normal": "Turtle", + "block.computercraft.turtle_normal.upgraded": "Turtle (%s)", + "block.computercraft.turtle_normal.upgraded_twice": "Turtle (%s, %s)", + + "block.computercraft.turtle_advanced": "Erweiterte Turtle", + "block.computercraft.turtle_advanced.upgraded": "Erweiterte Turtle (%s)", + "block.computercraft.turtle_advanced.upgraded_twice": "Erweiterte Turtle (%s, %s)", + + "item.computercraft.disk": "Diskette", + "item.computercraft.treasure_disk": "Diskette", + "item.computercraft.printed_page": "Gedruckte Seite", + "item.computercraft.printed_pages": "Gedruckte Seiten", + "item.computercraft.printed_book": "Gedrucktes Buch", + + "item.computercraft.pocket_computer_normal": "Taschencomputer", + "item.computercraft.pocket_computer_normal.upgraded": "Taschencomputer (%s)", + "item.computercraft.pocket_computer_advanced": "Erweiterter Taschencomputer", + "item.computercraft.pocket_computer_advanced.upgraded": "Erweiterter Taschencomputer (%s)", + + "upgrade.minecraft.diamond_sword.adjective": "Nahkampf", + "upgrade.minecraft.diamond_shovel.adjective": "Graben", + "upgrade.minecraft.diamond_pickaxe.adjective": "Bergbau", + "upgrade.minecraft.diamond_axe.adjective": "Holzfällen", + "upgrade.minecraft.diamond_hoe.adjective": "Ackerbau", + "upgrade.minecraft.crafting_table.adjective": "Fabrizierung", + "upgrade.computercraft.wireless_modem_normal.adjective": "Ender", + "upgrade.computercraft.wireless_modem_advanced.adjective": "Kabellos", + "upgrade.computercraft.speaker.adjective": "Laut", + + "chat.computercraft.wired_modem.peripheral_connected": "Peripheriegerät \"%s\" mit dem Netzwerk verbunden", + "chat.computercraft.wired_modem.peripheral_disconnected": "Peripheriegerät \"%s\" vom Netzwerk getrennt", + + "gui.computercraft.config.computer_space_limit": "Speicherplatz von Computern (bytes)", + "gui.computercraft.config.floppy_space_limit": "Speicherplatz von Disketten (bytes)", + "gui.computercraft.config.maximum_open_files": "Maximalanzahl an gleichzeitig offenen Dateien je Computer", + "gui.computercraft.config.disable_lua51_features": "Lua 5.1-Funktionen deaktivieren", + "gui.computercraft.config.default_computer_settings": "Computer-Standardeinstellungen", + "gui.computercraft.config.debug_enabled": "Debug-Library aktivieren", + "gui.computercraft.config.log_computer_errors": "Peripheriefehler loggen", + + "gui.computercraft.config.http.enabled": "HTTP-API aktivieren", + "gui.computercraft.config.http.websocket_enabled": "HTTP-Websockets aktivieren", + "gui.computercraft.config.http.whitelist": "HTTP-Whitelist", + "gui.computercraft.config.http.blacklist": "HTTP-Blacklist", + + "gui.computercraft.config.peripheral.command_block_enabled": "Befehlsblöcke als Peripheriegerät erlauben", + "gui.computercraft.config.peripheral.modem_range": "Modemreichweite (normal)", + "gui.computercraft.config.peripheral.modem_high_altitude_range": "Modemreichweite (in großer Höhe)", + "gui.computercraft.config.peripheral.modem_range_during_storm": "Modemreichweite (bei schlechtem Wetter)", + "gui.computercraft.config.peripheral.modem_high_altitude_range_during_storm": "Modemreichweite (in großer Höhe bei schlechtem Wetter)", + "gui.computercraft.config.peripheral.max_notes_per_tick": "Maximalanzahl an Noten, die ein Computer gleichzeitig spielen kann", + + "gui.computercraft.config.turtle.need_fuel": "Treibstoffverbrauch aktivieren", + "gui.computercraft.config.turtle.normal_fuel_limit": "Treibstofflimit von Turtles", + "gui.computercraft.config.turtle.advanced_fuel_limit": "Treibstofflimit von Erweiterten Turtles", + "gui.computercraft.config.turtle.obey_block_protection": "Turtles unterliegen Blockschutzrichtlinien", + "gui.computercraft.config.turtle.can_push": "Turtles können Entities bewegen", + "gui.computercraft.config.turtle.disabled_actions": "Deaktivierte Turtle-Aktionen" +} diff --git a/src/main/resources/assets/computercraft/lang/de_de.lang b/src/main/resources/assets/computercraft/lang/de_de.lang deleted file mode 100644 index 6e01501d2..000000000 --- a/src/main/resources/assets/computercraft/lang/de_de.lang +++ /dev/null @@ -1,190 +0,0 @@ -tile.computercraft:computer.name=Computer -tile.computercraft:advanced_computer.name=Erweiterter Computer -tile.computercraft:drive.name=Diskettenlaufwerk -tile.computercraft:printer.name=Drucker -tile.computercraft:monitor.name=Monitor -tile.computercraft:advanced_monitor.name=Erweiterter Monitor -tile.computercraft:wireless_modem.name=Kabelloses Modem -tile.computercraft:wired_modem.name=Kabelmodem -tile.computercraft:cable.name=Netzwerkkabel -tile.computercraft:command_computer.name=Befehlscomputer -tile.computercraft:advanced_modem.name=Endermodem -tile.computercraft:speaker.name=Lautsprecher - -tile.computercraft:turtle.name=Turtle -tile.computercraft:turtle.upgraded.name=Turtle (%s) -tile.computercraft:turtle.upgraded_twice.name=Turtle (%s, %s) -tile.computercraft:advanced_turtle.name=Erweiterte Turtle -tile.computercraft:advanced_turtle.upgraded.name=Erweiterte Turtle (%s) -tile.computercraft:advanced_turtle.upgraded_twice.name=Erweiterte Turtle (%s, %s) - -item.computercraft:disk.name=Diskette -item.computercraft:treasure_disk.name=Diskette -item.computercraft:page.name=Gedruckte Seite -item.computercraft:pages.name=Gedruckte Seiten -item.computercraft:book.name=Gedrucktes Buch - -item.computercraft:pocket_computer.name=Taschencomputer -item.computercraft:pocket_computer.upgraded.name=Taschencomputer (%s) -item.computercraft:advanced_pocket_computer.name=Erweiterter Taschencomputer -item.computercraft:advanced_pocket_computer.upgraded.name=Erweiterter Taschencomputer (%s) - -upgrade.minecraft:diamond_sword.adjective=Nahkampf -upgrade.minecraft:diamond_shovel.adjective=Graben -upgrade.minecraft:diamond_pickaxe.adjective=Bergbau -upgrade.minecraft:diamond_axe.adjective=Holzfällen -upgrade.minecraft:diamond_hoe.adjective=Ackerbau -upgrade.computercraft:wireless_modem.adjective=Kabellos -upgrade.minecraft:crafting_table.adjective=Fabrizierung -upgrade.computercraft:advanced_modem.adjective=Ender -upgrade.computercraft:speaker.adjective=Laut - -chat.computercraft.wired_modem.peripheral_connected=Peripheriegerät "%s" mit dem Netzwerk verbunden -chat.computercraft.wired_modem.peripheral_disconnected=Peripheriegerät "%s" vom Netzwerk getrennt - -# Command descriptions, usage and any additional messages. -commands.computercraft.synopsis=Verschiedene Befehle um Computer zu kontrollieren. -commands.computercraft.desc=Der /computercraft Befehl enthält verschiedene Werkzeuge um Computer zu debuggen, kontrollieren oder mit ihnen zu interagieren. - -commands.computercraft.help.synopsis=Zeigt die Hilfe für den angegebenen Befehl -commands.computercraft.help.desc= -commands.computercraft.help.usage=[command] -commands.computercraft.help.no_children=%s hat keine Unterbefehle -commands.computercraft.help.no_command=Unbekannter Befehl '%s' - -commands.computercraft.dump.synopsis=Zeigt den Status eines Computers. -commands.computercraft.dump.desc=Zeigt den Status aller Computer oder genauere Informationen über einen angegebenen Computer. Der Computer kann entweder über seine Instanz ID (z.B. 123), seine Computer ID (z.B. #123) oder seinen Namen (z.B. "@Mein Computer") angegeben werden. -commands.computercraft.dump.usage=[ID] -commands.computercraft.dump.action=Zeigt mehr Informationen über einen Computer - -commands.computercraft.shutdown.synopsis=Fährt den Computer aus der Ferne herunter. -commands.computercraft.shutdown.desc=Fährt die angegebenen Computer herunter. Falls keine Computer angegeben sind, werden alle heruntergefahren. Der Computer kann entweder über seine Instanz ID (z.B. 123), seine Computer ID (z.B. #123) oder seinen Namen (z.B. "@Mein Computer") angegeben werden. -commands.computercraft.shutdown.usage=[IDs...] -commands.computercraft.shutdown.done=Fährt die Computer %s/%s herunter - -commands.computercraft.turn_on.synopsis=Fährt einen Computer aus der Ferne hoch. -commands.computercraft.turn_on.desc=Fährt die angegebenen Computer hoch. Der Computer kann entweder über seine Instanz ID (z.B. 123), seine Computer ID (z.B. #123) oder seinen Namen (z.B. "@Mein Computer") angegeben werden. -commands.computercraft.turn_on.usage=[IDs...] -commands.computercraft.turn_on.done=Fährt die Computer %s/%s hoch - -commands.computercraft.tp.synopsis=Teleportiert dich zum angegebenen Computer. -commands.computercraft.tp.desc=Teleportiert dich zum Standort eines Computers. Der Computer kann entweder über seine Instanz ID (z.B. 123), seine Computer ID (z.B. #123) oder seinen Namen (z.B. "@Mein Computer") angegeben werden. -commands.computercraft.tp.usage= -commands.computercraft.tp.action=Teleportiert dich zum Computer -commands.computercraft.tp.not_entity=Konnte Terminal für Nicht-Spieler nicht öffnen -commands.computercraft.tp.not_there=Konnte Computer in der Welt nicht finden - -commands.computercraft.view.synopsis=Zeigt das Terminal eines Computers. -commands.computercraft.view.desc=Zeigt das Terminal eines Computers. Dies ermöglicht, den Computer aus der Ferne zu steuern. Ein Zugriff auf das Inventar eines Turtles ist dadurch allerdings nicht möglich. Der Computer kann entweder über seine Instanz ID (z.B. 123), seine Computer ID (z.B. #123) oder seinen Namen (z.B. "@Mein Computer") angegeben werden. -commands.computercraft.view.usage= -commands.computercraft.view.action=Zeigt den Computer -commands.computercraft.view.not_player=Konnte Terminal für Nicht-Spieler nicht öffnen - -commands.computercraft.track.synopsis=Zeichnet die Laufzeiten von Computern auf. -commands.computercraft.track.desc=Zeichnet die Laufzeiten von Computern und wie viele Events ausgelöst werden auf. Die Ausgabe der Informationen ist ähnlich zu /forge track, was beim aufspüren von Lags sehr hilfreich sein kann. - -commands.computercraft.track.start.synopsis=Startet die Aufzeichnung von Computern -commands.computercraft.track.start.desc=Startet die Aufzeichnung der Laufzeiten und Anzahl der Events aller Computer. Dadurch werden die Ergebnisse der letzten Male verworfen. -commands.computercraft.track.start.usage= -commands.computercraft.track.start.stop=Führe %s aus um die Aufzeichnung zu stoppen und die Ergebnisse anzusehen - -commands.computercraft.track.stop.synopsis=Stoppt die Aufzeichnung aller Computer -commands.computercraft.track.stop.desc=Stopt die Aufzeichnung aller Computer Events und Laufzeiten -commands.computercraft.track.stop.usage= -commands.computercraft.track.stop.action=Klicke um die Aufzeichnung zu stoppen -commands.computercraft.track.stop.not_enabled=Momentan werden keine Computer aufgezeichnet - -commands.computercraft.track.dump.synopsis=Gibt die aktuellen Ergebnisse der Aufzeichnung aus -commands.computercraft.track.dump.desc=Gibt die aktuellen Ergebnisse der Aufzeichnung aus. -commands.computercraft.track.dump.usage=[Art] -commands.computercraft.track.dump.no_timings=Keine Zeitangaben verfügbar -commands.computercraft.track.dump.no_field=Unbekanntes Feld '%s' -commands.computercraft.track.dump.computer=Computer - -commands.computercraft.reload.synopsis=Liest die Konfigurationsdatei von ComputerCraft neu ein -commands.computercraft.reload.desc=Liest die Konfigurationsdatei von ComputerCraft neu ein -commands.computercraft.reload.usage= -commands.computercraft.reload.done=Die Konfigurationsdatei wurde erfolgreich neu eingelesen - -commands.computercraft.queue.synopsis=Sendet ein computer_command Event an einen Befehlscomputer -commands.computercraft.queue.desc=Sendet ein computer_command Event zusammen mit optionalen Argumenten an einen Befehlscomputer. Dieser Befehl wurde als eine Computerfreundliche Version von /trigger für Mapdesigner designed. Jeder Spieler kann diesen Befehl ausführen, weshalb er sich perfekt für ein Klickevent von z.B. Schildern oder Büchern eignet. -commands.computercraft.queue.usage= [Argumente...] - -commands.computercraft.generic.no_position= -commands.computercraft.generic.position=%s, %s, %s -commands.computercraft.generic.yes=J -commands.computercraft.generic.no=N -commands.computercraft.generic.exception=Unbehandelte Ausnahme (%s) -commands.computercraft.generic.additional_rows=%d zusätzliche Zeilen… - -commands.computercraft.argument.no_matching=Kein Computer passt auf '%s' -commands.computercraft.argument.many_matching=Mehrere Computer passen auf '%s' (Instanzen %s) -commands.computercraft.argument.not_number='%s' ist keine Zahl - -# Names for the various tracking fields. -tracking_field.computercraft.tasks.name=Aufgaben -tracking_field.computercraft.total.name=Gesamtzeit -tracking_field.computercraft.average.name=Durchschnittliche Zeit -tracking_field.computercraft.max.name=Maximale Zeit - -tracking_field.computercraft.server_count.name=Anzahl der Server-Tasks -tracking_field.computercraft.server_time.name=Server-Task-Zeit - -tracking_field.computercraft.peripheral.name=Peripheriegeräte Aufrufe -tracking_field.computercraft.fs.name=Dateisystem Operationen -tracking_field.computercraft.turtle.name=Turtle Operationen - -tracking_field.computercraft.http.name=HTTP-Requests -tracking_field.computercraft.http_upload.name=HTTP Upload -tracking_field.computercraft.http_download.name=HTTT Download - -tracking_field.computercraft.websocket_incoming.name=Websocket eingehend -tracking_field.computercraft.websocket_outgoing.name=Websocket ausgehend - -tracking_field.computercraft.coroutines_created.name=Koroutinen erstellt -tracking_field.computercraft.coroutines_dead.name=Koroutinen gelöscht - -# Misc tooltips -gui.computercraft.tooltip.copy=In die Zwischenablage kopieren -gui.computercraft.tooltip.computer_id=(Computer ID: %s) -gui.computercraft.tooltip.disk_id=(Disketten ID: %s) - -# Config options -gui.computercraft:config.computer_space_limit=Speicherplatz von Computern (Bytes) -gui.computercraft:config.floppy_space_limit=Speicherplatz von Disketten (Bytes) -gui.computercraft:config.maximum_open_files=Maximalanzahl an gleichzeitig offenen Dateien je Computer -gui.computercraft:config.disable_lua51_features=Lua 5.1-Funktionen deaktivieren -gui.computercraft:config.default_computer_settings=Computer-Standardeinstellungen -gui.computercraft:config.debug_enabled=Debug-Library aktivieren -gui.computercraft:config.log_computer_errors=Computerfehler loggen - -gui.computercraft:config.execution.computer_threads=Computer Threads - -gui.computercraft:config.http=HTTP -gui.computercraft:config.http.enabled=HTTP-API aktivieren -gui.computercraft:config.http.websocket_enabled=Websockets aktivieren -gui.computercraft:config.http.whitelist=HTTP-Whitelist -gui.computercraft:config.http.blacklist=HTTP-Blacklist - -gui.computercraft:config.http.timeout=Zeitüberschreitung -gui.computercraft:config.http.max_requests=Maximale Anzahl gleichzeitiger Anfragen -gui.computercraft:config.http.max_download=Maximale Antwortgröße -gui.computercraft:config.http.max_upload=Maximale Anfragegröße -gui.computercraft:config.http.max_websockets=Maximale Anzahl gleichzeitiger Websockets -gui.computercraft:config.http.max_websocket_message=Maximale Größe der Websocket-Nachricht - -gui.computercraft:config.peripheral=Peripheriegeräte -gui.computercraft:config.peripheral.command_block_enabled=Befehlsblöcke als Peripheriegerät erlauben -gui.computercraft:config.peripheral.modem_range=Modemreichweite (normal) -gui.computercraft:config.peripheral.modem_high_altitude_range=Modemreichweite (in großer Höhe) -gui.computercraft:config.peripheral.modem_range_during_storm=Modemreichweite (bei schlechtem Wetter) -gui.computercraft:config.peripheral.modem_high_altitude_range_during_storm=Modemreichweite (in großer Höhe bei schlechtem Wetter) -gui.computercraft:config.peripheral.max_notes_per_tick=Maximalanzahl an Noten, die ein Computer gleichzeitig spielen kann - -gui.computercraft:config.turtle=Turtles -gui.computercraft:config.turtle.need_fuel=Treibstoffverbrauch aktivieren -gui.computercraft:config.turtle.normal_fuel_limit=Treibstofflimit von Turtles -gui.computercraft:config.turtle.advanced_fuel_limit=Treibstofflimit von Erweiterten Turtles -gui.computercraft:config.turtle.obey_block_protection=Turtles unterliegen Blockschutzrichtlinien -gui.computercraft:config.turtle.can_push=Turtles können Entities bewegen -gui.computercraft:config.turtle.disabled_actions=Deaktivierte Turtle-Aktionen diff --git a/src/main/resources/assets/computercraft/lang/en_us.json b/src/main/resources/assets/computercraft/lang/en_us.json new file mode 100644 index 000000000..4c90acf02 --- /dev/null +++ b/src/main/resources/assets/computercraft/lang/en_us.json @@ -0,0 +1,190 @@ +{ + "itemGroup.computercraft": "ComputerCraft", + + "block.computercraft.computer_normal": "Computer", + "block.computercraft.computer_advanced": "Advanced Computer", + "block.computercraft.computer_command": "Command Computer", + + "block.computercraft.disk_drive": "Disk Drive", + "block.computercraft.printer": "Printer", + "block.computercraft.speaker": "Speaker", + + "block.computercraft.monitor_normal": "Monitor", + "block.computercraft.monitor_advanced": "Advanced Monitor", + + "block.computercraft.wireless_modem_normal": "Wireless Modem", + "block.computercraft.wireless_modem_advanced": "Ender Modem", + + "block.computercraft.wired_modem": "Wired Modem", + "block.computercraft.cable": "Networking Cable", + "block.computercraft.wired_modem_full": "Wired Modem", + + "block.computercraft.turtle_normal": "Turtle", + "block.computercraft.turtle_normal.upgraded": "%s Turtle", + "block.computercraft.turtle_normal.upgraded_twice": "%s %s Turtle", + + "block.computercraft.turtle_advanced": "Advanced Turtle", + "block.computercraft.turtle_advanced.upgraded": "Advanced %s Turtle", + "block.computercraft.turtle_advanced.upgraded_twice": "Advanced %s %s Turtle", + + "item.computercraft.disk": "Floppy Disk", + "item.computercraft.treasure_disk": "Floppy Disk", + "item.computercraft.printed_page": "Printed Page", + "item.computercraft.printed_pages": "Printed Pages", + "item.computercraft.printed_book": "Printed Book", + + "item.computercraft.pocket_computer_normal": "Pocket Computer", + "item.computercraft.pocket_computer_normal.upgraded": "%s Pocket Computer", + "item.computercraft.pocket_computer_advanced": "Advanced Pocket Computer", + "item.computercraft.pocket_computer_advanced.upgraded": "Advanced %s Pocket Computer", + + "upgrade.minecraft.diamond_sword.adjective": "Melee", + "upgrade.minecraft.diamond_shovel.adjective": "Digging", + "upgrade.minecraft.diamond_pickaxe.adjective": "Mining", + "upgrade.minecraft.diamond_axe.adjective": "Felling", + "upgrade.minecraft.diamond_hoe.adjective": "Farming", + "upgrade.minecraft.crafting_table.adjective": "Crafty", + "upgrade.computercraft.wireless_modem_normal.adjective": "Wireless", + "upgrade.computercraft.wireless_modem_advanced.adjective": "Ender", + "upgrade.computercraft.speaker.adjective": "Noisy", + + "chat.computercraft.wired_modem.peripheral_connected": "Peripheral \"%s\" connected to network", + "chat.computercraft.wired_modem.peripheral_disconnected": "Peripheral \"%s\" disconnected from network", + + "commands.computercraft.synopsis": "Various commands for controlling computers.", + "commands.computercraft.desc": "The /computercraft command provides various debugging and administrator tools for controlling and interacting with computers.", + + "commands.computercraft.help.synopsis": "Provide help for a specific command", + "commands.computercraft.help.desc": "", + "commands.computercraft.help.no_children": "%s has no sub-commands", + "commands.computercraft.help.no_command": "No such command '%s'", + + "commands.computercraft.dump.synopsis": "Display the status of computers.", + "commands.computercraft.dump.desc": "Display the status of all computers or specific information about one computer. You can specify the computer's instance id (e.g. 123), computer id (e.g #123) or label (e.g. \"@My Computer\").", + "commands.computercraft.dump.action": "View more info about this computer", + + "commands.computercraft.shutdown.synopsis": "Shutdown computers remotely.", + "commands.computercraft.shutdown.desc": "Shutdown the listed computers or all if none are specified. You can specify the computer's instance id (e.g. 123), computer id (e.g #123) or label (e.g. \"@My Computer\").", + "commands.computercraft.shutdown.done": "Shutdown %s/%s computers", + + "commands.computercraft.turn_on.synopsis": "Turn computers on remotely.", + "commands.computercraft.turn_on.desc": "Turn on the listed computers. You can specify the computer's instance id (e.g. 123), computer id (e.g #123) or label (e.g. \"@My Computer\").", + "commands.computercraft.turn_on.done": "Turned on %s/%s computers", + + "commands.computercraft.tp.synopsis": "Teleport to a specific computer.", + "commands.computercraft.tp.desc": "Teleport to the location of a computer. You can either specify the computer's instance id (e.g. 123) or computer id (e.g #123).", + "commands.computercraft.tp.action": "Teleport to this computer", + "commands.computercraft.tp.not_player": "Cannot open terminal for non-player", + "commands.computercraft.tp.not_there": "Cannot locate computer in the world", + + "commands.computercraft.view.synopsis": "View the terminal of a computer.", + "commands.computercraft.view.desc": "Open the terminal of a computer, allowing remote control of a computer. This does not provide access to turtle's inventories. You can either specify the computer's instance id (e.g. 123) or computer id (e.g #123).", + "commands.computercraft.view.action": "View this computer", + "commands.computercraft.view.not_player": "Cannot open terminal for non-player", + + "commands.computercraft.track.synopsis": "Track execution times for computers.", + "commands.computercraft.track.desc": "Track how long computers execute for, as well as how many events they handle. This presents information in a similar way to /forge track and can be useful for diagnosing lag.", + + "commands.computercraft.track.start.synopsis": "Start tracking all computers", + "commands.computercraft.track.start.desc": "Start tracking all computers' execution times and event counts. This will discard the results of previous runs.", + "commands.computercraft.track.start.stop": "Run %s to stop tracking and view the results", + + "commands.computercraft.track.stop.synopsis": "Stop tracking all computers", + "commands.computercraft.track.stop.desc": "Stop tracking all computers' events and execution times", + "commands.computercraft.track.stop.action": "Click to stop tracking", + "commands.computercraft.track.stop.not_enabled": "Not currently tracking computers", + + "commands.computercraft.track.dump.synopsis": "Dump the latest track results", + "commands.computercraft.track.dump.desc": "Dump the latest results of computer tracking.", + "commands.computercraft.track.dump.no_timings": "No timings available", + "commands.computercraft.track.dump.computer": "Computer", + + "commands.computercraft.reload.synopsis": "Reload the ComputerCraft config file", + "commands.computercraft.reload.desc": "Reload the ComputerCraft config file", + "commands.computercraft.reload.done": "Reloaded config", + + "commands.computercraft.queue.synopsis": "Send a computer_command event to a command computer", + "commands.computercraft.queue.desc": "Send a computer_command event to a command computer, passing through the additional arguments. This is mostly designed for map makers, acting as a more computer-friendly version of /trigger. Any player can run the command, which would most likely be done through a text component's click event.", + + "commands.computercraft.generic.no_position": "", + "commands.computercraft.generic.position": "%s, %s, %s", + "commands.computercraft.generic.yes": "Y", + "commands.computercraft.generic.no": "N", + "commands.computercraft.generic.exception": "Unhandled exception (%s)", + "commands.computercraft.generic.additional_rows": "%d additional rows…", + + "argument.computercraft.computer.no_matching": "No computers matching '%s'", + "argument.computercraft.computer.many_matching": "Multiple computers matching '%s' (instances %s)", + + "argument.computercraft.tacking_field.no_field": "Unknown field '%s'", + + "argument.computercraft.argument_expected": "Argument expected", + + "tracking_field.computercraft.tasks.name": "Tasks", + "tracking_field.computercraft.total.name": "Total time", + "tracking_field.computercraft.average.name": "Average time", + "tracking_field.computercraft.max.name": "Max time", + + "tracking_field.computercraft.server_count.name": "Server task count", + "tracking_field.computercraft.server_time.name": "Server task time", + + "tracking_field.computercraft.peripheral.name": "Peripheral calls", + "tracking_field.computercraft.fs.name": "Filesystem operations", + "tracking_field.computercraft.turtle.name": "Turtle operations", + + "tracking_field.computercraft.http.name": "HTTP requests", + "tracking_field.computercraft.http_upload.name": "HTTP upload", + "tracking_field.computercraft.http_download.name": "HTTT download", + + "tracking_field.computercraft.websocket_incoming.name": "Websocket incoming", + "tracking_field.computercraft.websocket_outgoing.name": "Websocket outgoing", + + "tracking_field.computercraft.coroutines_created.name": "Coroutines created", + "tracking_field.computercraft.coroutines_dead.name": "Coroutines disposed", + + "gui.computercraft.tooltip.copy": "Copy to clipboard", + "gui.computercraft.tooltip.computer_id": "(Computer ID: %s)", + "gui.computercraft.tooltip.disk_id": "(Disk ID: %s)", + + "gui.computercraft.config.computer_space_limit": "Computer space limit (bytes)", + "gui.computercraft.config.floppy_space_limit": "Floppy Disk space limit (bytes)", + "gui.computercraft.config.maximum_open_files": "Maximum files open per computer", + "gui.computercraft.config.disable_lua51_features": "Disable Lua 5.1 features", + "gui.computercraft.config.default_computer_settings": "Default Computer settings", + "gui.computercraft.config.debug_enabled": "Enable debug library", + "gui.computercraft.config.log_computer_errors": "Log computer errors", + + "gui.computercraft.config.execution": "Execution", + "gui.computercraft.config.execution.computer_threads": "Computer threads", + "gui.computercraft.config.execution.max_main_global_time": "Server tick global time limit", + "gui.computercraft.config.execution.max_main_computer_time": "Server tick computer time limit", + + "gui.computercraft.config.http": "HTTP", + "gui.computercraft.config.http.enabled": "Enable the HTTP API", + "gui.computercraft.config.http.websocket_enabled": "Enable websockets", + "gui.computercraft.config.http.whitelist": "HTTP whitelist", + "gui.computercraft.config.http.blacklist": "HTTP blacklist", + + "gui.computercraft.config.http.timeout": "Timeout", + "gui.computercraft.config.http.max_requests": "Maximum concurrent requests", + "gui.computercraft.config.http.max_download": "Maximum response size", + "gui.computercraft.config.http.max_upload": "Maximum request size", + "gui.computercraft.config.http.max_websockets": "Maximum concurrent websockets", + "gui.computercraft.config.http.max_websocket_message": "Maximum websocket message size", + + "gui.computercraft.config.peripheral": "Peripherals", + "gui.computercraft.config.peripheral.command_block_enabled": "Enable command block peripheral", + "gui.computercraft.config.peripheral.modem_range": "Modem range (default)", + "gui.computercraft.config.peripheral.modem_high_altitude_range": "Modem range (high-altitude)", + "gui.computercraft.config.peripheral.modem_range_during_storm": "Modem range (bad weather)", + "gui.computercraft.config.peripheral.modem_high_altitude_range_during_storm": "Modem range (high-altitude, bad weather)", + "gui.computercraft.config.peripheral.max_notes_per_tick": "Maximum notes that a computer can play at once", + + "gui.computercraft.config.turtle": "Turtles", + "gui.computercraft.config.turtle.need_fuel": "Enable fuel", + "gui.computercraft.config.turtle.normal_fuel_limit": "Turtle fuel limit", + "gui.computercraft.config.turtle.advanced_fuel_limit": "Advanced Turtle fuel limit", + "gui.computercraft.config.turtle.obey_block_protection": "Turtles obey block protection", + "gui.computercraft.config.turtle.can_push": "Turtles can push entities", + "gui.computercraft.config.turtle.disabled_actions": "Disabled turtle actions" +} diff --git a/src/main/resources/assets/computercraft/lang/en_us.lang b/src/main/resources/assets/computercraft/lang/en_us.lang deleted file mode 100644 index d00875c37..000000000 --- a/src/main/resources/assets/computercraft/lang/en_us.lang +++ /dev/null @@ -1,195 +0,0 @@ -itemGroup.computercraft=CC: Tweaked - -tile.computercraft:computer.name=Computer -tile.computercraft:advanced_computer.name=Advanced Computer -tile.computercraft:drive.name=Disk Drive -tile.computercraft:printer.name=Printer -tile.computercraft:monitor.name=Monitor -tile.computercraft:advanced_monitor.name=Advanced Monitor -tile.computercraft:wireless_modem.name=Wireless Modem -tile.computercraft:wired_modem.name=Wired Modem -tile.computercraft:cable.name=Networking Cable -tile.computercraft:command_computer.name=Command Computer -tile.computercraft:advanced_modem.name=Ender Modem -tile.computercraft:speaker.name=Speaker - -tile.computercraft:turtle.name=Turtle -tile.computercraft:turtle.upgraded.name=%s Turtle -tile.computercraft:turtle.upgraded_twice.name=%s %s Turtle -tile.computercraft:advanced_turtle.name=Advanced Turtle -tile.computercraft:advanced_turtle.upgraded.name=Advanced %s Turtle -tile.computercraft:advanced_turtle.upgraded_twice.name=Advanced %s %s Turtle - -item.computercraft:disk.name=Floppy Disk -item.computercraft:treasure_disk.name=Floppy Disk -item.computercraft:page.name=Printed Page -item.computercraft:pages.name=Printed Pages -item.computercraft:book.name=Printed Book - -item.computercraft:pocket_computer.name=Pocket Computer -item.computercraft:pocket_computer.upgraded.name=%s Pocket Computer -item.computercraft:advanced_pocket_computer.name=Advanced Pocket Computer -item.computercraft:advanced_pocket_computer.upgraded.name=Advanced %s Pocket Computer - -upgrade.minecraft:diamond_sword.adjective=Melee -upgrade.minecraft:diamond_shovel.adjective=Digging -upgrade.minecraft:diamond_pickaxe.adjective=Mining -upgrade.minecraft:diamond_axe.adjective=Felling -upgrade.minecraft:diamond_hoe.adjective=Farming -upgrade.computercraft:wireless_modem.adjective=Wireless -upgrade.minecraft:crafting_table.adjective=Crafty -upgrade.computercraft:advanced_modem.adjective=Ender -upgrade.computercraft:speaker.adjective=Noisy - -chat.computercraft.wired_modem.peripheral_connected=Peripheral "%s" connected to network -chat.computercraft.wired_modem.peripheral_disconnected=Peripheral "%s" disconnected from network - -# Command descriptions, usage and any additional messages. -commands.computercraft.synopsis=Various commands for controlling computers. -commands.computercraft.desc=The /computercraft command provides various debugging and administrator tools for controlling and interacting with computers. - -commands.computercraft.help.synopsis=Provide help for a specific command -commands.computercraft.help.desc= -commands.computercraft.help.usage=[command] -commands.computercraft.help.no_children=%s has no sub-commands -commands.computercraft.help.no_command=No such command '%s' - -commands.computercraft.dump.synopsis=Display the status of computers. -commands.computercraft.dump.desc=Display the status of all computers or specific information about one computer. You can specify the computer's instance id (e.g. 123), computer id (e.g #123) or label (e.g. "@My Computer"). -commands.computercraft.dump.usage=[id] -commands.computercraft.dump.action=View more info about this computer - -commands.computercraft.shutdown.synopsis=Shutdown computers remotely. -commands.computercraft.shutdown.desc=Shutdown the listed computers or all if none are specified. You can specify the computer's instance id (e.g. 123), computer id (e.g #123) or label (e.g. "@My Computer"). -commands.computercraft.shutdown.usage=[ids...] -commands.computercraft.shutdown.done=Shutdown %s/%s computers - -commands.computercraft.turn_on.synopsis=Turn computers on remotely. -commands.computercraft.turn_on.desc=Turn on the listed computers. You can specify the computer's instance id (e.g. 123), computer id (e.g #123) or label (e.g. "@My Computer"). -commands.computercraft.turn_on.usage=[ids...] -commands.computercraft.turn_on.done=Turned on %s/%s computers - -commands.computercraft.tp.synopsis=Teleport to a specific computer. -commands.computercraft.tp.desc=Teleport to the location of a computer. You can either specify the computer's instance id (e.g. 123) or computer id (e.g #123). -commands.computercraft.tp.usage= -commands.computercraft.tp.action=Teleport to this computer -commands.computercraft.tp.not_entity=Cannot open terminal for non-player -commands.computercraft.tp.not_there=Cannot locate computer in the world - -commands.computercraft.view.synopsis=View the terminal of a computer. -commands.computercraft.view.desc=Open the terminal of a computer, allowing remote control of a computer. This does not provide access to turtle's inventories. You can either specify the computer's instance id (e.g. 123) or computer id (e.g #123). -commands.computercraft.view.usage= -commands.computercraft.view.action=View this computer -commands.computercraft.view.not_player=Cannot open terminal for non-player - -commands.computercraft.track.synopsis=Track execution times for computers. -commands.computercraft.track.desc=Track how long computers execute for, as well as how many events they handle. This presents information in a similar way to /forge track and can be useful for diagnosing lag. - -commands.computercraft.track.start.synopsis=Start tracking all computers -commands.computercraft.track.start.desc=Start tracking all computers' execution times and event counts. This will discard the results of previous runs. -commands.computercraft.track.start.usage= -commands.computercraft.track.start.stop=Run %s to stop tracking and view the results - -commands.computercraft.track.stop.synopsis=Stop tracking all computers -commands.computercraft.track.stop.desc=Stop tracking all computers' events and execution times -commands.computercraft.track.stop.usage= -commands.computercraft.track.stop.action=Click to stop tracking -commands.computercraft.track.stop.not_enabled=Not currently tracking computers - -commands.computercraft.track.dump.synopsis=Dump the latest track results -commands.computercraft.track.dump.desc=Dump the latest results of computer tracking. -commands.computercraft.track.dump.usage=[kind] -commands.computercraft.track.dump.no_timings=No timings available -commands.computercraft.track.dump.no_field=Unknown field '%s' -commands.computercraft.track.dump.computer=Computer - -commands.computercraft.reload.synopsis=Reload the ComputerCraft config file -commands.computercraft.reload.desc=Reload the ComputerCraft config file -commands.computercraft.reload.usage= -commands.computercraft.reload.done=Reloaded config - -commands.computercraft.queue.synopsis=Send a computer_command event to a command computer -commands.computercraft.queue.desc=Send a computer_command event to a command computer, passing through the additional arguments. This is mostly designed for map makers, acting as a more computer-friendly version of /trigger. Any player can run the command, which would most likely be done through a text component's click event. -commands.computercraft.queue.usage= [args...] - -commands.computercraft.generic.no_position= -commands.computercraft.generic.position=%s, %s, %s -commands.computercraft.generic.yes=Y -commands.computercraft.generic.no=N -commands.computercraft.generic.exception=Unhandled exception (%s) -commands.computercraft.generic.additional_rows=%d additional rows… - -commands.computercraft.argument.no_matching=No computers matching '%s' -commands.computercraft.argument.many_matching=Multiple computers matching '%s' (instances %s) -commands.computercraft.argument.not_number='%s' is not a number - -# Names for the various tracking fields. -tracking_field.computercraft.tasks.name=Tasks -tracking_field.computercraft.total.name=Total time -tracking_field.computercraft.average.name=Average time -tracking_field.computercraft.max.name=Max time - -tracking_field.computercraft.server_count.name=Server task count -tracking_field.computercraft.server_time.name=Server task time - -tracking_field.computercraft.peripheral.name=Peripheral calls -tracking_field.computercraft.fs.name=Filesystem operations -tracking_field.computercraft.turtle.name=Turtle operations - -tracking_field.computercraft.http.name=HTTP requests -tracking_field.computercraft.http_upload.name=HTTP upload -tracking_field.computercraft.http_download.name=HTTT download - -tracking_field.computercraft.websocket_incoming.name=Websocket incoming -tracking_field.computercraft.websocket_outgoing.name=Websocket outgoing - -tracking_field.computercraft.coroutines_created.name=Coroutines created -tracking_field.computercraft.coroutines_dead.name=Coroutines disposed - -# Misc tooltips -gui.computercraft.tooltip.copy=Copy to clipboard -gui.computercraft.tooltip.computer_id=(Computer ID: %s) -gui.computercraft.tooltip.disk_id=(Disk ID: %s) - -# Config options -gui.computercraft:config.computer_space_limit=Computer space limit (bytes) -gui.computercraft:config.floppy_space_limit=Floppy Disk space limit (bytes) -gui.computercraft:config.maximum_open_files=Maximum files open per computer -gui.computercraft:config.disable_lua51_features=Disable Lua 5.1 features -gui.computercraft:config.default_computer_settings=Default Computer settings -gui.computercraft:config.debug_enabled=Enable debug library -gui.computercraft:config.log_computer_errors=Log computer errors - -gui.computercraft:config.execution=Execution -gui.computercraft:config.execution.computer_threads=Computer threads -gui.computercraft:config.execution.max_main_global_time=Server tick global time limit -gui.computercraft:config.execution.max_main_computer_time=Server tick computer time limit - -gui.computercraft:config.http=HTTP -gui.computercraft:config.http.enabled=Enable the HTTP API -gui.computercraft:config.http.websocket_enabled=Enable websockets -gui.computercraft:config.http.whitelist=HTTP whitelist -gui.computercraft:config.http.blacklist=HTTP blacklist - -gui.computercraft:config.http.timeout=Timeout -gui.computercraft:config.http.max_requests=Maximum concurrent requests -gui.computercraft:config.http.max_download=Maximum response size -gui.computercraft:config.http.max_upload=Maximum request size -gui.computercraft:config.http.max_websockets=Maximum concurrent websockets -gui.computercraft:config.http.max_websocket_message=Maximum websocket message size - -gui.computercraft:config.peripheral=Peripherals -gui.computercraft:config.peripheral.command_block_enabled=Enable command block peripheral -gui.computercraft:config.peripheral.modem_range=Modem range (default) -gui.computercraft:config.peripheral.modem_high_altitude_range=Modem range (high-altitude) -gui.computercraft:config.peripheral.modem_range_during_storm=Modem range (bad weather) -gui.computercraft:config.peripheral.modem_high_altitude_range_during_storm=Modem range (high-altitude, bad weather) -gui.computercraft:config.peripheral.max_notes_per_tick=Maximum notes that a computer can play at once - -gui.computercraft:config.turtle=Turtles -gui.computercraft:config.turtle.need_fuel=Enable fuel -gui.computercraft:config.turtle.normal_fuel_limit=Turtle fuel limit -gui.computercraft:config.turtle.advanced_fuel_limit=Advanced Turtle fuel limit -gui.computercraft:config.turtle.obey_block_protection=Turtles obey block protection -gui.computercraft:config.turtle.can_push=Turtles can push entities -gui.computercraft:config.turtle.disabled_actions=Disabled turtle actions diff --git a/src/main/resources/assets/computercraft/lang/es_es.json b/src/main/resources/assets/computercraft/lang/es_es.json new file mode 100644 index 000000000..c0709f11e --- /dev/null +++ b/src/main/resources/assets/computercraft/lang/es_es.json @@ -0,0 +1,75 @@ +{ + + "block.computercraft.computer_normal": "Ordenador", + "block.computercraft.computer_advanced": "Ordenador avanzado", + "block.computercraft.computer_command": "Ordenador de Comandos", + + "block.computercraft.disk_drive": "Disco duro", + "block.computercraft.printer": "Impresora", + "block.computercraft.speaker": "Altavoz", + + "block.computercraft.monitor_normal": "Monitor", + "block.computercraft.monitor_advanced": "Monitor avanzado", + + "block.computercraft.wireless_modem_normal": "Módem sin cables", + "block.computercraft.wireless_modem_advanced": "Módem de Ender", + + "block.computercraft.wired_modem": "Módem cableado", + "block.computercraft.cable": "Cable de red", + + "block.computercraft.turtle_normal": "Tortuga", + "block.computercraft.turtle_normal.upgraded": "Tortuga %s", + "block.computercraft.turtle_normal.upgraded_twice": "Tortuga %s %s", + + "block.computercraft.turtle_advanced": "Tortuga avanzada", + "block.computercraft.turtle_advanced.upgraded": "Tortuga %s avanzada", + "block.computercraft.turtle_advanced.upgraded_twice": "Tortuga %s %s avanzada", + + "item.computercraft.disk": "Disquete", + "item.computercraft.treasure_disk": "Disquete (Tesoro)", + "item.computercraft.printed_page": "Página impresa", + "item.computercraft.printed_pages": "Páginas impresas", + "item.computercraft.printed_book": "Libro impreso", + + "item.computercraft.pocket_computer_normal": "Ordenador de bolsillo", + "item.computercraft.pocket_computer_normal.upgraded": "Ordenador de bolsillo %s", + "item.computercraft.pocket_computer_advanced": "Ordenador de bolsillo avanzado", + "item.computercraft.pocket_computer_advanced.upgraded": "Ordenador de bolsillo %s avanzado", + + "upgrade.minecraft.diamond_sword.adjective": "guerrera", + "upgrade.minecraft.diamond_shovel.adjective": "excavadora", + "upgrade.minecraft.diamond_pickaxe.adjective": "minera", + "upgrade.minecraft.diamond_axe.adjective": "taladora", + "upgrade.minecraft.diamond_hoe.adjective": "granjera", + "upgrade.minecraft.crafting_table.adjective": "crafteadora", + "upgrade.computercraft.wireless_modem_normal.adjective": "sin cables", + "upgrade.computercraft.wireless_modem_advanced.adjective": "ender", + "upgrade.computercraft.speaker.adjective": "ruidosa", + + "chat.computercraft.wired_modem.peripheral_connected": "El periférico "%s" se conectó a la red", + "chat.computercraft.wired_modem.peripheral_disconnected": "El periférico "%s" se desconectó de la red", + + "gui.computercraft.config.computer_space_limit": "Límite de memoria de ordenadores (en bytes)", + "gui.computercraft.config.floppy_space_limit": "Límite de memoria de disquetes (en bytes)", + "gui.computercraft.config.maximum_open_files": "Archivos abiertos máximos por cada ordenador", + "gui.computercraft.config.disable_lua51_features": "Deshabilitar funciones de Lua 5.1", + "gui.computercraft.config.default_computer_settings": "Configuración de Ordenador por defecto", + "gui.computercraft.config.log_computer_errors": "Grabar errores periféricos", + + "gui.computercraft.config.http.enabled": "Habilitar API de HTTP", + "gui.computercraft.config.http.whitelist": "Lista blanca de HTTP", + "gui.computercraft.config.http.blacklist": "Lista negra de HTTP", + + "gui.computercraft.config.peripheral.command_block_enabled": "Habilitar bloque de comandos periférico", + "gui.computercraft.config.peripheral.modem_range": "Rango del módem (Por defecto)", + "gui.computercraft.config.peripheral.modem_high_altitude_range": "Rango del módem (en altitud)", + "gui.computercraft.config.peripheral.modem_range_during_storm": "Rango del módem (mal tiempo)", + "gui.computercraft.config.peripheral.modem_high_altitude_range_during_storm": "Rango del módem (en altitud con mal tiempo)", + "gui.computercraft.config.peripheral.max_notes_per_tick": "Notas máximas que un ordenador puede tocar a la vez", + + "gui.computercraft.config.turtle.need_fuel": "Habilitar combustible", + "gui.computercraft.config.turtle.normal_fuel_limit": "Límite de combustible de las tortugas", + "gui.computercraft.config.turtle.advanced_fuel_limit": "Límite de combustible de las tortugas avanzadas", + "gui.computercraft.config.turtle.obey_block_protection": "Las tortugas obedecen protección de bloques", + "gui.computercraft.config.turtle.can_push": "Las tortugas pueden empujar entidades" +} diff --git a/src/main/resources/assets/computercraft/lang/es_es.lang b/src/main/resources/assets/computercraft/lang/es_es.lang deleted file mode 100644 index fa2129634..000000000 --- a/src/main/resources/assets/computercraft/lang/es_es.lang +++ /dev/null @@ -1,74 +0,0 @@ -tile.computercraft:computer.name=Ordenador -tile.computercraft:advanced_computer.name=Ordenador avanzado -tile.computercraft:drive.name=Disco duro -tile.computercraft:printer.name=Impresora -tile.computercraft:monitor.name=Monitor -tile.computercraft:advanced_monitor.name=Monitor avanzado -tile.computercraft:wireless_modem.name=Módem sin cables -tile.computercraft:wired_modem.name=Módem cableado -tile.computercraft:cable.name=Cable de red -tile.computercraft:command_computer.name=Ordenador de Comandos -tile.computercraft:advanced_modem.name=Módem de Ender -tile.computercraft:speaker.name=Altavoz - -tile.computercraft:turtle.name=Tortuga -tile.computercraft:turtle.upgraded.name=Tortuga %s -tile.computercraft:turtle.upgraded_twice.name=Tortuga %s %s -tile.computercraft:advanced_turtle.name=Tortuga avanzada -tile.computercraft:advanced_turtle.upgraded.name=Tortuga %s avanzada -tile.computercraft:advanced_turtle.upgraded_twice.name=Tortuga %s %s avanzada - -item.computercraft:disk.name=Disquete -item.computercraft:treasure_disk.name=Disquete (Tesoro) -item.computercraft:page.name=Página impresa -item.computercraft:pages.name=Páginas impresas -item.computercraft:book.name=Libro impreso - -item.computercraft:pocket_computer.name=Ordenador de bolsillo -item.computercraft:pocket_computer.upgraded.name=Ordenador de bolsillo %s -item.computercraft:advanced_pocket_computer.name=Ordenador de bolsillo avanzado -item.computercraft:advanced_pocket_computer.upgraded.name=Ordenador de bolsillo %s avanzado - -upgrade.minecraft:diamond_sword.adjective=guerrera -upgrade.minecraft:diamond_shovel.adjective=excavadora -upgrade.minecraft:diamond_pickaxe.adjective=minera -upgrade.minecraft:diamond_axe.adjective=taladora -upgrade.minecraft:diamond_hoe.adjective=granjera -upgrade.computercraft:wireless_modem.adjective=sin cables -upgrade.minecraft:crafting_table.adjective=crafteadora -upgrade.computercraft:advanced_modem.adjective=ender -upgrade.computercraft:speaker.adjective=ruidosa - -chat.computercraft.wired_modem.peripheral_connected=El periférico "%s" se conectó a la red -chat.computercraft.wired_modem.peripheral_disconnected=El periférico "%s" se desconectó de la red - -# Command descriptions, usage and any additional messages. - -# Names for the various tracking fields. - -# Misc tooltips - -# Config options -gui.computercraft:config.computer_space_limit=Límite de memoria de ordenadores (en bytes) -gui.computercraft:config.floppy_space_limit=Límite de memoria de disquetes (en bytes) -gui.computercraft:config.maximum_open_files=Archivos abiertos máximos por cada ordenador -gui.computercraft:config.disable_lua51_features=Deshabilitar funciones de Lua 5.1 -gui.computercraft:config.default_computer_settings=Configuración de Ordenador por defecto -gui.computercraft:config.log_computer_errors=Grabar errores periféricos - -gui.computercraft:config.http.enabled=Habilitar API de HTTP -gui.computercraft:config.http.whitelist=Lista blanca de HTTP -gui.computercraft:config.http.blacklist=Lista negra de HTTP - -gui.computercraft:config.peripheral.command_block_enabled=Habilitar bloque de comandos periférico -gui.computercraft:config.peripheral.modem_range=Rango del módem (Por defecto) -gui.computercraft:config.peripheral.modem_high_altitude_range=Rango del módem (en altitud) -gui.computercraft:config.peripheral.modem_range_during_storm=Rango del módem (mal tiempo) -gui.computercraft:config.peripheral.modem_high_altitude_range_during_storm=Rango del módem (en altitud con mal tiempo) -gui.computercraft:config.peripheral.max_notes_per_tick=Notas máximas que un ordenador puede tocar a la vez - -gui.computercraft:config.turtle.need_fuel=Habilitar combustible -gui.computercraft:config.turtle.normal_fuel_limit=Límite de combustible de las tortugas -gui.computercraft:config.turtle.advanced_fuel_limit=Límite de combustible de las tortugas avanzadas -gui.computercraft:config.turtle.obey_block_protection=Las tortugas obedecen protección de bloques -gui.computercraft:config.turtle.can_push=Las tortugas pueden empujar entidades diff --git a/src/main/resources/assets/computercraft/lang/fr_fr.json b/src/main/resources/assets/computercraft/lang/fr_fr.json new file mode 100644 index 000000000..958fcbde6 --- /dev/null +++ b/src/main/resources/assets/computercraft/lang/fr_fr.json @@ -0,0 +1,76 @@ +{ + + "block.computercraft.computer_normal": "Ordinateur", + "block.computercraft.computer_advanced": "Ordinateur avancé", + "block.computercraft.computer_command": "Ordinateur de commande", + + "block.computercraft.disk_drive": "Lecteur disque", + "block.computercraft.printer": "Imprimante", + "block.computercraft.speaker": "Haut-parleur", + + "block.computercraft.monitor_normal": "Moniteur", + "block.computercraft.monitor_advanced": "Moniteur avancé", + + "block.computercraft.wireless_modem_normal": "Modem sans fil", + "block.computercraft.wireless_modem_advanced": "Modem de l'Ender", + + "block.computercraft.wired_modem": "Modem filaire", + "block.computercraft.cable": "Câble réseau", + "block.computercraft.wired_modem_full": "Modem filaire", + + "block.computercraft.turtle_normal": "Tortue", + "block.computercraft.turtle_normal.upgraded": "Tortue %s", + "block.computercraft.turtle_normal.upgraded_twice": "Tortue %s %s", + + "block.computercraft.turtle_advanced": "Tortue avancée", + "block.computercraft.turtle_advanced.upgraded": "Tortue %s avancée", + "block.computercraft.turtle_advanced.upgraded_twice": "Tortue %s %s avancée", + + "item.computercraft.disk": "Disquette", + "item.computercraft.treasure_disk": "Disquette", + "item.computercraft.printed_page": "Imprimé", + "item.computercraft.printed_pages": "Imprimés", + "item.computercraft.printed_book": "Livre imprimé", + + "item.computercraft.pocket_computer_normal": "Ordinateur de poche", + "item.computercraft.pocket_computer_normal.upgraded": "Ordinateur de poche %s", + "item.computercraft.pocket_computer_advanced": "Ordinateur de poche avancé", + "item.computercraft.pocket_computer_advanced.upgraded": "Ordinateur de poche %s avancé", + + "upgrade.minecraft.diamond_sword.adjective": "combattante", + "upgrade.minecraft.diamond_shovel.adjective": "excavatrice", + "upgrade.minecraft.diamond_pickaxe.adjective": "minière", + "upgrade.minecraft.diamond_axe.adjective": "forestière", + "upgrade.minecraft.diamond_hoe.adjective": "agricole", + "upgrade.minecraft.crafting_table.adjective": "ouvrière", + "upgrade.computercraft.wireless_modem_normal.adjective": "sans fil", + "upgrade.computercraft.wireless_modem_advanced.adjective": "de l'Ender", + "upgrade.computercraft.speaker.adjective": "parlante", + + "chat.computercraft.wired_modem.peripheral_connected": "Le periphérique \"%s\" est connecté au réseau", + "chat.computercraft.wired_modem.peripheral_disconnected": "Le periphérique \"%s\" est déconnecté du réseau", + + "gui.computercraft.config.computer_space_limit": "Espace disque d'un Ordinateur (octets)", + "gui.computercraft.config.floppy_space_limit": "Espace disque d'une Disquette (octets)", + "gui.computercraft.config.maximum_open_files": "Maximum de fichier ouvert par Ordinateur", + "gui.computercraft.config.disable_lua51_features": "Désactiver les particularités de Lua 5.1", + "gui.computercraft.config.default_computer_settings": "Configuration d'Ordinateur par défaut", + "gui.computercraft.config.log_computer_errors": "Journal d'erreur périphériques", + + "gui.computercraft.config.http.enabled": "Permettre l'API HTTP", + "gui.computercraft.config.http.whitelist": "HTTP liste blanche", + "gui.computercraft.config.http.blacklist": "HTTP liste noire", + + "gui.computercraft.config.peripheral.command_block_enabled": "Permettre l'accès d'un Bloc de Commande par périphérique", + "gui.computercraft.config.peripheral.modem_range": "Portée d'un Modem (par défaut)", + "gui.computercraft.config.peripheral.modem_high_altitude_range": "Portée d'un Modem (en haute altitude)", + "gui.computercraft.config.peripheral.modem_range_during_storm": "Portée d'un Modem (par mauvais temps)", + "gui.computercraft.config.peripheral.modem_high_altitude_range_during_storm": "Portée d'un Modem (en haute altitude, par mauvais temps)", + "gui.computercraft.config.peripheral.max_notes_per_tick": "Maximum de notes simultanées jouées par Ordinateur", + + "gui.computercraft.config.turtle.need_fuel": "Activer la nécessité de carburant au mouvement des Tortues", + "gui.computercraft.config.turtle.normal_fuel_limit": "Limite de carburant par Tortue", + "gui.computercraft.config.turtle.advanced_fuel_limit": "Limite de carburant par Tortue avancée", + "gui.computercraft.config.turtle.obey_block_protection": "Les Tortues respectent les protections de blocs", + "gui.computercraft.config.turtle.can_push": "Les Tortues peuvent pousser les entitées" +} diff --git a/src/main/resources/assets/computercraft/lang/fr_fr.lang b/src/main/resources/assets/computercraft/lang/fr_fr.lang deleted file mode 100644 index e1f151235..000000000 --- a/src/main/resources/assets/computercraft/lang/fr_fr.lang +++ /dev/null @@ -1,74 +0,0 @@ -tile.computercraft:computer.name=Ordinateur -tile.computercraft:advanced_computer.name=Ordinateur avancé -tile.computercraft:drive.name=Lecteur disque -tile.computercraft:printer.name=Imprimante -tile.computercraft:monitor.name=Moniteur -tile.computercraft:advanced_monitor.name=Moniteur avancé -tile.computercraft:wireless_modem.name=Modem sans fil -tile.computercraft:wired_modem.name=Modem filaire -tile.computercraft:cable.name=Câble réseau -tile.computercraft:command_computer.name=Ordinateur de commande -tile.computercraft:advanced_modem.name=Modem de l'Ender -tile.computercraft:speaker.name=Haut-parleur - -tile.computercraft:turtle.name=Tortue -tile.computercraft:turtle.upgraded.name=Tortue %s -tile.computercraft:turtle.upgraded_twice.name=Tortue %s %s -tile.computercraft:advanced_turtle.name=Tortue avancée -tile.computercraft:advanced_turtle.upgraded.name=Tortue %s avancée -tile.computercraft:advanced_turtle.upgraded_twice.name=Tortue %s %s avancée - -item.computercraft:disk.name=Disquette -item.computercraft:treasure_disk.name=Disquette -item.computercraft:page.name=Imprimé -item.computercraft:pages.name=Imprimés -item.computercraft:book.name=Livre imprimé - -item.computercraft:pocket_computer.name=Ordinateur de poche -item.computercraft:pocket_computer.upgraded.name=Ordinateur de poche %s -item.computercraft:advanced_pocket_computer.name=Ordinateur de poche avancé -item.computercraft:advanced_pocket_computer.upgraded.name=Ordinateur de poche %s avancé - -upgrade.minecraft:diamond_sword.adjective=combattante -upgrade.minecraft:diamond_shovel.adjective=excavatrice -upgrade.minecraft:diamond_pickaxe.adjective=minière -upgrade.minecraft:diamond_axe.adjective=forestière -upgrade.minecraft:diamond_hoe.adjective=agricole -upgrade.computercraft:wireless_modem.adjective=sans fil -upgrade.minecraft:crafting_table.adjective=ouvrière -upgrade.computercraft:advanced_modem.adjective=de l'Ender -upgrade.computercraft:speaker.adjective=parlante - -chat.computercraft.wired_modem.peripheral_connected=Le periphérique "%s" est connecté au réseau -chat.computercraft.wired_modem.peripheral_disconnected=Le periphérique "%s" est déconnecté du réseau - -# Command descriptions, usage and any additional messages. - -# Names for the various tracking fields. - -# Misc tooltips - -# Config options -gui.computercraft:config.computer_space_limit=Espace disque d'un Ordinateur (octets) -gui.computercraft:config.floppy_space_limit=Espace disque d'une Disquette (octets) -gui.computercraft:config.maximum_open_files=Maximum de fichier ouvert par Ordinateur -gui.computercraft:config.disable_lua51_features=Désactiver les particularités de Lua 5.1 -gui.computercraft:config.default_computer_settings=Configuration d'Ordinateur par défaut -gui.computercraft:config.log_computer_errors=Journal d'erreur périphériques - -gui.computercraft:config.http.enabled=Permettre l'API HTTP -gui.computercraft:config.http.whitelist=HTTP liste blanche -gui.computercraft:config.http.blacklist=HTTP liste noire - -gui.computercraft:config.peripheral.command_block_enabled=Permettre l'accès d'un Bloc de Commande par périphérique -gui.computercraft:config.peripheral.modem_range=Portée d'un Modem (par défaut) -gui.computercraft:config.peripheral.modem_high_altitude_range=Portée d'un Modem (en haute altitude) -gui.computercraft:config.peripheral.modem_range_during_storm=Portée d'un Modem (par mauvais temps) -gui.computercraft:config.peripheral.modem_high_altitude_range_during_storm=Portée d'un Modem (en haute altitude, par mauvais temps) -gui.computercraft:config.peripheral.max_notes_per_tick=Maximum de notes simultanées jouées par Ordinateur - -gui.computercraft:config.turtle.need_fuel=Activer la nécessité de carburant au mouvement des Tortues -gui.computercraft:config.turtle.normal_fuel_limit=Limite de carburant par Tortue -gui.computercraft:config.turtle.advanced_fuel_limit=Limite de carburant par Tortue avancée -gui.computercraft:config.turtle.obey_block_protection=Les Tortues respectent les protections de blocs -gui.computercraft:config.turtle.can_push=Les Tortues peuvent pousser les entitées diff --git a/src/main/resources/assets/computercraft/lang/it_it.json b/src/main/resources/assets/computercraft/lang/it_it.json new file mode 100644 index 000000000..620c8b515 --- /dev/null +++ b/src/main/resources/assets/computercraft/lang/it_it.json @@ -0,0 +1,92 @@ +{ + + "block.computercraft.computer_normal": "Computer", + "block.computercraft.computer_advanced": "Computer Avanzato", + "block.computercraft.computer_command": "Computer Commando", + + "block.computercraft.disk_drive": "Lettore disco", + "block.computercraft.printer": "Stampante", + "block.computercraft.speaker": "Altoparlante", + + "block.computercraft.monitor_normal": "Monitor", + "block.computercraft.monitor_advanced": "Monitor Avanzato", + + "block.computercraft.wireless_modem_normal": "Modem Wireless", + "block.computercraft.wireless_modem_advanced": "Modem di Ender", + + "block.computercraft.wired_modem": "Modem Cablato", + "block.computercraft.cable": "Cavo Di Rete", + + "block.computercraft.turtle_normal": "Tartaruga", + "block.computercraft.turtle_normal.upgraded": "Tartaruga %s", + "block.computercraft.turtle_normal.upgraded_twice": "Tartaruga %s %s", + + "block.computercraft.turtle_advanced": "Tartaruga Avanzata", + "block.computercraft.turtle_advanced.upgraded": "Tartaruga %s Avanzata", + "block.computercraft.turtle_advanced.upgraded_twice": "Tartaruga %s %s Avanzata", + + "item.computercraft.disk": "Disco Floppy", + "item.computercraft.treasure_disk": "Disco Floppy", + "item.computercraft.printed_page": "Pagina Stampata", + "item.computercraft.printed_pages": "Pagine Stampate", + "item.computercraft.printed_book": "Libro Stampato", + + "item.computercraft.pocket_computer_normal": "Computer Tascabile", + "item.computercraft.pocket_computer_normal.upgraded": "Computer Tascabile %s", + "item.computercraft.pocket_computer_advanced": "Computer Tascabile Avanzato", + "item.computercraft.pocket_computer_advanced.upgraded": "Computer Tascabile %s Avanzato", + + "upgrade.minecraft.diamond_sword.adjective": "Da Combattimento", + "upgrade.minecraft.diamond_shovel.adjective": "Scavatrice", + "upgrade.minecraft.diamond_pickaxe.adjective": "Minatrice", + "upgrade.minecraft.diamond_axe.adjective": "Taglialegna", + "upgrade.minecraft.diamond_hoe.adjective": "Contadina", + "upgrade.minecraft.crafting_table.adjective": "Artigiano", + "upgrade.computercraft.wireless_modem_normal.adjective": "Wireless", + "upgrade.computercraft.wireless_modem_advanced.adjective": "Ender", + "upgrade.computercraft.speaker.adjective": "Rumoroso", + + "chat.computercraft.wired_modem.peripheral_connected": "Periferica \"%s\" connessa alla rete", + "chat.computercraft.wired_modem.peripheral_disconnected": "Periferica \"%s\" disconessa dalla rete", + + "gui.computercraft.tooltip.copy": "Copia negli appunti", + + "gui.computercraft.config.computer_space_limit": "Limite spazio Computer (bytes)", + "gui.computercraft.config.floppy_space_limit": "Limite spazio Disco Floppy (bytes)", + "gui.computercraft.config.maximum_open_files": "Massimo file aperti per computer", + "gui.computercraft.config.disable_lua51_features": "Disattiva features Lua 5.1", + "gui.computercraft.config.default_computer_settings": "Impostazioni Computer predefinite", + "gui.computercraft.config.debug_enabled": "Attiva libreria di debug", + "gui.computercraft.config.log_computer_errors": "Salva errori computer", + + "gui.computercraft.config.execution.computer_threads": "Threads computer", + + "gui.computercraft.config.http": "HTTP", + "gui.computercraft.config.http.enabled": "Attiva l'API HTTP", + "gui.computercraft.config.http.websocket_enabled": "Attiva websocket", + "gui.computercraft.config.http.whitelist": "Lista bianca HTTP", + "gui.computercraft.config.http.blacklist": "Lista nera HTTP", + + "gui.computercraft.config.http.timeout": "Tempo di scadenza", + "gui.computercraft.config.http.max_requests": "Richieste correnti massime", + "gui.computercraft.config.http.max_download": "Massimo grandezza risposte", + "gui.computercraft.config.http.max_upload": "Massimo grandezza richieste", + "gui.computercraft.config.http.max_websockets": "Connessioni websocket massime", + "gui.computercraft.config.http.max_websocket_message": "Massimo grandezza messaggi websocket", + + "gui.computercraft.config.peripheral": "Periferiche", + "gui.computercraft.config.peripheral.command_block_enabled": "Attiva periferica blocco comandi", + "gui.computercraft.config.peripheral.modem_range": "Raggio Modem (default)", + "gui.computercraft.config.peripheral.modem_high_altitude_range": "Raggio Modem (alta quota)", + "gui.computercraft.config.peripheral.modem_range_during_storm": "Raggio Modem (brutto tempo)", + "gui.computercraft.config.peripheral.modem_high_altitude_range_during_storm": "Raggio Modem (alta quota, brutto tempo)", + "gui.computercraft.config.peripheral.max_notes_per_tick": "Note massime alla volta", + + "gui.computercraft.config.turtle": "Tartarughe", + "gui.computercraft.config.turtle.need_fuel": "Attiva carburante", + "gui.computercraft.config.turtle.normal_fuel_limit": "Limite carburante tartarughe", + "gui.computercraft.config.turtle.advanced_fuel_limit": "Limite carburante tartarughe avanzate", + "gui.computercraft.config.turtle.obey_block_protection": "Tartarughe rispettano le protezioni", + "gui.computercraft.config.turtle.can_push": "Le tartarughe possono spingere le entità", + "gui.computercraft.config.turtle.disabled_actions": "Disattiva azioni tartarughe" +} diff --git a/src/main/resources/assets/computercraft/lang/it_it.lang b/src/main/resources/assets/computercraft/lang/it_it.lang deleted file mode 100644 index 6be7df879..000000000 --- a/src/main/resources/assets/computercraft/lang/it_it.lang +++ /dev/null @@ -1,90 +0,0 @@ -tile.computercraft:computer.name=Computer -tile.computercraft:advanced_computer.name=Computer Avanzato -tile.computercraft:drive.name=Lettore disco -tile.computercraft:printer.name=Stampante -tile.computercraft:monitor.name=Monitor -tile.computercraft:advanced_monitor.name=Monitor Avanzato -tile.computercraft:wireless_modem.name=Modem Wireless -tile.computercraft:wired_modem.name=Modem Cablato -tile.computercraft:cable.name=Cavo Di Rete -tile.computercraft:command_computer.name=Computer Commando -tile.computercraft:advanced_modem.name=Modem di Ender -tile.computercraft:speaker.name=Altoparlante - -tile.computercraft:turtle.name=Tartaruga -tile.computercraft:turtle.upgraded.name=Tartaruga %s -tile.computercraft:turtle.upgraded_twice.name=Tartaruga %s %s -tile.computercraft:advanced_turtle.name=Tartaruga Avanzata -tile.computercraft:advanced_turtle.upgraded.name=Tartaruga %s Avanzata -tile.computercraft:advanced_turtle.upgraded_twice.name=Tartaruga %s %s Avanzata - -item.computercraft:disk.name=Disco Floppy -item.computercraft:treasure_disk.name=Disco Floppy -item.computercraft:page.name=Pagina Stampata -item.computercraft:pages.name=Pagine Stampate -item.computercraft:book.name=Libro Stampato - -item.computercraft:pocket_computer.name=Computer Tascabile -item.computercraft:pocket_computer.upgraded.name=Computer Tascabile %s -item.computercraft:advanced_pocket_computer.name=Computer Tascabile Avanzato -item.computercraft:advanced_pocket_computer.upgraded.name=Computer Tascabile %s Avanzato - -upgrade.minecraft:diamond_sword.adjective=Da Combattimento -upgrade.minecraft:diamond_shovel.adjective=Scavatrice -upgrade.minecraft:diamond_pickaxe.adjective=Minatrice -upgrade.minecraft:diamond_axe.adjective=Taglialegna -upgrade.minecraft:diamond_hoe.adjective=Contadina -upgrade.computercraft:wireless_modem.adjective=Wireless -upgrade.minecraft:crafting_table.adjective=Artigiano -upgrade.computercraft:advanced_modem.adjective=Ender -upgrade.computercraft:speaker.adjective=Rumoroso - -chat.computercraft.wired_modem.peripheral_connected=Periferica "%s" connessa alla rete -chat.computercraft.wired_modem.peripheral_disconnected=Periferica "%s" disconessa dalla rete - -# Command descriptions, usage and any additional messages. - -# Names for the various tracking fields. - -# Misc tooltips -gui.computercraft.tooltip.copy=Copia negli appunti - -# Config options -gui.computercraft:config.computer_space_limit=Limite spazio Computer (bytes) -gui.computercraft:config.floppy_space_limit=Limite spazio Disco Floppy (bytes) -gui.computercraft:config.maximum_open_files=Massimo file aperti per computer -gui.computercraft:config.disable_lua51_features=Disattiva features Lua 5.1 -gui.computercraft:config.default_computer_settings=Impostazioni Computer predefinite -gui.computercraft:config.debug_enabled=Attiva libreria di debug -gui.computercraft:config.log_computer_errors=Salva errori computer - -gui.computercraft:config.execution.computer_threads=Threads computer - -gui.computercraft:config.http=HTTP -gui.computercraft:config.http.enabled=Attiva l'API HTTP -gui.computercraft:config.http.websocket_enabled=Attiva websocket -gui.computercraft:config.http.whitelist=Lista bianca HTTP -gui.computercraft:config.http.blacklist=Lista nera HTTP - -gui.computercraft:config.http.timeout=Tempo di scadenza -gui.computercraft:config.http.max_requests=Richieste correnti massime -gui.computercraft:config.http.max_download=Massimo grandezza risposte -gui.computercraft:config.http.max_upload=Massimo grandezza richieste -gui.computercraft:config.http.max_websockets=Connessioni websocket massime -gui.computercraft:config.http.max_websocket_message=Massimo grandezza messaggi websocket - -gui.computercraft:config.peripheral=Periferiche -gui.computercraft:config.peripheral.command_block_enabled=Attiva periferica blocco comandi -gui.computercraft:config.peripheral.modem_range=Raggio Modem (default) -gui.computercraft:config.peripheral.modem_high_altitude_range=Raggio Modem (alta quota) -gui.computercraft:config.peripheral.modem_range_during_storm=Raggio Modem (brutto tempo) -gui.computercraft:config.peripheral.modem_high_altitude_range_during_storm=Raggio Modem (alta quota, brutto tempo) -gui.computercraft:config.peripheral.max_notes_per_tick=Note massime alla volta - -gui.computercraft:config.turtle=Tartarughe -gui.computercraft:config.turtle.need_fuel=Attiva carburante -gui.computercraft:config.turtle.normal_fuel_limit=Limite carburante tartarughe -gui.computercraft:config.turtle.advanced_fuel_limit=Limite carburante tartarughe avanzate -gui.computercraft:config.turtle.obey_block_protection=Tartarughe rispettano le protezioni -gui.computercraft:config.turtle.can_push=Le tartarughe possono spingere le entità -gui.computercraft:config.turtle.disabled_actions=Disattiva azioni tartarughe diff --git a/src/main/resources/assets/computercraft/lang/pt_br.json b/src/main/resources/assets/computercraft/lang/pt_br.json new file mode 100644 index 000000000..c4b1f4963 --- /dev/null +++ b/src/main/resources/assets/computercraft/lang/pt_br.json @@ -0,0 +1,93 @@ +{ + + "block.computercraft.computer_normal": "Computador", + "block.computercraft.computer_advanced": "Computador Avançado", + "block.computercraft.computer_command": "Computador de Comandos", + + "block.computercraft.disk_drive": "Leitor de Disco", + "block.computercraft.printer": "Impressora", + "block.computercraft.speaker": "Alto-Falante", + + "block.computercraft.monitor_normal": "Monitor", + "block.computercraft.monitor_advanced": "Monitor Avançado", + + "block.computercraft.wireless_modem_normal": "Modem sem Fio", + "block.computercraft.wireless_modem_advanced": "Modem Ender", + + "block.computercraft.wired_modem": "Modem com Fio", + "block.computercraft.cable": "Cabo de Rede", + "block.computercraft.wired_modem_full": "Modem com Fio", + + "block.computercraft.turtle_normal": "Tartaruga", + "block.computercraft.turtle_normal.upgraded": "Tartaruga %s", + "block.computercraft.turtle_normal.upgraded_twice": "Tartaruga %s %s", + + "block.computercraft.turtle_advanced": "Tartaruga Avançada", + "block.computercraft.turtle_advanced.upgraded": "Tartaruga Avançada %s", + "block.computercraft.turtle_advanced.upgraded_twice": "Tartaruga Avançada %s %s", + + "item.computercraft.disk": "Disquete", + "item.computercraft.treasure_disk": "Disquete", + "item.computercraft.printed_page": "Página Impressa", + "item.computercraft.printed_pages": "Páginas Impressas", + "item.computercraft.printed_book": "Livro Impresso", + + "item.computercraft.pocket_computer_normal": "Computador Portátil", + "item.computercraft.pocket_computer_normal.upgraded": "Computador Portátil %s", + "item.computercraft.pocket_computer_advanced": "Computador Portátil Avançado", + "item.computercraft.pocket_computer_advanced.upgraded": "Computador Portátil Avançado %s", + + "upgrade.minecraft.diamond_sword.adjective": "Lutadora", + "upgrade.minecraft.diamond_shovel.adjective": "Escavadora", + "upgrade.minecraft.diamond_pickaxe.adjective": "Mineiradora", + "upgrade.minecraft.diamond_axe.adjective": "Lenhadora", + "upgrade.minecraft.diamond_hoe.adjective": "Fazendeira", + "upgrade.minecraft.crafting_table.adjective": "Artesã", + "upgrade.computercraft.wireless_modem_normal.adjective": "sem Fio", + "upgrade.computercraft.wireless_modem_advanced.adjective": "Ender", + "upgrade.computercraft.speaker.adjective": "(Alto-Falante)", + + "chat.computercraft.wired_modem.peripheral_connected": "Periférico \"%s\" conectado à rede", + "chat.computercraft.wired_modem.peripheral_disconnected": "Periférico \"%s\" desconectado da rede", + + "gui.computercraft.tooltip.copy": "Copiar para a área de transferência", + + "gui.computercraft.config.computer_space_limit": "Limite de espaço dos Computadores (bytes)", + "gui.computercraft.config.floppy_space_limit": "Limite de espaço dos Disquetes (bytes)", + "gui.computercraft.config.maximum_open_files": "Número máximo de arquivos em um computador", + "gui.computercraft.config.disable_lua51_features": "Desabilitar funcionalidade da Lua 5.1", + "gui.computercraft.config.default_computer_settings": "Configurações padrão para Computadores", + "gui.computercraft.config.debug_enabled": "Habilitar biblioteca de debug", + "gui.computercraft.config.log_computer_errors": "Registrar erros de computadores", + + "gui.computercraft.config.execution.computer_threads": "Threads por computador", + + "gui.computercraft.config.http": "HTTP", + "gui.computercraft.config.http.enabled": "Habilitar a biblioteca de HTTP", + "gui.computercraft.config.http.websocket_enabled": "Habilitar websockets", + "gui.computercraft.config.http.whitelist": "Lista de endereços autorizados", + "gui.computercraft.config.http.blacklist": "Lista de endereços proíbidos", + + "gui.computercraft.config.http.timeout": "Tempo limite para conexões", + "gui.computercraft.config.http.max_requests": "Limite de conexões paralelas", + "gui.computercraft.config.http.max_download": "Tamanho limite de respostas", + "gui.computercraft.config.http.max_upload": "Tamanho limite de pedidos", + "gui.computercraft.config.http.max_websockets": "Limite de conexões websocket", + "gui.computercraft.config.http.max_websocket_message": "Tamanho limite de mensagens websocket", + + "gui.computercraft.config.peripheral": "Periféricos", + "gui.computercraft.config.peripheral.command_block_enabled": "Habilitar periférico do bloco de comando", + "gui.computercraft.config.peripheral.modem_range": "Alcance do modem (padrão)", + "gui.computercraft.config.peripheral.modem_high_altitude_range": "Alcance do modem (altitude elevada)", + "gui.computercraft.config.peripheral.modem_range_during_storm": "Alcance do modem (clima ruim)", + "gui.computercraft.config.peripheral.modem_high_altitude_range_during_storm": "Alcance do modem (altitude elevada, clima ruim)", + "gui.computercraft.config.peripheral.max_notes_per_tick": "Número de notas que um computador pode tocar simultâneamente", + + "gui.computercraft.config.turtle": "Tartarugas", + "gui.computercraft.config.turtle.need_fuel": "Habilitar combustível", + "gui.computercraft.config.turtle.normal_fuel_limit": "Limite de combustível de Tartarugas", + "gui.computercraft.config.turtle.advanced_fuel_limit": "Limite de combustível de Tartarugas Avançadas", + "gui.computercraft.config.turtle.obey_block_protection": "Tartarugas obedecem proteção de blocos", + "gui.computercraft.config.turtle.can_push": "Tartarugas podem empurrar entidades", + "gui.computercraft.config.turtle.disabled_actions": "Ações proíbidas para tartarugas" +} diff --git a/src/main/resources/assets/computercraft/lang/pt_br.lang b/src/main/resources/assets/computercraft/lang/pt_br.lang deleted file mode 100644 index d9706ffa5..000000000 --- a/src/main/resources/assets/computercraft/lang/pt_br.lang +++ /dev/null @@ -1,90 +0,0 @@ -tile.computercraft:computer.name=Computador -tile.computercraft:advanced_computer.name=Computador Avançado -tile.computercraft:drive.name=Leitor de Disco -tile.computercraft:printer.name=Impressora -tile.computercraft:monitor.name=Monitor -tile.computercraft:advanced_monitor.name=Monitor Avançado -tile.computercraft:wireless_modem.name=Modem sem Fio -tile.computercraft:wired_modem.name=Modem com Fio -tile.computercraft:cable.name=Cabo de Rede -tile.computercraft:command_computer.name=Computador de Comandos -tile.computercraft:advanced_modem.name=Modem Ender -tile.computercraft:speaker.name=Alto-Falante - -tile.computercraft:turtle.name=Tartaruga -tile.computercraft:turtle.upgraded.name=Tartaruga %s -tile.computercraft:turtle.upgraded_twice.name=Tartaruga %s %s -tile.computercraft:advanced_turtle.name=Tartaruga Avançada -tile.computercraft:advanced_turtle.upgraded.name=Tartaruga Avançada %s -tile.computercraft:advanced_turtle.upgraded_twice.name=Tartaruga Avançada %s %s - -item.computercraft:disk.name=Disquete -item.computercraft:treasure_disk.name=Disquete -item.computercraft:page.name=Página Impressa -item.computercraft:pages.name=Páginas Impressas -item.computercraft:book.name=Livro Impresso - -item.computercraft:pocket_computer.name=Computador Portátil -item.computercraft:pocket_computer.upgraded.name=Computador Portátil %s -item.computercraft:advanced_pocket_computer.name=Computador Portátil Avançado -item.computercraft:advanced_pocket_computer.upgraded.name=Computador Portátil Avançado %s - -upgrade.minecraft:diamond_sword.adjective=Lutadora -upgrade.minecraft:diamond_shovel.adjective=Escavadora -upgrade.minecraft:diamond_pickaxe.adjective=Mineiradora -upgrade.minecraft:diamond_axe.adjective=Lenhadora -upgrade.minecraft:diamond_hoe.adjective=Fazendeira -upgrade.computercraft:wireless_modem.adjective=sem Fio -upgrade.minecraft:crafting_table.adjective=Artesã -upgrade.computercraft:advanced_modem.adjective=Ender -upgrade.computercraft:speaker.adjective=(Alto-Falante) - -chat.computercraft.wired_modem.peripheral_connected=Periférico "%s" conectado à rede -chat.computercraft.wired_modem.peripheral_disconnected=Periférico "%s" desconectado da rede - -# Command descriptions, usage and any additional messages. - -# Names for the various tracking fields. - -# Misc tooltips -gui.computercraft.tooltip.copy=Copiar para a área de transferência - -# Config options -gui.computercraft:config.computer_space_limit=Limite de espaço dos Computadores (bytes) -gui.computercraft:config.floppy_space_limit=Limite de espaço dos Disquetes (bytes) -gui.computercraft:config.maximum_open_files=Número máximo de arquivos em um computador -gui.computercraft:config.disable_lua51_features=Desabilitar funcionalidade da Lua 5.1 -gui.computercraft:config.default_computer_settings=Configurações padrão para Computadores -gui.computercraft:config.debug_enabled=Habilitar biblioteca de debug -gui.computercraft:config.log_computer_errors=Registrar erros de computadores - -gui.computercraft:config.execution.computer_threads=Threads por computador - -gui.computercraft:config.http=HTTP -gui.computercraft:config.http.enabled=Habilitar a biblioteca de HTTP -gui.computercraft:config.http.websocket_enabled=Habilitar websockets -gui.computercraft:config.http.whitelist=Lista de endereços autorizados -gui.computercraft:config.http.blacklist=Lista de endereços proíbidos - -gui.computercraft:config.http.timeout=Tempo limite para conexões -gui.computercraft:config.http.max_requests=Limite de conexões paralelas -gui.computercraft:config.http.max_download=Tamanho limite de respostas -gui.computercraft:config.http.max_upload=Tamanho limite de pedidos -gui.computercraft:config.http.max_websockets=Limite de conexões websocket -gui.computercraft:config.http.max_websocket_message=Tamanho limite de mensagens websocket - -gui.computercraft:config.peripheral=Periféricos -gui.computercraft:config.peripheral.command_block_enabled=Habilitar periférico do bloco de comando -gui.computercraft:config.peripheral.modem_range=Alcance do modem (padrão) -gui.computercraft:config.peripheral.modem_high_altitude_range=Alcance do modem (altitude elevada) -gui.computercraft:config.peripheral.modem_range_during_storm=Alcance do modem (clima ruim) -gui.computercraft:config.peripheral.modem_high_altitude_range_during_storm=Alcance do modem (altitude elevada, clima ruim) -gui.computercraft:config.peripheral.max_notes_per_tick=Número de notas que um computador pode tocar simultâneamente - -gui.computercraft:config.turtle=Tartarugas -gui.computercraft:config.turtle.need_fuel=Habilitar combustível -gui.computercraft:config.turtle.normal_fuel_limit=Limite de combustível de Tartarugas -gui.computercraft:config.turtle.advanced_fuel_limit=Limite de combustível de Tartarugas Avançadas -gui.computercraft:config.turtle.obey_block_protection=Tartarugas obedecem proteção de blocos -gui.computercraft:config.turtle.can_push=Tartarugas podem empurrar entidades -gui.computercraft:config.turtle.disabled_actions=Ações proíbidas para tartarugas diff --git a/src/main/resources/assets/computercraft/lang/sv_se.json b/src/main/resources/assets/computercraft/lang/sv_se.json new file mode 100644 index 000000000..81648dec6 --- /dev/null +++ b/src/main/resources/assets/computercraft/lang/sv_se.json @@ -0,0 +1,93 @@ +{ + + "block.computercraft.computer_normal": "Dator", + "block.computercraft.computer_advanced": "Avancerad Dator", + "block.computercraft.computer_command": "Kommando Dator", + + "block.computercraft.disk_drive": "Diskettläsare", + "block.computercraft.printer": "Skrivare", + "block.computercraft.speaker": "Högtalare", + + "block.computercraft.monitor_normal": "Skärm", + "block.computercraft.monitor_advanced": "Avancerad Skärm", + + "block.computercraft.wireless_modem_normal": "Trådlöst Modem", + "block.computercraft.wireless_modem_advanced": "Ender Modem", + + "block.computercraft.wired_modem": "Trådat Modem", + "block.computercraft.cable": "Nätverkskabel", + "block.computercraft.wired_modem_full": "Trådat Modem", + + "block.computercraft.turtle_normal": "Turtle", + "block.computercraft.turtle_normal.upgraded": "%s Turtle", + "block.computercraft.turtle_normal.upgraded_twice": "%s %s Turtle", + + "block.computercraft.turtle_advanced": "Avancerad Turtle", + "block.computercraft.turtle_advanced.upgraded": "Avancerad %s Turtle", + "block.computercraft.turtle_advanced.upgraded_twice": "Avancerad %s %s Turtle", + + "item.computercraft.disk": "Diskett", + "item.computercraft.treasure_disk": "Diskett", + "item.computercraft.printed_page": "Utskriven Sida", + "item.computercraft.printed_pages": "Utskrivna Sidor", + "item.computercraft.printed_book": "Tryckt bok", + + "item.computercraft.pocket_computer_normal": "Fickdator", + "item.computercraft.pocket_computer_normal.upgraded": "%s Fickdator", + "item.computercraft.pocket_computer_advanced": "Avancerad Fickdator", + "item.computercraft.pocket_computer_advanced.upgraded": "Avancerad %s Fickdator", + + "upgrade.minecraft.diamond_sword.adjective": "Närstridande", + "upgrade.minecraft.diamond_shovel.adjective": "Grävande", + "upgrade.minecraft.diamond_pickaxe.adjective": "Brytande", + "upgrade.minecraft.diamond_axe.adjective": "Fällande", + "upgrade.minecraft.diamond_hoe.adjective": "Odlande", + "upgrade.minecraft.crafting_table.adjective": "Händig", + "upgrade.computercraft.wireless_modem_normal.adjective": "Trådlös", + "upgrade.computercraft.wireless_modem_advanced.adjective": "Ender", + "upgrade.computercraft.speaker.adjective": "Högljudd", + + "chat.computercraft.wired_modem.peripheral_connected": "Kringutrustning \"%s\" är kopplad till nätverket", + "chat.computercraft.wired_modem.peripheral_disconnected": "Kringutrustning \"%s\" är frånkopplad från nätverket", + + "gui.computercraft.tooltip.copy": "Kopiera till urklipp", + + "gui.computercraft.config.computer_space_limit": "Dator maximalt utrymme (bytes)", + "gui.computercraft.config.floppy_space_limit": "Diskett maximalt utrymme (bytes)", + "gui.computercraft.config.maximum_open_files": "Max antal filer öppna per dator", + "gui.computercraft.config.disable_lua51_features": "Avaktivera Lua 5.1 funktioner", + "gui.computercraft.config.default_computer_settings": "Standard Datorinställningar", + "gui.computercraft.config.debug_enabled": "Aktivera debug bibliotek", + "gui.computercraft.config.log_computer_errors": "Logga datorfel", + + "gui.computercraft.config.execution.computer_threads": "Dator trådar", + + "gui.computercraft.config.http": "HTTP", + "gui.computercraft.config.http.enabled": "Aktivera HTTP API", + "gui.computercraft.config.http.websocket_enabled": "Aktivera websockets", + "gui.computercraft.config.http.whitelist": "HTTP vitlista", + "gui.computercraft.config.http.blacklist": "HTTP svartlista", + + "gui.computercraft.config.http.timeout": "Timeout", + "gui.computercraft.config.http.max_requests": "Maximalt antal samgående förfrågningar", + "gui.computercraft.config.http.max_download": "Maximal svarsstorlek", + "gui.computercraft.config.http.max_upload": "Maximal förfrågan", + "gui.computercraft.config.http.max_websockets": "Maximalt antal samgående websockets", + "gui.computercraft.config.http.max_websocket_message": "Maximal websocket meddelandestorlek", + + "gui.computercraft.config.peripheral": "Kringutrustning", + "gui.computercraft.config.peripheral.command_block_enabled": "Aktivera kommandoblock som kringutrustning", + "gui.computercraft.config.peripheral.modem_range": "Modem räckvidd (standard)", + "gui.computercraft.config.peripheral.modem_high_altitude_range": "Modem räckvidd (hög altitud)", + "gui.computercraft.config.peripheral.modem_range_during_storm": "Modem räckvidd (dåligt väder)", + "gui.computercraft.config.peripheral.modem_high_altitude_range_during_storm": "Modem räckvidd (hög altitud, dåligt väder)", + "gui.computercraft.config.peripheral.max_notes_per_tick": "Maximalt antal musiknoter en dator kan spela samtidigt", + + "gui.computercraft.config.turtle": "Turtles", + "gui.computercraft.config.turtle.need_fuel": "Aktivera bränsle", + "gui.computercraft.config.turtle.normal_fuel_limit": "Turtle bränslegräns", + "gui.computercraft.config.turtle.advanced_fuel_limit": "Advanced Turtle bränslegräns", + "gui.computercraft.config.turtle.obey_block_protection": "Turtles lyder blockskydd", + "gui.computercraft.config.turtle.can_push": "Turtles kan putta entiteter", + "gui.computercraft.config.turtle.disabled_actions": "Avaktiverade turtle åtgärder" +} diff --git a/src/main/resources/assets/computercraft/lang/sv_se.lang b/src/main/resources/assets/computercraft/lang/sv_se.lang deleted file mode 100644 index ad4dc0ceb..000000000 --- a/src/main/resources/assets/computercraft/lang/sv_se.lang +++ /dev/null @@ -1,90 +0,0 @@ -tile.computercraft:computer.name=Dator -tile.computercraft:advanced_computer.name=Avancerad Dator -tile.computercraft:drive.name=Diskettläsare -tile.computercraft:printer.name=Skrivare -tile.computercraft:monitor.name=Skärm -tile.computercraft:advanced_monitor.name=Avancerad Skärm -tile.computercraft:wireless_modem.name=Trådlöst Modem -tile.computercraft:wired_modem.name=Trådat Modem -tile.computercraft:cable.name=Nätverkskabel -tile.computercraft:command_computer.name=Kommando Dator -tile.computercraft:advanced_modem.name=Ender Modem -tile.computercraft:speaker.name=Högtalare - -tile.computercraft:turtle.name=Turtle -tile.computercraft:turtle.upgraded.name=%s Turtle -tile.computercraft:turtle.upgraded_twice.name=%s %s Turtle -tile.computercraft:advanced_turtle.name=Avancerad Turtle -tile.computercraft:advanced_turtle.upgraded.name=Avancerad %s Turtle -tile.computercraft:advanced_turtle.upgraded_twice.name=Avancerad %s %s Turtle - -item.computercraft:disk.name=Diskett -item.computercraft:treasure_disk.name=Diskett -item.computercraft:page.name=Utskriven Sida -item.computercraft:pages.name=Utskrivna Sidor -item.computercraft:book.name=Tryckt bok - -item.computercraft:pocket_computer.name=Fickdator -item.computercraft:pocket_computer.upgraded.name=%s Fickdator -item.computercraft:advanced_pocket_computer.name=Avancerad Fickdator -item.computercraft:advanced_pocket_computer.upgraded.name=Avancerad %s Fickdator - -upgrade.minecraft:diamond_sword.adjective=Närstridande -upgrade.minecraft:diamond_shovel.adjective=Grävande -upgrade.minecraft:diamond_pickaxe.adjective=Brytande -upgrade.minecraft:diamond_axe.adjective=Fällande -upgrade.minecraft:diamond_hoe.adjective=Odlande -upgrade.computercraft:wireless_modem.adjective=Trådlös -upgrade.minecraft:crafting_table.adjective=Händig -upgrade.computercraft:advanced_modem.adjective=Ender -upgrade.computercraft:speaker.adjective=Högljudd - -chat.computercraft.wired_modem.peripheral_connected=Kringutrustning "%s" är kopplad till nätverket -chat.computercraft.wired_modem.peripheral_disconnected=Kringutrustning "%s" är frånkopplad från nätverket - -# Command descriptions, usage and any additional messages. - -# Names for the various tracking fields. - -# Misc tooltips -gui.computercraft.tooltip.copy=Kopiera till urklipp - -# Config options -gui.computercraft:config.computer_space_limit=Dator maximalt utrymme (bytes) -gui.computercraft:config.floppy_space_limit=Diskett maximalt utrymme (bytes) -gui.computercraft:config.maximum_open_files=Max antal filer öppna per dator -gui.computercraft:config.disable_lua51_features=Avaktivera Lua 5.1 funktioner -gui.computercraft:config.default_computer_settings=Standard Datorinställningar -gui.computercraft:config.debug_enabled=Aktivera debug bibliotek -gui.computercraft:config.log_computer_errors=Logga datorfel - -gui.computercraft:config.execution.computer_threads=Dator trådar - -gui.computercraft:config.http=HTTP -gui.computercraft:config.http.enabled=Aktivera HTTP API -gui.computercraft:config.http.websocket_enabled=Aktivera websockets -gui.computercraft:config.http.whitelist=HTTP vitlista -gui.computercraft:config.http.blacklist=HTTP svartlista - -gui.computercraft:config.http.timeout=Timeout -gui.computercraft:config.http.max_requests=Maximalt antal samgående förfrågningar -gui.computercraft:config.http.max_download=Maximal svarsstorlek -gui.computercraft:config.http.max_upload=Maximal förfrågan -gui.computercraft:config.http.max_websockets=Maximalt antal samgående websockets -gui.computercraft:config.http.max_websocket_message=Maximal websocket meddelandestorlek - -gui.computercraft:config.peripheral=Kringutrustning -gui.computercraft:config.peripheral.command_block_enabled=Aktivera kommandoblock som kringutrustning -gui.computercraft:config.peripheral.modem_range=Modem räckvidd (standard) -gui.computercraft:config.peripheral.modem_high_altitude_range=Modem räckvidd (hög altitud) -gui.computercraft:config.peripheral.modem_range_during_storm=Modem räckvidd (dåligt väder) -gui.computercraft:config.peripheral.modem_high_altitude_range_during_storm=Modem räckvidd (hög altitud, dåligt väder) -gui.computercraft:config.peripheral.max_notes_per_tick=Maximalt antal musiknoter en dator kan spela samtidigt - -gui.computercraft:config.turtle=Turtles -gui.computercraft:config.turtle.need_fuel=Aktivera bränsle -gui.computercraft:config.turtle.normal_fuel_limit=Turtle bränslegräns -gui.computercraft:config.turtle.advanced_fuel_limit=Advanced Turtle bränslegräns -gui.computercraft:config.turtle.obey_block_protection=Turtles lyder blockskydd -gui.computercraft:config.turtle.can_push=Turtles kan putta entiteter -gui.computercraft:config.turtle.disabled_actions=Avaktiverade turtle åtgärder diff --git a/src/main/resources/assets/computercraft/models/block/advanced_computer_blinking.json b/src/main/resources/assets/computercraft/models/block/advanced_computer_blinking.json deleted file mode 100644 index 886f9fccb..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_computer_blinking.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:blocks/computer_front_blink_advanced", - "side": "computercraft:blocks/computer_side_advanced", - "top": "computercraft:blocks/computer_top_advanced" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_computer_off.json b/src/main/resources/assets/computercraft/models/block/advanced_computer_off.json deleted file mode 100644 index b08ab9555..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_computer_off.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:blocks/computer_front_advanced", - "side": "computercraft:blocks/computer_side_advanced", - "top": "computercraft:blocks/computer_top_advanced" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_computer_on.json b/src/main/resources/assets/computercraft/models/block/advanced_computer_on.json deleted file mode 100644 index 4e6636639..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_computer_on.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:blocks/computer_front_on_advanced", - "side": "computercraft:blocks/computer_side_advanced", - "top": "computercraft:blocks/computer_top_advanced" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_modem_off.json b/src/main/resources/assets/computercraft/models/block/advanced_modem_off.json deleted file mode 100644 index 6a9557d97..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_modem_off.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "computercraft:block/modem", - "textures": { - "front": "computercraft:blocks/adv_modem_face", - "back": "computercraft:blocks/modem_back" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_modem_on.json b/src/main/resources/assets/computercraft/models/block/advanced_modem_on.json deleted file mode 100644 index 062a35a1a..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_modem_on.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "computercraft:block/modem", - "textures": { - "front": "computercraft:blocks/adv_modem_face_on", - "back": "computercraft:blocks/modem_back" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor.json deleted file mode 100644 index deac4229a..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_monitor.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/adv_monitor16", - "side": "computercraft:blocks/adv_monitor4", - "top": "computercraft:blocks/adv_monitor0", - "back": "computercraft:blocks/adv_monitor4" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_d.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_d.json deleted file mode 100644 index f836bd93b..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_d.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/adv_monitor20", - "side": "computercraft:blocks/adv_monitor36", - "top": "computercraft:blocks/adv_monitor0", - "back": "computercraft:blocks/adv_monitor36" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_item.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_item.json deleted file mode 100644 index 0f5e9f860..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_item.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:blocks/adv_monitor15", - "side": "computercraft:blocks/adv_monitor4", - "top": "computercraft:blocks/adv_monitor0" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_l.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_l.json deleted file mode 100644 index 8a2e9131a..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_l.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/adv_monitor19", - "side": "computercraft:blocks/adv_monitor4", - "top": "computercraft:blocks/adv_monitor1", - "back": "computercraft:blocks/adv_monitor33" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_ld.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_ld.json deleted file mode 100644 index b8484e597..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_ld.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/adv_monitor31", - "side": "computercraft:blocks/adv_monitor7", - "top": "computercraft:blocks/adv_monitor1", - "back": "computercraft:blocks/adv_monitor45" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lr.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_lr.json deleted file mode 100644 index a948efe91..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lr.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/adv_monitor18", - "side": "computercraft:blocks/adv_monitor4", - "top": "computercraft:blocks/adv_monitor2", - "back": "computercraft:blocks/adv_monitor34" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lrd.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_lrd.json deleted file mode 100644 index 9fab25ab3..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lrd.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/adv_monitor30", - "side": "computercraft:blocks/adv_monitor7", - "top": "computercraft:blocks/adv_monitor2", - "back": "computercraft:blocks/adv_monitor46" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lru.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_lru.json deleted file mode 100644 index f79f82964..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lru.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/adv_monitor24", - "side": "computercraft:blocks/adv_monitor38", - "top": "computercraft:blocks/adv_monitor2", - "back": "computercraft:blocks/adv_monitor40" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lrud.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_lrud.json deleted file mode 100644 index c0ca8fcac..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lrud.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/adv_monitor27", - "side": "computercraft:blocks/adv_monitor37", - "top": "computercraft:blocks/adv_monitor2", - "back": "computercraft:blocks/adv_monitor43" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lu.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_lu.json deleted file mode 100644 index 6e0afca5d..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lu.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/adv_monitor25", - "side": "computercraft:blocks/adv_monitor38", - "top": "computercraft:blocks/adv_monitor1", - "back": "computercraft:blocks/adv_monitor39" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lud.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_lud.json deleted file mode 100644 index 0a7bd2901..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_lud.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/adv_monitor28", - "side": "computercraft:blocks/adv_monitor37", - "top": "computercraft:blocks/adv_monitor1", - "back": "computercraft:blocks/adv_monitor42" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_r.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_r.json deleted file mode 100644 index 5e1c3a1d8..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_r.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/adv_monitor17", - "side": "computercraft:blocks/adv_monitor4", - "top": "computercraft:blocks/adv_monitor3", - "back": "computercraft:blocks/adv_monitor35" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_rd.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_rd.json deleted file mode 100644 index 4e96ecafa..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_rd.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/adv_monitor29", - "side": "computercraft:blocks/adv_monitor7", - "top": "computercraft:blocks/adv_monitor3", - "back": "computercraft:blocks/adv_monitor47" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_ru.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_ru.json deleted file mode 100644 index 046c65ce6..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_ru.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/adv_monitor23", - "side": "computercraft:blocks/adv_monitor38", - "top": "computercraft:blocks/adv_monitor3", - "back": "computercraft:blocks/adv_monitor41" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_rud.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_rud.json deleted file mode 100644 index 7cb6b7218..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_rud.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/adv_monitor26", - "side": "computercraft:blocks/adv_monitor37", - "top": "computercraft:blocks/adv_monitor3", - "back": "computercraft:blocks/adv_monitor44" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_u.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_u.json deleted file mode 100644 index 78a99a448..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_u.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/adv_monitor22", - "side": "computercraft:blocks/adv_monitor38", - "top": "computercraft:blocks/adv_monitor0", - "back": "computercraft:blocks/adv_monitor38" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_monitor_ud.json b/src/main/resources/assets/computercraft/models/block/advanced_monitor_ud.json deleted file mode 100644 index f102b42bc..000000000 --- a/src/main/resources/assets/computercraft/models/block/advanced_monitor_ud.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/adv_monitor21", - "side": "computercraft:blocks/adv_monitor37", - "top": "computercraft:blocks/adv_monitor0", - "back": "computercraft:blocks/adv_monitor37" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/cable_arm.json b/src/main/resources/assets/computercraft/models/block/cable_arm.json index 1f1ac8f59..cd00629a1 100644 --- a/src/main/resources/assets/computercraft/models/block/cable_arm.json +++ b/src/main/resources/assets/computercraft/models/block/cable_arm.json @@ -1,8 +1,8 @@ { "parent": "block/block", "textures": { - "particle": "computercraft:blocks/cable_core", - "side": "computercraft:blocks/cable_side" + "particle": "computercraft:block/cable_core", + "side": "computercraft:block/cable_side" }, "elements": [ { diff --git a/src/main/resources/assets/computercraft/models/block/cable_core_any.json b/src/main/resources/assets/computercraft/models/block/cable_core_any.json index a548fbb11..0086189e2 100644 --- a/src/main/resources/assets/computercraft/models/block/cable_core_any.json +++ b/src/main/resources/assets/computercraft/models/block/cable_core_any.json @@ -1,8 +1,8 @@ { "parent": "block/block", "textures": { - "particle": "computercraft:blocks/cable_core", - "side": "computercraft:blocks/cable_side" + "particle": "computercraft:block/cable_core", + "side": "computercraft:block/cable_side" }, "elements": [ { diff --git a/src/main/resources/assets/computercraft/models/block/cable_core_facing.json b/src/main/resources/assets/computercraft/models/block/cable_core_facing.json index bbe1aeb4b..7876b44b9 100644 --- a/src/main/resources/assets/computercraft/models/block/cable_core_facing.json +++ b/src/main/resources/assets/computercraft/models/block/cable_core_facing.json @@ -1,9 +1,9 @@ { "parent": "block/block", "textures": { - "particle": "computercraft:blocks/cable_core", - "side": "computercraft:blocks/cable_side", - "end": "computercraft:blocks/cable_core" + "particle": "computercraft:block/cable_core", + "side": "computercraft:block/cable_side", + "end": "computercraft:block/cable_core" }, "elements": [ { diff --git a/src/main/resources/assets/computercraft/models/block/cable_item.json b/src/main/resources/assets/computercraft/models/block/cable_item.json index cb51a984f..2ee3627ab 100644 --- a/src/main/resources/assets/computercraft/models/block/cable_item.json +++ b/src/main/resources/assets/computercraft/models/block/cable_item.json @@ -1,9 +1,9 @@ { "parent": "block/block", "textures": { - "particle": "computercraft:blocks/cable_core", - "side": "computercraft:blocks/cable_side", - "end": "computercraft:blocks/cable_core" + "particle": "computercraft:block/cable_core", + "side": "computercraft:block/cable_side", + "end": "computercraft:block/cable_core" }, "elements": [ { diff --git a/src/main/resources/assets/computercraft/models/block/command_computer_blinking.json b/src/main/resources/assets/computercraft/models/block/command_computer_blinking.json deleted file mode 100644 index a160a3184..000000000 --- a/src/main/resources/assets/computercraft/models/block/command_computer_blinking.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:blocks/command_computer_front_blink", - "side": "computercraft:blocks/command_computer_side", - "top": "computercraft:blocks/command_computer_top" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/command_computer_off.json b/src/main/resources/assets/computercraft/models/block/command_computer_off.json deleted file mode 100644 index 30d2efb01..000000000 --- a/src/main/resources/assets/computercraft/models/block/command_computer_off.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:blocks/command_computer_front", - "side": "computercraft:blocks/command_computer_side", - "top": "computercraft:blocks/command_computer_top" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/command_computer_on.json b/src/main/resources/assets/computercraft/models/block/command_computer_on.json deleted file mode 100644 index f068e1e88..000000000 --- a/src/main/resources/assets/computercraft/models/block/command_computer_on.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:blocks/command_computer_front_on", - "side": "computercraft:blocks/command_computer_side", - "top": "computercraft:blocks/command_computer_top" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/computer_advanced_blinking.json b/src/main/resources/assets/computercraft/models/block/computer_advanced_blinking.json new file mode 100644 index 000000000..ed4c9bec3 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/computer_advanced_blinking.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "front": "computercraft:block/computer_advanced_front_blink", + "side": "computercraft:block/computer_advanced_side", + "top": "computercraft:block/computer_advanced_top" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/computer_advanced_off.json b/src/main/resources/assets/computercraft/models/block/computer_advanced_off.json new file mode 100644 index 000000000..8631c88ed --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/computer_advanced_off.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "front": "computercraft:block/computer_advanced_front", + "side": "computercraft:block/computer_advanced_side", + "top": "computercraft:block/computer_advanced_top" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/computer_advanced_on.json b/src/main/resources/assets/computercraft/models/block/computer_advanced_on.json new file mode 100644 index 000000000..2692aab84 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/computer_advanced_on.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "front": "computercraft:block/computer_advanced_front_on", + "side": "computercraft:block/computer_advanced_side", + "top": "computercraft:block/computer_advanced_top" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/computer_blinking.json b/src/main/resources/assets/computercraft/models/block/computer_blinking.json deleted file mode 100644 index 45fe82c91..000000000 --- a/src/main/resources/assets/computercraft/models/block/computer_blinking.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:blocks/computer_front_blink", - "side": "computercraft:blocks/computer_side", - "top": "computercraft:blocks/computer_top" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/computer_command_blinking.json b/src/main/resources/assets/computercraft/models/block/computer_command_blinking.json new file mode 100644 index 000000000..09d7ac1b3 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/computer_command_blinking.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "front": "computercraft:block/computer_command_front_blink", + "side": "computercraft:block/computer_command_side", + "top": "computercraft:block/computer_command_top" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/computer_command_off.json b/src/main/resources/assets/computercraft/models/block/computer_command_off.json new file mode 100644 index 000000000..eaa4970b9 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/computer_command_off.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "front": "computercraft:block/computer_command_front", + "side": "computercraft:block/computer_command_side", + "top": "computercraft:block/computer_command_top" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/computer_command_on.json b/src/main/resources/assets/computercraft/models/block/computer_command_on.json new file mode 100644 index 000000000..7d4730140 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/computer_command_on.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "front": "computercraft:block/computer_command_front_on", + "side": "computercraft:block/computer_command_side", + "top": "computercraft:block/computer_command_top" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/computer_normal_blinking.json b/src/main/resources/assets/computercraft/models/block/computer_normal_blinking.json new file mode 100644 index 000000000..d6d70f696 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/computer_normal_blinking.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "front": "computercraft:block/computer_normal_front_blink", + "side": "computercraft:block/computer_normal_side", + "top": "computercraft:block/computer_normal_top" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/computer_normal_off.json b/src/main/resources/assets/computercraft/models/block/computer_normal_off.json new file mode 100644 index 000000000..5d200f816 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/computer_normal_off.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "front": "computercraft:block/computer_normal_front", + "side": "computercraft:block/computer_normal_side", + "top": "computercraft:block/computer_normal_top" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/computer_normal_on.json b/src/main/resources/assets/computercraft/models/block/computer_normal_on.json new file mode 100644 index 000000000..f434d7fa8 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/computer_normal_on.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "front": "computercraft:block/computer_normal_front_on", + "side": "computercraft:block/computer_normal_side", + "top": "computercraft:block/computer_normal_top" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/computer_off.json b/src/main/resources/assets/computercraft/models/block/computer_off.json deleted file mode 100644 index ba281ec84..000000000 --- a/src/main/resources/assets/computercraft/models/block/computer_off.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:blocks/computer_front", - "side": "computercraft:blocks/computer_side", - "top": "computercraft:blocks/computer_top" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/computer_on.json b/src/main/resources/assets/computercraft/models/block/computer_on.json deleted file mode 100644 index 138278fb7..000000000 --- a/src/main/resources/assets/computercraft/models/block/computer_on.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:blocks/computer_front_on", - "side": "computercraft:blocks/computer_side", - "top": "computercraft:blocks/computer_top" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/disk_drive_empty.json b/src/main/resources/assets/computercraft/models/block/disk_drive_empty.json index 9ab150803..67a028949 100644 --- a/src/main/resources/assets/computercraft/models/block/disk_drive_empty.json +++ b/src/main/resources/assets/computercraft/models/block/disk_drive_empty.json @@ -1,8 +1,8 @@ { "parent": "block/orientable", "textures": { - "front": "computercraft:blocks/disk_drive_front", - "side": "computercraft:blocks/disk_drive_side", - "top": "computercraft:blocks/disk_drive_top" + "front": "computercraft:block/disk_drive_front", + "side": "computercraft:block/disk_drive_side", + "top": "computercraft:block/disk_drive_top" } } diff --git a/src/main/resources/assets/computercraft/models/block/disk_drive_full.json b/src/main/resources/assets/computercraft/models/block/disk_drive_full.json index 076231973..57ea2cf14 100644 --- a/src/main/resources/assets/computercraft/models/block/disk_drive_full.json +++ b/src/main/resources/assets/computercraft/models/block/disk_drive_full.json @@ -1,8 +1,8 @@ { "parent": "block/orientable", "textures": { - "front": "computercraft:blocks/disk_drive_front_accepted", - "side": "computercraft:blocks/disk_drive_side", - "top": "computercraft:blocks/disk_drive_top" + "front": "computercraft:block/disk_drive_front_accepted", + "side": "computercraft:block/disk_drive_side", + "top": "computercraft:block/disk_drive_top" } } diff --git a/src/main/resources/assets/computercraft/models/block/disk_drive_invalid.json b/src/main/resources/assets/computercraft/models/block/disk_drive_invalid.json index 5cf512ae6..0eb64250b 100644 --- a/src/main/resources/assets/computercraft/models/block/disk_drive_invalid.json +++ b/src/main/resources/assets/computercraft/models/block/disk_drive_invalid.json @@ -1,8 +1,8 @@ { "parent": "block/orientable", "textures": { - "front": "computercraft:blocks/disk_drive_front_rejected", - "side": "computercraft:blocks/disk_drive_side", - "top": "computercraft:blocks/disk_drive_top" + "front": "computercraft:block/disk_drive_front_rejected", + "side": "computercraft:block/disk_drive_side", + "top": "computercraft:block/disk_drive_top" } } diff --git a/src/main/resources/assets/computercraft/models/block/monitor.json b/src/main/resources/assets/computercraft/models/block/monitor.json deleted file mode 100644 index 706d0d56d..000000000 --- a/src/main/resources/assets/computercraft/models/block/monitor.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/monitor16", - "side": "computercraft:blocks/monitor4", - "top": "computercraft:blocks/monitor0", - "back": "computercraft:blocks/monitor4" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_advanced.json b/src/main/resources/assets/computercraft/models/block/monitor_advanced.json new file mode 100644 index 000000000..3ff0ed5dc --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_advanced.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_advanced_16", + "side": "computercraft:block/monitor_advanced_4", + "top": "computercraft:block/monitor_advanced_0", + "back": "computercraft:block/monitor_advanced_4" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_advanced_d.json b/src/main/resources/assets/computercraft/models/block/monitor_advanced_d.json new file mode 100644 index 000000000..d8936956d --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_advanced_d.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_advanced_20", + "side": "computercraft:block/monitor_advanced_36", + "top": "computercraft:block/monitor_advanced_0", + "back": "computercraft:block/monitor_advanced_36" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_advanced_item.json b/src/main/resources/assets/computercraft/models/block/monitor_advanced_item.json new file mode 100644 index 000000000..9420c1350 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_advanced_item.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "front": "computercraft:block/monitor_advanced_15", + "side": "computercraft:block/monitor_advanced_4", + "top": "computercraft:block/monitor_advanced_0" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_advanced_l.json b/src/main/resources/assets/computercraft/models/block/monitor_advanced_l.json new file mode 100644 index 000000000..3abee2204 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_advanced_l.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_advanced_19", + "side": "computercraft:block/monitor_advanced_4", + "top": "computercraft:block/monitor_advanced_1", + "back": "computercraft:block/monitor_advanced_33" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_advanced_ld.json b/src/main/resources/assets/computercraft/models/block/monitor_advanced_ld.json new file mode 100644 index 000000000..ee054dbc8 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_advanced_ld.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_advanced_31", + "side": "computercraft:block/monitor_advanced_7", + "top": "computercraft:block/monitor_advanced_1", + "back": "computercraft:block/monitor_advanced_45" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_advanced_lr.json b/src/main/resources/assets/computercraft/models/block/monitor_advanced_lr.json new file mode 100644 index 000000000..320c8d354 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_advanced_lr.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_advanced_18", + "side": "computercraft:block/monitor_advanced_4", + "top": "computercraft:block/monitor_advanced_2", + "back": "computercraft:block/monitor_advanced_34" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_advanced_lrd.json b/src/main/resources/assets/computercraft/models/block/monitor_advanced_lrd.json new file mode 100644 index 000000000..5f7a43407 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_advanced_lrd.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_advanced_30", + "side": "computercraft:block/monitor_advanced_7", + "top": "computercraft:block/monitor_advanced_2", + "back": "computercraft:block/monitor_advanced_46" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_advanced_lru.json b/src/main/resources/assets/computercraft/models/block/monitor_advanced_lru.json new file mode 100644 index 000000000..56acdd077 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_advanced_lru.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_advanced_24", + "side": "computercraft:block/monitor_advanced_38", + "top": "computercraft:block/monitor_advanced_2", + "back": "computercraft:block/monitor_advanced_40" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_advanced_lrud.json b/src/main/resources/assets/computercraft/models/block/monitor_advanced_lrud.json new file mode 100644 index 000000000..dce3c2baf --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_advanced_lrud.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_advanced_27", + "side": "computercraft:block/monitor_advanced_37", + "top": "computercraft:block/monitor_advanced_2", + "back": "computercraft:block/monitor_advanced_43" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_advanced_lu.json b/src/main/resources/assets/computercraft/models/block/monitor_advanced_lu.json new file mode 100644 index 000000000..905ebdce3 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_advanced_lu.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_advanced_25", + "side": "computercraft:block/monitor_advanced_38", + "top": "computercraft:block/monitor_advanced_1", + "back": "computercraft:block/monitor_advanced_39" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_advanced_lud.json b/src/main/resources/assets/computercraft/models/block/monitor_advanced_lud.json new file mode 100644 index 000000000..43b110c03 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_advanced_lud.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_advanced_28", + "side": "computercraft:block/monitor_advanced_37", + "top": "computercraft:block/monitor_advanced_1", + "back": "computercraft:block/monitor_advanced_42" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_advanced_r.json b/src/main/resources/assets/computercraft/models/block/monitor_advanced_r.json new file mode 100644 index 000000000..03d1d386f --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_advanced_r.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_advanced_17", + "side": "computercraft:block/monitor_advanced_4", + "top": "computercraft:block/monitor_advanced_3", + "back": "computercraft:block/monitor_advanced_35" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_advanced_rd.json b/src/main/resources/assets/computercraft/models/block/monitor_advanced_rd.json new file mode 100644 index 000000000..4ded80dba --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_advanced_rd.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_advanced_29", + "side": "computercraft:block/monitor_advanced_7", + "top": "computercraft:block/monitor_advanced_3", + "back": "computercraft:block/monitor_advanced_47" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_advanced_ru.json b/src/main/resources/assets/computercraft/models/block/monitor_advanced_ru.json new file mode 100644 index 000000000..67cd36920 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_advanced_ru.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_advanced_23", + "side": "computercraft:block/monitor_advanced_38", + "top": "computercraft:block/monitor_advanced_3", + "back": "computercraft:block/monitor_advanced_41" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_advanced_rud.json b/src/main/resources/assets/computercraft/models/block/monitor_advanced_rud.json new file mode 100644 index 000000000..0573ad049 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_advanced_rud.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_advanced_26", + "side": "computercraft:block/monitor_advanced_37", + "top": "computercraft:block/monitor_advanced_3", + "back": "computercraft:block/monitor_advanced_44" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_advanced_u.json b/src/main/resources/assets/computercraft/models/block/monitor_advanced_u.json new file mode 100644 index 000000000..bdc9f7a2d --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_advanced_u.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_advanced_22", + "side": "computercraft:block/monitor_advanced_38", + "top": "computercraft:block/monitor_advanced_0", + "back": "computercraft:block/monitor_advanced_38" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_advanced_ud.json b/src/main/resources/assets/computercraft/models/block/monitor_advanced_ud.json new file mode 100644 index 000000000..3987b109f --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_advanced_ud.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_advanced_21", + "side": "computercraft:block/monitor_advanced_37", + "top": "computercraft:block/monitor_advanced_0", + "back": "computercraft:block/monitor_advanced_37" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_d.json b/src/main/resources/assets/computercraft/models/block/monitor_d.json deleted file mode 100644 index 010cefca5..000000000 --- a/src/main/resources/assets/computercraft/models/block/monitor_d.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/monitor20", - "side": "computercraft:blocks/monitor36", - "top": "computercraft:blocks/monitor0", - "back": "computercraft:blocks/monitor36" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_item.json b/src/main/resources/assets/computercraft/models/block/monitor_item.json deleted file mode 100644 index 9d64c271a..000000000 --- a/src/main/resources/assets/computercraft/models/block/monitor_item.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "front": "computercraft:blocks/monitor15", - "side": "computercraft:blocks/monitor4", - "top": "computercraft:blocks/monitor0" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_l.json b/src/main/resources/assets/computercraft/models/block/monitor_l.json deleted file mode 100644 index 98b267c7b..000000000 --- a/src/main/resources/assets/computercraft/models/block/monitor_l.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/monitor19", - "side": "computercraft:blocks/monitor4", - "top": "computercraft:blocks/monitor1", - "back": "computercraft:blocks/monitor33" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_ld.json b/src/main/resources/assets/computercraft/models/block/monitor_ld.json deleted file mode 100644 index cd68647b8..000000000 --- a/src/main/resources/assets/computercraft/models/block/monitor_ld.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/monitor31", - "side": "computercraft:blocks/monitor7", - "top": "computercraft:blocks/monitor1", - "back": "computercraft:blocks/monitor45" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_lr.json b/src/main/resources/assets/computercraft/models/block/monitor_lr.json deleted file mode 100644 index c98e6e43b..000000000 --- a/src/main/resources/assets/computercraft/models/block/monitor_lr.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/monitor18", - "side": "computercraft:blocks/monitor4", - "top": "computercraft:blocks/monitor2", - "back": "computercraft:blocks/monitor34" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_lrd.json b/src/main/resources/assets/computercraft/models/block/monitor_lrd.json deleted file mode 100644 index 545239bf9..000000000 --- a/src/main/resources/assets/computercraft/models/block/monitor_lrd.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/monitor30", - "side": "computercraft:blocks/monitor7", - "top": "computercraft:blocks/monitor2", - "back": "computercraft:blocks/monitor46" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_lru.json b/src/main/resources/assets/computercraft/models/block/monitor_lru.json deleted file mode 100644 index e53cbfda9..000000000 --- a/src/main/resources/assets/computercraft/models/block/monitor_lru.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/monitor24", - "side": "computercraft:blocks/monitor38", - "top": "computercraft:blocks/monitor2", - "back": "computercraft:blocks/monitor40" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_lrud.json b/src/main/resources/assets/computercraft/models/block/monitor_lrud.json deleted file mode 100644 index 4b99691a5..000000000 --- a/src/main/resources/assets/computercraft/models/block/monitor_lrud.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/monitor27", - "side": "computercraft:blocks/monitor37", - "top": "computercraft:blocks/monitor2", - "back": "computercraft:blocks/monitor43" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_lu.json b/src/main/resources/assets/computercraft/models/block/monitor_lu.json deleted file mode 100644 index 3698e0321..000000000 --- a/src/main/resources/assets/computercraft/models/block/monitor_lu.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/monitor25", - "side": "computercraft:blocks/monitor38", - "top": "computercraft:blocks/monitor1", - "back": "computercraft:blocks/monitor39" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_lud.json b/src/main/resources/assets/computercraft/models/block/monitor_lud.json deleted file mode 100644 index d3200aa45..000000000 --- a/src/main/resources/assets/computercraft/models/block/monitor_lud.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/monitor28", - "side": "computercraft:blocks/monitor37", - "top": "computercraft:blocks/monitor1", - "back": "computercraft:blocks/monitor42" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_normal.json b/src/main/resources/assets/computercraft/models/block/monitor_normal.json new file mode 100644 index 000000000..e7a669695 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_normal.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_normal_16", + "side": "computercraft:block/monitor_normal_4", + "top": "computercraft:block/monitor_normal_0", + "back": "computercraft:block/monitor_normal_4" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_normal_d.json b/src/main/resources/assets/computercraft/models/block/monitor_normal_d.json new file mode 100644 index 000000000..ab3cf8bf4 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_normal_d.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_normal_20", + "side": "computercraft:block/monitor_normal_36", + "top": "computercraft:block/monitor_normal_0", + "back": "computercraft:block/monitor_normal_36" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_normal_item.json b/src/main/resources/assets/computercraft/models/block/monitor_normal_item.json new file mode 100644 index 000000000..a8f01f314 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_normal_item.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "front": "computercraft:block/monitor_normal_15", + "side": "computercraft:block/monitor_normal_4", + "top": "computercraft:block/monitor_normal_0" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_normal_l.json b/src/main/resources/assets/computercraft/models/block/monitor_normal_l.json new file mode 100644 index 000000000..def167210 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_normal_l.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_normal_19", + "side": "computercraft:block/monitor_normal_4", + "top": "computercraft:block/monitor_normal_1", + "back": "computercraft:block/monitor_normal_33" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_normal_ld.json b/src/main/resources/assets/computercraft/models/block/monitor_normal_ld.json new file mode 100644 index 000000000..410d65029 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_normal_ld.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_normal_31", + "side": "computercraft:block/monitor_normal_7", + "top": "computercraft:block/monitor_normal_1", + "back": "computercraft:block/monitor_normal_45" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_normal_lr.json b/src/main/resources/assets/computercraft/models/block/monitor_normal_lr.json new file mode 100644 index 000000000..36243944d --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_normal_lr.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_normal_18", + "side": "computercraft:block/monitor_normal_4", + "top": "computercraft:block/monitor_normal_2", + "back": "computercraft:block/monitor_normal_34" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_normal_lrd.json b/src/main/resources/assets/computercraft/models/block/monitor_normal_lrd.json new file mode 100644 index 000000000..1fe673561 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_normal_lrd.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_normal_30", + "side": "computercraft:block/monitor_normal_7", + "top": "computercraft:block/monitor_normal_2", + "back": "computercraft:block/monitor_normal_46" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_normal_lru.json b/src/main/resources/assets/computercraft/models/block/monitor_normal_lru.json new file mode 100644 index 000000000..d6c5b2ce4 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_normal_lru.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_normal_24", + "side": "computercraft:block/monitor_normal_38", + "top": "computercraft:block/monitor_normal_2", + "back": "computercraft:block/monitor_normal_40" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_normal_lrud.json b/src/main/resources/assets/computercraft/models/block/monitor_normal_lrud.json new file mode 100644 index 000000000..ba96ee76d --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_normal_lrud.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_normal_27", + "side": "computercraft:block/monitor_normal_37", + "top": "computercraft:block/monitor_normal_2", + "back": "computercraft:block/monitor_normal_43" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_normal_lu.json b/src/main/resources/assets/computercraft/models/block/monitor_normal_lu.json new file mode 100644 index 000000000..444408d25 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_normal_lu.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_normal_25", + "side": "computercraft:block/monitor_normal_38", + "top": "computercraft:block/monitor_normal_1", + "back": "computercraft:block/monitor_normal_39" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_normal_lud.json b/src/main/resources/assets/computercraft/models/block/monitor_normal_lud.json new file mode 100644 index 000000000..28f06d420 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_normal_lud.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_normal_28", + "side": "computercraft:block/monitor_normal_37", + "top": "computercraft:block/monitor_normal_1", + "back": "computercraft:block/monitor_normal_42" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_normal_r.json b/src/main/resources/assets/computercraft/models/block/monitor_normal_r.json new file mode 100644 index 000000000..8b8eb4df1 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_normal_r.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_normal_17", + "side": "computercraft:block/monitor_normal_4", + "top": "computercraft:block/monitor_normal_3", + "back": "computercraft:block/monitor_normal_35" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_normal_rd.json b/src/main/resources/assets/computercraft/models/block/monitor_normal_rd.json new file mode 100644 index 000000000..61d7d1231 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_normal_rd.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_normal_29", + "side": "computercraft:block/monitor_normal_7", + "top": "computercraft:block/monitor_normal_3", + "back": "computercraft:block/monitor_normal_47" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_normal_ru.json b/src/main/resources/assets/computercraft/models/block/monitor_normal_ru.json new file mode 100644 index 000000000..ddb474736 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_normal_ru.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_normal_23", + "side": "computercraft:block/monitor_normal_38", + "top": "computercraft:block/monitor_normal_3", + "back": "computercraft:block/monitor_normal_41" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_normal_rud.json b/src/main/resources/assets/computercraft/models/block/monitor_normal_rud.json new file mode 100644 index 000000000..a8f272995 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_normal_rud.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_normal_26", + "side": "computercraft:block/monitor_normal_37", + "top": "computercraft:block/monitor_normal_3", + "back": "computercraft:block/monitor_normal_44" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_normal_u.json b/src/main/resources/assets/computercraft/models/block/monitor_normal_u.json new file mode 100644 index 000000000..c7d67619b --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_normal_u.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_normal_22", + "side": "computercraft:block/monitor_normal_38", + "top": "computercraft:block/monitor_normal_0", + "back": "computercraft:block/monitor_normal_38" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_normal_ud.json b/src/main/resources/assets/computercraft/models/block/monitor_normal_ud.json new file mode 100644 index 000000000..0cbadcc4b --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/monitor_normal_ud.json @@ -0,0 +1,9 @@ +{ + "parent": "computercraft:block/monitor_base", + "textures": { + "front": "computercraft:block/monitor_normal_21", + "side": "computercraft:block/monitor_normal_37", + "top": "computercraft:block/monitor_normal_0", + "back": "computercraft:block/monitor_normal_37" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_r.json b/src/main/resources/assets/computercraft/models/block/monitor_r.json deleted file mode 100644 index 6df1d8ed6..000000000 --- a/src/main/resources/assets/computercraft/models/block/monitor_r.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/monitor17", - "side": "computercraft:blocks/monitor4", - "top": "computercraft:blocks/monitor3", - "back": "computercraft:blocks/monitor35" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_rd.json b/src/main/resources/assets/computercraft/models/block/monitor_rd.json deleted file mode 100644 index a70a1288a..000000000 --- a/src/main/resources/assets/computercraft/models/block/monitor_rd.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/monitor29", - "side": "computercraft:blocks/monitor7", - "top": "computercraft:blocks/monitor3", - "back": "computercraft:blocks/monitor47" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_ru.json b/src/main/resources/assets/computercraft/models/block/monitor_ru.json deleted file mode 100644 index 4fdab8b57..000000000 --- a/src/main/resources/assets/computercraft/models/block/monitor_ru.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/monitor23", - "side": "computercraft:blocks/monitor38", - "top": "computercraft:blocks/monitor3", - "back": "computercraft:blocks/monitor41" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_rud.json b/src/main/resources/assets/computercraft/models/block/monitor_rud.json deleted file mode 100644 index aebca56b5..000000000 --- a/src/main/resources/assets/computercraft/models/block/monitor_rud.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/monitor26", - "side": "computercraft:blocks/monitor37", - "top": "computercraft:blocks/monitor3", - "back": "computercraft:blocks/monitor44" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_u.json b/src/main/resources/assets/computercraft/models/block/monitor_u.json deleted file mode 100644 index 44c93e361..000000000 --- a/src/main/resources/assets/computercraft/models/block/monitor_u.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/monitor22", - "side": "computercraft:blocks/monitor38", - "top": "computercraft:blocks/monitor0", - "back": "computercraft:blocks/monitor38" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/monitor_ud.json b/src/main/resources/assets/computercraft/models/block/monitor_ud.json deleted file mode 100644 index 5c59b92c7..000000000 --- a/src/main/resources/assets/computercraft/models/block/monitor_ud.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "computercraft:block/monitor_base", - "textures": { - "front": "computercraft:blocks/monitor21", - "side": "computercraft:blocks/monitor37", - "top": "computercraft:blocks/monitor0", - "back": "computercraft:blocks/monitor37" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/printer_both_full.json b/src/main/resources/assets/computercraft/models/block/printer_both_full.json index 0db5558ea..e086ec662 100644 --- a/src/main/resources/assets/computercraft/models/block/printer_both_full.json +++ b/src/main/resources/assets/computercraft/models/block/printer_both_full.json @@ -1,8 +1,8 @@ { "parent": "block/orientable", "textures": { - "front": "computercraft:blocks/printer_front_both_trays", - "side": "computercraft:blocks/printer_side", - "top": "computercraft:blocks/printer_top" + "front": "computercraft:block/printer_front_both_trays", + "side": "computercraft:block/printer_side", + "top": "computercraft:block/printer_top" } } diff --git a/src/main/resources/assets/computercraft/models/block/printer_bottom_full.json b/src/main/resources/assets/computercraft/models/block/printer_bottom_full.json index 90883f08f..0191534cd 100644 --- a/src/main/resources/assets/computercraft/models/block/printer_bottom_full.json +++ b/src/main/resources/assets/computercraft/models/block/printer_bottom_full.json @@ -1,8 +1,8 @@ { "parent": "block/orientable", "textures": { - "front": "computercraft:blocks/printer_front_bottom_tray", - "side": "computercraft:blocks/printer_side", - "top": "computercraft:blocks/printer_top" + "front": "computercraft:block/printer_front_bottom_tray", + "side": "computercraft:block/printer_side", + "top": "computercraft:block/printer_top" } } diff --git a/src/main/resources/assets/computercraft/models/block/printer_empty.json b/src/main/resources/assets/computercraft/models/block/printer_empty.json index dadcd5209..e41abdf71 100644 --- a/src/main/resources/assets/computercraft/models/block/printer_empty.json +++ b/src/main/resources/assets/computercraft/models/block/printer_empty.json @@ -1,8 +1,8 @@ { "parent": "block/orientable", "textures": { - "front": "computercraft:blocks/printer_front_empty", - "side": "computercraft:blocks/printer_side", - "top": "computercraft:blocks/printer_top" + "front": "computercraft:block/printer_front_empty", + "side": "computercraft:block/printer_side", + "top": "computercraft:block/printer_top" } } diff --git a/src/main/resources/assets/computercraft/models/block/printer_top_full.json b/src/main/resources/assets/computercraft/models/block/printer_top_full.json index 845719279..5a6465e15 100644 --- a/src/main/resources/assets/computercraft/models/block/printer_top_full.json +++ b/src/main/resources/assets/computercraft/models/block/printer_top_full.json @@ -1,8 +1,8 @@ { "parent": "block/orientable", "textures": { - "front": "computercraft:blocks/printer_front_top_tray", - "side": "computercraft:blocks/printer_side", - "top": "computercraft:blocks/printer_top" + "front": "computercraft:block/printer_front_top_tray", + "side": "computercraft:block/printer_side", + "top": "computercraft:block/printer_top" } } diff --git a/src/main/resources/assets/computercraft/models/block/speaker.json b/src/main/resources/assets/computercraft/models/block/speaker.json index 288d44523..a2f45c10a 100644 --- a/src/main/resources/assets/computercraft/models/block/speaker.json +++ b/src/main/resources/assets/computercraft/models/block/speaker.json @@ -1,8 +1,8 @@ { "parent": "block/orientable", "textures": { - "front": "computercraft:blocks/speaker_front", - "side": "computercraft:blocks/speaker_side", - "top": "computercraft:blocks/speaker_top" + "front": "computercraft:block/speaker_front", + "side": "computercraft:block/speaker_side", + "top": "computercraft:block/speaker_top" } } diff --git a/src/main/resources/assets/computercraft/models/block/advanced_turtle.json b/src/main/resources/assets/computercraft/models/block/turtle_advanced.json similarity index 57% rename from src/main/resources/assets/computercraft/models/block/advanced_turtle.json rename to src/main/resources/assets/computercraft/models/block/turtle_advanced.json index aff0bdee3..c232c67d3 100644 --- a/src/main/resources/assets/computercraft/models/block/advanced_turtle.json +++ b/src/main/resources/assets/computercraft/models/block/turtle_advanced.json @@ -1,6 +1,6 @@ { "parent": "computercraft:block/turtle_base", "textures": { - "texture": "computercraft:blocks/turtle_advanced" + "texture": "computercraft:block/turtle_advanced" } } diff --git a/src/main/resources/assets/computercraft/models/block/turtle_white.json b/src/main/resources/assets/computercraft/models/block/turtle_colour.json similarity index 97% rename from src/main/resources/assets/computercraft/models/block/turtle_white.json rename to src/main/resources/assets/computercraft/models/block/turtle_colour.json index 7e0d2df03..6e5515574 100644 --- a/src/main/resources/assets/computercraft/models/block/turtle_white.json +++ b/src/main/resources/assets/computercraft/models/block/turtle_colour.json @@ -1,7 +1,7 @@ { "parent": "computercraft:block/turtle_base", "textures": { - "texture": "computercraft:blocks/turtle_white" + "texture": "computercraft:block/turtle_colour" }, "elements": [ { diff --git a/src/main/resources/assets/computercraft/models/block/turtle_elf_overlay.json b/src/main/resources/assets/computercraft/models/block/turtle_elf_overlay.json index af0a1d7a7..d17e4c8ec 100644 --- a/src/main/resources/assets/computercraft/models/block/turtle_elf_overlay.json +++ b/src/main/resources/assets/computercraft/models/block/turtle_elf_overlay.json @@ -1,6 +1,6 @@ { - "parent": "computercraft:block/turtle_overlay", + "parent": "computercraft:block/turtle_normal_overlay", "textures": { - "texture": "computercraft:blocks/turtle_elf_overlay" + "texture": "computercraft:block/turtle_elf_overlay" } } diff --git a/src/main/resources/assets/computercraft/models/block/turtle_modem_on_left.json b/src/main/resources/assets/computercraft/models/block/turtle_modem_on_left.json deleted file mode 100644 index 4bcf579a4..000000000 --- a/src/main/resources/assets/computercraft/models/block/turtle_modem_on_left.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "computercraft:block/turtle_upgrade_base_left", - "textures": { - "texture": "computercraft:blocks/wireless_modem_face_on" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/turtle_modem_on_right.json b/src/main/resources/assets/computercraft/models/block/turtle_modem_on_right.json deleted file mode 100644 index e61d6e0ab..000000000 --- a/src/main/resources/assets/computercraft/models/block/turtle_modem_on_right.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "computercraft:block/turtle_upgrade_base_right", - "textures": { - "texture": "computercraft:blocks/wireless_modem_face_on" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/turtle.json b/src/main/resources/assets/computercraft/models/block/turtle_normal.json similarity index 58% rename from src/main/resources/assets/computercraft/models/block/turtle.json rename to src/main/resources/assets/computercraft/models/block/turtle_normal.json index 9bd9823da..840517b05 100644 --- a/src/main/resources/assets/computercraft/models/block/turtle.json +++ b/src/main/resources/assets/computercraft/models/block/turtle_normal.json @@ -1,6 +1,6 @@ { "parent": "computercraft:block/turtle_base", "textures": { - "texture": "computercraft:blocks/turtle" + "texture": "computercraft:block/turtle_normal" } } diff --git a/src/main/resources/assets/computercraft/models/block/turtle_overlay.json b/src/main/resources/assets/computercraft/models/block/turtle_normal_overlay.json similarity index 100% rename from src/main/resources/assets/computercraft/models/block/turtle_overlay.json rename to src/main/resources/assets/computercraft/models/block/turtle_normal_overlay.json diff --git a/src/main/resources/assets/computercraft/models/block/turtle_speaker_upgrade_left.json b/src/main/resources/assets/computercraft/models/block/turtle_speaker_upgrade_left.json deleted file mode 100644 index e86851a7d..000000000 --- a/src/main/resources/assets/computercraft/models/block/turtle_speaker_upgrade_left.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "computercraft:block/turtle_upgrade_base_left", - "textures": { - "texture": "computercraft:blocks/turtle_speaker_face" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/turtle_speaker_upgrade_right.json b/src/main/resources/assets/computercraft/models/block/turtle_speaker_upgrade_right.json deleted file mode 100644 index 48c01ef06..000000000 --- a/src/main/resources/assets/computercraft/models/block/turtle_speaker_upgrade_right.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "computercraft:block/turtle_upgrade_base_right", - "textures": { - "texture": "computercraft:blocks/turtle_speaker_face" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/wired_modem_full_off.json b/src/main/resources/assets/computercraft/models/block/wired_modem_full_off.json index e6ea77dfa..d6d2e5303 100644 --- a/src/main/resources/assets/computercraft/models/block/wired_modem_full_off.json +++ b/src/main/resources/assets/computercraft/models/block/wired_modem_full_off.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "computercraft:blocks/wired_modem_face" + "all": "computercraft:block/wired_modem_face" } } diff --git a/src/main/resources/assets/computercraft/models/block/wired_modem_full_off_peripheral.json b/src/main/resources/assets/computercraft/models/block/wired_modem_full_off_peripheral.json index 318233585..0c5c0e50c 100644 --- a/src/main/resources/assets/computercraft/models/block/wired_modem_full_off_peripheral.json +++ b/src/main/resources/assets/computercraft/models/block/wired_modem_full_off_peripheral.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "computercraft:blocks/wired_modem_face_peripheral" + "all": "computercraft:block/wired_modem_face_peripheral" } } diff --git a/src/main/resources/assets/computercraft/models/block/wired_modem_full_on.json b/src/main/resources/assets/computercraft/models/block/wired_modem_full_on.json index 241e39ca0..c36e45cff 100644 --- a/src/main/resources/assets/computercraft/models/block/wired_modem_full_on.json +++ b/src/main/resources/assets/computercraft/models/block/wired_modem_full_on.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "computercraft:blocks/wired_modem_face_on" + "all": "computercraft:block/wired_modem_face_on" } } diff --git a/src/main/resources/assets/computercraft/models/block/wired_modem_full_on_peripheral.json b/src/main/resources/assets/computercraft/models/block/wired_modem_full_on_peripheral.json index c8ef3c9d4..e4fb9858b 100644 --- a/src/main/resources/assets/computercraft/models/block/wired_modem_full_on_peripheral.json +++ b/src/main/resources/assets/computercraft/models/block/wired_modem_full_on_peripheral.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "computercraft:blocks/wired_modem_face_peripheral_on" + "all": "computercraft:block/wired_modem_face_peripheral_on" } } diff --git a/src/main/resources/assets/computercraft/models/block/wired_modem_off.json b/src/main/resources/assets/computercraft/models/block/wired_modem_off.json index 4207636fe..9c500700d 100644 --- a/src/main/resources/assets/computercraft/models/block/wired_modem_off.json +++ b/src/main/resources/assets/computercraft/models/block/wired_modem_off.json @@ -1,7 +1,7 @@ { "parent": "computercraft:block/modem", "textures": { - "front": "computercraft:blocks/wired_modem_face", - "back": "computercraft:blocks/modem_back" + "front": "computercraft:block/wired_modem_face", + "back": "computercraft:block/modem_back" } } diff --git a/src/main/resources/assets/computercraft/models/block/wired_modem_off_peripheral.json b/src/main/resources/assets/computercraft/models/block/wired_modem_off_peripheral.json index 3a90b109a..9532df960 100644 --- a/src/main/resources/assets/computercraft/models/block/wired_modem_off_peripheral.json +++ b/src/main/resources/assets/computercraft/models/block/wired_modem_off_peripheral.json @@ -1,7 +1,7 @@ { "parent": "computercraft:block/modem", "textures": { - "front": "computercraft:blocks/wired_modem_face_peripheral", - "back": "computercraft:blocks/modem_back" + "front": "computercraft:block/wired_modem_face_peripheral", + "back": "computercraft:block/modem_back" } } diff --git a/src/main/resources/assets/computercraft/models/block/wired_modem_on.json b/src/main/resources/assets/computercraft/models/block/wired_modem_on.json index 66ccdf8b1..f69937299 100644 --- a/src/main/resources/assets/computercraft/models/block/wired_modem_on.json +++ b/src/main/resources/assets/computercraft/models/block/wired_modem_on.json @@ -1,7 +1,7 @@ { "parent": "computercraft:block/modem", "textures": { - "front": "computercraft:blocks/wired_modem_face_on", - "back": "computercraft:blocks/modem_back" + "front": "computercraft:block/wired_modem_face_on", + "back": "computercraft:block/modem_back" } } diff --git a/src/main/resources/assets/computercraft/models/block/wired_modem_on_peripheral.json b/src/main/resources/assets/computercraft/models/block/wired_modem_on_peripheral.json index b4bfdd334..22cccf90b 100644 --- a/src/main/resources/assets/computercraft/models/block/wired_modem_on_peripheral.json +++ b/src/main/resources/assets/computercraft/models/block/wired_modem_on_peripheral.json @@ -1,7 +1,7 @@ { "parent": "computercraft:block/modem", "textures": { - "front": "computercraft:blocks/wired_modem_face_peripheral_on", - "back": "computercraft:blocks/modem_back" + "front": "computercraft:block/wired_modem_face_peripheral_on", + "back": "computercraft:block/modem_back" } } diff --git a/src/main/resources/assets/computercraft/models/block/wireless_modem_advanced_off.json b/src/main/resources/assets/computercraft/models/block/wireless_modem_advanced_off.json new file mode 100644 index 000000000..a818ba19a --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/wireless_modem_advanced_off.json @@ -0,0 +1,7 @@ +{ + "parent": "computercraft:block/modem", + "textures": { + "front": "computercraft:block/wireless_modem_advanced_face", + "back": "computercraft:block/modem_back" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/wireless_modem_advanced_on.json b/src/main/resources/assets/computercraft/models/block/wireless_modem_advanced_on.json new file mode 100644 index 000000000..7327fa44a --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/wireless_modem_advanced_on.json @@ -0,0 +1,7 @@ +{ + "parent": "computercraft:block/modem", + "textures": { + "front": "computercraft:block/wireless_modem_advanced_face_on", + "back": "computercraft:block/modem_back" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/wireless_modem_normal_off.json b/src/main/resources/assets/computercraft/models/block/wireless_modem_normal_off.json new file mode 100644 index 000000000..2ac06bfd5 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/wireless_modem_normal_off.json @@ -0,0 +1,7 @@ +{ + "parent": "computercraft:block/modem", + "textures": { + "front": "computercraft:block/wireless_modem_normal_face", + "back": "computercraft:block/modem_back" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/wireless_modem_normal_on.json b/src/main/resources/assets/computercraft/models/block/wireless_modem_normal_on.json new file mode 100644 index 000000000..0b0697741 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/block/wireless_modem_normal_on.json @@ -0,0 +1,7 @@ +{ + "parent": "computercraft:block/modem", + "textures": { + "front": "computercraft:block/wireless_modem_normal_face_on", + "back": "computercraft:block/modem_back" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/wireless_modem_off.json b/src/main/resources/assets/computercraft/models/block/wireless_modem_off.json deleted file mode 100644 index 7ac41f7de..000000000 --- a/src/main/resources/assets/computercraft/models/block/wireless_modem_off.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "computercraft:block/modem", - "textures": { - "front": "computercraft:blocks/wireless_modem_face", - "back": "computercraft:blocks/modem_back" - } -} diff --git a/src/main/resources/assets/computercraft/models/block/wireless_modem_on.json b/src/main/resources/assets/computercraft/models/block/wireless_modem_on.json deleted file mode 100644 index b000209a4..000000000 --- a/src/main/resources/assets/computercraft/models/block/wireless_modem_on.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "computercraft:block/modem", - "textures": { - "front": "computercraft:blocks/wireless_modem_face_on", - "back": "computercraft:blocks/modem_back" - } -} diff --git a/src/main/resources/assets/computercraft/models/item/advanced_computer.json b/src/main/resources/assets/computercraft/models/item/advanced_computer.json deleted file mode 100644 index 680707b87..000000000 --- a/src/main/resources/assets/computercraft/models/item/advanced_computer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "computercraft:block/advanced_computer_blinking" -} diff --git a/src/main/resources/assets/computercraft/models/item/advanced_modem.json b/src/main/resources/assets/computercraft/models/item/advanced_modem.json deleted file mode 100644 index 769ce4ebf..000000000 --- a/src/main/resources/assets/computercraft/models/item/advanced_modem.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "computercraft:block/advanced_modem_off" -} diff --git a/src/main/resources/assets/computercraft/models/item/advanced_monitor.json b/src/main/resources/assets/computercraft/models/item/advanced_monitor.json deleted file mode 100644 index c56c09ac4..000000000 --- a/src/main/resources/assets/computercraft/models/item/advanced_monitor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "computercraft:block/advanced_monitor_item" -} diff --git a/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_blinking.json b/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_blinking.json deleted file mode 100644 index 9f80a939f..000000000 --- a/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_blinking.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "computercraft:items/pocket_computer_blink", - "layer1": "computercraft:items/pocket_computer_advanced", - "layer2": "computercraft:items/pocket_computer_light" - } -} diff --git a/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_on.json b/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_on.json deleted file mode 100644 index 3dd83edf9..000000000 --- a/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer_on.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "computercraft:items/pocket_computer_on", - "layer1": "computercraft:items/pocket_computer_advanced", - "layer2": "computercraft:items/pocket_computer_light" - } -} diff --git a/src/main/resources/assets/computercraft/models/item/cable.json b/src/main/resources/assets/computercraft/models/item/cable.json index 3ed0b46ad..2ee3627ab 100644 --- a/src/main/resources/assets/computercraft/models/item/cable.json +++ b/src/main/resources/assets/computercraft/models/item/cable.json @@ -1,3 +1,22 @@ { - "parent": "computercraft:block/cable_item" + "parent": "block/block", + "textures": { + "particle": "computercraft:block/cable_core", + "side": "computercraft:block/cable_side", + "end": "computercraft:block/cable_core" + }, + "elements": [ + { + "from": [ 6, 6, 2 ], + "to": [ 10, 10, 14 ], + "faces": { + "down": { "uv": [ 6, 2, 10, 14 ], "texture": "#side" }, + "up": { "uv": [ 6, 2, 10, 14 ], "texture": "#side" }, + "north": { "uv": [ 6, 6, 10, 10 ], "texture": "#end" }, + "south": { "uv": [ 6, 6, 10, 10 ], "texture": "#end" }, + "west": { "uv": [ 2, 6, 14, 10 ], "texture": "#side" }, + "east": { "uv": [ 2, 6, 14, 10 ], "texture": "#side" } + } + } + ] } diff --git a/src/main/resources/assets/computercraft/models/item/command_computer.json b/src/main/resources/assets/computercraft/models/item/command_computer.json deleted file mode 100644 index 91cb0ef72..000000000 --- a/src/main/resources/assets/computercraft/models/item/command_computer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "computercraft:block/command_computer_blinking" -} diff --git a/src/main/resources/assets/computercraft/models/item/computer.json b/src/main/resources/assets/computercraft/models/item/computer.json deleted file mode 100644 index 0dd3d5081..000000000 --- a/src/main/resources/assets/computercraft/models/item/computer.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "computercraft:block/computer_blinking", - "overrides": [ - { - "model": "computercraft:item/computer", - "predicate": { "computercraft:family": 0 } - }, - { - "model": "computercraft:item/advanced_computer", - "predicate": { "computercraft:family": 1 } - } - ] -} diff --git a/src/main/resources/assets/computercraft/models/item/computer_advanced.json b/src/main/resources/assets/computercraft/models/item/computer_advanced.json new file mode 100644 index 000000000..bbaf95089 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/item/computer_advanced.json @@ -0,0 +1,3 @@ +{ + "parent": "computercraft:block/computer_advanced_blinking" +} diff --git a/src/main/resources/assets/computercraft/models/item/computer_command.json b/src/main/resources/assets/computercraft/models/item/computer_command.json new file mode 100644 index 000000000..c0df0ddd6 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/item/computer_command.json @@ -0,0 +1,3 @@ +{ + "parent": "computercraft:block/computer_command_blinking" +} diff --git a/src/main/resources/assets/computercraft/models/item/computer_normal.json b/src/main/resources/assets/computercraft/models/item/computer_normal.json new file mode 100644 index 000000000..bf906f744 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/item/computer_normal.json @@ -0,0 +1,3 @@ +{ + "parent": "computercraft:block/computer_normal_blinking" +} diff --git a/src/main/resources/assets/computercraft/models/item/disk.json b/src/main/resources/assets/computercraft/models/item/disk.json index 69ec8ebe6..f815397c5 100644 --- a/src/main/resources/assets/computercraft/models/item/disk.json +++ b/src/main/resources/assets/computercraft/models/item/disk.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "computercraft:items/disk_frame", - "layer1": "computercraft:items/disk_colour" + "layer0": "computercraft:item/disk_frame", + "layer1": "computercraft:item/disk_colour" } } diff --git a/src/main/resources/assets/computercraft/models/item/peripheral.json b/src/main/resources/assets/computercraft/models/item/disk_drive.json similarity index 100% rename from src/main/resources/assets/computercraft/models/item/peripheral.json rename to src/main/resources/assets/computercraft/models/item/disk_drive.json diff --git a/src/main/resources/assets/computercraft/models/item/disk_expanded.json b/src/main/resources/assets/computercraft/models/item/disk_expanded.json deleted file mode 100644 index 69ec8ebe6..000000000 --- a/src/main/resources/assets/computercraft/models/item/disk_expanded.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "computercraft:items/disk_frame", - "layer1": "computercraft:items/disk_colour" - } -} diff --git a/src/main/resources/assets/computercraft/models/item/monitor.json b/src/main/resources/assets/computercraft/models/item/monitor.json deleted file mode 100644 index 5e1f25699..000000000 --- a/src/main/resources/assets/computercraft/models/item/monitor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "computercraft:block/monitor_item" -} diff --git a/src/main/resources/assets/computercraft/models/item/monitor_advanced.json b/src/main/resources/assets/computercraft/models/item/monitor_advanced.json new file mode 100644 index 000000000..52ff045f8 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/item/monitor_advanced.json @@ -0,0 +1,3 @@ +{ + "parent": "computercraft:block/monitor_advanced_item" +} diff --git a/src/main/resources/assets/computercraft/models/item/monitor_normal.json b/src/main/resources/assets/computercraft/models/item/monitor_normal.json new file mode 100644 index 000000000..29079e6b3 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/item/monitor_normal.json @@ -0,0 +1,3 @@ +{ + "parent": "computercraft:block/monitor_normal_item" +} diff --git a/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer.json b/src/main/resources/assets/computercraft/models/item/pocket_computer_advanced.json similarity index 72% rename from src/main/resources/assets/computercraft/models/item/advanced_pocket_computer.json rename to src/main/resources/assets/computercraft/models/item/pocket_computer_advanced.json index 1956e6553..0e1b7bb15 100644 --- a/src/main/resources/assets/computercraft/models/item/advanced_pocket_computer.json +++ b/src/main/resources/assets/computercraft/models/item/pocket_computer_advanced.json @@ -1,20 +1,20 @@ { "parent": "item/generated", "textures": { - "layer0": "computercraft:items/pocket_computer_frame", - "layer1": "computercraft:items/pocket_computer_advanced" + "layer0": "computercraft:item/pocket_computer_frame", + "layer1": "computercraft:item/pocket_computer_advanced" }, "overrides": [ { - "model": "computercraft:item/advanced_pocket_computer", + "model": "computercraft:item/pocket_computer_advanced", "predicate": { "computercraft:state": 0, "computercraft:coloured": 0 } }, { - "model": "computercraft:item/advanced_pocket_computer_on", + "model": "computercraft:item/pocket_computer_advanced_on", "predicate": { "computercraft:state": 1, "computercraft:coloured": 0 } }, { - "model": "computercraft:item/advanced_pocket_computer_blinking", + "model": "computercraft:item/pocket_computer_advanced_blinking", "predicate": { "computercraft:state": 2, "computercraft:coloured": 0 } }, diff --git a/src/main/resources/assets/computercraft/models/item/pocket_computer_advanced_blinking.json b/src/main/resources/assets/computercraft/models/item/pocket_computer_advanced_blinking.json new file mode 100644 index 000000000..7a11caa9b --- /dev/null +++ b/src/main/resources/assets/computercraft/models/item/pocket_computer_advanced_blinking.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "computercraft:item/pocket_computer_blink", + "layer1": "computercraft:item/pocket_computer_advanced", + "layer2": "computercraft:item/pocket_computer_light" + } +} diff --git a/src/main/resources/assets/computercraft/models/item/pocket_computer_advanced_on.json b/src/main/resources/assets/computercraft/models/item/pocket_computer_advanced_on.json new file mode 100644 index 000000000..dd50412e8 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/item/pocket_computer_advanced_on.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "computercraft:item/pocket_computer_on", + "layer1": "computercraft:item/pocket_computer_advanced", + "layer2": "computercraft:item/pocket_computer_light" + } +} diff --git a/src/main/resources/assets/computercraft/models/item/pocket_computer_blinking.json b/src/main/resources/assets/computercraft/models/item/pocket_computer_blinking.json deleted file mode 100644 index 82a43f458..000000000 --- a/src/main/resources/assets/computercraft/models/item/pocket_computer_blinking.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "computercraft:items/pocket_computer_blink", - "layer1": "computercraft:items/pocket_computer", - "layer2": "computercraft:items/pocket_computer_light" - } -} diff --git a/src/main/resources/assets/computercraft/models/item/pocket_computer_colour.json b/src/main/resources/assets/computercraft/models/item/pocket_computer_colour.json index 82d9b31b0..dac87f7af 100644 --- a/src/main/resources/assets/computercraft/models/item/pocket_computer_colour.json +++ b/src/main/resources/assets/computercraft/models/item/pocket_computer_colour.json @@ -1,7 +1,17 @@ { "parent": "item/generated", "textures": { - "layer0": "computercraft:items/pocket_computer_frame", - "layer1": "computercraft:items/pocket_computer_colour" - } + "layer0": "computercraft:item/pocket_computer_frame", + "layer1": "computercraft:item/pocket_computer_colour" + }, + "overrides": [ + { + "predicate": { "computercraft:computer_state": 1 }, + "model": "computercraft:item/pocket_computer_colour_on" + }, + { + "predicate": { "computercraft:computer_state": 2 }, + "model": "computercraft:item/pocket_computer_colour_blinking" + } + ] } diff --git a/src/main/resources/assets/computercraft/models/item/pocket_computer_colour_blinking.json b/src/main/resources/assets/computercraft/models/item/pocket_computer_colour_blinking.json index 776ed5a1b..784ed879b 100644 --- a/src/main/resources/assets/computercraft/models/item/pocket_computer_colour_blinking.json +++ b/src/main/resources/assets/computercraft/models/item/pocket_computer_colour_blinking.json @@ -1,8 +1,8 @@ { "parent": "item/generated", "textures": { - "layer0": "computercraft:items/pocket_computer_blink", - "layer1": "computercraft:items/pocket_computer_colour", - "layer2": "computercraft:items/pocket_computer_light" + "layer0": "computercraft:item/pocket_computer_blink", + "layer1": "computercraft:item/pocket_computer_colour", + "layer2": "computercraft:item/pocket_computer_light" } } diff --git a/src/main/resources/assets/computercraft/models/item/pocket_computer_colour_on.json b/src/main/resources/assets/computercraft/models/item/pocket_computer_colour_on.json index 086378b4f..e086819c7 100644 --- a/src/main/resources/assets/computercraft/models/item/pocket_computer_colour_on.json +++ b/src/main/resources/assets/computercraft/models/item/pocket_computer_colour_on.json @@ -1,8 +1,8 @@ { "parent": "item/generated", "textures": { - "layer0": "computercraft:items/pocket_computer_on", - "layer1": "computercraft:items/pocket_computer_colour", - "layer2": "computercraft:items/pocket_computer_light" + "layer0": "computercraft:item/pocket_computer_on", + "layer1": "computercraft:item/pocket_computer_colour", + "layer2": "computercraft:item/pocket_computer_light" } } diff --git a/src/main/resources/assets/computercraft/models/item/pocket_computer.json b/src/main/resources/assets/computercraft/models/item/pocket_computer_normal.json similarity index 73% rename from src/main/resources/assets/computercraft/models/item/pocket_computer.json rename to src/main/resources/assets/computercraft/models/item/pocket_computer_normal.json index 5d56cf7f3..10e5e132b 100644 --- a/src/main/resources/assets/computercraft/models/item/pocket_computer.json +++ b/src/main/resources/assets/computercraft/models/item/pocket_computer_normal.json @@ -1,20 +1,20 @@ { "parent": "item/generated", "textures": { - "layer0": "computercraft:items/pocket_computer_frame", - "layer1": "computercraft:items/pocket_computer" + "layer0": "computercraft:item/pocket_computer_frame", + "layer1": "computercraft:item/pocket_computer_normal" }, "overrides": [ { - "model": "computercraft:item/pocket_computer", + "model": "computercraft:item/pocket_computer_normal", "predicate": { "computercraft:state": 0, "computercraft:coloured": 0 } }, { - "model": "computercraft:item/pocket_computer_on", + "model": "computercraft:item/pocket_computer_normal_on", "predicate": { "computercraft:state": 1, "computercraft:coloured": 0 } }, { - "model": "computercraft:item/pocket_computer_blinking", + "model": "computercraft:item/pocket_computer_advanced_blinking", "predicate": { "computercraft:state": 2, "computercraft:coloured": 0 } }, diff --git a/src/main/resources/assets/computercraft/models/item/pocket_computer_normal_blinking.json b/src/main/resources/assets/computercraft/models/item/pocket_computer_normal_blinking.json new file mode 100644 index 000000000..72e94e035 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/item/pocket_computer_normal_blinking.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "computercraft:item/pocket_computer_blink", + "layer1": "computercraft:item/pocket_computer_normal", + "layer2": "computercraft:item/pocket_computer_light" + } +} diff --git a/src/main/resources/assets/computercraft/models/item/pocket_computer_normal_on.json b/src/main/resources/assets/computercraft/models/item/pocket_computer_normal_on.json new file mode 100644 index 000000000..4c5f435fd --- /dev/null +++ b/src/main/resources/assets/computercraft/models/item/pocket_computer_normal_on.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "computercraft:item/pocket_computer_on", + "layer1": "computercraft:item/pocket_computer_normal", + "layer2": "computercraft:item/pocket_computer_light" + } +} diff --git a/src/main/resources/assets/computercraft/models/item/pocket_computer_on.json b/src/main/resources/assets/computercraft/models/item/pocket_computer_on.json deleted file mode 100644 index 463f8c2fa..000000000 --- a/src/main/resources/assets/computercraft/models/item/pocket_computer_on.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "computercraft:items/pocket_computer_on", - "layer1": "computercraft:items/pocket_computer", - "layer2": "computercraft:items/pocket_computer_light" - } -} diff --git a/src/main/resources/assets/computercraft/models/item/printout.json b/src/main/resources/assets/computercraft/models/item/printed_book.json similarity index 53% rename from src/main/resources/assets/computercraft/models/item/printout.json rename to src/main/resources/assets/computercraft/models/item/printed_book.json index 8af82c201..c2e601ff6 100644 --- a/src/main/resources/assets/computercraft/models/item/printout.json +++ b/src/main/resources/assets/computercraft/models/item/printed_book.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "computercraft:items/page" + "layer0": "computercraft:item/printed_book" } } diff --git a/src/main/resources/assets/computercraft/models/item/book.json b/src/main/resources/assets/computercraft/models/item/printed_page.json similarity index 53% rename from src/main/resources/assets/computercraft/models/item/book.json rename to src/main/resources/assets/computercraft/models/item/printed_page.json index c90e874db..b7b945e41 100644 --- a/src/main/resources/assets/computercraft/models/item/book.json +++ b/src/main/resources/assets/computercraft/models/item/printed_page.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "computercraft:items/book" + "layer0": "computercraft:item/printed_page" } } diff --git a/src/main/resources/assets/computercraft/models/item/pages.json b/src/main/resources/assets/computercraft/models/item/printed_pages.json similarity index 53% rename from src/main/resources/assets/computercraft/models/item/pages.json rename to src/main/resources/assets/computercraft/models/item/printed_pages.json index 55ef26785..dbe6704e2 100644 --- a/src/main/resources/assets/computercraft/models/item/pages.json +++ b/src/main/resources/assets/computercraft/models/item/printed_pages.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "computercraft:items/page_bundle" + "layer0": "computercraft:item/printed_pages" } } diff --git a/src/main/resources/assets/computercraft/models/item/treasure_disk.json b/src/main/resources/assets/computercraft/models/item/treasure_disk.json index 69ec8ebe6..f815397c5 100644 --- a/src/main/resources/assets/computercraft/models/item/treasure_disk.json +++ b/src/main/resources/assets/computercraft/models/item/treasure_disk.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "computercraft:items/disk_frame", - "layer1": "computercraft:items/disk_colour" + "layer0": "computercraft:item/disk_frame", + "layer1": "computercraft:item/disk_colour" } } diff --git a/src/main/resources/assets/computercraft/models/item/turtle.json b/src/main/resources/assets/computercraft/models/item/turtle.json deleted file mode 100644 index a223545cb..000000000 --- a/src/main/resources/assets/computercraft/models/item/turtle.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "computercraft:block/turtle" -} diff --git a/src/main/resources/assets/computercraft/models/item/turtle_advanced.json b/src/main/resources/assets/computercraft/models/item/turtle_advanced.json index a0c014518..05160ec24 100644 --- a/src/main/resources/assets/computercraft/models/item/turtle_advanced.json +++ b/src/main/resources/assets/computercraft/models/item/turtle_advanced.json @@ -1,3 +1,3 @@ { - "parent": "computercraft:block/advanced_turtle" + "parent": "computercraft:block/turtle_advanced" } diff --git a/src/main/resources/assets/computercraft/models/item/turtle_colour.json b/src/main/resources/assets/computercraft/models/item/turtle_colour.json new file mode 100644 index 000000000..ef04ffdde --- /dev/null +++ b/src/main/resources/assets/computercraft/models/item/turtle_colour.json @@ -0,0 +1,3 @@ +{ + "parent": "computercraft:block/turtle_colour" +} diff --git a/src/main/resources/assets/computercraft/models/block/turtle_crafting_table_left.json b/src/main/resources/assets/computercraft/models/item/turtle_crafting_table_left.json similarity index 60% rename from src/main/resources/assets/computercraft/models/block/turtle_crafting_table_left.json rename to src/main/resources/assets/computercraft/models/item/turtle_crafting_table_left.json index ce211fd19..8b93cc7c6 100644 --- a/src/main/resources/assets/computercraft/models/block/turtle_crafting_table_left.json +++ b/src/main/resources/assets/computercraft/models/item/turtle_crafting_table_left.json @@ -1,6 +1,6 @@ { "parent": "computercraft:block/turtle_upgrade_base_left", "textures": { - "texture": "computercraft:blocks/crafty_upgrade" + "texture": "computercraft:block/turtle_crafty_face" } } diff --git a/src/main/resources/assets/computercraft/models/block/turtle_crafting_table_right.json b/src/main/resources/assets/computercraft/models/item/turtle_crafting_table_right.json similarity index 60% rename from src/main/resources/assets/computercraft/models/block/turtle_crafting_table_right.json rename to src/main/resources/assets/computercraft/models/item/turtle_crafting_table_right.json index 2538a8c8f..87c7226da 100644 --- a/src/main/resources/assets/computercraft/models/block/turtle_crafting_table_right.json +++ b/src/main/resources/assets/computercraft/models/item/turtle_crafting_table_right.json @@ -1,6 +1,6 @@ { "parent": "computercraft:block/turtle_upgrade_base_right", "textures": { - "texture": "computercraft:blocks/crafty_upgrade" + "texture": "computercraft:block/turtle_crafty_face" } } diff --git a/src/main/resources/assets/computercraft/models/item/turtle_expanded.json b/src/main/resources/assets/computercraft/models/item/turtle_expanded.json deleted file mode 100644 index a223545cb..000000000 --- a/src/main/resources/assets/computercraft/models/item/turtle_expanded.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "computercraft:block/turtle" -} diff --git a/src/main/resources/assets/computercraft/models/block/turtle_modem_off_left.json b/src/main/resources/assets/computercraft/models/item/turtle_modem_advanced_off_left.json similarity index 56% rename from src/main/resources/assets/computercraft/models/block/turtle_modem_off_left.json rename to src/main/resources/assets/computercraft/models/item/turtle_modem_advanced_off_left.json index e47b5f73c..b77cfcb52 100644 --- a/src/main/resources/assets/computercraft/models/block/turtle_modem_off_left.json +++ b/src/main/resources/assets/computercraft/models/item/turtle_modem_advanced_off_left.json @@ -1,6 +1,6 @@ { "parent": "computercraft:block/turtle_upgrade_base_left", "textures": { - "texture": "computercraft:blocks/wireless_modem_face" + "texture": "computercraft:block/wireless_modem_advanced_face" } } diff --git a/src/main/resources/assets/computercraft/models/block/turtle_modem_off_right.json b/src/main/resources/assets/computercraft/models/item/turtle_modem_advanced_off_right.json similarity index 56% rename from src/main/resources/assets/computercraft/models/block/turtle_modem_off_right.json rename to src/main/resources/assets/computercraft/models/item/turtle_modem_advanced_off_right.json index b237d4f48..6e0a3906e 100644 --- a/src/main/resources/assets/computercraft/models/block/turtle_modem_off_right.json +++ b/src/main/resources/assets/computercraft/models/item/turtle_modem_advanced_off_right.json @@ -1,6 +1,6 @@ { "parent": "computercraft:block/turtle_upgrade_base_right", "textures": { - "texture": "computercraft:blocks/wireless_modem_face" + "texture": "computercraft:block/wireless_modem_advanced_face" } } diff --git a/src/main/resources/assets/computercraft/models/item/turtle_modem_advanced_on_left.json b/src/main/resources/assets/computercraft/models/item/turtle_modem_advanced_on_left.json new file mode 100644 index 000000000..c01ae10d6 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/item/turtle_modem_advanced_on_left.json @@ -0,0 +1,6 @@ +{ + "parent": "computercraft:block/turtle_upgrade_base_left", + "textures": { + "texture": "computercraft:block/wireless_modem_advanced_face_on" + } +} diff --git a/src/main/resources/assets/computercraft/models/item/turtle_modem_advanced_on_right.json b/src/main/resources/assets/computercraft/models/item/turtle_modem_advanced_on_right.json new file mode 100644 index 000000000..ee3de262c --- /dev/null +++ b/src/main/resources/assets/computercraft/models/item/turtle_modem_advanced_on_right.json @@ -0,0 +1,6 @@ +{ + "parent": "computercraft:block/turtle_upgrade_base_right", + "textures": { + "texture": "computercraft:block/wireless_modem_advanced_face_on" + } +} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_on_left.json b/src/main/resources/assets/computercraft/models/item/turtle_modem_normal_off_left.json similarity index 56% rename from src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_on_left.json rename to src/main/resources/assets/computercraft/models/item/turtle_modem_normal_off_left.json index 2cadf94c7..b01fb94cf 100644 --- a/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_on_left.json +++ b/src/main/resources/assets/computercraft/models/item/turtle_modem_normal_off_left.json @@ -1,6 +1,6 @@ { "parent": "computercraft:block/turtle_upgrade_base_left", "textures": { - "texture": "computercraft:blocks/adv_modem_face_on" + "texture": "computercraft:block/wireless_modem_normal_face" } } diff --git a/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_off_right.json b/src/main/resources/assets/computercraft/models/item/turtle_modem_normal_off_right.json similarity index 57% rename from src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_off_right.json rename to src/main/resources/assets/computercraft/models/item/turtle_modem_normal_off_right.json index f23baad27..6ad179231 100644 --- a/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_off_right.json +++ b/src/main/resources/assets/computercraft/models/item/turtle_modem_normal_off_right.json @@ -1,6 +1,6 @@ { "parent": "computercraft:block/turtle_upgrade_base_right", "textures": { - "texture": "computercraft:blocks/adv_modem_face" + "texture": "computercraft:block/wireless_modem_normal_face" } } diff --git a/src/main/resources/assets/computercraft/models/item/turtle_modem_normal_on_left.json b/src/main/resources/assets/computercraft/models/item/turtle_modem_normal_on_left.json new file mode 100644 index 000000000..cde6c4276 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/item/turtle_modem_normal_on_left.json @@ -0,0 +1,6 @@ +{ + "parent": "computercraft:block/turtle_upgrade_base_left", + "textures": { + "texture": "computercraft:block/wireless_modem_normal_face_on" + } +} diff --git a/src/main/resources/assets/computercraft/models/item/turtle_modem_normal_on_right.json b/src/main/resources/assets/computercraft/models/item/turtle_modem_normal_on_right.json new file mode 100644 index 000000000..182942292 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/item/turtle_modem_normal_on_right.json @@ -0,0 +1,6 @@ +{ + "parent": "computercraft:block/turtle_upgrade_base_right", + "textures": { + "texture": "computercraft:block/wireless_modem_normal_face_on" + } +} diff --git a/src/main/resources/assets/computercraft/models/item/turtle_normal.json b/src/main/resources/assets/computercraft/models/item/turtle_normal.json new file mode 100644 index 000000000..7e52697e1 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/item/turtle_normal.json @@ -0,0 +1,3 @@ +{ + "parent": "computercraft:block/turtle_normal" +} diff --git a/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_off_left.json b/src/main/resources/assets/computercraft/models/item/turtle_speaker_upgrade_left.json similarity index 59% rename from src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_off_left.json rename to src/main/resources/assets/computercraft/models/item/turtle_speaker_upgrade_left.json index 361a8369e..206713cc9 100644 --- a/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_off_left.json +++ b/src/main/resources/assets/computercraft/models/item/turtle_speaker_upgrade_left.json @@ -1,6 +1,6 @@ { "parent": "computercraft:block/turtle_upgrade_base_left", "textures": { - "texture": "computercraft:blocks/adv_modem_face" + "texture": "computercraft:block/turtle_speaker_face" } } diff --git a/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_on_right.json b/src/main/resources/assets/computercraft/models/item/turtle_speaker_upgrade_right.json similarity index 59% rename from src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_on_right.json rename to src/main/resources/assets/computercraft/models/item/turtle_speaker_upgrade_right.json index aad434e78..f43a92f77 100644 --- a/src/main/resources/assets/computercraft/models/block/advanced_turtle_modem_on_right.json +++ b/src/main/resources/assets/computercraft/models/item/turtle_speaker_upgrade_right.json @@ -1,6 +1,6 @@ { "parent": "computercraft:block/turtle_upgrade_base_right", "textures": { - "texture": "computercraft:blocks/adv_modem_face_on" + "texture": "computercraft:block/turtle_speaker_face" } } diff --git a/src/main/resources/assets/computercraft/models/item/turtle_white.json b/src/main/resources/assets/computercraft/models/item/turtle_white.json deleted file mode 100644 index 04b89922b..000000000 --- a/src/main/resources/assets/computercraft/models/item/turtle_white.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "computercraft:block/turtle_white" -} diff --git a/src/main/resources/assets/computercraft/models/item/wireless_modem.json b/src/main/resources/assets/computercraft/models/item/wireless_modem.json deleted file mode 100644 index 9be5c29ad..000000000 --- a/src/main/resources/assets/computercraft/models/item/wireless_modem.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "computercraft:block/wireless_modem_off" -} diff --git a/src/main/resources/assets/computercraft/models/item/wireless_modem_advanced.json b/src/main/resources/assets/computercraft/models/item/wireless_modem_advanced.json new file mode 100644 index 000000000..801d0dd42 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/item/wireless_modem_advanced.json @@ -0,0 +1,3 @@ +{ + "parent": "computercraft:block/wireless_modem_advanced_off" +} diff --git a/src/main/resources/assets/computercraft/models/item/wireless_modem_normal.json b/src/main/resources/assets/computercraft/models/item/wireless_modem_normal.json new file mode 100644 index 000000000..bf403a943 --- /dev/null +++ b/src/main/resources/assets/computercraft/models/item/wireless_modem_normal.json @@ -0,0 +1,3 @@ +{ + "parent": "computercraft:block/wireless_modem_normal_off" +} diff --git a/src/main/resources/assets/computercraft/textures/block/computer_front_advanced.png b/src/main/resources/assets/computercraft/textures/block/computer_advanced_front.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/computer_front_advanced.png rename to src/main/resources/assets/computercraft/textures/block/computer_advanced_front.png diff --git a/src/main/resources/assets/computercraft/textures/block/computer_front_blink_advanced.png b/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_blink.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/computer_front_blink_advanced.png rename to src/main/resources/assets/computercraft/textures/block/computer_advanced_front_blink.png diff --git a/src/main/resources/assets/computercraft/textures/block/command_computer_front_blink.png.mcmeta b/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_blink.png.mcmeta similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/command_computer_front_blink.png.mcmeta rename to src/main/resources/assets/computercraft/textures/block/computer_advanced_front_blink.png.mcmeta diff --git a/src/main/resources/assets/computercraft/textures/block/computer_front_on_advanced.png b/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_on.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/computer_front_on_advanced.png rename to src/main/resources/assets/computercraft/textures/block/computer_advanced_front_on.png diff --git a/src/main/resources/assets/computercraft/textures/block/computer_side_advanced.png b/src/main/resources/assets/computercraft/textures/block/computer_advanced_side.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/computer_side_advanced.png rename to src/main/resources/assets/computercraft/textures/block/computer_advanced_side.png diff --git a/src/main/resources/assets/computercraft/textures/block/computer_top_advanced.png b/src/main/resources/assets/computercraft/textures/block/computer_advanced_top.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/computer_top_advanced.png rename to src/main/resources/assets/computercraft/textures/block/computer_advanced_top.png diff --git a/src/main/resources/assets/computercraft/textures/block/command_computer_front.png b/src/main/resources/assets/computercraft/textures/block/computer_command_front.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/command_computer_front.png rename to src/main/resources/assets/computercraft/textures/block/computer_command_front.png diff --git a/src/main/resources/assets/computercraft/textures/block/command_computer_front_blink.png b/src/main/resources/assets/computercraft/textures/block/computer_command_front_blink.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/command_computer_front_blink.png rename to src/main/resources/assets/computercraft/textures/block/computer_command_front_blink.png diff --git a/src/main/resources/assets/computercraft/textures/block/computer_front_blink.png.mcmeta b/src/main/resources/assets/computercraft/textures/block/computer_command_front_blink.png.mcmeta similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/computer_front_blink.png.mcmeta rename to src/main/resources/assets/computercraft/textures/block/computer_command_front_blink.png.mcmeta diff --git a/src/main/resources/assets/computercraft/textures/block/command_computer_front_on.png b/src/main/resources/assets/computercraft/textures/block/computer_command_front_on.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/command_computer_front_on.png rename to src/main/resources/assets/computercraft/textures/block/computer_command_front_on.png diff --git a/src/main/resources/assets/computercraft/textures/block/command_computer_side.png b/src/main/resources/assets/computercraft/textures/block/computer_command_side.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/command_computer_side.png rename to src/main/resources/assets/computercraft/textures/block/computer_command_side.png diff --git a/src/main/resources/assets/computercraft/textures/block/command_computer_top.png b/src/main/resources/assets/computercraft/textures/block/computer_command_top.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/command_computer_top.png rename to src/main/resources/assets/computercraft/textures/block/computer_command_top.png diff --git a/src/main/resources/assets/computercraft/textures/block/computer_front.png b/src/main/resources/assets/computercraft/textures/block/computer_normal_front.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/computer_front.png rename to src/main/resources/assets/computercraft/textures/block/computer_normal_front.png diff --git a/src/main/resources/assets/computercraft/textures/block/computer_front_blink.png b/src/main/resources/assets/computercraft/textures/block/computer_normal_front_blink.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/computer_front_blink.png rename to src/main/resources/assets/computercraft/textures/block/computer_normal_front_blink.png diff --git a/src/main/resources/assets/computercraft/textures/block/computer_front_blink_advanced.png.mcmeta b/src/main/resources/assets/computercraft/textures/block/computer_normal_front_blink.png.mcmeta similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/computer_front_blink_advanced.png.mcmeta rename to src/main/resources/assets/computercraft/textures/block/computer_normal_front_blink.png.mcmeta diff --git a/src/main/resources/assets/computercraft/textures/block/computer_front_on.png b/src/main/resources/assets/computercraft/textures/block/computer_normal_front_on.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/computer_front_on.png rename to src/main/resources/assets/computercraft/textures/block/computer_normal_front_on.png diff --git a/src/main/resources/assets/computercraft/textures/block/computer_side.png b/src/main/resources/assets/computercraft/textures/block/computer_normal_side.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/computer_side.png rename to src/main/resources/assets/computercraft/textures/block/computer_normal_side.png diff --git a/src/main/resources/assets/computercraft/textures/block/computer_top.png b/src/main/resources/assets/computercraft/textures/block/computer_normal_top.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/computer_top.png rename to src/main/resources/assets/computercraft/textures/block/computer_normal_top.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor0.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_0.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor0.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_0.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor1.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_1.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor1.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_1.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor15.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_15.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor15.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_15.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor16.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_16.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor16.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_16.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor17.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_17.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor17.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_17.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor18.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_18.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor18.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_18.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor19.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_19.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor19.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_19.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor2.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_2.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor2.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_2.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor20.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_20.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor20.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_20.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor21.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_21.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor21.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_21.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor22.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_22.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor22.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_22.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor23.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_23.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor23.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_23.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor24.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_24.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor24.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_24.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor25.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_25.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor25.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_25.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor26.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_26.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor26.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_26.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor27.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_27.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor27.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_27.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor28.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_28.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor28.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_28.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor29.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_29.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor29.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_29.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor3.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_3.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor3.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_3.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor30.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_30.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor30.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_30.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor31.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_31.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor31.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_31.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor32.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_32.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor32.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_32.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor33.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_33.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor33.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_33.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor34.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_34.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor34.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_34.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor35.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_35.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor35.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_35.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor36.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_36.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor36.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_36.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor37.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_37.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor37.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_37.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor38.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_38.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor38.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_38.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor39.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_39.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor39.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_39.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor4.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_4.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor4.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_4.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor40.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_40.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor40.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_40.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor41.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_41.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor41.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_41.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor42.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_42.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor42.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_42.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor43.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_43.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor43.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_43.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor44.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_44.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor44.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_44.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor45.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_45.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor45.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_45.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor46.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_46.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor46.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_46.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor47.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_47.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor47.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_47.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor5.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_5.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor5.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_5.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor6.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_6.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor6.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_6.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_monitor7.png b/src/main/resources/assets/computercraft/textures/block/monitor_advanced_7.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_monitor7.png rename to src/main/resources/assets/computercraft/textures/block/monitor_advanced_7.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor0.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_0.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor0.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_0.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor1.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_1.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor1.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_1.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor15.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_15.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor15.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_15.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor16.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_16.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor16.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_16.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor17.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_17.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor17.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_17.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor18.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_18.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor18.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_18.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor19.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_19.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor19.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_19.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor2.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_2.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor2.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_2.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor20.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_20.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor20.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_20.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor21.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_21.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor21.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_21.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor22.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_22.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor22.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_22.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor23.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_23.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor23.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_23.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor24.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_24.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor24.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_24.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor25.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_25.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor25.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_25.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor26.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_26.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor26.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_26.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor27.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_27.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor27.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_27.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor28.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_28.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor28.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_28.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor29.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_29.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor29.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_29.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor3.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_3.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor3.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_3.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor30.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_30.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor30.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_30.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor31.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_31.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor31.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_31.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor32.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_32.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor32.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_32.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor33.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_33.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor33.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_33.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor34.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_34.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor34.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_34.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor35.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_35.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor35.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_35.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor36.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_36.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor36.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_36.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor37.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_37.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor37.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_37.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor38.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_38.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor38.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_38.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor39.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_39.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor39.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_39.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor4.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_4.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor4.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_4.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor40.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_40.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor40.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_40.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor41.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_41.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor41.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_41.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor42.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_42.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor42.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_42.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor43.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_43.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor43.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_43.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor44.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_44.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor44.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_44.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor45.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_45.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor45.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_45.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor46.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_46.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor46.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_46.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor47.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_47.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor47.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_47.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor5.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_5.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor5.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_5.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor6.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_6.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor6.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_6.png diff --git a/src/main/resources/assets/computercraft/textures/block/monitor7.png b/src/main/resources/assets/computercraft/textures/block/monitor_normal_7.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/monitor7.png rename to src/main/resources/assets/computercraft/textures/block/monitor_normal_7.png diff --git a/src/main/resources/assets/computercraft/textures/block/turtle_white.png b/src/main/resources/assets/computercraft/textures/block/turtle_colour.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/turtle_white.png rename to src/main/resources/assets/computercraft/textures/block/turtle_colour.png diff --git a/src/main/resources/assets/computercraft/textures/block/crafty_upgrade.png b/src/main/resources/assets/computercraft/textures/block/turtle_crafty_face.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/crafty_upgrade.png rename to src/main/resources/assets/computercraft/textures/block/turtle_crafty_face.png diff --git a/src/main/resources/assets/computercraft/textures/block/turtle.png b/src/main/resources/assets/computercraft/textures/block/turtle_normal.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/turtle.png rename to src/main/resources/assets/computercraft/textures/block/turtle_normal.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_modem_face.png b/src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_modem_face.png rename to src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face.png diff --git a/src/main/resources/assets/computercraft/textures/block/adv_modem_face_on.png b/src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face_on.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/adv_modem_face_on.png rename to src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face_on.png diff --git a/src/main/resources/assets/computercraft/textures/block/wireless_modem_face.png b/src/main/resources/assets/computercraft/textures/block/wireless_modem_normal_face.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/wireless_modem_face.png rename to src/main/resources/assets/computercraft/textures/block/wireless_modem_normal_face.png diff --git a/src/main/resources/assets/computercraft/textures/block/wireless_modem_face_on.png b/src/main/resources/assets/computercraft/textures/block/wireless_modem_normal_face_on.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/block/wireless_modem_face_on.png rename to src/main/resources/assets/computercraft/textures/block/wireless_modem_normal_face_on.png diff --git a/src/main/resources/assets/computercraft/textures/gui/corners.png b/src/main/resources/assets/computercraft/textures/gui/corners_normal.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/gui/corners.png rename to src/main/resources/assets/computercraft/textures/gui/corners_normal.png diff --git a/src/main/resources/assets/computercraft/textures/gui/diskdrive.png b/src/main/resources/assets/computercraft/textures/gui/disk_drive.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/gui/diskdrive.png rename to src/main/resources/assets/computercraft/textures/gui/disk_drive.png diff --git a/src/main/resources/assets/computercraft/textures/gui/turtle.png b/src/main/resources/assets/computercraft/textures/gui/turtle_normal.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/gui/turtle.png rename to src/main/resources/assets/computercraft/textures/gui/turtle_normal.png diff --git a/src/main/resources/assets/computercraft/textures/item/pocket_computer.png b/src/main/resources/assets/computercraft/textures/item/pocket_computer_normal.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/item/pocket_computer.png rename to src/main/resources/assets/computercraft/textures/item/pocket_computer_normal.png diff --git a/src/main/resources/assets/computercraft/textures/item/book.png b/src/main/resources/assets/computercraft/textures/item/printed_book.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/item/book.png rename to src/main/resources/assets/computercraft/textures/item/printed_book.png diff --git a/src/main/resources/assets/computercraft/textures/item/page.png b/src/main/resources/assets/computercraft/textures/item/printed_page.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/item/page.png rename to src/main/resources/assets/computercraft/textures/item/printed_page.png diff --git a/src/main/resources/assets/computercraft/textures/item/page_bundle.png b/src/main/resources/assets/computercraft/textures/item/printed_pages.png similarity index 100% rename from src/main/resources/assets/computercraft/textures/item/page_bundle.png rename to src/main/resources/assets/computercraft/textures/item/printed_pages.png diff --git a/src/main/resources/data/computercraft/advancements/recipes/advanced_computer.json b/src/main/resources/data/computercraft/advancements/recipes/advanced_computer.json index 96c0f57e4..fa3783c51 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/advanced_computer.json +++ b/src/main/resources/data/computercraft/advancements/recipes/advanced_computer.json @@ -7,7 +7,7 @@ "has_redstone": { "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ { "item": "minecraft:redstone" } ] + "items": [ { "tag": "forge:dusts/redstone" } ] } }, "has_the_recipe": { diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/disk.json b/src/main/resources/data/computercraft/advancements/recipes/generated/disk.json index c9af1d3b4..94c07e6d9 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/disk.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/disk.json @@ -21,10 +21,10 @@ ] }, "criteria": { - "has_printer": { + "has_drive": { "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ { "item": "computercraft:peripheral", "data": 0 } ] + "items": [ { "item": "computercraft:disk_drive" } ] } }, "has_recipe_1": { @@ -94,7 +94,7 @@ }, "requirements": [ [ - "has_printer", + "has_drive", "has_recipe_1", "has_recipe_2", "has_recipe_3", diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_speaker.json b/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_speaker.json index 3fc1fea61..3b9da6c6f 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_speaker.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_speaker.json @@ -8,8 +8,8 @@ "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:pocket_computer", "data": 1 }, - { "item": "computercraft:peripheral", "data": 5 } + { "item": "computercraft:pocket_computer_advanced" }, + { "item": "computercraft:speaker" } ] } }, diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_advanced_modem.json b/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_wireless_modem_advanced.json similarity index 69% rename from src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_advanced_modem.json rename to src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_wireless_modem_advanced.json index 8a000781b..ce426a0f9 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_advanced_modem.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_wireless_modem_advanced.json @@ -1,21 +1,21 @@ { "parent": "minecraft:recipes/root", "rewards": { - "recipes": [ "computercraft:generated/pocket_advanced/computercraft_advanced_modem" ] + "recipes": [ "computercraft:generated/pocket_advanced/computercraft_wireless_modem_advanced" ] }, "criteria": { "has_items": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:pocket_computer", "data": 1 }, - { "item": "computercraft:advanced_modem" } + { "item": "computercraft:pocket_computer_advanced" }, + { "item": "computercraft:wireless_modem_advanced" } ] } }, "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/pocket_advanced/computercraft_advanced_modem" } + "conditions": { "recipe": "computercraft:generated/pocket_advanced/computercraft_wireless_modem_advanced" } } }, "requirements": [ [ "has_items", "has_the_recipe" ] ] diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_wireless_modem.json b/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_wireless_modem_normal.json similarity index 69% rename from src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_wireless_modem.json rename to src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_wireless_modem_normal.json index 44a237f79..d92bae7b0 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_wireless_modem.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_advanced/computercraft_wireless_modem_normal.json @@ -1,21 +1,21 @@ { "parent": "minecraft:recipes/root", "rewards": { - "recipes": [ "computercraft:generated/pocket_advanced/computercraft_wireless_modem" ] + "recipes": [ "computercraft:generated/pocket_advanced/computercraft_wireless_modem_normal" ] }, "criteria": { "has_items": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:pocket_computer", "data": 1 }, - { "item": "computercraft:peripheral", "data": 1 } + { "item": "computercraft:pocket_computer_advanced" }, + { "item": "computercraft:wireless_modem_normal" } ] } }, "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/pocket_advanced/computercraft_wireless_modem" } + "conditions": { "recipe": "computercraft:generated/pocket_advanced/computercraft_wireless_modem_normal" } } }, "requirements": [ [ "has_items", "has_the_recipe" ] ] diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_speaker.json b/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_speaker.json index adec834b9..a0fac97f9 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_speaker.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_speaker.json @@ -8,8 +8,8 @@ "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:pocket_computer", "data": 0 }, - { "item": "computercraft:peripheral", "data": 5 } + { "item": "computercraft:pocket_computer_normal" }, + { "item": "computercraft:speaker" } ] } }, diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_advanced_modem.json b/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_wireless_modem_advanced.json similarity index 69% rename from src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_advanced_modem.json rename to src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_wireless_modem_advanced.json index 0b750fedb..29c8cb86b 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_advanced_modem.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_wireless_modem_advanced.json @@ -1,21 +1,21 @@ { "parent": "minecraft:recipes/root", "rewards": { - "recipes": [ "computercraft:generated/pocket_normal/computercraft_advanced_modem" ] + "recipes": [ "computercraft:generated/pocket_normal/computercraft_wireless_modem_advanced" ] }, "criteria": { "has_items": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:pocket_computer", "data": 0 }, - { "item": "computercraft:advanced_modem" } + { "item": "computercraft:pocket_computer_normal" }, + { "item": "computercraft:wireless_modem_advanced" } ] } }, "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/pocket_normal/computercraft_advanced_modem" } + "conditions": { "recipe": "computercraft:generated/pocket_normal/computercraft_wireless_modem_advanced" } } }, "requirements": [ [ "has_items", "has_the_recipe" ] ] diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_wireless_modem.json b/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_wireless_modem_normal.json similarity index 70% rename from src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_wireless_modem.json rename to src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_wireless_modem_normal.json index 71e4e8991..19fe726ee 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_wireless_modem.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/pocket_normal/computercraft_wireless_modem_normal.json @@ -1,21 +1,21 @@ { "parent": "minecraft:recipes/root", "rewards": { - "recipes": [ "computercraft:generated/pocket_normal/computercraft_wireless_modem" ] + "recipes": [ "computercraft:generated/pocket_normal/computercraft_wireless_modem_normal" ] }, "criteria": { "has_items": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:pocket_computer", "data": 0 }, - { "item": "computercraft:peripheral", "data": 1 } + { "item": "computercraft:pocket_computer_normal" }, + { "item": "computercraft:wireless_modem_normal" } ] } }, "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/pocket_normal/computercraft_wireless_modem" } + "conditions": { "recipe": "computercraft:generated/pocket_normal/computercraft_wireless_modem_normal" } } }, "requirements": [ [ "has_items", "has_the_recipe" ] ] diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_speaker.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_speaker.json index 1a161916a..09942d3d5 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_speaker.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_speaker.json @@ -8,8 +8,8 @@ "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:turtle_advanced", "data": 0 }, - { "item": "computercraft:peripheral", "data": 5 } + { "item": "computercraft:turtle_advanced" }, + { "item": "computercraft:speaker" } ] } }, diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_wireless_modem.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_wireless_modem_advanced.json similarity index 70% rename from src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_wireless_modem.json rename to src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_wireless_modem_advanced.json index e9ea34588..23ed3111c 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_wireless_modem.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_wireless_modem_advanced.json @@ -1,21 +1,21 @@ { "parent": "minecraft:recipes/root", "rewards": { - "recipes": [ "computercraft:generated/turtle_advanced/computercraft_wireless_modem" ] + "recipes": [ "computercraft:generated/turtle_advanced/computercraft_wireless_modem_advanced" ] }, "criteria": { "has_items": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:turtle_advanced", "data": 0 }, - { "item": "computercraft:peripheral", "data": 1 } + { "item": "computercraft:turtle_advanced" }, + { "item": "computercraft:wireless_modem_advanced" } ] } }, "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/turtle_advanced/computercraft_wireless_modem" } + "conditions": { "recipe": "computercraft:generated/turtle_advanced/computercraft_wireless_modem_advanced" } } }, "requirements": [ [ "has_items", "has_the_recipe" ] ] diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_advanced_modem.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_wireless_modem_normal.json similarity index 70% rename from src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_advanced_modem.json rename to src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_wireless_modem_normal.json index 47dc97822..e2613b21f 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_advanced_modem.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/computercraft_wireless_modem_normal.json @@ -1,21 +1,21 @@ { "parent": "minecraft:recipes/root", "rewards": { - "recipes": [ "computercraft:generated/turtle_advanced/computercraft_advanced_modem" ] + "recipes": [ "computercraft:generated/turtle_advanced/computercraft_wireless_modem_normal" ] }, "criteria": { "has_items": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:turtle_advanced", "data": 0 }, - { "item": "computercraft:advanced_modem" } + { "item": "computercraft:turtle_advanced" }, + { "item": "computercraft:wireless_modem_normal" } ] } }, "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/turtle_advanced/computercraft_advanced_modem" } + "conditions": { "recipe": "computercraft:generated/turtle_advanced/computercraft_wireless_modem_normal" } } }, "requirements": [ [ "has_items", "has_the_recipe" ] ] diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_crafting_table.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_crafting_table.json index 5d5d14ea6..c6c86d47a 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_crafting_table.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_crafting_table.json @@ -8,7 +8,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:turtle_advanced", "data": 0 }, + { "item": "computercraft:turtle_advanced" }, { "item": "minecraft:crafting_table" } ] } diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_axe.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_axe.json index 6994546df..6c1adcd84 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_axe.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_axe.json @@ -8,7 +8,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:turtle_advanced", "data": 0 }, + { "item": "computercraft:turtle_advanced" }, { "item": "minecraft:diamond_axe" } ] } diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_hoe.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_hoe.json index b65be1a7d..d906a8317 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_hoe.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_hoe.json @@ -8,7 +8,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:turtle_advanced", "data": 0 }, + { "item": "computercraft:turtle_advanced" }, { "item": "minecraft:diamond_hoe" } ] } diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_pickaxe.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_pickaxe.json index 77bd187ca..9d59c615e 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_pickaxe.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_pickaxe.json @@ -8,7 +8,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:turtle_advanced", "data": 0 }, + { "item": "computercraft:turtle_advanced" }, { "item": "minecraft:diamond_pickaxe" } ] } diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_shovel.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_shovel.json index 271496a43..efc7a3fce 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_shovel.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_shovel.json @@ -8,7 +8,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:turtle_advanced", "data": 0 }, + { "item": "computercraft:turtle_advanced" }, { "item": "minecraft:diamond_shovel" } ] } diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_sword.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_sword.json index 5e9cfaa2f..ad9f19c17 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_sword.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_advanced/minecraft_diamond_sword.json @@ -8,7 +8,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:turtle_advanced", "data": 0 }, + { "item": "computercraft:turtle_advanced" }, { "item": "minecraft:diamond_sword" } ] } diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_speaker.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_speaker.json index f713d1206..6d18d9ee2 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_speaker.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_speaker.json @@ -8,8 +8,8 @@ "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:turtle_expanded", "data": 0 }, - { "item": "computercraft:peripheral", "data": 5 } + { "item": "computercraft:turtle_normal" }, + { "item": "computercraft:speaker" } ] } }, diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_wireless_modem.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_wireless_modem_advanced.json similarity index 70% rename from src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_wireless_modem.json rename to src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_wireless_modem_advanced.json index dfb6588f8..5fe595acc 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_wireless_modem.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_wireless_modem_advanced.json @@ -1,21 +1,21 @@ { "parent": "minecraft:recipes/root", "rewards": { - "recipes": [ "computercraft:generated/turtle_normal/computercraft_wireless_modem" ] + "recipes": [ "computercraft:generated/turtle_normal/computercraft_wireless_modem_advanced" ] }, "criteria": { "has_items": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:turtle_expanded", "data": 0 }, - { "item": "computercraft:peripheral", "data": 1 } + { "item": "computercraft:turtle_normal" }, + { "item": "computercraft:wireless_modem_advanced" } ] } }, "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/turtle_normal/computercraft_wireless_modem" } + "conditions": { "recipe": "computercraft:generated/turtle_normal/computercraft_wireless_modem_advanced" } } }, "requirements": [ [ "has_items", "has_the_recipe" ] ] diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_advanced_modem.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_wireless_modem_normal.json similarity index 71% rename from src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_advanced_modem.json rename to src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_wireless_modem_normal.json index 2e486f91b..8d43a7c65 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_advanced_modem.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/computercraft_wireless_modem_normal.json @@ -1,21 +1,21 @@ { "parent": "minecraft:recipes/root", "rewards": { - "recipes": [ "computercraft:generated/turtle_normal/computercraft_advanced_modem" ] + "recipes": [ "computercraft:generated/turtle_normal/computercraft_wireless_modem_normal" ] }, "criteria": { "has_items": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:turtle_expanded", "data": 0 }, - { "item": "computercraft:advanced_modem" } + { "item": "computercraft:turtle_normal" }, + { "item": "computercraft:wireless_modem_normal" } ] } }, "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:generated/turtle_normal/computercraft_advanced_modem" } + "conditions": { "recipe": "computercraft:generated/turtle_normal/computercraft_wireless_modem_normal" } } }, "requirements": [ [ "has_items", "has_the_recipe" ] ] diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_crafting_table.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_crafting_table.json index 292f04e30..2bee28454 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_crafting_table.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_crafting_table.json @@ -8,7 +8,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:turtle_expanded", "data": 0 }, + { "item": "computercraft:turtle_normal" }, { "item": "minecraft:crafting_table" } ] } diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_axe.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_axe.json index 8ddc6c263..df0b816a6 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_axe.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_axe.json @@ -8,7 +8,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:turtle_expanded", "data": 0 }, + { "item": "computercraft:turtle_normal" }, { "item": "minecraft:diamond_axe" } ] } diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_hoe.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_hoe.json index 056186f44..8df26b012 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_hoe.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_hoe.json @@ -8,7 +8,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:turtle_expanded", "data": 0 }, + { "item": "computercraft:turtle_normal" }, { "item": "minecraft:diamond_hoe" } ] } diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_pickaxe.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_pickaxe.json index b2d29c747..e83d19e7b 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_pickaxe.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_pickaxe.json @@ -8,7 +8,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:turtle_expanded", "data": 0 }, + { "item": "computercraft:turtle_normal" }, { "item": "minecraft:diamond_pickaxe" } ] } diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_shovel.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_shovel.json index bebab1936..abeddd89b 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_shovel.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_shovel.json @@ -8,7 +8,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:turtle_expanded", "data": 0 }, + { "item": "computercraft:turtle_normal" }, { "item": "minecraft:diamond_shovel" } ] } diff --git a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_sword.json b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_sword.json index fcd87c222..8930c40dd 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_sword.json +++ b/src/main/resources/data/computercraft/advancements/recipes/generated/turtle_normal/minecraft_diamond_sword.json @@ -8,7 +8,7 @@ "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:turtle_expanded", "data": 0 }, + { "item": "computercraft:turtle_normal" }, { "item": "minecraft:diamond_sword" } ] } diff --git a/src/main/resources/data/computercraft/advancements/recipes/advanced_monitor.json b/src/main/resources/data/computercraft/advancements/recipes/monitor_advanced.json similarity index 85% rename from src/main/resources/data/computercraft/advancements/recipes/advanced_monitor.json rename to src/main/resources/data/computercraft/advancements/recipes/monitor_advanced.json index 49106a8fc..7bbe4cfc6 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/advanced_monitor.json +++ b/src/main/resources/data/computercraft/advancements/recipes/monitor_advanced.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "rewards": { - "recipes": [ "computercraft:advanced_monitor" ] + "recipes": [ "computercraft:monitor_advanced" ] }, "criteria": { "has_normal": { @@ -18,7 +18,7 @@ }, "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:advanced_monitor" } + "conditions": { "recipe": "computercraft:monitor_advanced" } } }, "requirements": [ diff --git a/src/main/resources/data/computercraft/advancements/recipes/normal_computer.json b/src/main/resources/data/computercraft/advancements/recipes/normal_computer.json index b8ef77055..1ad34028d 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/normal_computer.json +++ b/src/main/resources/data/computercraft/advancements/recipes/normal_computer.json @@ -7,7 +7,7 @@ "has_redstone": { "trigger": "minecraft:inventory_changed", "conditions": { - "items": [ { "item": "minecraft:redstone" } ] + "items": [ { "tag": "forge:dusts/redstone" } ] } }, "has_the_recipe": { diff --git a/src/main/resources/data/computercraft/advancements/recipes/normal_pocket_computer.json b/src/main/resources/data/computercraft/advancements/recipes/normal_pocket_computer.json index f04cda58d..20c268f4d 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/normal_pocket_computer.json +++ b/src/main/resources/data/computercraft/advancements/recipes/normal_pocket_computer.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "rewards": { - "recipes": [ "computercraft:normal_pocket_computer" ] + "recipes": [ "computercraft:normal_pocket_computer_normal" ] }, "criteria": { "has_normal": { @@ -24,7 +24,7 @@ }, "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:normal_pocket_computer" } + "conditions": { "recipe": "computercraft:normal_pocket_computer_normal" } } }, "requirements": [ diff --git a/src/main/resources/data/computercraft/advancements/recipes/normal_turtle.json b/src/main/resources/data/computercraft/advancements/recipes/normal_turtle_normal.json similarity index 88% rename from src/main/resources/data/computercraft/advancements/recipes/normal_turtle.json rename to src/main/resources/data/computercraft/advancements/recipes/normal_turtle_normal.json index 339291df7..496d8534f 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/normal_turtle.json +++ b/src/main/resources/data/computercraft/advancements/recipes/normal_turtle_normal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "rewards": { - "recipes": [ "computercraft:normal_turtle" ] + "recipes": [ "computercraft:normal_turtle_normal" ] }, "criteria": { "has_normal": { @@ -12,7 +12,7 @@ }, "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:normal_turtle" } + "conditions": { "recipe": "computercraft:normal_turtle_normal" } } }, "requirements": [ diff --git a/src/main/resources/data/computercraft/advancements/recipes/advanced_pocket_computer.json b/src/main/resources/data/computercraft/advancements/recipes/pocket_computer_advanced.json similarity index 86% rename from src/main/resources/data/computercraft/advancements/recipes/advanced_pocket_computer.json rename to src/main/resources/data/computercraft/advancements/recipes/pocket_computer_advanced.json index dd326529f..e05b9a977 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/advanced_pocket_computer.json +++ b/src/main/resources/data/computercraft/advancements/recipes/pocket_computer_advanced.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "rewards": { - "recipes": [ "computercraft:advanced_pocket_computer" ] + "recipes": [ "computercraft:pocket_computer_advanced" ] }, "criteria": { "has_normal": { @@ -24,7 +24,7 @@ }, "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:advanced_pocket_computer" } + "conditions": { "recipe": "computercraft:pocket_computer_advanced" } } }, "requirements": [ diff --git a/src/main/resources/data/computercraft/advancements/recipes/advanced_turtle.json b/src/main/resources/data/computercraft/advancements/recipes/turtle_advanced.json similarity index 79% rename from src/main/resources/data/computercraft/advancements/recipes/advanced_turtle.json rename to src/main/resources/data/computercraft/advancements/recipes/turtle_advanced.json index 03749528a..6fe361b40 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/advanced_turtle.json +++ b/src/main/resources/data/computercraft/advancements/recipes/turtle_advanced.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "rewards": { - "recipes": [ "computercraft:advanced_turtle" ] + "recipes": [ "computercraft:turtle_advanced" ] }, "criteria": { "has_advanced": { @@ -12,7 +12,7 @@ }, "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:advanced_turtle" } + "conditions": { "recipe": "computercraft:turtle_advanced" } } }, "requirements": [ diff --git a/src/main/resources/data/computercraft/advancements/recipes/wireless_modem.json b/src/main/resources/data/computercraft/advancements/recipes/wireless_modem_normal.json similarity index 91% rename from src/main/resources/data/computercraft/advancements/recipes/wireless_modem.json rename to src/main/resources/data/computercraft/advancements/recipes/wireless_modem_normal.json index 16af43067..d7284f83c 100644 --- a/src/main/resources/data/computercraft/advancements/recipes/wireless_modem.json +++ b/src/main/resources/data/computercraft/advancements/recipes/wireless_modem_normal.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "rewards": { - "recipes": [ "computercraft:wireless_modem" ] + "recipes": [ "computercraft:wireless_modem_normal" ] }, "criteria": { "has_normal": { @@ -18,7 +18,7 @@ }, "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", - "conditions": { "recipe": "computercraft:wireless_modem" } + "conditions": { "recipe": "computercraft:wireless_modem_normal" } } }, "requirements": [ diff --git a/src/main/resources/data/computercraft/lua/rom/apis/command/commands.lua b/src/main/resources/data/computercraft/lua/rom/apis/command/commands.lua index 849bf8e7c..41caa483f 100644 --- a/src/main/resources/data/computercraft/lua/rom/apis/command/commands.lua +++ b/src/main/resources/data/computercraft/lua/rom/apis/command/commands.lua @@ -1,8 +1,9 @@ if not commands then - error( "Cannot load command API on normal computer", 2 ) + error( "Cannot load command API on normal computer", 2 ) end -native = commands.native or commands + +local native = commands.native or commands local function collapseArgs( bJSONIsNBT, ... ) local args = table.pack(...) @@ -22,6 +23,7 @@ end -- Put native functions into the environment local env = _ENV +env.native = native for k,v in pairs( native ) do env[k] = v end @@ -32,18 +34,53 @@ local tNonNBTJSONCommands = { [ "tellraw" ] = true, [ "title" ] = true } -local tCommands = native.list() -for n,sCommandName in ipairs(tCommands) do + +local command_mt = {} +function command_mt.__call(self, ...) + local meta = self[command_mt] + local sCommand = collapseArgs( meta.json, table.concat(meta.name, " "), ... ) + return meta.func( sCommand ) +end + +function command_mt.__tostring(self) + local meta = self[command_mt] + return ("command %q"):format("/" .. table.concat(meta.name, " ")) +end + +function command_mt.__index(self, key) + local meta = self[command_mt] + if meta.children then return nil end + meta.children = true + + local name = meta.name + for _, child in ipairs(native.list(table.unpack(name))) do + local child_name = { table.unpack(name) } + child_name[#child_name + 1] = child + + self[child] = setmetatable({ [command_mt] = { + name = child_name, + func = meta.func, + json = meta.json + } }, command_mt) + end + + return self[key] +end + +for _, sCommandName in ipairs(native.list()) do if env[ sCommandName ] == nil then - local bJSONIsNBT = (tNonNBTJSONCommands[ sCommandName ] == nil) - env[ sCommandName ] = function( ... ) - local sCommand = collapseArgs( bJSONIsNBT, sCommandName, ... ) - return native.exec( sCommand ) - end - tAsync[ sCommandName ] = function( ... ) - local sCommand = collapseArgs( bJSONIsNBT, sCommandName, ... ) - return native.execAsync( sCommand ) - end + local bJSONIsNBT = tNonNBTJSONCommands[ sCommandName ] == nil + env[ sCommandName ] = setmetatable({ [command_mt] = { + name = { sCommandName }, + func = native.exec, + json = bJSONIsNBT + } }, command_mt) + + tAsync[ sCommandName ] = setmetatable({ [command_mt] = { + name = { sCommandName }, + func = native.execAsync, + json = bJSONIsNBT + } }, command_mt) end end env.async = tAsync diff --git a/src/main/resources/data/computercraft/lua/rom/apis/keys.lua b/src/main/resources/data/computercraft/lua/rom/apis/keys.lua index 87d428840..31a026415 100644 --- a/src/main/resources/data/computercraft/lua/rom/apis/keys.lua +++ b/src/main/resources/data/computercraft/lua/rom/apis/keys.lua @@ -1,65 +1,146 @@ - --- Minecraft key code bindings --- See http://www.minecraftwiki.net/wiki/Key_codes for more info - -local tKeys = { - nil, "one", "two", "three", "four", -- 1 - "five", "six", "seven", "eight", "nine", -- 6 - "zero", "minus", "equals", "backspace","tab", -- 11 - "q", "w", "e", "r", "t", -- 16 - "y", "u", "i", "o", "p", -- 21 - "leftBracket","rightBracket","enter","leftCtrl","a", -- 26 - "s", "d", "f", "g", "h", -- 31 - "j", "k", "l", "semiColon","apostrophe", -- 36 - "grave", "leftShift","backslash","z", "x", -- 41 - "c", "v", "b", "n", "m", -- 46 - "comma", "period", "slash", "rightShift","multiply", -- 51 - "leftAlt", "space", "capsLock", "f1", "f2", -- 56 - "f3", "f4", "f5", "f6", "f7", -- 61 - "f8", "f9", "f10", "numLock", "scrollLock", -- 66 - "numPad7", "numPad8", "numPad9", "numPadSubtract","numPad4", -- 71 - "numPad5", "numPad6", "numPadAdd","numPad1", "numPad2", -- 76 - "numPad3", "numPad0", "numPadDecimal",nil, nil, -- 81 - nil, "f11", "f12", nil, nil, -- 86 - nil, nil, nil, nil, nil, -- 91 - nil, nil, nil, nil, "f13", -- 96 - "f14", "f15", nil, nil, nil, -- 101 - nil, nil, nil, nil, nil, -- 106 - nil, "kana", nil, nil, nil, -- 111 - nil, nil, nil, nil, nil, -- 116 - "convert", nil, "noconvert",nil, "yen", -- 121 - nil, nil, nil, nil, nil, -- 126 - nil, nil, nil, nil, nil, -- 131 - nil, nil, nil, nil, nil, -- 136 - "numPadEquals",nil, nil, "circumflex","at", -- 141 - "colon", "underscore","kanji", "stop", "ax", -- 146 - nil, nil, nil, nil, nil, -- 151 - "numPadEnter","rightCtrl",nil, nil, nil, -- 156 - nil, nil, nil, nil, nil, -- 161 - nil, nil, nil, nil, nil, -- 166 - nil, nil, nil, nil, nil, -- 171 - nil, nil, nil, "numPadComma",nil, -- 176 - "numPadDivide",nil, nil, "rightAlt", nil, -- 181 - nil, nil, nil, nil, nil, -- 186 - nil, nil, nil, nil, nil, -- 191 - nil, "pause", nil, "home", "up", -- 196 - "pageUp", nil, "left", nil, "right", -- 201 - nil, "end", "down", "pageDown", "insert", -- 206 - "delete" -- 211 -} +--- Key codes for ComputerCraft +-- +-- This is derived from the GLFW list of key codes, and mostly created via +-- a couple of regexes. +-- +-- Note that this is technically incompatible with previous versions of CC, as +-- they relied on Minecraft's character mappings. However, if CC emulators have +-- taught me anything, it's that emulating LWJGL's weird key handling is nigh-on +-- impossible. +local tKeys = {} +tKeys[32] = 'space' +tKeys[39] = 'apostrophe' +tKeys[44] = 'comma' +tKeys[45] = 'minus' +tKeys[46] = 'period' +tKeys[47] = 'slash' +tKeys[48] = 'zero' +tKeys[49] = 'one' +tKeys[50] = 'two' +tKeys[51] = 'three' +tKeys[52] = 'four' +tKeys[53] = 'five' +tKeys[54] = 'six' +tKeys[55] = 'seven' +tKeys[56] = 'eight' +tKeys[57] = 'nine' +tKeys[59] = 'semicolon' +tKeys[61] = 'equals' +tKeys[65] = 'a' +tKeys[66] = 'b' +tKeys[67] = 'c' +tKeys[68] = 'd' +tKeys[69] = 'e' +tKeys[70] = 'f' +tKeys[71] = 'g' +tKeys[72] = 'h' +tKeys[73] = 'i' +tKeys[74] = 'j' +tKeys[75] = 'k' +tKeys[76] = 'l' +tKeys[77] = 'm' +tKeys[78] = 'n' +tKeys[79] = 'o' +tKeys[80] = 'p' +tKeys[81] = 'q' +tKeys[82] = 'r' +tKeys[83] = 's' +tKeys[84] = 't' +tKeys[85] = 'u' +tKeys[86] = 'v' +tKeys[87] = 'w' +tKeys[88] = 'x' +tKeys[89] = 'y' +tKeys[90] = 'z' +tKeys[91] = 'leftBracket' +tKeys[92] = 'backslash' +tKeys[93] = 'rightBracket' +tKeys[96] = 'grave' +-- tKeys[161] = 'world1' +-- tKeys[162] = 'world2' +tKeys[257] = 'enter' +tKeys[258] = 'tab' +tKeys[259] = 'backspace' +tKeys[260] = 'insert' +tKeys[261] = 'delete' +tKeys[262] = 'right' +tKeys[263] = 'left' +tKeys[264] = 'down' +tKeys[265] = 'up' +tKeys[266] = 'pageUp' +tKeys[267] = 'pageDown' +tKeys[268] = 'home' +tKeys[269] = 'end' +tKeys[280] = 'capsLock' +tKeys[281] = 'scrollLock' +tKeys[282] = 'numLock' +-- tKeys[283] = 'printScreen' +tKeys[284] = 'pause' +tKeys[290] = 'f1' +tKeys[291] = 'f2' +tKeys[292] = 'f3' +tKeys[293] = 'f4' +tKeys[294] = 'f5' +tKeys[295] = 'f6' +tKeys[296] = 'f7' +tKeys[297] = 'f8' +tKeys[298] = 'f9' +tKeys[299] = 'f10' +tKeys[300] = 'f11' +tKeys[301] = 'f12' +tKeys[302] = 'f13' +tKeys[303] = 'f14' +tKeys[304] = 'f15' +tKeys[305] = 'f16' +tKeys[306] = 'f17' +tKeys[307] = 'f18' +tKeys[308] = 'f19' +tKeys[309] = 'f20' +tKeys[310] = 'f21' +tKeys[311] = 'f22' +tKeys[312] = 'f23' +tKeys[313] = 'f24' +tKeys[314] = 'f25' +tKeys[320] = 'numPad0' +tKeys[321] = 'numPad1' +tKeys[322] = 'numPad2' +tKeys[323] = 'numPad3' +tKeys[324] = 'numPad4' +tKeys[325] = 'numPad5' +tKeys[326] = 'numPad6' +tKeys[327] = 'numPad7' +tKeys[328] = 'numPad8' +tKeys[329] = 'numPad9' +tKeys[330] = 'numPadDecimal' +tKeys[331] = 'numPadDivide' +-- tKeys[332] = 'numPadMultiply' +tKeys[333] = 'numPadSubtract' +tKeys[334] = 'numPadAdd' +tKeys[335] = 'numPadEnter' +tKeys[336] = 'numPadEqual' +tKeys[340] = 'leftShift' +tKeys[341] = 'leftCtrl' +tKeys[342] = 'leftAlt' +-- tKeys[343] = 'leftSuper' +tKeys[344] = 'rightShift' +tKeys[345] = 'rightControl' +tKeys[346] = 'rightAlt' +-- tKeys[347] = 'rightSuper' +-- tKeys[348] = 'menu' local keys = _ENV for nKey, sKey in pairs( tKeys ) do keys[sKey] = nKey end + +-- Alias some keys for ease-of-use and backwards compatibility keys["return"] = keys.enter ---backwards compatibility to earlier, typo prone, versions keys.scollLock = keys.scrollLock -keys.cimcumflex = keys.circumflex +-- keys.cimcumflex = keys.circumflex function getName( _nKey ) if type( _nKey ) ~= "number" then error( "bad argument #1 (expected number, got " .. type( _nKey ) .. ")", 2 ) end - return tKeys[ _nKey ] + return tKeys[ _nKey ] end diff --git a/src/main/resources/data/computercraft/recipes/_factories.json b/src/main/resources/data/computercraft/recipes/_factories.json deleted file mode 100644 index 40a083061..000000000 --- a/src/main/resources/data/computercraft/recipes/_factories.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "recipes": { - "impostor_shaped": "dan200.computercraft.shared.util.ImpostorRecipe$Factory", - "impostor_shapeless": "dan200.computercraft.shared.util.ImpostorShapelessRecipe$Factory", - - "colour": "dan200.computercraft.shared.common.ColourableRecipe$Factory", - "computer_upgrade": "dan200.computercraft.shared.computer.recipe.ComputerFamilyRecipe$Factory", - "disk": "dan200.computercraft.shared.media.recipes.DiskRecipe$Factory", - "pocket_computer_upgrade": "dan200.computercraft.shared.pocket.recipes.PocketComputerUpgradeRecipe$Factory", - "printout": "dan200.computercraft.shared.media.recipes.PrintoutRecipe$Factory", - "turtle": "dan200.computercraft.shared.turtle.recipes.TurtleRecipe$Factory", - "turtle_upgrade": "dan200.computercraft.shared.turtle.recipes.TurtleUpgradeRecipe$Factory" - }, - "ingredients": { - "computer": "dan200.computercraft.shared.computer.recipe.ComputerIngredient$Factory" - } -} diff --git a/src/main/resources/data/computercraft/recipes/advanced_computer.json b/src/main/resources/data/computercraft/recipes/advanced_computer.json deleted file mode 100644 index 879becaab..000000000 --- a/src/main/resources/data/computercraft/recipes/advanced_computer.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "#R#", - "#G#" - ], - "key": { - "#": { "type": "forge:ore_dict", "ore": "ingotGold" }, - "R": { "type": "forge:ore_dict", "ore": "dustRedstone" }, - "G": { "type": "forge:ore_dict", "ore": "paneGlass" } - }, - "result": { "item": "computercraft:computer", "data": 16384 } -} diff --git a/src/main/resources/data/computercraft/recipes/advanced_computer_upgrade.json b/src/main/resources/data/computercraft/recipes/advanced_computer_upgrade.json deleted file mode 100644 index 417aecd50..000000000 --- a/src/main/resources/data/computercraft/recipes/advanced_computer_upgrade.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "computercraft:computer_upgrade", - "pattern": [ - "###", - "#C#", - "# #" - ], - "key": { - "#": { "type": "forge:ore_dict", "ore": "ingotGold" }, - "C": { "type": "computercraft:computer", "item": "computercraft:computer", "family": "Normal" } - }, - "family": "Advanced", - "result": { "item": "computercraft:computer", "data": 16384 } -} diff --git a/src/main/resources/data/computercraft/recipes/advanced_monitor.json b/src/main/resources/data/computercraft/recipes/advanced_monitor.json deleted file mode 100644 index f45a215a4..000000000 --- a/src/main/resources/data/computercraft/recipes/advanced_monitor.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "#G#", - "###" - ], - "key": { - "#": { "type": "forge:ore_dict", "ore": "ingotGold" }, - "G": { "type": "forge:ore_dict", "ore": "paneGlass" } - }, - "result": { "item": "computercraft:peripheral", "data": 4, "count": 4 } -} diff --git a/src/main/resources/data/computercraft/recipes/advanced_pocket_computer.json b/src/main/resources/data/computercraft/recipes/advanced_pocket_computer.json deleted file mode 100644 index 7161fe907..000000000 --- a/src/main/resources/data/computercraft/recipes/advanced_pocket_computer.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "#A#", - "#G#" - ], - "key": { - "#": { "type": "forge:ore_dict", "ore": "ingotGold" }, - "G": { "type": "forge:ore_dict", "ore": "paneGlass" }, - "A": { "item": "minecraft:golden_apple", "data": 0 } - }, - "result": { "item": "computercraft:pocket_computer", "data": 1 } -} diff --git a/src/main/resources/data/computercraft/recipes/advanced_pocket_computer_upgrade.json b/src/main/resources/data/computercraft/recipes/advanced_pocket_computer_upgrade.json deleted file mode 100644 index 2528451b0..000000000 --- a/src/main/resources/data/computercraft/recipes/advanced_pocket_computer_upgrade.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "computercraft:computer_upgrade", - "pattern": [ - "###", - "#C#", - "# #" - ], - "key": { - "#": { "type": "forge:ore_dict", "ore": "ingotGold" }, - "C": { "item": "computercraft:pocket_computer", "data": 0 } - }, - "family": "Advanced", - "result": { "item": "computercraft:pocket_computer", "data": 1 } -} diff --git a/src/main/resources/data/computercraft/recipes/advanced_turtle.json b/src/main/resources/data/computercraft/recipes/advanced_turtle.json deleted file mode 100644 index 6eb94615f..000000000 --- a/src/main/resources/data/computercraft/recipes/advanced_turtle.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "computercraft:turtle", - "pattern": [ - "###", - "#C#", - "#I#" - ], - "key": { - "#": { "type": "forge:ore_dict", "ore": "ingotGold" }, - "C": { "type": "computercraft:computer", "item": "computercraft:computer", "data": 16384, "family": "Advanced" }, - "I": { "type": "forge:ore_dict", "ore": "chestWood" } - }, - "family": "Advanced" -} diff --git a/src/main/resources/data/computercraft/recipes/advanced_turtle_upgrade.json b/src/main/resources/data/computercraft/recipes/advanced_turtle_upgrade.json deleted file mode 100644 index 15791665d..000000000 --- a/src/main/resources/data/computercraft/recipes/advanced_turtle_upgrade.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "computercraft:computer_upgrade", - "pattern": [ - "###", - "#C#", - " B " - ], - "key": { - "#": { "type": "forge:ore_dict", "ore": "ingotGold" }, - "B": { "type": "forge:ore_dict", "ore": "blockGold" }, - "C": [ - { "type": "computercraft:computer", "item": "computercraft:turtle", "family": "Normal" }, - { "item": "computercraft:turtle_expanded", "data": 0 } - ] - }, - "family": "Advanced", - "result": { "item": "computercraft:turtle_advanced", "data": 0 } -} diff --git a/src/main/resources/data/computercraft/recipes/cable.json b/src/main/resources/data/computercraft/recipes/cable.json index 0c3195e4f..09115ec12 100644 --- a/src/main/resources/data/computercraft/recipes/cable.json +++ b/src/main/resources/data/computercraft/recipes/cable.json @@ -1,13 +1,13 @@ { - "type": "minecraft:crafting_shaped", + "type": "crafting_shaped", "pattern": [ " # ", "#R#", " # " ], "key": { - "#": { "type": "forge:ore_dict", "ore": "stone" }, - "R": { "type": "forge:ore_dict", "ore": "dustRedstone" } + "#": { "tag": "forge:stone" }, + "R": { "tag": "forge:dusts/redstone" } }, - "result": { "item": "computercraft:cable", "data": 0, "count": 6 } + "result": { "item": "computercraft:cable", "count": 6 } } diff --git a/src/main/resources/data/computercraft/recipes/command_computer.json b/src/main/resources/data/computercraft/recipes/command_computer.json deleted file mode 100644 index e204b2ff0..000000000 --- a/src/main/resources/data/computercraft/recipes/command_computer.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "#C#", - "#G#" - ], - "key": { - "#": { "type": "forge:ore_dict", "ore": "stone" }, - "C": { "item": "minecraft:command_block" }, - "G": { "type": "forge:ore_dict", "ore": "paneGlass" } - }, - "result": { "item": "computercraft:command_computer", "data": 0 } -} diff --git a/src/main/resources/data/computercraft/recipes/computer_advanced.json b/src/main/resources/data/computercraft/recipes/computer_advanced.json new file mode 100644 index 000000000..81afaad43 --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/computer_advanced.json @@ -0,0 +1,14 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "###", + "#R#", + "#G#" + ], + "key": { + "#": { "tag": "forge:ingots/gold" }, + "R": { "tag": "forge:dusts/redstone" }, + "G": { "item": "minecraft:glass_pane" } + }, + "result": { "item": "computercraft:computer_advanced" } +} diff --git a/src/main/resources/data/computercraft/recipes/computer_advanced_upgrade.json b/src/main/resources/data/computercraft/recipes/computer_advanced_upgrade.json new file mode 100644 index 000000000..e6de6b37e --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/computer_advanced_upgrade.json @@ -0,0 +1,14 @@ +{ + "type": "computercraft:computer_upgrade", + "pattern": [ + "###", + "#C#", + "# #" + ], + "key": { + "#": { "tag": "forge:ingots/gold" }, + "C": { "item": "computercraft:computer_normal" } + }, + "family": "Advanced", + "result": { "item": "computercraft:computer_advanced" } +} diff --git a/src/main/resources/data/computercraft/recipes/computer_command.json b/src/main/resources/data/computercraft/recipes/computer_command.json new file mode 100644 index 000000000..c89aa7f6d --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/computer_command.json @@ -0,0 +1,14 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "###", + "#R#", + "#G#" + ], + "key": { + "#": { "tag": "forge:stone" }, + "R": { "item": "minecraft:command_block" }, + "G": { "item": "minecraft:glass_pane" } + }, + "result": { "item": "computercraft:computer_command" } +} diff --git a/src/main/resources/data/computercraft/recipes/computer_normal.json b/src/main/resources/data/computercraft/recipes/computer_normal.json new file mode 100644 index 000000000..1761701bc --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/computer_normal.json @@ -0,0 +1,14 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "###", + "#R#", + "#G#" + ], + "key": { + "#": { "tag": "forge:stone" }, + "R": { "tag": "forge:dusts/redstone" }, + "G": { "item": "minecraft:glass_pane" } + }, + "result": { "item": "computercraft:computer_normal" } +} diff --git a/src/main/resources/data/computercraft/recipes/disk_drive.json b/src/main/resources/data/computercraft/recipes/disk_drive.json index 7a16f7514..59c78b50f 100644 --- a/src/main/resources/data/computercraft/recipes/disk_drive.json +++ b/src/main/resources/data/computercraft/recipes/disk_drive.json @@ -1,13 +1,13 @@ { - "type": "minecraft:crafting_shaped", + "type": "crafting_shaped", "pattern": [ "###", "#R#", "#R#" ], "key": { - "#": { "type": "forge:ore_dict", "ore": "stone" }, - "R": { "type": "forge:ore_dict", "ore": "dustRedstone" } + "#": { "tag": "forge:stone" }, + "R": { "tag": "forge:dusts/redstone" } }, - "result": { "item": "computercraft:peripheral", "data": 0 } + "result": { "item": "computercraft:disk_drive" } } diff --git a/src/main/resources/data/computercraft/recipes/ender_modem.json b/src/main/resources/data/computercraft/recipes/ender_modem.json deleted file mode 100644 index ebfe1a587..000000000 --- a/src/main/resources/data/computercraft/recipes/ender_modem.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "#E#", - "###" - ], - "key": { - "#": { "type": "forge:ore_dict", "ore": "ingotGold" }, - "E": { "item": "minecraft:ender_eye" } - }, - "result": { "item": "computercraft:advanced_modem" } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_1.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_1.json index c90c230bb..8b01925bb 100644 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_1.json +++ b/src/main/resources/data/computercraft/recipes/generated/disk/disk_1.json @@ -2,9 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { "type": "forge:ore_dict", "ore": "dustRedstone" }, - { "type": "forge:ore_dict", "ore": "paper" }, - { "item": "minecraft:dye", "data": 0 } + { "tag": "forge:dusts/redstone" }, + { "item": "minecraft:paper" }, + { "item": "minecraft:ink_sac" } ], - "result": { "item": "computercraft:disk_expanded", "data": 0, "nbt": { "color": 1118481 } } + "result": { "item": "computercraft:disk", "nbt": { "color": 1118481 } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_10.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_10.json index 9896b3615..26b83fe6b 100644 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_10.json +++ b/src/main/resources/data/computercraft/recipes/generated/disk/disk_10.json @@ -2,9 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { "type": "forge:ore_dict", "ore": "dustRedstone" }, - { "type": "forge:ore_dict", "ore": "paper" }, - { "item": "minecraft:dye", "data": 9 } + { "tag": "forge:dusts/redstone" }, + { "item": "minecraft:paper" }, + { "item": "minecraft:pink_dye" } ], - "result": { "item": "computercraft:disk_expanded", "data": 0, "nbt": { "color": 15905484 } } + "result": { "item": "computercraft:disk", "nbt": { "color": 15905484 } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_11.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_11.json index 2cabe7b0d..40d6157c0 100644 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_11.json +++ b/src/main/resources/data/computercraft/recipes/generated/disk/disk_11.json @@ -2,9 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { "type": "forge:ore_dict", "ore": "dustRedstone" }, - { "type": "forge:ore_dict", "ore": "paper" }, - { "item": "minecraft:dye", "data": 10 } + { "tag": "forge:dusts/redstone" }, + { "item": "minecraft:paper" }, + { "item": "minecraft:lime_dye" } ], - "result": { "item": "computercraft:disk_expanded", "data": 0, "nbt": { "color": 8375321 } } + "result": { "item": "computercraft:disk", "nbt": { "color": 8375321 } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_12.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_12.json index 3b703aa6f..7920fc6dd 100644 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_12.json +++ b/src/main/resources/data/computercraft/recipes/generated/disk/disk_12.json @@ -2,9 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { "type": "forge:ore_dict", "ore": "dustRedstone" }, - { "type": "forge:ore_dict", "ore": "paper" }, - { "item": "minecraft:dye", "data": 11 } + { "tag": "forge:dusts/redstone" }, + { "item": "minecraft:paper" }, + { "item": "minecraft:dandelion_yellow" } ], - "result": { "item": "computercraft:disk_expanded", "data": 0, "nbt": { "color": 14605932 } } + "result": { "item": "computercraft:disk", "nbt": { "color": 14605932 } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_13.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_13.json index 7659124dd..e270135ef 100644 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_13.json +++ b/src/main/resources/data/computercraft/recipes/generated/disk/disk_13.json @@ -2,9 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { "type": "forge:ore_dict", "ore": "dustRedstone" }, - { "type": "forge:ore_dict", "ore": "paper" }, - { "item": "minecraft:dye", "data": 12 } + { "tag": "forge:dusts/redstone" }, + { "item": "minecraft:paper" }, + { "item": "minecraft:light_blue_dye" } ], - "result": { "item": "computercraft:disk_expanded", "data": 0, "nbt": { "color": 10072818 } } + "result": { "item": "computercraft:disk", "nbt": { "color": 10072818 } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_14.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_14.json index dd258311b..73794dac1 100644 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_14.json +++ b/src/main/resources/data/computercraft/recipes/generated/disk/disk_14.json @@ -2,9 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { "type": "forge:ore_dict", "ore": "dustRedstone" }, - { "type": "forge:ore_dict", "ore": "paper" }, - { "item": "minecraft:dye", "data": 13 } + { "tag": "forge:dusts/redstone" }, + { "item": "minecraft:paper" }, + { "item": "minecraft:magenta_dye" } ], - "result": { "item": "computercraft:disk_expanded", "data": 0, "nbt": { "color": 15040472 } } + "result": { "item": "computercraft:disk", "nbt": { "color": 15040472 } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_15.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_15.json index 1251e80c0..13ff4dd71 100644 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_15.json +++ b/src/main/resources/data/computercraft/recipes/generated/disk/disk_15.json @@ -2,9 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { "type": "forge:ore_dict", "ore": "dustRedstone" }, - { "type": "forge:ore_dict", "ore": "paper" }, - { "item": "minecraft:dye", "data": 14 } + { "tag": "forge:dusts/redstone" }, + { "item": "minecraft:paper" }, + { "item": "minecraft:orange_dye" } ], - "result": { "item": "computercraft:disk_expanded", "data": 0, "nbt": { "color": 15905331 } } + "result": { "item": "computercraft:disk", "nbt": { "color": 15905331 } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_16.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_16.json index 3be29ac28..c3c6f193d 100644 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_16.json +++ b/src/main/resources/data/computercraft/recipes/generated/disk/disk_16.json @@ -2,9 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { "type": "forge:ore_dict", "ore": "dustRedstone" }, - { "type": "forge:ore_dict", "ore": "paper" }, - { "item": "minecraft:dye", "data": 15 } + { "tag": "forge:dusts/redstone" }, + { "item": "minecraft:paper" }, + { "item": "minecraft:bone_meal" } ], - "result": { "item": "computercraft:disk_expanded", "data": 0, "nbt": { "color": 15790320 } } + "result": { "item": "computercraft:disk", "nbt": { "color": 15790320 } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_2.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_2.json index d2bcd2025..53f78a99a 100644 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_2.json +++ b/src/main/resources/data/computercraft/recipes/generated/disk/disk_2.json @@ -2,9 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { "type": "forge:ore_dict", "ore": "dustRedstone" }, - { "type": "forge:ore_dict", "ore": "paper" }, - { "item": "minecraft:dye", "data": 1 } + { "tag": "forge:dusts/redstone" }, + { "item": "minecraft:paper" }, + { "item": "minecraft:rose_red" } ], - "result": { "item": "computercraft:disk_expanded", "data": 0, "nbt": { "color": 13388876 } } + "result": { "item": "computercraft:disk", "nbt": { "color": 13388876 } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_3.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_3.json index d53f95b12..452e4c348 100644 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_3.json +++ b/src/main/resources/data/computercraft/recipes/generated/disk/disk_3.json @@ -2,9 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { "type": "forge:ore_dict", "ore": "dustRedstone" }, - { "type": "forge:ore_dict", "ore": "paper" }, - { "item": "minecraft:dye", "data": 2 } + { "tag": "forge:dusts/redstone" }, + { "item": "minecraft:paper" }, + { "item": "minecraft:cactus_green" } ], - "result": { "item": "computercraft:disk_expanded", "data": 0, "nbt": { "color": 5744206 } } + "result": { "item": "computercraft:disk", "nbt": { "color": 5744206 } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_4.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_4.json index 13ddc527d..457bba1ed 100644 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_4.json +++ b/src/main/resources/data/computercraft/recipes/generated/disk/disk_4.json @@ -2,9 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { "type": "forge:ore_dict", "ore": "dustRedstone" }, - { "type": "forge:ore_dict", "ore": "paper" }, - { "item": "minecraft:dye", "data": 3 } + { "tag": "forge:dusts/redstone" }, + { "item": "minecraft:paper" }, + { "item": "minecraft:cocoa_beans" } ], - "result": { "item": "computercraft:disk_expanded", "data": 0, "nbt": { "color": 8349260 } } + "result": { "item": "computercraft:disk", "nbt": { "color": 8349260 } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_5.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_5.json index e4ae1c440..94520e185 100644 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_5.json +++ b/src/main/resources/data/computercraft/recipes/generated/disk/disk_5.json @@ -2,9 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { "type": "forge:ore_dict", "ore": "dustRedstone" }, - { "type": "forge:ore_dict", "ore": "paper" }, - { "item": "minecraft:dye", "data": 4 } + { "tag": "forge:dusts/redstone" }, + { "item": "minecraft:paper" }, + { "item": "minecraft:lapis_lazuli" } ], - "result": { "item": "computercraft:disk_expanded", "data": 0, "nbt": { "color": 3368652 } } + "result": { "item": "computercraft:disk", "nbt": { "color": 3368652 } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_6.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_6.json index 2c7ca2bb9..6a9c1ed5b 100644 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_6.json +++ b/src/main/resources/data/computercraft/recipes/generated/disk/disk_6.json @@ -2,9 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { "type": "forge:ore_dict", "ore": "dustRedstone" }, - { "type": "forge:ore_dict", "ore": "paper" }, - { "item": "minecraft:dye", "data": 5 } + { "tag": "forge:dusts/redstone" }, + { "item": "minecraft:paper" }, + { "item": "minecraft:purple_dye" } ], - "result": { "item": "computercraft:disk_expanded", "data": 0, "nbt": { "color": 11691749 } } + "result": { "item": "computercraft:disk", "nbt": { "color": 11691749 } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_7.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_7.json index 25f678d0d..6f6a442f7 100644 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_7.json +++ b/src/main/resources/data/computercraft/recipes/generated/disk/disk_7.json @@ -2,9 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { "type": "forge:ore_dict", "ore": "dustRedstone" }, - { "type": "forge:ore_dict", "ore": "paper" }, - { "item": "minecraft:dye", "data": 6 } + { "tag": "forge:dusts/redstone" }, + { "item": "minecraft:paper" }, + { "item": "minecraft:cyan_dye" } ], - "result": { "item": "computercraft:disk_expanded", "data": 0, "nbt": { "color": 5020082 } } + "result": { "item": "computercraft:disk", "nbt": { "color": 5020082 } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_8.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_8.json index 639d166a0..bd8bc8f42 100644 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_8.json +++ b/src/main/resources/data/computercraft/recipes/generated/disk/disk_8.json @@ -2,9 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { "type": "forge:ore_dict", "ore": "dustRedstone" }, - { "type": "forge:ore_dict", "ore": "paper" }, - { "item": "minecraft:dye", "data": 7 } + { "tag": "forge:dusts/redstone" }, + { "item": "minecraft:paper" }, + { "item": "minecraft:light_gray_dye" } ], - "result": { "item": "computercraft:disk_expanded", "data": 0, "nbt": { "color": 10066329 } } + "result": { "item": "computercraft:disk", "nbt": { "color": 10066329 } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/disk/disk_9.json b/src/main/resources/data/computercraft/recipes/generated/disk/disk_9.json index acae54b6d..67ad7f58e 100644 --- a/src/main/resources/data/computercraft/recipes/generated/disk/disk_9.json +++ b/src/main/resources/data/computercraft/recipes/generated/disk/disk_9.json @@ -2,9 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { "type": "forge:ore_dict", "ore": "dustRedstone" }, - { "type": "forge:ore_dict", "ore": "paper" }, - { "item": "minecraft:dye", "data": 8 } + { "tag": "forge:dusts/redstone" }, + { "item": "minecraft:paper" }, + { "item": "minecraft:gray_dye" } ], - "result": { "item": "computercraft:disk_expanded", "data": 0, "nbt": { "color": 5000268 } } + "result": { "item": "computercraft:disk", "nbt": { "color": 5000268 } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_advanced_modem.json b/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_advanced_modem.json deleted file mode 100644 index 2c563904a..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_advanced_modem.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_pocket_advanced", - "pattern": [ - "#", - "T" - ], - "key": { - "#": { "item": "computercraft:advanced_modem" }, - "T": { "item": "computercraft:pocket_computer", "data": 1 } - }, - "result": { "item": "computercraft:pocket_computer", "data": 1, "nbt": { "upgrade": "computercraft:advanced_modem" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_speaker.json b/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_speaker.json index d8d3dbac0..e60e9ea93 100644 --- a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_speaker.json +++ b/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_speaker.json @@ -6,8 +6,8 @@ "T" ], "key": { - "#": { "item": "computercraft:peripheral", "data": 5 }, - "T": { "item": "computercraft:pocket_computer", "data": 1 } + "#": { "item": "computercraft:speaker" }, + "T": { "item": "computercraft:pocket_computer_advanced" } }, - "result": { "item": "computercraft:pocket_computer", "data": 1, "nbt": { "upgrade": "computercraft:speaker" } } + "result": { "item": "computercraft:pocket_computer_advanced", "nbt": { "Upgrade": "computercraft:speaker" } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem.json b/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem.json deleted file mode 100644 index 5a8d3c666..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_pocket_advanced", - "pattern": [ - "#", - "T" - ], - "key": { - "#": { "item": "computercraft:peripheral", "data": 1 }, - "T": { "item": "computercraft:pocket_computer", "data": 1 } - }, - "result": { "item": "computercraft:pocket_computer", "data": 1, "nbt": { "upgrade": "computercraft:wireless_modem" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_advanced.json b/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_advanced.json new file mode 100644 index 000000000..878afe1a5 --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_advanced.json @@ -0,0 +1,13 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:upgrade_pocket_advanced", + "pattern": [ + "#", + "T" + ], + "key": { + "#": { "item": "computercraft:wireless_modem_advanced" }, + "T": { "item": "computercraft:pocket_computer_advanced" } + }, + "result": { "item": "computercraft:pocket_computer_advanced", "nbt": { "Upgrade": "computercraft:wireless_modem_advanced" } } +} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_normal.json b/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_normal.json new file mode 100644 index 000000000..1bd86cca0 --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/generated/pocket_advanced/computercraft_wireless_modem_normal.json @@ -0,0 +1,13 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:upgrade_pocket_advanced", + "pattern": [ + "#", + "T" + ], + "key": { + "#": { "item": "computercraft:wireless_modem_normal" }, + "T": { "item": "computercraft:pocket_computer_advanced" } + }, + "result": { "item": "computercraft:pocket_computer_advanced", "nbt": { "Upgrade": "computercraft:wireless_modem_normal" } } +} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_advanced_modem.json b/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_advanced_modem.json deleted file mode 100644 index 7e1934cc5..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_advanced_modem.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_pocket_normal", - "pattern": [ - "#", - "T" - ], - "key": { - "#": { "item": "computercraft:advanced_modem" }, - "T": { "item": "computercraft:pocket_computer", "data": 0 } - }, - "result": { "item": "computercraft:pocket_computer", "data": 0, "nbt": { "upgrade": "computercraft:advanced_modem" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_speaker.json b/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_speaker.json index c798f1202..ba569ec7a 100644 --- a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_speaker.json +++ b/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_speaker.json @@ -6,8 +6,8 @@ "T" ], "key": { - "#": { "item": "computercraft:peripheral", "data": 5 }, - "T": { "item": "computercraft:pocket_computer", "data": 0 } + "#": { "item": "computercraft:speaker" }, + "T": { "item": "computercraft:pocket_computer_normal" } }, - "result": { "item": "computercraft:pocket_computer", "data": 0, "nbt": { "upgrade": "computercraft:speaker" } } + "result": { "item": "computercraft:pocket_computer_normal", "nbt": { "Upgrade": "computercraft:speaker" } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem.json b/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem.json deleted file mode 100644 index 0984f0746..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_pocket_normal", - "pattern": [ - "#", - "T" - ], - "key": { - "#": { "item": "computercraft:peripheral", "data": 1 }, - "T": { "item": "computercraft:pocket_computer", "data": 0 } - }, - "result": { "item": "computercraft:pocket_computer", "data": 0, "nbt": { "upgrade": "computercraft:wireless_modem" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_advanced.json b/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_advanced.json new file mode 100644 index 000000000..3c008706d --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_advanced.json @@ -0,0 +1,13 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:upgrade_pocket_normal", + "pattern": [ + "#", + "T" + ], + "key": { + "#": { "item": "computercraft:wireless_modem_advanced" }, + "T": { "item": "computercraft:pocket_computer_normal" } + }, + "result": { "item": "computercraft:pocket_computer_normal", "nbt": { "Upgrade": "computercraft:wireless_modem_advanced" } } +} diff --git a/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_normal.json b/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_normal.json new file mode 100644 index 000000000..85e7a1d5f --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/generated/pocket_normal/computercraft_wireless_modem_normal.json @@ -0,0 +1,13 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:upgrade_pocket_normal", + "pattern": [ + "#", + "T" + ], + "key": { + "#": { "item": "computercraft:wireless_modem_normal" }, + "T": { "item": "computercraft:pocket_computer_normal" } + }, + "result": { "item": "computercraft:pocket_computer_normal", "nbt": { "Upgrade": "computercraft:wireless_modem_normal" } } +} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_advanced_modem.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_advanced_modem.json deleted file mode 100644 index ab4c156f4..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_advanced_modem.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "computercraft:advanced_modem" }, - "T": { "item": "computercraft:turtle_advanced", "data": 0 } - }, - "result": { "item": "computercraft:turtle_advanced", "data": 0, "nbt": { "rightUpgrade": "computercraft:advanced_modem" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_speaker.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_speaker.json index 895f4afb5..fe43a6734 100644 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_speaker.json +++ b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_speaker.json @@ -5,8 +5,8 @@ "#T" ], "key": { - "#": { "item": "computercraft:peripheral", "data": 5 }, - "T": { "item": "computercraft:turtle_advanced", "data": 0 } + "#": { "item": "computercraft:speaker" }, + "T": { "item": "computercraft:turtle_advanced" } }, - "result": { "item": "computercraft:turtle_advanced", "data": 0, "nbt": { "rightUpgrade": "computercraft:speaker" } } + "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "computercraft:speaker" } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem.json deleted file mode 100644 index a7bd2ad27..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_advanced", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "computercraft:peripheral", "data": 1 }, - "T": { "item": "computercraft:turtle_advanced", "data": 0 } - }, - "result": { "item": "computercraft:turtle_advanced", "data": 0, "nbt": { "rightUpgrade": "computercraft:wireless_modem" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_advanced.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_advanced.json new file mode 100644 index 000000000..a6af8052c --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_advanced.json @@ -0,0 +1,12 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:upgrade_turtle_advanced", + "pattern": [ + "#T" + ], + "key": { + "#": { "item": "computercraft:wireless_modem_advanced" }, + "T": { "item": "computercraft:turtle_advanced" } + }, + "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "computercraft:wireless_modem_advanced" } } +} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_normal.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_normal.json new file mode 100644 index 000000000..564e31980 --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/computercraft_wireless_modem_normal.json @@ -0,0 +1,12 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:upgrade_turtle_advanced", + "pattern": [ + "#T" + ], + "key": { + "#": { "item": "computercraft:wireless_modem_normal" }, + "T": { "item": "computercraft:turtle_advanced" } + }, + "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "computercraft:wireless_modem_normal" } } +} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_crafting_table.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_crafting_table.json index d98931c8b..3e44088ca 100644 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_crafting_table.json +++ b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_crafting_table.json @@ -6,7 +6,7 @@ ], "key": { "#": { "item": "minecraft:crafting_table" }, - "T": { "item": "computercraft:turtle_advanced", "data": 0 } + "T": { "item": "computercraft:turtle_advanced" } }, - "result": { "item": "computercraft:turtle_advanced", "data": 0, "nbt": { "rightUpgrade": "minecraft:crafting_table" } } + "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "minecraft:crafting_table" } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_axe.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_axe.json index 17ab077ac..9727781b2 100644 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_axe.json +++ b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_axe.json @@ -6,7 +6,7 @@ ], "key": { "#": { "item": "minecraft:diamond_axe" }, - "T": { "item": "computercraft:turtle_advanced", "data": 0 } + "T": { "item": "computercraft:turtle_advanced" } }, - "result": { "item": "computercraft:turtle_advanced", "data": 0, "nbt": { "rightUpgrade": "minecraft:diamond_axe" } } + "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "minecraft:diamond_axe" } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_hoe.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_hoe.json index cce400925..a36a0b9f5 100644 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_hoe.json +++ b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_hoe.json @@ -6,7 +6,7 @@ ], "key": { "#": { "item": "minecraft:diamond_hoe" }, - "T": { "item": "computercraft:turtle_advanced", "data": 0 } + "T": { "item": "computercraft:turtle_advanced" } }, - "result": { "item": "computercraft:turtle_advanced", "data": 0, "nbt": { "rightUpgrade": "minecraft:diamond_hoe" } } + "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "minecraft:diamond_hoe" } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_pickaxe.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_pickaxe.json index c014870f6..27da4aabd 100644 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_pickaxe.json +++ b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_pickaxe.json @@ -6,7 +6,7 @@ ], "key": { "#": { "item": "minecraft:diamond_pickaxe" }, - "T": { "item": "computercraft:turtle_advanced", "data": 0 } + "T": { "item": "computercraft:turtle_advanced" } }, - "result": { "item": "computercraft:turtle_advanced", "data": 0, "nbt": { "rightUpgrade": "minecraft:diamond_pickaxe" } } + "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "minecraft:diamond_pickaxe" } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_shovel.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_shovel.json index c6c1f7dac..72bc79f11 100644 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_shovel.json +++ b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_shovel.json @@ -6,7 +6,7 @@ ], "key": { "#": { "item": "minecraft:diamond_shovel" }, - "T": { "item": "computercraft:turtle_advanced", "data": 0 } + "T": { "item": "computercraft:turtle_advanced" } }, - "result": { "item": "computercraft:turtle_advanced", "data": 0, "nbt": { "rightUpgrade": "minecraft:diamond_shovel" } } + "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "minecraft:diamond_shovel" } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_sword.json b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_sword.json index 63429bd9a..3035c91e0 100644 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_sword.json +++ b/src/main/resources/data/computercraft/recipes/generated/turtle_advanced/minecraft_diamond_sword.json @@ -6,7 +6,7 @@ ], "key": { "#": { "item": "minecraft:diamond_sword" }, - "T": { "item": "computercraft:turtle_advanced", "data": 0 } + "T": { "item": "computercraft:turtle_advanced" } }, - "result": { "item": "computercraft:turtle_advanced", "data": 0, "nbt": { "rightUpgrade": "minecraft:diamond_sword" } } + "result": { "item": "computercraft:turtle_advanced", "nbt": { "RightUpgrade": "minecraft:diamond_sword" } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_advanced_modem.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_advanced_modem.json deleted file mode 100644 index 6193845da..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_advanced_modem.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "computercraft:advanced_modem" }, - "T": { "item": "computercraft:turtle_expanded", "data": 0 } - }, - "result": { "item": "computercraft:turtle_expanded", "data": 0, "nbt": { "rightUpgrade": "computercraft:advanced_modem" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_speaker.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_speaker.json index 4410b2d4d..20788c88d 100644 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_speaker.json +++ b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_speaker.json @@ -5,8 +5,8 @@ "#T" ], "key": { - "#": { "item": "computercraft:peripheral", "data": 5 }, - "T": { "item": "computercraft:turtle_expanded", "data": 0 } + "#": { "item": "computercraft:speaker" }, + "T": { "item": "computercraft:turtle_normal" } }, - "result": { "item": "computercraft:turtle_expanded", "data": 0, "nbt": { "rightUpgrade": "computercraft:speaker" } } + "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "computercraft:speaker" } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem.json deleted file mode 100644 index 4640378a6..000000000 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "computercraft:impostor_shaped", - "group": "computercraft:upgrade_turtle_normal", - "pattern": [ - "#T" - ], - "key": { - "#": { "item": "computercraft:peripheral", "data": 1 }, - "T": { "item": "computercraft:turtle_expanded", "data": 0 } - }, - "result": { "item": "computercraft:turtle_expanded", "data": 0, "nbt": { "rightUpgrade": "computercraft:wireless_modem" } } -} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_advanced.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_advanced.json new file mode 100644 index 000000000..b7b7e6ef1 --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_advanced.json @@ -0,0 +1,12 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:upgrade_turtle_normal", + "pattern": [ + "#T" + ], + "key": { + "#": { "item": "computercraft:wireless_modem_advanced" }, + "T": { "item": "computercraft:turtle_normal" } + }, + "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "computercraft:wireless_modem_advanced" } } +} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_normal.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_normal.json new file mode 100644 index 000000000..5722d7029 --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/computercraft_wireless_modem_normal.json @@ -0,0 +1,12 @@ +{ + "type": "computercraft:impostor_shaped", + "group": "computercraft:upgrade_turtle_normal", + "pattern": [ + "#T" + ], + "key": { + "#": { "item": "computercraft:wireless_modem_normal" }, + "T": { "item": "computercraft:turtle_normal" } + }, + "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "computercraft:wireless_modem_normal" } } +} diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_crafting_table.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_crafting_table.json index 98c02e23b..14c8f23e3 100644 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_crafting_table.json +++ b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_crafting_table.json @@ -6,7 +6,7 @@ ], "key": { "#": { "item": "minecraft:crafting_table" }, - "T": { "item": "computercraft:turtle_expanded", "data": 0 } + "T": { "item": "computercraft:turtle_normal" } }, - "result": { "item": "computercraft:turtle_expanded", "data": 0, "nbt": { "rightUpgrade": "minecraft:crafting_table" } } + "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "minecraft:crafting_table" } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_axe.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_axe.json index 45a62ce3c..e0c2104d2 100644 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_axe.json +++ b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_axe.json @@ -6,7 +6,7 @@ ], "key": { "#": { "item": "minecraft:diamond_axe" }, - "T": { "item": "computercraft:turtle_expanded", "data": 0 } + "T": { "item": "computercraft:turtle_normal" } }, - "result": { "item": "computercraft:turtle_expanded", "data": 0, "nbt": { "rightUpgrade": "minecraft:diamond_axe" } } + "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "minecraft:diamond_axe" } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_hoe.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_hoe.json index 8d9fca28a..981e41774 100644 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_hoe.json +++ b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_hoe.json @@ -6,7 +6,7 @@ ], "key": { "#": { "item": "minecraft:diamond_hoe" }, - "T": { "item": "computercraft:turtle_expanded", "data": 0 } + "T": { "item": "computercraft:turtle_normal" } }, - "result": { "item": "computercraft:turtle_expanded", "data": 0, "nbt": { "rightUpgrade": "minecraft:diamond_hoe" } } + "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "minecraft:diamond_hoe" } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_pickaxe.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_pickaxe.json index 0f0d2c9a8..459ca8233 100644 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_pickaxe.json +++ b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_pickaxe.json @@ -6,7 +6,7 @@ ], "key": { "#": { "item": "minecraft:diamond_pickaxe" }, - "T": { "item": "computercraft:turtle_expanded", "data": 0 } + "T": { "item": "computercraft:turtle_normal" } }, - "result": { "item": "computercraft:turtle_expanded", "data": 0, "nbt": { "rightUpgrade": "minecraft:diamond_pickaxe" } } + "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "minecraft:diamond_pickaxe" } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_shovel.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_shovel.json index e612f5284..fc414008b 100644 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_shovel.json +++ b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_shovel.json @@ -6,7 +6,7 @@ ], "key": { "#": { "item": "minecraft:diamond_shovel" }, - "T": { "item": "computercraft:turtle_expanded", "data": 0 } + "T": { "item": "computercraft:turtle_normal" } }, - "result": { "item": "computercraft:turtle_expanded", "data": 0, "nbt": { "rightUpgrade": "minecraft:diamond_shovel" } } + "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "minecraft:diamond_shovel" } } } diff --git a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_sword.json b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_sword.json index c18b97360..0c2321121 100644 --- a/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_sword.json +++ b/src/main/resources/data/computercraft/recipes/generated/turtle_normal/minecraft_diamond_sword.json @@ -6,7 +6,7 @@ ], "key": { "#": { "item": "minecraft:diamond_sword" }, - "T": { "item": "computercraft:turtle_expanded", "data": 0 } + "T": { "item": "computercraft:turtle_normal" } }, - "result": { "item": "computercraft:turtle_expanded", "data": 0, "nbt": { "rightUpgrade": "minecraft:diamond_sword" } } + "result": { "item": "computercraft:turtle_normal", "nbt": { "RightUpgrade": "minecraft:diamond_sword" } } } diff --git a/src/main/resources/data/computercraft/recipes/monitor_advanced.json b/src/main/resources/data/computercraft/recipes/monitor_advanced.json new file mode 100644 index 000000000..6dc27ecff --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/monitor_advanced.json @@ -0,0 +1,13 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "###", + "#G#", + "###" + ], + "key": { + "#": { "tag": "forge:ingots/gold" }, + "G": { "item": "minecraft:glass_pane" } + }, + "result": { "item": "computercraft:monitor_advanced", "count": 4 } +} diff --git a/src/main/resources/data/computercraft/recipes/monitor_normal.json b/src/main/resources/data/computercraft/recipes/monitor_normal.json new file mode 100644 index 000000000..8ee786686 --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/monitor_normal.json @@ -0,0 +1,13 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "###", + "#G#", + "###" + ], + "key": { + "#": { "tag": "forge:stone" }, + "G": { "item": "minecraft:glass_pane" } + }, + "result": { "item": "computercraft:monitor_normal" } +} diff --git a/src/main/resources/data/computercraft/recipes/normal_computer.json b/src/main/resources/data/computercraft/recipes/normal_computer.json deleted file mode 100644 index fd215cc1e..000000000 --- a/src/main/resources/data/computercraft/recipes/normal_computer.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "#R#", - "#G#" - ], - "key": { - "#": { "type": "forge:ore_dict", "ore": "stone" }, - "R": { "type": "forge:ore_dict", "ore": "dustRedstone" }, - "G": { "type": "forge:ore_dict", "ore": "paneGlass" } - }, - "result": { "item": "computercraft:computer", "data": 0 } -} diff --git a/src/main/resources/data/computercraft/recipes/normal_monitor.json b/src/main/resources/data/computercraft/recipes/normal_monitor.json deleted file mode 100644 index 72c52c4f0..000000000 --- a/src/main/resources/data/computercraft/recipes/normal_monitor.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "#G#", - "###" - ], - "key": { - "#": { "type": "forge:ore_dict", "ore": "stone" }, - "G": { "type": "forge:ore_dict", "ore": "paneGlass" } - }, - "result": { "item": "computercraft:peripheral", "data": 2 } -} diff --git a/src/main/resources/data/computercraft/recipes/normal_pocket_computer.json b/src/main/resources/data/computercraft/recipes/normal_pocket_computer.json deleted file mode 100644 index c4bb9fb7f..000000000 --- a/src/main/resources/data/computercraft/recipes/normal_pocket_computer.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "#A#", - "#G#" - ], - "key": { - "#": { "type": "forge:ore_dict", "ore": "stone" }, - "G": { "type": "forge:ore_dict", "ore": "paneGlass" }, - "A": { "item": "minecraft:golden_apple", "data": 0 } - }, - "result": { "item": "computercraft:pocket_computer", "data": 0 } -} diff --git a/src/main/resources/data/computercraft/recipes/normal_turtle.json b/src/main/resources/data/computercraft/recipes/normal_turtle.json deleted file mode 100644 index 7187458ed..000000000 --- a/src/main/resources/data/computercraft/recipes/normal_turtle.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "computercraft:turtle", - "pattern": [ - "###", - "#C#", - "#I#" - ], - "key": { - "#": { "type": "forge:ore_dict", "ore": "ingotIron" }, - "C": { "type": "computercraft:computer", "item": "computercraft:computer", "family": "Normal" }, - "I": { "type": "forge:ore_dict", "ore": "chestWood" } - }, - "family": "Normal" -} diff --git a/src/main/resources/data/computercraft/recipes/pocket_computer_advanced.json b/src/main/resources/data/computercraft/recipes/pocket_computer_advanced.json new file mode 100644 index 000000000..f4119b18b --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/pocket_computer_advanced.json @@ -0,0 +1,14 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "###", + "#A#", + "#G#" + ], + "key": { + "#": { "tag": "forge:ingots/gold" }, + "G": { "item": "minecraft:glass_pane" }, + "A": { "item": "minecraft:golden_apple" } + }, + "result": { "item": "computercraft:pocket_computer_advanced" } +} diff --git a/src/main/resources/data/computercraft/recipes/pocket_computer_advanced_upgrade.json b/src/main/resources/data/computercraft/recipes/pocket_computer_advanced_upgrade.json new file mode 100644 index 000000000..79ee81b41 --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/pocket_computer_advanced_upgrade.json @@ -0,0 +1,14 @@ +{ + "type": "computercraft:computer_upgrade", + "pattern": [ + "###", + "#C#", + "# #" + ], + "key": { + "#": { "tag": "forge:ingots/gold" }, + "C": { "item": "computercraft:pocket_computer_normal" } + }, + "family": "Advanced", + "result": { "item": "computercraft:pocket_computer_advanced" } +} diff --git a/src/main/resources/data/computercraft/recipes/pocket_computer_normal.json b/src/main/resources/data/computercraft/recipes/pocket_computer_normal.json new file mode 100644 index 000000000..f01612779 --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/pocket_computer_normal.json @@ -0,0 +1,14 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "###", + "#A#", + "#G#" + ], + "key": { + "#": { "tag": "forge:stone" }, + "G": { "item": "minecraft:glass_pane" }, + "A": { "item": "minecraft:golden_apple" } + }, + "result": { "item": "computercraft:pocket_computer_normal" } +} diff --git a/src/main/resources/data/computercraft/recipes/printed_book.json b/src/main/resources/data/computercraft/recipes/printed_book.json index 057a4f5bc..aac7eb4e2 100644 --- a/src/main/resources/data/computercraft/recipes/printed_book.json +++ b/src/main/resources/data/computercraft/recipes/printed_book.json @@ -1,9 +1,9 @@ { "type": "computercraft:impostor_shapeless", "ingredients": [ - { "type": "forge:ore_dict", "ore": "leather" }, - { "item": "computercraft:printout", "data": 0 }, - { "type": "forge:ore_dict", "ore": "string" } + { "item": "minecraft:leather" }, + { "item": "computercraft:printed_page" }, + { "item": "minecraft:string" } ], - "result": { "item": "computercraft:printout", "data": 2 } + "result": { "item": "computercraft:printed_book" } } diff --git a/src/main/resources/data/computercraft/recipes/printed_pages.json b/src/main/resources/data/computercraft/recipes/printed_pages.json index 8a2ca21f7..38d32c223 100644 --- a/src/main/resources/data/computercraft/recipes/printed_pages.json +++ b/src/main/resources/data/computercraft/recipes/printed_pages.json @@ -1,9 +1,9 @@ { "type": "computercraft:impostor_shapeless", "ingredients": [ - { "item": "computercraft:printout", "data": 0 }, - { "item": "computercraft:printout", "data": 0 }, - { "type": "forge:ore_dict", "ore": "string" } + { "item": "computercraft:printed_page" }, + { "item": "computercraft:printed_page" }, + { "item": "minecraft:string" } ], - "result": { "item": "computercraft:printout", "data": 1 } + "result": { "item": "computercraft:printed_pages" } } diff --git a/src/main/resources/data/computercraft/recipes/printer.json b/src/main/resources/data/computercraft/recipes/printer.json index ec278f99a..4d120a541 100644 --- a/src/main/resources/data/computercraft/recipes/printer.json +++ b/src/main/resources/data/computercraft/recipes/printer.json @@ -1,14 +1,14 @@ { - "type": "minecraft:crafting_shaped", + "type": "crafting_shaped", "pattern": [ "###", "#R#", "#D#" ], "key": { - "#": { "type": "forge:ore_dict", "ore": "stone" }, - "R": { "type": "forge:ore_dict", "ore": "paneGlass" }, - "D": { "type": "forge:ore_dict", "ore": "dye" } + "#": { "tag": "forge:stone" }, + "R": { "item": "minecraft:glass_pane" }, + "D": { "tag": "forge:dyes" } }, - "result": { "item": "computercraft:peripheral", "data": 3 } + "result": { "item": "computercraft:printer" } } diff --git a/src/main/resources/data/computercraft/recipes/skull_cloudy.json b/src/main/resources/data/computercraft/recipes/skull_cloudy.json index 32f6d7346..4d7a77642 100644 --- a/src/main/resources/data/computercraft/recipes/skull_cloudy.json +++ b/src/main/resources/data/computercraft/recipes/skull_cloudy.json @@ -1,12 +1,11 @@ { - "type": "minecraft:crafting_shapeless", + "type": "crafting_shapeless", "ingredients": [ - { "item": "minecraft:skull", "data": 32767 }, - { "item": "computercraft:peripheral", "data": 2 } + { "item": "minecraft:wither_skeleton_skull" }, + { "item": "computercraft:monitor_normal" } ], "result": { - "item": "minecraft:skull", - "data": 3, - "nbt": { "SkullOwner": "Cloudhunter" } + "item": "minecraft:player_head", + "nbt": { "SkullOwner": { "Name": "Cloudhunter", "Id": "6d074736-b1e9-4378-a99b-bd8777821c9c" } } } } diff --git a/src/main/resources/data/computercraft/recipes/skull_dan200.json b/src/main/resources/data/computercraft/recipes/skull_dan200.json index 1f28e0139..5f7bb84a8 100644 --- a/src/main/resources/data/computercraft/recipes/skull_dan200.json +++ b/src/main/resources/data/computercraft/recipes/skull_dan200.json @@ -1,12 +1,11 @@ { - "type": "minecraft:crafting_shapeless", + "type": "crafting_shapeless", "ingredients": [ - { "item": "minecraft:skull", "data": 32767 }, - { "item": "computercraft:computer", "data": 0 } + { "item": "minecraft:wither_skeleton_skull" }, + { "item": "computercraft:computer_normal" } ], "result": { - "item": "minecraft:skull", - "data": 3, - "nbt": { "SkullOwner": "dan200" } + "item": "minecraft:player_head", + "nbt": { "SkullOwner": { "Name": "dan200", "Id": "f3c8d69b-0776-4512-8434-d1b2165909eb" } } } } diff --git a/src/main/resources/data/computercraft/recipes/speaker.json b/src/main/resources/data/computercraft/recipes/speaker.json index 4e28d806e..6c0cf7595 100644 --- a/src/main/resources/data/computercraft/recipes/speaker.json +++ b/src/main/resources/data/computercraft/recipes/speaker.json @@ -1,14 +1,14 @@ { - "type": "minecraft:crafting_shaped", + "type": "crafting_shaped", "pattern": [ "###", "#N#", "#R#" ], "key": { - "#": { "type": "forge:ore_dict", "ore": "stone" }, - "R": { "type": "forge:ore_dict", "ore": "dustRedstone" }, - "N": { "item": "minecraft:noteblock" } + "#": { "tag": "forge:stone" }, + "R": { "tag": "forge:dusts/redstone" }, + "N": { "item": "minecraft:note_block" } }, - "result": { "item": "computercraft:peripheral", "data": 5 } + "result": { "item": "computercraft:speaker" } } diff --git a/src/main/resources/data/computercraft/recipes/turtle_advanced.json b/src/main/resources/data/computercraft/recipes/turtle_advanced.json new file mode 100644 index 000000000..7da7f9017 --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/turtle_advanced.json @@ -0,0 +1,15 @@ +{ + "type": "computercraft:turtle", + "pattern": [ + "###", + "#C#", + "#I#" + ], + "key": { + "#": { "tag": "forge:ingots/gold" }, + "C": { "item": "computercraft:computer_advanced" }, + "I": { "tag": "forge:chests/wooden" } + }, + "family": "Advanced", + "result": { "item": "computercraft:turtle_advanced" } +} diff --git a/src/main/resources/data/computercraft/recipes/turtle_advanced_upgrade.json b/src/main/resources/data/computercraft/recipes/turtle_advanced_upgrade.json new file mode 100644 index 000000000..79f4444ea --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/turtle_advanced_upgrade.json @@ -0,0 +1,15 @@ +{ + "type": "computercraft:computer_upgrade", + "pattern": [ + "###", + "#C#", + " B " + ], + "key": { + "#": { "tag": "forge:ingots/gold" }, + "B": { "tag": "forge:storage_blocks/gold" }, + "C": { "item": "computercraft:turtle_normal" } + }, + "family": "Advanced", + "result": { "item": "computercraft:turtle_advanced" } +} diff --git a/src/main/resources/data/computercraft/recipes/turtle_normal.json b/src/main/resources/data/computercraft/recipes/turtle_normal.json new file mode 100644 index 000000000..f432bdf3c --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/turtle_normal.json @@ -0,0 +1,15 @@ +{ + "type": "computercraft:turtle", + "pattern": [ + "###", + "#C#", + "#I#" + ], + "key": { + "#": { "tag": "forge:ingots/iron" }, + "C": { "item": "computercraft:computer_normal" }, + "I": { "tag": "forge:chests/wooden" } + }, + "family": "Normal", + "result": { "item": "computercraft:turtle_normal" } +} diff --git a/src/main/resources/data/computercraft/recipes/wired_modem.json b/src/main/resources/data/computercraft/recipes/wired_modem.json index 42c1a1795..fa9e47af2 100644 --- a/src/main/resources/data/computercraft/recipes/wired_modem.json +++ b/src/main/resources/data/computercraft/recipes/wired_modem.json @@ -1,13 +1,13 @@ { - "type": "minecraft:crafting_shaped", + "type": "crafting_shaped", "pattern": [ "###", "#R#", "###" ], "key": { - "#": { "type": "forge:ore_dict", "ore": "stone" }, - "R": { "type": "forge:ore_dict", "ore": "dustRedstone" } + "#": { "tag": "forge:stone" }, + "R": { "tag": "forge:dusts/redstone" } }, - "result": { "item": "computercraft:cable", "data": 1 } + "result": { "item": "computercraft:wired_modem" } } diff --git a/src/main/resources/data/computercraft/recipes/wired_modem_full_from.json b/src/main/resources/data/computercraft/recipes/wired_modem_full_from.json index a96609c51..f9579b354 100644 --- a/src/main/resources/data/computercraft/recipes/wired_modem_full_from.json +++ b/src/main/resources/data/computercraft/recipes/wired_modem_full_from.json @@ -1,7 +1,7 @@ { - "type": "minecraft:crafting_shapeless", + "type": "crafting_shapeless", "ingredients": [ { "item": "computercraft:wired_modem_full" } ], - "result": { "item": "computercraft:cable", "data": 1 } + "result": { "item": "computercraft:wired_modem" } } diff --git a/src/main/resources/data/computercraft/recipes/wired_modem_full_to.json b/src/main/resources/data/computercraft/recipes/wired_modem_full_to.json index a6424a8b5..204170660 100644 --- a/src/main/resources/data/computercraft/recipes/wired_modem_full_to.json +++ b/src/main/resources/data/computercraft/recipes/wired_modem_full_to.json @@ -1,7 +1,7 @@ { - "type": "minecraft:crafting_shapeless", + "type": "crafting_shapeless", "ingredients": [ - { "item": "computercraft:cable", "data": 1 } + { "item": "computercraft:wired_modem" } ], "result": { "item": "computercraft:wired_modem_full" } } diff --git a/src/main/resources/data/computercraft/recipes/wireless_modem.json b/src/main/resources/data/computercraft/recipes/wireless_modem.json deleted file mode 100644 index 147982dd1..000000000 --- a/src/main/resources/data/computercraft/recipes/wireless_modem.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "#E#", - "###" - ], - "key": { - "#": { "type": "forge:ore_dict", "ore": "stone" }, - "E": { "type": "forge:ore_dict", "ore": "enderpearl" } - }, - "result": { "item": "computercraft:peripheral", "data": 1 } -} diff --git a/src/main/resources/data/computercraft/recipes/wireless_modem_advanced.json b/src/main/resources/data/computercraft/recipes/wireless_modem_advanced.json new file mode 100644 index 000000000..3d3297d6c --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/wireless_modem_advanced.json @@ -0,0 +1,13 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "###", + "#E#", + "###" + ], + "key": { + "#": { "tag": "forge:ingots/gold" }, + "E": { "item": "minecraft:ender_eye" } + }, + "result": { "item": "computercraft:wireless_modem_advanced" } +} diff --git a/src/main/resources/data/computercraft/recipes/wireless_modem_normal.json b/src/main/resources/data/computercraft/recipes/wireless_modem_normal.json new file mode 100644 index 000000000..3005edd7d --- /dev/null +++ b/src/main/resources/data/computercraft/recipes/wireless_modem_normal.json @@ -0,0 +1,13 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "###", + "#E#", + "###" + ], + "key": { + "#": { "tag": "forge:stone" }, + "E": { "item": "minecraft:ender_pearl" } + }, + "result": { "item": "computercraft:wireless_modem_normal" } +} diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info deleted file mode 100644 index cb0499dd9..000000000 --- a/src/main/resources/mcmod.info +++ /dev/null @@ -1,23 +0,0 @@ -[ - { - "modid" : "computercraft", - "name" : "CC: Tweaked", - "version" : "${version}", - "mcversion" : "${mcversion}", - "url" : "https://github.com/SquidDev-CC/CC-Tweaked", - "credits" : "Initially created by Daniel Ratcliffe (@DanTwoHundred)", - "authorList" : [ - "Daniel Ratcliffe", - "Aaron Mills", - "SquidDev" - ], - "description" : "CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles and more to Minecraft.", - "logoFile" : "pack.png" - }, - { - "modid" : "cctweaked", - "name" : "CC: Tweaked", - "version" : "${version}", - "parent" : "computercraft" - } -] diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 56d71f203..a0de516e0 100755 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 1, + "pack_format": 4, "description": "CC: Tweaked" } } diff --git a/tools/disk_recipe.json b/tools/disk_recipe.json index a52525245..c6a67ab7a 100644 --- a/tools/disk_recipe.json +++ b/tools/disk_recipe.json @@ -2,9 +2,9 @@ "type": "computercraft:impostor_shapeless", "group": "computercraft:disk", "ingredients": [ - { "type": "forge:ore_dict", "ore": "dustRedstone" }, - { "type": "forge:ore_dict", "ore": "paper" }, - { "item": "minecraft:dye", "data": ${dye} } + { "tag": "forge:dusts/redstone" }, + { "item": "minecraft:paper" }, + { "item": "${dye}" } ], - "result": { "item": "computercraft:disk_expanded", "data": 0, "nbt": { "color": ${colour} } } + "result": { "item": "computercraft:disk", "nbt": { "color": ${colour} } } } diff --git a/tools/language.lua b/tools/language.lua index fceb6874e..10020ebc1 100644 --- a/tools/language.lua +++ b/tools/language.lua @@ -29,25 +29,26 @@ local secondary = { local verbose = false -local path = "src/main/resources/assets/computercraft/lang/%s.lang" +local path = "src/main/resources/assets/computercraft/lang/%s.json" - -local args = {...} +local args = { ... } for i = #args, 1, -1 do if args[i] == "-v" or args[i] == "--verbose" then table.remove(args, i) verbose = true end end -if #args > 0 then secondary = args end +if #args > 0 then + secondary = args +end -- Read the contents of the primary language file local primary_contents, n = {}, 1 for line in io.lines(path:format(primary)) do - local key = line:match("^([^=]+)=.*$") + local key = line:match('^%s*"([^"]+)":.*$') if key then primary_contents[n], n = key, n + 1 - elseif line == "" or line:sub(1, 1) == "#" then + elseif line == "" or line == "{" or line == "}" then primary_contents[n], n = line, n + 1 else io.stderr:write(("Unknown line %q in %s\n"):format(line, primary)) @@ -59,7 +60,7 @@ for _, language in ipairs(secondary) do local keys = {} for line in io.lines(path:format(language)) do - local key, value = line:match("^([^=]+)=(.*)$") + local key, value = line:match('^%s*"([^"]+)":%s*(.-),?$') if key then if keys[key] then io.stderr:write(("Duplicate keys for %q in %q\n"):format(key, language)) @@ -67,29 +68,28 @@ for _, language in ipairs(secondary) do end keys[key] = value - elseif line ~= "" and line:sub(1, 1) ~= "#" then + elseif line ~= "" and line ~= "{" and line ~= "}" then io.stderr:write(("Unknown line %q in %s\n"):format(line, language)) os.exit(1) end end local h = io.open(path:format(language), "wb") - local previous_blank = true + h:write("{") + local has_blank, has_any = false, false for _, line in ipairs(primary_contents) do - if line == "" then - if not previous_blank then - previous_blank = true - h:write("\n") - end - elseif line:sub(1, 1) == "#" then - h:write(line .. "\n") - previous_blank = false + if line == "{" or line == "}" then + -- Skip + elseif line == "" then + has_blank = true else local translated = keys[line] if translated then - h:write(("%s=%s\n"):format(line, translated)) + if has_any then h:write(",") else has_any = true end + if has_blank then h:write("\n") has_blank = false end + + h:write(("\n %q: %s"):format(line, translated)) keys[line] = nil - previous_blank = false elseif verbose then io.stderr:write(("Missing translation %q for %q\n"):format(line, language)) end @@ -98,15 +98,22 @@ for _, language in ipairs(secondary) do if next(keys) ~= nil then local extra = {} - for k, v in pairs(keys) do extra[#extra + 1] = ("%s=%s\n"):format(k, v) end + for k, v in pairs(keys) do + extra[#extra + 1] = ("\n %q: %s"):format(k, v) + end table.sort(extra) io.stderr:write(("%d additional unknown translation keys in %q\n"):format(#extra, language)) - if not previous_blank then h:write("\n") end - h:write("#Unknown translations\n") - for _, line in ipairs(extra) do h:write(line) end + has_blank = true + + for _, line in ipairs(extra) do + if has_any then h:write(",") else has_any = true end + if has_blank then h:write("\n") has_blank = false end + h:write(line) + end end + h:write("\n}\n") h:close() end diff --git a/tools/pocket_upgrade_advancement.json b/tools/pocket_upgrade_advancement.json index 6d6bfbf54..2fd25329f 100644 --- a/tools/pocket_upgrade_advancement.json +++ b/tools/pocket_upgrade_advancement.json @@ -8,8 +8,8 @@ "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "computercraft:pocket_computer", "data": ${pocket_data} }, - { "item": ${upgrade_item} } + { "item": "computercraft:pocket_computer_${pocket_family}" }, + { "item": "${upgrade_item}" } ] } }, diff --git a/tools/pocket_upgrade_recipe.json b/tools/pocket_upgrade_recipe.json index 982169a23..354015b2a 100644 --- a/tools/pocket_upgrade_recipe.json +++ b/tools/pocket_upgrade_recipe.json @@ -6,8 +6,8 @@ "T" ], "key": { - "#": { "item": ${upgrade_item} }, - "T": { "item": "computercraft:pocket_computer", "data": ${pocket_data} } + "#": { "item": "${upgrade_item}" }, + "T": { "item": "computercraft:pocket_computer_${pocket_family}" } }, - "result": { "item": "computercraft:pocket_computer", "data": ${pocket_data}, "nbt": { "upgrade": "${upgrade_id}" } } + "result": { "item": "computercraft:pocket_computer_${pocket_family}", "nbt": { "Upgrade": "${upgrade_id}" } } } diff --git a/tools/recipes.lua b/tools/recipes.lua index 91f400b27..53c619f45 100644 --- a/tools/recipes.lua +++ b/tools/recipes.lua @@ -10,9 +10,9 @@ --- All turtle upgrades, and an optional item for this upgrade. local turtle_upgrades = { - { "computercraft:wireless_modem", '"computercraft:peripheral", "data": 1' }, - { "computercraft:advanced_modem" }, - { "computercraft:speaker", '"computercraft:peripheral", "data": 5' }, + { "computercraft:wireless_modem_normal" }, + { "computercraft:wireless_modem_advanced" }, + { "computercraft:speaker" }, { "minecraft:crafting_table" }, { "minecraft:diamond_sword" }, { "minecraft:diamond_shovel" }, @@ -23,29 +23,29 @@ local turtle_upgrades = { --- All pocket upgrades, and an optional item for this upgrade. local pocket_upgrades = { - { "computercraft:wireless_modem", '"computercraft:peripheral", "data": 1' }, - { "computercraft:advanced_modem" }, - { "computercraft:speaker", '"computercraft:peripheral", "data": 5' }, + { "computercraft:wireless_modem_normal" }, + { "computercraft:wireless_modem_advanced" }, + { "computercraft:speaker" }, } --- All dye/disk colours local colours = { - 0x111111, - 0xcc4c4c, - 0x57A64E, - 0x7f664c, - 0x3366cc, - 0xb266e5, - 0x4c99b2, - 0x999999, - 0x4c4c4c, - 0xf2b2cc, - 0x7fcc19, - 0xdede6c, - 0x99b2f2, - 0xe57fd8, - 0xf2b233, - 0xf0f0f0; + { 0x111111, "minecraft:ink_sac" }, + { 0xcc4c4c, "minecraft:rose_red" }, + { 0x57A64E, "minecraft:cactus_green" }, + { 0x7f664c, "minecraft:cocoa_beans" }, + { 0x3366cc, "minecraft:lapis_lazuli" }, + { 0xb266e5, "minecraft:purple_dye" }, + { 0x4c99b2, "minecraft:cyan_dye" }, + { 0x999999, "minecraft:light_gray_dye" }, + { 0x4c4c4c, "minecraft:gray_dye" }, + { 0xf2b2cc, "minecraft:pink_dye" }, + { 0x7fcc19, "minecraft:lime_dye" }, + { 0xdede6c, "minecraft:dandelion_yellow" }, + { 0x99b2f2, "minecraft:light_blue_dye" }, + { 0xe57fd8, "minecraft:magenta_dye" }, + { 0xf2b233, "minecraft:orange_dye" }, + { 0xf0f0f0, "minecraft:bone_meal" }, } --- Read the provided file into a string, exiting the program if not found. @@ -82,44 +82,44 @@ end --- Format template strings of the form `${key}` using the given substituion -- table. local function template(str, subs) - return str:gsub("%$%{([^}]+)%}", function(k) return subs[k] or error("Unknown key " .. k) end) + return str:gsub("%$%{([^}]+)%}", function(k) + return subs[k] or error("Unknown key " .. k) + end) end -- Write turtle upgrades local turtle_recipe = read_all "tools/turtle_upgrade_recipe.json" local turtle_advance = read_all "tools/turtle_upgrade_advancement.json" -for _, turtle in ipairs { { "normal", "computercraft:turtle_expanded" }, { "advanced", "computercraft:turtle_advanced" } } do - local turtle_family, turtle_item = turtle[1], turtle[2] +for _, turtle_family in ipairs { "normal", "advanced" } do for _, upgrade in ipairs(turtle_upgrades) do - local upgrade_id, upgrade_item = upgrade[1], upgrade[2] or ('"%s"'):format(upgrade[1]) + local upgrade_id, upgrade_item = upgrade[1], upgrade[2] or upgrade[1] local path = ("generated/turtle_%s/%s"):format(turtle_family, (upgrade_id:gsub(":", "_"))) local keys = { upgrade_id = upgrade_id, upgrade_item = upgrade_item, - turtle_family = turtle_family, turtle_item = turtle_item, + turtle_family = turtle_family, path = path, } - write_all("src/main/resources/assets/computercraft/recipes/" .. path .. ".json", template(turtle_recipe, keys)) - write_all("src/main/resources/assets/computercraft/advancements/recipes/" .. path .. ".json", template(turtle_advance, keys)) + write_all("src/main/resources/data/computercraft/recipes/" .. path .. ".json", template(turtle_recipe, keys)) + write_all("src/main/resources/data/computercraft/advancements/recipes/" .. path .. ".json", template(turtle_advance, keys)) end end -- Write pocket upgrades local pocket_recipe = read_all "tools/pocket_upgrade_recipe.json" local pocket_advance = read_all "tools/pocket_upgrade_advancement.json" -for _, pocket in ipairs { { "normal", "0" }, { "advanced", "1" } } do - local pocket_family, pocket_data = pocket[1], pocket[2] +for _, pocket_family in ipairs { "normal", "advanced" } do for _, upgrade in ipairs(pocket_upgrades) do - local upgrade_id, upgrade_item = upgrade[1], upgrade[2] or ('"%s"'):format(upgrade[1]) + local upgrade_id, upgrade_item = upgrade[1], upgrade[2] or upgrade[1] local path = ("generated/pocket_%s/%s"):format(pocket_family, (upgrade_id:gsub(":", "_"))) local keys = { upgrade_id = upgrade_id, upgrade_item = upgrade_item, - pocket_family = pocket_family, pocket_data = pocket_data, + pocket_family = pocket_family, path = path, } - write_all("src/main/resources/assets/computercraft/recipes/" .. path .. ".json", template(pocket_recipe, keys)) - write_all("src/main/resources/assets/computercraft/advancements/recipes/" .. path .. ".json", template(pocket_advance, keys)) + write_all("src/main/resources/data/computercraft/recipes/" .. path .. ".json", template(pocket_recipe, keys)) + write_all("src/main/resources/data/computercraft/advancements/recipes/" .. path .. ".json", template(pocket_advance, keys)) end end @@ -128,9 +128,9 @@ local disk_recipe = read_all "tools/disk_recipe.json" for i, colour in ipairs(colours) do local path = ("generated/disk/disk_%s"):format(i) local keys = { - dye = i - 1, colour = colour, - path = path, - } + dye = colour[2], colour = colour[1], + path = path, + } - write_all("src/main/resources/assets/computercraft/recipes/" .. path .. ".json", template(disk_recipe, keys)) + write_all("src/main/resources/data/computercraft/recipes/" .. path .. ".json", template(disk_recipe, keys)) end diff --git a/tools/turtle_upgrade_advancement.json b/tools/turtle_upgrade_advancement.json index 043a6fca5..c671f4874 100644 --- a/tools/turtle_upgrade_advancement.json +++ b/tools/turtle_upgrade_advancement.json @@ -8,8 +8,8 @@ "trigger": "minecraft:inventory_changed", "conditions": { "items": [ - { "item": "${turtle_item}", "data": 0 }, - { "item": ${upgrade_item} } + { "item": "computercraft:turtle_${turtle_family}" }, + { "item": "${upgrade_item}" } ] } }, diff --git a/tools/turtle_upgrade_recipe.json b/tools/turtle_upgrade_recipe.json index 8cbb6cdcf..d81b346cd 100644 --- a/tools/turtle_upgrade_recipe.json +++ b/tools/turtle_upgrade_recipe.json @@ -5,8 +5,8 @@ "#T" ], "key": { - "#": { "item": ${upgrade_item} }, - "T": { "item": "${turtle_item}", "data": 0 } + "#": { "item": "${upgrade_item}" }, + "T": { "item": "computercraft:turtle_${turtle_family}" } }, - "result": { "item": "${turtle_item}", "data": 0, "nbt": { "rightUpgrade": "${upgrade_id}" } } + "result": { "item": "computercraft:turtle_${turtle_family}", "nbt": { "RightUpgrade": "${upgrade_id}" } } }