From 05bacd7a4ec04e381b61fd346f7cda0afd9fb9be Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Wed, 18 May 2022 16:22:29 +0200 Subject: [PATCH] 100% less wooden buttons - Streamlined a number of existing recipe paths - Added recipes for new items and blocks - Creating bogeys in survival mode now requires railway casing --- src/generated/resources/.cache/cache | 171 ++++---- .../resources/assets/create/lang/en_ud.json | 5 +- .../resources/assets/create/lang/en_us.json | 6 +- .../assets/create/lang/unfinished/de_de.json | 8 +- .../assets/create/lang/unfinished/es_cl.json | 8 +- .../assets/create/lang/unfinished/es_es.json | 8 +- .../assets/create/lang/unfinished/fr_fr.json | 8 +- .../assets/create/lang/unfinished/it_it.json | 8 +- .../assets/create/lang/unfinished/ja_jp.json | 8 +- .../assets/create/lang/unfinished/ko_kr.json | 8 +- .../assets/create/lang/unfinished/nl_nl.json | 8 +- .../assets/create/lang/unfinished/pl_pl.json | 8 +- .../assets/create/lang/unfinished/pt_br.json | 8 +- .../assets/create/lang/unfinished/pt_pt.json | 8 +- .../assets/create/lang/unfinished/ro_ro.json | 8 +- .../assets/create/lang/unfinished/ru_ru.json | 8 +- .../assets/create/lang/unfinished/zh_cn.json | 8 +- .../assets/create/lang/unfinished/zh_tw.json | 8 +- .../create/models/item/incomplete_track.json | 6 + .../create/models/item/reinforced_sheet.json | 6 + .../item/unprocessed_obsidian_sheet.json | 6 + .../kinetics/adjustable_chain_gearshift.json | 2 +- .../create.base/crafting/kinetics/clutch.json | 2 +- .../crafting/kinetics/controls.json | 34 ++ .../crafting/kinetics/display_board.json | 34 ++ .../crafting/kinetics/flywheel.json | 32 ++ .../crafting/kinetics/gearshift.json | 2 +- .../kinetics/large_cogwheelfrom_little.json | 34 ++ .../{sail_frame.json => metal_girder.json} | 4 +- .../crafting/kinetics/millstone.json | 2 +- .../kinetics/sail_framefrom_conversion.json | 34 ++ .../crafting/kinetics/schedule.json | 32 ++ .../crafting/kinetics/steam_engine.json | 34 ++ .../crafting/kinetics/steam_whistle.json | 34 ++ .../crafting/kinetics/track_signal.json | 34 ++ .../crafting/kinetics/track_station.json | 34 ++ .../crafting/kinetics/white_sail.json | 2 +- .../kinetics/white_sailfrom_conversion.json | 34 ++ .../content_observerfrom_conversion.json | 34 ++ ...tockpile_switch.json => display_link.json} | 4 +- .../crafting/logistics/redstone_link.json | 4 +- .../stockpile_switchfrom_conversion.json | 34 ++ .../loot_tables/blocks/large_bogey.json | 2 +- .../loot_tables/blocks/small_bogey.json | 2 +- .../kinetics/adjustable_chain_gearshift.json | 20 +- .../crafting/kinetics/cart_assembler.json | 1 - .../recipes/crafting/kinetics/chute.json | 7 +- .../crafting/kinetics/clockwork_bearing.json | 9 +- .../recipes/crafting/kinetics/clutch.json | 21 +- .../recipes/crafting/kinetics/cogwheel.json | 22 +- .../recipes/crafting/kinetics/controls.json | 22 + .../crafting/kinetics/cuckoo_clock.json | 13 +- .../recipes/crafting/kinetics/deployer.json | 9 +- .../crafting/kinetics/display_board.json | 18 + .../crafting/kinetics/empty_blaze_burner.json | 7 +- .../kinetics/encased_chain_drive.json | 25 +- .../crafting/kinetics/encased_fan.json | 11 +- .../crafting/kinetics/fluid_valve.json | 22 +- .../recipes/crafting/kinetics/flywheel.json | 19 + .../crafting/kinetics/gantry_carriage.json | 9 +- .../recipes/crafting/kinetics/gearshift.json | 21 +- .../recipes/crafting/kinetics/hand_crank.json | 4 - .../crafting/kinetics/hose_pulley.json | 14 +- .../crafting/kinetics/large_cogwheel.json | 24 +- .../kinetics/large_cogwheelfrom_little.json | 14 + .../crafting/kinetics/mechanical_bearing.json | 11 +- .../crafting/kinetics/mechanical_crafter.json | 9 +- .../crafting/kinetics/mechanical_mixer.json | 11 +- .../crafting/kinetics/mechanical_piston.json | 9 +- .../crafting/kinetics/mechanical_press.json | 11 +- .../{sail_frame.json => metal_girder.json} | 15 +- .../recipes/crafting/kinetics/millstone.json | 15 +- .../recipes/crafting/kinetics/nixie_tube.json | 15 +- .../crafting/kinetics/rope_pulley.json | 9 +- .../kinetics/rotation_speed_controller.json | 7 +- .../kinetics/sail_framefrom_conversion.json | 11 + .../recipes/crafting/kinetics/schedule.json | 15 + .../kinetics/sequenced_gearshift.json | 9 +- .../crafting/kinetics/speedometer.json | 7 +- .../recipes/crafting/kinetics/spout.json | 8 +- .../crafting/kinetics/steam_engine.json | 22 + .../crafting/kinetics/steam_whistle.json | 18 + .../crafting/kinetics/track_signal.json | 15 + .../crafting/kinetics/track_station.json | 14 + .../recipes/crafting/kinetics/white_sail.json | 16 +- .../kinetics/white_sailfrom_conversion.json | 11 + .../crafting/kinetics/windmill_bearing.json | 8 +- .../crafting/logistics/andesite_funnel.json | 4 +- .../crafting/logistics/brass_funnel.json | 7 +- .../crafting/logistics/content_observer.json | 12 +- .../content_observerfrom_conversion.json | 11 + .../crafting/logistics/display_link.json | 22 + .../crafting/logistics/redstone_link.json | 9 +- .../crafting/logistics/stockpile_switch.json | 24 -- .../stockpile_switchfrom_conversion.json | 11 + .../crafting/materials/electron_tube.json | 6 +- .../crafting/schematics/schematicannon.json | 9 +- .../create/recipes/deploying/cogwheel.json | 16 + .../recipes/deploying/large_cogwheel.json | 16 + .../item_application/railway_casing.json | 16 + .../recipes/mechanical_crafting/flywheel.json | 20 - .../recipes/sequenced_assembly/cogwheel.json | 65 --- .../sequenced_assembly/large_cogwheel.json | 81 ---- .../sequenced_assembly/reinforced_sheet.json | 61 +++ .../recipes/sequenced_assembly/track.json | 72 ++++ .../data/create/tags/items/sleepers.json | 8 + .../forge/tags/items/plates/obsidian.json | 6 + .../java/com/simibubi/create/AllItems.java | 32 +- .../java/com/simibubi/create/AllTags.java | 3 + .../edgePoint/station/AssemblyScreen.java | 6 +- .../edgePoint/station/StationTileEntity.java | 20 +- .../trains/track/StandardBogeyBlock.java | 13 +- .../logistics/trains/track/TrackBlock.java | 2 +- .../foundation/data/BuilderTransformers.java | 1 + .../data/recipe/CreateRecipeProvider.java | 8 + .../data/recipe/DeployingRecipeGen.java | 12 +- .../data/recipe/ItemApplicationRecipeGen.java | 3 + .../recipe/MechanicalCraftingRecipeGen.java | 10 +- .../recipe/SequencedAssemblyRecipeGen.java | 57 ++- .../data/recipe/StandardRecipeGen.java | 378 +++++++++--------- .../assets/create/lang/default/interface.json | 1 + .../models/item/incomplete_cogwheel.json | 52 --- .../item/incomplete_large_cogwheel.json | 104 ----- .../models/item/incomplete_netherrack.json | 6 - .../create/textures/item/incomplete_track.png | Bin 0 -> 273 bytes .../create/textures/item/reinforced_sheet.png | Bin 0 -> 263 bytes .../item/unprocessed_obsidian_sheet.png | Bin 0 -> 292 bytes 127 files changed, 1514 insertions(+), 1032 deletions(-) create mode 100644 src/generated/resources/assets/create/models/item/incomplete_track.json create mode 100644 src/generated/resources/assets/create/models/item/reinforced_sheet.json create mode 100644 src/generated/resources/assets/create/models/item/unprocessed_obsidian_sheet.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/controls.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/display_board.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/flywheel.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/large_cogwheelfrom_little.json rename src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/{sail_frame.json => metal_girder.json} (83%) create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/sail_framefrom_conversion.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/schedule.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/steam_engine.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/steam_whistle.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/track_signal.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/track_station.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/white_sailfrom_conversion.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/content_observerfrom_conversion.json rename src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/{stockpile_switch.json => display_link.json} (81%) create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/stockpile_switchfrom_conversion.json create mode 100644 src/generated/resources/data/create/recipes/crafting/kinetics/controls.json create mode 100644 src/generated/resources/data/create/recipes/crafting/kinetics/display_board.json create mode 100644 src/generated/resources/data/create/recipes/crafting/kinetics/flywheel.json create mode 100644 src/generated/resources/data/create/recipes/crafting/kinetics/large_cogwheelfrom_little.json rename src/generated/resources/data/create/recipes/crafting/kinetics/{sail_frame.json => metal_girder.json} (57%) create mode 100644 src/generated/resources/data/create/recipes/crafting/kinetics/sail_framefrom_conversion.json create mode 100644 src/generated/resources/data/create/recipes/crafting/kinetics/schedule.json create mode 100644 src/generated/resources/data/create/recipes/crafting/kinetics/steam_engine.json create mode 100644 src/generated/resources/data/create/recipes/crafting/kinetics/steam_whistle.json create mode 100644 src/generated/resources/data/create/recipes/crafting/kinetics/track_signal.json create mode 100644 src/generated/resources/data/create/recipes/crafting/kinetics/track_station.json create mode 100644 src/generated/resources/data/create/recipes/crafting/kinetics/white_sailfrom_conversion.json create mode 100644 src/generated/resources/data/create/recipes/crafting/logistics/content_observerfrom_conversion.json create mode 100644 src/generated/resources/data/create/recipes/crafting/logistics/display_link.json delete mode 100644 src/generated/resources/data/create/recipes/crafting/logistics/stockpile_switch.json create mode 100644 src/generated/resources/data/create/recipes/crafting/logistics/stockpile_switchfrom_conversion.json create mode 100644 src/generated/resources/data/create/recipes/deploying/cogwheel.json create mode 100644 src/generated/resources/data/create/recipes/deploying/large_cogwheel.json create mode 100644 src/generated/resources/data/create/recipes/item_application/railway_casing.json delete mode 100644 src/generated/resources/data/create/recipes/mechanical_crafting/flywheel.json delete mode 100644 src/generated/resources/data/create/recipes/sequenced_assembly/cogwheel.json delete mode 100644 src/generated/resources/data/create/recipes/sequenced_assembly/large_cogwheel.json create mode 100644 src/generated/resources/data/create/recipes/sequenced_assembly/reinforced_sheet.json create mode 100644 src/generated/resources/data/create/recipes/sequenced_assembly/track.json create mode 100644 src/generated/resources/data/create/tags/items/sleepers.json create mode 100644 src/generated/resources/data/forge/tags/items/plates/obsidian.json delete mode 100644 src/main/resources/assets/create/models/item/incomplete_cogwheel.json delete mode 100644 src/main/resources/assets/create/models/item/incomplete_large_cogwheel.json delete mode 100644 src/main/resources/assets/create/models/item/incomplete_netherrack.json create mode 100644 src/main/resources/assets/create/textures/item/incomplete_track.png create mode 100644 src/main/resources/assets/create/textures/item/reinforced_sheet.png create mode 100644 src/main/resources/assets/create/textures/item/unprocessed_obsidian_sheet.png diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index f97f88072..ad27680cc 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -544,23 +544,23 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo 6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json -ad4db674caf6a1abe0bea573fd38ecfb198d3a9f assets/create/lang/en_ud.json -f7b3b5d1701800018eb6f337f289bcb09a2d2b32 assets/create/lang/en_us.json -78d55ed7e2c935ca1fceeaeadd19d6d4798e18f6 assets/create/lang/unfinished/de_de.json -abe03a5c6c992e45f5c1248a2a9f69fb8ee777fb assets/create/lang/unfinished/es_cl.json -8629b686bfb443c5ab5e7b364a197af0b34d07da assets/create/lang/unfinished/es_es.json -f716fa6e0ed4cd2d521c5e45b436b2abf2651325 assets/create/lang/unfinished/fr_fr.json -5e3d9743807181eafc7f34f08a83bb0906c69cec assets/create/lang/unfinished/it_it.json -a41170acf0976a295eb8e6c4ae2b0f496027460b assets/create/lang/unfinished/ja_jp.json -041aeb71ac42b3256338f6a8a0c7c1af9ac52bf3 assets/create/lang/unfinished/ko_kr.json -6112f9780067a315d25f21e37177060c043f8a53 assets/create/lang/unfinished/nl_nl.json -78cc27aac1829635b4dd18ec3cd4d720594ee714 assets/create/lang/unfinished/pl_pl.json -f827b360177819a70a3da17946d44f24ccd5fcb8 assets/create/lang/unfinished/pt_br.json -b7b3c9434b1a6a2139669aff6157f678d51062f5 assets/create/lang/unfinished/pt_pt.json -a4296b4ef145871d6838fd1756a82ec505e62cda assets/create/lang/unfinished/ro_ro.json -fa0d21f2bba491c1e30889d4838680006d5d27a7 assets/create/lang/unfinished/ru_ru.json -97bc1cd81e4e4dd151a1b3565b8b24421e69f075 assets/create/lang/unfinished/zh_cn.json -7be762379b0b2439fe4d0ffd9a8514ef01080d1f assets/create/lang/unfinished/zh_tw.json +bc34b2c5574a903a43729369b32c8981a4098ac1 assets/create/lang/en_ud.json +8ff43211f8611542dc2b80125eabe13153bc1fbf assets/create/lang/en_us.json +4c857eab126af9dba639b6483e02628f81cc46fb assets/create/lang/unfinished/de_de.json +0ce3a240ac9fa0b44674cf886a71dfe43f2bd164 assets/create/lang/unfinished/es_cl.json +bc0318d36ad5249bcfe7dd526372137fd8af86b6 assets/create/lang/unfinished/es_es.json +c15da57f79901b1cddbf6fa3d94e953480ab9467 assets/create/lang/unfinished/fr_fr.json +c2e763d4e611143f9a42c0a6a0b8cfa58f254b37 assets/create/lang/unfinished/it_it.json +5a173ee5e1f6b5a6ffeff2b301c28e9f75eb762c assets/create/lang/unfinished/ja_jp.json +a1d09b3588d98762d0fa56fece59e600507311da assets/create/lang/unfinished/ko_kr.json +9ad05595229b0ac2ef8d8b21d43dc86396167485 assets/create/lang/unfinished/nl_nl.json +76052baa07a1c9d34a5e98e75e1c7f8a935076c9 assets/create/lang/unfinished/pl_pl.json +d6fc8c6f6a1e88021d21546d5363c425863e4204 assets/create/lang/unfinished/pt_br.json +541b9a302d8ddf3827f29a7ab67b482e345bc207 assets/create/lang/unfinished/pt_pt.json +69ba5f485d16706f5438856162fcc337d23c5400 assets/create/lang/unfinished/ro_ro.json +64431b39b4cfa1fe1988ec8c4f36145e66714847 assets/create/lang/unfinished/ru_ru.json +1dd6ff7ee8d61c16bed0583a5f5d4567f5c76257 assets/create/lang/unfinished/zh_cn.json +e8db253724c9b2eeb07b4587d3efb10811941df5 assets/create/lang/unfinished/zh_tw.json 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json 3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json @@ -1860,6 +1860,7 @@ f0d5af58e23e2705b3ef675c30bdf85ed9567c57 assets/create/models/item/honey_bucket. f0e3b2b8a553b6e61746c922c27302dabfff71b6 assets/create/models/item/horizontal_framed_glass_pane.json ff92f6a9dfb73a6ee1eaaed3279c89390ff04a80 assets/create/models/item/hose_pulley.json 153a185852af79654f0fb216c4b1b8e69c85ee8a assets/create/models/item/incomplete_precision_mechanism.json +d4883a5c777abb6c5235563eadb70e2b1b3de17b assets/create/models/item/incomplete_track.json 9d605ce0da83a73b535bce45c107e604364e2b20 assets/create/models/item/iron_sheet.json 52e435014cb03e93411666c4799ebff206e55fc9 assets/create/models/item/item_drain.json 76ab46c9b64faf5e94391579eec5115360dff73d assets/create/models/item/item_vault.json @@ -2017,6 +2018,7 @@ b9a4ac219a27e60a82f55129f2df5ae6183981e2 assets/create/models/item/redstone_cont 52e561abeb954d0349e640566de92ef80ccbf919 assets/create/models/item/redstone_link.json 81c7f4381cbda69aebcb07700cb998f49c38c8c1 assets/create/models/item/refined_radiance.json ef52b3734a47e96c5f83d60da73110e925737933 assets/create/models/item/refined_radiance_casing.json +4bb564251aeca9ba96ae12091d87c1cabc2812d7 assets/create/models/item/reinforced_sheet.json 6daff6b82b33374d7add65e352e05ecb2fd9ebdd assets/create/models/item/rope_pulley.json 0817505d2d3ee516424100b985ca3fe2d2e7f01e assets/create/models/item/rose_quartz.json acfbf487ee65c2c58d89cb2644e33fda75751fde assets/create/models/item/rotation_speed_controller.json @@ -2114,6 +2116,7 @@ c317adb86ee47765dd7716539c65f31f329deb85 assets/create/models/item/track_signal. f8a4fa1ccecb16a3941cc46db7481ed8e8429a5e assets/create/models/item/tree_fertilizer.json 3f6810da54724de551591b46cd5b47a98a4737ef assets/create/models/item/tuff_pillar.json fb24881c4e92bbb7ffa54a71e0af6b1c66d84829 assets/create/models/item/turntable.json +0e4293d5b585bafb76eca66b88bfe43d831f9aad assets/create/models/item/unprocessed_obsidian_sheet.json 309146512095aafae89955e0eb1299ea717242ea assets/create/models/item/veridium.json 3d1459a79ec7d4b9486aad5e04c6be277c5cabeb assets/create/models/item/veridium_pillar.json 2a6be52ddedd614dc3b8a6b659bfbd7a4be54252 assets/create/models/item/vertical_framed_glass.json @@ -2332,7 +2335,7 @@ abda25ed5695780b534412b4501e927ec3a6fe16 data/create/advancements/recipes/create bb138bedd2aec741fa54b6b52be384fdbd741249 data/create/advancements/recipes/create.base/crafting/curiosities/brown_toolbox.json 773faf96b003868e35ceeb0bf738281d066e343b data/create/advancements/recipes/create.base/crafting/curiosities/minecart_coupling.json a8c72e7e02fd0843d33fa4c5d43de81f29bc3aa4 data/create/advancements/recipes/create.base/crafting/curiosities/peculiar_bell.json -468e48708a0dd00248cd43474eef10adc2f660c7 data/create/advancements/recipes/create.base/crafting/kinetics/adjustable_chain_gearshift.json +5a6613ff9c493c02f70b54d6dd162948002d533b data/create/advancements/recipes/create.base/crafting/kinetics/adjustable_chain_gearshift.json 1eed818673d57a9e9c28e90a2d87b97c28f85784 data/create/advancements/recipes/create.base/crafting/kinetics/analog_lever.json 3e9753006da898d4569bbeabf95997e8c90847c8 data/create/advancements/recipes/create.base/crafting/kinetics/attribute_filter.json 08b21b30437a1c6e7ba61b137f17aabb6c24acab data/create/advancements/recipes/create.base/crafting/kinetics/basin.json @@ -2350,9 +2353,10 @@ d12c6127aa397138d490ccfcf31148fb3754b7a6 data/create/advancements/recipes/create 94ad3db260f33ee255265d36d9b865f7dbc78c5f data/create/advancements/recipes/create.base/crafting/kinetics/cart_assembler.json bf3bcb52176b43f1886c7538705ca7a4f0e84a9e data/create/advancements/recipes/create.base/crafting/kinetics/chute.json d5e444853f95bcdb3b19d0d222806ac077e2e72d data/create/advancements/recipes/create.base/crafting/kinetics/clockwork_bearing.json -af678ad65c956f1661173284bbdc7276d8ab1563 data/create/advancements/recipes/create.base/crafting/kinetics/clutch.json +cc7d35a428412b995e46165b10873b538063d1e1 data/create/advancements/recipes/create.base/crafting/kinetics/clutch.json f1d8029514853b25356dbdeadd56c4d765fb2a08 data/create/advancements/recipes/create.base/crafting/kinetics/cogwheel.json 261bcfc98cc5ccd25b63776a32e8c0d1075640b4 data/create/advancements/recipes/create.base/crafting/kinetics/controller_rail.json +c66893266dac69fdcc9ba6bae432e915678b0706 data/create/advancements/recipes/create.base/crafting/kinetics/controls.json 70ba0f80929fb60409518d03fbeecd21d5002cb3 data/create/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle.json cfcb1053b7311aeea03ee9caa66e783801ae74f3 data/create/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle_from_others.json adb639c5e0c2b12c22c29af2218e450ebbe2e07a data/create/advancements/recipes/create.base/crafting/kinetics/crafter_slot_cover.json @@ -2362,6 +2366,7 @@ bb771079e7e814a2a7a854d48bbf270db16a420e data/create/advancements/recipes/create 2691122d20392bffa45a2b39c84555c90fe07e7d data/create/advancements/recipes/create.base/crafting/kinetics/cyan_valve_handle_from_other_valve_handle.json cd1a6ea80663ec9251bb13e27d90e6ccdd10ce3e data/create/advancements/recipes/create.base/crafting/kinetics/deployer.json 2c85a7080390156ce05985bbba840ad9ffbaed8f data/create/advancements/recipes/create.base/crafting/kinetics/depot.json +f79cc141e2cfc8dde9f27b1e3b2e00aced8ee632 data/create/advancements/recipes/create.base/crafting/kinetics/display_board.json 81a3fe7e87c26767e3be6f97ea1de50f1cd74b65 data/create/advancements/recipes/create.base/crafting/kinetics/empty_blaze_burner.json 77ee6740d2e0f3ec4bffb298d9d8ce4c77ebff0e data/create/advancements/recipes/create.base/crafting/kinetics/encased_chain_drive.json 3a9aef30af8d9694548da236fe3129c16dba4883 data/create/advancements/recipes/create.base/crafting/kinetics/encased_fan.json @@ -2369,11 +2374,12 @@ cd1a6ea80663ec9251bb13e27d90e6ccdd10ce3e data/create/advancements/recipes/create 8d4b4ebfe4b7b70dcb34f1b79eda3aee4f5b7abb data/create/advancements/recipes/create.base/crafting/kinetics/fluid_pipe.json 450a84018a6df61921e2c7eac507928e42d82b93 data/create/advancements/recipes/create.base/crafting/kinetics/fluid_tank.json 5b68a2e467e01d2255c448691ec5b4be20ac35c2 data/create/advancements/recipes/create.base/crafting/kinetics/fluid_valve.json +36f5f608cba7cb563a4c8bffc964cd4baa5c3997 data/create/advancements/recipes/create.base/crafting/kinetics/flywheel.json 4049cbeed4452bf6fe7608e06f4a4c90f58d6da0 data/create/advancements/recipes/create.base/crafting/kinetics/gantry_carriage.json 10529af8626e0d60d041aaebeadd4ac6a22cf061 data/create/advancements/recipes/create.base/crafting/kinetics/gantry_shaft.json 60beaa4f519b92eea28a4db11739313da9168beb data/create/advancements/recipes/create.base/crafting/kinetics/gearbox.json 710c5c73147a3a92841b823ed41d45faa0ffeb90 data/create/advancements/recipes/create.base/crafting/kinetics/gearboxfrom_conversion.json -c61da89a4b64fcda7417ca41257f1a55c761b57e data/create/advancements/recipes/create.base/crafting/kinetics/gearshift.json +d5a9e092f1b591c648487454d10ce7bac208c7de data/create/advancements/recipes/create.base/crafting/kinetics/gearshift.json 0b465aeff26c469f525dbf92f2dfaa6d90eb5d76 data/create/advancements/recipes/create.base/crafting/kinetics/goggles.json 585378d03f5ae23e43a587468d183951e3fa58a9 data/create/advancements/recipes/create.base/crafting/kinetics/gray_seat.json f0a0c371c6851a5418b4b9480797677c8e871372 data/create/advancements/recipes/create.base/crafting/kinetics/gray_seat_from_other_seat.json @@ -2386,6 +2392,7 @@ f4e8fd79cb27e0677460f5c260b106338f2a48cc data/create/advancements/recipes/create a9f2c8a0b0b322741575ef833a461006ef2f0421 data/create/advancements/recipes/create.base/crafting/kinetics/item_drain.json 2ccfaf572456e8642a0070ea6928a082f98c63af data/create/advancements/recipes/create.base/crafting/kinetics/item_vault.json 73433a5cd400ed392796a4e543f15c42dd499fe8 data/create/advancements/recipes/create.base/crafting/kinetics/large_cogwheel.json +1c9e9888ccc51ddf76b9df0c186e74efaefb1256 data/create/advancements/recipes/create.base/crafting/kinetics/large_cogwheelfrom_little.json eb007bb079bbe6b6aaad2ca90f5af84261e3f8ea data/create/advancements/recipes/create.base/crafting/kinetics/light_blue_seat.json 571da50fbf5f2fcd3363b3dab91e7233e0ebffa0 data/create/advancements/recipes/create.base/crafting/kinetics/light_blue_seat_from_other_seat.json ddd80e84a7d595bbb3cf405a902ebbfd4ea5263c data/create/advancements/recipes/create.base/crafting/kinetics/light_blue_valve_handle_from_other_valve_handle.json @@ -2412,7 +2419,8 @@ ab3cb22e7cb2469c69a177ba83e29a2e1abdc3f8 data/create/advancements/recipes/create 90434eccfbcff42e8bc397881fd9d68f2dcb7ad4 data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_pump.json 40a87b7abbc22436efab546fad3910f4a945c5fc data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_saw.json ed6f472a0de659074e384d20e6c5903bda543acc data/create/advancements/recipes/create.base/crafting/kinetics/metal_bracket.json -4619ee687e7a6d162c771246a40ac1d76b766842 data/create/advancements/recipes/create.base/crafting/kinetics/millstone.json +3072592260b044257cc53be8f023909394b6cfea data/create/advancements/recipes/create.base/crafting/kinetics/metal_girder.json +1c06cd141f9ec29fd78ca4010115074865aef335 data/create/advancements/recipes/create.base/crafting/kinetics/millstone.json 25839b28208552ffe2a7dc094679514b200a065c data/create/advancements/recipes/create.base/crafting/kinetics/mysterious_cuckoo_clock.json 59f300d33fb2a0be6cb07fefebc6a9d59fb2476b data/create/advancements/recipes/create.base/crafting/kinetics/nixie_tube.json e1390d3436bacda88c126fa6f6e349fa11852fbc data/create/advancements/recipes/create.base/crafting/kinetics/nozzle.json @@ -2435,7 +2443,8 @@ f639481c8e1485019bf120463e67811b6d2d8ef9 data/create/advancements/recipes/create dba0696069fe0850120dc6e1ca1ab741b0fe6d21 data/create/advancements/recipes/create.base/crafting/kinetics/red_valve_handle_from_other_valve_handle.json 6aea000b80ac153ed6a027fff5ca0a1d55250d43 data/create/advancements/recipes/create.base/crafting/kinetics/rope_pulley.json 13f9944cdcafb651740b3670a6a75b3289886c6e data/create/advancements/recipes/create.base/crafting/kinetics/rotation_speed_controller.json -45f518ec72bdaa47486f7ee2100aee4f529ccdc2 data/create/advancements/recipes/create.base/crafting/kinetics/sail_frame.json +ab164782e70772371d2900c9b9d8ced048c52dea data/create/advancements/recipes/create.base/crafting/kinetics/sail_framefrom_conversion.json +5f33f1d9e97ea54b5137210fd088ff4105cd416a data/create/advancements/recipes/create.base/crafting/kinetics/schedule.json 338df97a6142704eea36ecd89bd3379188fd23a2 data/create/advancements/recipes/create.base/crafting/kinetics/secondary_linear_chassisfrom_conversion.json d177c347ce9ef4a3c021b337b6e974894941e0b3 data/create/advancements/recipes/create.base/crafting/kinetics/sequenced_gearshift.json 883ef3fc5f79903ca39049a01b1da8a02d67cbb0 data/create/advancements/recipes/create.base/crafting/kinetics/shaft.json @@ -2444,16 +2453,21 @@ aa081b762579ed614eeace1c02a66243921b5ab7 data/create/advancements/recipes/create 4cc0acdf9bfd6c3575b81c8129002aca558fc723 data/create/advancements/recipes/create.base/crafting/kinetics/speedometer.json fe70a9ffa16e5063f4fc99da4459a647c56174cf data/create/advancements/recipes/create.base/crafting/kinetics/speedometerfrom_conversion.json 1874d4f0df7b2bf8c95bdc6614c07fdd098b4d7c data/create/advancements/recipes/create.base/crafting/kinetics/spout.json +d38501f861c1842f20447f9312cad5bdbb006382 data/create/advancements/recipes/create.base/crafting/kinetics/steam_engine.json +e8bea7022c2d36276922a59eca0e9364efe9ee03 data/create/advancements/recipes/create.base/crafting/kinetics/steam_whistle.json 48f32dac75fdca978a9a18f9917b9ad94bee17b3 data/create/advancements/recipes/create.base/crafting/kinetics/sticker.json f14d533b42261bd4c5366cd6afaf44bf184a9f03 data/create/advancements/recipes/create.base/crafting/kinetics/sticky_mechanical_piston.json f640ded44cb4cf4c31e49deb0fc14e3495cd2edf data/create/advancements/recipes/create.base/crafting/kinetics/stressometerfrom_conversion.json f3fc3d4fee0712906f833aa17185f0bacb21922f data/create/advancements/recipes/create.base/crafting/kinetics/super_glue.json +23c1ecff946d41c74d4fb78e2bbc5e348c4487f5 data/create/advancements/recipes/create.base/crafting/kinetics/track_signal.json +da30636ca7e77f2947d0d28542c0b99747c9939e data/create/advancements/recipes/create.base/crafting/kinetics/track_station.json 9d7bbda05cebecc0922f4d344e9a51d4c2774a18 data/create/advancements/recipes/create.base/crafting/kinetics/turntable.json c1bb8d9022dff3dcf6c42f651b421281924c7dd2 data/create/advancements/recipes/create.base/crafting/kinetics/vertical_gearboxfrom_conversion.json a67713418e505fa68ecde6b8bc83c09ccced7a65 data/create/advancements/recipes/create.base/crafting/kinetics/water_wheel.json 1a90a33a8334a778972a16ca92a2303cb083830a data/create/advancements/recipes/create.base/crafting/kinetics/weighted_ejector.json 7c146cc51139c2a8e287a60c8d645fa6f6f48cb1 data/create/advancements/recipes/create.base/crafting/kinetics/whisk.json -05e67ca4200691ac8ee76f3dc2db2c51c04f28d6 data/create/advancements/recipes/create.base/crafting/kinetics/white_sail.json +85c29c56780b4ee3e9c758dd4baa9a78e824cf5a data/create/advancements/recipes/create.base/crafting/kinetics/white_sail.json +8c1194d26957352943841ba6cf368157cb8dd0f7 data/create/advancements/recipes/create.base/crafting/kinetics/white_sailfrom_conversion.json 37e545b016a7c5cd283168ac71ace6467a5ad3ef data/create/advancements/recipes/create.base/crafting/kinetics/white_seat.json 856760c4b120f7b29a94dd22fe04d62df061d409 data/create/advancements/recipes/create.base/crafting/kinetics/white_seat_from_other_seat.json b73e6f8b89e6ef94167b6fa3d0837a27222edb01 data/create/advancements/recipes/create.base/crafting/kinetics/white_valve_handle_from_other_valve_handle.json @@ -2468,13 +2482,15 @@ f05bbae1e39eabb51dffa0babecf07f5de2cee3d data/create/advancements/recipes/create 66dbb3486c5d38d309dd480e3f2ab0eb5ff9e559 data/create/advancements/recipes/create.base/crafting/logistics/brass_funnel.json 2127c0f1d822cc88a24d98ebb9eead9de5837ffe data/create/advancements/recipes/create.base/crafting/logistics/brass_tunnel.json 6ee9a16973001dcce16afc4c085f6dc3abbc344a data/create/advancements/recipes/create.base/crafting/logistics/content_observer.json +e20925f3c67f4a7b4acbbd61f8375efe09416edc data/create/advancements/recipes/create.base/crafting/logistics/content_observerfrom_conversion.json +cf8418ddb94198b900c6b8a281e59cee404b1b63 data/create/advancements/recipes/create.base/crafting/logistics/display_link.json b9b0a8bfff61a89149d4fcadf679f753385212d0 data/create/advancements/recipes/create.base/crafting/logistics/powered_latch.json 9951f2d35f7444c98c022142119b18b1289ca734 data/create/advancements/recipes/create.base/crafting/logistics/powered_toggle_latch.json 7513a5f19cc03098b3fb6922561fb2fea0a147aa data/create/advancements/recipes/create.base/crafting/logistics/pulse_extender.json 76d4c5f04d0a3e6817127a828594388b18f210c4 data/create/advancements/recipes/create.base/crafting/logistics/pulse_repeater.json 0020b5c5cc6301c576d392ace447235de3e1b70c data/create/advancements/recipes/create.base/crafting/logistics/redstone_contact.json -24a00abe5c747b3c8864872c4c0c50d872f219a1 data/create/advancements/recipes/create.base/crafting/logistics/redstone_link.json -675c980c5b9088233b8d777fa03aba4c44650c4e data/create/advancements/recipes/create.base/crafting/logistics/stockpile_switch.json +4bb511d1407ad4e21a53f7d67daa3b0de9b6c01e data/create/advancements/recipes/create.base/crafting/logistics/redstone_link.json +5da3e404c9195ee68c25e91a4fd29ab21a8e9316 data/create/advancements/recipes/create.base/crafting/logistics/stockpile_switchfrom_conversion.json 8e137e9ad4870708d4c015400f91d78cb37b4a92 data/create/advancements/recipes/create.base/crafting/materials/andesite_alloy.json 6ad84f6f8b4ef85e67ebcc68c5326a22b59bc81a data/create/advancements/recipes/create.base/crafting/materials/andesite_alloy_from_zinc.json a7d9a6dda3049332f04f4db027340070e1a9e597 data/create/advancements/recipes/create.base/crafting/materials/brass_block_from_compacting.json @@ -3547,7 +3563,7 @@ feed1cd9639de957c9b34212d1c4aef2044d1e31 data/create/loot_tables/blocks/item_dra af3042824de4aff38e27657ebb084077a7d4f925 data/create/loot_tables/blocks/item_vault.json db23fee08abdb61fe2f200a5016e41523159feef data/create/loot_tables/blocks/jungle_window.json 67f7d9162d3b86e198ab7faa1ddcfdfce605d10c data/create/loot_tables/blocks/jungle_window_pane.json -5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/create/loot_tables/blocks/large_bogey.json +7ed68e33a8c488242a2d9039797498068797c5a6 data/create/loot_tables/blocks/large_bogey.json a70fcfe474ba023adc9c326218c5664fbd7b58f8 data/create/loot_tables/blocks/large_cogwheel.json 81013913c3cc88e2390608420a2911d57414bd2c data/create/loot_tables/blocks/layered_andesite.json a89d357d3b8d7633bffe12a4197ab19cba891005 data/create/loot_tables/blocks/layered_asurine.json @@ -3733,7 +3749,7 @@ af9c104f3d5863191aedf25c83c647de439c215f data/create/loot_tables/blocks/small_as 56aa727f02da49231e52593f4904eff3a93475ab data/create/loot_tables/blocks/small_asurine_brick_stairs.json 172dc3a9a866895035553e6ff166755a24afd0ff data/create/loot_tables/blocks/small_asurine_brick_wall.json db97cf328010da9b5f643dbfde12660e9f8a33f8 data/create/loot_tables/blocks/small_asurine_bricks.json -5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/create/loot_tables/blocks/small_bogey.json +7ed68e33a8c488242a2d9039797498068797c5a6 data/create/loot_tables/blocks/small_bogey.json 9a48f87a53b61188cfddbcf217b251ba13ee08df data/create/loot_tables/blocks/small_calcite_brick_slab.json 542fb74a3b02b5f947dbe9bd9d919b631ffd3ff3 data/create/loot_tables/blocks/small_calcite_brick_stairs.json 8b03b9773f2be01cf639c0fedcf69bb05f9a0f7d data/create/loot_tables/blocks/small_calcite_brick_wall.json @@ -3949,7 +3965,7 @@ b8c398ca1f483ce673b66af80c6f43902f51e2a6 data/create/recipes/crafting/copper/wax 660e92da2b1b6698b1c0df74bd74a56a25fb3eca data/create/recipes/crafting/curiosities/minecart_coupling.json 1f8f96ab57363166b7e132a1dd082001a5a0d5f0 data/create/recipes/crafting/curiosities/peculiar_bell.json 07b3ca3a3e44ee1f76c69132ffa6556e027e5b0e data/create/recipes/crafting/curiosities/toolbox_dyeing.json -cc56d21a25286a9024e506dde9fa161230eaf46d data/create/recipes/crafting/kinetics/adjustable_chain_gearshift.json +4e9630bad12e6879ae7357ce7c8d455dddded9a4 data/create/recipes/crafting/kinetics/adjustable_chain_gearshift.json 88de51b451469698665b7319e5b9cfb9a87ae3e0 data/create/recipes/crafting/kinetics/analog_lever.json cf1f3a6306d47025cebe153cf05949ef69ccbe5a data/create/recipes/crafting/kinetics/attribute_filter.json 059d12526529b2896ed583555373afa31839a0de data/create/recipes/crafting/kinetics/basin.json @@ -3964,34 +3980,37 @@ f7ed975f13585273832f12d9f28808e0215308af data/create/recipes/crafting/kinetics/b 23b98f9772b1567172607cb0aecc65e2fdd933de data/create/recipes/crafting/kinetics/brown_seat.json ab3b69d035dae7fe696f5dd983d7018649f466a2 data/create/recipes/crafting/kinetics/brown_seat_from_other_seat.json 9eab21724f64455376c12b14f42a09a3af547201 data/create/recipes/crafting/kinetics/brown_valve_handle_from_other_valve_handle.json -860796dce8756c4cd234f18bbe52108f3b2254c2 data/create/recipes/crafting/kinetics/cart_assembler.json -abf8a28b4b8ae4ba15beed938736ef3a5a7b27ff data/create/recipes/crafting/kinetics/chute.json -a80e3eabbeba2931d0d58dd9492018a0d78da8b5 data/create/recipes/crafting/kinetics/clockwork_bearing.json -501ad764d087b40ce36f3d4256b0d5ee25b2081e data/create/recipes/crafting/kinetics/clutch.json -e46bcc6778ff5118252fe6371ef817ae1302253a data/create/recipes/crafting/kinetics/cogwheel.json +ac71fb7ad49c64bbe37230deeb1b06f7ea76036c data/create/recipes/crafting/kinetics/cart_assembler.json +7f48f8db6c9fbc7e39bf6e3580a86364b53df057 data/create/recipes/crafting/kinetics/chute.json +bc2313d0a4d94b858b4cef1b1dcbf4985a85c6cc data/create/recipes/crafting/kinetics/clockwork_bearing.json +031788926b5d8b77ec061773a11c3cfd2b361cd1 data/create/recipes/crafting/kinetics/clutch.json +a79bb44c6b136ea3d3f28926adf84e37e6aa6aa6 data/create/recipes/crafting/kinetics/cogwheel.json 11fe2ccc11f470e5735c3e848a944f889697ff73 data/create/recipes/crafting/kinetics/controller_rail.json +397c6c0691a54987b67854673b8d3c16c7f74e14 data/create/recipes/crafting/kinetics/controls.json 3093be508f6597eee2f3230cd9072f12d2821a6f data/create/recipes/crafting/kinetics/copper_valve_handle.json 886caa21481e62d44d70fd103f8d29f9bac64d60 data/create/recipes/crafting/kinetics/copper_valve_handle_from_others.json 59db5170cec390fe6c20a27d6154deebe044580c data/create/recipes/crafting/kinetics/crafter_slot_cover.json -cc2ab4b619aa55c03db18b67a62e12b6089e7019 data/create/recipes/crafting/kinetics/cuckoo_clock.json +92e84058e4bf36a770405a4dd37fa3df17cb240e data/create/recipes/crafting/kinetics/cuckoo_clock.json 67583ae5a8c9f71e3856a1787c6650c34070428e data/create/recipes/crafting/kinetics/cyan_seat.json 6c4d1e8f5b903cc804330a799ad20df59c427d05 data/create/recipes/crafting/kinetics/cyan_seat_from_other_seat.json 40018bc6f631c443279c410dc7c5765060f7446a data/create/recipes/crafting/kinetics/cyan_valve_handle_from_other_valve_handle.json -ad1c3ce1e98b8483512bdd754f2e5930c7b3ae85 data/create/recipes/crafting/kinetics/deployer.json +0c9f611a3982b04f817136b8bcee2548f2eff450 data/create/recipes/crafting/kinetics/deployer.json 2fe66b3d37ff5b0f7f30d5baa4efd713dd8b502a data/create/recipes/crafting/kinetics/depot.json -9c5d30f25a130d591b924c50e5c83e3b787c2758 data/create/recipes/crafting/kinetics/empty_blaze_burner.json -73cd487885be8d5190f24319b4a927b8e34c21cd data/create/recipes/crafting/kinetics/encased_chain_drive.json -b07496e4ba5bc56a2c5a395b612c68ba21328867 data/create/recipes/crafting/kinetics/encased_fan.json +37012670f9913fbaf83a44a5655693390dcf4a2b data/create/recipes/crafting/kinetics/display_board.json +93940e00c442077ce101dca50dbc28e0f1178560 data/create/recipes/crafting/kinetics/empty_blaze_burner.json +47c6a254c15b8c38fa54c88d0d6c8fe1c99a0ca2 data/create/recipes/crafting/kinetics/encased_chain_drive.json +f06e7bda5f4ac5b33eb45cc80a1c802d79836bd8 data/create/recipes/crafting/kinetics/encased_fan.json 0dd0cc11eaa6789fc612af3231ed247893852178 data/create/recipes/crafting/kinetics/filter.json 9df7da02bcae5ae7c3b441ff0299f75394133145 data/create/recipes/crafting/kinetics/fluid_pipe.json 284e8554d7285989a1684a5e14c72063d152cc9e data/create/recipes/crafting/kinetics/fluid_tank.json -3dad2a849796df268cd3a06ed37376f2cc529957 data/create/recipes/crafting/kinetics/fluid_valve.json +5f229a7024101b27d95e6c13991a5be81f400dad data/create/recipes/crafting/kinetics/fluid_valve.json +bae222e1eab464b25431909abe9a7da2ef9bd7a6 data/create/recipes/crafting/kinetics/flywheel.json 84153bd478c0e63a04c77579d6595043f604b7ab data/create/recipes/crafting/kinetics/furnace_minecart_from_contraption_cart.json -9e75756423b7f9372a2330a7140f80b1b87bd30e data/create/recipes/crafting/kinetics/gantry_carriage.json +5d7ce9c5ec92df215ebbada5cf4f977ab2598a7e data/create/recipes/crafting/kinetics/gantry_carriage.json 21095a156547d4a7d215964be793f1e960b81c09 data/create/recipes/crafting/kinetics/gantry_shaft.json 5eb05cdf88bccdaddfe7ebfbd8b70d1196d422a6 data/create/recipes/crafting/kinetics/gearbox.json b5da8c58f6b8aba525ae8a12ad906db37b78a566 data/create/recipes/crafting/kinetics/gearboxfrom_conversion.json -4d4124b4f1df38d892cb19da19c6464522d3e37d data/create/recipes/crafting/kinetics/gearshift.json +0939038638e99737decca86808d49e3b54ca2392 data/create/recipes/crafting/kinetics/gearshift.json 5b07af1b09125f874500c3fb140efda90061a19e data/create/recipes/crafting/kinetics/goggles.json 4e6db62bd4e72a5b19db4ed634c273cd7206ec61 data/create/recipes/crafting/kinetics/gray_seat.json 89ff5b0b6e78221b78d1daff0401b4a32eccb213 data/create/recipes/crafting/kinetics/gray_seat_from_other_seat.json @@ -3999,11 +4018,12 @@ b5da8c58f6b8aba525ae8a12ad906db37b78a566 data/create/recipes/crafting/kinetics/g 01fbdedbb05c66a207784cae902484245c1d6f62 data/create/recipes/crafting/kinetics/green_seat.json 9a11f2a6d34cb0031392c32bffc70c5f5e0bfeed data/create/recipes/crafting/kinetics/green_seat_from_other_seat.json 574e32cd8c194576a1c060cfcd7476bcc3f319df data/create/recipes/crafting/kinetics/green_valve_handle_from_other_valve_handle.json -9f08bdaeec88e04a43c2dc103869f9648deee079 data/create/recipes/crafting/kinetics/hand_crank.json -d10639b0c3999481531fe0a9383a1bb4af60225e data/create/recipes/crafting/kinetics/hose_pulley.json +fe806e84a575e83da4709e1d48426bda1b6421d1 data/create/recipes/crafting/kinetics/hand_crank.json +312c6be229299f1d426e13545091f671b2a09226 data/create/recipes/crafting/kinetics/hose_pulley.json f4fbb11ef55f3431bd387f3f6f258513bfbc8011 data/create/recipes/crafting/kinetics/item_drain.json 8f7110447f039f80a6f5b1d854bc760c3d77da82 data/create/recipes/crafting/kinetics/item_vault.json -237541c1c318b8426734c1c43be31fbd01413d39 data/create/recipes/crafting/kinetics/large_cogwheel.json +7f105694e02d4ce69a02740edfa4a0d0bc4f4eac data/create/recipes/crafting/kinetics/large_cogwheel.json +197c174c28f294b23ae6496b7a31c35e7e8b4771 data/create/recipes/crafting/kinetics/large_cogwheelfrom_little.json 0397b107ab380cd23390c96f298971a70e9bceef data/create/recipes/crafting/kinetics/light_blue_seat.json aa06f0594e1b2d31aa41bace309ed95a16529498 data/create/recipes/crafting/kinetics/light_blue_seat_from_other_seat.json bb8759b51aef768fa841962b9ad49676a6096a1c data/create/recipes/crafting/kinetics/light_blue_valve_handle_from_other_valve_handle.json @@ -4019,21 +4039,22 @@ fd0fced8aa6ae01ffb1dc0f55ec5d8522d864a02 data/create/recipes/crafting/kinetics/m ba2fb8e07f03b376d3629262b2eaeda988e76af2 data/create/recipes/crafting/kinetics/magenta_seat_from_other_seat.json 631039797c71547fb4fe33ab5cb688e222f123ae data/create/recipes/crafting/kinetics/magenta_valve_handle_from_other_valve_handle.json 659cd6acdd15511c4b0a396740118b99b76a619d data/create/recipes/crafting/kinetics/mechanical_arm.json -946389078db31de69a7dc4fec5feebddf48dcfc3 data/create/recipes/crafting/kinetics/mechanical_bearing.json -a5c7aad0d86cbb66b8688d295e62547da4a2ce0f data/create/recipes/crafting/kinetics/mechanical_crafter.json +28abfb50182783b95742361e852ab0288c05996b data/create/recipes/crafting/kinetics/mechanical_bearing.json +a8174961cfd32d41823a065a0587ec193d25c383 data/create/recipes/crafting/kinetics/mechanical_crafter.json 4372830100d39c4a89ff397a62b01940e1a28cb3 data/create/recipes/crafting/kinetics/mechanical_drill.json 0972ab663a9f51ffc63463ee7329efe516321fbb data/create/recipes/crafting/kinetics/mechanical_harvester.json -431fd34eae60e5af6afd0f9a7afb6cb513d828b2 data/create/recipes/crafting/kinetics/mechanical_mixer.json -ac9003ad3320fe2009c1793a3c6e86bdf20ca832 data/create/recipes/crafting/kinetics/mechanical_piston.json +8eb87da54e5439ba982e6df28cbfffef36a42f0c data/create/recipes/crafting/kinetics/mechanical_mixer.json +cdf5cc972b8d5c660e87ab48c15d7862ad3ba200 data/create/recipes/crafting/kinetics/mechanical_piston.json 8a2f9068d6fab81f46699f897e619461ca89e38f data/create/recipes/crafting/kinetics/mechanical_plough.json -ce8e269907aae5549cea04141bd231f4a20e6453 data/create/recipes/crafting/kinetics/mechanical_press.json +5118c2f0144a280a8b778e2314f3f814f69d327e data/create/recipes/crafting/kinetics/mechanical_press.json 4307cc2c988ac19602f2f86afa2146c7e7fef026 data/create/recipes/crafting/kinetics/mechanical_pump.json ce28bcb47a379976d4a1bdfcfd1cdd0bae0bcdae data/create/recipes/crafting/kinetics/mechanical_saw.json 353146e9501096b4cd9632ad5500b0a2406c6f5d data/create/recipes/crafting/kinetics/metal_bracket.json -58d9046e61eae40958181388186a35dc07cc9a59 data/create/recipes/crafting/kinetics/millstone.json +0ef8088b775f551c6f5b44f21f419fba366a971e data/create/recipes/crafting/kinetics/metal_girder.json +43d0ba7b15a4280eb6c8932e877c14aad24cb022 data/create/recipes/crafting/kinetics/millstone.json 13fa2887d3c988973c9222ce5e2e3dd0d9bd8374 data/create/recipes/crafting/kinetics/minecart_from_contraption_cart.json be4c7fdb0ba1e9ee6d3dcf200dc2718ad83ec8fb data/create/recipes/crafting/kinetics/mysterious_cuckoo_clock.json -99935fbbb83fe102454096a2dcafe09d572d9ad3 data/create/recipes/crafting/kinetics/nixie_tube.json +94398a41b0eb3f49fb70b558b348510358fd4e21 data/create/recipes/crafting/kinetics/nixie_tube.json 6b1b626394d7269a6861a836992ccdb344b6e7dd data/create/recipes/crafting/kinetics/nozzle.json 4088c9f8d9d74495860c2d0102277f5af1c22893 data/create/recipes/crafting/kinetics/orange_seat.json 7d87c973228c6a6705ed106ea7c195866f9f4f63 data/create/recipes/crafting/kinetics/orange_seat_from_other_seat.json @@ -4052,48 +4073,56 @@ af84b939ced1c0254a27469f857f571afbadc4f6 data/create/recipes/crafting/kinetics/r 419a93ed1f41a20936a7d66f7271da0a0be4d593 data/create/recipes/crafting/kinetics/red_seat.json c0c248fa1b8d8d8cb63d3c299e8b35c72b0aab03 data/create/recipes/crafting/kinetics/red_seat_from_other_seat.json 73c8d12da8a5d9ec8a0d0d5c413bc2f66e463e81 data/create/recipes/crafting/kinetics/red_valve_handle_from_other_valve_handle.json -af525e135eb927b64462120d201ecae7a7ec61ed data/create/recipes/crafting/kinetics/rope_pulley.json -1b918eb77b3e0fb2234c4c2c0d52e730ae7f3ffa data/create/recipes/crafting/kinetics/rotation_speed_controller.json -d0d7fb94621f6f02fa3137666f20e677022d9d5b data/create/recipes/crafting/kinetics/sail_frame.json +16279b2c2862ff9a9442851dd051acee51fd4614 data/create/recipes/crafting/kinetics/rope_pulley.json +0add4bc98e3b36de6b1636dc8b28a4122e81ccfa data/create/recipes/crafting/kinetics/rotation_speed_controller.json +9f6fedefe1c1fda86fbb17763ec34c237d8e32c3 data/create/recipes/crafting/kinetics/sail_framefrom_conversion.json +5355790e4e3ca6f99b40d953afe989566b72f97d data/create/recipes/crafting/kinetics/schedule.json 66922e18791c87fadb7629cdf32d3dd2f50ccd13 data/create/recipes/crafting/kinetics/secondary_linear_chassisfrom_conversion.json -a17db27e61baa45f8a6ecb46a6d2a5a464704f8b data/create/recipes/crafting/kinetics/sequenced_gearshift.json +6635a22053556d6d4b3f0ee3abbaea2d699df168 data/create/recipes/crafting/kinetics/sequenced_gearshift.json 2e36438665bfb97265fd4e6ea85505970eae67fd data/create/recipes/crafting/kinetics/shaft.json 683c9e128a976282eaa6cdbbee3914e4c66b1676 data/create/recipes/crafting/kinetics/smart_chute.json 319e75dc4be645efd4809dafc1331581a8022e93 data/create/recipes/crafting/kinetics/smart_fluid_pipe.json -b1a74f0b51fa37ca1ed814266b3d69b8b7e69fa3 data/create/recipes/crafting/kinetics/speedometer.json +3f793f95427696d7568e735ee9d742e51714a108 data/create/recipes/crafting/kinetics/speedometer.json 8d632845deeb723e1a56083536ee5f9d60de2fcb data/create/recipes/crafting/kinetics/speedometerfrom_conversion.json -eea9d4066cd2fafef40b50b79323dcc603fa6388 data/create/recipes/crafting/kinetics/spout.json +dc287743a0f2c605be0e6664737cf681812445ab data/create/recipes/crafting/kinetics/spout.json +474b52575dcf6d0a9e191044c54712bf139c215c data/create/recipes/crafting/kinetics/steam_engine.json +726929444c0e42986ae200e8d8fbca33994e29f3 data/create/recipes/crafting/kinetics/steam_whistle.json e532a5c405e48b415e3fcd4f7c6183ea335cb915 data/create/recipes/crafting/kinetics/sticker.json 3be40664acfd150d0617bc138dc2dd9d54a21b3a data/create/recipes/crafting/kinetics/sticky_mechanical_piston.json af5854ee2fa3be195ad9abcdeebe6ed7306b651c data/create/recipes/crafting/kinetics/stressometerfrom_conversion.json 21f885a674603367b67e1e993c175638cbda9ea3 data/create/recipes/crafting/kinetics/super_glue.json +456d59d0fff2b042e1e886ebbe46b84fbd212c40 data/create/recipes/crafting/kinetics/track_signal.json +901a57eb0b488d046fc6d9dbd0b44785dc1a6062 data/create/recipes/crafting/kinetics/track_station.json 8494f5fcd85a740fa0f0384e3522d8cdd905ce49 data/create/recipes/crafting/kinetics/turntable.json 057c889b0a306f44b8835c896663154ccd9ff12f data/create/recipes/crafting/kinetics/vertical_gearboxfrom_conversion.json 4fb009b86a51b2e259bd1f73848803f6276dd820 data/create/recipes/crafting/kinetics/water_wheel.json 06b5b371ae9dd81df8fd3dee6d3559b1ed0db35c data/create/recipes/crafting/kinetics/weighted_ejector.json f508d510576c93712e7f5265345a32e8818bbf0d data/create/recipes/crafting/kinetics/whisk.json -d80a741d2f0d4f742217b43d7e4d37f003ec9f9d data/create/recipes/crafting/kinetics/white_sail.json +98546e5e5f1fe111e84c4a17569c8e7b57f8cc8d data/create/recipes/crafting/kinetics/white_sail.json +2d9725bd3bfc082fb0ff5fd020bb7f7e90258561 data/create/recipes/crafting/kinetics/white_sailfrom_conversion.json 61894b1302aef9413ca263eb89c3d9f4cfb92239 data/create/recipes/crafting/kinetics/white_seat.json ceb3d574336ce5ff151db080fe517ba43ff77a49 data/create/recipes/crafting/kinetics/white_seat_from_other_seat.json 54a182603347c2d8898f9990f1536128611af749 data/create/recipes/crafting/kinetics/white_valve_handle_from_other_valve_handle.json -8508255518d3718a0d8c2f536f69ffe9ed48a855 data/create/recipes/crafting/kinetics/windmill_bearing.json +b6b6398bc40c6a734e6a93ee270f09eb6e72022e data/create/recipes/crafting/kinetics/windmill_bearing.json d11eee4005372b1d0fad283b28c8016d823b5e37 data/create/recipes/crafting/kinetics/wooden_bracket.json 3ec8bb5660656f1c676035d8ba5460462c1d1865 data/create/recipes/crafting/kinetics/wrench.json 8b7ca850a23126fd7d65084cbc6506145efee7af data/create/recipes/crafting/kinetics/yellow_seat.json c574b993d49874bbed5d064205c436271dfa27b8 data/create/recipes/crafting/kinetics/yellow_seat_from_other_seat.json 19333b83d10e307d715b5667b8623915880e1861 data/create/recipes/crafting/kinetics/yellow_valve_handle_from_other_valve_handle.json -fc75c87159569cb6ee978e6d51b0c3b0f504b5de data/create/recipes/crafting/logistics/andesite_funnel.json +cdef45f9fe02b031648b7b4dd4786b838f7ad105 data/create/recipes/crafting/logistics/andesite_funnel.json 660e824ab6042c145f02ffcfe95a34c38f113e19 data/create/recipes/crafting/logistics/andesite_tunnel.json -9b4e74f9a950191134d978bf45c3339212677b0d data/create/recipes/crafting/logistics/brass_funnel.json +30230c732fe24ed9fa87c70cd32c8f61f6a5a89b data/create/recipes/crafting/logistics/brass_funnel.json 2ae06df0357c494b53db0ddf9655c60ef2022d0b data/create/recipes/crafting/logistics/brass_tunnel.json -8559045b42abd99490fb9a3cf5d06b08fd014b38 data/create/recipes/crafting/logistics/content_observer.json +ce2228d3cbec4b770ba95a3940c36dfe156ebc1b data/create/recipes/crafting/logistics/content_observer.json +22d18bf94275f8e4153da4f03c657b7eaa766716 data/create/recipes/crafting/logistics/content_observerfrom_conversion.json +abef83d640e02a715854ec4f7a90aa1fab8f4f5f data/create/recipes/crafting/logistics/display_link.json a32ac53848862837f3044ff9c81ed62c1134fe4f data/create/recipes/crafting/logistics/powered_latch.json 660eb73bcc66c1528cbd4d4204ad6b771f4bd721 data/create/recipes/crafting/logistics/powered_toggle_latch.json 08be50405433365f483a1b5f2ff688e3adbf6a7b data/create/recipes/crafting/logistics/pulse_extender.json 9f079a853c128f68f15277448bbf72dfbc212f26 data/create/recipes/crafting/logistics/pulse_repeater.json 739f0d8b7f98a5639ed37f7fb8ce474d5e6ba0c6 data/create/recipes/crafting/logistics/redstone_contact.json -bc511f7c225750743ae3e985502fa65beb1e7b8d data/create/recipes/crafting/logistics/redstone_link.json -10b16358664f2bb8a11589ef8ba3d69ee8d3b9fc data/create/recipes/crafting/logistics/stockpile_switch.json +8de2f5220d719feeaeab99cb526e890cdc97340d data/create/recipes/crafting/logistics/redstone_link.json +7dd23fbdd0fbd5471ed78108e6171e43db9b75f3 data/create/recipes/crafting/logistics/stockpile_switchfrom_conversion.json 0dc99b8a8c68d6a9250c3a1167ffb565be9622ec data/create/recipes/crafting/materials/andesite_alloy.json 8bb306454795fd6a2066152717c169e0e8aaf480 data/create/recipes/crafting/materials/andesite_alloy_from_zinc.json fa23f8ff9f43ed39a70a86d0c9080102d57d14b6 data/create/recipes/crafting/materials/brass_block_from_compacting.json @@ -4102,7 +4131,7 @@ fa23f8ff9f43ed39a70a86d0c9080102d57d14b6 data/create/recipes/crafting/materials/ 49c263368f8c02509332654c0ce97b7472d45cd3 data/create/recipes/crafting/materials/brass_nugget_from_decompacting.json 62ce480f3b5a2f9de27858fdde4f48cf8b91fe2c data/create/recipes/crafting/materials/copper_ingot.json 9a8cef55dc3b7cecef500bad0c7bbb86c51f4b5f data/create/recipes/crafting/materials/copper_nugget.json -7cd3500890430496381cb56c432a233f78b21a25 data/create/recipes/crafting/materials/electron_tube.json +399f7148fcec3a5c1eed40069d777f16622ff32d data/create/recipes/crafting/materials/electron_tube.json e73e4abd1306e2bfeb59ab5ca2d804c23fc66f7e data/create/recipes/crafting/materials/raw_zinc.json cc167074d22aff7ba824ec738653e84f131a1bf0 data/create/recipes/crafting/materials/raw_zinc_block.json 9c9e40ffd41ce46c65113080a92ff9b4f27e5fab data/create/recipes/crafting/materials/red_sand_paper.json @@ -4116,7 +4145,7 @@ fe1d69b1e33d5748eb3c0ea732b8d67e2d612203 data/create/recipes/crafting/materials/ 0b7acc249bed992387aa9702a2c05836ecf584df data/create/recipes/crafting/schematics/empty_schematic.json 5c47ac2e2b596439a684126fef7265f13de2379b data/create/recipes/crafting/schematics/schematic_and_quill.json 9fb943be76c51a24aa9d8a09de5b7bd17b44ab08 data/create/recipes/crafting/schematics/schematic_table.json -1a810338ea15ab5ac2f37e87579c56f72b2b371b data/create/recipes/crafting/schematics/schematicannon.json +c4a88166bb906a88b986c37a002057a86d2ece00 data/create/recipes/crafting/schematics/schematicannon.json 3b0989052d6b500fad9fa9adc26f6a012182155c data/create/recipes/crimsite_pillar_from_crimsite_stonecutting.json c60542c99008f7abecdd03c47137b51e20a4747b data/create/recipes/crimsite_pillar_from_stone_types_crimsite_stonecutting.json 4629d9a1a8a98a6b5b8b82c4507ca9e321c3a210 data/create/recipes/crimson_window.json @@ -4565,6 +4594,8 @@ f2c317e03ac4d42fb631e1625607061e10c480fe data/create/recipes/dark_oak_window.jso d9dbae6e237eb38e53a619a0f1b339fca7c59b4d data/create/recipes/dark_oak_window_pane.json 3a0fa13409b2c55e98bf99bf96261033adb3e4a6 data/create/recipes/deepslate_pillar_from_deepslate_stonecutting.json 1feb1de96d35277e2c8b6eee6f572e59105f8463 data/create/recipes/deepslate_pillar_from_stone_types_deepslate_stonecutting.json +b826def1e64ec25c2bcecb7260a2c44ed2f73656 data/create/recipes/deploying/cogwheel.json +254a515061028eab180c2e818258608c0686a340 data/create/recipes/deploying/large_cogwheel.json e2f4c7f74d1a6e354bb6727f56b1d19e6e32420e data/create/recipes/deploying/waxed_copper_block_from_adding_wax.json ade2adabcc76d3c17bdf008f3b61b9a71ff9b2f4 data/create/recipes/deploying/waxed_copper_shingle_slab_from_adding_wax.json d7a950358a62df498d89dd5730a0bd8f0240773c data/create/recipes/deploying/waxed_copper_shingle_stairs_from_adding_wax.json @@ -4661,6 +4692,7 @@ b6b72466615bcce50e31238ee78b7f6dcee1bbfe data/create/recipes/item_application/br 62eb2897c263fdf2d2d24e5279f8b4c0f9acd101 data/create/recipes/item_application/brass_casing_from_wood.json 320cf6df9446236f42799aafbfad7a46cd425cb3 data/create/recipes/item_application/copper_casing_from_log.json 4cf9c45c5ffae0600d3c305818aa05e7ecf7b7b1 data/create/recipes/item_application/copper_casing_from_wood.json +5f44bb9745023db87264b98a416e7802d9b7e1b0 data/create/recipes/item_application/railway_casing.json c3ccd16b7fe9878cc734d699b4c8b219ad556f46 data/create/recipes/jungle_window.json 76dab06d0bda78c4247f76d6a849e1aa083fceb1 data/create/recipes/jungle_window_pane.json fc00b0e336c45698df1f94ad470f9941e19b0e24 data/create/recipes/layered_andesite_from_andesite_stonecutting.json @@ -4695,7 +4727,6 @@ c2e15ac0c9109bad3face6d13efc32d7116b4c25 data/create/recipes/limestone_pillar_fr 484e6c52ad534d2fa2bbacb7c03a349ae68d0803 data/create/recipes/limestone_pillar_from_stone_types_limestone_stonecutting.json 66674d07de63aada0991d2fdff07e22e00450135 data/create/recipes/mechanical_crafting/crushing_wheel.json 599f8b87c24c131350ba7ceb69a0c8b9829c62bc data/create/recipes/mechanical_crafting/extendo_grip.json -f26ed47c10cc63613759b0f8ae4ef349000de60d data/create/recipes/mechanical_crafting/flywheel.json fa356eb82c08339bb0064017d88b1e5b053fd4ff data/create/recipes/mechanical_crafting/potato_cannon.json 7e695ab2b684c23968a23765072603be5da13d75 data/create/recipes/mechanical_crafting/wand_of_symmetry.json 98f877bf8f3f8a686fc6cf7479a0fba5744248ce data/create/recipes/milling/allium.json @@ -4944,9 +4975,9 @@ f6e2fb5725f3730d01fae4a2b1a04d11095eab5f data/create/recipes/scorchia_pillar_fro 66e8559dc15ce13042bd007247e2851022362b9e data/create/recipes/scorchia_pillar_from_stone_types_scorchia_stonecutting.json 2e0ecbd3619f080d0fc6fe48307c5a5bcc2e91b4 data/create/recipes/scoria_pillar_from_scoria_stonecutting.json d6e16599de7424513e1457b07acb6370815d2bd7 data/create/recipes/scoria_pillar_from_stone_types_scoria_stonecutting.json -1b6bec69b00c44e74951973d69caae53d85383cb data/create/recipes/sequenced_assembly/cogwheel.json -3bc3d13856f9ab8ccc47c3188cfd839f6db2359b data/create/recipes/sequenced_assembly/large_cogwheel.json b49a0da57a179edc087eee224221ded22fd1be01 data/create/recipes/sequenced_assembly/precision_mechanism.json +41320844fd65366d098929d5a438d679af023d1d data/create/recipes/sequenced_assembly/reinforced_sheet.json +7610e0be633b1ade7ae39db3dbbfe1bd14aa333a data/create/recipes/sequenced_assembly/track.json 5e7648d55555c263539a2696b8d1f8d352a71dc9 data/create/recipes/small_andesite_brick_slab.json 180c1ca843163ef4ed3701ac93e3eac060ad2cc4 data/create/recipes/small_andesite_brick_slab_from_andesite_stonecutting.json 4734a4ed04708b841f530ea95f23214e3b5d0ea4 data/create/recipes/small_andesite_brick_slab_from_stone_types_andesite_stonecutting.json @@ -5256,6 +5287,7 @@ d99d5c67bdffff60789a19bd51a5c5267c75e0a4 data/create/tags/items/casing.json 4480f211f4a37bfee193eba945bc9f5a8d2c6e34 data/create/tags/items/crushed_ores.json bce28787b0271382842823d04a977912a88b01c2 data/create/tags/items/sandpaper.json 6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/items/seats.json +0f4276a6b7da5f4dee8909802e6717a4c97f0555 data/create/tags/items/sleepers.json e15f9670cc533d7213b8335c06c0bcf2ecbeced2 data/create/tags/items/stone_types/andesite.json 36dfa31df7c27919a4cfcb7cf7ac7a21e6b3fa54 data/create/tags/items/stone_types/asurine.json 3df3af195de5c9f398600e0532fc4faa4ec82c50 data/create/tags/items/stone_types/calcite.json @@ -5309,6 +5341,7 @@ d5ea262a0f5fb210612d22521818e26cf08e591a data/forge/tags/items/ores_in_ground/st c3dab5fe379bc1b7b10d4a0ba7009eee1b75a27c data/forge/tags/items/plates/copper.json fb9bfb4c84ed9cf2da8c4b2fbc4cd4d9f37d3016 data/forge/tags/items/plates/gold.json 04d947ed7a5066f3cfe75a8dc564fe2dca8a9c93 data/forge/tags/items/plates/iron.json +61bfa521759124486a215820e9fbcfd3418ff1f5 data/forge/tags/items/plates/obsidian.json dc96331cded39b2d2f24853f4dd6c1f6f3863115 data/forge/tags/items/raw_materials.json dc96331cded39b2d2f24853f4dd6c1f6f3863115 data/forge/tags/items/raw_materials/zinc.json 66065a698fca917446a0fb766593dbcc77fabeac data/forge/tags/items/storage_blocks.json diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index 1de6571cf..93fef699d 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -608,9 +608,8 @@ "item.create.handheld_worldshaper": "\u0279\u01DDd\u0250\u0265sp\u05DF\u0279oM \u01DD\u028C\u0131\u0287\u0250\u01DD\u0279\u0186", "item.create.honey_bucket": "\u0287\u01DD\u029E\u0254n\u15FA \u028E\u01DDuoH", "item.create.honeyed_apple": "\u01DD\u05DFdd\u2C6F p\u01DD\u028E\u01DDuoH", - "item.create.incomplete_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI", - "item.create.incomplete_large_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 \u01DDb\u0279\u0250\uA780 \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI", "item.create.incomplete_precision_mechanism": "\u026Fs\u0131u\u0250\u0265\u0254\u01DDW uo\u0131s\u0131\u0254\u01DD\u0279\u0500 \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI", + "item.create.incomplete_track": "\u029E\u0254\u0250\u0279\u27D8 \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI", "item.create.iron_sheet": "\u0287\u01DD\u01DD\u0265S uo\u0279I", "item.create.linked_controller": "\u0279\u01DD\u05DF\u05DFo\u0279\u0287uo\u0186 p\u01DD\u029Eu\u0131\uA780", "item.create.minecart_contraption": "uo\u0131\u0287d\u0250\u0279\u0287uo\u0186 \u0287\u0279\u0250\u0254\u01DDu\u0131W", @@ -623,6 +622,7 @@ "item.create.raw_zinc": "\u0254u\u0131Z \u028D\u0250\u1D1A", "item.create.red_sand_paper": "\u0279\u01DDd\u0250\u0500 pu\u0250S p\u01DD\u1D1A", "item.create.refined_radiance": "\u01DD\u0254u\u0250\u0131p\u0250\u1D1A p\u01DDu\u0131\u025F\u01DD\u1D1A", + "item.create.reinforced_sheet": "\u0287\u01DD\u01DD\u0265S p\u01DD\u0254\u0279o\u025Fu\u0131\u01DD\u1D1A", "item.create.rose_quartz": "z\u0287\u0279\u0250n\u1F49 \u01DDso\u1D1A", "item.create.sand_paper": "\u0279\u01DDd\u0250\u0500 pu\u0250S", "item.create.schedule": "\u01DD\u05DFnp\u01DD\u0265\u0254S u\u0131\u0250\u0279\u27D8", @@ -632,6 +632,7 @@ "item.create.super_glue": "\u01DDn\u05DF\u2141 \u0279\u01DDdnS", "item.create.sweet_roll": "\u05DF\u05DFo\u1D1A \u0287\u01DD\u01DD\u028DS", "item.create.tree_fertilizer": "\u0279\u01DDz\u0131\u05DF\u0131\u0287\u0279\u01DD\u2132 \u01DD\u01DD\u0279\u27D8", + "item.create.unprocessed_obsidian_sheet": "\u0287\u01DD\u01DD\u0265S u\u0250\u0131p\u0131sqO p\u01DDss\u01DD\u0254o\u0279du\u2229", "item.create.vertical_gearbox": "xoq\u0279\u0250\u01DD\u2141 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B", "item.create.wand_of_symmetry": "\u028E\u0279\u0287\u01DD\u026F\u026F\u028ES \u025FO pu\u0250M", "item.create.wheat_flour": "\u0279no\u05DF\u2132 \u0287\u0250\u01DD\u0265M", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 57137bcdb..4f2a63368 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -615,9 +615,8 @@ "item.create.handheld_worldshaper": "Creative Worldshaper", "item.create.honey_bucket": "Honey Bucket", "item.create.honeyed_apple": "Honeyed Apple", - "item.create.incomplete_cogwheel": "Incomplete Cogwheel", - "item.create.incomplete_large_cogwheel": "Incomplete Large Cogwheel", "item.create.incomplete_precision_mechanism": "Incomplete Precision Mechanism", + "item.create.incomplete_track": "Incomplete Track", "item.create.iron_sheet": "Iron Sheet", "item.create.linked_controller": "Linked Controller", "item.create.minecart_contraption": "Minecart Contraption", @@ -630,6 +629,7 @@ "item.create.raw_zinc": "Raw Zinc", "item.create.red_sand_paper": "Red Sand Paper", "item.create.refined_radiance": "Refined Radiance", + "item.create.reinforced_sheet": "Reinforced Sheet", "item.create.rose_quartz": "Rose Quartz", "item.create.sand_paper": "Sand Paper", "item.create.schedule": "Train Schedule", @@ -639,6 +639,7 @@ "item.create.super_glue": "Super Glue", "item.create.sweet_roll": "Sweet Roll", "item.create.tree_fertilizer": "Tree Fertilizer", + "item.create.unprocessed_obsidian_sheet": "Unprocessed Obsidian Sheet", "item.create.vertical_gearbox": "Vertical Gearbox", "item.create.wand_of_symmetry": "Wand Of Symmetry", "item.create.wheat_flour": "Wheat Flour", @@ -1446,6 +1447,7 @@ "create.train_assembly.no_controls": "At least one forward-facing controls block needs to be mounted on the train", "create.train_assembly.sideways_controls": "A mounted controls block is facing sideways", "create.train_assembly.bogey_created": "Bogey created. Click again to cycle type", + "create.train_assembly.requires_casing": "Use Railway Casing to create bogeys on tracks", "create.track_target.set": "Targeted track selected", "create.track_target.success": "Successfully bound to targeted track", diff --git a/src/generated/resources/assets/create/lang/unfinished/de_de.json b/src/generated/resources/assets/create/lang/unfinished/de_de.json index 08a868df0..cffc73a60 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1543", + "_": "Missing Localizations: 1545", "_": "->------------------------] Game Elements [------------------------<-", @@ -616,9 +616,8 @@ "item.create.handheld_worldshaper": "Geländeformer", "item.create.honey_bucket": "Honigeimer", "item.create.honeyed_apple": "Honigapfel", - "item.create.incomplete_cogwheel": "UNLOCALIZED: Incomplete Cogwheel", - "item.create.incomplete_large_cogwheel": "UNLOCALIZED: Incomplete Large Cogwheel", "item.create.incomplete_precision_mechanism": "UNLOCALIZED: Incomplete Precision Mechanism", + "item.create.incomplete_track": "UNLOCALIZED: Incomplete Track", "item.create.iron_sheet": "Eisenblech", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", "item.create.minecart_contraption": "Loren Vorrichtung", @@ -631,6 +630,7 @@ "item.create.raw_zinc": "UNLOCALIZED: Raw Zinc", "item.create.red_sand_paper": "Rotes Schmirgelpapier", "item.create.refined_radiance": "Raffinierter Glanz", + "item.create.reinforced_sheet": "UNLOCALIZED: Reinforced Sheet", "item.create.rose_quartz": "Rosenquarz", "item.create.sand_paper": "Schmirgelpapier", "item.create.schedule": "UNLOCALIZED: Train Schedule", @@ -640,6 +640,7 @@ "item.create.super_glue": "Superkleber", "item.create.sweet_roll": "Rosinenschnecke", "item.create.tree_fertilizer": "Baumdünger", + "item.create.unprocessed_obsidian_sheet": "UNLOCALIZED: Unprocessed Obsidian Sheet", "item.create.vertical_gearbox": "Vertikales Getriebe", "item.create.wand_of_symmetry": "Symmetriestab", "item.create.wheat_flour": "Weizenmehl", @@ -1447,6 +1448,7 @@ "create.train_assembly.no_controls": "UNLOCALIZED: At least one forward-facing controls block needs to be mounted on the train", "create.train_assembly.sideways_controls": "UNLOCALIZED: A mounted controls block is facing sideways", "create.train_assembly.bogey_created": "UNLOCALIZED: Bogey created. Click again to cycle type", + "create.train_assembly.requires_casing": "UNLOCALIZED: Use Railway Casing to create bogeys on tracks", "create.track_target.set": "UNLOCALIZED: Targeted track selected", "create.track_target.success": "UNLOCALIZED: Successfully bound to targeted track", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_cl.json b/src/generated/resources/assets/create/lang/unfinished/es_cl.json index d2b3df134..873ae7160 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_cl.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_cl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 565", + "_": "Missing Localizations: 569", "_": "->------------------------] Game Elements [------------------------<-", @@ -616,9 +616,8 @@ "item.create.handheld_worldshaper": "Forma Mundos del Creativo", "item.create.honey_bucket": "Balde de Miel", "item.create.honeyed_apple": "Manzana Enmielada", - "item.create.incomplete_cogwheel": "Engranaje Incompleto", - "item.create.incomplete_large_cogwheel": "Engranaje Grande Incompleto", "item.create.incomplete_precision_mechanism": "Mecanismo de Precisión Incompleto", + "item.create.incomplete_track": "UNLOCALIZED: Incomplete Track", "item.create.iron_sheet": "Plancha de Hierro", "item.create.linked_controller": "Controlador Vinculable", "item.create.minecart_contraption": "Contrapción de Vagoneta", @@ -631,6 +630,7 @@ "item.create.raw_zinc": "UNLOCALIZED: Raw Zinc", "item.create.red_sand_paper": "Papel de Arena Roja", "item.create.refined_radiance": "Radiancia Refinada", + "item.create.reinforced_sheet": "UNLOCALIZED: Reinforced Sheet", "item.create.rose_quartz": "Cuarzo Rosa", "item.create.sand_paper": "Papel de Arena", "item.create.schedule": "UNLOCALIZED: Train Schedule", @@ -640,6 +640,7 @@ "item.create.super_glue": "La Gotita", "item.create.sweet_roll": "Rollito Dulce", "item.create.tree_fertilizer": "Fertilizante Arbóreo", + "item.create.unprocessed_obsidian_sheet": "UNLOCALIZED: Unprocessed Obsidian Sheet", "item.create.vertical_gearbox": "Caja de Engranajes Vertical", "item.create.wand_of_symmetry": "Vara de Simetría", "item.create.wheat_flour": "Harina de Trigo", @@ -1447,6 +1448,7 @@ "create.train_assembly.no_controls": "UNLOCALIZED: At least one forward-facing controls block needs to be mounted on the train", "create.train_assembly.sideways_controls": "UNLOCALIZED: A mounted controls block is facing sideways", "create.train_assembly.bogey_created": "UNLOCALIZED: Bogey created. Click again to cycle type", + "create.train_assembly.requires_casing": "UNLOCALIZED: Use Railway Casing to create bogeys on tracks", "create.track_target.set": "UNLOCALIZED: Targeted track selected", "create.track_target.success": "UNLOCALIZED: Successfully bound to targeted track", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_es.json b/src/generated/resources/assets/create/lang/unfinished/es_es.json index ceee232d1..576356ab0 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_es.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_es.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 236", + "_": "Missing Localizations: 240", "_": "->------------------------] Game Elements [------------------------<-", @@ -616,9 +616,8 @@ "item.create.handheld_worldshaper": "Moldeador de mundos", "item.create.honey_bucket": "Cubo con miel", "item.create.honeyed_apple": "Manzana con miel", - "item.create.incomplete_cogwheel": "Engranaje incompleto", - "item.create.incomplete_large_cogwheel": "Engranaje grande incompleto", "item.create.incomplete_precision_mechanism": "Mecanismo de precisión incompleto", + "item.create.incomplete_track": "UNLOCALIZED: Incomplete Track", "item.create.iron_sheet": "Lámina de hierro", "item.create.linked_controller": "Controlador enlazado", "item.create.minecart_contraption": "Artefacto móvil de vagoneta", @@ -631,6 +630,7 @@ "item.create.raw_zinc": "Cinc en bruto", "item.create.red_sand_paper": "Papel de lija rojo", "item.create.refined_radiance": "Resplandor refinado", + "item.create.reinforced_sheet": "UNLOCALIZED: Reinforced Sheet", "item.create.rose_quartz": "Cuarzo rosado", "item.create.sand_paper": "Papel de lija", "item.create.schedule": "UNLOCALIZED: Train Schedule", @@ -640,6 +640,7 @@ "item.create.super_glue": "Pegamento", "item.create.sweet_roll": "Ensaimada", "item.create.tree_fertilizer": "Fertilizante para árboles", + "item.create.unprocessed_obsidian_sheet": "UNLOCALIZED: Unprocessed Obsidian Sheet", "item.create.vertical_gearbox": "Caja de transmisión vertical", "item.create.wand_of_symmetry": "Varita de simetría", "item.create.wheat_flour": "Harina de trigo", @@ -1447,6 +1448,7 @@ "create.train_assembly.no_controls": "UNLOCALIZED: At least one forward-facing controls block needs to be mounted on the train", "create.train_assembly.sideways_controls": "UNLOCALIZED: A mounted controls block is facing sideways", "create.train_assembly.bogey_created": "UNLOCALIZED: Bogey created. Click again to cycle type", + "create.train_assembly.requires_casing": "UNLOCALIZED: Use Railway Casing to create bogeys on tracks", "create.track_target.set": "UNLOCALIZED: Targeted track selected", "create.track_target.success": "UNLOCALIZED: Successfully bound to targeted track", diff --git a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json index 17be261dc..aa5ee2690 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1805", + "_": "Missing Localizations: 1807", "_": "->------------------------] Game Elements [------------------------<-", @@ -616,9 +616,8 @@ "item.create.handheld_worldshaper": "Térraformeur portable", "item.create.honey_bucket": "Seau de miel", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", - "item.create.incomplete_cogwheel": "UNLOCALIZED: Incomplete Cogwheel", - "item.create.incomplete_large_cogwheel": "UNLOCALIZED: Incomplete Large Cogwheel", "item.create.incomplete_precision_mechanism": "UNLOCALIZED: Incomplete Precision Mechanism", + "item.create.incomplete_track": "UNLOCALIZED: Incomplete Track", "item.create.iron_sheet": "Plaque de Fer", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", "item.create.minecart_contraption": "Engin de wagonnet", @@ -631,6 +630,7 @@ "item.create.raw_zinc": "UNLOCALIZED: Raw Zinc", "item.create.red_sand_paper": "Papier de verre rouge", "item.create.refined_radiance": "Éclat raffiné", + "item.create.reinforced_sheet": "UNLOCALIZED: Reinforced Sheet", "item.create.rose_quartz": "Quartz rose", "item.create.sand_paper": "Papier de verre", "item.create.schedule": "UNLOCALIZED: Train Schedule", @@ -640,6 +640,7 @@ "item.create.super_glue": "Colle extra-forte", "item.create.sweet_roll": "UNLOCALIZED: Sweet Roll", "item.create.tree_fertilizer": "Engrais pour arbres", + "item.create.unprocessed_obsidian_sheet": "UNLOCALIZED: Unprocessed Obsidian Sheet", "item.create.vertical_gearbox": "Boîte de transfert verticale", "item.create.wand_of_symmetry": "Bâton de symétrie", "item.create.wheat_flour": "Farine", @@ -1447,6 +1448,7 @@ "create.train_assembly.no_controls": "UNLOCALIZED: At least one forward-facing controls block needs to be mounted on the train", "create.train_assembly.sideways_controls": "UNLOCALIZED: A mounted controls block is facing sideways", "create.train_assembly.bogey_created": "UNLOCALIZED: Bogey created. Click again to cycle type", + "create.train_assembly.requires_casing": "UNLOCALIZED: Use Railway Casing to create bogeys on tracks", "create.track_target.set": "UNLOCALIZED: Targeted track selected", "create.track_target.success": "UNLOCALIZED: Successfully bound to targeted track", diff --git a/src/generated/resources/assets/create/lang/unfinished/it_it.json b/src/generated/resources/assets/create/lang/unfinished/it_it.json index 0086c06ca..d71bcad7f 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1494", + "_": "Missing Localizations: 1496", "_": "->------------------------] Game Elements [------------------------<-", @@ -616,9 +616,8 @@ "item.create.handheld_worldshaper": "Plasmatore del mondo portatile", "item.create.honey_bucket": "Secchio di miele", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", - "item.create.incomplete_cogwheel": "UNLOCALIZED: Incomplete Cogwheel", - "item.create.incomplete_large_cogwheel": "UNLOCALIZED: Incomplete Large Cogwheel", "item.create.incomplete_precision_mechanism": "UNLOCALIZED: Incomplete Precision Mechanism", + "item.create.incomplete_track": "UNLOCALIZED: Incomplete Track", "item.create.iron_sheet": "Lamiera di ferro", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", "item.create.minecart_contraption": "Contrazione per carrello da miniera", @@ -631,6 +630,7 @@ "item.create.raw_zinc": "UNLOCALIZED: Raw Zinc", "item.create.red_sand_paper": "Carta vetrata rossa", "item.create.refined_radiance": "Radiance raffinata", + "item.create.reinforced_sheet": "UNLOCALIZED: Reinforced Sheet", "item.create.rose_quartz": "Quarzo rosa", "item.create.sand_paper": "Carta vetrata", "item.create.schedule": "UNLOCALIZED: Train Schedule", @@ -640,6 +640,7 @@ "item.create.super_glue": "Super colla", "item.create.sweet_roll": "UNLOCALIZED: Sweet Roll", "item.create.tree_fertilizer": "Fertilizzante per alberi", + "item.create.unprocessed_obsidian_sheet": "UNLOCALIZED: Unprocessed Obsidian Sheet", "item.create.vertical_gearbox": "Riduttore verticale", "item.create.wand_of_symmetry": "Asta di simmetria", "item.create.wheat_flour": "Farina di grano", @@ -1447,6 +1448,7 @@ "create.train_assembly.no_controls": "UNLOCALIZED: At least one forward-facing controls block needs to be mounted on the train", "create.train_assembly.sideways_controls": "UNLOCALIZED: A mounted controls block is facing sideways", "create.train_assembly.bogey_created": "UNLOCALIZED: Bogey created. Click again to cycle type", + "create.train_assembly.requires_casing": "UNLOCALIZED: Use Railway Casing to create bogeys on tracks", "create.track_target.set": "UNLOCALIZED: Targeted track selected", "create.track_target.success": "UNLOCALIZED: Successfully bound to targeted track", diff --git a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json index ada872fd5..239e0b249 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 231", + "_": "Missing Localizations: 235", "_": "->------------------------] Game Elements [------------------------<-", @@ -616,9 +616,8 @@ "item.create.handheld_worldshaper": "携帯型ワールドシェーパー", "item.create.honey_bucket": "ハチミツ入りバケツ", "item.create.honeyed_apple": "リンゴのハチミツかけ", - "item.create.incomplete_cogwheel": "組み立て中の歯車", - "item.create.incomplete_large_cogwheel": "組み立て中の大きな歯車", "item.create.incomplete_precision_mechanism": "組み立て中の精密機構", + "item.create.incomplete_track": "UNLOCALIZED: Incomplete Track", "item.create.iron_sheet": "鉄板", "item.create.linked_controller": "リンクコントローラー", "item.create.minecart_contraption": "からくりトロッコ", @@ -631,6 +630,7 @@ "item.create.raw_zinc": "亜鉛の原石", "item.create.red_sand_paper": "赤い紙やすり", "item.create.refined_radiance": "高貴な光輝", + "item.create.reinforced_sheet": "UNLOCALIZED: Reinforced Sheet", "item.create.rose_quartz": "ローズクォーツ", "item.create.sand_paper": "紙やすり", "item.create.schedule": "UNLOCALIZED: Train Schedule", @@ -640,6 +640,7 @@ "item.create.super_glue": "超粘着剤", "item.create.sweet_roll": "スイートロール", "item.create.tree_fertilizer": "樹木の肥料", + "item.create.unprocessed_obsidian_sheet": "UNLOCALIZED: Unprocessed Obsidian Sheet", "item.create.vertical_gearbox": "垂直ギアボックス", "item.create.wand_of_symmetry": "対称の杖", "item.create.wheat_flour": "小麦粉", @@ -1447,6 +1448,7 @@ "create.train_assembly.no_controls": "UNLOCALIZED: At least one forward-facing controls block needs to be mounted on the train", "create.train_assembly.sideways_controls": "UNLOCALIZED: A mounted controls block is facing sideways", "create.train_assembly.bogey_created": "UNLOCALIZED: Bogey created. Click again to cycle type", + "create.train_assembly.requires_casing": "UNLOCALIZED: Use Railway Casing to create bogeys on tracks", "create.track_target.set": "UNLOCALIZED: Targeted track selected", "create.track_target.success": "UNLOCALIZED: Successfully bound to targeted track", diff --git a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json index 993f2fc6d..54b15a6ac 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 231", + "_": "Missing Localizations: 235", "_": "->------------------------] Game Elements [------------------------<-", @@ -616,9 +616,8 @@ "item.create.handheld_worldshaper": "크리에이티브 세계편집기", "item.create.honey_bucket": "꿀 양동이", "item.create.honeyed_apple": "꿀 바른 사과", - "item.create.incomplete_cogwheel": "미완성된 톱니바퀴", - "item.create.incomplete_large_cogwheel": "미완성된 큰 톱니바퀴", "item.create.incomplete_precision_mechanism": "미완성된 정밀 기계장치", + "item.create.incomplete_track": "UNLOCALIZED: Incomplete Track", "item.create.iron_sheet": "철 판", "item.create.linked_controller": "레드스톤 링크 조작기", "item.create.minecart_contraption": "광산 수레 구조물", @@ -631,6 +630,7 @@ "item.create.raw_zinc": "아연 원석", "item.create.red_sand_paper": "붉은 사포", "item.create.refined_radiance": "정제된 광채", + "item.create.reinforced_sheet": "UNLOCALIZED: Reinforced Sheet", "item.create.rose_quartz": "장밋빛 석영", "item.create.sand_paper": "사포", "item.create.schedule": "UNLOCALIZED: Train Schedule", @@ -640,6 +640,7 @@ "item.create.super_glue": "강력 접착제", "item.create.sweet_roll": "롤빵", "item.create.tree_fertilizer": "나무 비료", + "item.create.unprocessed_obsidian_sheet": "UNLOCALIZED: Unprocessed Obsidian Sheet", "item.create.vertical_gearbox": "수직 기어박스", "item.create.wand_of_symmetry": "대칭의 지팡이", "item.create.wheat_flour": "밀가루", @@ -1447,6 +1448,7 @@ "create.train_assembly.no_controls": "UNLOCALIZED: At least one forward-facing controls block needs to be mounted on the train", "create.train_assembly.sideways_controls": "UNLOCALIZED: A mounted controls block is facing sideways", "create.train_assembly.bogey_created": "UNLOCALIZED: Bogey created. Click again to cycle type", + "create.train_assembly.requires_casing": "UNLOCALIZED: Use Railway Casing to create bogeys on tracks", "create.track_target.set": "UNLOCALIZED: Targeted track selected", "create.track_target.success": "UNLOCALIZED: Successfully bound to targeted track", diff --git a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json index f30238169..76aa565e3 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 2157", + "_": "Missing Localizations: 2159", "_": "->------------------------] Game Elements [------------------------<-", @@ -616,9 +616,8 @@ "item.create.handheld_worldshaper": "UNLOCALIZED: Creative Worldshaper", "item.create.honey_bucket": "UNLOCALIZED: Honey Bucket", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", - "item.create.incomplete_cogwheel": "UNLOCALIZED: Incomplete Cogwheel", - "item.create.incomplete_large_cogwheel": "UNLOCALIZED: Incomplete Large Cogwheel", "item.create.incomplete_precision_mechanism": "UNLOCALIZED: Incomplete Precision Mechanism", + "item.create.incomplete_track": "UNLOCALIZED: Incomplete Track", "item.create.iron_sheet": "IJzeren Platen", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", "item.create.minecart_contraption": "UNLOCALIZED: Minecart Contraption", @@ -631,6 +630,7 @@ "item.create.raw_zinc": "UNLOCALIZED: Raw Zinc", "item.create.red_sand_paper": "UNLOCALIZED: Red Sand Paper", "item.create.refined_radiance": "UNLOCALIZED: Refined Radiance", + "item.create.reinforced_sheet": "UNLOCALIZED: Reinforced Sheet", "item.create.rose_quartz": "Roze Kwarts", "item.create.sand_paper": "UNLOCALIZED: Sand Paper", "item.create.schedule": "UNLOCALIZED: Train Schedule", @@ -640,6 +640,7 @@ "item.create.super_glue": "UNLOCALIZED: Super Glue", "item.create.sweet_roll": "UNLOCALIZED: Sweet Roll", "item.create.tree_fertilizer": "Boom mest", + "item.create.unprocessed_obsidian_sheet": "UNLOCALIZED: Unprocessed Obsidian Sheet", "item.create.vertical_gearbox": "UNLOCALIZED: Vertical Gearbox", "item.create.wand_of_symmetry": "Symmetrie Staf", "item.create.wheat_flour": "UNLOCALIZED: Wheat Flour", @@ -1447,6 +1448,7 @@ "create.train_assembly.no_controls": "UNLOCALIZED: At least one forward-facing controls block needs to be mounted on the train", "create.train_assembly.sideways_controls": "UNLOCALIZED: A mounted controls block is facing sideways", "create.train_assembly.bogey_created": "UNLOCALIZED: Bogey created. Click again to cycle type", + "create.train_assembly.requires_casing": "UNLOCALIZED: Use Railway Casing to create bogeys on tracks", "create.track_target.set": "UNLOCALIZED: Targeted track selected", "create.track_target.success": "UNLOCALIZED: Successfully bound to targeted track", diff --git a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json index 9b2a86f2b..fa88ed0c4 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json +++ b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 604", + "_": "Missing Localizations: 608", "_": "->------------------------] Game Elements [------------------------<-", @@ -616,9 +616,8 @@ "item.create.handheld_worldshaper": "Ręczny kształter", "item.create.honey_bucket": "Wiadro miodu", "item.create.honeyed_apple": "Jabłko w miodzie", - "item.create.incomplete_cogwheel": "Niedokończone koło zębate", - "item.create.incomplete_large_cogwheel": "Niedokończone duże koło zębate", "item.create.incomplete_precision_mechanism": "Niedokończony precyzyjny mechanizm", + "item.create.incomplete_track": "UNLOCALIZED: Incomplete Track", "item.create.iron_sheet": "Arkusz żelaza", "item.create.linked_controller": "Zdalny sterownik", "item.create.minecart_contraption": "Maszyna w wagoniku", @@ -631,6 +630,7 @@ "item.create.raw_zinc": "UNLOCALIZED: Raw Zinc", "item.create.red_sand_paper": "Czerwony papier ścierny", "item.create.refined_radiance": "Świetlisty materiał", + "item.create.reinforced_sheet": "UNLOCALIZED: Reinforced Sheet", "item.create.rose_quartz": "Różowy kwarc", "item.create.sand_paper": "Papier ścierny", "item.create.schedule": "UNLOCALIZED: Train Schedule", @@ -640,6 +640,7 @@ "item.create.super_glue": "Super Glue", "item.create.sweet_roll": "Słodka bułka", "item.create.tree_fertilizer": "Nawóz do drzew", + "item.create.unprocessed_obsidian_sheet": "UNLOCALIZED: Unprocessed Obsidian Sheet", "item.create.vertical_gearbox": "Pionowa przekładnia", "item.create.wand_of_symmetry": "Różdżka symetrii", "item.create.wheat_flour": "Mąka pszenna", @@ -1447,6 +1448,7 @@ "create.train_assembly.no_controls": "UNLOCALIZED: At least one forward-facing controls block needs to be mounted on the train", "create.train_assembly.sideways_controls": "UNLOCALIZED: A mounted controls block is facing sideways", "create.train_assembly.bogey_created": "UNLOCALIZED: Bogey created. Click again to cycle type", + "create.train_assembly.requires_casing": "UNLOCALIZED: Use Railway Casing to create bogeys on tracks", "create.track_target.set": "UNLOCALIZED: Targeted track selected", "create.track_target.success": "UNLOCALIZED: Successfully bound to targeted track", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_br.json b/src/generated/resources/assets/create/lang/unfinished/pt_br.json index 995157047..cdb37a51e 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1405", + "_": "Missing Localizations: 1409", "_": "->------------------------] Game Elements [------------------------<-", @@ -616,9 +616,8 @@ "item.create.handheld_worldshaper": "Terraformador de Mundo Criativo", "item.create.honey_bucket": "Balde de Mel", "item.create.honeyed_apple": "Maçã com Cobertura de Mel", - "item.create.incomplete_cogwheel": "Roda Dentada Incompleta", - "item.create.incomplete_large_cogwheel": "Roda Dentada Grande Incompleta", "item.create.incomplete_precision_mechanism": "Mecanismo de Precisão", + "item.create.incomplete_track": "UNLOCALIZED: Incomplete Track", "item.create.iron_sheet": "Chapa de Ferro", "item.create.linked_controller": "Controle conectado", "item.create.minecart_contraption": "Engenhoca de Carrinho de Mina", @@ -631,6 +630,7 @@ "item.create.raw_zinc": "Zinco bruto", "item.create.red_sand_paper": "Lixa Vermelha", "item.create.refined_radiance": "Luz Refinada", + "item.create.reinforced_sheet": "UNLOCALIZED: Reinforced Sheet", "item.create.rose_quartz": "Quartzo Rosa", "item.create.sand_paper": "Lixa", "item.create.schedule": "UNLOCALIZED: Train Schedule", @@ -640,6 +640,7 @@ "item.create.super_glue": "Super Cola", "item.create.sweet_roll": "Rolinho Doce", "item.create.tree_fertilizer": "Fertilizante de Árvore", + "item.create.unprocessed_obsidian_sheet": "UNLOCALIZED: Unprocessed Obsidian Sheet", "item.create.vertical_gearbox": "Caixa de Transmissão Vertical", "item.create.wand_of_symmetry": "Varinha de Simetria", "item.create.wheat_flour": "Farinha de trigo", @@ -1447,6 +1448,7 @@ "create.train_assembly.no_controls": "UNLOCALIZED: At least one forward-facing controls block needs to be mounted on the train", "create.train_assembly.sideways_controls": "UNLOCALIZED: A mounted controls block is facing sideways", "create.train_assembly.bogey_created": "UNLOCALIZED: Bogey created. Click again to cycle type", + "create.train_assembly.requires_casing": "UNLOCALIZED: Use Railway Casing to create bogeys on tracks", "create.track_target.set": "UNLOCALIZED: Targeted track selected", "create.track_target.success": "UNLOCALIZED: Successfully bound to targeted track", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_pt.json b/src/generated/resources/assets/create/lang/unfinished/pt_pt.json index 3eb1572ca..7ffd3a1d5 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_pt.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_pt.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1777", + "_": "Missing Localizations: 1781", "_": "->------------------------] Game Elements [------------------------<-", @@ -616,9 +616,8 @@ "item.create.handheld_worldshaper": "Modelador de Mundo Criativo", "item.create.honey_bucket": "Balde de Mel", "item.create.honeyed_apple": "Maçã com Cobertura de Mel", - "item.create.incomplete_cogwheel": "Roda Dentada Incompleta", - "item.create.incomplete_large_cogwheel": "Roda Dentada Grande Incompleta", "item.create.incomplete_precision_mechanism": "Mecanismo de Precisão", + "item.create.incomplete_track": "UNLOCALIZED: Incomplete Track", "item.create.iron_sheet": "Chapa de Ferro", "item.create.linked_controller": "Controle conectado", "item.create.minecart_contraption": "Engenhoca de Carrino de Mina", @@ -631,6 +630,7 @@ "item.create.raw_zinc": "Zinco bruto", "item.create.red_sand_paper": "Lixa Vermelha", "item.create.refined_radiance": "Luz Refinada", + "item.create.reinforced_sheet": "UNLOCALIZED: Reinforced Sheet", "item.create.rose_quartz": "Quartzo Rosa", "item.create.sand_paper": "Lixa", "item.create.schedule": "UNLOCALIZED: Train Schedule", @@ -640,6 +640,7 @@ "item.create.super_glue": "Super Cola", "item.create.sweet_roll": "Rolinho Doce", "item.create.tree_fertilizer": "Fertilizante de Árvore", + "item.create.unprocessed_obsidian_sheet": "UNLOCALIZED: Unprocessed Obsidian Sheet", "item.create.vertical_gearbox": "Caixa de Transmissão Vertical", "item.create.wand_of_symmetry": "Varinha de Simetria", "item.create.wheat_flour": "Farinha de trigo", @@ -1447,6 +1448,7 @@ "create.train_assembly.no_controls": "UNLOCALIZED: At least one forward-facing controls block needs to be mounted on the train", "create.train_assembly.sideways_controls": "UNLOCALIZED: A mounted controls block is facing sideways", "create.train_assembly.bogey_created": "UNLOCALIZED: Bogey created. Click again to cycle type", + "create.train_assembly.requires_casing": "UNLOCALIZED: Use Railway Casing to create bogeys on tracks", "create.track_target.set": "UNLOCALIZED: Targeted track selected", "create.track_target.success": "UNLOCALIZED: Successfully bound to targeted track", diff --git a/src/generated/resources/assets/create/lang/unfinished/ro_ro.json b/src/generated/resources/assets/create/lang/unfinished/ro_ro.json index 1142f2f75..6314f9e19 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ro_ro.json +++ b/src/generated/resources/assets/create/lang/unfinished/ro_ro.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 232", + "_": "Missing Localizations: 236", "_": "->------------------------] Game Elements [------------------------<-", @@ -616,9 +616,8 @@ "item.create.handheld_worldshaper": "Modelator De Lume Creativ", "item.create.honey_bucket": "Găleată De Miere", "item.create.honeyed_apple": "Măr Cu Miere", - "item.create.incomplete_cogwheel": "Roată Dințată Incompletă", - "item.create.incomplete_large_cogwheel": "Roată Dințată Mare Incompletă", "item.create.incomplete_precision_mechanism": "Mecanism De Precizie Incomplet", + "item.create.incomplete_track": "UNLOCALIZED: Incomplete Track", "item.create.iron_sheet": "Placă De Fier", "item.create.linked_controller": "Controlor Legat", "item.create.minecart_contraption": "Invenție De Vagonet", @@ -631,6 +630,7 @@ "item.create.raw_zinc": "Zinc Brut", "item.create.red_sand_paper": "Șmirghel Roșu", "item.create.refined_radiance": "Radianță Rafinată", + "item.create.reinforced_sheet": "UNLOCALIZED: Reinforced Sheet", "item.create.rose_quartz": "Cuarț Roz", "item.create.sand_paper": "Șmirghel", "item.create.schedule": "UNLOCALIZED: Train Schedule", @@ -640,6 +640,7 @@ "item.create.super_glue": "Super-Lipici", "item.create.sweet_roll": "Rolă Dulce", "item.create.tree_fertilizer": "Fertilizator De Copaci", + "item.create.unprocessed_obsidian_sheet": "UNLOCALIZED: Unprocessed Obsidian Sheet", "item.create.vertical_gearbox": "Cutie De Viteze Verticală", "item.create.wand_of_symmetry": "Baghetă De Simetrie", "item.create.wheat_flour": "Făină De Grâu", @@ -1447,6 +1448,7 @@ "create.train_assembly.no_controls": "UNLOCALIZED: At least one forward-facing controls block needs to be mounted on the train", "create.train_assembly.sideways_controls": "UNLOCALIZED: A mounted controls block is facing sideways", "create.train_assembly.bogey_created": "UNLOCALIZED: Bogey created. Click again to cycle type", + "create.train_assembly.requires_casing": "UNLOCALIZED: Use Railway Casing to create bogeys on tracks", "create.track_target.set": "UNLOCALIZED: Targeted track selected", "create.track_target.success": "UNLOCALIZED: Successfully bound to targeted track", diff --git a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json index 33a6e1d2f..3cac7356f 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 609", + "_": "Missing Localizations: 613", "_": "->------------------------] Game Elements [------------------------<-", @@ -616,9 +616,8 @@ "item.create.handheld_worldshaper": "Ручной редактор мира", "item.create.honey_bucket": "Ведро мёда", "item.create.honeyed_apple": "Яблоко в меду", - "item.create.incomplete_cogwheel": "Незаконченная шестерня", - "item.create.incomplete_large_cogwheel": "Незаконченная большая шестерня", "item.create.incomplete_precision_mechanism": "Незаконченный механизм точности", + "item.create.incomplete_track": "UNLOCALIZED: Incomplete Track", "item.create.iron_sheet": "Железный лист", "item.create.linked_controller": "Контроллер связей", "item.create.minecart_contraption": "Вагонеточная штуковина", @@ -631,6 +630,7 @@ "item.create.raw_zinc": "UNLOCALIZED: Raw Zinc", "item.create.red_sand_paper": "Красная наждачная бумага", "item.create.refined_radiance": "Изысканное сияние", + "item.create.reinforced_sheet": "UNLOCALIZED: Reinforced Sheet", "item.create.rose_quartz": "Розовый кварц", "item.create.sand_paper": "Наждачная бумага", "item.create.schedule": "UNLOCALIZED: Train Schedule", @@ -640,6 +640,7 @@ "item.create.super_glue": "Супер-клей", "item.create.sweet_roll": "Сладкий рулет", "item.create.tree_fertilizer": "Удобрение для деревьев", + "item.create.unprocessed_obsidian_sheet": "UNLOCALIZED: Unprocessed Obsidian Sheet", "item.create.vertical_gearbox": "Вертикальная коробка передач", "item.create.wand_of_symmetry": "Жезл симметрии", "item.create.wheat_flour": "Пшеничная мука", @@ -1447,6 +1448,7 @@ "create.train_assembly.no_controls": "UNLOCALIZED: At least one forward-facing controls block needs to be mounted on the train", "create.train_assembly.sideways_controls": "UNLOCALIZED: A mounted controls block is facing sideways", "create.train_assembly.bogey_created": "UNLOCALIZED: Bogey created. Click again to cycle type", + "create.train_assembly.requires_casing": "UNLOCALIZED: Use Railway Casing to create bogeys on tracks", "create.track_target.set": "UNLOCALIZED: Targeted track selected", "create.track_target.success": "UNLOCALIZED: Successfully bound to targeted track", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json index d335b734f..197fe31e3 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 231", + "_": "Missing Localizations: 235", "_": "->------------------------] Game Elements [------------------------<-", @@ -616,9 +616,8 @@ "item.create.handheld_worldshaper": "手持式环境塑形器", "item.create.honey_bucket": "蜂蜜桶", "item.create.honeyed_apple": "蜜渍苹果", - "item.create.incomplete_cogwheel": "齿轮（半成品）", - "item.create.incomplete_large_cogwheel": "大齿轮（半成品）", "item.create.incomplete_precision_mechanism": "精密构件（半成品）", + "item.create.incomplete_track": "UNLOCALIZED: Incomplete Track", "item.create.iron_sheet": "铁板", "item.create.linked_controller": "无线红石遥控器", "item.create.minecart_contraption": "装配过的矿车", @@ -631,6 +630,7 @@ "item.create.raw_zinc": "粗锌", "item.create.red_sand_paper": "红沙砂纸", "item.create.refined_radiance": "光辉石", + "item.create.reinforced_sheet": "UNLOCALIZED: Reinforced Sheet", "item.create.rose_quartz": "玫瑰石英", "item.create.sand_paper": "砂纸", "item.create.schedule": "UNLOCALIZED: Train Schedule", @@ -640,6 +640,7 @@ "item.create.super_glue": "强力胶", "item.create.sweet_roll": "甜甜卷", "item.create.tree_fertilizer": "树木肥料", + "item.create.unprocessed_obsidian_sheet": "UNLOCALIZED: Unprocessed Obsidian Sheet", "item.create.vertical_gearbox": "竖直十字齿轮箱", "item.create.wand_of_symmetry": "对称之杖", "item.create.wheat_flour": "小麦粉", @@ -1447,6 +1448,7 @@ "create.train_assembly.no_controls": "UNLOCALIZED: At least one forward-facing controls block needs to be mounted on the train", "create.train_assembly.sideways_controls": "UNLOCALIZED: A mounted controls block is facing sideways", "create.train_assembly.bogey_created": "UNLOCALIZED: Bogey created. Click again to cycle type", + "create.train_assembly.requires_casing": "UNLOCALIZED: Use Railway Casing to create bogeys on tracks", "create.track_target.set": "UNLOCALIZED: Targeted track selected", "create.track_target.success": "UNLOCALIZED: Successfully bound to targeted track", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json index 46e095a07..54a1824ae 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 623", + "_": "Missing Localizations: 627", "_": "->------------------------] Game Elements [------------------------<-", @@ -616,9 +616,8 @@ "item.create.handheld_worldshaper": "地形雕塑器", "item.create.honey_bucket": "蜂蜜桶", "item.create.honeyed_apple": "蜂蜜蘋果", - "item.create.incomplete_cogwheel": "未完成的小齒輪", - "item.create.incomplete_large_cogwheel": "未完成的大齒輪", "item.create.incomplete_precision_mechanism": "未完成的精確控制器", + "item.create.incomplete_track": "UNLOCALIZED: Incomplete Track", "item.create.iron_sheet": "鐵板", "item.create.linked_controller": "遙控器", "item.create.minecart_contraption": "裝修過的礦車", @@ -631,6 +630,7 @@ "item.create.raw_zinc": "UNLOCALIZED: Raw Zinc", "item.create.red_sand_paper": "紅砂紙", "item.create.refined_radiance": "光輝石", + "item.create.reinforced_sheet": "UNLOCALIZED: Reinforced Sheet", "item.create.rose_quartz": "玫瑰石英", "item.create.sand_paper": "砂紙", "item.create.schedule": "UNLOCALIZED: Train Schedule", @@ -640,6 +640,7 @@ "item.create.super_glue": "強力膠", "item.create.sweet_roll": "甜捲捲", "item.create.tree_fertilizer": "樹木肥料", + "item.create.unprocessed_obsidian_sheet": "UNLOCALIZED: Unprocessed Obsidian Sheet", "item.create.vertical_gearbox": "豎直齒輪箱", "item.create.wand_of_symmetry": "對稱杖", "item.create.wheat_flour": "小麥粉", @@ -1447,6 +1448,7 @@ "create.train_assembly.no_controls": "UNLOCALIZED: At least one forward-facing controls block needs to be mounted on the train", "create.train_assembly.sideways_controls": "UNLOCALIZED: A mounted controls block is facing sideways", "create.train_assembly.bogey_created": "UNLOCALIZED: Bogey created. Click again to cycle type", + "create.train_assembly.requires_casing": "UNLOCALIZED: Use Railway Casing to create bogeys on tracks", "create.track_target.set": "UNLOCALIZED: Targeted track selected", "create.track_target.success": "UNLOCALIZED: Successfully bound to targeted track", diff --git a/src/generated/resources/assets/create/models/item/incomplete_track.json b/src/generated/resources/assets/create/models/item/incomplete_track.json new file mode 100644 index 000000000..b32f40825 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/incomplete_track.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "create:item/incomplete_track" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/reinforced_sheet.json b/src/generated/resources/assets/create/models/item/reinforced_sheet.json new file mode 100644 index 000000000..2940f5509 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/reinforced_sheet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "create:item/reinforced_sheet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/unprocessed_obsidian_sheet.json b/src/generated/resources/assets/create/models/item/unprocessed_obsidian_sheet.json new file mode 100644 index 000000000..12ab4d8ce --- /dev/null +++ b/src/generated/resources/assets/create/models/item/unprocessed_obsidian_sheet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "create:item/unprocessed_obsidian_sheet" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/adjustable_chain_gearshift.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/adjustable_chain_gearshift.json index 822ece654..09490c7f0 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/adjustable_chain_gearshift.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/adjustable_chain_gearshift.json @@ -12,7 +12,7 @@ "items": [ { "items": [ - "create:brass_casing" + "create:electron_tube" ] } ] diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/clutch.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/clutch.json index f29249d5f..cfaaa1b67 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/clutch.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/clutch.json @@ -12,7 +12,7 @@ "items": [ { "items": [ - "create:andesite_alloy" + "create:andesite_casing" ] } ] diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/controls.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/controls.json new file mode 100644 index 000000000..9cd7e4dc5 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/controls.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/kinetics/controls" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:railway_casing" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/kinetics/controls" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/display_board.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/display_board.json new file mode 100644 index 000000000..a953d9f78 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/display_board.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/kinetics/display_board" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:andesite_alloy" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/kinetics/display_board" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/flywheel.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/flywheel.json new file mode 100644 index 000000000..9b7b0453a --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/flywheel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/kinetics/flywheel" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/kinetics/flywheel" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/gearshift.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/gearshift.json index 3072f8370..e21612534 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/gearshift.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/gearshift.json @@ -12,7 +12,7 @@ "items": [ { "items": [ - "create:andesite_alloy" + "create:andesite_casing" ] } ] diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/large_cogwheelfrom_little.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/large_cogwheelfrom_little.json new file mode 100644 index 000000000..d711440e9 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/large_cogwheelfrom_little.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/kinetics/large_cogwheelfrom_little" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:andesite_alloy" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/kinetics/large_cogwheelfrom_little" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/sail_frame.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/metal_girder.json similarity index 83% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/sail_frame.json rename to src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/metal_girder.json index 1b424432c..6748c47b3 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/sail_frame.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/metal_girder.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "create:crafting/kinetics/sail_frame" + "create:crafting/kinetics/metal_girder" ] }, "criteria": { @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "create:crafting/kinetics/sail_frame" + "recipe": "create:crafting/kinetics/metal_girder" } } }, diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/millstone.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/millstone.json index 47158cadf..dce08623e 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/millstone.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/millstone.json @@ -12,7 +12,7 @@ "items": [ { "items": [ - "create:andesite_alloy" + "create:andesite_casing" ] } ] diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/sail_framefrom_conversion.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/sail_framefrom_conversion.json new file mode 100644 index 000000000..0c11283c4 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/sail_framefrom_conversion.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/kinetics/sail_framefrom_conversion" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:white_sail" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/kinetics/sail_framefrom_conversion" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/schedule.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/schedule.json new file mode 100644 index 000000000..0fd9bc3f3 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/schedule.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/kinetics/schedule" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:plates/obsidian" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/kinetics/schedule" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/steam_engine.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/steam_engine.json new file mode 100644 index 000000000..256dbd511 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/steam_engine.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/kinetics/steam_engine" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:copper_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/kinetics/steam_engine" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/steam_whistle.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/steam_whistle.json new file mode 100644 index 000000000..ca0c4928b --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/steam_whistle.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/kinetics/steam_whistle" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:copper_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/kinetics/steam_whistle" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/track_signal.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/track_signal.json new file mode 100644 index 000000000..0a442cb95 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/track_signal.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/kinetics/track_signal" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:railway_casing" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/kinetics/track_signal" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/track_station.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/track_station.json new file mode 100644 index 000000000..68cd80d8a --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/track_station.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/kinetics/track_station" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:railway_casing" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/kinetics/track_station" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/white_sail.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/white_sail.json index b965b60fe..a5d4799be 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/white_sail.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/white_sail.json @@ -12,7 +12,7 @@ "items": [ { "items": [ - "create:sail_frame" + "create:andesite_alloy" ] } ] diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/white_sailfrom_conversion.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/white_sailfrom_conversion.json new file mode 100644 index 000000000..cdb772b77 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/white_sailfrom_conversion.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/kinetics/white_sailfrom_conversion" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:sail_frame" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/kinetics/white_sailfrom_conversion" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/content_observerfrom_conversion.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/content_observerfrom_conversion.json new file mode 100644 index 000000000..69c294f67 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/content_observerfrom_conversion.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/logistics/content_observerfrom_conversion" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:stockpile_switch" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/logistics/content_observerfrom_conversion" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/stockpile_switch.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/display_link.json similarity index 81% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/stockpile_switch.json rename to src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/display_link.json index ad1c6d7a2..4c7d2dc0d 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/stockpile_switch.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/display_link.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "create:crafting/logistics/stockpile_switch" + "create:crafting/logistics/display_link" ] }, "criteria": { @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "create:crafting/logistics/stockpile_switch" + "recipe": "create:crafting/logistics/display_link" } } }, diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/redstone_link.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/redstone_link.json index cdc2d55a7..2a0247192 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/redstone_link.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/redstone_link.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "tag": "forge:ingots/brass" + "items": [ + "create:brass_casing" + ] } ] } diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/stockpile_switchfrom_conversion.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/stockpile_switchfrom_conversion.json new file mode 100644 index 000000000..47a661215 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/stockpile_switchfrom_conversion.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/logistics/stockpile_switchfrom_conversion" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:content_observer" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/logistics/stockpile_switchfrom_conversion" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/large_bogey.json b/src/generated/resources/data/create/loot_tables/blocks/large_bogey.json index 3da3a59b4..474e6712c 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/large_bogey.json +++ b/src/generated/resources/data/create/loot_tables/blocks/large_bogey.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:air" + "name": "create:railway_casing" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/small_bogey.json b/src/generated/resources/data/create/loot_tables/blocks/small_bogey.json index 3da3a59b4..474e6712c 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/small_bogey.json +++ b/src/generated/resources/data/create/loot_tables/blocks/small_bogey.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:air" + "name": "create:railway_casing" } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/adjustable_chain_gearshift.json b/src/generated/resources/data/create/recipes/crafting/kinetics/adjustable_chain_gearshift.json index 5b22915ad..cc1d5c321 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/adjustable_chain_gearshift.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/adjustable_chain_gearshift.json @@ -1,21 +1,13 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "A", - "B", - "C" - ], - "key": { - "A": { - "item": "create:electron_tube" - }, - "B": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "create:encased_chain_drive" }, - "C": { - "item": "create:large_cogwheel" + { + "item": "create:electron_tube" } - }, + ], "result": { "item": "create:adjustable_chain_gearshift" } diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/cart_assembler.json b/src/generated/resources/data/create/recipes/crafting/kinetics/cart_assembler.json index 526200b14..3894f6c61 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/cart_assembler.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/cart_assembler.json @@ -1,7 +1,6 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " L ", "CRC", "L L" ], diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/chute.json b/src/generated/resources/data/create/recipes/crafting/kinetics/chute.json index e8bddbe4b..d9fb5ebec 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/chute.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/chute.json @@ -1,15 +1,16 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - "II", - "AA" + "A", + "I", + "A" ], "key": { "A": { "tag": "forge:plates/iron" }, "I": { - "item": "create:andesite_alloy" + "tag": "forge:ingots/iron" } }, "result": { diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/clockwork_bearing.json b/src/generated/resources/data/create/recipes/crafting/kinetics/clockwork_bearing.json index 4f21392ea..1ce75c769 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/clockwork_bearing.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/clockwork_bearing.json @@ -1,14 +1,11 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " B ", - "SCS", - " I " + "B", + "C", + "S" ], "key": { - "I": { - "item": "create:shaft" - }, "S": { "item": "create:electron_tube" }, diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/clutch.json b/src/generated/resources/data/create/recipes/crafting/kinetics/clutch.json index b74ff3044..b50000618 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/clutch.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/clutch.json @@ -1,21 +1,16 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " B ", - "SCS", - " B " - ], - "key": { - "S": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "create:andesite_casing" + }, + { "item": "create:shaft" }, - "B": { + { "tag": "forge:dusts/redstone" - }, - "C": { - "item": "create:andesite_casing" } - }, + ], "result": { "item": "create:clutch" } diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/cogwheel.json b/src/generated/resources/data/create/recipes/crafting/kinetics/cogwheel.json index 242eaf996..b170f1e0e 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/cogwheel.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/cogwheel.json @@ -1,20 +1,14 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "SSS", - "SCS", - "SSS" - ], - "key": { - "S": { - "tag": "minecraft:wooden_buttons" + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "create:shaft" }, - "C": { - "item": "create:andesite_alloy" + { + "tag": "minecraft:planks" } - }, + ], "result": { - "item": "create:cogwheel", - "count": 8 + "item": "create:cogwheel" } } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/controls.json b/src/generated/resources/data/create/recipes/crafting/kinetics/controls.json new file mode 100644 index 000000000..831f6229d --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/controls.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "B", + "C", + "I" + ], + "key": { + "I": { + "item": "create:precision_mechanism" + }, + "B": { + "item": "minecraft:lever" + }, + "C": { + "item": "create:railway_casing" + } + }, + "result": { + "item": "create:controls" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/cuckoo_clock.json b/src/generated/resources/data/create/recipes/crafting/kinetics/cuckoo_clock.json index 2e72ccd8d..9d9f3c108 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/cuckoo_clock.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/cuckoo_clock.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " S ", - "SAS", - "BPB" + "S", + "C", + "A" ], "key": { "S": { @@ -12,11 +12,8 @@ "A": { "item": "minecraft:clock" }, - "B": { - "tag": "minecraft:logs" - }, - "P": { - "item": "create:cogwheel" + "C": { + "item": "create:andesite_casing" } }, "result": { diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/deployer.json b/src/generated/resources/data/create/recipes/crafting/kinetics/deployer.json index abb71dae6..5bc2a4288 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/deployer.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/deployer.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " B ", - "SCS", - " I " + "B", + "C", + "I" ], "key": { "I": { @@ -12,9 +12,6 @@ "B": { "item": "create:electron_tube" }, - "S": { - "item": "create:cogwheel" - }, "C": { "item": "create:andesite_casing" } diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/display_board.json b/src/generated/resources/data/create/recipes/crafting/kinetics/display_board.json new file mode 100644 index 000000000..ad92f995b --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/display_board.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "PAP" + ], + "key": { + "A": { + "item": "create:electron_tube" + }, + "P": { + "item": "create:andesite_alloy" + } + }, + "result": { + "item": "create:display_board", + "count": 2 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/empty_blaze_burner.json b/src/generated/resources/data/create/recipes/crafting/kinetics/empty_blaze_burner.json index 16091c3c4..6144ce90d 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/empty_blaze_burner.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/empty_blaze_burner.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - "II", - "AA" + " I ", + "IAI", + " I " ], "key": { "A": { - "item": "minecraft:iron_bars" + "tag": "forge:netherrack" }, "I": { "tag": "forge:plates/iron" diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/encased_chain_drive.json b/src/generated/resources/data/create/recipes/crafting/kinetics/encased_chain_drive.json index eb0f18f9b..21ec3801a 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/encased_chain_drive.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/encased_chain_drive.json @@ -1,23 +1,14 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " B ", - "SCS", - " B " - ], - "key": { - "S": { - "item": "create:shaft" - }, - "B": { - "tag": "forge:nuggets/iron" - }, - "C": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "create:andesite_casing" + }, + { + "item": "minecraft:chain" } - }, + ], "result": { - "item": "create:encased_chain_drive", - "count": 2 + "item": "create:encased_chain_drive" } } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/encased_fan.json b/src/generated/resources/data/create/recipes/crafting/kinetics/encased_fan.json index 677c6d765..7157e7ee6 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/encased_fan.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/encased_fan.json @@ -1,20 +1,13 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " S ", - "RAR", - " P " + "A", + "P" ], "key": { - "S": { - "item": "create:shaft" - }, "A": { "item": "create:andesite_casing" }, - "R": { - "item": "create:cogwheel" - }, "P": { "item": "create:propeller" } diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/fluid_valve.json b/src/generated/resources/data/create/recipes/crafting/kinetics/fluid_valve.json index 68fb533f5..c6f601cbd 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/fluid_valve.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/fluid_valve.json @@ -1,21 +1,13 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "I", - "S", - "P" - ], - "key": { - "P": { - "item": "create:shaft" - }, - "S": { - "item": "create:fluid_pipe" - }, - "I": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "tag": "forge:plates/iron" + }, + { + "item": "create:fluid_pipe" } - }, + ], "result": { "item": "create:fluid_valve" } diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/flywheel.json b/src/generated/resources/data/create/recipes/crafting/kinetics/flywheel.json new file mode 100644 index 000000000..2cb51f37d --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/flywheel.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "CCC", + "CAC", + "CCC" + ], + "key": { + "C": { + "tag": "forge:ingots/brass" + }, + "A": { + "item": "create:shaft" + } + }, + "result": { + "item": "create:flywheel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/gantry_carriage.json b/src/generated/resources/data/create/recipes/crafting/kinetics/gantry_carriage.json index e4bccc262..14e6af3fc 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/gantry_carriage.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/gantry_carriage.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " B ", - "ICI", - " S " + "B", + "C", + "S" ], "key": { "B": { @@ -14,9 +14,6 @@ }, "C": { "item": "create:andesite_casing" - }, - "I": { - "item": "create:shaft" } }, "result": { diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/gearshift.json b/src/generated/resources/data/create/recipes/crafting/kinetics/gearshift.json index 0255f3d1e..75dd806e8 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/gearshift.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/gearshift.json @@ -1,21 +1,16 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " B ", - "SCS", - " B " - ], - "key": { - "S": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "create:andesite_casing" + }, + { "item": "create:cogwheel" }, - "B": { + { "tag": "forge:dusts/redstone" - }, - "C": { - "item": "create:andesite_casing" } - }, + ], "result": { "item": "create:gearshift" } diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/hand_crank.json b/src/generated/resources/data/create/recipes/crafting/kinetics/hand_crank.json index 98ccb51ed..237f1a6db 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/hand_crank.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/hand_crank.json @@ -1,7 +1,6 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " S ", "CCC", " A" ], @@ -11,9 +10,6 @@ }, "C": { "tag": "minecraft:planks" - }, - "S": { - "item": "create:shaft" } }, "result": { diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/hose_pulley.json b/src/generated/resources/data/create/recipes/crafting/kinetics/hose_pulley.json index ae6b27994..5d6ea892c 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/hose_pulley.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/hose_pulley.json @@ -1,22 +1,16 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " B ", - "SCP", - " I " + "B", + "C", + "I" ], "key": { - "S": { - "item": "create:shaft" - }, - "P": { - "item": "create:fluid_pipe" - }, "B": { "item": "create:copper_casing" }, "C": { - "item": "minecraft:dried_kelp" + "item": "minecraft:dried_kelp_block" }, "I": { "tag": "forge:plates/copper" diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/large_cogwheel.json b/src/generated/resources/data/create/recipes/crafting/kinetics/large_cogwheel.json index 05e4e3f46..18f1d5ee5 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/large_cogwheel.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/large_cogwheel.json @@ -1,23 +1,17 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "SDS", - "DCD", - "SDS" - ], - "key": { - "S": { - "tag": "minecraft:wooden_buttons" + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "create:shaft" }, - "C": { - "item": "create:andesite_alloy" + { + "tag": "minecraft:planks" }, - "D": { + { "tag": "minecraft:planks" } - }, + ], "result": { - "item": "create:large_cogwheel", - "count": 2 + "item": "create:large_cogwheel" } } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/large_cogwheelfrom_little.json b/src/generated/resources/data/create/recipes/crafting/kinetics/large_cogwheelfrom_little.json new file mode 100644 index 000000000..fff6439b7 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/large_cogwheelfrom_little.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "create:cogwheel" + }, + { + "tag": "minecraft:planks" + } + ], + "result": { + "item": "create:large_cogwheel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_bearing.json b/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_bearing.json index 2273703f8..c3016754b 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_bearing.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_bearing.json @@ -1,17 +1,10 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " B ", - "SCS", - " I " + "B", + "C" ], "key": { - "I": { - "item": "create:shaft" - }, - "S": { - "item": "create:andesite_alloy" - }, "B": { "item": "create:turntable" }, diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_crafter.json b/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_crafter.json index 938064560..c2bc8318c 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_crafter.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_crafter.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " B ", - "SCS", - " R " + "B", + "C", + "R" ], "key": { "B": { @@ -14,9 +14,6 @@ }, "C": { "item": "create:brass_casing" - }, - "S": { - "item": "create:cogwheel" } }, "result": { diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_mixer.json b/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_mixer.json index b5e8767c5..974f2b104 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_mixer.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_mixer.json @@ -1,17 +1,10 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " B ", - "SCS", - " I " + "C", + "I" ], "key": { - "S": { - "item": "create:cogwheel" - }, - "B": { - "item": "create:andesite_alloy" - }, "C": { "item": "create:andesite_casing" }, diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_piston.json b/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_piston.json index e1d197c0b..f81b088e3 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_piston.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_piston.json @@ -1,17 +1,14 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " B ", - "SCS", - " I " + "B", + "C", + "I" ], "key": { "B": { "tag": "minecraft:planks" }, - "S": { - "item": "create:cogwheel" - }, "C": { "item": "create:andesite_casing" }, diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_press.json b/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_press.json index b63759672..b7ea30971 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_press.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_press.json @@ -1,17 +1,10 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " B ", - "SCS", - " I " + "C", + "I" ], "key": { - "B": { - "item": "create:andesite_alloy" - }, - "S": { - "item": "create:cogwheel" - }, "C": { "item": "create:andesite_casing" }, diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/sail_frame.json b/src/generated/resources/data/create/recipes/crafting/kinetics/metal_girder.json similarity index 57% rename from src/generated/resources/data/create/recipes/crafting/kinetics/sail_frame.json rename to src/generated/resources/data/create/recipes/crafting/kinetics/metal_girder.json index 962b7a32c..d23e4a618 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/sail_frame.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/metal_girder.json @@ -1,20 +1,19 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - "SSS", - "SAS", - "SSS" + "PPP", + "CCC" ], "key": { - "A": { - "item": "create:andesite_alloy" + "P": { + "tag": "forge:plates/iron" }, - "S": { - "tag": "forge:rods/wooden" + "C": { + "item": "create:andesite_alloy" } }, "result": { - "item": "create:sail_frame", + "item": "create:metal_girder", "count": 8 } } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/millstone.json b/src/generated/resources/data/create/recipes/crafting/kinetics/millstone.json index 65a8e8fe4..cff0104b7 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/millstone.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/millstone.json @@ -1,20 +1,17 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " B ", - "SCS", - " I " + "C", + "S", + "I" ], "key": { - "B": { - "tag": "minecraft:planks" - }, - "S": { - "item": "create:andesite_alloy" - }, "C": { "item": "create:cogwheel" }, + "S": { + "item": "create:andesite_casing" + }, "I": { "tag": "forge:stone" } diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/nixie_tube.json b/src/generated/resources/data/create/recipes/crafting/kinetics/nixie_tube.json index 8d965d79f..ff2f13a28 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/nixie_tube.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/nixie_tube.json @@ -1,16 +1,13 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "EBE" - ], - "key": { - "E": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "create:electron_tube" }, - "B": { - "item": "create:brass_casing" + { + "item": "create:electron_tube" } - }, + ], "result": { "item": "create:nixie_tube" } diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/rope_pulley.json b/src/generated/resources/data/create/recipes/crafting/kinetics/rope_pulley.json index 9bc8e30e3..3cec3ac93 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/rope_pulley.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/rope_pulley.json @@ -1,14 +1,11 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " B ", - "SCS", - " I " + "B", + "C", + "I" ], "key": { - "S": { - "item": "create:shaft" - }, "B": { "item": "create:andesite_casing" }, diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/rotation_speed_controller.json b/src/generated/resources/data/create/recipes/crafting/kinetics/rotation_speed_controller.json index 76a4949f5..ce76bbbad 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/rotation_speed_controller.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/rotation_speed_controller.json @@ -1,8 +1,8 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " B ", - "SCS" + "B", + "C" ], "key": { "B": { @@ -10,9 +10,6 @@ }, "C": { "item": "create:brass_casing" - }, - "S": { - "item": "create:shaft" } }, "result": { diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/sail_framefrom_conversion.json b/src/generated/resources/data/create/recipes/crafting/kinetics/sail_framefrom_conversion.json new file mode 100644 index 000000000..e0802dc20 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/sail_framefrom_conversion.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "create:white_sail" + } + ], + "result": { + "item": "create:sail_frame" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/schedule.json b/src/generated/resources/data/create/recipes/crafting/kinetics/schedule.json new file mode 100644 index 000000000..4d7be9767 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/schedule.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:plates/obsidian" + }, + { + "item": "minecraft:paper" + } + ], + "result": { + "item": "create:schedule", + "count": 4 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/sequenced_gearshift.json b/src/generated/resources/data/create/recipes/crafting/kinetics/sequenced_gearshift.json index 6d01b38a4..6248ac173 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/sequenced_gearshift.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/sequenced_gearshift.json @@ -1,17 +1,14 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " B ", - "SCS", - " I " + "B", + "C", + "I" ], "key": { "B": { "item": "create:electron_tube" }, - "S": { - "item": "create:cogwheel" - }, "C": { "item": "create:brass_casing" }, diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/speedometer.json b/src/generated/resources/data/create/recipes/crafting/kinetics/speedometer.json index 2bf70cab3..dd6f381d1 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/speedometer.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/speedometer.json @@ -1,8 +1,8 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " C ", - "SAS" + "C", + "A" ], "key": { "C": { @@ -10,9 +10,6 @@ }, "A": { "item": "create:andesite_casing" - }, - "S": { - "item": "create:shaft" } }, "result": { diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/spout.json b/src/generated/resources/data/create/recipes/crafting/kinetics/spout.json index a7db594f5..29556b4d8 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/spout.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/spout.json @@ -2,18 +2,14 @@ "type": "minecraft:crafting_shaped", "pattern": [ "T", - "P", - "S" + "P" ], "key": { "T": { - "item": "create:fluid_tank" + "item": "create:copper_casing" }, "P": { "item": "minecraft:dried_kelp" - }, - "S": { - "tag": "forge:nuggets/copper" } }, "result": { diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/steam_engine.json b/src/generated/resources/data/create/recipes/crafting/kinetics/steam_engine.json new file mode 100644 index 000000000..2d6c86fe3 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/steam_engine.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "P", + "A", + "C" + ], + "key": { + "P": { + "tag": "forge:plates/gold" + }, + "C": { + "item": "minecraft:copper_block" + }, + "A": { + "item": "create:andesite_alloy" + } + }, + "result": { + "item": "create:steam_engine" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/steam_whistle.json b/src/generated/resources/data/create/recipes/crafting/kinetics/steam_whistle.json new file mode 100644 index 000000000..f237d8889 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/steam_whistle.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "P", + "C" + ], + "key": { + "P": { + "tag": "forge:plates/gold" + }, + "C": { + "item": "minecraft:copper_ingot" + } + }, + "result": { + "item": "create:steam_whistle" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/track_signal.json b/src/generated/resources/data/create/recipes/crafting/kinetics/track_signal.json new file mode 100644 index 000000000..ae1e41867 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/track_signal.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "create:railway_casing" + }, + { + "item": "create:electron_tube" + } + ], + "result": { + "item": "create:track_signal", + "count": 4 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/track_station.json b/src/generated/resources/data/create/recipes/crafting/kinetics/track_station.json new file mode 100644 index 000000000..ba2ff79a8 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/track_station.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "create:railway_casing" + }, + { + "item": "minecraft:compass" + } + ], + "result": { + "item": "create:track_station" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/white_sail.json b/src/generated/resources/data/create/recipes/crafting/kinetics/white_sail.json index 9d48831b0..75ca63c73 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/white_sail.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/white_sail.json @@ -1,20 +1,22 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - "FFF", - "FWF", - "FFF" + "WS", + "SA" ], "key": { - "F": { - "item": "create:sail_frame" - }, "W": { "tag": "minecraft:wool" + }, + "S": { + "tag": "forge:rods/wooden" + }, + "A": { + "item": "create:andesite_alloy" } }, "result": { "item": "create:white_sail", - "count": 8 + "count": 2 } } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/white_sailfrom_conversion.json b/src/generated/resources/data/create/recipes/crafting/kinetics/white_sailfrom_conversion.json new file mode 100644 index 000000000..3bc7c1131 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/white_sailfrom_conversion.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "create:sail_frame" + } + ], + "result": { + "item": "create:white_sail" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/windmill_bearing.json b/src/generated/resources/data/create/recipes/crafting/kinetics/windmill_bearing.json index 8a210d190..d90a0294e 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/windmill_bearing.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/windmill_bearing.json @@ -1,14 +1,10 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " B ", - " C ", - " I " + "B", + "C" ], "key": { - "I": { - "item": "create:shaft" - }, "B": { "item": "create:turntable" }, diff --git a/src/generated/resources/data/create/recipes/crafting/logistics/andesite_funnel.json b/src/generated/resources/data/create/recipes/crafting/logistics/andesite_funnel.json index cbaab571d..129254ca8 100644 --- a/src/generated/resources/data/create/recipes/crafting/logistics/andesite_funnel.json +++ b/src/generated/resources/data/create/recipes/crafting/logistics/andesite_funnel.json @@ -1,8 +1,8 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - "AKA", - " K " + "A", + "K" ], "key": { "A": { diff --git a/src/generated/resources/data/create/recipes/crafting/logistics/brass_funnel.json b/src/generated/resources/data/create/recipes/crafting/logistics/brass_funnel.json index cfbf4e054..eacc78dcf 100644 --- a/src/generated/resources/data/create/recipes/crafting/logistics/brass_funnel.json +++ b/src/generated/resources/data/create/recipes/crafting/logistics/brass_funnel.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - "AEA", - " K " + "E", + "A", + "K" ], "key": { "A": { - "tag": "forge:ingots/brass" + "tag": "forge:plates/brass" }, "K": { "item": "minecraft:dried_kelp" diff --git a/src/generated/resources/data/create/recipes/crafting/logistics/content_observer.json b/src/generated/resources/data/create/recipes/crafting/logistics/content_observer.json index 6bc6b13f4..6e21a750f 100644 --- a/src/generated/resources/data/create/recipes/crafting/logistics/content_observer.json +++ b/src/generated/resources/data/create/recipes/crafting/logistics/content_observer.json @@ -1,21 +1,19 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - "RCI", - " B " + "I", + "B", + "R" ], "key": { "B": { "item": "create:brass_casing" }, "R": { - "tag": "forge:dusts/redstone" + "item": "create:electron_tube" }, "I": { - "tag": "forge:ingots/iron" - }, - "C": { - "item": "minecraft:observer" + "item": "minecraft:comparator" } }, "result": { diff --git a/src/generated/resources/data/create/recipes/crafting/logistics/content_observerfrom_conversion.json b/src/generated/resources/data/create/recipes/crafting/logistics/content_observerfrom_conversion.json new file mode 100644 index 000000000..d6d558236 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/logistics/content_observerfrom_conversion.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "create:stockpile_switch" + } + ], + "result": { + "item": "create:content_observer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/logistics/display_link.json b/src/generated/resources/data/create/recipes/crafting/logistics/display_link.json new file mode 100644 index 000000000..f59887bfa --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/logistics/display_link.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "C", + "S", + "A" + ], + "key": { + "C": { + "item": "minecraft:redstone_torch" + }, + "A": { + "tag": "forge:plates/copper" + }, + "S": { + "item": "create:brass_casing" + } + }, + "result": { + "item": "create:display_link" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/logistics/redstone_link.json b/src/generated/resources/data/create/recipes/crafting/logistics/redstone_link.json index 9b4ce64a3..e962820e4 100644 --- a/src/generated/resources/data/create/recipes/crafting/logistics/redstone_link.json +++ b/src/generated/resources/data/create/recipes/crafting/logistics/redstone_link.json @@ -1,18 +1,15 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " C", - "SIS" + "C", + "S" ], "key": { "C": { "item": "minecraft:redstone_torch" }, "S": { - "tag": "forge:plates/brass" - }, - "I": { - "tag": "minecraft:planks" + "item": "create:brass_casing" } }, "result": { diff --git a/src/generated/resources/data/create/recipes/crafting/logistics/stockpile_switch.json b/src/generated/resources/data/create/recipes/crafting/logistics/stockpile_switch.json deleted file mode 100644 index 5b0630ff5..000000000 --- a/src/generated/resources/data/create/recipes/crafting/logistics/stockpile_switch.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "RCI", - " B " - ], - "key": { - "B": { - "item": "create:brass_casing" - }, - "R": { - "tag": "forge:dusts/redstone" - }, - "I": { - "tag": "forge:ingots/iron" - }, - "C": { - "item": "minecraft:comparator" - } - }, - "result": { - "item": "create:stockpile_switch" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/logistics/stockpile_switchfrom_conversion.json b/src/generated/resources/data/create/recipes/crafting/logistics/stockpile_switchfrom_conversion.json new file mode 100644 index 000000000..34cb0c277 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/logistics/stockpile_switchfrom_conversion.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "create:content_observer" + } + ], + "result": { + "item": "create:stockpile_switch" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/materials/electron_tube.json b/src/generated/resources/data/create/recipes/crafting/materials/electron_tube.json index 6cc4b04b2..abe43d00b 100644 --- a/src/generated/resources/data/create/recipes/crafting/materials/electron_tube.json +++ b/src/generated/resources/data/create/recipes/crafting/materials/electron_tube.json @@ -2,18 +2,14 @@ "type": "minecraft:crafting_shaped", "pattern": [ "L", - "R", "N" ], "key": { "L": { "item": "create:polished_rose_quartz" }, - "R": { - "item": "minecraft:redstone_torch" - }, "N": { - "tag": "forge:nuggets/iron" + "tag": "forge:plates/iron" } }, "result": { diff --git a/src/generated/resources/data/create/recipes/crafting/schematics/schematicannon.json b/src/generated/resources/data/create/recipes/crafting/schematics/schematicannon.json index 7a720eee4..3b4f0722f 100644 --- a/src/generated/resources/data/create/recipes/crafting/schematics/schematicannon.json +++ b/src/generated/resources/data/create/recipes/crafting/schematics/schematicannon.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " C ", - "LDL", - "SIS" + " I ", + "LIL", + "SDS" ], "key": { "L": { @@ -12,9 +12,6 @@ "D": { "item": "minecraft:dispenser" }, - "C": { - "item": "minecraft:cauldron" - }, "S": { "item": "minecraft:smooth_stone" }, diff --git a/src/generated/resources/data/create/recipes/deploying/cogwheel.json b/src/generated/resources/data/create/recipes/deploying/cogwheel.json new file mode 100644 index 000000000..59980eb52 --- /dev/null +++ b/src/generated/resources/data/create/recipes/deploying/cogwheel.json @@ -0,0 +1,16 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:shaft" + }, + { + "tag": "minecraft:planks" + } + ], + "results": [ + { + "item": "create:cogwheel" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/deploying/large_cogwheel.json b/src/generated/resources/data/create/recipes/deploying/large_cogwheel.json new file mode 100644 index 000000000..adbdb3855 --- /dev/null +++ b/src/generated/resources/data/create/recipes/deploying/large_cogwheel.json @@ -0,0 +1,16 @@ +{ + "type": "create:deploying", + "ingredients": [ + { + "item": "create:cogwheel" + }, + { + "tag": "minecraft:planks" + } + ], + "results": [ + { + "item": "create:large_cogwheel" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/item_application/railway_casing.json b/src/generated/resources/data/create/recipes/item_application/railway_casing.json new file mode 100644 index 000000000..0821b265d --- /dev/null +++ b/src/generated/resources/data/create/recipes/item_application/railway_casing.json @@ -0,0 +1,16 @@ +{ + "type": "create:item_application", + "ingredients": [ + { + "item": "create:brass_casing" + }, + { + "tag": "forge:plates/obsidian" + } + ], + "results": [ + { + "item": "create:railway_casing" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/mechanical_crafting/flywheel.json b/src/generated/resources/data/create/recipes/mechanical_crafting/flywheel.json deleted file mode 100644 index dee9cffd7..000000000 --- a/src/generated/resources/data/create/recipes/mechanical_crafting/flywheel.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "create:mechanical_crafting", - "pattern": [ - " BBB", - "CB B", - " BBB" - ], - "key": { - "B": { - "tag": "forge:ingots/brass" - }, - "C": { - "item": "create:brass_casing" - } - }, - "result": { - "item": "create:flywheel" - }, - "acceptMirrored": true -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/sequenced_assembly/cogwheel.json b/src/generated/resources/data/create/recipes/sequenced_assembly/cogwheel.json deleted file mode 100644 index 3815a5bdc..000000000 --- a/src/generated/resources/data/create/recipes/sequenced_assembly/cogwheel.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "type": "create:sequenced_assembly", - "ingredient": { - "item": "create:andesite_alloy" - }, - "transitionalItem": { - "item": "create:incomplete_cogwheel" - }, - "sequence": [ - { - "type": "create:deploying", - "ingredients": [ - { - "item": "create:incomplete_cogwheel" - }, - { - "tag": "minecraft:wooden_buttons" - } - ], - "results": [ - { - "item": "create:incomplete_cogwheel" - } - ] - }, - { - "type": "create:cutting", - "ingredients": [ - { - "item": "create:incomplete_cogwheel" - } - ], - "results": [ - { - "item": "create:incomplete_cogwheel" - } - ], - "processingTime": 50 - } - ], - "results": [ - { - "item": "create:cogwheel", - "count": 12, - "chance": 32.0 - }, - { - "item": "create:andesite_alloy", - "chance": 2.0 - }, - { - "item": "minecraft:andesite" - }, - { - "item": "create:large_cogwheel" - }, - { - "item": "minecraft:stick" - }, - { - "item": "minecraft:iron_nugget" - } - ], - "loops": 4 -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/sequenced_assembly/large_cogwheel.json b/src/generated/resources/data/create/recipes/sequenced_assembly/large_cogwheel.json deleted file mode 100644 index 6c80cc515..000000000 --- a/src/generated/resources/data/create/recipes/sequenced_assembly/large_cogwheel.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "type": "create:sequenced_assembly", - "ingredient": { - "item": "create:andesite_alloy" - }, - "transitionalItem": { - "item": "create:incomplete_large_cogwheel" - }, - "sequence": [ - { - "type": "create:deploying", - "ingredients": [ - { - "item": "create:incomplete_large_cogwheel" - }, - { - "tag": "minecraft:planks" - } - ], - "results": [ - { - "item": "create:incomplete_large_cogwheel" - } - ] - }, - { - "type": "create:deploying", - "ingredients": [ - { - "item": "create:incomplete_large_cogwheel" - }, - { - "tag": "minecraft:wooden_buttons" - } - ], - "results": [ - { - "item": "create:incomplete_large_cogwheel" - } - ] - }, - { - "type": "create:cutting", - "ingredients": [ - { - "item": "create:incomplete_large_cogwheel" - } - ], - "results": [ - { - "item": "create:incomplete_large_cogwheel" - } - ], - "processingTime": 50 - } - ], - "results": [ - { - "item": "create:large_cogwheel", - "count": 6, - "chance": 32.0 - }, - { - "item": "create:andesite_alloy", - "chance": 2.0 - }, - { - "item": "minecraft:andesite" - }, - { - "item": "create:cogwheel" - }, - { - "item": "minecraft:stick" - }, - { - "item": "minecraft:iron_nugget" - } - ], - "loops": 3 -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/sequenced_assembly/reinforced_sheet.json b/src/generated/resources/data/create/recipes/sequenced_assembly/reinforced_sheet.json new file mode 100644 index 000000000..696b43635 --- /dev/null +++ b/src/generated/resources/data/create/recipes/sequenced_assembly/reinforced_sheet.json @@ -0,0 +1,61 @@ +{ + "type": "create:sequenced_assembly", + "ingredient": { + "item": "create:powdered_obsidian" + }, + "transitionalItem": { + "item": "create:unprocessed_obsidian_sheet" + }, + "sequence": [ + { + "type": "create:filling", + "ingredients": [ + { + "item": "create:unprocessed_obsidian_sheet" + }, + { + "fluid": "minecraft:lava", + "nbt": {}, + "amount": 500 + } + ], + "results": [ + { + "item": "create:unprocessed_obsidian_sheet" + } + ] + }, + { + "type": "create:pressing", + "ingredients": [ + { + "item": "create:unprocessed_obsidian_sheet" + } + ], + "results": [ + { + "item": "create:unprocessed_obsidian_sheet" + } + ] + }, + { + "type": "create:pressing", + "ingredients": [ + { + "item": "create:unprocessed_obsidian_sheet" + } + ], + "results": [ + { + "item": "create:unprocessed_obsidian_sheet" + } + ] + } + ], + "results": [ + { + "item": "create:reinforced_sheet" + } + ], + "loops": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/sequenced_assembly/track.json b/src/generated/resources/data/create/recipes/sequenced_assembly/track.json new file mode 100644 index 000000000..f6fc086fc --- /dev/null +++ b/src/generated/resources/data/create/recipes/sequenced_assembly/track.json @@ -0,0 +1,72 @@ +{ + "type": "create:sequenced_assembly", + "ingredient": { + "tag": "create:sleepers" + }, + "transitionalItem": { + "item": "create:incomplete_track" + }, + "sequence": [ + { + "type": "create:deploying", + "ingredients": [ + { + "item": "create:incomplete_track" + }, + [ + { + "tag": "forge:nuggets/iron" + }, + { + "tag": "forge:nuggets/zinc" + } + ] + ], + "results": [ + { + "item": "create:incomplete_track" + } + ] + }, + { + "type": "create:deploying", + "ingredients": [ + { + "item": "create:incomplete_track" + }, + [ + { + "tag": "forge:nuggets/iron" + }, + { + "tag": "forge:nuggets/zinc" + } + ] + ], + "results": [ + { + "item": "create:incomplete_track" + } + ] + }, + { + "type": "create:pressing", + "ingredients": [ + { + "item": "create:incomplete_track" + } + ], + "results": [ + { + "item": "create:incomplete_track" + } + ] + } + ], + "results": [ + { + "item": "create:track" + } + ], + "loops": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/items/sleepers.json b/src/generated/resources/data/create/tags/items/sleepers.json new file mode 100644 index 000000000..9a5fbb246 --- /dev/null +++ b/src/generated/resources/data/create/tags/items/sleepers.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "minecraft:stone_slab", + "minecraft:smooth_stone_slab", + "minecraft:andesite_slab" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/plates/obsidian.json b/src/generated/resources/data/forge/tags/items/plates/obsidian.json new file mode 100644 index 000000000..dfbb41151 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/plates/obsidian.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:reinforced_sheet" + ] +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index aa7c27289..3560d35e7 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -82,28 +82,19 @@ public class AllItems { public static final ItemEntry WHEAT_FLOUR = ingredient("wheat_flour"), DOUGH = ingredient("dough"), CINDER_FLOUR = ingredient("cinder_flour"), ROSE_QUARTZ = ingredient("rose_quartz"), - POLISHED_ROSE_QUARTZ = ingredient("polished_rose_quartz"), PROPELLER = ingredient("propeller"), - WHISK = ingredient("whisk"), BRASS_HAND = ingredient("brass_hand"), + POLISHED_ROSE_QUARTZ = ingredient("polished_rose_quartz"), POWDERED_OBSIDIAN = ingredient("powdered_obsidian"), + REINFORCED_SHEET = taggedIngredient("reinforced_sheet", forgeItemTag("plates/obsidian")), + PROPELLER = ingredient("propeller"), WHISK = ingredient("whisk"), BRASS_HAND = ingredient("brass_hand"), CRAFTER_SLOT_COVER = ingredient("crafter_slot_cover"), ELECTRON_TUBE = ingredient("electron_tube"); - public static final ItemEntry POWDERED_OBSIDIAN = hiddenIngredient("powdered_obsidian"); + public static final ItemEntry - public static final ItemEntry INCOMPLETE_PRECISION_MECHANISM = - REGISTRATE.item("incomplete_precision_mechanism", SequencedAssemblyItem::new) - .register(); + INCOMPLETE_PRECISION_MECHANISM = sequencedIngredient("incomplete_precision_mechanism"), + INCOMPLETE_REINFORCED_SHEET = sequencedIngredient("unprocessed_obsidian_sheet"), + INCOMPLETE_TRACK = sequencedIngredient("incomplete_track"); public static final ItemEntry PRECISION_MECHANISM = ingredient("precision_mechanism"); - public static final ItemEntry INCOMPLETE_COGWHEEL = - REGISTRATE.item("incomplete_cogwheel", SequencedAssemblyItem::new) - .model(AssetLookup.existingItemModel()) - .register(); - - public static final ItemEntry INCOMPLETE_LARGE_COGWHEEL = - REGISTRATE.item("incomplete_large_cogwheel", SequencedAssemblyItem::new) - .model(AssetLookup.existingItemModel()) - .register(); - public static final ItemEntry BLAZE_CAKE_BASE = REGISTRATE.item("blaze_cake_base", HiddenIngredientItem::new) .tag(AllItemTags.UPRIGHT_ON_BELT.tag) @@ -374,11 +365,16 @@ public class AllItems { .register(); } - private static ItemEntry hiddenIngredient(String name) { - return REGISTRATE.item(name, HiddenIngredientItem::new) + private static ItemEntry sequencedIngredient(String name) { + return REGISTRATE.item(name, SequencedAssemblyItem::new) .register(); } +// private static ItemEntry hiddenIngredient(String name) { +// return REGISTRATE.item(name, HiddenIngredientItem::new) +// .register(); +// } + @SafeVarargs private static ItemEntry taggedIngredient(String name, TagKey... tags) { return REGISTRATE.item(name, Item::new) diff --git a/src/main/java/com/simibubi/create/AllTags.java b/src/main/java/com/simibubi/create/AllTags.java index 14b938181..4b9f63f20 100644 --- a/src/main/java/com/simibubi/create/AllTags.java +++ b/src/main/java/com/simibubi/create/AllTags.java @@ -206,6 +206,7 @@ public class AllTags { VANILLA_STRIPPED_LOGS, VANILLA_STRIPPED_WOOD, CASING, + SLEEPERS, STRIPPED_LOGS(FORGE), STRIPPED_WOOD(FORGE), @@ -363,6 +364,8 @@ public class AllTags { AllItemTags.UPRIGHT_ON_BELT.add(Items.GLASS_BOTTLE, Items.POTION, Items.SPLASH_POTION, Items.LINGERING_POTION, Items.HONEY_BOTTLE, Items.CAKE); + AllItemTags.SLEEPERS.add(Items.STONE_SLAB, Items.SMOOTH_STONE_SLAB, Items.ANDESITE_SLAB); + AllBlockTags.WINDMILL_SAILS.includeAll(BlockTags.WOOL); AllBlockTags.BRITTLE.includeAll(BlockTags.DOORS); diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/AssemblyScreen.java b/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/AssemblyScreen.java index 2c090f5bd..495d088a1 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/AssemblyScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/AssemblyScreen.java @@ -220,11 +220,11 @@ public class AssemblyScreen extends AbstractStationScreen { new TextComponent(bogeyCount == 0 ? "No Bogeys" : bogeyCount + (bogeyCount == 1 ? " Bogey" : " Bogeys")); font.draw(ms, text, x + 97 - font.width(text) / 2, y + 47, 0x7A7A7A); - font.drawWordWrap(new TextComponent("Right-click on highlighted Tracks to create bogeys."), x + 28, y + 67, 134, + font.drawWordWrap(new TextComponent("Use Railway Casing on highlighted Tracks to create bogeys."), x + 28, y + 62, 134, 0x7A7A7A); - font.drawWordWrap(new TextComponent("Remove bogeys by breaking the block on top."), x + 28, y + 90, 134, + font.drawWordWrap(new TextComponent("Remove bogeys by breaking the block on top."), x + 28, y + 94, 134, 0x7A7A7A); - font.drawWordWrap(new TextComponent("Build carriages attached to one or two bogeys each."), x + 28, y + 113, + font.drawWordWrap(new TextComponent("Build carriages attached to one or two bogeys each."), x + 28, y + 117, 138, 0x7A7A7A); } diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationTileEntity.java index 714512be2..09c4bb339 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationTileEntity.java @@ -12,6 +12,7 @@ import java.util.UUID; import javax.annotation.Nullable; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.Create; @@ -55,6 +56,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundSource; import net.minecraft.util.Mth; +import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.SoundType; @@ -232,7 +234,8 @@ public class StationTileEntity extends SmartTileEntity { } } - public boolean trackClicked(Player player, ITrackBlock track, BlockState state, BlockPos pos) { + public boolean trackClicked(Player player, InteractionHand hand, ITrackBlock track, BlockState state, + BlockPos pos) { refreshAssemblyInfo(); BoundingBox bb = assemblyAreas.get(level) .get(worldPosition); @@ -242,7 +245,6 @@ public class StationTileEntity extends SmartTileEntity { BlockPos up = new BlockPos(track.getUpNormal(level, pos, state)); int bogeyOffset = pos.distManhattan(edgePoint.getGlobalPosition()) - 1; if (!isValidBogeyOffset(bogeyOffset)) { - for (int i = -1; i <= 1; i++) { BlockPos bogeyPos = pos.relative(assemblyDirection, i) .offset(up); @@ -257,6 +259,12 @@ public class StationTileEntity extends SmartTileEntity { return false; } + ItemStack handItem = player.getItemInHand(hand); + if (!player.isCreative() && !AllBlocks.RAILWAY_CASING.isIn(handItem)) { + player.displayClientMessage(Lang.translate("train_assembly.requires_casing"), true); + return false; + } + BlockState bogeyAnchor = track.getBogeyAnchor(level, pos, state); level.setBlock(pos.offset(up), bogeyAnchor, 3); player.displayClientMessage(Lang.translate("train_assembly.bogey_created"), true); @@ -264,6 +272,14 @@ public class StationTileEntity extends SmartTileEntity { .getSoundType(state, level, pos, player); level.playSound(null, pos, soundtype.getPlaceSound(), SoundSource.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F); + + if (!player.isCreative()) { + ItemStack itemInHand = player.getItemInHand(hand); + itemInHand.shrink(1); + if (itemInHand.isEmpty()) + player.setItemInHand(hand, ItemStack.EMPTY); + } + return true; } diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/StandardBogeyBlock.java b/src/main/java/com/simibubi/create/content/logistics/trains/track/StandardBogeyBlock.java index 3832a6ed5..2ef47f778 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/track/StandardBogeyBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/track/StandardBogeyBlock.java @@ -23,6 +23,8 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; @@ -32,6 +34,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition.Builder; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.EnumProperty; +import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -187,11 +190,17 @@ public class StandardBogeyBlock extends Block implements IBogeyBlock, ITE pState.cycle(AXIS); - default -> pState; + case COUNTERCLOCKWISE_90, CLOCKWISE_90 -> pState.cycle(AXIS); + default -> pState; }; } + @Override + public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter level, BlockPos pos, + Player player) { + return AllBlocks.RAILWAY_CASING.asStack(); + } + @Override public Class getTileEntityClass() { return StandardBogeyTileEntity.class; diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlock.java b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlock.java index 385ea1c7a..e12eec574 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlock.java @@ -421,7 +421,7 @@ public class TrackBlock extends Block implements EntityBlock, IWrenchable, ITrac .isInside(pos)) continue; if (world.getBlockEntity(entry.getKey())instanceof StationTileEntity station) - if (station.trackClicked(player, this, state, pos)) + if (station.trackClicked(player, hand, this, state, pos)) return InteractionResult.SUCCESS; } diff --git a/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java index 0c8bd9a74..8f6f4a430 100644 --- a/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java +++ b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java @@ -72,6 +72,7 @@ public class BuilderTransformers { .properties(p -> p.noOcclusion()) .blockstate((c, p) -> BlockStateGen.horizontalAxisBlock(c, p, s -> p.models() .getExistingFile(p.modLoc("block/track/bogey/top")))) + .loot((p, l) -> p.dropOther(l, AllBlocks.RAILWAY_CASING.get())) .onRegister(block -> IBogeyBlock.register(block.getRegistryName())); } diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CreateRecipeProvider.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CreateRecipeProvider.java index 894d493d7..5a4ff3df9 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CreateRecipeProvider.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CreateRecipeProvider.java @@ -115,10 +115,18 @@ public abstract class CreateRecipeProvider extends RecipeProvider { static TagKey ironSheet() { return AllTags.forgeItemTag("plates/iron"); } + + static TagKey reinforcedSheet() { + return AllTags.forgeItemTag("plates/obsidian"); + } static ItemLike brassCasing() { return AllBlocks.BRASS_CASING.get(); } + + static ItemLike railwayCasing() { + return AllBlocks.RAILWAY_CASING.get(); + } static ItemLike electronTube() { return AllItems.ELECTRON_TUBE.get(); diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/DeployingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/DeployingRecipeGen.java index 44626ac68..d0c7d033b 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/DeployingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/DeployingRecipeGen.java @@ -20,7 +20,17 @@ public class DeployingRecipeGen extends ProcessingRecipeGen { GeneratedRecipe - CB1 = addWax(() -> Blocks.WAXED_COPPER_BLOCK, () -> Blocks.COPPER_BLOCK), + COGWHEEL = create("cogwheel", b -> b.require(I.shaft()) + .require(I.planks()) + .output(I.cog())), + + LARGE_COGWHEEL = create("large_cogwheel", b -> b.require(I.cog()) + .require(I.planks()) + .output(I.largeCog())); + + GeneratedRecipe + + CB1 = addWax(() -> Blocks.WAXED_COPPER_BLOCK, () -> Blocks.COPPER_BLOCK), CB2 = addWax(() -> Blocks.WAXED_EXPOSED_COPPER, () -> Blocks.EXPOSED_COPPER), CB3 = addWax(() -> Blocks.WAXED_WEATHERED_COPPER, () -> Blocks.WEATHERED_COPPER), CB4 = addWax(() -> Blocks.WAXED_OXIDIZED_COPPER, () -> Blocks.OXIDIZED_COPPER), diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/ItemApplicationRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/ItemApplicationRecipeGen.java index 7a07e787d..8fc72d602 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/ItemApplicationRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/ItemApplicationRecipeGen.java @@ -16,6 +16,9 @@ public class ItemApplicationRecipeGen extends ProcessingRecipeGen { GeneratedRecipe ANDESITE = woodCasing("andesite", I::andesite, I::andesiteCasing); GeneratedRecipe COPPER = woodCasingTag("copper", I::copperSheet, I::copperCasing); GeneratedRecipe BRASS = woodCasingTag("brass", I::brassSheet, I::brassCasing); + GeneratedRecipe RAILWAY = create("railway_casing", b -> b.require(I.brassCasing()) + .require(I.reinforcedSheet()) + .output(I.railwayCasing())); protected GeneratedRecipe woodCasing(String type, Supplier ingredient, Supplier output) { return woodCasingIngredient(type, () -> Ingredient.of(ingredient.get()), output); diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeGen.java index 91cc006c3..d359a5bf0 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeGen.java @@ -12,7 +12,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; -import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.Tags; public class MechanicalCraftingRecipeGen extends CreateRecipeProvider { @@ -60,14 +59,7 @@ public class MechanicalCraftingRecipeGen extends CreateRecipeProvider { .key('S', AllBlocks.FLUID_PIPE.get()) .key('C', Ingredient.of(I.copper())) .patternLine("LRSSS") - .patternLine("CC ")), - - FLYWHEEL = create(AllBlocks.FLYWHEEL::get).returns(1) - .recipe(b -> b.key('B', Ingredient.of(I.brass())) - .key('C', I.brassCasing()) - .patternLine(" BBB") - .patternLine("CB B") - .patternLine(" BBB")) + .patternLine("CC ")) ; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java index edf8058e8..432363300 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java @@ -1,19 +1,21 @@ package com.simibubi.create.foundation.data.recipe; import java.util.function.UnaryOperator; +import java.util.stream.Stream; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; +import com.simibubi.create.AllTags.AllItemTags; import com.simibubi.create.Create; import com.simibubi.create.content.contraptions.components.deployer.DeployerApplicationRecipe; -import com.simibubi.create.content.contraptions.components.saw.CuttingRecipe; +import com.simibubi.create.content.contraptions.components.press.PressingRecipe; +import com.simibubi.create.content.contraptions.fluids.actors.FillingRecipe; import com.simibubi.create.content.contraptions.itemAssembly.SequencedAssemblyRecipeBuilder; import net.minecraft.data.DataGenerator; -import net.minecraft.tags.ItemTags; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; -import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.material.Fluids; public class SequencedAssemblyRecipeGen extends CreateRecipeProvider { @@ -47,35 +49,28 @@ public class SequencedAssemblyRecipeGen extends CreateRecipeProvider { .loops(5) .addStep(DeployerApplicationRecipe::new, rb -> rb.require(I.cog())) .addStep(DeployerApplicationRecipe::new, rb -> rb.require(I.largeCog())) - .addStep(DeployerApplicationRecipe::new, rb -> rb.require(I.ironNugget())) - ), + .addStep(DeployerApplicationRecipe::new, rb -> rb.require(I.ironNugget()))), - COGWHEEL = create("cogwheel", b -> b.require(I.andesite()) - .transitionTo(AllItems.INCOMPLETE_COGWHEEL.get()) - .addOutput(new ItemStack(AllBlocks.COGWHEEL.get(), 12), 32) - .addOutput(AllItems.ANDESITE_ALLOY.get(), 2) - .addOutput(Blocks.ANDESITE, 1) - .addOutput(AllBlocks.LARGE_COGWHEEL.get(), 1) - .addOutput(Items.STICK, 1) - .addOutput(Items.IRON_NUGGET, 1) - .loops(4) - .addStep(DeployerApplicationRecipe::new, rb -> rb.require(ItemTags.WOODEN_BUTTONS)) - .addStep(CuttingRecipe::new, rb -> rb.duration(50)) - ), + REINFORCED_SHEET = create("reinforced_sheet", b -> b.require(AllItems.POWDERED_OBSIDIAN.get()) + .transitionTo(AllItems.INCOMPLETE_REINFORCED_SHEET.get()) + .addOutput(AllItems.REINFORCED_SHEET.get(), 1) + .loops(1) + .addStep(FillingRecipe::new, rb -> rb.require(Fluids.LAVA, 500)) + .addStep(PressingRecipe::new, rb -> rb) + .addStep(PressingRecipe::new, rb -> rb)), + + TRACK = create("track", b -> b.require(AllItemTags.SLEEPERS.tag) + .transitionTo(AllItems.INCOMPLETE_TRACK.get()) + .addOutput(AllBlocks.TRACK.get(), 1) + .loops(1) + .addStep(DeployerApplicationRecipe::new, + rb -> rb.require(Ingredient.fromValues( + Stream.of(new Ingredient.TagValue(I.ironNugget()), new Ingredient.TagValue(I.zincNugget()))))) + .addStep(DeployerApplicationRecipe::new, + rb -> rb.require(Ingredient.fromValues( + Stream.of(new Ingredient.TagValue(I.ironNugget()), new Ingredient.TagValue(I.zincNugget()))))) + .addStep(PressingRecipe::new, rb -> rb)) - LARGE_COGWHEEL = create("large_cogwheel", b -> b.require(I.andesite()) - .transitionTo(AllItems.INCOMPLETE_LARGE_COGWHEEL.get()) - .addOutput(new ItemStack(AllBlocks.LARGE_COGWHEEL.get(), 6), 32) - .addOutput(AllItems.ANDESITE_ALLOY.get(), 2) - .addOutput(Blocks.ANDESITE, 1) - .addOutput(AllBlocks.COGWHEEL.get(), 1) - .addOutput(Items.STICK, 1) - .addOutput(Items.IRON_NUGGET, 1) - .loops(3) - .addStep(DeployerApplicationRecipe::new, rb -> rb.require(I.planks())) - .addStep(DeployerApplicationRecipe::new, rb -> rb.require(ItemTags.WOODEN_BUTTONS)) - .addStep(CuttingRecipe::new, rb -> rb.duration(50)) - ) ; public SequencedAssemblyRecipeGen(DataGenerator p_i48262_1_) { diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java index 9e1c46f87..885dfa8d0 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java @@ -114,10 +114,8 @@ public class StandardRecipeGen extends CreateRecipeProvider { ELECTRON_TUBE = create(AllItems.ELECTRON_TUBE).unlockedBy(AllItems.ROSE_QUARTZ::get) .viaShaped(b -> b.define('L', AllItems.POLISHED_ROSE_QUARTZ.get()) - .define('R', Items.REDSTONE_TORCH) - .define('N', Tags.Items.NUGGETS_IRON) + .define('N', I.ironSheet()) .pattern("L") - .pattern("R") .pattern("N")), ROSE_QUARTZ = create(AllItems.ROSE_QUARTZ).unlockedBy(() -> Items.REDSTONE) @@ -214,22 +212,19 @@ public class StandardRecipeGen extends CreateRecipeProvider { .viaShaped(b -> b.define('A', I.brassNugget()) .pattern("AAA")), - COGWHEEL = create(AllBlocks.COGWHEEL).returns(8) - .unlockedBy(I::andesite) - .viaShaped(b -> b.define('S', ItemTags.WOODEN_BUTTONS) - .define('C', I.andesite()) - .pattern("SSS") - .pattern("SCS") - .pattern("SSS")), + COGWHEEL = create(AllBlocks.COGWHEEL).unlockedBy(I::andesite) + .viaShapeless(b -> b.requires(I.shaft()) + .requires(I.planks())), - LARGE_COGWHEEL = create(AllBlocks.LARGE_COGWHEEL).returns(2) + LARGE_COGWHEEL = create(AllBlocks.LARGE_COGWHEEL).unlockedBy(I::andesite) + .viaShapeless(b -> b.requires(I.shaft()) + .requires(I.planks()) + .requires(I.planks())), + + LARGE_COGWHEEL_FROM_LITTLE = create(AllBlocks.LARGE_COGWHEEL).withSuffix("from_little") .unlockedBy(I::andesite) - .viaShaped(b -> b.define('S', ItemTags.WOODEN_BUTTONS) - .define('C', I.andesite()) - .define('D', ItemTags.PLANKS) - .pattern("SDS") - .pattern("DCD") - .pattern("SDS")), + .viaShapeless(b -> b.requires(I.cog()) + .requires(I.planks())), WATER_WHEEL = create(AllBlocks.WATER_WHEEL).unlockedBy(I::andesite) .viaShaped(b -> b.define('S', ItemTags.WOODEN_SLABS) @@ -245,31 +240,26 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("A")), MECHANICAL_PRESS = create(AllBlocks.MECHANICAL_PRESS).unlockedBy(I::andesiteCasing) - .viaShaped(b -> b.define('B', I.andesite()) - .define('S', I.cog()) - .define('C', I.andesiteCasing()) + .viaShaped(b -> b.define('C', I.andesiteCasing()) .define('I', AllTags.forgeItemTag("storage_blocks/iron")) - .pattern(" B ") - .pattern("SCS") - .pattern(" I ")), + .pattern("C") + .pattern("I")), - MILLSTONE = create(AllBlocks.MILLSTONE).unlockedBy(I::andesite) - .viaShaped(b -> b.define('B', ItemTags.PLANKS) - .define('S', I.andesite()) - .define('C', I.cog()) + MILLSTONE = create(AllBlocks.MILLSTONE).unlockedBy(I::andesiteCasing) + .viaShaped(b -> b.define('C', I.cog()) + .define('S', I.andesiteCasing()) .define('I', I.stone()) - .pattern(" B ") - .pattern("SCS") - .pattern(" I ")), + .pattern("C") + .pattern("S") + .pattern("I")), MECHANICAL_PISTON = create(AllBlocks.MECHANICAL_PISTON).unlockedBy(I::andesiteCasing) .viaShaped(b -> b.define('B', ItemTags.PLANKS) - .define('S', I.cog()) .define('C', I.andesiteCasing()) .define('I', AllBlocks.PISTON_EXTENSION_POLE.get()) - .pattern(" B ") - .pattern("SCS") - .pattern(" I ")), + .pattern("B") + .pattern("C") + .pattern("I")), STICKY_MECHANICAL_PISTON = create(AllBlocks.STICKY_MECHANICAL_PISTON).unlockedBy(I::andesite) .viaShaped(b -> b.define('S', Tags.Items.SLIMEBALLS) @@ -295,10 +285,9 @@ public class StandardRecipeGen extends CreateRecipeProvider { .viaShaped(b -> b.define('B', ItemTags.PLANKS) .define('S', I.cog()) .define('C', I.andesiteCasing()) - .define('I', I.shaft()) - .pattern(" B ") - .pattern("ICI") - .pattern(" S ")), + .pattern("B") + .pattern("C") + .pattern("S")), GANTRY_SHAFT = create(AllBlocks.GANTRY_SHAFT).returns(8) .unlockedBy(I::andesite) @@ -319,19 +308,14 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("DDD") .pattern("DDD")), - ADJUSTABLE_PULLEY = create(AllBlocks.ADJUSTABLE_CHAIN_GEARSHIFT).unlockedBy(I::brassCasing) - .viaShaped(b -> b.define('A', I.electronTube()) - .define('B', AllBlocks.ENCASED_CHAIN_DRIVE.get()) - .define('C', AllBlocks.LARGE_COGWHEEL.get()) - .pattern("A") - .pattern("B") - .pattern("C")), + ADJUSTABLE_PULLEY = create(AllBlocks.ADJUSTABLE_CHAIN_GEARSHIFT).unlockedBy(I::electronTube) + .viaShapeless(b -> b.requires(AllBlocks.ENCASED_CHAIN_DRIVE.get()) + .requires(I.electronTube())), CART_ASSEMBLER = create(AllBlocks.CART_ASSEMBLER).unlockedBy(I::andesite) .viaShaped(b -> b.define('L', ItemTags.LOGS) .define('R', I.redstone()) .define('C', I.andesite()) - .pattern(" L ") .pattern("CRC") .pattern("L L")), @@ -347,8 +331,6 @@ public class StandardRecipeGen extends CreateRecipeProvider { HAND_CRANK = create(AllBlocks.HAND_CRANK).unlockedBy(I::andesite) .viaShaped(b -> b.define('A', I.andesite()) .define('C', ItemTags.PLANKS) - .define('S', I.shaft()) - .pattern(" S ") .pattern("CCC") .pattern(" A")), @@ -384,58 +366,47 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("SSS")), ENCASED_FAN = create(AllBlocks.ENCASED_FAN).unlockedByTag(I::ironSheet) - .viaShaped(b -> b.define('S', I.shaft()) - .define('A', I.andesiteCasing()) - .define('R', I.cog()) + .viaShaped(b -> b.define('A', I.andesiteCasing()) .define('P', AllItems.PROPELLER.get()) - .pattern(" S ") - .pattern("RAR") - .pattern(" P ")), + .pattern("A") + .pattern("P")), CUCKOO_CLOCK = create(AllBlocks.CUCKOO_CLOCK).unlockedBy(I::andesite) .viaShaped(b -> b.define('S', ItemTags.PLANKS) .define('A', Items.CLOCK) - .define('B', ItemTags.LOGS) - .define('P', I.cog()) - .pattern(" S ") - .pattern("SAS") - .pattern("BPB")), + .define('C', I.andesiteCasing()) + .pattern("S") + .pattern("C") + .pattern("A")), MECHANICAL_CRAFTER = create(AllBlocks.MECHANICAL_CRAFTER).returns(3) .unlockedBy(I::brassCasing) .viaShaped(b -> b.define('B', I.electronTube()) .define('R', Blocks.CRAFTING_TABLE) .define('C', I.brassCasing()) - .define('S', I.cog()) - .pattern(" B ") - .pattern("SCS") - .pattern(" R ")), + .pattern("B") + .pattern("C") + .pattern("R")), WINDMILL_BEARING = create(AllBlocks.WINDMILL_BEARING).unlockedBy(I::andesite) - .viaShaped(b -> b.define('I', I.shaft()) - .define('B', AllBlocks.TURNTABLE.get()) + .viaShaped(b -> b.define('B', AllBlocks.TURNTABLE.get()) .define('C', I.stone()) - .pattern(" B ") - .pattern(" C ") - .pattern(" I ")), + .pattern("B") + .pattern("C")), MECHANICAL_BEARING = create(AllBlocks.MECHANICAL_BEARING).unlockedBy(I::andesiteCasing) - .viaShaped(b -> b.define('I', I.shaft()) - .define('S', I.andesite()) - .define('B', AllBlocks.TURNTABLE.get()) + .viaShaped(b -> b.define('B', AllBlocks.TURNTABLE.get()) .define('C', I.andesiteCasing()) - .pattern(" B ") - .pattern("SCS") - .pattern(" I ")), + .pattern("B") + .pattern("C")), CLOCKWORK_BEARING = create(AllBlocks.CLOCKWORK_BEARING).unlockedBy(I::brassCasing) - .viaShaped(b -> b.define('I', I.shaft()) - .define('S', I.electronTube()) + .viaShaped(b -> b.define('S', I.electronTube()) .define('B', AllBlocks.TURNTABLE.get()) .define('C', I.brassCasing()) - .pattern(" B ") - .pattern("SCS") - .pattern(" I ")), + .pattern("B") + .pattern("C") + .pattern("S")), WOODEN_BRACKET = create(AllBlocks.WOODEN_BRACKET).returns(4) .unlockedBy(I::andesite) @@ -453,6 +424,33 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("SSS") .pattern("PCP")), + METAL_GIRDER = create(AllBlocks.METAL_GIRDER).returns(8) + .unlockedBy(I::andesite) + .viaShaped(b -> b.define('P', I.ironSheet()) + .define('C', I.andesite()) + .pattern("PPP") + .pattern("CCC")), + + DISPLAY_BOARD = create(AllBlocks.DISPLAY_BOARD).returns(2) + .unlockedBy(I::andesite) + .viaShaped(b -> b.define('A', I.electronTube()) + .define('P', I.andesite()) + .pattern("PAP")), + + STEAM_WHISTLE = create(AllBlocks.STEAM_WHISTLE).unlockedBy(I::copper) + .viaShaped(b -> b.define('P', I.goldSheet()) + .define('C', I.copper()) + .pattern("P") + .pattern("C")), + + STEAM_ENGINE = create(AllBlocks.STEAM_ENGINE).unlockedBy(I::copper) + .viaShaped(b -> b.define('P', I.goldSheet()) + .define('C', I.copperBlock()) + .define('A', I.andesite()) + .pattern("P") + .pattern("A") + .pattern("C")), + FLUID_PIPE = create(AllBlocks.FLUID_PIPE).returns(4) .unlockedBy(I::copper) .viaShaped(b -> b.define('S', I.copperSheet()) @@ -472,20 +470,14 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("P")), FLUID_VALVE = create(AllBlocks.FLUID_VALVE).unlockedBy(I::copper) - .viaShaped(b -> b.define('P', I.shaft()) - .define('S', AllBlocks.FLUID_PIPE.get()) - .define('I', I.ironSheet()) - .pattern("I") - .pattern("S") - .pattern("P")), + .viaShapeless(b -> b.requires(I.ironSheet()) + .requires(AllBlocks.FLUID_PIPE.get())), SPOUT = create(AllBlocks.SPOUT).unlockedBy(I::copperCasing) - .viaShaped(b -> b.define('T', AllBlocks.FLUID_TANK.get()) + .viaShaped(b -> b.define('T', I.copperCasing()) .define('P', Items.DRIED_KELP) - .define('S', I.copperNugget()) .pattern("T") - .pattern("P") - .pattern("S")), + .pattern("P")), ITEM_DRAIN = create(AllBlocks.ITEM_DRAIN).unlockedBy(I::copperCasing) .viaShaped(b -> b.define('P', Blocks.IRON_BARS) @@ -507,14 +499,35 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("C") .pattern("B")), + TRAIN_SIGNAL = create(AllBlocks.TRACK_SIGNAL).unlockedBy(I::railwayCasing) + .returns(4) + .viaShapeless(b -> b.requires(I.railwayCasing()) + .requires(I.electronTube())), + + TRAIN_SCHEDULE = create(AllItems.SCHEDULE).unlockedByTag(I::reinforcedSheet) + .returns(4) + .viaShapeless(b -> b.requires(I.reinforcedSheet()) + .requires(Items.PAPER)), + + TRAIN_STATION = create(AllBlocks.TRACK_STATION).unlockedBy(I::railwayCasing) + .viaShapeless(b -> b.requires(I.railwayCasing()) + .requires(Items.COMPASS)), + + TRAIN_CONTROLS = create(AllBlocks.CONTROLS).unlockedBy(I::railwayCasing) + .viaShaped(b -> b.define('I', I.precisionMechanism()) + .define('B', Items.LEVER) + .define('C', I.railwayCasing()) + .pattern("B") + .pattern("C") + .pattern("I")), + DEPLOYER = create(AllBlocks.DEPLOYER).unlockedBy(I::electronTube) .viaShaped(b -> b.define('I', AllItems.BRASS_HAND.get()) .define('B', I.electronTube()) - .define('S', I.cog()) .define('C', I.andesiteCasing()) - .pattern(" B ") - .pattern("SCS") - .pattern(" I ")), + .pattern("B") + .pattern("C") + .pattern("I")), PORTABLE_STORAGE_INTERFACE = create(AllBlocks.PORTABLE_STORAGE_INTERFACE).unlockedBy(I::andesiteCasing) .viaShapeless(b -> b.requires(I.andesiteCasing()) @@ -525,36 +538,35 @@ public class StandardRecipeGen extends CreateRecipeProvider { .requires(AllBlocks.CHUTE.get())), ROPE_PULLEY = create(AllBlocks.ROPE_PULLEY).unlockedBy(I::andesite) - .viaShaped(b -> b.define('S', I.shaft()) - .define('B', I.andesiteCasing()) + .viaShaped(b -> b.define('B', I.andesiteCasing()) .define('C', ItemTags.WOOL) .define('I', I.ironSheet()) - .pattern(" B ") - .pattern("SCS") - .pattern(" I ")), + .pattern("B") + .pattern("C") + .pattern("I")), HOSE_PULLEY = create(AllBlocks.HOSE_PULLEY).unlockedBy(I::copper) - .viaShaped(b -> b.define('S', I.shaft()) - .define('P', AllBlocks.FLUID_PIPE.get()) - .define('B', I.copperCasing()) - .define('C', Items.DRIED_KELP) + .viaShaped(b -> b.define('B', I.copperCasing()) + .define('C', Items.DRIED_KELP_BLOCK) .define('I', I.copperSheet()) - .pattern(" B ") - .pattern("SCP") - .pattern(" I ")), + .pattern("B") + .pattern("C") + .pattern("I")), EMPTY_BLAZE_BURNER = create(AllItems.EMPTY_BLAZE_BURNER).unlockedByTag(I::iron) - .viaShaped(b -> b.define('A', Blocks.IRON_BARS) + .viaShaped(b -> b.define('A', Tags.Items.NETHERRACK) .define('I', I.ironSheet()) - .pattern("II") - .pattern("AA")), + .pattern(" I ") + .pattern("IAI") + .pattern(" I ")), CHUTE = create(AllBlocks.CHUTE).unlockedBy(I::andesite) .returns(4) .viaShaped(b -> b.define('A', I.ironSheet()) - .define('I', I.andesite()) - .pattern("II") - .pattern("AA")), + .define('I', I.iron()) + .pattern("A") + .pattern("I") + .pattern("A")), SMART_CHUTE = create(AllBlocks.SMART_CHUTE).unlockedBy(AllBlocks.CHUTE::get) .viaShaped(b -> b.define('P', I.electronTube()) @@ -587,45 +599,30 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("IC ")), MECHANICAL_MIXER = create(AllBlocks.MECHANICAL_MIXER).unlockedBy(I::andesite) - .viaShaped(b -> b.define('S', I.cog()) - .define('B', I.andesite()) - .define('C', I.andesiteCasing()) + .viaShaped(b -> b.define('C', I.andesiteCasing()) .define('I', AllItems.WHISK.get()) - .pattern(" B ") - .pattern("SCS") - .pattern(" I ")), + .pattern("C") + .pattern("I")), - CLUTCH = create(AllBlocks.CLUTCH).unlockedBy(I::andesite) - .viaShaped(b -> b.define('S', I.shaft()) - .define('B', I.redstone()) - .define('C', I.andesiteCasing()) - .pattern(" B ") - .pattern("SCS") - .pattern(" B ")), + CLUTCH = create(AllBlocks.CLUTCH).unlockedBy(I::andesiteCasing) + .viaShapeless(b -> b.requires(I.andesiteCasing()) + .requires(I.shaft()) + .requires(I.redstone())), - GEARSHIFT = create(AllBlocks.GEARSHIFT).unlockedBy(I::andesite) - .viaShaped(b -> b.define('S', I.cog()) - .define('B', I.redstone()) - .define('C', I.andesiteCasing()) - .pattern(" B ") - .pattern("SCS") - .pattern(" B ")), + GEARSHIFT = create(AllBlocks.GEARSHIFT).unlockedBy(I::andesiteCasing) + .viaShapeless(b -> b.requires(I.andesiteCasing()) + .requires(I.cog()) + .requires(I.redstone())), - SAIL_FRAME = create(AllBlocks.SAIL_FRAME).returns(8) + SAIL = create(AllBlocks.SAIL).returns(2) .unlockedBy(I::andesite) - .viaShaped(b -> b.define('A', I.andesite()) + .viaShaped(b -> b.define('W', ItemTags.WOOL) .define('S', Tags.Items.RODS_WOODEN) - .pattern("SSS") - .pattern("SAS") - .pattern("SSS")), + .define('A', I.andesite()) + .pattern("WS") + .pattern("SA")), - SAIL = create(AllBlocks.SAIL).returns(8) - .unlockedBy(AllBlocks.SAIL_FRAME::get) - .viaShaped(b -> b.define('F', AllBlocks.SAIL_FRAME.get()) - .define('W', ItemTags.WOOL) - .pattern("FFF") - .pattern("FWF") - .pattern("FFF")), + SAIL_CYCLE = conversionCycle(ImmutableList.of(AllBlocks.SAIL_FRAME, AllBlocks.SAIL)), RADIAL_CHASIS = create(AllBlocks.RADIAL_CHASSIS).returns(3) .unlockedBy(I::andesite) @@ -679,35 +676,34 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("CBC") .pattern(" C ")), - ENCASED_CHAIN_DRIVE = create(AllBlocks.ENCASED_CHAIN_DRIVE).returns(2) - .unlockedBy(I::andesiteCasing) - .viaShaped(b -> b.define('S', I.shaft()) - .define('B', Tags.Items.NUGGETS_IRON) - .define('C', I.andesiteCasing()) - .pattern(" B ") - .pattern("SCS") - .pattern(" B ")), + ENCASED_CHAIN_DRIVE = create(AllBlocks.ENCASED_CHAIN_DRIVE).unlockedBy(I::andesiteCasing) + .viaShapeless(b -> b.requires(I.andesiteCasing()) + .requires(Items.CHAIN)), + + FLYWHEEL = create(AllBlocks.FLYWHEEL).unlockedByTag(I::brass) + .viaShaped(b -> b.define('C', I.brass()) + .define('A', I.shaft()) + .pattern("CCC") + .pattern("CAC") + .pattern("CCC")), SPEEDOMETER = create(AllBlocks.SPEEDOMETER).unlockedBy(I::andesite) .viaShaped(b -> b.define('C', Items.COMPASS) .define('A', I.andesiteCasing()) - .define('S', I.shaft()) - .pattern(" C ") - .pattern("SAS")), + .pattern("C") + .pattern("A")), GAUGE_CYCLE = conversionCycle(ImmutableList.of(AllBlocks.SPEEDOMETER, AllBlocks.STRESSOMETER)), ROTATION_SPEED_CONTROLLER = create(AllBlocks.ROTATION_SPEED_CONTROLLER).unlockedBy(I::brassCasing) .viaShaped(b -> b.define('B', I.precisionMechanism()) .define('C', I.brassCasing()) - .define('S', I.shaft()) - .pattern(" B ") - .pattern("SCS")), + .pattern("B") + .pattern("C")), NIXIE_TUBE = create(AllBlocks.ORANGE_NIXIE_TUBE).unlockedBy(I::brassCasing) - .viaShaped(b -> b.define('E', I.electronTube()) - .define('B', I.brassCasing()) - .pattern("EBE")), + .viaShapeless(b -> b.requires(I.electronTube()) + .requires(I.electronTube())), MECHANICAL_SAW = create(AllBlocks.MECHANICAL_SAW).unlockedBy(I::andesiteCasing) .viaShaped(b -> b.define('C', I.andesiteCasing()) @@ -743,12 +739,11 @@ public class StandardRecipeGen extends CreateRecipeProvider { SEQUENCED_GEARSHIFT = create(AllBlocks.SEQUENCED_GEARSHIFT).unlockedBy(I::brassCasing) .viaShaped(b -> b.define('B', I.electronTube()) - .define('S', I.cog()) .define('C', I.brassCasing()) .define('I', Items.CLOCK) - .pattern(" B ") - .pattern("SCS") - .pattern(" I ")) + .pattern("B") + .pattern("C") + .pattern("I")) ; @@ -769,16 +764,17 @@ public class StandardRecipeGen extends CreateRecipeProvider { .unlockedBy(I::andesite) .viaShaped(b -> b.define('A', I.andesite()) .define('K', Items.DRIED_KELP) - .pattern("AKA") - .pattern(" K ")), + .pattern("A") + .pattern("K")), BRASS_FUNNEL = create(AllBlocks.BRASS_FUNNEL).returns(2) .unlockedByTag(I::brass) - .viaShaped(b -> b.define('A', I.brass()) + .viaShaped(b -> b.define('A', I.brassSheet()) .define('K', Items.DRIED_KELP) .define('E', I.electronTube()) - .pattern("AEA") - .pattern(" K ")), + .pattern("E") + .pattern("A") + .pattern("K")), ANDESITE_TUNNEL = create(AllBlocks.ANDESITE_TUNNEL).returns(2) .unlockedBy(I::andesite) @@ -796,21 +792,15 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("AA") .pattern("KK")), - BELT_OBSERVER = create(AllBlocks.CONTENT_OBSERVER).unlockedBy(AllItems.BELT_CONNECTOR::get) + CONTENT_OBSERVER = create(AllBlocks.CONTENT_OBSERVER).unlockedBy(AllItems.BELT_CONNECTOR::get) .viaShaped(b -> b.define('B', I.brassCasing()) - .define('R', I.redstone()) - .define('I', I.iron()) - .define('C', Blocks.OBSERVER) - .pattern("RCI") - .pattern(" B ")), + .define('R', I.electronTube()) + .define('I', Blocks.COMPARATOR) + .pattern("I") + .pattern("B") + .pattern("R")), - STOCKPILE_SWITCH = create(AllBlocks.STOCKPILE_SWITCH).unlockedBy(I::brassCasing) - .viaShaped(b -> b.define('B', I.brassCasing()) - .define('R', I.redstone()) - .define('I', I.iron()) - .define('C', Blocks.COMPARATOR) - .pattern("RCI") - .pattern(" B ")), + OBSERVER_CYCLE = conversionCycle(ImmutableList.of(AllBlocks.CONTENT_OBSERVER, AllBlocks.STOCKPILE_SWITCH)), PULSE_EXTENDER = create(AllBlocks.PULSE_EXTENDER).unlockedByTag(I::redstone) .viaShaped(b -> b.define('T', Blocks.REDSTONE_TORCH) @@ -847,12 +837,19 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("SSS")), REDSTONE_LINK = create(AllBlocks.REDSTONE_LINK).returns(2) - .unlockedByTag(I::brass) + .unlockedBy(I::brassCasing) .viaShaped(b -> b.define('C', Blocks.REDSTONE_TORCH) - .define('S', I.brassSheet()) - .define('I', ItemTags.PLANKS) - .pattern(" C") - .pattern("SIS")) + .define('S', I.brassCasing()) + .pattern("C") + .pattern("S")), + + DISPLAY_LINK = create(AllBlocks.DISPLAY_LINK).unlockedBy(I::brassCasing) + .viaShaped(b -> b.define('C', Blocks.REDSTONE_TORCH) + .define('A', I.copperSheet()) + .define('S', I.brassCasing()) + .pattern("C") + .pattern("S") + .pattern("A")) ; @@ -870,12 +867,11 @@ public class StandardRecipeGen extends CreateRecipeProvider { SCHEMATICANNON = create(AllBlocks.SCHEMATICANNON).unlockedBy(AllItems.EMPTY_SCHEMATIC::get) .viaShaped(b -> b.define('L', ItemTags.LOGS) .define('D', Blocks.DISPENSER) - .define('C', Blocks.CAULDRON) .define('S', Blocks.SMOOTH_STONE) .define('I', Blocks.IRON_BLOCK) - .pattern(" C ") - .pattern("LDL") - .pattern("SIS")), + .pattern(" I ") + .pattern("LIL") + .pattern("SDS")), EMPTY_SCHEMATIC = create(AllItems.EMPTY_SCHEMATIC).unlockedBy(() -> Items.PAPER) .viaShapeless(b -> b.requires(Items.PAPER) diff --git a/src/main/resources/assets/create/lang/default/interface.json b/src/main/resources/assets/create/lang/default/interface.json index 6946ad3a7..428d5026d 100644 --- a/src/main/resources/assets/create/lang/default/interface.json +++ b/src/main/resources/assets/create/lang/default/interface.json @@ -669,6 +669,7 @@ "create.train_assembly.no_controls": "At least one forward-facing controls block needs to be mounted on the train", "create.train_assembly.sideways_controls": "A mounted controls block is facing sideways", "create.train_assembly.bogey_created": "Bogey created. Click again to cycle type", + "create.train_assembly.requires_casing": "Use Railway Casing to create bogeys on tracks", "create.track_target.set": "Targeted track selected", "create.track_target.success": "Successfully bound to targeted track", diff --git a/src/main/resources/assets/create/models/item/incomplete_cogwheel.json b/src/main/resources/assets/create/models/item/incomplete_cogwheel.json deleted file mode 100644 index ca83f56ca..000000000 --- a/src/main/resources/assets/create/models/item/incomplete_cogwheel.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "create:block/large_wheels", - "texture_size": [32, 32], - "textures": { - "0": "create:block/axis", - "3": "create:block/axis_top", - "1_2": "create:block/cogwheel", - "particle": "block/stripped_spruce_log" - }, - "elements": [ - { - "name": "Axis", - "from": [6, 0, 6], - "to": [10, 16, 10], - "faces": { - "north": {"uv": [6, 0, 10, 16], "texture": "#0"}, - "east": {"uv": [6, 0, 10, 16], "texture": "#0"}, - "south": {"uv": [6, 0, 10, 16], "texture": "#0"}, - "west": {"uv": [6, 0, 10, 16], "texture": "#0"}, - "up": {"uv": [6, 6, 10, 10], "texture": "#3"}, - "down": {"uv": [6, 6, 10, 10], "texture": "#3"} - } - }, - { - "name": "GearCaseInner", - "from": [2, 7, 2], - "to": [14, 9, 14], - "faces": { - "north": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, - "east": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, - "south": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, - "west": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, - "up": {"uv": [4, 0, 10, 6], "texture": "#1_2"}, - "down": {"uv": [4, 0, 10, 6], "texture": "#1_2"} - } - }, - { - "name": "GearCaseOuter", - "from": [4, 6, 4], - "to": [12, 10, 12], - "faces": { - "north": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, - "east": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, - "south": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, - "west": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#1_2"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1_2"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/incomplete_large_cogwheel.json b/src/main/resources/assets/create/models/item/incomplete_large_cogwheel.json deleted file mode 100644 index 9532ae92e..000000000 --- a/src/main/resources/assets/create/models/item/incomplete_large_cogwheel.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "create:block/large_wheels", - "texture_size": [32, 32], - "textures": { - "0": "create:block/axis", - "3": "create:block/axis_top", - "4": "create:block/large_cogwheel", - "particle": "block/stripped_spruce_log" - }, - "elements": [ - { - "name": "Axis", - "from": [6, 0, 6], - "to": [10, 16, 10], - "faces": { - "north": {"uv": [6, 0, 10, 16], "texture": "#0"}, - "east": {"uv": [6, 0, 10, 16], "texture": "#0"}, - "south": {"uv": [6, 0, 10, 16], "texture": "#0"}, - "west": {"uv": [6, 0, 10, 16], "texture": "#0"}, - "up": {"uv": [6, 6, 10, 10], "texture": "#3"}, - "down": {"uv": [6, 6, 10, 10], "texture": "#3"} - } - }, - { - "name": "GearCaseInner", - "from": [-2, 7, -2], - "to": [18, 9, 18], - "faces": { - "north": {"uv": [0, 10, 10, 11], "texture": "#4"}, - "east": {"uv": [0, 10, 10, 11], "texture": "#4"}, - "south": {"uv": [0, 10, 10, 11], "texture": "#4"}, - "west": {"uv": [0, 10, 10, 11], "texture": "#4"}, - "up": {"uv": [0, 0, 10, 10], "texture": "#4"}, - "down": {"uv": [0, 0, 10, 10], "texture": "#4"} - } - }, - { - "name": "GearCaseOuter", - "from": [1, 5.5, 1], - "to": [15, 10.5, 15], - "faces": { - "north": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, - "east": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, - "south": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, - "west": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, - "up": {"uv": [1.5, 1.5, 8.5, 8.5], "texture": "#4"}, - "down": {"uv": [1.5, 1.5, 8.5, 8.5], "texture": "#4"} - } - }, - { - "name": "GearCaseOuter", - "from": [-1, 5.5, 1], - "to": [1, 10.5, 15], - "faces": { - "north": {"uv": [10, 0, 12.5, 1], "rotation": 90, "texture": "#4"}, - "east": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, - "south": {"uv": [10, 6, 12.5, 7], "rotation": 90, "texture": "#4"}, - "west": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, - "up": {"uv": [7, 15, 14, 16], "rotation": 90, "texture": "#4"}, - "down": {"uv": [7, 15, 14, 16], "rotation": 90, "texture": "#4"} - } - }, - { - "name": "GearCaseOuter", - "from": [15, 5.5, 1], - "to": [17, 10.5, 15], - "faces": { - "north": {"uv": [10, 6, 12.5, 7], "rotation": 90, "texture": "#4"}, - "east": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, - "south": {"uv": [10, 0, 12.5, 1], "rotation": 90, "texture": "#4"}, - "west": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, - "up": {"uv": [0, 15, 7, 16], "rotation": 270, "texture": "#4"}, - "down": {"uv": [0, 15, 7, 16], "rotation": 270, "texture": "#4"} - } - }, - { - "name": "GearCaseOuter", - "from": [1, 5.5, -1], - "to": [15, 10.5, 1], - "faces": { - "north": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, - "east": {"uv": [10, 0, 12.5, 1], "rotation": 90, "texture": "#4"}, - "south": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, - "west": {"uv": [10, 6, 12.5, 7], "rotation": 90, "texture": "#4"}, - "up": {"uv": [7, 14, 14, 15], "rotation": 180, "texture": "#4"}, - "down": {"uv": [0, 14, 7, 15], "texture": "#4"} - } - }, - { - "name": "GearCaseOuter", - "from": [1, 5.5, 15], - "to": [15, 10.5, 17], - "faces": { - "north": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, - "east": {"uv": [10, 6, 12.5, 7], "rotation": 90, "texture": "#4"}, - "south": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, - "west": {"uv": [10, 0, 12.5, 1], "rotation": 90, "texture": "#4"}, - "up": {"uv": [0, 14, 7, 15], "texture": "#4"}, - "down": {"uv": [7, 14, 14, 15], "rotation": 180, "texture": "#4"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/incomplete_netherrack.json b/src/main/resources/assets/create/models/item/incomplete_netherrack.json deleted file mode 100644 index d69068a1c..000000000 --- a/src/main/resources/assets/create/models/item/incomplete_netherrack.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "create:block/incomplete_netherrack" - } -} diff --git a/src/main/resources/assets/create/textures/item/incomplete_track.png b/src/main/resources/assets/create/textures/item/incomplete_track.png new file mode 100644 index 0000000000000000000000000000000000000000..b1f12709537d50191da4131ab98caf1a87edc346 GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|&0G|-oG*83ZyH_VBCU$mqdYh`WN7&y!vG2;2E1NfOc5!iOPp}6nJi1<3 z2T1Xh1o;L3M*s$)`{&L9#W@Q+B8wRq_zr+DW7f4!PM~0%r;B5VM)2G|Z?OXk9L&iF zRz3aqJ$J=l+v#WB(v<83z3aI5{1alml6cI!;;zHyYrUEwOJ4diCvN@_rSQaI(Z-AA z;(ZsiD&xw;U;R~_Z*-f-$@x_0cYC=#N7cJKEEuNV;V2O4698Jtz~JfX=d#Wzp$P!d C`DH=? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/item/reinforced_sheet.png b/src/main/resources/assets/create/textures/item/reinforced_sheet.png new file mode 100644 index 0000000000000000000000000000000000000000..66375197d50200b25d60576f7c48223d9a3f9eb6 GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}H0G|+7Nof^lr$BCA(V)P@g1n}_-i2CP<`x!i%&a^>B{xO#8i5p7NswRg ze;8ocbVlbqP?WR4BeIx*f$uN~Gak=hkpdKq@pN$v(FmS;#*^=W0SB|g0iB2c<@Flf z)>f_7-^i{xW&R(AUAHScBA1= u>SsObTakUXanjCrCQIg2KA6g%61Q24?O)f!je0NS%G}50G|+73kx?%X_bP!CT?EQzTSmFfr-vefoI$_9{1QkxfG+NWzNjXQ*WmO zR36&@>J*UTD+%%o{*Me8To2qi0hHk^@Q5r1DmV&p1}-*w)ev|0ad$=^A?;)8!3L*Fb@hb!-bubz|G{9s+M%O^1#EyqyT-yEC< z&ot&vkG>wva=!G4D5<6OMz Tci8)ZmNIy{`njxgN@xNAS|Mss literal 0 HcmV?d00001