From d1570736c54b4b81395dff267cc5b9bde9669513 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sun, 19 Jun 2022 22:54:09 +0200 Subject: [PATCH] The Quartz Age - Added Rose Quartz Block and Rose Quartz Tiles - Added the Rose Quartz Lamp with its peculiar redstone behaviour --- src/generated/resources/.cache/cache | 66 +++++-- .../create/blockstates/rose_quartz_block.json | 16 ++ .../create/blockstates/rose_quartz_lamp.json | 28 +++ .../create/blockstates/rose_quartz_tiles.json | 7 + .../blockstates/small_rose_quartz_tiles.json | 7 + .../resources/assets/create/lang/en_ud.json | 4 + .../resources/assets/create/lang/en_us.json | 4 + .../assets/create/lang/unfinished/de_de.json | 6 +- .../assets/create/lang/unfinished/es_cl.json | 6 +- .../assets/create/lang/unfinished/es_es.json | 6 +- .../assets/create/lang/unfinished/fr_fr.json | 6 +- .../assets/create/lang/unfinished/it_it.json | 6 +- .../assets/create/lang/unfinished/ja_jp.json | 6 +- .../assets/create/lang/unfinished/ko_kr.json | 6 +- .../assets/create/lang/unfinished/nl_nl.json | 6 +- .../assets/create/lang/unfinished/pl_pl.json | 6 +- .../assets/create/lang/unfinished/pt_br.json | 6 +- .../assets/create/lang/unfinished/pt_pt.json | 6 +- .../assets/create/lang/unfinished/ro_ro.json | 6 +- .../assets/create/lang/unfinished/ru_ru.json | 6 +- .../assets/create/lang/unfinished/zh_cn.json | 6 +- .../assets/create/lang/unfinished/zh_tw.json | 6 +- .../models/block/rose_quartz_block.json | 7 + .../block/rose_quartz_block_horizontal.json | 7 + .../create/models/block/rose_quartz_lamp.json | 6 + .../block/rose_quartz_lamp_powered.json | 6 + .../models/block/rose_quartz_tiles.json | 6 + .../models/block/small_rose_quartz_tiles.json | 6 + .../create/models/item/rose_quartz_block.json | 3 + .../create/models/item/rose_quartz_lamp.json | 3 + .../create/models/item/rose_quartz_tiles.json | 3 + .../models/item/small_rose_quartz_tiles.json | 3 + .../crafting/kinetics/rose_quartz_lamp.json | 32 +++ .../rose_quartz_tilesfrom_conversion.json | 34 ++++ ...mall_rose_quartz_tilesfrom_conversion.json | 34 ++++ ...z_block_from_rose_quartz_stonecutting.json | 34 ++++ ...rom_polished_rose_quartz_stonecutting.json | 34 ++++ ...rom_polished_rose_quartz_stonecutting.json | 34 ++++ .../loot_tables/blocks/rose_quartz_block.json | 20 ++ .../loot_tables/blocks/rose_quartz_lamp.json | 20 ++ .../loot_tables/blocks/rose_quartz_tiles.json | 20 ++ .../blocks/small_rose_quartz_tiles.json | 20 ++ .../crafting/kinetics/rose_quartz_lamp.json | 17 ++ .../rose_quartz_tilesfrom_conversion.json | 11 ++ ...mall_rose_quartz_tilesfrom_conversion.json | 11 ++ ...z_block_from_rose_quartz_stonecutting.json | 8 + ...rom_polished_rose_quartz_stonecutting.json | 8 + ...rom_polished_rose_quartz_stonecutting.json | 8 + .../tags/blocks/mineable/pickaxe.json | 4 + .../java/com/simibubi/create/AllBlocks.java | 58 +++++- .../block/redstone/RoseQuartzLampBlock.java | 186 ++++++++++++++++++ .../create/foundation/data/BlockStateGen.java | 6 + .../data/recipe/StandardRecipeGen.java | 8 + .../block/palettes/rose_quartz_side.png | Bin 0 -> 267 bytes .../block/palettes/rose_quartz_tiles.png | Bin 0 -> 237 bytes .../block/palettes/rose_quartz_top.png | Bin 0 -> 253 bytes .../palettes/small_rose_quartz_tiles.png | Bin 0 -> 199 bytes .../textures/block/rose_quartz_lamp.png | Bin 0 -> 298 bytes .../block/rose_quartz_lamp_powered.png | Bin 0 -> 316 bytes 59 files changed, 843 insertions(+), 36 deletions(-) create mode 100644 src/generated/resources/assets/create/blockstates/rose_quartz_block.json create mode 100644 src/generated/resources/assets/create/blockstates/rose_quartz_lamp.json create mode 100644 src/generated/resources/assets/create/blockstates/rose_quartz_tiles.json create mode 100644 src/generated/resources/assets/create/blockstates/small_rose_quartz_tiles.json create mode 100644 src/generated/resources/assets/create/models/block/rose_quartz_block.json create mode 100644 src/generated/resources/assets/create/models/block/rose_quartz_block_horizontal.json create mode 100644 src/generated/resources/assets/create/models/block/rose_quartz_lamp.json create mode 100644 src/generated/resources/assets/create/models/block/rose_quartz_lamp_powered.json create mode 100644 src/generated/resources/assets/create/models/block/rose_quartz_tiles.json create mode 100644 src/generated/resources/assets/create/models/block/small_rose_quartz_tiles.json create mode 100644 src/generated/resources/assets/create/models/item/rose_quartz_block.json create mode 100644 src/generated/resources/assets/create/models/item/rose_quartz_lamp.json create mode 100644 src/generated/resources/assets/create/models/item/rose_quartz_tiles.json create mode 100644 src/generated/resources/assets/create/models/item/small_rose_quartz_tiles.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/rose_quartz_lamp.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/rose_quartz_tilesfrom_conversion.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/small_rose_quartz_tilesfrom_conversion.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/rose_quartz_block_from_rose_quartz_stonecutting.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/small_rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json create mode 100644 src/generated/resources/data/create/loot_tables/blocks/rose_quartz_block.json create mode 100644 src/generated/resources/data/create/loot_tables/blocks/rose_quartz_lamp.json create mode 100644 src/generated/resources/data/create/loot_tables/blocks/rose_quartz_tiles.json create mode 100644 src/generated/resources/data/create/loot_tables/blocks/small_rose_quartz_tiles.json create mode 100644 src/generated/resources/data/create/recipes/crafting/kinetics/rose_quartz_lamp.json create mode 100644 src/generated/resources/data/create/recipes/crafting/materials/rose_quartz_tilesfrom_conversion.json create mode 100644 src/generated/resources/data/create/recipes/crafting/materials/small_rose_quartz_tilesfrom_conversion.json create mode 100644 src/generated/resources/data/create/recipes/rose_quartz_block_from_rose_quartz_stonecutting.json create mode 100644 src/generated/resources/data/create/recipes/rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json create mode 100644 src/generated/resources/data/create/recipes/small_rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json create mode 100644 src/main/java/com/simibubi/create/content/logistics/block/redstone/RoseQuartzLampBlock.java create mode 100644 src/main/resources/assets/create/textures/block/palettes/rose_quartz_side.png create mode 100644 src/main/resources/assets/create/textures/block/palettes/rose_quartz_tiles.png create mode 100644 src/main/resources/assets/create/textures/block/palettes/rose_quartz_top.png create mode 100644 src/main/resources/assets/create/textures/block/palettes/small_rose_quartz_tiles.png create mode 100644 src/main/resources/assets/create/textures/block/rose_quartz_lamp.png create mode 100644 src/main/resources/assets/create/textures/block/rose_quartz_lamp_powered.png diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 96dce9e7c..84b81b7ea 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -409,6 +409,9 @@ c29213b77ac0c78d8979c5f6188d2b265696f9b9 assets/create/blockstates/redstone_link b76ed5f6d271349b2509708c11e713bb299a57b6 assets/create/blockstates/refined_radiance_casing.json e2990fe70ad5d10437a376e70e167d1856277cc1 assets/create/blockstates/rope.json e14d5f7252105934295b4e156ec0e6d62d3d6b1c assets/create/blockstates/rope_pulley.json +9c08b924c0106c2d69f9da5d0fb1c5f82d3ac745 assets/create/blockstates/rose_quartz_block.json +89a864f5997e106660d7e13f1965b01e926d2832 assets/create/blockstates/rose_quartz_lamp.json +735d77e8db553f7ccebde64e926f2f4215c3e249 assets/create/blockstates/rose_quartz_tiles.json cc4cf3420fa290cb844f9cf4dfdd836aa9b70500 assets/create/blockstates/rotation_speed_controller.json ff5525783431f5047fc1ebf71d6c5ad526072b14 assets/create/blockstates/sail_frame.json 7120f29e4b88a1c40125a8cdbe8af3570f4ee352 assets/create/blockstates/schematic_table.json @@ -462,6 +465,7 @@ f6c1d9c3e5c80f9bc8c586789b6461a9c26c81e3 assets/create/blockstates/small_ochrum_ b3d1769b0b0949ee7a5be3242ca9ee2e87f6c9fa assets/create/blockstates/small_ochrum_brick_stairs.json c5e83818ad04eb47aab24bd61f6bed2ae223380c assets/create/blockstates/small_ochrum_brick_wall.json 939e083a4cef60a8894df0b9db3cd0bdbd00e0bb assets/create/blockstates/small_ochrum_bricks.json +7d976651157c012c422462bba31d988653b6f6e4 assets/create/blockstates/small_rose_quartz_tiles.json 776cce85751f1874f4d958a0c251201709f9c9c2 assets/create/blockstates/small_scorchia_brick_slab.json 98c7141374a0caa5a2b93546ce93c57fe57a0aa2 assets/create/blockstates/small_scorchia_brick_stairs.json 6cd911850f5e974db579ea82796d0410e6eceaf4 assets/create/blockstates/small_scorchia_brick_wall.json @@ -553,23 +557,23 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo 6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json -50f7862ded2d9a955c259a12685906a9ec9ad97a assets/create/lang/en_ud.json -41c67dfd448831b33c05fd39e919b2434dad9b00 assets/create/lang/en_us.json -cee940310ec66bd18786ec80805133dc6630d6fc assets/create/lang/unfinished/de_de.json -f077ae8e80665fa36b77a83566672b1f6b7eec7e assets/create/lang/unfinished/es_cl.json -7f81432a2de87db393e2442a89fe5f962f5dcf42 assets/create/lang/unfinished/es_es.json -f23087a1c4cbb3b1c7d04a97a2d6be8d7a540bcf assets/create/lang/unfinished/fr_fr.json -977d2766056e44060a2db183923f5a2de69de004 assets/create/lang/unfinished/it_it.json -bd1ad5f1c1312a827b37b71c1f180b166b6c5b5f assets/create/lang/unfinished/ja_jp.json -b380fb3655e0402505854c354a615984ddb70090 assets/create/lang/unfinished/ko_kr.json -840da26ab492f1f47c85c9446f174d290249c46a assets/create/lang/unfinished/nl_nl.json -d8e986e35492f98fd65b9a558f4cc30e65854073 assets/create/lang/unfinished/pl_pl.json -cec8168490b01b8975f6672e28d9d57b413a9383 assets/create/lang/unfinished/pt_br.json -d53b036b59cab599c12396987ba9e6953aeb7847 assets/create/lang/unfinished/pt_pt.json -09c1eb40b2ef5d9664f5d38aba87b6616f5a95b5 assets/create/lang/unfinished/ro_ro.json -01c3a0b6f64f539d601e5d20f515f2316f9bc5a0 assets/create/lang/unfinished/ru_ru.json -0dd5878ffe9aad05f5c18041de9b88ae8a4f2725 assets/create/lang/unfinished/zh_cn.json -8a99efd52fe9f4e31315632850c830b7bc9acb57 assets/create/lang/unfinished/zh_tw.json +f85edc574ee6de0de7693ffb031266643db6724a assets/create/lang/en_ud.json +3389bcc76a6b6f090f22c087f0c95479e5507825 assets/create/lang/en_us.json +70bb9e6f8264c400c6f641dae8313a79af421adc assets/create/lang/unfinished/de_de.json +fb198125e80986e9660a9cb370cd82706a90bea3 assets/create/lang/unfinished/es_cl.json +fa791d50aa9d01566197305052a92c820e852ba0 assets/create/lang/unfinished/es_es.json +322dfdb1504993658b7c5c5dee22a8393c818501 assets/create/lang/unfinished/fr_fr.json +8e8cbd0c82957867dc90259ebd7a95f5b5c9dd70 assets/create/lang/unfinished/it_it.json +1d9a2e6db1abd0397e155b74f0364686aae52a12 assets/create/lang/unfinished/ja_jp.json +9161f628c9e3e33ce5e409f36685eed93d580113 assets/create/lang/unfinished/ko_kr.json +f88451bc8963fe7368e0c5aed71d8ea473bb34ef assets/create/lang/unfinished/nl_nl.json +fdea9ed14399ebed642fa544520ccd9acb5fbcbe assets/create/lang/unfinished/pl_pl.json +84d99d46413acfefdb3c4945de1eae8a8525e675 assets/create/lang/unfinished/pt_br.json +b95a8fa71094618776fa026e1d859251334a5698 assets/create/lang/unfinished/pt_pt.json +dc5a5b3dda1e294c9d10c6eaedbc6a0a9815615d assets/create/lang/unfinished/ro_ro.json +16be2263ee7db93868e84a8b8cfaa35c430828b4 assets/create/lang/unfinished/ru_ru.json +aef72e79454e1d2f6f6a43d26758086f12015935 assets/create/lang/unfinished/zh_cn.json +9c53051ed8bcaec04ab23d213d02e2595637a3e9 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 @@ -1359,6 +1363,11 @@ f0099576080a0f2bb09dd85e55777bad69f9f265 assets/create/models/block/red_sail.jso 8b3de1161707901173accaf66c1f45233be8f8bd assets/create/models/block/red_toolbox.json 0064825ee3c1702c524d34abb6adb66906586851 assets/create/models/block/red_valve_handle.json 61ce6e1ba7fee30683c86b09ec35da4fbff8f9cb assets/create/models/block/refined_radiance_casing.json +2e1b4451c1fcac841990b1ab5558c48d0f75ea81 assets/create/models/block/rose_quartz_block.json +a13018e43079b8ef35c60400022b3e63b81f7a61 assets/create/models/block/rose_quartz_block_horizontal.json +d34e5f35166385cbed3f7f43097532ec39027535 assets/create/models/block/rose_quartz_lamp.json +b39e42b5d38e0d4b67c02a349faf7110c99d8bc4 assets/create/models/block/rose_quartz_lamp_powered.json +7c5a8eab242c943942e1bacf1432cd0d2617e043 assets/create/models/block/rose_quartz_tiles.json 81d2645d12ce902757d7f066af8522ee0e42f2fc assets/create/models/block/scorchia.json 79a6136536775bdfef7844ab97889f75fbe9169b assets/create/models/block/scorchia_pillar.json 21862a9eb051b382ad5a57579c3c214cef27ad6c assets/create/models/block/scorchia_pillar_horizontal.json @@ -1460,6 +1469,7 @@ b5282b30dd206009e0ee09660a4d239d273c9529 assets/create/models/block/small_ochrum c1babd12b3246333e1689df1e37870a5789f77e3 assets/create/models/block/small_ochrum_bricks_wall_post.json be7b99a7d0c97e006730d58f06189c33ec3afa9b assets/create/models/block/small_ochrum_bricks_wall_side.json 7be594d2f85ff44ecd74cd0489ac73c3d6e27a49 assets/create/models/block/small_ochrum_bricks_wall_side_tall.json +bd7a7a4e5de87fe70fd738505da1b9de9819fdb6 assets/create/models/block/small_rose_quartz_tiles.json 3ce1712b963b554b6d8a3bc9be25901bc4222945 assets/create/models/block/small_scorchia_brick_slab.json 921ec159878d182bf27815ac3848b4c28056377a assets/create/models/block/small_scorchia_brick_slab_top.json e2d5a04b96d5fdb4db1841ea25bdee906fa49c5a assets/create/models/block/small_scorchia_brick_stairs.json @@ -2039,6 +2049,9 @@ b9a4ac219a27e60a82f55129f2df5ae6183981e2 assets/create/models/item/redstone_cont ef52b3734a47e96c5f83d60da73110e925737933 assets/create/models/item/refined_radiance_casing.json 6daff6b82b33374d7add65e352e05ecb2fd9ebdd assets/create/models/item/rope_pulley.json 0817505d2d3ee516424100b985ca3fe2d2e7f01e assets/create/models/item/rose_quartz.json +3c5da7e30898440778c12d00a7352a4fcf25699d assets/create/models/item/rose_quartz_block.json +7865f7b18b1f3262ebb6a9b97d59e150d0918983 assets/create/models/item/rose_quartz_lamp.json +fa7f02934d8bcb938eb173dc6db2613a01e90266 assets/create/models/item/rose_quartz_tiles.json acfbf487ee65c2c58d89cb2644e33fda75751fde assets/create/models/item/rotation_speed_controller.json 171c343f7f536008f79ea1d63e0a443d064e9ef1 assets/create/models/item/sail_frame.json 5fa0bfe8642e2614a7e97d27af1a95dd2e012097 assets/create/models/item/sand_paper.json @@ -2096,6 +2109,7 @@ edee8b14d66df927e948131d55ff32979205d3f0 assets/create/models/item/small_dripsto 8e6284a8b152b5bafcfb696357a6c26dacb55ffd assets/create/models/item/small_ochrum_brick_stairs.json 90bda363dfa9ccfeeafe873491e17fbac9f5f775 assets/create/models/item/small_ochrum_brick_wall.json 9443bab4eb6f6ec8ded1127815218b290636d559 assets/create/models/item/small_ochrum_bricks.json +7577433c23ba7d31304826d2b695421669371018 assets/create/models/item/small_rose_quartz_tiles.json 6e065de96020d3005bd7b91ebd8f71bde48c9a61 assets/create/models/item/small_scorchia_brick_slab.json 62f53248d2255a347bb9e40492a250b45da1219e assets/create/models/item/small_scorchia_brick_stairs.json ba7266a207086cb72899ec8234a426a3cec26d97 assets/create/models/item/small_scorchia_brick_wall.json @@ -2451,6 +2465,7 @@ f639481c8e1485019bf120463e67811b6d2d8ef9 data/create/advancements/recipes/create 038e18d0815e7de55fc8fcb5fe7127cdad62210f data/create/advancements/recipes/create.base/crafting/kinetics/red_seat_from_other_seat.json dba0696069fe0850120dc6e1ca1ab741b0fe6d21 data/create/advancements/recipes/create.base/crafting/kinetics/red_valve_handle_from_other_valve_handle.json 6aea000b80ac153ed6a027fff5ca0a1d55250d43 data/create/advancements/recipes/create.base/crafting/kinetics/rope_pulley.json +43c694f0058538dd14cb06dde267c96b0f34bdf0 data/create/advancements/recipes/create.base/crafting/kinetics/rose_quartz_lamp.json 13f9944cdcafb651740b3670a6a75b3289886c6e data/create/advancements/recipes/create.base/crafting/kinetics/rotation_speed_controller.json ab164782e70772371d2900c9b9d8ced048c52dea data/create/advancements/recipes/create.base/crafting/kinetics/sail_framefrom_conversion.json 5f33f1d9e97ea54b5137210fd088ff4105cd416a data/create/advancements/recipes/create.base/crafting/kinetics/schedule.json @@ -2516,7 +2531,9 @@ a8a032b40204919242bf5043d2920627cd28d348 data/create/advancements/recipes/create 433e9dae24a4167b2cbd23e37e59bc84cfe352e5 data/create/advancements/recipes/create.base/crafting/materials/raw_zinc_block.json 2d875ed3e78b4840863f2188aea2b9dd23304512 data/create/advancements/recipes/create.base/crafting/materials/red_sand_paper.json bc58b9bec08df3ae2ba9aa871097f0113e4f9075 data/create/advancements/recipes/create.base/crafting/materials/rose_quartz.json +37ff5e0f0a1224e310c4a63e9690913b525db337 data/create/advancements/recipes/create.base/crafting/materials/rose_quartz_tilesfrom_conversion.json 75cbc691e7443b566c1639d0c77c96cab66677c8 data/create/advancements/recipes/create.base/crafting/materials/sand_paper.json +401f3b540c745c05bfb7b24e27367790aa232d74 data/create/advancements/recipes/create.base/crafting/materials/small_rose_quartz_tilesfrom_conversion.json d8a83ace588c01d781fea3e62fa3762ee04e0250 data/create/advancements/recipes/create.base/crafting/materials/zinc_block_from_compacting.json 827269a9749c37af9221d27281a85de09942fa2a data/create/advancements/recipes/create.base/crafting/materials/zinc_ingot_from_compacting.json b15e93ea48cc71a78dca4d5fa5738d5354a3a944 data/create/advancements/recipes/create.base/crafting/materials/zinc_ingot_from_decompacting.json @@ -2541,6 +2558,9 @@ f35f31c4ce11e8aaf6eef0e840eced22d969c614 data/create/advancements/recipes/create 873bedb88243757360f8c49b15eef4d8f28c09da data/create/advancements/recipes/create.base/oxidized_copper_tile_slab_from_oxidized_copper_tiles_stonecutting.json f89386ad5e50a50cfb2d423b9543c1bb7b6fd867 data/create/advancements/recipes/create.base/oxidized_copper_tile_stairs.json 18dac4389d7b0fac7287dfa8dd21b65a0b04cfb6 data/create/advancements/recipes/create.base/oxidized_copper_tile_stairs_from_oxidized_copper_tiles_stonecutting.json +57b304371e080df11d87a539b1c5b30721057ce6 data/create/advancements/recipes/create.base/rose_quartz_block_from_rose_quartz_stonecutting.json +6afa5267c43c3592a5da7d9f4526b712d5ef5b15 data/create/advancements/recipes/create.base/rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json +8547f4a498595eb11dde29df4b6f9e9051d2bf5f data/create/advancements/recipes/create.base/small_rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json b2b9c6d93ff4d912081cee2ab5e68209828cdc86 data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_crushed.json 16e52ba04279bcf803c5f6be46550ba5d81be1a3 data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_ore.json 88a8661167993de0f2897c95e398b6f77429d724 data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_raw_ore.json @@ -3764,6 +3784,9 @@ cc736576fd98c14436b3b66688994a2ba43a17e4 data/create/loot_tables/blocks/redstone 88ae3451da5d59d14d0e8d1dda7554cdb11003cd data/create/loot_tables/blocks/refined_radiance_casing.json 5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/create/loot_tables/blocks/rope.json 7a12c2e7f3b33faedbd5be6434c090d6d6148581 data/create/loot_tables/blocks/rope_pulley.json +3de632f11589ba68d55f479f75a1f10b7e3be6ca data/create/loot_tables/blocks/rose_quartz_block.json +f8b7e94ad0901331c3e3defe4029ed3da51aa119 data/create/loot_tables/blocks/rose_quartz_lamp.json +e5b0b0d37e276e866f788f53eceb600585e9b894 data/create/loot_tables/blocks/rose_quartz_tiles.json c1b854434fa68dd80ba720af13f80d19d7c54652 data/create/loot_tables/blocks/rotation_speed_controller.json e3bef23ba89cde128632d6fa2ea6237be2f0f11a data/create/loot_tables/blocks/sail_frame.json ae954ea6c9847ebffbe26c2f380dfb7bf8c08a40 data/create/loot_tables/blocks/schematic_table.json @@ -3817,6 +3840,7 @@ fd511a192600c31e00090909970c863e5de22762 data/create/loot_tables/blocks/small_oc 09cc343fe01e837537e3a7b97a9d2ba31076e44f data/create/loot_tables/blocks/small_ochrum_brick_stairs.json 98d8a76d4d694f7ffe2f9ab278b68919ae66d6b1 data/create/loot_tables/blocks/small_ochrum_brick_wall.json 8deeec5e9baecc95170fd7c55177fcc3a5631e47 data/create/loot_tables/blocks/small_ochrum_bricks.json +90abb679f0f22fb7f170d047e4d66aaf28015c33 data/create/loot_tables/blocks/small_rose_quartz_tiles.json 719866898f418f6deaa909c6f857ccc122e30a3b data/create/loot_tables/blocks/small_scorchia_brick_slab.json 09c28555152ca9605fbfa48c62a8c330e2394901 data/create/loot_tables/blocks/small_scorchia_brick_stairs.json 93c14189425d4f1400c6f00eae5cd97c8199eb9b data/create/loot_tables/blocks/small_scorchia_brick_wall.json @@ -4106,6 +4130,7 @@ af84b939ced1c0254a27469f857f571afbadc4f6 data/create/recipes/crafting/kinetics/r c0c248fa1b8d8d8cb63d3c299e8b35c72b0aab03 data/create/recipes/crafting/kinetics/red_seat_from_other_seat.json 73c8d12da8a5d9ec8a0d0d5c413bc2f66e463e81 data/create/recipes/crafting/kinetics/red_valve_handle_from_other_valve_handle.json 16279b2c2862ff9a9442851dd051acee51fd4614 data/create/recipes/crafting/kinetics/rope_pulley.json +6d09fba7d3efb71720a3a8de7dfee32f91391ced data/create/recipes/crafting/kinetics/rose_quartz_lamp.json 0add4bc98e3b36de6b1636dc8b28a4122e81ccfa data/create/recipes/crafting/kinetics/rotation_speed_controller.json 9f6fedefe1c1fda86fbb17763ec34c237d8e32c3 data/create/recipes/crafting/kinetics/sail_framefrom_conversion.json 5355790e4e3ca6f99b40d953afe989566b72f97d data/create/recipes/crafting/kinetics/schedule.json @@ -4172,7 +4197,9 @@ e73e4abd1306e2bfeb59ab5ca2d804c23fc66f7e data/create/recipes/crafting/materials/ cc167074d22aff7ba824ec738653e84f131a1bf0 data/create/recipes/crafting/materials/raw_zinc_block.json 9c9e40ffd41ce46c65113080a92ff9b4f27e5fab data/create/recipes/crafting/materials/red_sand_paper.json 7eb292bc564de70227f4bf947050bcdbfc5a8d67 data/create/recipes/crafting/materials/rose_quartz.json +4e5a99f14a3a4d87cfdc533198d658522545969d data/create/recipes/crafting/materials/rose_quartz_tilesfrom_conversion.json 5ca47ec1bca9a5ce28aabd9868b74b71c829ca07 data/create/recipes/crafting/materials/sand_paper.json +5d148aebab84f3a39b757029029dd2f1c6fc5c33 data/create/recipes/crafting/materials/small_rose_quartz_tilesfrom_conversion.json e1ac783d1f8fd96a1dd1088cf736e95ee3f7b025 data/create/recipes/crafting/materials/zinc_block_from_compacting.json 06cc0ec46bc5a7d2e98dbd4ece82d451c5f79de9 data/create/recipes/crafting/materials/zinc_ingot_from_compacting.json fe1d69b1e33d5748eb3c0ea732b8d67e2d612203 data/create/recipes/crafting/materials/zinc_ingot_from_decompacting.json @@ -5322,6 +5349,8 @@ d6687f51d5a46cd402cf261345064e39d6921bb8 data/create/recipes/polished_cut_veridi a104ef6eb8872a40ea7b2ef67ae54cec943162f0 data/create/recipes/pressing/iron_ingot.json 83bcbf6a56b5df3be97d86744fcfbb866879d133 data/create/recipes/pressing/path.json bd57ccc8eb4357b4a5af021db7b806b514cd2558 data/create/recipes/pressing/sugar_cane.json +1153c482560d086580caefc8a9374d8738992acd data/create/recipes/rose_quartz_block_from_rose_quartz_stonecutting.json +9ea9e0786785e2dd9fbbfe9e828cc15a3732a16d data/create/recipes/rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json 141173778757d87e7f2e9466bdab6ff1263c8e98 data/create/recipes/sandpaper_polishing/rose_quartz.json f6e2fb5725f3730d01fae4a2b1a04d11095eab5f data/create/recipes/scorchia_pillar_from_scorchia_stonecutting.json 66e8559dc15ce13042bd007247e2851022362b9e data/create/recipes/scorchia_pillar_from_stone_types_scorchia_stonecutting.json @@ -5450,6 +5479,7 @@ ad6c2b392a66f4a40403331569784672b4dc9058 data/create/recipes/small_ochrum_brick_ 30e63c3ef2f4aefe04b4e292af53fa802707586b data/create/recipes/small_ochrum_brick_wall_from_stone_types_ochrum_stonecutting.json 304510fe42134b9e4e7803d3bc0bf8d8de68d59c data/create/recipes/small_ochrum_bricks_from_ochrum_stonecutting.json 1aa5fa555efae53709a85861c655892eadad0beb data/create/recipes/small_ochrum_bricks_from_stone_types_ochrum_stonecutting.json +d8e9ef4c8b100eac61fcd31403f3f852b553005f data/create/recipes/small_rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json 80ce12b2f7b6e5457b8a14800b5ffc089c765dc5 data/create/recipes/small_scorchia_brick_slab.json a39b9317766c7078d6db6ac527998ac08c78dbed data/create/recipes/small_scorchia_brick_slab_from_scorchia_stonecutting.json ddc87bc0fe6ad23db9d77191da59003638482601 data/create/recipes/small_scorchia_brick_slab_from_stone_types_scorchia_stonecutting.json @@ -5688,7 +5718,7 @@ e16d74571ae10007f06f3b86ddf05d3ca9b73559 data/minecraft/tags/blocks/doors.json 69f596fcb065e26b02ce246760432b5174191b76 data/minecraft/tags/blocks/impermeable.json 2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/lush_ground_replaceable.json 1472ec62e43355273f0699743ccdb65324c02475 data/minecraft/tags/blocks/mineable/axe.json -6217d450d341b50ca116983c80d9374957903284 data/minecraft/tags/blocks/mineable/pickaxe.json +cb3c434a11ce83b673d09b1c60a91530a89aaadf data/minecraft/tags/blocks/mineable/pickaxe.json 2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/moss_replaceable.json e157c1d3af30e409e34bbefbe15a037e6e1c8daa data/minecraft/tags/blocks/needs_iron_tool.json a08f67865337f62601c5e333b4011382d10020e4 data/minecraft/tags/blocks/needs_stone_tool.json diff --git a/src/generated/resources/assets/create/blockstates/rose_quartz_block.json b/src/generated/resources/assets/create/blockstates/rose_quartz_block.json new file mode 100644 index 000000000..c7fc210a3 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/rose_quartz_block.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "create:block/rose_quartz_block_horizontal", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "create:block/rose_quartz_block" + }, + "axis=z": { + "model": "create:block/rose_quartz_block_horizontal", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/rose_quartz_lamp.json b/src/generated/resources/assets/create/blockstates/rose_quartz_lamp.json new file mode 100644 index 000000000..240adc625 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/rose_quartz_lamp.json @@ -0,0 +1,28 @@ +{ + "variants": { + "activate=false,powered=false,powering=false": { + "model": "create:block/rose_quartz_lamp" + }, + "activate=true,powered=false,powering=false": { + "model": "create:block/rose_quartz_lamp" + }, + "activate=false,powered=true,powering=false": { + "model": "create:block/rose_quartz_lamp" + }, + "activate=true,powered=true,powering=false": { + "model": "create:block/rose_quartz_lamp" + }, + "activate=false,powered=false,powering=true": { + "model": "create:block/rose_quartz_lamp_powered" + }, + "activate=true,powered=false,powering=true": { + "model": "create:block/rose_quartz_lamp_powered" + }, + "activate=false,powered=true,powering=true": { + "model": "create:block/rose_quartz_lamp_powered" + }, + "activate=true,powered=true,powering=true": { + "model": "create:block/rose_quartz_lamp_powered" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/rose_quartz_tiles.json b/src/generated/resources/assets/create/blockstates/rose_quartz_tiles.json new file mode 100644 index 000000000..f70e845d6 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/rose_quartz_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/rose_quartz_tiles" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/small_rose_quartz_tiles.json b/src/generated/resources/assets/create/blockstates/small_rose_quartz_tiles.json new file mode 100644 index 000000000..b3fe944f0 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/small_rose_quartz_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/small_rose_quartz_tiles" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index 542e2cffb..d57821dd5 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -411,6 +411,9 @@ "block.create.refined_radiance_casing": "bu\u0131s\u0250\u0186 \u0287u\u0250\u0131p\u0250\u1D1A", "block.create.rope": "\u01DDdo\u1D1A", "block.create.rope_pulley": "\u028E\u01DD\u05DF\u05DFn\u0500 \u01DDdo\u1D1A", + "block.create.rose_quartz_block": "z\u0287\u0279\u0250n\u1F49 \u01DDso\u1D1A \u025Fo \u029E\u0254o\u05DF\u15FA", + "block.create.rose_quartz_lamp": "d\u026F\u0250\uA780 z\u0287\u0279\u0250n\u1F49 \u01DDso\u1D1A", + "block.create.rose_quartz_tiles": "s\u01DD\u05DF\u0131\u27D8 z\u0287\u0279\u0250n\u1F49 \u01DDso\u1D1A", "block.create.rotation_speed_controller": "\u0279\u01DD\u05DF\u05DFo\u0279\u0287uo\u0186 p\u01DD\u01DDdS uo\u0131\u0287\u0250\u0287o\u1D1A", "block.create.sail_frame": "\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0131\u0250S", "block.create.schematic_table": "\u01DD\u05DFq\u0250\u27D8 \u0254\u0131\u0287\u0250\u026F\u01DD\u0265\u0254S", @@ -464,6 +467,7 @@ "block.create.small_ochrum_brick_stairs": "s\u0279\u0131\u0250\u0287S \u029E\u0254\u0131\u0279\u15FA \u026Fn\u0279\u0265\u0254O \u05DF\u05DF\u0250\u026FS", "block.create.small_ochrum_brick_wall": "\u05DF\u05DF\u0250M \u029E\u0254\u0131\u0279\u15FA \u026Fn\u0279\u0265\u0254O \u05DF\u05DF\u0250\u026FS", "block.create.small_ochrum_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u026Fn\u0279\u0265\u0254O \u05DF\u05DF\u0250\u026FS", + "block.create.small_rose_quartz_tiles": "s\u01DD\u05DF\u0131\u27D8 z\u0287\u0279\u0250n\u1F49 \u01DDso\u1D1A \u05DF\u05DF\u0250\u026FS", "block.create.small_scorchia_brick_slab": "q\u0250\u05DFS \u029E\u0254\u0131\u0279\u15FA \u0250\u0131\u0265\u0254\u0279o\u0254S \u05DF\u05DF\u0250\u026FS", "block.create.small_scorchia_brick_stairs": "s\u0279\u0131\u0250\u0287S \u029E\u0254\u0131\u0279\u15FA \u0250\u0131\u0265\u0254\u0279o\u0254S \u05DF\u05DF\u0250\u026FS", "block.create.small_scorchia_brick_wall": "\u05DF\u05DF\u0250M \u029E\u0254\u0131\u0279\u15FA \u0250\u0131\u0265\u0254\u0279o\u0254S \u05DF\u05DF\u0250\u026FS", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 356ffd578..82fec239c 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -414,6 +414,9 @@ "block.create.refined_radiance_casing": "Radiant Casing", "block.create.rope": "Rope", "block.create.rope_pulley": "Rope Pulley", + "block.create.rose_quartz_block": "Block of Rose Quartz", + "block.create.rose_quartz_lamp": "Rose Quartz Lamp", + "block.create.rose_quartz_tiles": "Rose Quartz Tiles", "block.create.rotation_speed_controller": "Rotation Speed Controller", "block.create.sail_frame": "Sail Frame", "block.create.schematic_table": "Schematic Table", @@ -467,6 +470,7 @@ "block.create.small_ochrum_brick_stairs": "Small Ochrum Brick Stairs", "block.create.small_ochrum_brick_wall": "Small Ochrum Brick Wall", "block.create.small_ochrum_bricks": "Small Ochrum Bricks", + "block.create.small_rose_quartz_tiles": "Small Rose Quartz Tiles", "block.create.small_scorchia_brick_slab": "Small Scorchia Brick Slab", "block.create.small_scorchia_brick_stairs": "Small Scorchia Brick Stairs", "block.create.small_scorchia_brick_wall": "Small Scorchia Brick Wall", 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 ef6367465..a9b2e8733 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1169", + "_": "Missing Localizations: 1173", "_": "->------------------------] Game Elements [------------------------<-", @@ -415,6 +415,9 @@ "block.create.refined_radiance_casing": "Glanzgehäuse", "block.create.rope": "Seil", "block.create.rope_pulley": "Seilrolle", + "block.create.rose_quartz_block": "UNLOCALIZED: Block of Rose Quartz", + "block.create.rose_quartz_lamp": "UNLOCALIZED: Rose Quartz Lamp", + "block.create.rose_quartz_tiles": "UNLOCALIZED: Rose Quartz Tiles", "block.create.rotation_speed_controller": "Rotationsgeschwindigkeitsregler", "block.create.sail_frame": "Segelrahmen", "block.create.schematic_table": "Bauplantisch", @@ -468,6 +471,7 @@ "block.create.small_ochrum_brick_stairs": "Kleine Ockrumziegeltreppe", "block.create.small_ochrum_brick_wall": "Kleine Ockrumziegelmauer", "block.create.small_ochrum_bricks": "Kleine Ockrumziegelsteine", + "block.create.small_rose_quartz_tiles": "UNLOCALIZED: Small Rose Quartz Tiles", "block.create.small_scorchia_brick_slab": "Kleine Scorchiaziegelstufe", "block.create.small_scorchia_brick_stairs": "Kleine Scorchiaziegeltreppe", "block.create.small_scorchia_brick_wall": "Kleine Scorchiaziegelmauer", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_cl.json b/src/generated/resources/assets/create/lang/unfinished/es_cl.json index e9de1860e..db6b3896a 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_cl.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_cl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 819", + "_": "Missing Localizations: 823", "_": "->------------------------] Game Elements [------------------------<-", @@ -415,6 +415,9 @@ "block.create.refined_radiance_casing": "Cubierta Radiante", "block.create.rope": "Cuerda", "block.create.rope_pulley": "Polea de Cuerda", + "block.create.rose_quartz_block": "UNLOCALIZED: Block of Rose Quartz", + "block.create.rose_quartz_lamp": "UNLOCALIZED: Rose Quartz Lamp", + "block.create.rose_quartz_tiles": "UNLOCALIZED: Rose Quartz Tiles", "block.create.rotation_speed_controller": "Controlador de Velocidad de Rotación", "block.create.sail_frame": "Marco de Vela", "block.create.schematic_table": "Mesa de Esquemas", @@ -468,6 +471,7 @@ "block.create.small_ochrum_brick_stairs": "UNLOCALIZED: Small Ochrum Brick Stairs", "block.create.small_ochrum_brick_wall": "UNLOCALIZED: Small Ochrum Brick Wall", "block.create.small_ochrum_bricks": "UNLOCALIZED: Small Ochrum Bricks", + "block.create.small_rose_quartz_tiles": "UNLOCALIZED: Small Rose Quartz Tiles", "block.create.small_scorchia_brick_slab": "UNLOCALIZED: Small Scorchia Brick Slab", "block.create.small_scorchia_brick_stairs": "UNLOCALIZED: Small Scorchia Brick Stairs", "block.create.small_scorchia_brick_wall": "UNLOCALIZED: Small Scorchia Brick Wall", 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 529e2dc84..c9efc40b9 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_es.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_es.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 483", + "_": "Missing Localizations: 487", "_": "->------------------------] Game Elements [------------------------<-", @@ -415,6 +415,9 @@ "block.create.refined_radiance_casing": "Revestidor radiante", "block.create.rope": "Cuerda", "block.create.rope_pulley": "Polea de cuerda", + "block.create.rose_quartz_block": "UNLOCALIZED: Block of Rose Quartz", + "block.create.rose_quartz_lamp": "UNLOCALIZED: Rose Quartz Lamp", + "block.create.rose_quartz_tiles": "UNLOCALIZED: Rose Quartz Tiles", "block.create.rotation_speed_controller": "Controlador de velocidad rotacional", "block.create.sail_frame": "Marco de vela", "block.create.schematic_table": "Tabla de esquemas", @@ -468,6 +471,7 @@ "block.create.small_ochrum_brick_stairs": "Escalera de ladrillos pequeños de ocre", "block.create.small_ochrum_brick_wall": "Muro de ladrillos pequeños de ocre", "block.create.small_ochrum_bricks": "Ladrillos pequeños de ocre", + "block.create.small_rose_quartz_tiles": "UNLOCALIZED: Small Rose Quartz Tiles", "block.create.small_scorchia_brick_slab": "Losa de ladrillos pequeños de escoria oscura", "block.create.small_scorchia_brick_stairs": "Escaleras de ladrillos pequeños de escoria oscura", "block.create.small_scorchia_brick_wall": "Muro de ladrillos pequeños de escoria oscura", 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 a741991fa..de61ddaa4 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1975", + "_": "Missing Localizations: 1979", "_": "->------------------------] Game Elements [------------------------<-", @@ -415,6 +415,9 @@ "block.create.refined_radiance_casing": "UNLOCALIZED: Radiant Casing", "block.create.rope": "Corde", "block.create.rope_pulley": "Poulie à corde", + "block.create.rose_quartz_block": "UNLOCALIZED: Block of Rose Quartz", + "block.create.rose_quartz_lamp": "UNLOCALIZED: Rose Quartz Lamp", + "block.create.rose_quartz_tiles": "UNLOCALIZED: Rose Quartz Tiles", "block.create.rotation_speed_controller": "Contrôleur de vitesse de rotation", "block.create.sail_frame": "UNLOCALIZED: Sail Frame", "block.create.schematic_table": "Table à schéma", @@ -468,6 +471,7 @@ "block.create.small_ochrum_brick_stairs": "UNLOCALIZED: Small Ochrum Brick Stairs", "block.create.small_ochrum_brick_wall": "UNLOCALIZED: Small Ochrum Brick Wall", "block.create.small_ochrum_bricks": "UNLOCALIZED: Small Ochrum Bricks", + "block.create.small_rose_quartz_tiles": "UNLOCALIZED: Small Rose Quartz Tiles", "block.create.small_scorchia_brick_slab": "UNLOCALIZED: Small Scorchia Brick Slab", "block.create.small_scorchia_brick_stairs": "UNLOCALIZED: Small Scorchia Brick Stairs", "block.create.small_scorchia_brick_wall": "UNLOCALIZED: Small Scorchia Brick Wall", 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 76d23127f..f2db49bc5 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1746", + "_": "Missing Localizations: 1750", "_": "->------------------------] Game Elements [------------------------<-", @@ -415,6 +415,9 @@ "block.create.refined_radiance_casing": "Involucro radiante", "block.create.rope": "Corda", "block.create.rope_pulley": "Carrucola per corde", + "block.create.rose_quartz_block": "UNLOCALIZED: Block of Rose Quartz", + "block.create.rose_quartz_lamp": "UNLOCALIZED: Rose Quartz Lamp", + "block.create.rose_quartz_tiles": "UNLOCALIZED: Rose Quartz Tiles", "block.create.rotation_speed_controller": "Regolatore di velocità di rotazione", "block.create.sail_frame": "Telaio per vela", "block.create.schematic_table": "Banco schematico", @@ -468,6 +471,7 @@ "block.create.small_ochrum_brick_stairs": "UNLOCALIZED: Small Ochrum Brick Stairs", "block.create.small_ochrum_brick_wall": "UNLOCALIZED: Small Ochrum Brick Wall", "block.create.small_ochrum_bricks": "UNLOCALIZED: Small Ochrum Bricks", + "block.create.small_rose_quartz_tiles": "UNLOCALIZED: Small Rose Quartz Tiles", "block.create.small_scorchia_brick_slab": "UNLOCALIZED: Small Scorchia Brick Slab", "block.create.small_scorchia_brick_stairs": "UNLOCALIZED: Small Scorchia Brick Stairs", "block.create.small_scorchia_brick_wall": "UNLOCALIZED: Small Scorchia Brick Wall", 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 f4bd54fee..704aed60b 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 485", + "_": "Missing Localizations: 489", "_": "->------------------------] Game Elements [------------------------<-", @@ -415,6 +415,9 @@ "block.create.refined_radiance_casing": "光輝ケーシング", "block.create.rope": "ロープ", "block.create.rope_pulley": "ローププーリー", + "block.create.rose_quartz_block": "UNLOCALIZED: Block of Rose Quartz", + "block.create.rose_quartz_lamp": "UNLOCALIZED: Rose Quartz Lamp", + "block.create.rose_quartz_tiles": "UNLOCALIZED: Rose Quartz Tiles", "block.create.rotation_speed_controller": "回転速度コントローラー", "block.create.sail_frame": "帆フレーム", "block.create.schematic_table": "概略図台", @@ -468,6 +471,7 @@ "block.create.small_ochrum_brick_stairs": "小さな黄土岩レンガの階段", "block.create.small_ochrum_brick_wall": "小さな黄土岩レンガの塀", "block.create.small_ochrum_bricks": "小さな黄土岩レンガ", + "block.create.small_rose_quartz_tiles": "UNLOCALIZED: Small Rose Quartz Tiles", "block.create.small_scorchia_brick_slab": "小さなスコーチアレンガのハーフブロック", "block.create.small_scorchia_brick_stairs": "小さなスコーチアレンガの階段", "block.create.small_scorchia_brick_wall": "小さなスコーチアレンガの塀", 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 d64407e94..9fb6429d5 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 485", + "_": "Missing Localizations: 489", "_": "->------------------------] Game Elements [------------------------<-", @@ -415,6 +415,9 @@ "block.create.refined_radiance_casing": "빛나는 케이스", "block.create.rope": "밧줄", "block.create.rope_pulley": "밧줄 도르래", + "block.create.rose_quartz_block": "UNLOCALIZED: Block of Rose Quartz", + "block.create.rose_quartz_lamp": "UNLOCALIZED: Rose Quartz Lamp", + "block.create.rose_quartz_tiles": "UNLOCALIZED: Rose Quartz Tiles", "block.create.rotation_speed_controller": "회전 속도 컨트롤러", "block.create.sail_frame": "풍차 날개 틀", "block.create.schematic_table": "청사진 탁자", @@ -468,6 +471,7 @@ "block.create.small_ochrum_brick_stairs": "작은 황토암 벽돌 계단", "block.create.small_ochrum_brick_wall": "작은 황토암 벽돌 담장", "block.create.small_ochrum_bricks": "작은 황토암 벽돌", + "block.create.small_rose_quartz_tiles": "UNLOCALIZED: Small Rose Quartz Tiles", "block.create.small_scorchia_brick_slab": "작은 짙은 스코리아 벽돌 반 블록", "block.create.small_scorchia_brick_stairs": "작은 짙은 스코리아 벽돌 계단", "block.create.small_scorchia_brick_wall": "작은 짙은 스코리아 벽돌 담장", 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 163055eb6..89fb186ff 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 2319", + "_": "Missing Localizations: 2323", "_": "->------------------------] Game Elements [------------------------<-", @@ -415,6 +415,9 @@ "block.create.refined_radiance_casing": "UNLOCALIZED: Radiant Casing", "block.create.rope": "UNLOCALIZED: Rope", "block.create.rope_pulley": "UNLOCALIZED: Rope Pulley", + "block.create.rose_quartz_block": "UNLOCALIZED: Block of Rose Quartz", + "block.create.rose_quartz_lamp": "UNLOCALIZED: Rose Quartz Lamp", + "block.create.rose_quartz_tiles": "UNLOCALIZED: Rose Quartz Tiles", "block.create.rotation_speed_controller": "UNLOCALIZED: Rotation Speed Controller", "block.create.sail_frame": "UNLOCALIZED: Sail Frame", "block.create.schematic_table": "Bouwtekening Tafel", @@ -468,6 +471,7 @@ "block.create.small_ochrum_brick_stairs": "UNLOCALIZED: Small Ochrum Brick Stairs", "block.create.small_ochrum_brick_wall": "UNLOCALIZED: Small Ochrum Brick Wall", "block.create.small_ochrum_bricks": "UNLOCALIZED: Small Ochrum Bricks", + "block.create.small_rose_quartz_tiles": "UNLOCALIZED: Small Rose Quartz Tiles", "block.create.small_scorchia_brick_slab": "UNLOCALIZED: Small Scorchia Brick Slab", "block.create.small_scorchia_brick_stairs": "UNLOCALIZED: Small Scorchia Brick Stairs", "block.create.small_scorchia_brick_wall": "UNLOCALIZED: Small Scorchia Brick Wall", 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 3ab078632..91be4ada4 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json +++ b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 858", + "_": "Missing Localizations: 862", "_": "->------------------------] Game Elements [------------------------<-", @@ -415,6 +415,9 @@ "block.create.refined_radiance_casing": "Świetlista obudowa", "block.create.rope": "Lina", "block.create.rope_pulley": "Krążek z liną", + "block.create.rose_quartz_block": "UNLOCALIZED: Block of Rose Quartz", + "block.create.rose_quartz_lamp": "UNLOCALIZED: Rose Quartz Lamp", + "block.create.rose_quartz_tiles": "UNLOCALIZED: Rose Quartz Tiles", "block.create.rotation_speed_controller": "Sterownik prędkości obrotu", "block.create.sail_frame": "Rama żagla", "block.create.schematic_table": "Stół do planowania", @@ -468,6 +471,7 @@ "block.create.small_ochrum_brick_stairs": "UNLOCALIZED: Small Ochrum Brick Stairs", "block.create.small_ochrum_brick_wall": "UNLOCALIZED: Small Ochrum Brick Wall", "block.create.small_ochrum_bricks": "UNLOCALIZED: Small Ochrum Bricks", + "block.create.small_rose_quartz_tiles": "UNLOCALIZED: Small Rose Quartz Tiles", "block.create.small_scorchia_brick_slab": "UNLOCALIZED: Small Scorchia Brick Slab", "block.create.small_scorchia_brick_stairs": "UNLOCALIZED: Small Scorchia Brick Stairs", "block.create.small_scorchia_brick_wall": "UNLOCALIZED: Small Scorchia Brick Wall", 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 a06cf78bd..74a658d59 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1352", + "_": "Missing Localizations: 1356", "_": "->------------------------] Game Elements [------------------------<-", @@ -415,6 +415,9 @@ "block.create.refined_radiance_casing": "Revestimento Brilhante", "block.create.rope": "Corda", "block.create.rope_pulley": "Polia", + "block.create.rose_quartz_block": "UNLOCALIZED: Block of Rose Quartz", + "block.create.rose_quartz_lamp": "UNLOCALIZED: Rose Quartz Lamp", + "block.create.rose_quartz_tiles": "UNLOCALIZED: Rose Quartz Tiles", "block.create.rotation_speed_controller": "Controlador de Velocidade Rotacional", "block.create.sail_frame": "moldura de vela", "block.create.schematic_table": "Mesa de Esquema", @@ -468,6 +471,7 @@ "block.create.small_ochrum_brick_stairs": "Escada de tijolos pequenos de Ocrom", "block.create.small_ochrum_brick_wall": "Muro de tijolos pequenos de Ocrom", "block.create.small_ochrum_bricks": "Tijolos pequenos de Ocrom", + "block.create.small_rose_quartz_tiles": "UNLOCALIZED: Small Rose Quartz Tiles", "block.create.small_scorchia_brick_slab": "Laje de tijolos pequenos de escória negra", "block.create.small_scorchia_brick_stairs": "Escada de tijolos pequenos de escória negra", "block.create.small_scorchia_brick_wall": "Muro de tijolos pequenos de escória negra", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_pt.json b/src/generated/resources/assets/create/lang/unfinished/pt_pt.json index d211dc4ae..7d35db946 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_pt.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_pt.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 2028", + "_": "Missing Localizations: 2032", "_": "->------------------------] Game Elements [------------------------<-", @@ -415,6 +415,9 @@ "block.create.refined_radiance_casing": "Revestimento Brilhante", "block.create.rope": "Corda", "block.create.rope_pulley": "Polia", + "block.create.rose_quartz_block": "UNLOCALIZED: Block of Rose Quartz", + "block.create.rose_quartz_lamp": "UNLOCALIZED: Rose Quartz Lamp", + "block.create.rose_quartz_tiles": "UNLOCALIZED: Rose Quartz Tiles", "block.create.rotation_speed_controller": "Controlador de Velocidade Rotacional", "block.create.sail_frame": "moldura de vela", "block.create.schematic_table": "Mesa de Esquema", @@ -468,6 +471,7 @@ "block.create.small_ochrum_brick_stairs": "UNLOCALIZED: Small Ochrum Brick Stairs", "block.create.small_ochrum_brick_wall": "UNLOCALIZED: Small Ochrum Brick Wall", "block.create.small_ochrum_bricks": "UNLOCALIZED: Small Ochrum Bricks", + "block.create.small_rose_quartz_tiles": "UNLOCALIZED: Small Rose Quartz Tiles", "block.create.small_scorchia_brick_slab": "UNLOCALIZED: Small Scorchia Brick Slab", "block.create.small_scorchia_brick_stairs": "UNLOCALIZED: Small Scorchia Brick Stairs", "block.create.small_scorchia_brick_wall": "UNLOCALIZED: Small Scorchia Brick Wall", diff --git a/src/generated/resources/assets/create/lang/unfinished/ro_ro.json b/src/generated/resources/assets/create/lang/unfinished/ro_ro.json index 98e06cdbc..0d7cd2c7d 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ro_ro.json +++ b/src/generated/resources/assets/create/lang/unfinished/ro_ro.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 486", + "_": "Missing Localizations: 490", "_": "->------------------------] Game Elements [------------------------<-", @@ -415,6 +415,9 @@ "block.create.refined_radiance_casing": "Carcasă Radiantă", "block.create.rope": "Sfoară", "block.create.rope_pulley": "Scripete De Sfoară", + "block.create.rose_quartz_block": "UNLOCALIZED: Block of Rose Quartz", + "block.create.rose_quartz_lamp": "UNLOCALIZED: Rose Quartz Lamp", + "block.create.rose_quartz_tiles": "UNLOCALIZED: Rose Quartz Tiles", "block.create.rotation_speed_controller": "Controlor De Viteză De Rotație", "block.create.sail_frame": "Ramă De Velă", "block.create.schematic_table": "Masă De Schemă", @@ -468,6 +471,7 @@ "block.create.small_ochrum_brick_stairs": "Scări De Cărămizi Mici De Ochrum", "block.create.small_ochrum_brick_wall": "Zid De Cărămizi Mici De Ochrum", "block.create.small_ochrum_bricks": "Cărămizi Mici De Ochrum", + "block.create.small_rose_quartz_tiles": "UNLOCALIZED: Small Rose Quartz Tiles", "block.create.small_scorchia_brick_slab": "Lespede De Cărămizi Mici De Scorchia", "block.create.small_scorchia_brick_stairs": "Scări De Cărămizi Mici De Scorchia", "block.create.small_scorchia_brick_wall": "Zid De Cărămizi Mici De Scorchia", 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 a1cdb5885..ad64358ee 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 863", + "_": "Missing Localizations: 867", "_": "->------------------------] Game Elements [------------------------<-", @@ -415,6 +415,9 @@ "block.create.refined_radiance_casing": "Сияющий корпус", "block.create.rope": "Канат", "block.create.rope_pulley": "Лебёдка", + "block.create.rose_quartz_block": "UNLOCALIZED: Block of Rose Quartz", + "block.create.rose_quartz_lamp": "UNLOCALIZED: Rose Quartz Lamp", + "block.create.rose_quartz_tiles": "UNLOCALIZED: Rose Quartz Tiles", "block.create.rotation_speed_controller": "Регулятор скорости вращения", "block.create.sail_frame": "Рама паруса", "block.create.schematic_table": "Схематичный стол", @@ -468,6 +471,7 @@ "block.create.small_ochrum_brick_stairs": "UNLOCALIZED: Small Ochrum Brick Stairs", "block.create.small_ochrum_brick_wall": "UNLOCALIZED: Small Ochrum Brick Wall", "block.create.small_ochrum_bricks": "UNLOCALIZED: Small Ochrum Bricks", + "block.create.small_rose_quartz_tiles": "UNLOCALIZED: Small Rose Quartz Tiles", "block.create.small_scorchia_brick_slab": "UNLOCALIZED: Small Scorchia Brick Slab", "block.create.small_scorchia_brick_stairs": "UNLOCALIZED: Small Scorchia Brick Stairs", "block.create.small_scorchia_brick_wall": "UNLOCALIZED: Small Scorchia Brick Wall", 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 d645940d3..eb821cdd9 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 483", + "_": "Missing Localizations: 487", "_": "->------------------------] Game Elements [------------------------<-", @@ -415,6 +415,9 @@ "block.create.refined_radiance_casing": "光辉机壳", "block.create.rope": "绳索", "block.create.rope_pulley": "绳索滑轮", + "block.create.rose_quartz_block": "UNLOCALIZED: Block of Rose Quartz", + "block.create.rose_quartz_lamp": "UNLOCALIZED: Rose Quartz Lamp", + "block.create.rose_quartz_tiles": "UNLOCALIZED: Rose Quartz Tiles", "block.create.rotation_speed_controller": "转速控制器", "block.create.sail_frame": "风帆框架", "block.create.schematic_table": "蓝图桌", @@ -468,6 +471,7 @@ "block.create.small_ochrum_brick_stairs": "赭金砂小砖块楼梯", "block.create.small_ochrum_brick_wall": "赭金砂小砖块墙", "block.create.small_ochrum_bricks": "赭金砂小砖块", + "block.create.small_rose_quartz_tiles": "UNLOCALIZED: Small Rose Quartz Tiles", "block.create.small_scorchia_brick_slab": "焦黑熔渣小砖块台阶", "block.create.small_scorchia_brick_stairs": "焦黑熔渣小砖块楼梯", "block.create.small_scorchia_brick_wall": "焦黑熔渣小砖块墙", 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 68b69448d..043e8223d 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 877", + "_": "Missing Localizations: 881", "_": "->------------------------] Game Elements [------------------------<-", @@ -415,6 +415,9 @@ "block.create.refined_radiance_casing": "光輝機殼", "block.create.rope": "繩索", "block.create.rope_pulley": "滑輪繩索", + "block.create.rose_quartz_block": "UNLOCALIZED: Block of Rose Quartz", + "block.create.rose_quartz_lamp": "UNLOCALIZED: Rose Quartz Lamp", + "block.create.rose_quartz_tiles": "UNLOCALIZED: Rose Quartz Tiles", "block.create.rotation_speed_controller": "轉速控制器", "block.create.sail_frame": "風帆框架", "block.create.schematic_table": "藍圖桌", @@ -468,6 +471,7 @@ "block.create.small_ochrum_brick_stairs": "UNLOCALIZED: Small Ochrum Brick Stairs", "block.create.small_ochrum_brick_wall": "UNLOCALIZED: Small Ochrum Brick Wall", "block.create.small_ochrum_bricks": "UNLOCALIZED: Small Ochrum Bricks", + "block.create.small_rose_quartz_tiles": "UNLOCALIZED: Small Rose Quartz Tiles", "block.create.small_scorchia_brick_slab": "UNLOCALIZED: Small Scorchia Brick Slab", "block.create.small_scorchia_brick_stairs": "UNLOCALIZED: Small Scorchia Brick Stairs", "block.create.small_scorchia_brick_wall": "UNLOCALIZED: Small Scorchia Brick Wall", diff --git a/src/generated/resources/assets/create/models/block/rose_quartz_block.json b/src/generated/resources/assets/create/models/block/rose_quartz_block.json new file mode 100644 index 000000000..17aa23bf3 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/rose_quartz_block.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "create:block/palettes/rose_quartz_side", + "end": "create:block/palettes/rose_quartz_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/rose_quartz_block_horizontal.json b/src/generated/resources/assets/create/models/block/rose_quartz_block_horizontal.json new file mode 100644 index 000000000..6c30636f0 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/rose_quartz_block_horizontal.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "side": "create:block/palettes/rose_quartz_side", + "end": "create:block/palettes/rose_quartz_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/rose_quartz_lamp.json b/src/generated/resources/assets/create/models/block/rose_quartz_lamp.json new file mode 100644 index 000000000..ad7a72c91 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/rose_quartz_lamp.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "create:block/rose_quartz_lamp" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/rose_quartz_lamp_powered.json b/src/generated/resources/assets/create/models/block/rose_quartz_lamp_powered.json new file mode 100644 index 000000000..91b80ba77 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/rose_quartz_lamp_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "create:block/rose_quartz_lamp_powered" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/rose_quartz_tiles.json b/src/generated/resources/assets/create/models/block/rose_quartz_tiles.json new file mode 100644 index 000000000..67008e30f --- /dev/null +++ b/src/generated/resources/assets/create/models/block/rose_quartz_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "create:block/palettes/rose_quartz_tiles" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/small_rose_quartz_tiles.json b/src/generated/resources/assets/create/models/block/small_rose_quartz_tiles.json new file mode 100644 index 000000000..8f9d71b61 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/small_rose_quartz_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "create:block/palettes/small_rose_quartz_tiles" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/rose_quartz_block.json b/src/generated/resources/assets/create/models/item/rose_quartz_block.json new file mode 100644 index 000000000..04df51f18 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/rose_quartz_block.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/rose_quartz_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/rose_quartz_lamp.json b/src/generated/resources/assets/create/models/item/rose_quartz_lamp.json new file mode 100644 index 000000000..cbdadd1f0 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/rose_quartz_lamp.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/rose_quartz_lamp" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/rose_quartz_tiles.json b/src/generated/resources/assets/create/models/item/rose_quartz_tiles.json new file mode 100644 index 000000000..284a2334d --- /dev/null +++ b/src/generated/resources/assets/create/models/item/rose_quartz_tiles.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/rose_quartz_tiles" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/small_rose_quartz_tiles.json b/src/generated/resources/assets/create/models/item/small_rose_quartz_tiles.json new file mode 100644 index 000000000..7c6113367 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/small_rose_quartz_tiles.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/small_rose_quartz_tiles" +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/rose_quartz_lamp.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/rose_quartz_lamp.json new file mode 100644 index 000000000..607171f3b --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/rose_quartz_lamp.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/kinetics/rose_quartz_lamp" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/kinetics/rose_quartz_lamp" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/rose_quartz_tilesfrom_conversion.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/rose_quartz_tilesfrom_conversion.json new file mode 100644 index 000000000..be7d076c7 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/rose_quartz_tilesfrom_conversion.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/materials/rose_quartz_tilesfrom_conversion" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:small_rose_quartz_tiles" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/materials/rose_quartz_tilesfrom_conversion" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/small_rose_quartz_tilesfrom_conversion.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/small_rose_quartz_tilesfrom_conversion.json new file mode 100644 index 000000000..3d7734223 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/small_rose_quartz_tilesfrom_conversion.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/materials/small_rose_quartz_tilesfrom_conversion" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:rose_quartz_tiles" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/materials/small_rose_quartz_tilesfrom_conversion" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/rose_quartz_block_from_rose_quartz_stonecutting.json b/src/generated/resources/data/create/advancements/recipes/create.base/rose_quartz_block_from_rose_quartz_stonecutting.json new file mode 100644 index 000000000..d1a4954be --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/rose_quartz_block_from_rose_quartz_stonecutting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:rose_quartz_block_from_rose_quartz_stonecutting" + ] + }, + "criteria": { + "has_rose_quartz": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:rose_quartz" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:rose_quartz_block_from_rose_quartz_stonecutting" + } + } + }, + "requirements": [ + [ + "has_rose_quartz", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json b/src/generated/resources/data/create/advancements/recipes/create.base/rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json new file mode 100644 index 000000000..ce9a15c2a --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:rose_quartz_tiles_from_polished_rose_quartz_stonecutting" + ] + }, + "criteria": { + "has_polished_rose_quartz": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:polished_rose_quartz" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:rose_quartz_tiles_from_polished_rose_quartz_stonecutting" + } + } + }, + "requirements": [ + [ + "has_polished_rose_quartz", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/small_rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json b/src/generated/resources/data/create/advancements/recipes/create.base/small_rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json new file mode 100644 index 000000000..18abfa79a --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/small_rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:small_rose_quartz_tiles_from_polished_rose_quartz_stonecutting" + ] + }, + "criteria": { + "has_polished_rose_quartz": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "create:polished_rose_quartz" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:small_rose_quartz_tiles_from_polished_rose_quartz_stonecutting" + } + } + }, + "requirements": [ + [ + "has_polished_rose_quartz", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/rose_quartz_block.json b/src/generated/resources/data/create/loot_tables/blocks/rose_quartz_block.json new file mode 100644 index 000000000..3da459a43 --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/rose_quartz_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "create:rose_quartz_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/rose_quartz_lamp.json b/src/generated/resources/data/create/loot_tables/blocks/rose_quartz_lamp.json new file mode 100644 index 000000000..014c4682c --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/rose_quartz_lamp.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "create:rose_quartz_lamp" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/rose_quartz_tiles.json b/src/generated/resources/data/create/loot_tables/blocks/rose_quartz_tiles.json new file mode 100644 index 000000000..6ad6d3ad4 --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/rose_quartz_tiles.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "create:rose_quartz_tiles" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/small_rose_quartz_tiles.json b/src/generated/resources/data/create/loot_tables/blocks/small_rose_quartz_tiles.json new file mode 100644 index 000000000..30dfb25e6 --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/small_rose_quartz_tiles.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "create:small_rose_quartz_tiles" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/rose_quartz_lamp.json b/src/generated/resources/data/create/recipes/crafting/kinetics/rose_quartz_lamp.json new file mode 100644 index 000000000..2dc03e9e9 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/rose_quartz_lamp.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "create:polished_rose_quartz" + }, + { + "tag": "forge:dusts/redstone" + }, + { + "tag": "forge:ingots/zinc" + } + ], + "result": { + "item": "create:rose_quartz_lamp" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/materials/rose_quartz_tilesfrom_conversion.json b/src/generated/resources/data/create/recipes/crafting/materials/rose_quartz_tilesfrom_conversion.json new file mode 100644 index 000000000..c996b6d6c --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/materials/rose_quartz_tilesfrom_conversion.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "create:small_rose_quartz_tiles" + } + ], + "result": { + "item": "create:rose_quartz_tiles" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/materials/small_rose_quartz_tilesfrom_conversion.json b/src/generated/resources/data/create/recipes/crafting/materials/small_rose_quartz_tilesfrom_conversion.json new file mode 100644 index 000000000..3b9bb941d --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/materials/small_rose_quartz_tilesfrom_conversion.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "create:rose_quartz_tiles" + } + ], + "result": { + "item": "create:small_rose_quartz_tiles" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/rose_quartz_block_from_rose_quartz_stonecutting.json b/src/generated/resources/data/create/recipes/rose_quartz_block_from_rose_quartz_stonecutting.json new file mode 100644 index 000000000..5592a1582 --- /dev/null +++ b/src/generated/resources/data/create/recipes/rose_quartz_block_from_rose_quartz_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:rose_quartz" + }, + "result": "create:rose_quartz_block", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json b/src/generated/resources/data/create/recipes/rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json new file mode 100644 index 000000000..0902ac68e --- /dev/null +++ b/src/generated/resources/data/create/recipes/rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:polished_rose_quartz" + }, + "result": "create:rose_quartz_tiles", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/small_rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json b/src/generated/resources/data/create/recipes/small_rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json new file mode 100644 index 000000000..67a23e268 --- /dev/null +++ b/src/generated/resources/data/create/recipes/small_rose_quartz_tiles_from_polished_rose_quartz_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:polished_rose_quartz" + }, + "result": "create:small_rose_quartz_tiles", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index e36924259..2a235fd46 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -151,6 +151,7 @@ "create:green_nixie_tube", "create:red_nixie_tube", "create:black_nixie_tube", + "create:rose_quartz_lamp", "create:redstone_link", "create:analog_lever", "create:placard", @@ -162,6 +163,9 @@ "create:raw_zinc_block", "create:zinc_block", "create:brass_block", + "create:rose_quartz_block", + "create:rose_quartz_tiles", + "create:small_rose_quartz_tiles", "create:copper_shingles", "create:exposed_copper_shingles", "create:weathered_copper_shingles", diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 2940a514a..a25bd657f 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -9,6 +9,7 @@ import static com.simibubi.create.AllTags.tagBlockAndItem; import static com.simibubi.create.content.AllSections.SCHEMATICS; import static com.simibubi.create.content.logistics.block.display.AllDisplayBehaviours.assignDataBehaviour; import static com.simibubi.create.foundation.data.BlockStateGen.axisBlock; +import static com.simibubi.create.foundation.data.BlockStateGen.simpleCubeAll; import static com.simibubi.create.foundation.data.CreateRegistrate.connectedTextures; import static com.simibubi.create.foundation.data.ModelGen.customItemModel; @@ -198,6 +199,7 @@ import com.simibubi.create.content.logistics.block.redstone.NixieTubeGenerator; import com.simibubi.create.content.logistics.block.redstone.RedstoneContactBlock; import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkBlock; import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkGenerator; +import com.simibubi.create.content.logistics.block.redstone.RoseQuartzLampBlock; import com.simibubi.create.content.logistics.block.redstone.StockpileSwitchBlock; import com.simibubi.create.content.logistics.block.vault.ItemVaultBlock; import com.simibubi.create.content.logistics.block.vault.ItemVaultCTBehaviour; @@ -249,6 +251,7 @@ import net.minecraft.world.item.Rarity; import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.RotatedPillarBlock; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.properties.BlockStateProperties; @@ -1779,6 +1782,21 @@ public class AllBlocks { .register(); }); + public static final BlockEntry ROSE_QUARTZ_LAMP = + REGISTRATE.block("rose_quartz_lamp", RoseQuartzLampBlock::new) + .initialProperties(() -> Blocks.REDSTONE_LAMP) + .properties(p -> p.color(MaterialColor.TERRACOTTA_PINK) + .lightLevel(s -> s.getValue(RoseQuartzLampBlock.POWERING) ? 15 : 0)) + .blockstate((c, p) -> BlockStateGen.simpleBlock(c, p, s -> { + boolean powered = s.getValue(RoseQuartzLampBlock.POWERING); + String name = c.getName() + (powered ? "_powered" : ""); + return p.models() + .cubeAll(name, p.modLoc("block/" + name)); + })) + .transform(pickaxeOnly()) + .simpleItem() + .register(); + public static final BlockEntry REDSTONE_LINK = REGISTRATE.block("redstone_link", RedstoneLinkBlock::new) .initialProperties(SharedProperties::wooden) @@ -2002,13 +2020,12 @@ public class AllBlocks { .lang("Block of Zinc") .register(); - public static final BlockEntry BRASS_BLOCK = REGISTRATE.block("brass_block", p -> new Block(p)) + public static final BlockEntry BRASS_BLOCK = REGISTRATE.block("brass_block", Block::new) .initialProperties(() -> Blocks.IRON_BLOCK) .properties(p -> p.color(MaterialColor.TERRACOTTA_YELLOW)) .properties(p -> p.requiresCorrectToolForDrops()) .transform(pickaxeOnly()) - .blockstate((c, p) -> p.simpleBlock(c.get(), p.models() - .cubeAll(c.getName(), p.modLoc("block/brass_storage_block")))) + .blockstate(simpleCubeAll("brass_storage_block")) .tag(BlockTags.NEEDS_IRON_TOOL) .tag(Tags.Blocks.STORAGE_BLOCKS) .tag(BlockTags.BEACON_BASE_BLOCKS) @@ -2018,6 +2035,41 @@ public class AllBlocks { .lang("Block of Brass") .register(); + public static final BlockEntry ROSE_QUARTZ_BLOCK = + REGISTRATE.block("rose_quartz_block", RotatedPillarBlock::new) + .initialProperties(() -> Blocks.AMETHYST_BLOCK) + .properties(p -> p.color(MaterialColor.TERRACOTTA_PINK) + .requiresCorrectToolForDrops() + .sound(SoundType.DEEPSLATE)) + .transform(pickaxeOnly()) + .blockstate((c, p) -> p.axisBlock(c.get(), p.modLoc("block/palettes/rose_quartz_side"), + p.modLoc("block/palettes/rose_quartz_top"))) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(AllItems.ROSE_QUARTZ), c::get, 2)) + .simpleItem() + .lang("Block of Rose Quartz") + .register(); + + public static final BlockEntry ROSE_QUARTZ_TILES = REGISTRATE.block("rose_quartz_tiles", Block::new) + .initialProperties(() -> Blocks.DEEPSLATE) + .properties(p -> p.color(MaterialColor.TERRACOTTA_PINK)) + .properties(p -> p.requiresCorrectToolForDrops()) + .transform(pickaxeOnly()) + .blockstate(simpleCubeAll("palettes/rose_quartz_tiles")) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(AllItems.POLISHED_ROSE_QUARTZ), c::get, 2)) + .simpleItem() + .register(); + + public static final BlockEntry SMALL_ROSE_QUARTZ_TILES = + REGISTRATE.block("small_rose_quartz_tiles", Block::new) + .initialProperties(() -> Blocks.DEEPSLATE) + .properties(p -> p.color(MaterialColor.TERRACOTTA_PINK)) + .properties(p -> p.requiresCorrectToolForDrops()) + .transform(pickaxeOnly()) + .blockstate(simpleCubeAll("palettes/small_rose_quartz_tiles")) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(AllItems.POLISHED_ROSE_QUARTZ), c::get, 2)) + .simpleItem() + .register(); + public static final CopperBlockSet COPPER_SHINGLES = new CopperBlockSet(REGISTRATE, "copper_shingles", "copper_roof_top", CopperBlockSet.DEFAULT_VARIANTS, (c, p) -> { p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("plates/copper")), c::get, 2); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RoseQuartzLampBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/RoseQuartzLampBlock.java new file mode 100644 index 000000000..9046030db --- /dev/null +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/RoseQuartzLampBlock.java @@ -0,0 +1,186 @@ +package com.simibubi.create.content.logistics.block.redstone; + +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Random; +import java.util.Set; +import java.util.function.BiConsumer; + +import com.simibubi.create.content.contraptions.wrench.IWrenchable; +import com.simibubi.create.content.logistics.block.diodes.BrassDiodeBlock; +import com.simibubi.create.foundation.utility.Iterate; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.BlockPos.MutableBlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.level.block.state.properties.BooleanProperty; +import net.minecraft.world.phys.BlockHitResult; + +public class RoseQuartzLampBlock extends Block implements IWrenchable { + + public static final BooleanProperty POWERED = BlockStateProperties.POWERED; + public static final BooleanProperty POWERING = BrassDiodeBlock.POWERING; + public static final BooleanProperty ACTIVATE = BooleanProperty.create("activate"); + + public RoseQuartzLampBlock(Properties p_49795_) { + super(p_49795_); + registerDefaultState(defaultBlockState().setValue(POWERED, false) + .setValue(POWERING, false) + .setValue(ACTIVATE, false)); + } + + @Override + public BlockState getStateForPlacement(BlockPlaceContext pContext) { + BlockState stateForPlacement = super.getStateForPlacement(pContext); + return stateForPlacement.setValue(POWERED, pContext.getLevel() + .hasNeighborSignal(pContext.getClickedPos())); + } + + @Override + protected void createBlockStateDefinition(Builder pBuilder) { + super.createBlockStateDefinition(pBuilder.add(POWERED, POWERING, ACTIVATE)); + } + + @Override + public boolean shouldCheckWeakPower(BlockState state, LevelReader level, BlockPos pos, Direction side) { + return false; + } + + @Override + public void neighborChanged(BlockState pState, Level pLevel, BlockPos pPos, Block pBlock, BlockPos pFromPos, + boolean pIsMoving) { + if (pLevel.isClientSide) + return; + + boolean isPowered = pState.getValue(POWERED); + if (isPowered == pLevel.hasNeighborSignal(pPos)) + return; + if (isPowered) { + pLevel.setBlock(pPos, pState.cycle(POWERED), 2); + return; + } + + forEachInCluster(pLevel, pPos, (currentPos, currentState) -> { + pLevel.setBlock(currentPos, currentState.setValue(POWERING, false), 2); + scheduleActivation(pLevel, currentPos); + }); + + pLevel.setBlock(pPos, pState.setValue(POWERED, true) + .setValue(POWERING, true) + .setValue(ACTIVATE, true), 2); + pLevel.updateNeighborsAt(pPos, this); + scheduleActivation(pLevel, pPos); + } + + private void scheduleActivation(Level pLevel, BlockPos pPos) { + if (!pLevel.getBlockTicks() + .hasScheduledTick(pPos, this)) + pLevel.scheduleTick(pPos, this, 1); + } + + private void forEachInCluster(Level pLevel, BlockPos pPos, BiConsumer callback) { + List frontier = new LinkedList<>(); + Set visited = new HashSet<>(); + frontier.add(pPos); + visited.add(pPos); + + while (!frontier.isEmpty()) { + BlockPos pos = frontier.remove(0); + for (Direction d : Iterate.directions) { + BlockPos currentPos = pos.relative(d); + if (currentPos.distManhattan(pPos) > 16) + continue; + if (!visited.add(currentPos)) + continue; + BlockState currentState = pLevel.getBlockState(currentPos); + if (!currentState.is(this)) + continue; + callback.accept(currentPos, currentState); + frontier.add(currentPos); + } + } + } + + @Override + public boolean isSignalSource(BlockState pState) { + return true; + } + + @Override + public int getSignal(BlockState pState, BlockGetter pLevel, BlockPos pPos, Direction pDirection) { + if (pDirection == null) + return 0; + BlockState toState = pLevel.getBlockState(pPos.relative(pDirection.getOpposite())); + if (toState.is(this)) + return 0; + if (toState.is(Blocks.COMPARATOR)) + return getDistanceToPowered(pLevel, pPos, pDirection); +// if (toState.is(Blocks.REDSTONE_WIRE)) +// return 0; + return pState.getValue(POWERING) ? 15 : 0; + } + + private int getDistanceToPowered(BlockGetter level, BlockPos pos, Direction column) { + MutableBlockPos currentPos = pos.mutable(); + for (int power = 15; power > 0; power--) { + BlockState blockState = level.getBlockState(currentPos); + if (!blockState.is(this)) + return 0; + if (blockState.getValue(POWERING)) + return power; + currentPos.move(column); + } + return 0; + } + + @Override + public void tick(BlockState pState, ServerLevel pLevel, BlockPos pPos, Random pRand) { + boolean wasPowering = pState.getValue(POWERING); + boolean shouldBePowering = pState.getValue(ACTIVATE); + + if (wasPowering || shouldBePowering) { + pLevel.setBlock(pPos, pState.setValue(ACTIVATE, false) + .setValue(POWERING, shouldBePowering), 2); + } + + pLevel.updateNeighborsAt(pPos, this); + } + + @Override + public InteractionResult use(BlockState pState, Level pLevel, BlockPos pPos, Player pPlayer, InteractionHand pHand, + BlockHitResult pHit) { + return InteractionResult.PASS; + } + + @Override + public BlockState getRotatedBlockState(BlockState originalState, Direction targetedFace) { + return originalState.cycle(POWERING); + } + + @Override + public InteractionResult onWrenched(BlockState state, UseOnContext context) { + InteractionResult onWrenched = IWrenchable.super.onWrenched(state, context); + if (!onWrenched.consumesAction()) + return onWrenched; + + forEachInCluster(context.getLevel(), context.getClickedPos(), (currentPos, currentState) -> context.getLevel() + .updateNeighborsAt(currentPos, this)); + return onWrenched; + } + +} diff --git a/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java b/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java index d786dad40..8b2619a02 100644 --- a/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java @@ -76,6 +76,12 @@ public class BlockStateGen { boolean customItem) { return (c, p) -> horizontalAxisBlock(c, p, getBlockModel(customItem, c, p)); } + + public static NonNullBiConsumer, RegistrateBlockstateProvider> simpleCubeAll( + String path) { + return (c, p) -> p.simpleBlock(c.get(), p.models() + .cubeAll(c.getName(), p.modLoc("block/" + path))); + } public static NonNullBiConsumer, RegistrateBlockstateProvider> directionalAxisBlockProvider() { return (c, p) -> directionalAxisBlock(c, p, ($, vertical) -> p.models() 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 7d769b1af..2492252dc 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 @@ -99,6 +99,9 @@ public class StandardRecipeGen extends CreateRecipeProvider { metalCompacting(ImmutableList.of(AllItems.ZINC_NUGGET, AllItems.ZINC_INGOT, AllBlocks.ZINC_BLOCK), ImmutableList.of(I::zincNugget, I::zinc, I::zincBlock)), + ROSE_QUARTZ_CYCLE = + conversionCycle(ImmutableList.of(AllBlocks.ROSE_QUARTZ_TILES, AllBlocks.SMALL_ROSE_QUARTZ_TILES)), + ANDESITE_ALLOY = create(AllItems.ANDESITE_ALLOY).unlockedByTag(I::iron) .viaShaped(b -> b.define('A', Blocks.ANDESITE) .define('B', Tags.Items.NUGGETS_IRON) @@ -330,6 +333,11 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("P") .pattern("S")), + ROSE_QUARTZ_LAMP = create(AllBlocks.ROSE_QUARTZ_LAMP).unlockedByTag(I::zinc) + .viaShapeless(b -> b.requires(AllItems.POLISHED_ROSE_QUARTZ.get()) + .requires(I.redstone()) + .requires(I.zinc())), + BELT_CONNECTOR = create(AllItems.BELT_CONNECTOR).unlockedBy(I::andesite) .viaShaped(b -> b.define('D', Items.DRIED_KELP) .pattern("DDD") diff --git a/src/main/resources/assets/create/textures/block/palettes/rose_quartz_side.png b/src/main/resources/assets/create/textures/block/palettes/rose_quartz_side.png new file mode 100644 index 0000000000000000000000000000000000000000..c2a0ab37268e06c98b6feba606aaa431229a185d GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFiB@N_R&RLl&;3Pp!Or_F zM->eBlzOn;?+rU1&RjnEYFM3zjpR(}0_~>;J35rT)~%6EJNL0mZo#Lu)gC;rz8Cgx zSDF%9WvjF#!qdvQX7eVE$}7{(yLx=wvc)$@r2qWZiB|uZ>-5C~Uh`gV1UiMm)78&q Iol`;+02uscvH$=8 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/palettes/rose_quartz_tiles.png b/src/main/resources/assets/create/textures/block/palettes/rose_quartz_tiles.png new file mode 100644 index 0000000000000000000000000000000000000000..00cb9e0167d28ef5f68b529b2fc0869cd335bf40 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFk*O$nW6GkZ$%@VG=WbFnj;4JWnEM{QfI}E~% z$MaXD00k30T^vIsF3X;A6l`$dalUAfz`(1JxVk}%)mJv>uXn;>AHM$+DsTA39C(*) zr&oU1@m!#7xX9YsJ0ufhTdgnWoD)AhpW|7#!se>Eseh*NL{3oTHcD}9(>XDLRdSPp c@`*nT{ZR_n<2e7=04-ziboFyt=akR{08PnLaR2}S literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/palettes/rose_quartz_top.png b/src/main/resources/assets/create/textures/block/palettes/rose_quartz_top.png new file mode 100644 index 0000000000000000000000000000000000000000..27319577a8a35e9605bab87df080ca309fb067df GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFqSN74VjuK)X&{J*;Q|ECAmo71NOWjPBxB8wRq_zr_GdR5+|wI5-r{oVJ;*!fFywxsVNHZ8M5CCyjn^xGA3zEv~W t=br!OpyU)TSud;jlWa>6KOqFDmpUybP0l+XkKe%L!E literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/rose_quartz_lamp.png b/src/main/resources/assets/create/textures/block/rose_quartz_lamp.png new file mode 100644 index 0000000000000000000000000000000000000000..f71c6f9b6d3c2a8e62aa46679c2b6551e50f2e4a GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<*n>;#sae=3&FJU^%=@A?EbOLM2mRUR7Hn=wN@EE6f=dv3u)93Ywjbt@ZH!)E- lDw?q}GAioRwk=z77#?S9PM395`UrFygQu&X%Q~loCIG>xU{(MC literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/rose_quartz_lamp_powered.png b/src/main/resources/assets/create/textures/block/rose_quartz_lamp_powered.png new file mode 100644 index 0000000000000000000000000000000000000000..f04ae4a13e72b5c89f9e3fc55f5edd6a24c97067 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFbBi|dqtGpB)iISV`@iy0XB4uLSEsD@VqP;jcJi(`ny<>Ukrkpv?Fk(4w6 zPTt}b9K6Np0&};TE`0N3RSDZg)5bGTbCx&utUa|d@u=NPo}9+C&DWMqUuL{PB_+4F zGVIy81qWoLtI}3888=r}mYmtS`ps7!nU|L7ar)Yfvx*nIxpu1MRRP<@%x5bT-^4i_ zlPXvKHfiTWo}|_NYE$0qVm49NJ-d)4Wo2b$<;U-zK21t!Kzyn`(18q|u6{1- HoD!M<++ck% literal 0 HcmV?d00001