From 0b40a57227030f7f3f871244807b15bb8a39f0f8 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Tue, 6 Jul 2021 00:54:24 +0200 Subject: [PATCH] Instant Spook - Clockwork Component -> Precision Mechanism - Re-organized bell models - Added a little warm-up timer for held haunted bells - Tweaks to all Sequenced assembly recipes - Fixed missing particle of incomplete cogwheels - Sequenced Assembly mid-products are no longer stackable --- src/generated/resources/.cache/cache | 74 +-- .../create/blockstates/haunted_bell.json | 64 +-- .../create/blockstates/peculiar_bell.json | 64 +-- .../resources/assets/create/lang/en_ud.json | 4 +- .../resources/assets/create/lang/en_us.json | 14 +- .../assets/create/lang/unfinished/de_de.json | 14 +- .../assets/create/lang/unfinished/es_es.json | 14 +- .../assets/create/lang/unfinished/es_mx.json | 14 +- .../assets/create/lang/unfinished/fr_fr.json | 14 +- .../assets/create/lang/unfinished/it_it.json | 14 +- .../assets/create/lang/unfinished/ja_jp.json | 14 +- .../assets/create/lang/unfinished/ko_kr.json | 14 +- .../assets/create/lang/unfinished/nl_nl.json | 14 +- .../assets/create/lang/unfinished/pl_pl.json | 14 +- .../assets/create/lang/unfinished/pt_br.json | 14 +- .../assets/create/lang/unfinished/ru_ru.json | 14 +- .../assets/create/lang/unfinished/zh_cn.json | 14 +- .../assets/create/lang/unfinished/zh_tw.json | 14 +- .../models/block/haunted_bell_ceiling.json | 3 + .../block/haunted_bell_double_wall.json | 3 + .../models/block/haunted_bell_floor.json | 3 + .../block/haunted_bell_single_wall.json | 3 + .../models/block/peculiar_bell_ceiling.json | 3 + .../block/peculiar_bell_double_wall.json | 3 + .../models/block/peculiar_bell_floor.json | 3 + .../block/peculiar_bell_single_wall.json | 3 + .../create/models/item/haunted_bell.json | 2 +- ...on => incomplete_precision_mechanism.json} | 2 +- .../create/models/item/peculiar_bell.json | 2 +- ...omponent.json => precision_mechanism.json} | 2 +- .../advancements/clockwork_component_eob.json | 4 +- .../create/advancements/extendo_grip.json | 2 +- .../create/advancements/potato_cannon.json | 2 +- ...omponent.json => precision_mechanism.json} | 8 +- .../create/advancements/speed_controller.json | 2 +- .../crafting/kinetics/mechanical_arm.json | 2 +- .../kinetics/rotation_speed_controller.json | 2 +- .../mechanical_crafting/extendo_grip.json | 2 +- .../mechanical_crafting/potato_cannon.json | 2 +- .../recipes/sequenced_assembly/cogwheel.json | 38 +- .../sequenced_assembly/large_cogwheel.json | 40 +- ...omponent.json => precision_mechanism.json} | 41 +- .../com/simibubi/create/AllBlockPartials.java | 4 +- .../java/com/simibubi/create/AllItems.java | 14 +- .../category/SequencedAssemblyCategory.java | 2 +- .../SequencedAssemblySubCategory.java | 2 +- .../itemAssembly/SequencedAssemblyItem.java | 2 +- .../curiosities/bell/HauntedBellPulser.java | 37 +- .../advancement/AllAdvancements.java | 6 +- .../foundation/data/BuilderTransformers.java | 11 +- .../data/recipe/CreateRecipeProvider.java | 4 +- .../recipe/MechanicalCraftingRecipeGen.java | 4 +- .../recipe/SequencedAssemblyRecipeGen.java | 46 +- .../data/recipe/StandardRecipeGen.java | 4 +- .../create/lang/default/advancements.json | 4 +- .../assets/create/lang/default/tooltips.json | 6 +- .../block_ceiling.json | 0 .../block_double_wall.json | 0 .../block_floor.json | 0 .../block_single_wall.json | 0 .../bell.json => haunted_bell.json} | 11 +- .../models/block/haunted_bell/bell.json | 436 ------------------ .../block/haunted_bell/block_ceiling.json | 37 -- .../block/haunted_bell/block_double_wall.json | 32 -- .../block/haunted_bell/block_floor.json | 35 -- .../block/haunted_bell/block_single_wall.json | 30 -- .../models/block/haunted_bell/item.json | 93 ---- .../item.json => peculiar_bell.json} | 0 .../models/item/incomplete_cogwheel.json | 17 +- .../item/incomplete_large_cogwheel.json | 20 +- ...png => incomplete_precision_mechanism.png} | Bin ..._component.png => precision_mechanism.png} | Bin 72 files changed, 442 insertions(+), 994 deletions(-) create mode 100644 src/generated/resources/assets/create/models/block/haunted_bell_ceiling.json create mode 100644 src/generated/resources/assets/create/models/block/haunted_bell_double_wall.json create mode 100644 src/generated/resources/assets/create/models/block/haunted_bell_floor.json create mode 100644 src/generated/resources/assets/create/models/block/haunted_bell_single_wall.json create mode 100644 src/generated/resources/assets/create/models/block/peculiar_bell_ceiling.json create mode 100644 src/generated/resources/assets/create/models/block/peculiar_bell_double_wall.json create mode 100644 src/generated/resources/assets/create/models/block/peculiar_bell_floor.json create mode 100644 src/generated/resources/assets/create/models/block/peculiar_bell_single_wall.json rename src/generated/resources/assets/create/models/item/{incomplete_clockwork_component.json => incomplete_precision_mechanism.json} (51%) rename src/generated/resources/assets/create/models/item/{clockwork_component.json => precision_mechanism.json} (56%) rename src/generated/resources/data/create/advancements/{clockwork_component.json => precision_mechanism.json} (66%) rename src/generated/resources/data/create/recipes/sequenced_assembly/{clockwork_component.json => precision_mechanism.json} (53%) rename src/main/resources/assets/create/models/block/{peculiar_bell => bell_base}/block_ceiling.json (100%) rename src/main/resources/assets/create/models/block/{peculiar_bell => bell_base}/block_double_wall.json (100%) rename src/main/resources/assets/create/models/block/{peculiar_bell => bell_base}/block_floor.json (100%) rename src/main/resources/assets/create/models/block/{peculiar_bell => bell_base}/block_single_wall.json (100%) rename src/main/resources/assets/create/models/block/{peculiar_bell/bell.json => haunted_bell.json} (87%) delete mode 100644 src/main/resources/assets/create/models/block/haunted_bell/bell.json delete mode 100644 src/main/resources/assets/create/models/block/haunted_bell/block_ceiling.json delete mode 100644 src/main/resources/assets/create/models/block/haunted_bell/block_double_wall.json delete mode 100644 src/main/resources/assets/create/models/block/haunted_bell/block_floor.json delete mode 100644 src/main/resources/assets/create/models/block/haunted_bell/block_single_wall.json delete mode 100644 src/main/resources/assets/create/models/block/haunted_bell/item.json rename src/main/resources/assets/create/models/block/{peculiar_bell/item.json => peculiar_bell.json} (100%) rename src/main/resources/assets/create/textures/item/{incomplete_clockwork_component.png => incomplete_precision_mechanism.png} (100%) rename src/main/resources/assets/create/textures/item/{clockwork_component.png => precision_mechanism.png} (100%) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index cba0911c2..aca2f76ab 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -181,7 +181,7 @@ a5ec5401ba9f3e102a2e1b35837f643847afbca4 assets/create/blockstates/gray_seat.jso 13059309684db0cc7a0f1f4fce2407cf06cce80a assets/create/blockstates/green_seat.json f4a0fc68e8daaa0a47cdc951ced4310057a874b0 assets/create/blockstates/green_valve_handle.json 6ab675fa06317e6d07c0c1a453e7bb43e3f46b3b assets/create/blockstates/hand_crank.json -a895a7a0b47273301f21090882e06b64600e4e54 assets/create/blockstates/haunted_bell.json +34076c9caafe48daa87cc783e96d4c81b0b164c0 assets/create/blockstates/haunted_bell.json 4572b90f5d6c586e145f2c7a55664c3cb734bd2b assets/create/blockstates/honey.json be3bef7e091d8b50bfc1c6b7275946d1f636aefd assets/create/blockstates/horizontal_framed_glass.json 18d9fdaa1352a7e2ec91135e46dae5c02ccd8f8f assets/create/blockstates/horizontal_framed_glass_pane.json @@ -305,7 +305,7 @@ c17d334e938dcb742550ba8307ca8266a1fc9b49 assets/create/blockstates/paved_weather cb23aef25f3106b06c8fa8f152c638bb0d2185d8 assets/create/blockstates/paved_weathered_limestone_slab.json d62b0992cec1de45dad1f2c273132225f4ef33a0 assets/create/blockstates/paved_weathered_limestone_stairs.json e29e245d06c46dac94fcd0e01a9bf7fa8e02fb87 assets/create/blockstates/paved_weathered_limestone_wall.json -7734d96271a199579e3ebb0bebf8bcd1cbec0992 assets/create/blockstates/peculiar_bell.json +005cc195712aca252326ae8239ed0caf9a69a314 assets/create/blockstates/peculiar_bell.json 30971f2f76fe56f144178c33ad6bde5fc9fb61c3 assets/create/blockstates/pink_sail.json 919a79e4a4a5fab0aac3ef48e1c786017d6aa001 assets/create/blockstates/pink_seat.json 471a3bb474a0ae0453143888d561256cce894e3f assets/create/blockstates/pink_valve_handle.json @@ -410,21 +410,21 @@ a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.j 6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json -34e7619c5f0e1559b30fd74e9ac6b2df0fecebfa assets/create/lang/en_ud.json -ed63be2abd8021a72528d48ade842a0c6d85c86f assets/create/lang/en_us.json -b9ed3430d65113ad12f950e1d40a3a83fbfb31c3 assets/create/lang/unfinished/de_de.json -f711933e82d78045c61f06a6127a1b7ae675c489 assets/create/lang/unfinished/es_es.json -541e387b3cfbff383c184bea905ea0773431ebce assets/create/lang/unfinished/es_mx.json -265820a60d244ba055d7035703a67e2c934e799f assets/create/lang/unfinished/fr_fr.json -4f37230b84a39c0142dcb1833a719d1a740016bb assets/create/lang/unfinished/it_it.json -45d16773521011b79743ba068f3a57e4f6028a74 assets/create/lang/unfinished/ja_jp.json -dae91b76b48b91a47a77135c9185901fc579d745 assets/create/lang/unfinished/ko_kr.json -acf4d7bfe6dcdbd9515d237daae5a1ba0917fd69 assets/create/lang/unfinished/nl_nl.json -95ca0ee6942917dfec8c8229a920e7043bd50f3d assets/create/lang/unfinished/pl_pl.json -c11d5dbe2042260d93245c622ee7b64f5a827981 assets/create/lang/unfinished/pt_br.json -81fd37851ce0b7d6ec6f385e51c5689e0a056140 assets/create/lang/unfinished/ru_ru.json -e36a36cffbd08d27ced84e3d14057c4b0cb1e68a assets/create/lang/unfinished/zh_cn.json -ea0369a293ad2e2c814de9938687ad5a700db9f4 assets/create/lang/unfinished/zh_tw.json +a882a728871c8ecdd2d770f0a1b966bc2ed273d7 assets/create/lang/en_ud.json +15548ffa979fd01f90977502cda07ced1a599505 assets/create/lang/en_us.json +563389d30c2837ec3579e9b1f7d90ab3be23da5e assets/create/lang/unfinished/de_de.json +b954db488cad0cbf25e8c1916e326caf28187b62 assets/create/lang/unfinished/es_es.json +b3d34fddc0be87a9a485d215efc989b45dca8f52 assets/create/lang/unfinished/es_mx.json +882c93b17de0ebfb2c09ed1abf183d0aa1956f42 assets/create/lang/unfinished/fr_fr.json +e1c09d72895f253b4eb1a32a5b3bddadff6fae69 assets/create/lang/unfinished/it_it.json +52e81f7f0591d5feedfde8ce5431d0fd4ab18dfc assets/create/lang/unfinished/ja_jp.json +0982c6bb817926faa1803b5d733f1b89d216b47a assets/create/lang/unfinished/ko_kr.json +4d2683c83ccd02e5f9ccb924e5895b5b12704c84 assets/create/lang/unfinished/nl_nl.json +67dd006a5965872a731944de028ac4bd24e594b6 assets/create/lang/unfinished/pl_pl.json +e89d828bf5d66b9c08e83c3870dc9fc8bcd35ca3 assets/create/lang/unfinished/pt_br.json +a2f8789e4091cabbb8eff972840e34164ef2845e assets/create/lang/unfinished/ru_ru.json +e1937c326a4e7109d444cc721d478c66ce085798 assets/create/lang/unfinished/zh_cn.json +428639c35caf7d9c973b1b80d270ef125bd3a3b3 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 @@ -821,6 +821,10 @@ a68cd40ffb769b195437107f4a2c2188b222b74a assets/create/models/block/gray_sail.js 17b651233c62b928f0228562a7f6e7a2b7b2d6b7 assets/create/models/block/green_sail.json 1438b8ce54ac5557b8f10dcef94f3525eae19461 assets/create/models/block/green_seat.json cc7ce9b6bc687ad5027a67c3bf22bdf5bcd71674 assets/create/models/block/green_valve_handle.json +29e09bf70184cc1d09fce31aea908a2ab56fa9e4 assets/create/models/block/haunted_bell_ceiling.json +942c2ae8a3546bd91f8489094f9e7516ff026e61 assets/create/models/block/haunted_bell_double_wall.json +44371c13450dd41d84769a3a50250de1d86e75c5 assets/create/models/block/haunted_bell_floor.json +57e48a613ce2c81992623a46792fca4bcafb33ce assets/create/models/block/haunted_bell_single_wall.json 5163171ed77af879fa06f290bf24b1bb99735c94 assets/create/models/block/honey.json b1e94d2858c3a8807def6c5131b6f63fe586fb91 assets/create/models/block/horizontal_framed_glass.json d13df8a5920c5778d98081fb0e97f045e2fd46a2 assets/create/models/block/horizontal_framed_glass_pane_noside.json @@ -1037,6 +1041,10 @@ f924c6104378768a3a645f5e77f9ed80d2c31e5a assets/create/models/block/paved_weathe 46e3eeeefd47f7e6007e53bb1b22de2c6c2a5923 assets/create/models/block/paved_weathered_limestone_wall_post.json c7941c0bcbdf7ec7e2d34679afac744cf81b7489 assets/create/models/block/paved_weathered_limestone_wall_side.json 39aaea370e31fa032e471d3b8f0ebf0586ee1a03 assets/create/models/block/paved_weathered_limestone_wall_side_tall.json +29e09bf70184cc1d09fce31aea908a2ab56fa9e4 assets/create/models/block/peculiar_bell_ceiling.json +942c2ae8a3546bd91f8489094f9e7516ff026e61 assets/create/models/block/peculiar_bell_double_wall.json +44371c13450dd41d84769a3a50250de1d86e75c5 assets/create/models/block/peculiar_bell_floor.json +57e48a613ce2c81992623a46792fca4bcafb33ce assets/create/models/block/peculiar_bell_single_wall.json 1b5f9e819cd4b5f5fe6e8c24920b916e8d93c95e assets/create/models/block/pink_sail.json ecc60ce7ee6b753073a99c597db95d6d9df3d438 assets/create/models/block/pink_seat.json 7ada61878d3a3c1d3cc33bcf9a80c21b8f9aaff2 assets/create/models/block/pink_valve_handle.json @@ -1261,7 +1269,6 @@ a47fbe5f2da79080d99ef0975bfa8da4d08f8be4 assets/create/models/item/chiseled_scor fe67c3f380d17735a9436a4579a8be1a02b8e4a0 assets/create/models/item/chute.json 6680a68526576ded5dac2aa3bc9fb9de3e744146 assets/create/models/item/cinder_flour.json c1da21be9f1af4f7a2ef4ec9cd92195d65ada316 assets/create/models/item/clockwork_bearing.json -47fb26e7a75c7bd521f46cdf9c11885769e1c94e assets/create/models/item/clockwork_component.json 0a2a0f0aafeab0088172f77afd40c1fa2cc1f2b8 assets/create/models/item/clutch.json dcb09deae110077bcddf090996b51cc66e9a7de3 assets/create/models/item/cogwheel.json 7717e3b21cff39f497f07687c70c1fa40eaa756d assets/create/models/item/content_observer.json @@ -1418,13 +1425,13 @@ e7daa31c1fc445d542bad476dfe1d6a8811f2070 assets/create/models/item/gray_seat.jso ecb9f32f62d3fa43fb226ab85adc2eb229fdfb77 assets/create/models/item/green_valve_handle.json 398b1a7c76c7bdb6a23b1248fdce98f6d835467f assets/create/models/item/hand_crank.json dee43bf1a9c211a752fac2c07aeba123f7f0c914 assets/create/models/item/handheld_worldshaper.json -bdbc76719ebf3dc28b013d30fb00dc6ce92b0ceb assets/create/models/item/haunted_bell.json +e17d9c90e621e9a39f38bb2d90a122f09a5f169d assets/create/models/item/haunted_bell.json f0d5af58e23e2705b3ef675c30bdf85ed9567c57 assets/create/models/item/honey_bucket.json 068729724f5f7b276b9bc378e533898a92e8debe assets/create/models/item/honeyed_apple.json 955e8accadb47f9b360e5fd48cd959c507b00f2d assets/create/models/item/horizontal_framed_glass.json f0e3b2b8a553b6e61746c922c27302dabfff71b6 assets/create/models/item/horizontal_framed_glass_pane.json ff92f6a9dfb73a6ee1eaaed3279c89390ff04a80 assets/create/models/item/hose_pulley.json -94a09bbd2ca14a72f9f79ca9364a2c342c1637e3 assets/create/models/item/incomplete_clockwork_component.json +153a185852af79654f0fb216c4b1b8e69c85ee8a assets/create/models/item/incomplete_precision_mechanism.json 9d605ce0da83a73b535bce45c107e604364e2b20 assets/create/models/item/iron_sheet.json 52e435014cb03e93411666c4799ebff206e55fc9 assets/create/models/item/item_drain.json 83fa8699318e51f838b483b40b3e897c34ed53d1 assets/create/models/item/jungle_window.json @@ -1539,7 +1546,7 @@ d60c4fb6e0e68d8f6c137a0c601145c342236c18 assets/create/models/item/paved_limesto 5ec22c676e301a7004ff7d127d20b46f49063c64 assets/create/models/item/paved_weathered_limestone_slab.json d81f85aea5e683539a0f3c805c154b76a9d88a9d assets/create/models/item/paved_weathered_limestone_stairs.json 910eaf2f571bae883b888d13f305bd848d278577 assets/create/models/item/paved_weathered_limestone_wall.json -2c0c9e7b131d9eb87b595abcbd68d2c55c443e58 assets/create/models/item/peculiar_bell.json +477cf0b4dd4482353668f6307f3f94d0fd77dd62 assets/create/models/item/peculiar_bell.json 9664f171c7856661776c5c4ef0b6880a77db648e assets/create/models/item/pink_seat.json 7d12cc24b86fcb3f0ca6fee650d1dee683859c0d assets/create/models/item/pink_valve_handle.json 04ce23dc141bedccc75b4512263da8b498f13205 assets/create/models/item/piston_extension_pole.json @@ -1574,6 +1581,7 @@ b97c891ebe74e7850ef1f982e4cc043338baa30f assets/create/models/item/potato_cannon 417c301eb7e54f14c564975570f59d048cc88987 assets/create/models/item/powdered_obsidian.json 1e501c1f2e9250aaaadcf17db62646d08177d4e1 assets/create/models/item/powered_latch.json 3a6dfc7f36e31ebfcd650c3144a7f2210e8a4f9f assets/create/models/item/powered_toggle_latch.json +7459efc8f20d093a8b0ef987eaace8cb0ad0aaa8 assets/create/models/item/precision_mechanism.json 4a3c3d81097d56bbd3aefeeb9eb7db87f514b5b4 assets/create/models/item/propeller.json 4b8a27ff05ed5331889dfc4b0b4562f3e94b0dfe assets/create/models/item/pulse_repeater.json a598b2f5eb34b061e81efb8a55267a02f8e08a61 assets/create/models/item/purple_seat.json @@ -1680,8 +1688,7 @@ de13a091928d5ab539d567411dd5c522cdcdd668 data/create/advancements/brass_casing.j 9531baa67bb3aee5e2723b1ab0578ff87bcb42b0 data/create/advancements/chromatic_eob.json f37551a788dfb3ff3d65db97a03c0420edf2c041 data/create/advancements/chute.json 0ffacd497176afdb26670783b65d383ac6236c19 data/create/advancements/clockwork_bearing.json -18511a1a11f2b362438cfcd961750963a43b7155 data/create/advancements/clockwork_component.json -df4a08ee0bd8d26977fdf2e45cce1d3b2f972033 data/create/advancements/clockwork_component_eob.json +fcb3a56a40d245a2fc95799b4b4da90756b58bd6 data/create/advancements/clockwork_component_eob.json 870ca791c418a1bc24f7b12284f5788c84911b92 data/create/advancements/compact.json d1015e059a2f2008a364b6d045a011a6d671f20d data/create/advancements/copper_casing.json 8e2a12a26218a46665c46f350ef9c3418a901988 data/create/advancements/crafter.json @@ -1690,7 +1697,7 @@ e9e1789de5cd5577a801a09d489a13f2c98779dc data/create/advancements/cuckoo.json 2a96fad5b44b62f233c9af5b4a637faf32ce24af data/create/advancements/deployer.json 20e04d0ac916996efedc35ab80e2b4ac4001582c data/create/advancements/dual_extendo_grip.json 04eaf829696d735244c0e4798dd3bdeb26e13a32 data/create/advancements/electron_tube.json -23b99d6745120e5ee11bcf6e3f6d55beb1be64f6 data/create/advancements/extendo_grip.json +e15f8093da07cb2292de49620f2aa776f5a6099a data/create/advancements/extendo_grip.json b1699baaadaac7ebce642c09428519d156e21594 data/create/advancements/fan.json 5aa76cba3b40a1c234ffa84a89ecca630990fc0f data/create/advancements/fan_lava.json 716a9816558300a3652ed8d8d568517017813f5c data/create/advancements/fan_smoke.json @@ -1719,7 +1726,8 @@ c9c4060ed207226b69fada2d61e01a97d7077eae data/create/advancements/nixie_tube.jso 449eb8a9e6102bb342c96eb8b19e743eb6979bfa data/create/advancements/pipe_collision.json 4b621e5bb48fbb120853ec02c05c915d86bd6dd8 data/create/advancements/pipe_spill.json 72025d8bf73ab8096c29f12d0c8d9a346f09cd64 data/create/advancements/polished_rose_quartz.json -77421567ff8eb4bdbe6c16bc3f0ae0ed1cc29e5e data/create/advancements/potato_cannon.json +69c45c653458d3076313bba3483bf26fb3946292 data/create/advancements/potato_cannon.json +6378090ee972356a3b772aa3d140cf52d396e60d data/create/advancements/precision_mechanism.json 62d29ec01eff5d21968636a0479361ecdc11ae30 data/create/advancements/press.json f80479b50e248ee8d6d1abb7d08866cf711ac2b2 data/create/advancements/recipes/building_blocks/andesite.json 5012e9d559439d0d62d0b34c2e39de048e8c7699 data/create/advancements/recipes/building_blocks/blasting/aluminum_ingot_compat_silents_mechanisms.json @@ -2382,7 +2390,7 @@ e0b9edc5e59647e7dd99be17369b263dadf407d4 data/create/advancements/refined_radian fc12b590ab8f5ac901db21c67ba3850f157e1421 data/create/advancements/root.json c1f162e773518f6b1481221e3e63f9ba33fed647 data/create/advancements/shadow_steel.json 6c1a67e193a4c5af356b31a1d5b5e9d3faeca87e data/create/advancements/shifting_gears.json -17f0cf050d0024559d0100925e325117bf3b20e3 data/create/advancements/speed_controller.json +65132cb27041c848230781cca8020a2e5ae4365e data/create/advancements/speed_controller.json a203d509a6038f0bad707e232a425388e62e1ae1 data/create/advancements/speedometer.json f7bb8f08a08e22ec1e6bb098d65d06233e8fbcec data/create/advancements/splitter_tunnel.json b69d174d7a5e9eab8ca013b66bc9d02244d7f9a3 data/create/advancements/spout.json @@ -2950,7 +2958,7 @@ d214afbd44e580f5fd1ebb4f16f07ffe34d87cba data/create/recipes/crafting/kinetics/l d7d96071874a87edf7bbdcf7a462f95a130d2991 data/create/recipes/crafting/kinetics/magenta_seat.json 5836881feef8fa8b18e4cceb9c3a9a2748b8cf3a data/create/recipes/crafting/kinetics/magenta_seat_from_other_seat.json 2ea43d6527dcb734578067ff442ec20395b0093b data/create/recipes/crafting/kinetics/magenta_valve_handle_from_other_valve_handle.json -edf33830927a6b1583c77aa5faeed1e80ef3631f data/create/recipes/crafting/kinetics/mechanical_arm.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 4372830100d39c4a89ff397a62b01940e1a28cb3 data/create/recipes/crafting/kinetics/mechanical_drill.json @@ -2985,7 +2993,7 @@ af84b939ced1c0254a27469f857f571afbadc4f6 data/create/recipes/crafting/kinetics/r 0827e86e4b5f9d7023ccc19922bcbbaefd5b42d8 data/create/recipes/crafting/kinetics/red_seat_from_other_seat.json 5a10019d23726940152e26af3239d55d16bc7880 data/create/recipes/crafting/kinetics/red_valve_handle_from_other_valve_handle.json af525e135eb927b64462120d201ecae7a7ec61ed data/create/recipes/crafting/kinetics/rope_pulley.json -eab3a50d3252106bb244c6662404ba51d647a641 data/create/recipes/crafting/kinetics/rotation_speed_controller.json +1b918eb77b3e0fb2234c4c2c0d52e730ae7f3ffa data/create/recipes/crafting/kinetics/rotation_speed_controller.json d0d7fb94621f6f02fa3137666f20e677022d9d5b data/create/recipes/crafting/kinetics/sail_frame.json 66922e18791c87fadb7629cdf32d3dd2f50ccd13 data/create/recipes/crafting/kinetics/secondary_linear_chassisfrom_conversion.json a17db27e61baa45f8a6ecb46a6d2a5a464704f8b data/create/recipes/crafting/kinetics/sequenced_gearshift.json @@ -3326,10 +3334,10 @@ bbf64f7eb3868e354756e57348493e2b1ae6b0d9 data/create/recipes/limestone_cobblesto 327bb8a6535b60bb65d0dda9d5205e988bc82526 data/create/recipes/limestone_pillar.json c2e15ac0c9109bad3face6d13efc32d7116b4c25 data/create/recipes/limestone_pillar_from_limestone_stonecutting.json 88173753ceaf121c5430bbf928a40e3c046dbfe0 data/create/recipes/mechanical_crafting/crushing_wheel.json -5ad44ffe3befafba6ae45096cf77b80d00d8eca2 data/create/recipes/mechanical_crafting/extendo_grip.json +14e322d4de8fae35d952274376497740bb3d5962 data/create/recipes/mechanical_crafting/extendo_grip.json de7fea84434753873dfa2b929d9b5f5f86ac6a5c data/create/recipes/mechanical_crafting/flywheel.json e491fd8a8873308270f9dc2a57ac8f2c70431dcc data/create/recipes/mechanical_crafting/furnace_engine.json -06deb1679f4086e014e96fff40b6983365076a10 data/create/recipes/mechanical_crafting/potato_cannon.json +6ebd36ff54059038badefad239284ec1724fdf1d data/create/recipes/mechanical_crafting/potato_cannon.json 98f877bf8f3f8a686fc6cf7479a0fba5744248ce data/create/recipes/milling/allium.json 8c7e1cbc87c7ca7df2bf949957e89422fef8ad94 data/create/recipes/milling/aluminum_ore.json bcff4d30ae09a0729bce8b2dbde4ddd6719a998b data/create/recipes/milling/andesite.json @@ -3553,9 +3561,9 @@ f7b7ff190929ae525297fecb3c116f32fc05fd88 data/create/recipes/scoria_cobblestone_ a9096822db9d12b6014d6d34e52de5821305c03f data/create/recipes/scoria_cobblestone_wall_from_scoria_cobblestone_stonecutting.json a513468ce4d55fe3b3919bd76ba2bd5b6fac4d4e data/create/recipes/scoria_pillar.json 2e0ecbd3619f080d0fc6fe48307c5a5bcc2e91b4 data/create/recipes/scoria_pillar_from_scoria_stonecutting.json -073b7c585b6733e6b984f34b9658566c47540968 data/create/recipes/sequenced_assembly/clockwork_component.json -fafe9cd8b83fd9449f4040c7c2185341a4066d21 data/create/recipes/sequenced_assembly/cogwheel.json -f12f4d7f11b7ca9cdbc36791bbedbd7f14f75acd data/create/recipes/sequenced_assembly/large_cogwheel.json +23c9f4c033e5e04539c6c48e1253c95ad58ecf34 data/create/recipes/sequenced_assembly/cogwheel.json +eb8f0341d5fffab74003297af8bc36dd936b06fc data/create/recipes/sequenced_assembly/large_cogwheel.json +bf48a1da348c4fc536f2082aeead28ad7de7756e data/create/recipes/sequenced_assembly/precision_mechanism.json 4e817b521623966fa24186731a70f0e14c03168e data/create/recipes/smelting/aluminum_ingot_compat_silents_mechanisms.json ae90f50589bc06b44765ac8cbb9fbdc2b58fdb32 data/create/recipes/smelting/brass_ingot_from_crushed.json 64cbf425effba00ff2e31d95cffc2be2e0191932 data/create/recipes/smelting/bread.json diff --git a/src/generated/resources/assets/create/blockstates/haunted_bell.json b/src/generated/resources/assets/create/blockstates/haunted_bell.json index 5f0997b92..aff248286 100644 --- a/src/generated/resources/assets/create/blockstates/haunted_bell.json +++ b/src/generated/resources/assets/create/blockstates/haunted_bell.json @@ -1,123 +1,123 @@ { "variants": { "attachment=floor,facing=north,powered=false": { - "model": "create:block/haunted_bell/block_floor" + "model": "create:block/haunted_bell_floor" }, "attachment=ceiling,facing=north,powered=false": { - "model": "create:block/haunted_bell/block_ceiling" + "model": "create:block/haunted_bell_ceiling" }, "attachment=single_wall,facing=north,powered=false": { - "model": "create:block/haunted_bell/block_single_wall" + "model": "create:block/haunted_bell_single_wall" }, "attachment=double_wall,facing=north,powered=false": { - "model": "create:block/haunted_bell/block_double_wall" + "model": "create:block/haunted_bell_double_wall" }, "attachment=floor,facing=south,powered=false": { - "model": "create:block/haunted_bell/block_floor", + "model": "create:block/haunted_bell_floor", "y": 180 }, "attachment=ceiling,facing=south,powered=false": { - "model": "create:block/haunted_bell/block_ceiling", + "model": "create:block/haunted_bell_ceiling", "y": 180 }, "attachment=single_wall,facing=south,powered=false": { - "model": "create:block/haunted_bell/block_single_wall", + "model": "create:block/haunted_bell_single_wall", "y": 180 }, "attachment=double_wall,facing=south,powered=false": { - "model": "create:block/haunted_bell/block_double_wall", + "model": "create:block/haunted_bell_double_wall", "y": 180 }, "attachment=floor,facing=west,powered=false": { - "model": "create:block/haunted_bell/block_floor", + "model": "create:block/haunted_bell_floor", "y": 270 }, "attachment=ceiling,facing=west,powered=false": { - "model": "create:block/haunted_bell/block_ceiling", + "model": "create:block/haunted_bell_ceiling", "y": 270 }, "attachment=single_wall,facing=west,powered=false": { - "model": "create:block/haunted_bell/block_single_wall", + "model": "create:block/haunted_bell_single_wall", "y": 270 }, "attachment=double_wall,facing=west,powered=false": { - "model": "create:block/haunted_bell/block_double_wall", + "model": "create:block/haunted_bell_double_wall", "y": 270 }, "attachment=floor,facing=east,powered=false": { - "model": "create:block/haunted_bell/block_floor", + "model": "create:block/haunted_bell_floor", "y": 90 }, "attachment=ceiling,facing=east,powered=false": { - "model": "create:block/haunted_bell/block_ceiling", + "model": "create:block/haunted_bell_ceiling", "y": 90 }, "attachment=single_wall,facing=east,powered=false": { - "model": "create:block/haunted_bell/block_single_wall", + "model": "create:block/haunted_bell_single_wall", "y": 90 }, "attachment=double_wall,facing=east,powered=false": { - "model": "create:block/haunted_bell/block_double_wall", + "model": "create:block/haunted_bell_double_wall", "y": 90 }, "attachment=floor,facing=north,powered=true": { - "model": "create:block/haunted_bell/block_floor" + "model": "create:block/haunted_bell_floor" }, "attachment=ceiling,facing=north,powered=true": { - "model": "create:block/haunted_bell/block_ceiling" + "model": "create:block/haunted_bell_ceiling" }, "attachment=single_wall,facing=north,powered=true": { - "model": "create:block/haunted_bell/block_single_wall" + "model": "create:block/haunted_bell_single_wall" }, "attachment=double_wall,facing=north,powered=true": { - "model": "create:block/haunted_bell/block_double_wall" + "model": "create:block/haunted_bell_double_wall" }, "attachment=floor,facing=south,powered=true": { - "model": "create:block/haunted_bell/block_floor", + "model": "create:block/haunted_bell_floor", "y": 180 }, "attachment=ceiling,facing=south,powered=true": { - "model": "create:block/haunted_bell/block_ceiling", + "model": "create:block/haunted_bell_ceiling", "y": 180 }, "attachment=single_wall,facing=south,powered=true": { - "model": "create:block/haunted_bell/block_single_wall", + "model": "create:block/haunted_bell_single_wall", "y": 180 }, "attachment=double_wall,facing=south,powered=true": { - "model": "create:block/haunted_bell/block_double_wall", + "model": "create:block/haunted_bell_double_wall", "y": 180 }, "attachment=floor,facing=west,powered=true": { - "model": "create:block/haunted_bell/block_floor", + "model": "create:block/haunted_bell_floor", "y": 270 }, "attachment=ceiling,facing=west,powered=true": { - "model": "create:block/haunted_bell/block_ceiling", + "model": "create:block/haunted_bell_ceiling", "y": 270 }, "attachment=single_wall,facing=west,powered=true": { - "model": "create:block/haunted_bell/block_single_wall", + "model": "create:block/haunted_bell_single_wall", "y": 270 }, "attachment=double_wall,facing=west,powered=true": { - "model": "create:block/haunted_bell/block_double_wall", + "model": "create:block/haunted_bell_double_wall", "y": 270 }, "attachment=floor,facing=east,powered=true": { - "model": "create:block/haunted_bell/block_floor", + "model": "create:block/haunted_bell_floor", "y": 90 }, "attachment=ceiling,facing=east,powered=true": { - "model": "create:block/haunted_bell/block_ceiling", + "model": "create:block/haunted_bell_ceiling", "y": 90 }, "attachment=single_wall,facing=east,powered=true": { - "model": "create:block/haunted_bell/block_single_wall", + "model": "create:block/haunted_bell_single_wall", "y": 90 }, "attachment=double_wall,facing=east,powered=true": { - "model": "create:block/haunted_bell/block_double_wall", + "model": "create:block/haunted_bell_double_wall", "y": 90 } } diff --git a/src/generated/resources/assets/create/blockstates/peculiar_bell.json b/src/generated/resources/assets/create/blockstates/peculiar_bell.json index 1c4ad76a6..c688d01c7 100644 --- a/src/generated/resources/assets/create/blockstates/peculiar_bell.json +++ b/src/generated/resources/assets/create/blockstates/peculiar_bell.json @@ -1,123 +1,123 @@ { "variants": { "attachment=floor,facing=north,powered=false": { - "model": "create:block/peculiar_bell/block_floor" + "model": "create:block/peculiar_bell_floor" }, "attachment=ceiling,facing=north,powered=false": { - "model": "create:block/peculiar_bell/block_ceiling" + "model": "create:block/peculiar_bell_ceiling" }, "attachment=single_wall,facing=north,powered=false": { - "model": "create:block/peculiar_bell/block_single_wall" + "model": "create:block/peculiar_bell_single_wall" }, "attachment=double_wall,facing=north,powered=false": { - "model": "create:block/peculiar_bell/block_double_wall" + "model": "create:block/peculiar_bell_double_wall" }, "attachment=floor,facing=south,powered=false": { - "model": "create:block/peculiar_bell/block_floor", + "model": "create:block/peculiar_bell_floor", "y": 180 }, "attachment=ceiling,facing=south,powered=false": { - "model": "create:block/peculiar_bell/block_ceiling", + "model": "create:block/peculiar_bell_ceiling", "y": 180 }, "attachment=single_wall,facing=south,powered=false": { - "model": "create:block/peculiar_bell/block_single_wall", + "model": "create:block/peculiar_bell_single_wall", "y": 180 }, "attachment=double_wall,facing=south,powered=false": { - "model": "create:block/peculiar_bell/block_double_wall", + "model": "create:block/peculiar_bell_double_wall", "y": 180 }, "attachment=floor,facing=west,powered=false": { - "model": "create:block/peculiar_bell/block_floor", + "model": "create:block/peculiar_bell_floor", "y": 270 }, "attachment=ceiling,facing=west,powered=false": { - "model": "create:block/peculiar_bell/block_ceiling", + "model": "create:block/peculiar_bell_ceiling", "y": 270 }, "attachment=single_wall,facing=west,powered=false": { - "model": "create:block/peculiar_bell/block_single_wall", + "model": "create:block/peculiar_bell_single_wall", "y": 270 }, "attachment=double_wall,facing=west,powered=false": { - "model": "create:block/peculiar_bell/block_double_wall", + "model": "create:block/peculiar_bell_double_wall", "y": 270 }, "attachment=floor,facing=east,powered=false": { - "model": "create:block/peculiar_bell/block_floor", + "model": "create:block/peculiar_bell_floor", "y": 90 }, "attachment=ceiling,facing=east,powered=false": { - "model": "create:block/peculiar_bell/block_ceiling", + "model": "create:block/peculiar_bell_ceiling", "y": 90 }, "attachment=single_wall,facing=east,powered=false": { - "model": "create:block/peculiar_bell/block_single_wall", + "model": "create:block/peculiar_bell_single_wall", "y": 90 }, "attachment=double_wall,facing=east,powered=false": { - "model": "create:block/peculiar_bell/block_double_wall", + "model": "create:block/peculiar_bell_double_wall", "y": 90 }, "attachment=floor,facing=north,powered=true": { - "model": "create:block/peculiar_bell/block_floor" + "model": "create:block/peculiar_bell_floor" }, "attachment=ceiling,facing=north,powered=true": { - "model": "create:block/peculiar_bell/block_ceiling" + "model": "create:block/peculiar_bell_ceiling" }, "attachment=single_wall,facing=north,powered=true": { - "model": "create:block/peculiar_bell/block_single_wall" + "model": "create:block/peculiar_bell_single_wall" }, "attachment=double_wall,facing=north,powered=true": { - "model": "create:block/peculiar_bell/block_double_wall" + "model": "create:block/peculiar_bell_double_wall" }, "attachment=floor,facing=south,powered=true": { - "model": "create:block/peculiar_bell/block_floor", + "model": "create:block/peculiar_bell_floor", "y": 180 }, "attachment=ceiling,facing=south,powered=true": { - "model": "create:block/peculiar_bell/block_ceiling", + "model": "create:block/peculiar_bell_ceiling", "y": 180 }, "attachment=single_wall,facing=south,powered=true": { - "model": "create:block/peculiar_bell/block_single_wall", + "model": "create:block/peculiar_bell_single_wall", "y": 180 }, "attachment=double_wall,facing=south,powered=true": { - "model": "create:block/peculiar_bell/block_double_wall", + "model": "create:block/peculiar_bell_double_wall", "y": 180 }, "attachment=floor,facing=west,powered=true": { - "model": "create:block/peculiar_bell/block_floor", + "model": "create:block/peculiar_bell_floor", "y": 270 }, "attachment=ceiling,facing=west,powered=true": { - "model": "create:block/peculiar_bell/block_ceiling", + "model": "create:block/peculiar_bell_ceiling", "y": 270 }, "attachment=single_wall,facing=west,powered=true": { - "model": "create:block/peculiar_bell/block_single_wall", + "model": "create:block/peculiar_bell_single_wall", "y": 270 }, "attachment=double_wall,facing=west,powered=true": { - "model": "create:block/peculiar_bell/block_double_wall", + "model": "create:block/peculiar_bell_double_wall", "y": 270 }, "attachment=floor,facing=east,powered=true": { - "model": "create:block/peculiar_bell/block_floor", + "model": "create:block/peculiar_bell_floor", "y": 90 }, "attachment=ceiling,facing=east,powered=true": { - "model": "create:block/peculiar_bell/block_ceiling", + "model": "create:block/peculiar_bell_ceiling", "y": 90 }, "attachment=single_wall,facing=east,powered=true": { - "model": "create:block/peculiar_bell/block_single_wall", + "model": "create:block/peculiar_bell_single_wall", "y": 90 }, "attachment=double_wall,facing=east,powered=true": { - "model": "create:block/peculiar_bell/block_double_wall", + "model": "create:block/peculiar_bell_double_wall", "y": 90 } } diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index d4f9640af..fbbbb1a06 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -437,7 +437,6 @@ "item.create.chocolate_glazed_berries": "s\u01DD\u0131\u0279\u0279\u01DD\u15FA p\u01DDz\u0250\u05DF\u2141 \u01DD\u0287\u0250\u05DFo\u0254o\u0265\u0186", "item.create.chromatic_compound": "punod\u026Fo\u0186 \u0254\u0131\u0287\u0250\u026Fo\u0279\u0265\u0186", "item.create.cinder_flour": "\u0279no\u05DF\u2132 \u0279\u01DDpu\u0131\u0186", - "item.create.clockwork_component": "\u0287u\u01DDuod\u026Fo\u0186 \u029E\u0279o\u028D\u029E\u0254o\u05DF\u0186", "item.create.copper_backtank": "\u029Eu\u0250\u0287\u029E\u0254\u0250\u15FA \u0279\u01DDddo\u0186", "item.create.copper_ingot": "\u0287obuI \u0279\u01DDddo\u0186", "item.create.copper_nugget": "\u0287\u01DDbbnN \u0279\u01DDddo\u0186", @@ -472,9 +471,9 @@ "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_clockwork_component": "\u0287u\u01DDuod\u026Fo\u0186 \u029E\u0279o\u028D\u029E\u0254o\u05DF\u0186 \u01DD\u0287\u01DD\u05DFd\u026Fo\u0254uI", "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.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", @@ -482,6 +481,7 @@ "item.create.polished_rose_quartz": "z\u0287\u0279\u0250n\u1F49 \u01DDso\u1D1A p\u01DD\u0265s\u0131\u05DFo\u0500", "item.create.potato_cannon": "uouu\u0250\u0186 o\u0287\u0250\u0287o\u0500", "item.create.powdered_obsidian": "u\u0250\u0131p\u0131sqO p\u01DD\u0279\u01DDp\u028Do\u0500", + "item.create.precision_mechanism": "\u026Fs\u0131u\u0250\u0265\u0254\u01DDW uo\u0131s\u0131\u0254\u01DD\u0279\u0500", "item.create.propeller": "\u0279\u01DD\u05DF\u05DF\u01DDdo\u0279\u0500", "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", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 15e8ad3d3..d98b944a5 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -443,7 +443,6 @@ "item.create.chocolate_glazed_berries": "Chocolate Glazed Berries", "item.create.chromatic_compound": "Chromatic Compound", "item.create.cinder_flour": "Cinder Flour", - "item.create.clockwork_component": "Clockwork Component", "item.create.copper_backtank": "Copper Backtank", "item.create.copper_ingot": "Copper Ingot", "item.create.copper_nugget": "Copper Nugget", @@ -478,9 +477,9 @@ "item.create.handheld_worldshaper": "Creative Worldshaper", "item.create.honey_bucket": "Honey Bucket", "item.create.honeyed_apple": "Honeyed Apple", - "item.create.incomplete_clockwork_component": "Incomplete Clockwork Component", "item.create.incomplete_cogwheel": "Incomplete Cogwheel", "item.create.incomplete_large_cogwheel": "Incomplete Large Cogwheel", + "item.create.incomplete_precision_mechanism": "Incomplete Precision Mechanism", "item.create.iron_sheet": "Iron Sheet", "item.create.linked_controller": "Linked Controller", "item.create.minecart_contraption": "Minecart Contraption", @@ -488,6 +487,7 @@ "item.create.polished_rose_quartz": "Polished Rose Quartz", "item.create.potato_cannon": "Potato Cannon", "item.create.powdered_obsidian": "Powdered Obsidian", + "item.create.precision_mechanism": "Precision Mechanism", "item.create.propeller": "Propeller", "item.create.red_sand_paper": "Red Sand Paper", "item.create.refined_radiance": "Refined Radiance", @@ -632,8 +632,8 @@ "advancement.create.flywheel.desc": "Successfully connect an engine to the Flywheel.", "advancement.create.overstress_flywheel": "High levels of Stress", "advancement.create.overstress_flywheel.desc": "Overstress a Furnace Engine.", - "advancement.create.clockwork_component": "Complex Curiosities", - "advancement.create.clockwork_component.desc": "Assemble a Clockwork Component.", + "advancement.create.precision_mechanism": "Complex Curiosities", + "advancement.create.precision_mechanism.desc": "Assemble a Precision Mechanism.", "advancement.create.mechanical_arm": "Busy Hands!", "advancement.create.mechanical_arm.desc": "Craft a Mechanical Arm, select in- and outputs, place it down and give it power; then watch as it does all the work for you.", "advancement.create.musical_arm": "Play Me My Theme Tune!", @@ -1438,12 +1438,12 @@ "item.create.minecart_coupling.tooltip.behaviour1": "_Couples_ two Minecarts together, attempting to keep them at a _constant distance_ while moving.", "block.create.peculiar_bell.tooltip": "PECULIAR BELL", - "block.create.peculiar_bell.tooltip.summary": "A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", + "block.create.peculiar_bell.tooltip.summary": "A decorative _Brass Bell_. Placing it right above open _Soul Fire_ may cause side-effects...", "block.create.haunted_bell.tooltip": "HAUNTED BELL", - "block.create.haunted_bell.tooltip.summary": "A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.summary": "A _Cursed Bell_ haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.condition1": "When Held or Rang", - "block.create.haunted_bell.tooltip.behaviour1": "Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.", + "block.create.haunted_bell.tooltip.behaviour1": "Highlights nearby _Lightless Spots_ on which _Hostile Mobs_ can spawn.", "_": "->------------------------] Ponder Content [------------------------<-", 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 e02dd5dc6..60557279b 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -444,7 +444,6 @@ "item.create.chocolate_glazed_berries": "Schokoladenglasierte Beeren", "item.create.chromatic_compound": "Chromatische Verbindung", "item.create.cinder_flour": "Aschenmehl", - "item.create.clockwork_component": "UNLOCALIZED: Clockwork Component", "item.create.copper_backtank": "UNLOCALIZED: Copper Backtank", "item.create.copper_ingot": "Kupferbarren", "item.create.copper_nugget": "Kupferklumpen", @@ -479,9 +478,9 @@ "item.create.handheld_worldshaper": "Geländeformer", "item.create.honey_bucket": "Honigeimer", "item.create.honeyed_apple": "Honigapfel", - "item.create.incomplete_clockwork_component": "UNLOCALIZED: Incomplete Clockwork Component", "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.iron_sheet": "Eisenblech", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", "item.create.minecart_contraption": "Loren Vorrichtung", @@ -489,6 +488,7 @@ "item.create.polished_rose_quartz": "Polierter Rosenquarz", "item.create.potato_cannon": "UNLOCALIZED: Potato Cannon", "item.create.powdered_obsidian": "Pulverisierter Obsidian", + "item.create.precision_mechanism": "UNLOCALIZED: Precision Mechanism", "item.create.propeller": "Propeller", "item.create.red_sand_paper": "Rotes Schmirgelpapier", "item.create.refined_radiance": "Raffinierter Glanz", @@ -633,8 +633,8 @@ "advancement.create.flywheel.desc": "UNLOCALIZED: Successfully connect an engine to the Flywheel.", "advancement.create.overstress_flywheel": "UNLOCALIZED: High levels of Stress", "advancement.create.overstress_flywheel.desc": "UNLOCALIZED: Overstress a Furnace Engine.", - "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", - "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", + "advancement.create.precision_mechanism": "UNLOCALIZED: Complex Curiosities", + "advancement.create.precision_mechanism.desc": "UNLOCALIZED: Assemble a Precision Mechanism.", "advancement.create.mechanical_arm": "UNLOCALIZED: Busy Hands!", "advancement.create.mechanical_arm.desc": "UNLOCALIZED: Craft a Mechanical Arm, select in- and outputs, place it down and give it power; then watch as it does all the work for you.", "advancement.create.musical_arm": "UNLOCALIZED: Play Me My Theme Tune!", @@ -1439,12 +1439,12 @@ "item.create.minecart_coupling.tooltip.behaviour1": "UNLOCALIZED: _Couples_ two Minecarts together, attempting to keep them at a _constant distance_ while moving.", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", - "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", + "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative _Brass Bell_. Placing it right above open _Soul Fire_ may cause side-effects...", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", - "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A _Cursed Bell_ haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", - "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.", + "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _Lightless Spots_ on which _Hostile Mobs_ can spawn.", "_": "->------------------------] Ponder Content [------------------------<-", 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 d64bf6fed..00a2ad479 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_es.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_es.json @@ -444,7 +444,6 @@ "item.create.chocolate_glazed_berries": "UNLOCALIZED: Chocolate Glazed Berries", "item.create.chromatic_compound": "Compuesto cromático", "item.create.cinder_flour": "Harina de ceniza", - "item.create.clockwork_component": "UNLOCALIZED: Clockwork Component", "item.create.copper_backtank": "UNLOCALIZED: Copper Backtank", "item.create.copper_ingot": "Lingote de cobre", "item.create.copper_nugget": "Pepita de cobre", @@ -479,9 +478,9 @@ "item.create.handheld_worldshaper": "Worldshaper", "item.create.honey_bucket": "Cubo de miel", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", - "item.create.incomplete_clockwork_component": "UNLOCALIZED: Incomplete Clockwork Component", "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.iron_sheet": "Lámina de hierro", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", "item.create.minecart_contraption": "Artilugio de vagoneta", @@ -489,6 +488,7 @@ "item.create.polished_rose_quartz": "Cuarzo rosado pulido", "item.create.potato_cannon": "UNLOCALIZED: Potato Cannon", "item.create.powdered_obsidian": "Obsidiana en polvo", + "item.create.precision_mechanism": "UNLOCALIZED: Precision Mechanism", "item.create.propeller": "Hélice", "item.create.red_sand_paper": "Papel de lija rojo", "item.create.refined_radiance": "Resplandor refinado", @@ -633,8 +633,8 @@ "advancement.create.flywheel.desc": "Conectar con éxito un motor a la rueda de inercia.", "advancement.create.overstress_flywheel": "Altos niveles de estrés", "advancement.create.overstress_flywheel.desc": "Sobrecargar un Motor de Horno.", - "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", - "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", + "advancement.create.precision_mechanism": "UNLOCALIZED: Complex Curiosities", + "advancement.create.precision_mechanism.desc": "UNLOCALIZED: Assemble a Precision Mechanism.", "advancement.create.mechanical_arm": "Manos ocupadas!", "advancement.create.mechanical_arm.desc": "Crea un brazo mecánico, selecciona las entradas y salidas, colócalo en el suelo y dale energía; luego observa cómo hace todo el trabajo por ti.", "advancement.create.musical_arm": "Tócame la melodía!", @@ -1439,12 +1439,12 @@ "item.create.minecart_coupling.tooltip.behaviour1": "_Acopla_ dos Vagonetas, intentando mantenerlas a una _distancia constante_ mientras se mueven", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", - "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", + "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative _Brass Bell_. Placing it right above open _Soul Fire_ may cause side-effects...", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", - "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A _Cursed Bell_ haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", - "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.", + "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _Lightless Spots_ on which _Hostile Mobs_ can spawn.", "_": "->------------------------] Ponder Content [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_mx.json b/src/generated/resources/assets/create/lang/unfinished/es_mx.json index 225b3fab6..65dfbb877 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_mx.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_mx.json @@ -444,7 +444,6 @@ "item.create.chocolate_glazed_berries": "UNLOCALIZED: Chocolate Glazed Berries", "item.create.chromatic_compound": "Compuesto Cromático", "item.create.cinder_flour": "Ceniza Molida", - "item.create.clockwork_component": "UNLOCALIZED: Clockwork Component", "item.create.copper_backtank": "UNLOCALIZED: Copper Backtank", "item.create.copper_ingot": "Lingote de Cobre", "item.create.copper_nugget": "Pepita de Cobre", @@ -479,9 +478,9 @@ "item.create.handheld_worldshaper": "Pistola de Manipulación de Mundo", "item.create.honey_bucket": "Cubeta de Miel", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", - "item.create.incomplete_clockwork_component": "UNLOCALIZED: Incomplete Clockwork Component", "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.iron_sheet": "Lámina de Hierro", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", "item.create.minecart_contraption": "Artefacto de Vagón", @@ -489,6 +488,7 @@ "item.create.polished_rose_quartz": "Cuarzo Rosa Pulido", "item.create.potato_cannon": "UNLOCALIZED: Potato Cannon", "item.create.powdered_obsidian": "Polvo de Obsidiana", + "item.create.precision_mechanism": "UNLOCALIZED: Precision Mechanism", "item.create.propeller": "Hélice", "item.create.red_sand_paper": "Papel de Arena Roja", "item.create.refined_radiance": "Radiancia Refinada", @@ -633,8 +633,8 @@ "advancement.create.flywheel.desc": "UNLOCALIZED: Successfully connect an engine to the Flywheel.", "advancement.create.overstress_flywheel": "UNLOCALIZED: High levels of Stress", "advancement.create.overstress_flywheel.desc": "UNLOCALIZED: Overstress a Furnace Engine.", - "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", - "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", + "advancement.create.precision_mechanism": "UNLOCALIZED: Complex Curiosities", + "advancement.create.precision_mechanism.desc": "UNLOCALIZED: Assemble a Precision Mechanism.", "advancement.create.mechanical_arm": "UNLOCALIZED: Busy Hands!", "advancement.create.mechanical_arm.desc": "UNLOCALIZED: Craft a Mechanical Arm, select in- and outputs, place it down and give it power; then watch as it does all the work for you.", "advancement.create.musical_arm": "UNLOCALIZED: Play Me My Theme Tune!", @@ -1439,12 +1439,12 @@ "item.create.minecart_coupling.tooltip.behaviour1": "UNLOCALIZED: _Couples_ two Minecarts together, attempting to keep them at a _constant distance_ while moving.", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", - "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", + "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative _Brass Bell_. Placing it right above open _Soul Fire_ may cause side-effects...", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", - "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A _Cursed Bell_ haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", - "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.", + "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _Lightless Spots_ on which _Hostile Mobs_ can spawn.", "_": "->------------------------] Ponder Content [------------------------<-", 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 aa11a415f..efb79f420 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -444,7 +444,6 @@ "item.create.chocolate_glazed_berries": "UNLOCALIZED: Chocolate Glazed Berries", "item.create.chromatic_compound": "Composé chromatique", "item.create.cinder_flour": "Farine de braise", - "item.create.clockwork_component": "UNLOCALIZED: Clockwork Component", "item.create.copper_backtank": "UNLOCALIZED: Copper Backtank", "item.create.copper_ingot": "Lingot de cuivre", "item.create.copper_nugget": "Pépite de cuivre", @@ -479,9 +478,9 @@ "item.create.handheld_worldshaper": "Térraformeur portable", "item.create.honey_bucket": "Seau de miel", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", - "item.create.incomplete_clockwork_component": "UNLOCALIZED: Incomplete Clockwork Component", "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.iron_sheet": "Plaque de Fer", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", "item.create.minecart_contraption": "Engin de wagonnet", @@ -489,6 +488,7 @@ "item.create.polished_rose_quartz": "Quartz rose poli", "item.create.potato_cannon": "UNLOCALIZED: Potato Cannon", "item.create.powdered_obsidian": "Obsidienne concassée", + "item.create.precision_mechanism": "UNLOCALIZED: Precision Mechanism", "item.create.propeller": "Hélice", "item.create.red_sand_paper": "Papier de verre rouge", "item.create.refined_radiance": "Éclat raffiné", @@ -633,8 +633,8 @@ "advancement.create.flywheel.desc": "UNLOCALIZED: Successfully connect an engine to the Flywheel.", "advancement.create.overstress_flywheel": "UNLOCALIZED: High levels of Stress", "advancement.create.overstress_flywheel.desc": "UNLOCALIZED: Overstress a Furnace Engine.", - "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", - "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", + "advancement.create.precision_mechanism": "UNLOCALIZED: Complex Curiosities", + "advancement.create.precision_mechanism.desc": "UNLOCALIZED: Assemble a Precision Mechanism.", "advancement.create.mechanical_arm": "UNLOCALIZED: Busy Hands!", "advancement.create.mechanical_arm.desc": "UNLOCALIZED: Craft a Mechanical Arm, select in- and outputs, place it down and give it power; then watch as it does all the work for you.", "advancement.create.musical_arm": "UNLOCALIZED: Play Me My Theme Tune!", @@ -1439,12 +1439,12 @@ "item.create.minecart_coupling.tooltip.behaviour1": "UNLOCALIZED: _Couples_ two Minecarts together, attempting to keep them at a _constant distance_ while moving.", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", - "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", + "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative _Brass Bell_. Placing it right above open _Soul Fire_ may cause side-effects...", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", - "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A _Cursed Bell_ haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", - "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.", + "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _Lightless Spots_ on which _Hostile Mobs_ can spawn.", "_": "->------------------------] Ponder Content [------------------------<-", 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 6a8e34a67..734ef9bcb 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -444,7 +444,6 @@ "item.create.chocolate_glazed_berries": "UNLOCALIZED: Chocolate Glazed Berries", "item.create.chromatic_compound": "Composto cromatico", "item.create.cinder_flour": "Cenere farinosa", - "item.create.clockwork_component": "UNLOCALIZED: Clockwork Component", "item.create.copper_backtank": "UNLOCALIZED: Copper Backtank", "item.create.copper_ingot": "Lingotto di rame", "item.create.copper_nugget": "Pepita di rame", @@ -479,9 +478,9 @@ "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_clockwork_component": "UNLOCALIZED: Incomplete Clockwork Component", "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.iron_sheet": "Lamiera di ferro", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", "item.create.minecart_contraption": "Contrazione per carrello da miniera", @@ -489,6 +488,7 @@ "item.create.polished_rose_quartz": "Quarzo rosa levigato", "item.create.potato_cannon": "UNLOCALIZED: Potato Cannon", "item.create.powdered_obsidian": "Ossidiana in polvere", + "item.create.precision_mechanism": "UNLOCALIZED: Precision Mechanism", "item.create.propeller": "Elica", "item.create.red_sand_paper": "Carta vetrata rossa", "item.create.refined_radiance": "Radiance raffinata", @@ -633,8 +633,8 @@ "advancement.create.flywheel.desc": "Collega un motore ad un volano.", "advancement.create.overstress_flywheel": "Alti livelli di stress", "advancement.create.overstress_flywheel.desc": "Sovrastressa un motore fornace.", - "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", - "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", + "advancement.create.precision_mechanism": "UNLOCALIZED: Complex Curiosities", + "advancement.create.precision_mechanism.desc": "UNLOCALIZED: Assemble a Precision Mechanism.", "advancement.create.mechanical_arm": "Mani occupate!", "advancement.create.mechanical_arm.desc": "Costruisci un braccio meccanico, seleziona gli input e gli output, piazzalo e alimentalo; poi guardalo mentre fa il lavoro sporco al tuo posto.", "advancement.create.musical_arm": "DJ, metti su la musica!", @@ -1439,12 +1439,12 @@ "item.create.minecart_coupling.tooltip.behaviour1": "_Concatena_ due carrelli insieme, provando a tenerli uniti a una _distanza costante_ mentre si muovono.", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", - "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", + "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative _Brass Bell_. Placing it right above open _Soul Fire_ may cause side-effects...", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", - "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A _Cursed Bell_ haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", - "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.", + "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _Lightless Spots_ on which _Hostile Mobs_ can spawn.", "_": "->------------------------] Ponder Content [------------------------<-", 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 cbb95de6b..a254e55ad 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -444,7 +444,6 @@ "item.create.chocolate_glazed_berries": "チョコレートグレーズドベリー", "item.create.chromatic_compound": "色彩の化合物", "item.create.cinder_flour": "ネザーラックの粉", - "item.create.clockwork_component": "UNLOCALIZED: Clockwork Component", "item.create.copper_backtank": "UNLOCALIZED: Copper Backtank", "item.create.copper_ingot": "銅インゴット", "item.create.copper_nugget": "銅塊", @@ -479,9 +478,9 @@ "item.create.handheld_worldshaper": "携帯型ワールドシェーパー", "item.create.honey_bucket": "ハチミツ入りバケツ", "item.create.honeyed_apple": "リンゴのハチミツかけ", - "item.create.incomplete_clockwork_component": "UNLOCALIZED: Incomplete Clockwork Component", "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.iron_sheet": "鉄板", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", "item.create.minecart_contraption": "からくり付きトロッコ", @@ -489,6 +488,7 @@ "item.create.polished_rose_quartz": "磨かれたローズクォーツ", "item.create.potato_cannon": "UNLOCALIZED: Potato Cannon", "item.create.powdered_obsidian": "黒曜石の粉", + "item.create.precision_mechanism": "UNLOCALIZED: Precision Mechanism", "item.create.propeller": "プロペラ", "item.create.red_sand_paper": "赤い紙やすり", "item.create.refined_radiance": "高貴な光輝", @@ -633,8 +633,8 @@ "advancement.create.flywheel.desc": "かまどエンジンを勢車に繋ぐ", "advancement.create.overstress_flywheel": "ハイレベル応力", "advancement.create.overstress_flywheel.desc": "かまどエンジンに超過応力をかける", - "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", - "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", + "advancement.create.precision_mechanism": "UNLOCALIZED: Complex Curiosities", + "advancement.create.precision_mechanism.desc": "UNLOCALIZED: Assemble a Precision Mechanism.", "advancement.create.mechanical_arm": "手が離せない！", "advancement.create.mechanical_arm.desc": "搬入元と搬出先を設定したメカニカルアームを設置して、稼働させ、あなたのために一生懸命労働している様子を見る", "advancement.create.musical_arm": "お気に入りの曲を流して！", @@ -1439,12 +1439,12 @@ "item.create.minecart_coupling.tooltip.behaviour1": "_2台_のトロッコを連結します。それらは移動中に_一定_の_距離_を保とうします。", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", - "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", + "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative _Brass Bell_. Placing it right above open _Soul Fire_ may cause side-effects...", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", - "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A _Cursed Bell_ haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", - "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.", + "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _Lightless Spots_ on which _Hostile Mobs_ can spawn.", "_": "->------------------------] Ponder Content [------------------------<-", 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 f9725fa14..cadc40bd9 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -444,7 +444,6 @@ "item.create.chocolate_glazed_berries": "UNLOCALIZED: Chocolate Glazed Berries", "item.create.chromatic_compound": "색채 혼합물", "item.create.cinder_flour": "잿가루", - "item.create.clockwork_component": "UNLOCALIZED: Clockwork Component", "item.create.copper_backtank": "UNLOCALIZED: Copper Backtank", "item.create.copper_ingot": "구리 주괴", "item.create.copper_nugget": "구리 조각", @@ -479,9 +478,9 @@ "item.create.handheld_worldshaper": "휴대용 세계편집기", "item.create.honey_bucket": "꿀 양동이", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", - "item.create.incomplete_clockwork_component": "UNLOCALIZED: Incomplete Clockwork Component", "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.iron_sheet": "철 판", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", "item.create.minecart_contraption": "광산 수레 장치", @@ -489,6 +488,7 @@ "item.create.polished_rose_quartz": "윤나는 장밋빛 석영", "item.create.potato_cannon": "UNLOCALIZED: Potato Cannon", "item.create.powdered_obsidian": "흑요석 가루", + "item.create.precision_mechanism": "UNLOCALIZED: Precision Mechanism", "item.create.propeller": "프로펠러", "item.create.red_sand_paper": "붉은 사포", "item.create.refined_radiance": "정제된 광채", @@ -633,8 +633,8 @@ "advancement.create.flywheel.desc": "화로엔진에 플라이휠을 연결하세요.", "advancement.create.overstress_flywheel": "정말 높은 피로", "advancement.create.overstress_flywheel.desc": "화로 엔진을 과부하하세요.", - "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", - "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", + "advancement.create.precision_mechanism": "UNLOCALIZED: Complex Curiosities", + "advancement.create.precision_mechanism.desc": "UNLOCALIZED: Assemble a Precision Mechanism.", "advancement.create.mechanical_arm": "할일이 많아!", "advancement.create.mechanical_arm.desc": "기계 팔을 조합하고, 입력부와 출력부를 정하고, 설치한 다음 돌리세요. 그리고 그것이 작동하는 것을 보세요.", "advancement.create.musical_arm": "볼륨 최대로!", @@ -1439,12 +1439,12 @@ "item.create.minecart_coupling.tooltip.behaviour1": "_두 수레를 묶어_ 이동할 때 고정된 _거리를 유지하게_ 합니다.", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", - "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", + "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative _Brass Bell_. Placing it right above open _Soul Fire_ may cause side-effects...", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", - "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A _Cursed Bell_ haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", - "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.", + "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _Lightless Spots_ on which _Hostile Mobs_ can spawn.", "_": "->------------------------] Ponder Content [------------------------<-", 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 86d19e33e..c667ce0d4 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -444,7 +444,6 @@ "item.create.chocolate_glazed_berries": "UNLOCALIZED: Chocolate Glazed Berries", "item.create.chromatic_compound": "UNLOCALIZED: Chromatic Compound", "item.create.cinder_flour": "UNLOCALIZED: Cinder Flour", - "item.create.clockwork_component": "UNLOCALIZED: Clockwork Component", "item.create.copper_backtank": "UNLOCALIZED: Copper Backtank", "item.create.copper_ingot": "Koperstaaf", "item.create.copper_nugget": "Koper klompje", @@ -479,9 +478,9 @@ "item.create.handheld_worldshaper": "UNLOCALIZED: Creative Worldshaper", "item.create.honey_bucket": "UNLOCALIZED: Honey Bucket", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", - "item.create.incomplete_clockwork_component": "UNLOCALIZED: Incomplete Clockwork Component", "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.iron_sheet": "IJzeren Platen", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", "item.create.minecart_contraption": "UNLOCALIZED: Minecart Contraption", @@ -489,6 +488,7 @@ "item.create.polished_rose_quartz": "UNLOCALIZED: Polished Rose Quartz", "item.create.potato_cannon": "UNLOCALIZED: Potato Cannon", "item.create.powdered_obsidian": "UNLOCALIZED: Powdered Obsidian", + "item.create.precision_mechanism": "UNLOCALIZED: Precision Mechanism", "item.create.propeller": "Propeller", "item.create.red_sand_paper": "UNLOCALIZED: Red Sand Paper", "item.create.refined_radiance": "UNLOCALIZED: Refined Radiance", @@ -633,8 +633,8 @@ "advancement.create.flywheel.desc": "UNLOCALIZED: Successfully connect an engine to the Flywheel.", "advancement.create.overstress_flywheel": "UNLOCALIZED: High levels of Stress", "advancement.create.overstress_flywheel.desc": "UNLOCALIZED: Overstress a Furnace Engine.", - "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", - "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", + "advancement.create.precision_mechanism": "UNLOCALIZED: Complex Curiosities", + "advancement.create.precision_mechanism.desc": "UNLOCALIZED: Assemble a Precision Mechanism.", "advancement.create.mechanical_arm": "UNLOCALIZED: Busy Hands!", "advancement.create.mechanical_arm.desc": "UNLOCALIZED: Craft a Mechanical Arm, select in- and outputs, place it down and give it power; then watch as it does all the work for you.", "advancement.create.musical_arm": "UNLOCALIZED: Play Me My Theme Tune!", @@ -1439,12 +1439,12 @@ "item.create.minecart_coupling.tooltip.behaviour1": "UNLOCALIZED: _Couples_ two Minecarts together, attempting to keep them at a _constant distance_ while moving.", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", - "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", + "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative _Brass Bell_. Placing it right above open _Soul Fire_ may cause side-effects...", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", - "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A _Cursed Bell_ haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", - "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.", + "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _Lightless Spots_ on which _Hostile Mobs_ can spawn.", "_": "->------------------------] Ponder Content [------------------------<-", 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 5242eb574..879539ed5 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json +++ b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json @@ -444,7 +444,6 @@ "item.create.chocolate_glazed_berries": "Jagody w czekoladzie", "item.create.chromatic_compound": "Związek chromatyczny", "item.create.cinder_flour": "Rozżarzona mąka", - "item.create.clockwork_component": "UNLOCALIZED: Clockwork Component", "item.create.copper_backtank": "Miedziany zbiornik w plecaku", "item.create.copper_ingot": "Sztabka miedzi", "item.create.copper_nugget": "Bryłka miedzi", @@ -479,9 +478,9 @@ "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_clockwork_component": "UNLOCALIZED: Incomplete Clockwork Component", "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.iron_sheet": "Arkusz żelaza", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", "item.create.minecart_contraption": "Maszyna w wagoniku", @@ -489,6 +488,7 @@ "item.create.polished_rose_quartz": "Wypolerowany kwarc różowy", "item.create.potato_cannon": "UNLOCALIZED: Potato Cannon", "item.create.powdered_obsidian": "Sproszkowany obsydian", + "item.create.precision_mechanism": "UNLOCALIZED: Precision Mechanism", "item.create.propeller": "Śmigło", "item.create.red_sand_paper": "Czerwony papier ścierny", "item.create.refined_radiance": "Świetlisty materiał", @@ -633,8 +633,8 @@ "advancement.create.flywheel.desc": "Skutecznie podłącz silnik do koła zamachowego.", "advancement.create.overstress_flywheel": "Wysoki poziom obciążenia", "advancement.create.overstress_flywheel.desc": "Przeładuj silnik spalinowy.", - "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", - "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", + "advancement.create.precision_mechanism": "UNLOCALIZED: Complex Curiosities", + "advancement.create.precision_mechanism.desc": "UNLOCALIZED: Assemble a Precision Mechanism.", "advancement.create.mechanical_arm": "Ręce pełne roboty", "advancement.create.mechanical_arm.desc": "Wytwórz ramię mechaniczne, wybierz miejsca wejścia i wyjścia, postaw je i wpraw w ruch. Patrz jak robi wszystko za Ciebie.", "advancement.create.musical_arm": "Zagraj coś dla mnie!", @@ -1439,12 +1439,12 @@ "item.create.minecart_coupling.tooltip.behaviour1": "_Łączy_ dwa wagoniki, próbując utrzymać je w stałej odległości od siebie.", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", - "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", + "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative _Brass Bell_. Placing it right above open _Soul Fire_ may cause side-effects...", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", - "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A _Cursed Bell_ haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", - "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.", + "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _Lightless Spots_ on which _Hostile Mobs_ can spawn.", "_": "->------------------------] Ponder Content [------------------------<-", 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 217186b88..fe8c28dac 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -444,7 +444,6 @@ "item.create.chocolate_glazed_berries": "UNLOCALIZED: Chocolate Glazed Berries", "item.create.chromatic_compound": "UNLOCALIZED: Chromatic Compound", "item.create.cinder_flour": "UNLOCALIZED: Cinder Flour", - "item.create.clockwork_component": "UNLOCALIZED: Clockwork Component", "item.create.copper_backtank": "UNLOCALIZED: Copper Backtank", "item.create.copper_ingot": "UNLOCALIZED: Copper Ingot", "item.create.copper_nugget": "UNLOCALIZED: Copper Nugget", @@ -479,9 +478,9 @@ "item.create.handheld_worldshaper": "UNLOCALIZED: Creative Worldshaper", "item.create.honey_bucket": "UNLOCALIZED: Honey Bucket", "item.create.honeyed_apple": "UNLOCALIZED: Honeyed Apple", - "item.create.incomplete_clockwork_component": "UNLOCALIZED: Incomplete Clockwork Component", "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.iron_sheet": "Placas de Ferro", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", "item.create.minecart_contraption": "UNLOCALIZED: Minecart Contraption", @@ -489,6 +488,7 @@ "item.create.polished_rose_quartz": "UNLOCALIZED: Polished Rose Quartz", "item.create.potato_cannon": "UNLOCALIZED: Potato Cannon", "item.create.powdered_obsidian": "UNLOCALIZED: Powdered Obsidian", + "item.create.precision_mechanism": "UNLOCALIZED: Precision Mechanism", "item.create.propeller": "Hélice", "item.create.red_sand_paper": "UNLOCALIZED: Red Sand Paper", "item.create.refined_radiance": "UNLOCALIZED: Refined Radiance", @@ -633,8 +633,8 @@ "advancement.create.flywheel.desc": "UNLOCALIZED: Successfully connect an engine to the Flywheel.", "advancement.create.overstress_flywheel": "UNLOCALIZED: High levels of Stress", "advancement.create.overstress_flywheel.desc": "UNLOCALIZED: Overstress a Furnace Engine.", - "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", - "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", + "advancement.create.precision_mechanism": "UNLOCALIZED: Complex Curiosities", + "advancement.create.precision_mechanism.desc": "UNLOCALIZED: Assemble a Precision Mechanism.", "advancement.create.mechanical_arm": "UNLOCALIZED: Busy Hands!", "advancement.create.mechanical_arm.desc": "UNLOCALIZED: Craft a Mechanical Arm, select in- and outputs, place it down and give it power; then watch as it does all the work for you.", "advancement.create.musical_arm": "UNLOCALIZED: Play Me My Theme Tune!", @@ -1439,12 +1439,12 @@ "item.create.minecart_coupling.tooltip.behaviour1": "UNLOCALIZED: _Couples_ two Minecarts together, attempting to keep them at a _constant distance_ while moving.", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", - "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", + "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative _Brass Bell_. Placing it right above open _Soul Fire_ may cause side-effects...", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", - "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A _Cursed Bell_ haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", - "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.", + "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _Lightless Spots_ on which _Hostile Mobs_ can spawn.", "_": "->------------------------] Ponder Content [------------------------<-", 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 650d9ff49..7c2af855d 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -444,7 +444,6 @@ "item.create.chocolate_glazed_berries": "Ягоды в шоколадной глазури", "item.create.chromatic_compound": "Хроматический компаунд", "item.create.cinder_flour": "Незераковая пыль", - "item.create.clockwork_component": "UNLOCALIZED: Clockwork Component", "item.create.copper_backtank": "UNLOCALIZED: Copper Backtank", "item.create.copper_ingot": "Медный слиток", "item.create.copper_nugget": "Кусочек меди", @@ -479,9 +478,9 @@ "item.create.handheld_worldshaper": "Ручной редактор мира", "item.create.honey_bucket": "Ведро мёда", "item.create.honeyed_apple": "Яблоко в меду", - "item.create.incomplete_clockwork_component": "UNLOCALIZED: Incomplete Clockwork Component", "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.iron_sheet": "Железный лист", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", "item.create.minecart_contraption": "Вагонеточная штуковина", @@ -489,6 +488,7 @@ "item.create.polished_rose_quartz": "Полированный розовый кварц", "item.create.potato_cannon": "UNLOCALIZED: Potato Cannon", "item.create.powdered_obsidian": "Порошкообразный обсидиан", + "item.create.precision_mechanism": "UNLOCALIZED: Precision Mechanism", "item.create.propeller": "Пропеллер", "item.create.red_sand_paper": "Красная наждачная бумага", "item.create.refined_radiance": "Изысканное сияние", @@ -633,8 +633,8 @@ "advancement.create.flywheel.desc": "Успешно соедините двигатель с маховиком.", "advancement.create.overstress_flywheel": "Перенапряжение", "advancement.create.overstress_flywheel.desc": "Подайте слишком большую нагрузку на печной двигатель.", - "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", - "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", + "advancement.create.precision_mechanism": "UNLOCALIZED: Complex Curiosities", + "advancement.create.precision_mechanism.desc": "UNLOCALIZED: Assemble a Precision Mechanism.", "advancement.create.mechanical_arm": "Золотые руки!", "advancement.create.mechanical_arm.desc": "Создайте Механическую руку, выбирете входы и выходы, установите в мире и запитайте. Затем смотрите как она делает за вас всю работу.", "advancement.create.musical_arm": "Сбацай что-нибудь!", @@ -1439,12 +1439,12 @@ "item.create.minecart_coupling.tooltip.behaviour1": "_Соединяет_ две вагонетки вместе, пытаясь держать их на _определенной дистанции_ при движении.", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", - "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", + "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative _Brass Bell_. Placing it right above open _Soul Fire_ may cause side-effects...", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", - "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A _Cursed Bell_ haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", - "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.", + "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _Lightless Spots_ on which _Hostile Mobs_ can spawn.", "_": "->------------------------] Ponder Content [------------------------<-", 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 927b4baf2..5339b452f 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -444,7 +444,6 @@ "item.create.chocolate_glazed_berries": "巧克力包层浆果", "item.create.chromatic_compound": "异彩化合物", "item.create.cinder_flour": "下界面粉", - "item.create.clockwork_component": "UNLOCALIZED: Clockwork Component", "item.create.copper_backtank": "UNLOCALIZED: Copper Backtank", "item.create.copper_ingot": "铜锭", "item.create.copper_nugget": "铜粒", @@ -479,9 +478,9 @@ "item.create.handheld_worldshaper": "手持式环境塑形器", "item.create.honey_bucket": "蜂蜜桶", "item.create.honeyed_apple": "蜜渍苹果", - "item.create.incomplete_clockwork_component": "UNLOCALIZED: Incomplete Clockwork Component", "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.iron_sheet": "铁板", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", "item.create.minecart_contraption": "装配过的矿车", @@ -489,6 +488,7 @@ "item.create.polished_rose_quartz": "磨制玫瑰石英", "item.create.potato_cannon": "UNLOCALIZED: Potato Cannon", "item.create.powdered_obsidian": "黑曜石粉末", + "item.create.precision_mechanism": "UNLOCALIZED: Precision Mechanism", "item.create.propeller": "扇叶", "item.create.red_sand_paper": "红沙砂纸", "item.create.refined_radiance": "光辉石", @@ -633,8 +633,8 @@ "advancement.create.flywheel.desc": "将引擎成功连接到飞轮。", "advancement.create.overstress_flywheel": "高压", "advancement.create.overstress_flywheel.desc": "过载熔炉引擎。", - "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", - "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", + "advancement.create.precision_mechanism": "UNLOCALIZED: Complex Curiosities", + "advancement.create.precision_mechanism.desc": "UNLOCALIZED: Assemble a Precision Mechanism.", "advancement.create.mechanical_arm": "忙碌的手！", "advancement.create.mechanical_arm.desc": "制作机械臂，选择输入和输出，放置并给予它动力，然后看着它为你完成所有工作。", "advancement.create.musical_arm": "没人能在我的 BGM 里打败我！", @@ -1439,12 +1439,12 @@ "item.create.minecart_coupling.tooltip.behaviour1": "将两个矿车耦合在一起，在移动时将它们保持_恒定的距离_。", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", - "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", + "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative _Brass Bell_. Placing it right above open _Soul Fire_ may cause side-effects...", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", - "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A _Cursed Bell_ haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", - "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.", + "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _Lightless Spots_ on which _Hostile Mobs_ can spawn.", "_": "->------------------------] Ponder Content [------------------------<-", 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 f1bca2b7f..659bdb216 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json @@ -444,7 +444,6 @@ "item.create.chocolate_glazed_berries": "巧克力甜莓", "item.create.chromatic_compound": "異彩化合物", "item.create.cinder_flour": "地獄麵粉", - "item.create.clockwork_component": "UNLOCALIZED: Clockwork Component", "item.create.copper_backtank": "UNLOCALIZED: Copper Backtank", "item.create.copper_ingot": "銅錠", "item.create.copper_nugget": "銅粒", @@ -479,9 +478,9 @@ "item.create.handheld_worldshaper": "地形雕塑器", "item.create.honey_bucket": "蜂蜜桶", "item.create.honeyed_apple": "蜂蜜蘋果", - "item.create.incomplete_clockwork_component": "UNLOCALIZED: Incomplete Clockwork Component", "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.iron_sheet": "鐵板", "item.create.linked_controller": "UNLOCALIZED: Linked Controller", "item.create.minecart_contraption": "裝修過的礦車", @@ -489,6 +488,7 @@ "item.create.polished_rose_quartz": "磨製玫瑰石英", "item.create.potato_cannon": "UNLOCALIZED: Potato Cannon", "item.create.powdered_obsidian": "黑曜石粉末", + "item.create.precision_mechanism": "UNLOCALIZED: Precision Mechanism", "item.create.propeller": "扇葉", "item.create.red_sand_paper": "紅砂紙", "item.create.refined_radiance": "光輝石", @@ -633,8 +633,8 @@ "advancement.create.flywheel.desc": "將引擎成功連接到飛輪。", "advancement.create.overstress_flywheel": "壓力過大", "advancement.create.overstress_flywheel.desc": "超載熔爐引擎。", - "advancement.create.clockwork_component": "UNLOCALIZED: Complex Curiosities", - "advancement.create.clockwork_component.desc": "UNLOCALIZED: Assemble a Clockwork Component.", + "advancement.create.precision_mechanism": "UNLOCALIZED: Complex Curiosities", + "advancement.create.precision_mechanism.desc": "UNLOCALIZED: Assemble a Precision Mechanism.", "advancement.create.mechanical_arm": "忙碌的手！", "advancement.create.mechanical_arm.desc": "製作機械手臂，選擇輸入和輸出，放置並給它動能； 然後看著它完成所有你交代的工作。", "advancement.create.musical_arm": "沒人能在我的BGM裡打敗我！", @@ -1439,12 +1439,12 @@ "item.create.minecart_coupling.tooltip.behaviour1": "將兩個礦車耦合在一起，在移動時將它們保持_恒定的距離_。", "block.create.peculiar_bell.tooltip": "UNLOCALIZED: PECULIAR BELL", - "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", + "block.create.peculiar_bell.tooltip.summary": "UNLOCALIZED: A decorative _Brass Bell_. Placing it right above open _Soul Fire_ may cause side-effects...", "block.create.haunted_bell.tooltip": "UNLOCALIZED: HAUNTED BELL", - "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.summary": "UNLOCALIZED: A _Cursed Bell_ haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.condition1": "UNLOCALIZED: When Held or Rang", - "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.", + "block.create.haunted_bell.tooltip.behaviour1": "UNLOCALIZED: Highlights nearby _Lightless Spots_ on which _Hostile Mobs_ can spawn.", "_": "->------------------------] Ponder Content [------------------------<-", diff --git a/src/generated/resources/assets/create/models/block/haunted_bell_ceiling.json b/src/generated/resources/assets/create/models/block/haunted_bell_ceiling.json new file mode 100644 index 000000000..8953c2bde --- /dev/null +++ b/src/generated/resources/assets/create/models/block/haunted_bell_ceiling.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/bell_base/block_ceiling" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/haunted_bell_double_wall.json b/src/generated/resources/assets/create/models/block/haunted_bell_double_wall.json new file mode 100644 index 000000000..b3a17b341 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/haunted_bell_double_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/bell_base/block_double_wall" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/haunted_bell_floor.json b/src/generated/resources/assets/create/models/block/haunted_bell_floor.json new file mode 100644 index 000000000..987b55e26 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/haunted_bell_floor.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/bell_base/block_floor" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/haunted_bell_single_wall.json b/src/generated/resources/assets/create/models/block/haunted_bell_single_wall.json new file mode 100644 index 000000000..a6bacf266 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/haunted_bell_single_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/bell_base/block_single_wall" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/peculiar_bell_ceiling.json b/src/generated/resources/assets/create/models/block/peculiar_bell_ceiling.json new file mode 100644 index 000000000..8953c2bde --- /dev/null +++ b/src/generated/resources/assets/create/models/block/peculiar_bell_ceiling.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/bell_base/block_ceiling" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/peculiar_bell_double_wall.json b/src/generated/resources/assets/create/models/block/peculiar_bell_double_wall.json new file mode 100644 index 000000000..b3a17b341 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/peculiar_bell_double_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/bell_base/block_double_wall" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/peculiar_bell_floor.json b/src/generated/resources/assets/create/models/block/peculiar_bell_floor.json new file mode 100644 index 000000000..987b55e26 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/peculiar_bell_floor.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/bell_base/block_floor" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/peculiar_bell_single_wall.json b/src/generated/resources/assets/create/models/block/peculiar_bell_single_wall.json new file mode 100644 index 000000000..a6bacf266 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/peculiar_bell_single_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/bell_base/block_single_wall" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/haunted_bell.json b/src/generated/resources/assets/create/models/item/haunted_bell.json index eba6aa5d0..c0f602bc8 100644 --- a/src/generated/resources/assets/create/models/item/haunted_bell.json +++ b/src/generated/resources/assets/create/models/item/haunted_bell.json @@ -1,3 +1,3 @@ { - "parent": "create:block/haunted_bell/item" + "parent": "create:block/haunted_bell" } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/incomplete_clockwork_component.json b/src/generated/resources/assets/create/models/item/incomplete_precision_mechanism.json similarity index 51% rename from src/generated/resources/assets/create/models/item/incomplete_clockwork_component.json rename to src/generated/resources/assets/create/models/item/incomplete_precision_mechanism.json index 9dad96684..a8d39ded4 100644 --- a/src/generated/resources/assets/create/models/item/incomplete_clockwork_component.json +++ b/src/generated/resources/assets/create/models/item/incomplete_precision_mechanism.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "create:item/incomplete_clockwork_component" + "layer0": "create:item/incomplete_precision_mechanism" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/peculiar_bell.json b/src/generated/resources/assets/create/models/item/peculiar_bell.json index 686bce88e..4cc9e1942 100644 --- a/src/generated/resources/assets/create/models/item/peculiar_bell.json +++ b/src/generated/resources/assets/create/models/item/peculiar_bell.json @@ -1,3 +1,3 @@ { - "parent": "create:block/peculiar_bell/item" + "parent": "create:block/peculiar_bell" } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/clockwork_component.json b/src/generated/resources/assets/create/models/item/precision_mechanism.json similarity index 56% rename from src/generated/resources/assets/create/models/item/clockwork_component.json rename to src/generated/resources/assets/create/models/item/precision_mechanism.json index 6f6237a26..18694533b 100644 --- a/src/generated/resources/assets/create/models/item/clockwork_component.json +++ b/src/generated/resources/assets/create/models/item/precision_mechanism.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "create:item/clockwork_component" + "layer0": "create:item/precision_mechanism" } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/clockwork_component_eob.json b/src/generated/resources/data/create/advancements/clockwork_component_eob.json index fb730aff8..667bb88c4 100644 --- a/src/generated/resources/data/create/advancements/clockwork_component_eob.json +++ b/src/generated/resources/data/create/advancements/clockwork_component_eob.json @@ -1,5 +1,5 @@ { - "parent": "create:clockwork_component", + "parent": "create:precision_mechanism", "display": { "icon": { "item": "minecraft:oak_sapling" @@ -21,7 +21,7 @@ "conditions": { "items": [ { - "item": "create:clockwork_component" + "item": "create:precision_mechanism" } ] } diff --git a/src/generated/resources/data/create/advancements/extendo_grip.json b/src/generated/resources/data/create/advancements/extendo_grip.json index 94a9af017..bb4882b2b 100644 --- a/src/generated/resources/data/create/advancements/extendo_grip.json +++ b/src/generated/resources/data/create/advancements/extendo_grip.json @@ -1,5 +1,5 @@ { - "parent": "create:clockwork_component", + "parent": "create:precision_mechanism", "display": { "icon": { "item": "create:extendo_grip", diff --git a/src/generated/resources/data/create/advancements/potato_cannon.json b/src/generated/resources/data/create/advancements/potato_cannon.json index eccdc4cfb..9e1da2e5e 100644 --- a/src/generated/resources/data/create/advancements/potato_cannon.json +++ b/src/generated/resources/data/create/advancements/potato_cannon.json @@ -1,5 +1,5 @@ { - "parent": "create:clockwork_component", + "parent": "create:precision_mechanism", "display": { "icon": { "item": "create:potato_cannon", diff --git a/src/generated/resources/data/create/advancements/clockwork_component.json b/src/generated/resources/data/create/advancements/precision_mechanism.json similarity index 66% rename from src/generated/resources/data/create/advancements/clockwork_component.json rename to src/generated/resources/data/create/advancements/precision_mechanism.json index 0acda4115..a39f61f11 100644 --- a/src/generated/resources/data/create/advancements/clockwork_component.json +++ b/src/generated/resources/data/create/advancements/precision_mechanism.json @@ -2,13 +2,13 @@ "parent": "create:deployer", "display": { "icon": { - "item": "create:clockwork_component" + "item": "create:precision_mechanism" }, "title": { - "translate": "advancement.create.clockwork_component" + "translate": "advancement.create.precision_mechanism" }, "description": { - "translate": "advancement.create.clockwork_component.desc" + "translate": "advancement.create.precision_mechanism.desc" }, "frame": "task", "show_toast": true, @@ -21,7 +21,7 @@ "conditions": { "items": [ { - "item": "create:clockwork_component" + "item": "create:precision_mechanism" } ] } diff --git a/src/generated/resources/data/create/advancements/speed_controller.json b/src/generated/resources/data/create/advancements/speed_controller.json index b3cf5f1f0..38632e7d1 100644 --- a/src/generated/resources/data/create/advancements/speed_controller.json +++ b/src/generated/resources/data/create/advancements/speed_controller.json @@ -1,5 +1,5 @@ { - "parent": "create:clockwork_component", + "parent": "create:precision_mechanism", "display": { "icon": { "item": "create:rotation_speed_controller" diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_arm.json b/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_arm.json index 2b924aa87..5a64f5c23 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_arm.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/mechanical_arm.json @@ -10,7 +10,7 @@ "tag": "forge:plates/brass" }, "I": { - "item": "create:clockwork_component" + "item": "create:precision_mechanism" }, "A": { "item": "create:andesite_alloy" 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 ad8bfbdff..76a4949f5 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 @@ -6,7 +6,7 @@ ], "key": { "B": { - "item": "create:clockwork_component" + "item": "create:precision_mechanism" }, "C": { "item": "create:brass_casing" diff --git a/src/generated/resources/data/create/recipes/mechanical_crafting/extendo_grip.json b/src/generated/resources/data/create/recipes/mechanical_crafting/extendo_grip.json index 3973118fd..c7fc84b1c 100644 --- a/src/generated/resources/data/create/recipes/mechanical_crafting/extendo_grip.json +++ b/src/generated/resources/data/create/recipes/mechanical_crafting/extendo_grip.json @@ -12,7 +12,7 @@ "tag": "forge:ingots/brass" }, "R": { - "item": "create:clockwork_component" + "item": "create:precision_mechanism" }, "H": { "item": "create:brass_hand" diff --git a/src/generated/resources/data/create/recipes/mechanical_crafting/potato_cannon.json b/src/generated/resources/data/create/recipes/mechanical_crafting/potato_cannon.json index 0a5b41b44..859513ed2 100644 --- a/src/generated/resources/data/create/recipes/mechanical_crafting/potato_cannon.json +++ b/src/generated/resources/data/create/recipes/mechanical_crafting/potato_cannon.json @@ -12,7 +12,7 @@ "item": "create:andesite_alloy" }, "R": { - "item": "create:clockwork_component" + "item": "create:precision_mechanism" }, "S": { "tag": "forge:ingots/copper" diff --git a/src/generated/resources/data/create/recipes/sequenced_assembly/cogwheel.json b/src/generated/resources/data/create/recipes/sequenced_assembly/cogwheel.json index 52d588d43..84ae9aa9e 100644 --- a/src/generated/resources/data/create/recipes/sequenced_assembly/cogwheel.json +++ b/src/generated/resources/data/create/recipes/sequenced_assembly/cogwheel.json @@ -1,7 +1,7 @@ { "type": "create:sequenced_assembly", "ingredient": { - "item": "create:shaft" + "item": "create:andesite_alloy" }, "transitionalItem": { "item": "create:incomplete_cogwheel" @@ -14,7 +14,7 @@ "item": "create:incomplete_cogwheel" }, { - "tag": "minecraft:planks" + "tag": "minecraft:wooden_buttons" } ], "results": [ @@ -35,28 +35,30 @@ "item": "create:incomplete_cogwheel" } ], - "processingTime": 20 - }, - { - "type": "create:cutting", - "ingredients": [ - { - "item": "create:incomplete_cogwheel" - } - ], - "results": [ - { - "item": "create:incomplete_cogwheel" - } - ], - "processingTime": 40 + "processingTime": 50 } ], "results": [ { "item": "create:cogwheel", "count": 12, - "chance": 12.0 + "chance": 22.0 + }, + { + "item": "create:andesite_alloy", + "chance": 2.0 + }, + { + "item": "minecraft:andesite" + }, + { + "item": "create:large_cogwheel" + }, + { + "item": "minecraft:stick" + }, + { + "item": "minecraft:iron_nugget" } ], "loops": 4 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 index 005b9169c..6fa8f6ff2 100644 --- a/src/generated/resources/data/create/recipes/sequenced_assembly/large_cogwheel.json +++ b/src/generated/resources/data/create/recipes/sequenced_assembly/large_cogwheel.json @@ -14,7 +14,23 @@ "item": "create:incomplete_large_cogwheel" }, { - "tag": "minecraft:wooden_slabs" + "tag": "minecraft:planks" + } + ], + "results": [ + { + "item": "create:incomplete_large_cogwheel" + } + ] + }, + { + "type": "create:deploying", + "ingredients": [ + { + "item": "create:incomplete_large_cogwheel" + }, + { + "tag": "minecraft:wooden_buttons" } ], "results": [ @@ -41,9 +57,25 @@ "results": [ { "item": "create:large_cogwheel", - "count": 3, - "chance": 12.0 + "count": 6, + "chance": 22.0 + }, + { + "item": "create:andesite_alloy", + "chance": 2.0 + }, + { + "item": "minecraft:andesite" + }, + { + "item": "create:cogwheel" + }, + { + "item": "minecraft:stick" + }, + { + "item": "minecraft:iron_nugget" } ], - "loops": 8 + "loops": 3 } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/sequenced_assembly/clockwork_component.json b/src/generated/resources/data/create/recipes/sequenced_assembly/precision_mechanism.json similarity index 53% rename from src/generated/resources/data/create/recipes/sequenced_assembly/clockwork_component.json rename to src/generated/resources/data/create/recipes/sequenced_assembly/precision_mechanism.json index a48decec0..1a795ca46 100644 --- a/src/generated/resources/data/create/recipes/sequenced_assembly/clockwork_component.json +++ b/src/generated/resources/data/create/recipes/sequenced_assembly/precision_mechanism.json @@ -4,14 +4,14 @@ "tag": "forge:plates/gold" }, "transitionalItem": { - "item": "create:incomplete_clockwork_component" + "item": "create:incomplete_precision_mechanism" }, "sequence": [ { "type": "create:deploying", "ingredients": [ { - "item": "create:incomplete_clockwork_component" + "item": "create:incomplete_precision_mechanism" }, { "item": "create:cogwheel" @@ -19,7 +19,7 @@ ], "results": [ { - "item": "create:incomplete_clockwork_component" + "item": "create:incomplete_precision_mechanism" } ] }, @@ -27,7 +27,7 @@ "type": "create:deploying", "ingredients": [ { - "item": "create:incomplete_clockwork_component" + "item": "create:incomplete_precision_mechanism" }, { "item": "create:large_cogwheel" @@ -35,7 +35,7 @@ ], "results": [ { - "item": "create:incomplete_clockwork_component" + "item": "create:incomplete_precision_mechanism" } ] }, @@ -43,7 +43,7 @@ "type": "create:deploying", "ingredients": [ { - "item": "create:incomplete_clockwork_component" + "item": "create:incomplete_precision_mechanism" }, { "tag": "forge:nuggets/iron" @@ -51,26 +51,45 @@ ], "results": [ { - "item": "create:incomplete_clockwork_component" + "item": "create:incomplete_precision_mechanism" } ] } ], "results": [ { - "item": "create:clockwork_component", - "chance": 12.0 + "item": "create:precision_mechanism", + "chance": 60.0 }, { "item": "create:golden_sheet", - "chance": 2.0 + "chance": 8.0 }, { "item": "create:andesite_alloy", + "chance": 8.0 + }, + { + "item": "create:cogwheel", + "chance": 5.0 + }, + { + "item": "create:shaft", "chance": 2.0 }, { - "item": "create:cogwheel" + "item": "create:crushed_gold_ore", + "chance": 2.0 + }, + { + "item": "minecraft:gold_nugget", + "chance": 2.0 + }, + { + "item": "minecraft:iron_ingot" + }, + { + "item": "minecraft:clock" } ], "loops": 5 diff --git a/src/main/java/com/simibubi/create/AllBlockPartials.java b/src/main/java/com/simibubi/create/AllBlockPartials.java index 49fcaceca..0eff8e238 100644 --- a/src/main/java/com/simibubi/create/AllBlockPartials.java +++ b/src/main/java/com/simibubi/create/AllBlockPartials.java @@ -93,8 +93,8 @@ public class AllBlockPartials { SPOUT_TOP = get("spout/top"), SPOUT_MIDDLE = get("spout/middle"), SPOUT_BOTTOM = get("spout/bottom"), - PECULIAR_BELL = get("peculiar_bell/bell"), - HAUNTED_BELL = get("haunted_bell/bell"), + PECULIAR_BELL = get("peculiar_bell"), + HAUNTED_BELL = get("haunted_bell"), SPEED_CONTROLLER_BRACKET = get("rotation_speed_controller/bracket"), diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index 9679c255f..9292b4931 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -82,11 +82,11 @@ public class AllItems { 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 INCOMPLETE_CLOCKWORK_COMPONENT = - REGISTRATE.item("incomplete_clockwork_component", SequencedAssemblyItem::new) + public static final ItemEntry INCOMPLETE_PRECISION_MECHANISM = + REGISTRATE.item("incomplete_precision_mechanism", SequencedAssemblyItem::new) .register(); - public static final ItemEntry CLOCKWORK_COMPONENT = ingredient("clockwork_component"); + public static final ItemEntry PRECISION_MECHANISM = ingredient("precision_mechanism"); public static final ItemEntry INCOMPLETE_COGWHEEL = REGISTRATE.item("incomplete_cogwheel", SequencedAssemblyItem::new) @@ -344,10 +344,10 @@ public class AllItems { .register(); } - private static ItemEntry hiddenIngredient(String name) { - return REGISTRATE.item(name, HiddenIngredientItem::new) - .register(); - } +// private static ItemEntry hiddenIngredient(String name) { +// return REGISTRATE.item(name, HiddenIngredientItem::new) +// .register(); +// } @SafeVarargs private static ItemEntry taggedIngredient(String name, ITag.INamedTag... tags) { diff --git a/src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java index 0e1b480c4..a15d9b477 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java @@ -40,7 +40,7 @@ public class SequencedAssemblyCategory extends CreateRecipeCategory subCategories = new HashMap<>(); public SequencedAssemblyCategory() { - super(itemIcon(AllItems.CLOCKWORK_COMPONENT.get()), new EmptyBackground(180, 115)); + super(itemIcon(AllItems.PRECISION_MECHANISM.get()), new EmptyBackground(180, 115)); } @Override diff --git a/src/main/java/com/simibubi/create/compat/jei/category/sequencedAssembly/SequencedAssemblySubCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/sequencedAssembly/SequencedAssemblySubCategory.java index 15a078376..00f2784cb 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/sequencedAssembly/SequencedAssemblySubCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/sequencedAssembly/SequencedAssemblySubCategory.java @@ -121,12 +121,12 @@ public abstract class SequencedAssemblySubCategory { @Override public void draw(SequencedRecipe recipe, MatrixStack ms, double mouseX, double mouseY, int index) { deployer.offset = index; - AllGuiTextures.JEI_SLOT.draw(ms, 3, 14); ms.push(); ms.translate(-7, 50, 0); ms.scale(.75f, .75f, .75f); deployer.draw(ms, getWidth() / 2, 0); ms.pop(); + AllGuiTextures.JEI_SLOT.draw(ms, 3, 14); } } diff --git a/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyItem.java b/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyItem.java index b8571fded..2ac7b3bbe 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyItem.java @@ -12,7 +12,7 @@ import net.minecraft.util.math.MathHelper; public class SequencedAssemblyItem extends Item { public SequencedAssemblyItem(Properties p_i48487_1_) { - super(p_i48487_1_); + super(p_i48487_1_.maxStackSize(1)); } @Override diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellPulser.java b/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellPulser.java index 6c0ef3d79..626089218 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellPulser.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/HauntedBellPulser.java @@ -1,8 +1,16 @@ package com.simibubi.create.content.curiosities.bell; +import java.util.UUID; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; + +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.networking.AllPackets; +import com.simibubi.create.foundation.utility.IntAttached; +import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; @@ -17,6 +25,11 @@ public class HauntedBellPulser { public static final int DISTANCE = 3; public static final int RECHARGE_TICKS = 8; + public static final int WARMUP_TICKS = 10; + + public static final Cache> WARMUP = CacheBuilder.newBuilder() + .expireAfterAccess(250, TimeUnit.MILLISECONDS) + .build(); @SubscribeEvent public static void hauntedBellCreatesPulse(TickEvent.PlayerTickEvent event) { @@ -26,17 +39,31 @@ public class HauntedBellPulser { return; if (event.player.isSpectator()) return; - - if (event.player.world.getGameTime() % RECHARGE_TICKS != 0) + if (!event.player.isHolding(AllBlocks.HAUNTED_BELL::is)) return; - if (event.player.isHolding(AllBlocks.HAUNTED_BELL::is)) - sendPulse(event.player.world, event.player.getBlockPos(), DISTANCE, false); + Entity player = event.player; + boolean firstPulse = false; + + try { + IntAttached ticker = WARMUP.get(player.getUniqueID(), () -> IntAttached.with(WARMUP_TICKS, player)); + firstPulse = ticker.getFirst() + .intValue() == 1; + ticker.decrement(); + if (!ticker.isOrBelowZero()) + return; + } catch (ExecutionException e) { + } + + long gameTime = player.world.getGameTime(); + if (firstPulse || gameTime % RECHARGE_TICKS != 0) + sendPulse(player.world, event.player.getBlockPos(), DISTANCE, false); } public static void sendPulse(World world, BlockPos pos, int distance, boolean canOverlap) { Chunk chunk = world.getChunkAt(pos); - AllPackets.channel.send(PacketDistributor.TRACKING_CHUNK.with(() -> chunk), new SoulPulseEffectPacket(pos, distance, canOverlap)); + AllPackets.channel.send(PacketDistributor.TRACKING_CHUNK.with(() -> chunk), + new SoulPulseEffectPacket(pos, distance, canOverlap)); } } diff --git a/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java b/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java index 56573292e..ddf9fc087 100644 --- a/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java +++ b/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java @@ -365,11 +365,11 @@ public class AllAdvancements implements IDataProvider { .register(t, id + ":deployer"); Advancement clockwork_component = - itemAdvancement("clockwork_component", AllItems.CLOCKWORK_COMPONENT, TaskType.NORMAL).withParent(deployer) - .register(t, id + ":clockwork_component"); + itemAdvancement("precision_mechanism", AllItems.PRECISION_MECHANISM, TaskType.NORMAL).withParent(deployer) + .register(t, id + ":precision_mechanism"); Advancement clockwork_component_eob = deadEnd().withParent(clockwork_component) - .withCriterion("0", itemGathered(AllItems.CLOCKWORK_COMPONENT.get())) + .withCriterion("0", itemGathered(AllItems.PRECISION_MECHANISM.get())) .register(t, id + ":clockwork_component_eob"); Advancement extendo_grip = 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 b8976bad1..799a837af 100644 --- a/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java +++ b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java @@ -224,10 +224,15 @@ public class BuilderTransformers { .sound(SoundType.ANVIL)) .addLayer(() -> RenderType::getCutoutMipped) .tag(AllBlockTags.BRITTLE.tag) - .blockstate((c, p) -> p.horizontalBlock(c.getEntry(), state -> - AssetLookup.partialBaseModel(c, p, state.get(BlockStateProperties.BELL_ATTACHMENT).getString()))) + .blockstate((c, p) -> p.horizontalBlock(c.getEntry(), state -> { + String variant = state.get(BlockStateProperties.BELL_ATTACHMENT) + .getString(); + return p.models() + .withExistingParent(c.getName() + "_" + variant, p.modLoc("block/bell_base/block_" + variant)); + })) .item() - .transform(ModelGen.customItemModel()); + .model((c, p) -> p.withExistingParent(c.getName(), p.modLoc("block/" + c.getName()))) + .build(); } } 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 f3c4c24aa..3a1055b90 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 @@ -123,8 +123,8 @@ public abstract class CreateRecipeProvider extends RecipeProvider { return AllItems.ELECTRON_TUBE.get(); } - static IItemProvider clockwork() { - return AllItems.CLOCKWORK_COMPONENT.get(); + static IItemProvider precisionMechanism() { + return AllItems.PRECISION_MECHANISM.get(); } static ITag.INamedTag copperBlock() { 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 b1bbb20ef..887751cbb 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 @@ -31,7 +31,7 @@ public class MechanicalCraftingRecipeGen extends CreateRecipeProvider { EXTENDO_GRIP = create(AllItems.EXTENDO_GRIP::get).returns(1) .recipe(b -> b.key('L', Ingredient.fromTag(I.brass())) - .key('R', I.clockwork()) + .key('R', I.precisionMechanism()) .key('H', AllItems.BRASS_HAND.get()) .key('S', Ingredient.fromTag(Tags.Items.RODS_WOODEN)) .patternLine(" L ") @@ -42,7 +42,7 @@ public class MechanicalCraftingRecipeGen extends CreateRecipeProvider { POTATO_CANNON = create(AllItems.POTATO_CANNON::get).returns(1) .recipe(b -> b.key('L', I.andesite()) - .key('R', I.clockwork()) + .key('R', I.precisionMechanism()) .key('S', Ingredient.fromTag(I.copper())) .patternLine("L") .patternLine("R") 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 ce2c58985..7795e749a 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 @@ -9,8 +9,11 @@ import com.simibubi.create.content.contraptions.components.deployer.DeployerAppl import com.simibubi.create.content.contraptions.components.saw.CuttingRecipe; import com.simibubi.create.content.contraptions.itemAssembly.SequencedAssemblyRecipeBuilder; +import net.minecraft.block.Blocks; import net.minecraft.data.DataGenerator; import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.tags.ItemTags; public class SequencedAssemblyRecipeGen extends CreateRecipeProvider { @@ -30,32 +33,47 @@ public class SequencedAssemblyRecipeGen extends CreateRecipeProvider { // .addStep(FillingRecipe::new, rb -> rb.require(Fluids.WATER, 100)) // ) - CLOCKWORK_COMPONENT = create("clockwork_component", b -> b.require(I.goldSheet()) - .transitionTo(AllItems.INCOMPLETE_CLOCKWORK_COMPONENT.get()) - .addOutput(AllItems.CLOCKWORK_COMPONENT.get(), 12) - .addOutput(AllItems.GOLDEN_SHEET.get(), 2) - .addOutput(AllItems.ANDESITE_ALLOY.get(), 2) - .addOutput(AllBlocks.COGWHEEL.get(), 1) //TODO add more junk + PRECISION_MECHANISM = create("precision_mechanism", b -> b.require(I.goldSheet()) + .transitionTo(AllItems.INCOMPLETE_PRECISION_MECHANISM.get()) + .addOutput(AllItems.PRECISION_MECHANISM.get(), 60) + .addOutput(AllItems.GOLDEN_SHEET.get(), 8) + .addOutput(AllItems.ANDESITE_ALLOY.get(), 8) + .addOutput(AllBlocks.COGWHEEL.get(), 5) + .addOutput(AllBlocks.SHAFT.get(), 2) + .addOutput(AllItems.CRUSHED_GOLD.get(), 2) + .addOutput(Items.GOLD_NUGGET, 2) + .addOutput(Items.IRON_INGOT, 1) + .addOutput(Items.CLOCK, 1) .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())) ), - COGWHEEL = create("cogwheel", b -> b.require(I.shaft()) + COGWHEEL = create("cogwheel", b -> b.require(I.andesite()) .transitionTo(AllItems.INCOMPLETE_COGWHEEL.get()) - .addOutput(new ItemStack(AllBlocks.COGWHEEL.get(), 12), 12) + .addOutput(new ItemStack(AllBlocks.COGWHEEL.get(), 12), 22) + .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(I.planks())) - .addStep(CuttingRecipe::new, rb -> rb.duration(20)) - .addStep(CuttingRecipe::new, rb -> rb.duration(40)) + .addStep(DeployerApplicationRecipe::new, rb -> rb.require(ItemTags.WOODEN_BUTTONS)) + .addStep(CuttingRecipe::new, rb -> rb.duration(50)) ), LARGE_COGWHEEL = create("large_cogwheel", b -> b.require(I.andesite()) .transitionTo(AllItems.INCOMPLETE_LARGE_COGWHEEL.get()) - .addOutput(new ItemStack(AllBlocks.LARGE_COGWHEEL.get(), 3), 12) - .loops(8) - .addStep(DeployerApplicationRecipe::new, rb -> rb.require(I.woodSlab())) + .addOutput(new ItemStack(AllBlocks.LARGE_COGWHEEL.get(), 6), 22) + .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)) ) ; 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 1890fda3a..de5e26076 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 @@ -600,7 +600,7 @@ public class StandardRecipeGen extends CreateRecipeProvider { MECHANICAL_ARM = create(AllBlocks.MECHANICAL_ARM::get).unlockedBy(I::brassCasing) .returns(1) .viaShaped(b -> b.key('L', I.brassSheet()) - .key('I', I.clockwork()) + .key('I', I.precisionMechanism()) .key('A', I.andesite()) .key('C', I.brassCasing()) .patternLine("LLA") @@ -719,7 +719,7 @@ public class StandardRecipeGen extends CreateRecipeProvider { GAUGE_CYCLE = conversionCycle(ImmutableList.of(AllBlocks.SPEEDOMETER, AllBlocks.STRESSOMETER)), ROTATION_SPEED_CONTROLLER = create(AllBlocks.ROTATION_SPEED_CONTROLLER).unlockedBy(I::brassCasing) - .viaShaped(b -> b.key('B', I.clockwork()) + .viaShaped(b -> b.key('B', I.precisionMechanism()) .key('C', I.brassCasing()) .key('S', I.shaft()) .patternLine(" B ") diff --git a/src/main/resources/assets/create/lang/default/advancements.json b/src/main/resources/assets/create/lang/default/advancements.json index d56cccf97..1f35ae1b2 100644 --- a/src/main/resources/assets/create/lang/default/advancements.json +++ b/src/main/resources/assets/create/lang/default/advancements.json @@ -127,8 +127,8 @@ "advancement.create.flywheel.desc": "Successfully connect an engine to the Flywheel.", "advancement.create.overstress_flywheel": "High levels of Stress", "advancement.create.overstress_flywheel.desc": "Overstress a Furnace Engine.", - "advancement.create.clockwork_component": "Complex Curiosities", - "advancement.create.clockwork_component.desc": "Assemble a Clockwork Component.", + "advancement.create.precision_mechanism": "Complex Curiosities", + "advancement.create.precision_mechanism.desc": "Assemble a Precision Mechanism.", "advancement.create.mechanical_arm": "Busy Hands!", "advancement.create.mechanical_arm.desc": "Craft a Mechanical Arm, select in- and outputs, place it down and give it power; then watch as it does all the work for you.", "advancement.create.musical_arm": "Play Me My Theme Tune!", diff --git a/src/main/resources/assets/create/lang/default/tooltips.json b/src/main/resources/assets/create/lang/default/tooltips.json index 6fca14d13..412cc7a7d 100644 --- a/src/main/resources/assets/create/lang/default/tooltips.json +++ b/src/main/resources/assets/create/lang/default/tooltips.json @@ -218,12 +218,12 @@ "item.create.minecart_coupling.tooltip.behaviour1": "_Couples_ two Minecarts together, attempting to keep them at a _constant distance_ while moving.", "block.create.peculiar_bell.tooltip": "PECULIAR BELL", - "block.create.peculiar_bell.tooltip.summary": "A decorative brass bell. Placing it above a _Soul Fire_ or _Soul Campfire_ may cause a spooky transformation to occur...", + "block.create.peculiar_bell.tooltip.summary": "A decorative _Brass Bell_. Placing it right above open _Soul Fire_ may cause side-effects...", "block.create.haunted_bell.tooltip": "HAUNTED BELL", - "block.create.haunted_bell.tooltip.summary": "A spooky brass bell haunted by lost souls of the Nether.", + "block.create.haunted_bell.tooltip.summary": "A _Cursed Bell_ haunted by lost souls of the Nether.", "block.create.haunted_bell.tooltip.condition1": "When Held or Rang", - "block.create.haunted_bell.tooltip.behaviour1": "Highlights nearby _dark spots_ on which _Hostile Mobs_ could spawn.", + "block.create.haunted_bell.tooltip.behaviour1": "Highlights nearby _Lightless Spots_ on which _Hostile Mobs_ can spawn.", "create.gui.chromatic_projector.title": "Chromatic Projector", "create.gui.chromatic_projector.filter.invert": "Invert", diff --git a/src/main/resources/assets/create/models/block/peculiar_bell/block_ceiling.json b/src/main/resources/assets/create/models/block/bell_base/block_ceiling.json similarity index 100% rename from src/main/resources/assets/create/models/block/peculiar_bell/block_ceiling.json rename to src/main/resources/assets/create/models/block/bell_base/block_ceiling.json diff --git a/src/main/resources/assets/create/models/block/peculiar_bell/block_double_wall.json b/src/main/resources/assets/create/models/block/bell_base/block_double_wall.json similarity index 100% rename from src/main/resources/assets/create/models/block/peculiar_bell/block_double_wall.json rename to src/main/resources/assets/create/models/block/bell_base/block_double_wall.json diff --git a/src/main/resources/assets/create/models/block/peculiar_bell/block_floor.json b/src/main/resources/assets/create/models/block/bell_base/block_floor.json similarity index 100% rename from src/main/resources/assets/create/models/block/peculiar_bell/block_floor.json rename to src/main/resources/assets/create/models/block/bell_base/block_floor.json diff --git a/src/main/resources/assets/create/models/block/peculiar_bell/block_single_wall.json b/src/main/resources/assets/create/models/block/bell_base/block_single_wall.json similarity index 100% rename from src/main/resources/assets/create/models/block/peculiar_bell/block_single_wall.json rename to src/main/resources/assets/create/models/block/bell_base/block_single_wall.json diff --git a/src/main/resources/assets/create/models/block/peculiar_bell/bell.json b/src/main/resources/assets/create/models/block/haunted_bell.json similarity index 87% rename from src/main/resources/assets/create/models/block/peculiar_bell/bell.json rename to src/main/resources/assets/create/models/block/haunted_bell.json index 2e6436a27..ede25ad47 100644 --- a/src/main/resources/assets/create/models/block/peculiar_bell/bell.json +++ b/src/main/resources/assets/create/models/block/haunted_bell.json @@ -1,14 +1,15 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "textures": { - "0": "create:block/bell", + "0": "create:block/bell_anim", "particle": "create:block/bell" }, "elements": [ { "from": [13, 7, 7], "to": [15, 9, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 8]}, "faces": { "north": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"}, "east": {"uv": [9.5, 7, 10.5, 8], "rotation": 90, "texture": "#0"}, @@ -21,7 +22,7 @@ { "from": [1, 7, 7], "to": [3, 9, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 8]}, "faces": { "north": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"}, "east": {"uv": [10, 7, 10.5, 7.5], "texture": "#0"}, @@ -34,6 +35,7 @@ { "from": [3, 1, 3], "to": [13, 3, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, "faces": { "north": {"uv": [0, 15, 5, 16], "texture": "#0"}, "east": {"uv": [0, 15, 5, 16], "texture": "#0"}, @@ -46,6 +48,7 @@ { "from": [4, 3, 4], "to": [12, 12, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, "faces": { "north": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, "east": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, @@ -57,6 +60,7 @@ { "from": [7, 12, 7], "to": [9, 16, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, "faces": { "north": {"uv": [8, 6, 9, 8], "texture": "#0"}, "east": {"uv": [8, 6, 9, 8], "texture": "#0"}, @@ -86,7 +90,6 @@ { "name": "Bell", "origin": [8, 8, 8], - "color": 0, "children": [0, 1, 2, 3, 4, 5, 6] } ] diff --git a/src/main/resources/assets/create/models/block/haunted_bell/bell.json b/src/main/resources/assets/create/models/block/haunted_bell/bell.json deleted file mode 100644 index 161de430f..000000000 --- a/src/main/resources/assets/create/models/block/haunted_bell/bell.json +++ /dev/null @@ -1,436 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "0": "create:block/bell_anim", - "particle": "create:block/bell" - }, - "elements": [ - { - "from": [ - 14, - 7, - 7 - ], - "to": [ - 16, - 9, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 10.5, - 6, - 9.5, - 7 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 9.5, - 7, - 10.5, - 8 - ], - "rotation": 90, - "texture": "#0" - }, - "south": { - "uv": [ - 9.5, - 6, - 10.5, - 7 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 10, - 7, - 10.5, - 7.5 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 9.5, - 5, - 10.5, - 6 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 9.5, - 7, - 10.5, - 8 - ], - "texture": "#0" - } - } - }, - { - "from": [ - 0, - 7, - 7 - ], - "to": [ - 2, - 9, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8 - ] - }, - "faces": { - "north": { - "uv": [ - 9.5, - 6, - 10.5, - 7 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 10, - 7, - 10.5, - 7.5 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 10.5, - 6, - 9.5, - 7 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 9.5, - 7, - 10.5, - 8 - ], - "rotation": 90, - "texture": "#0" - }, - "up": { - "uv": [ - 9.5, - 5, - 10.5, - 6 - ], - "rotation": 180, - "texture": "#0" - }, - "down": { - "uv": [ - 9.5, - 7, - 10.5, - 8 - ], - "rotation": 180, - "texture": "#0" - } - } - }, - { - "from": [ - 3, - 0, - 3 - ], - "to": [ - 13, - 2, - 13 - ], - "faces": { - "north": { - "uv": [ - 0, - 15, - 5, - 16 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 0, - 15, - 5, - 16 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 0, - 15, - 5, - 16 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 0, - 15, - 5, - 16 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 0, - 10, - 5, - 15 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 5, - 10, - 10, - 15 - ], - "texture": "#0" - } - } - }, - { - "from": [ - 4, - 2, - 4 - ], - "to": [ - 12, - 11, - 12 - ], - "faces": { - "north": { - "uv": [ - 8, - 0, - 12, - 4.5 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 8, - 0, - 12, - 4.5 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 8, - 0, - 12, - 4.5 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 8, - 0, - 12, - 4.5 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 12, - 0, - 16, - 4 - ], - "texture": "#0" - } - } - }, - { - "from": [ - 7, - 11, - 7 - ], - "to": [ - 9, - 15, - 9 - ], - "faces": { - "north": { - "uv": [ - 8, - 6, - 9, - 8 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 8, - 6, - 9, - 8 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 8, - 6, - 9, - 8 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 8, - 6, - 9, - 8 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 8, - 5, - 9, - 6 - ], - "texture": "#0" - } - } - }, - { - "from": [ - 0, - 0, - 8 - ], - "to": [ - 16, - 16, - 9 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8.5 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 0, - 8, - 8 - ], - "texture": "#0" - } - } - }, - { - "from": [ - 0, - 0, - 7 - ], - "to": [ - 16, - 16, - 8 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8, - 8.5 - ] - }, - "faces": { - "south": { - "uv": [ - 0, - 0, - 8, - 8 - ], - "texture": "#0" - } - } - } - ], - "groups": [ - { - "name": "Bell", - "origin": [ - 8, - 8, - 8 - ], - "children": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6 - ] - } - ] -} diff --git a/src/main/resources/assets/create/models/block/haunted_bell/block_ceiling.json b/src/main/resources/assets/create/models/block/haunted_bell/block_ceiling.json deleted file mode 100644 index 67da4ac5d..000000000 --- a/src/main/resources/assets/create/models/block/haunted_bell/block_ceiling.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "1": "create:block/bell_frame_side", - "2": "create:block/bell_frame", - "particle": "create:block/bell" - }, - "elements": [ - { - "from": [0.1, 0, 0], - "to": [15.9, 16, 16], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"}, - "west": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"}, - "up": {"uv": [0, 0, 15.8, 16], "texture": "#2"} - } - }, - { - "from": [15.9, 0, 0], - "to": [0.1, 16, 16], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, - "faces": { - "east": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"}, - "west": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#2"} - } - } - ], - "groups": [ - { - "name": "Frame", - "origin": [8, 8, 8], - "children": [0, 1] - } - ] -} diff --git a/src/main/resources/assets/create/models/block/haunted_bell/block_double_wall.json b/src/main/resources/assets/create/models/block/haunted_bell/block_double_wall.json deleted file mode 100644 index 52a9e266d..000000000 --- a/src/main/resources/assets/create/models/block/haunted_bell/block_double_wall.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "1": "create:block/bell_frame_side", - "particle": "create:block/bell" - }, - "elements": [ - { - "from": [0.1, 0, 0], - "to": [15.9, 16, 16], - "faces": { - "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "north": {"uv": [0, 0, 16, 16], "texture": "#1"} - } - }, - { - "from": [15.9, 0, 0], - "to": [0.1, 16, 16], - "faces": { - "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "north": {"uv": [0, 0, 16, 16], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "Frame", - "origin": [8, 8, 8], - "children": [0, 1] - } - ] -} diff --git a/src/main/resources/assets/create/models/block/haunted_bell/block_floor.json b/src/main/resources/assets/create/models/block/haunted_bell/block_floor.json deleted file mode 100644 index 396f9e4e7..000000000 --- a/src/main/resources/assets/create/models/block/haunted_bell/block_floor.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "1": "create:block/bell_frame_side", - "2": "create:block/bell_frame", - "particle": "create:block/bell" - }, - "elements": [ - { - "from": [0.1, 0, 0], - "to": [15.9, 16, 16], - "faces": { - "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "down": {"uv": [0, 0, 15.8, 16], "texture": "#2"} - } - }, - { - "from": [15.9, 0, 0], - "to": [0.1, 16, 16], - "faces": { - "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#2"} - } - } - ], - "groups": [ - { - "name": "Frame", - "origin": [8, 8, 8], - "children": [0, 1] - } - ] -} diff --git a/src/main/resources/assets/create/models/block/haunted_bell/block_single_wall.json b/src/main/resources/assets/create/models/block/haunted_bell/block_single_wall.json deleted file mode 100644 index 7bee57b84..000000000 --- a/src/main/resources/assets/create/models/block/haunted_bell/block_single_wall.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "1": "create:block/bell_frame_side", - "particle": "create:block/bell" - }, - "elements": [ - { - "from": [0.1, 0, 0], - "to": [15.9, 16, 16], - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#1"} - } - }, - { - "from": [15.9, 0, 0], - "to": [0.1, 16, 16], - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "Frame", - "origin": [8, 8, 8], - "children": [0, 1] - } - ] -} diff --git a/src/main/resources/assets/create/models/block/haunted_bell/item.json b/src/main/resources/assets/create/models/block/haunted_bell/item.json deleted file mode 100644 index 2c1c2327c..000000000 --- a/src/main/resources/assets/create/models/block/haunted_bell/item.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "create:block/bell_anim", - "particle": "create:block/bell" - }, - "elements": [ - { - "from": [14, 7, 7], - "to": [16, 9, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"}, - "east": {"uv": [9.5, 7, 10.5, 8], "rotation": 90, "texture": "#0"}, - "south": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"}, - "west": {"uv": [10, 7, 10.5, 7.5], "texture": "#0"}, - "up": {"uv": [9.5, 5, 10.5, 6], "texture": "#0"}, - "down": {"uv": [9.5, 7, 10.5, 8], "texture": "#0"} - } - }, - { - "from": [0, 7, 7], - "to": [2, 9, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [9.5, 6, 10.5, 7], "texture": "#0"}, - "east": {"uv": [10, 7, 10.5, 7.5], "texture": "#0"}, - "south": {"uv": [10.5, 6, 9.5, 7], "texture": "#0"}, - "west": {"uv": [9.5, 7, 10.5, 8], "rotation": 90, "texture": "#0"}, - "up": {"uv": [9.5, 5, 10.5, 6], "rotation": 180, "texture": "#0"}, - "down": {"uv": [9.5, 7, 10.5, 8], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [3, 0, 3], - "to": [13, 2, 13], - "faces": { - "north": {"uv": [0, 15, 5, 16], "texture": "#0"}, - "east": {"uv": [0, 15, 5, 16], "texture": "#0"}, - "south": {"uv": [0, 15, 5, 16], "texture": "#0"}, - "west": {"uv": [0, 15, 5, 16], "texture": "#0"}, - "up": {"uv": [0, 10, 5, 15], "texture": "#0"}, - "down": {"uv": [5, 10, 10, 15], "texture": "#0"} - } - }, - { - "from": [4, 2, 4], - "to": [12, 11, 12], - "faces": { - "north": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, - "east": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, - "south": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, - "west": {"uv": [8, 0, 12, 4.5], "texture": "#0"}, - "up": {"uv": [12, 0, 16, 4], "texture": "#0"} - } - }, - { - "from": [7, 11, 7], - "to": [9, 15, 9], - "faces": { - "north": {"uv": [8, 6, 9, 8], "texture": "#0"}, - "east": {"uv": [8, 6, 9, 8], "texture": "#0"}, - "south": {"uv": [8, 6, 9, 8], "texture": "#0"}, - "west": {"uv": [8, 6, 9, 8], "texture": "#0"}, - "up": {"uv": [8, 5, 9, 6], "texture": "#0"} - } - }, - { - "from": [0, 0, 8], - "to": [16, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.5]}, - "faces": { - "north": {"uv": [0, 0, 8, 8], "texture": "#0"} - } - }, - { - "from": [0, 0, 7], - "to": [16, 16, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.5]}, - "faces": { - "south": {"uv": [0, 0, 8, 8], "texture": "#0"} - } - } - ], - "groups": [ - { - "name": "Bell", - "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4, 5, 6] - } - ] -} diff --git a/src/main/resources/assets/create/models/block/peculiar_bell/item.json b/src/main/resources/assets/create/models/block/peculiar_bell.json similarity index 100% rename from src/main/resources/assets/create/models/block/peculiar_bell/item.json rename to src/main/resources/assets/create/models/block/peculiar_bell.json diff --git a/src/main/resources/assets/create/models/item/incomplete_cogwheel.json b/src/main/resources/assets/create/models/item/incomplete_cogwheel.json index 312e9bdcf..50438130a 100644 --- a/src/main/resources/assets/create/models/item/incomplete_cogwheel.json +++ b/src/main/resources/assets/create/models/item/incomplete_cogwheel.json @@ -5,7 +5,8 @@ "textures": { "0": "create:block/axis", "3": "create:block/axis_top", - "1_2": "create:block/cogwheel" + "1_2": "create:block/cogwheel", + "particle": "block/stripped_spruce_log" }, "elements": [ { @@ -35,20 +36,6 @@ "down": {"uv": [4, 0, 10, 6], "texture": "#1_2"} } }, - { - "name": "GearCaseInnerDiagonal", - "from": [2, 7.1, 2], - "to": [14, 8.9, 14], - "rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8]}, - "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], 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 index 3c44e8315..1a9e884e1 100644 --- a/src/main/resources/assets/create/models/item/incomplete_large_cogwheel.json +++ b/src/main/resources/assets/create/models/item/incomplete_large_cogwheel.json @@ -5,24 +5,10 @@ "textures": { "0": "create:block/axis", "3": "create:block/axis_top", - "particle": "block/stripped_spruce_log", - "4": "create:block/large_cogwheel" + "4": "create:block/large_cogwheel", + "particle": "block/stripped_spruce_log" }, "elements": [ - { - "name": "GearCaseInnerRotated", - "from": [-2, 6.9, -2], - "to": [18, 8.9, 18], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, - "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": "Axis", "from": [6, 0, 6], @@ -116,4 +102,4 @@ } } ] -} +} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/item/incomplete_clockwork_component.png b/src/main/resources/assets/create/textures/item/incomplete_precision_mechanism.png similarity index 100% rename from src/main/resources/assets/create/textures/item/incomplete_clockwork_component.png rename to src/main/resources/assets/create/textures/item/incomplete_precision_mechanism.png diff --git a/src/main/resources/assets/create/textures/item/clockwork_component.png b/src/main/resources/assets/create/textures/item/precision_mechanism.png similarity index 100% rename from src/main/resources/assets/create/textures/item/clockwork_component.png rename to src/main/resources/assets/create/textures/item/precision_mechanism.png