diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index 79a533f15..b82cc5fb3 100644 --- a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,11 +1,11 @@ -// 1.20.1 2023-10-29T12:06:36.0052427 Registries +// 1.20.1 2023-11-01T14:34:16.9971116 Registries 67f8cd0621b1c3614da8c1910f6b7bcb61660293 data/deeperdarker/dimension_type/otherside.json 1087b644ded881bbbf5188fd66ce16f07cc59fbf data/deeperdarker/worldgen/biome/blooming_caverns.json 4491dd6887a8760b77f9a28406c3e4c0535b108d data/deeperdarker/worldgen/biome/deeplands.json bd2c433caf3a3f7dfff3668a68dbdf56fa994df5 data/deeperdarker/worldgen/biome/echoing_forest.json 06d29b9291ed3a63be90750a8c6f182e0c168b7b data/deeperdarker/worldgen/biome/overcast_columns.json 799c485ec1466bd9b459c4ca9e2e2d5963465cc3 data/deeperdarker/worldgen/configured_feature/blooming_sculk_patch.json -3510820741c1f596035b74223ec273786b6dcbad data/deeperdarker/worldgen/configured_feature/blooming_sculk_vegetation.json +befb8dd1022d3e0e0bea6f211800fe3c8b63bb2e data/deeperdarker/worldgen/configured_feature/blooming_sculk_vegetation.json 5097028f5c8ae5e294126d6df771e3126d4fbd07 data/deeperdarker/worldgen/configured_feature/gloomslate_column.json ba29dfa84f2bebe688044c6e89b6c1d38dbaf0c6 data/deeperdarker/worldgen/configured_feature/gloomslate_generation.json 5d330f021ad1e22b038b08bfd79b49f5da654254 data/deeperdarker/worldgen/configured_feature/gloomy_sculk_patch.json diff --git a/src/generated/resources/.cache/16a987815a5a6d3b74a700570adf310b2e53ecae b/src/generated/resources/.cache/16a987815a5a6d3b74a700570adf310b2e53ecae index d704f8a6d..ee0b97fec 100644 --- a/src/generated/resources/.cache/16a987815a5a6d3b74a700570adf310b2e53ecae +++ b/src/generated/resources/.cache/16a987815a5a6d3b74a700570adf310b2e53ecae @@ -1,6 +1,5 @@ -// 1.20.1 2023-10-29T21:56:08.2776156 Block States: deeperdarker +// 1.20.1 2023-11-01T14:34:17.0061135 Block States: deeperdarker 4394f02c270408be611b2f3ba7abfbfd658cb0ff assets/deeperdarker/blockstates/ancient_vase.json -6a6092533dcd9d5b6932f99f5be6dc85b429f41b assets/deeperdarker/blockstates/blooming_flowers.json 165980177c5adcf470b9a08fe401e3bb1a4966f0 assets/deeperdarker/blockstates/blooming_moss_block.json 498227afd0f8c9b0fa72dfef97bf22b886a9069f assets/deeperdarker/blockstates/blooming_sculk.json a9636c05e9a8e2c7566c106f3dbbbd86c8097a4e assets/deeperdarker/blockstates/blooming_stem.json @@ -65,6 +64,7 @@ e3a2b0ee80440e02561977fb683ed85c20c7213a assets/deeperdarker/blockstates/gloomsl 3c096beaa9613e61820d7c7b3aa012585df0a82b assets/deeperdarker/blockstates/gloomy_geyser.json 09d1e0a03feba8c94323895c8cd611eb1b080c6e assets/deeperdarker/blockstates/gloomy_grass.json 49c82a06a73943a1539209d8e88a70833e64dfa1 assets/deeperdarker/blockstates/gloomy_sculk.json +5969d7abba92d5795a702cc49f4edd45a10c342e assets/deeperdarker/blockstates/glowing_flowers.json 6228cdf3d867d28cc4c70b02ba6640085913d9e5 assets/deeperdarker/blockstates/glowing_grass.json 59b37cfc48b764ed52f057a40cda85004285aaee assets/deeperdarker/blockstates/infested_sculk.json 6197329be084d0e4d3258707fbf338c36432af98 assets/deeperdarker/blockstates/polished_gloomslate.json @@ -118,7 +118,6 @@ d7f5127b333b891bbfa97cee4414876fef5429d5 assets/deeperdarker/blockstates/smooth_ e94fc45e791c65302fcc908ab5d32adc564c5e88 assets/deeperdarker/blockstates/stripped_echo_log.json 1482ba18bb49fe90f1bb3d0b7aec7963e6c0ac9f assets/deeperdarker/blockstates/stripped_echo_wood.json 690d24d273d0514954cb5395b0a6220314038cfd assets/deeperdarker/models/block/ancient_vase.json -b3e7881ec9d01d89952b70be65946eea0305c45f assets/deeperdarker/models/block/blooming_flowers.json 5f6d78b44fd7067c2670c9e989ce03e4e9aac70f assets/deeperdarker/models/block/blooming_moss_block.json 446377a22c7cd0fa8486a0da7afe4adf393c90e2 assets/deeperdarker/models/block/blooming_sculk.json 0c90c3f2270980d69f3a46e4826ab53ce84ec3f4 assets/deeperdarker/models/block/blooming_stem.json @@ -247,6 +246,7 @@ f238842b328abeca410989b554d21d4ec5f44df3 assets/deeperdarker/models/block/glooms 272248edfd0507c5be61290c5086ee576c56eaf4 assets/deeperdarker/models/block/gloomy_geyser.json a4fd82de7cea7b4d869c660fe963505bd1dbce11 assets/deeperdarker/models/block/gloomy_grass.json 62f9bfc451122ed1f36f07e0aaef8a00c1a98f7a assets/deeperdarker/models/block/gloomy_sculk.json +0642410e641f7e588bef0f3afe712ce23ce455d4 assets/deeperdarker/models/block/glowing_flowers.json 235d69d1208eebc1926f742f2a9aef3d8e9541bc assets/deeperdarker/models/block/glowing_grass.json b9d3122e7eb15851e9dc6d930601aff03629ce89 assets/deeperdarker/models/block/polished_gloomslate.json fb8457ff93c35f23a65ae63a157ada04bbf08244 assets/deeperdarker/models/block/polished_gloomslate_slab.json diff --git a/src/generated/resources/.cache/2b1c4c301b77a741c666834d476e7a049e70d3df b/src/generated/resources/.cache/2b1c4c301b77a741c666834d476e7a049e70d3df index e4f34bb9a..eb9a28815 100644 --- a/src/generated/resources/.cache/2b1c4c301b77a741c666834d476e7a049e70d3df +++ b/src/generated/resources/.cache/2b1c4c301b77a741c666834d476e7a049e70d3df @@ -1,4 +1,4 @@ -// 1.20.1 2023-10-29T13:48:21.7994946 Tags for minecraft:block mod id deeperdarker +// 1.20.1 2023-11-01T14:34:16.9781214 Tags for minecraft:block mod id deeperdarker 453499b5116c2c24d57c28ec55db0211260f511d data/deeperdarker/tags/blocks/echo_soil.json 5fc75620cbf33b6fbe8762687116de2f0df1bd34 data/deeperdarker/tags/blocks/gloomslate_replaceable.json 1b524a72db2dc423a915068148fa9e921f2e46f5 data/deeperdarker/tags/blocks/gloomy_sculk_replaceable.json @@ -24,15 +24,15 @@ dc2be5311ef04baad7565936ffafc6dcea324cf1 data/minecraft/tags/blocks/copper_ores. 8c05a0f37456da64c198eca83b383a909c2fe23f data/minecraft/tags/blocks/dirt.json 41a0ed1cf9fcf4b0f4e41d3155f010eb069e2edc data/minecraft/tags/blocks/emerald_ores.json 4b1b7b3d622aeb255906e952be4ddaf003b6026f data/minecraft/tags/blocks/fence_gates.json -2863c20239d0632a3b2be29f894feb5960c9929d data/minecraft/tags/blocks/flowers.json +81a54dc6ee81c739615aa27a3e28b941ba65077e data/minecraft/tags/blocks/flowers.json a84d63160bb42d942778124d8368b9db10ef6ed2 data/minecraft/tags/blocks/gold_ores.json -2863c20239d0632a3b2be29f894feb5960c9929d data/minecraft/tags/blocks/inside_step_sound_blocks.json +81a54dc6ee81c739615aa27a3e28b941ba65077e data/minecraft/tags/blocks/inside_step_sound_blocks.json 08b0595e3c0290061ed898dfbeb230d6c4f95eeb data/minecraft/tags/blocks/iron_ores.json e85880d9acf64424927082c80e9af7c9f50de52f data/minecraft/tags/blocks/lapis_ores.json 65c3a4802e5e6412bef926f01f45d3e81de4c779 data/minecraft/tags/blocks/leaves.json 21ba86398acef0f961c304fe5b2fd972455e0e3d data/minecraft/tags/blocks/logs_that_burn.json f7e256dd1d5e6019b4d5f567311a3c83e0fcc213 data/minecraft/tags/blocks/mineable/axe.json -ac3e7a20ad6ffdf5ecc67f728c3ce58ec93a90e8 data/minecraft/tags/blocks/mineable/hoe.json +7b8019698b80745368a00837d63c6265a4e8b120 data/minecraft/tags/blocks/mineable/hoe.json ad177a07d9375078090756e86bdf590b27cd0566 data/minecraft/tags/blocks/mineable/pickaxe.json f7b6f4235356ecc4395d064f20adbb6abb2fb51a data/minecraft/tags/blocks/mineable/shovel.json 6349c914702ba9732f2266363153bb5d75633878 data/minecraft/tags/blocks/needs_iron_tool.json @@ -47,7 +47,7 @@ b87f41ec93385cf003a9e81713446620acd52b86 data/minecraft/tags/blocks/redstone_ore 8c05a0f37456da64c198eca83b383a909c2fe23f data/minecraft/tags/blocks/sniffer_egg_hatch_boost.json 8dfd3b492264b019307369b18d494910d7fe89e8 data/minecraft/tags/blocks/stairs.json 3160b8c1824cc26cacda9143dd8d832ff3a4c422 data/minecraft/tags/blocks/standing_signs.json -6a5f7fc14ff990e13a3cea1d7ea499a47137ed5a data/minecraft/tags/blocks/sword_efficient.json +ac71e4068f749d8f57adca90bcebbdb6e2f2ecd1 data/minecraft/tags/blocks/sword_efficient.json e72a4292dc72ea8e75aa284e652feb7fd955f8b9 data/minecraft/tags/blocks/walls.json 59d845afe4fd0c9146ddc55b4cc1bc6d1e2606c2 data/minecraft/tags/blocks/wall_hanging_signs.json fd38b0e7d7082c1795e0c4db934fc18507a12568 data/minecraft/tags/blocks/wall_signs.json diff --git a/src/generated/resources/.cache/2cdab8a05c139b60806a3879962e52a7f2933554 b/src/generated/resources/.cache/2cdab8a05c139b60806a3879962e52a7f2933554 index 6e3bea4bb..b6081da6e 100644 --- a/src/generated/resources/.cache/2cdab8a05c139b60806a3879962e52a7f2933554 +++ b/src/generated/resources/.cache/2cdab8a05c139b60806a3879962e52a7f2933554 @@ -1,6 +1,5 @@ -// 1.20.1 2023-10-29T13:48:21.8075044 Item Models: deeperdarker +// 1.20.1 2023-11-01T14:34:16.9861195 Item Models: deeperdarker b36185a1f9e1c105ef9ef404ee0483eedd9ecd79 assets/deeperdarker/models/item/ancient_vase.json -cf8de973e6d5a7a898fe6f699e576271f9f62f6a assets/deeperdarker/models/item/blooming_flowers.json f2fe62e9aa1b817d10053a94259d530922d39562 assets/deeperdarker/models/item/blooming_moss_block.json 2072c85056b9991df1889bc23b0e49f44e63bb56 assets/deeperdarker/models/item/blooming_sculk.json 4008c5aef5f4571e735d6e479a6a223fde438539 assets/deeperdarker/models/item/blooming_stem.json @@ -65,6 +64,7 @@ c7343ab080a175d8521f10587a5b78957417aacc assets/deeperdarker/models/item/gloomsl 8e409b8aa7fe85d79e978db49a66dd36f5d4f814 assets/deeperdarker/models/item/gloomy_geyser.json 181b6c50c80d78392abf4d0bfeba5ef09d0664a4 assets/deeperdarker/models/item/gloomy_grass.json 419d0cd43e6279078460c2cff113efa95c578347 assets/deeperdarker/models/item/gloomy_sculk.json +20c638422a83e36ca13e160ac830c9efa29d522b assets/deeperdarker/models/item/glowing_flowers.json 59f78721ae299030f68c3d188cc503eeebf7e632 assets/deeperdarker/models/item/glowing_grass.json dcb13683800224ef75b1e8919dc436a16060d157 assets/deeperdarker/models/item/grime_ball.json 0713be97d937d3540b05b468690d8fe75c336e2a assets/deeperdarker/models/item/grime_brick.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 16dbd1524..0e1bd135f 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,6 +1,5 @@ -// 1.20.1 2023-10-29T13:48:21.8115283 Loot Tables +// 1.20.1 2023-11-01T14:34:16.9931119 Loot Tables f4fe1f635cb6e3e68f5aaae0488de719277f01f2 data/deeperdarker/loot_tables/blocks/ancient_vase.json -50039af3ff092f15f51955da214409a709227433 data/deeperdarker/loot_tables/blocks/blooming_flowers.json 006429d2ca86d8c54cd1448e51b2ffd95ef52b52 data/deeperdarker/loot_tables/blocks/blooming_moss_block.json d95dd7543f0edaed48f7e47c555fd9a2b5c517d4 data/deeperdarker/loot_tables/blocks/blooming_sculk.json 18b211bff5cec0e373e6c336bb3f27cad8c1ed81 data/deeperdarker/loot_tables/blocks/blooming_stem.json @@ -63,6 +62,7 @@ b79953dbce2811727ba0fd045d32548df591f522 data/deeperdarker/loot_tables/blocks/gl e9cdd9c59276030a34726ea2518efcf68ebf1028 data/deeperdarker/loot_tables/blocks/gloomy_geyser.json 572617753ebcbad01325aa9f948cd7b9f545e9bb data/deeperdarker/loot_tables/blocks/gloomy_grass.json 1462d8fdb43154a1102e5c085b4938d07432a31f data/deeperdarker/loot_tables/blocks/gloomy_sculk.json +a9d3aa407b960c0ccdd4b3be54ff8bde2edbdfcb data/deeperdarker/loot_tables/blocks/glowing_flowers.json d6a5fa9f67b608b026c5a7a208ccda62fc0b4a51 data/deeperdarker/loot_tables/blocks/glowing_grass.json 093754b11630f11059505b6ce473005a37c54e29 data/deeperdarker/loot_tables/blocks/infested_sculk.json ba1fa3ac422fadf264ad292830a461ded3f12cb1 data/deeperdarker/loot_tables/blocks/polished_gloomslate.json diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index 3092bee53..b0301a7a1 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.20.1 2023-10-29T13:48:21.814529 Languages: en_us -8a1cda8296f91906dfd5279c8e3db2d37bbb929b assets/deeperdarker/lang/en_us.json +// 1.20.1 2023-11-01T14:34:17.0041112 Languages: en_us +75d97b9e003361e541f9deb2be48c0393c5d99f6 assets/deeperdarker/lang/en_us.json diff --git a/src/generated/resources/assets/deeperdarker/blockstates/blooming_flowers.json b/src/generated/resources/assets/deeperdarker/blockstates/blooming_flowers.json deleted file mode 100644 index f830630a4..000000000 --- a/src/generated/resources/assets/deeperdarker/blockstates/blooming_flowers.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "variants": { - "facing=east": { - "model": "deeperdarker:block/blooming_flowers", - "y": 90 - }, - "facing=north": { - "model": "deeperdarker:block/blooming_flowers" - }, - "facing=south": { - "model": "deeperdarker:block/blooming_flowers", - "y": 180 - }, - "facing=west": { - "model": "deeperdarker:block/blooming_flowers", - "y": 270 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deeperdarker/blockstates/glowing_flowers.json b/src/generated/resources/assets/deeperdarker/blockstates/glowing_flowers.json new file mode 100644 index 000000000..5074908c2 --- /dev/null +++ b/src/generated/resources/assets/deeperdarker/blockstates/glowing_flowers.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "deeperdarker:block/glowing_flowers", + "y": 90 + }, + "facing=north": { + "model": "deeperdarker:block/glowing_flowers" + }, + "facing=south": { + "model": "deeperdarker:block/glowing_flowers", + "y": 180 + }, + "facing=west": { + "model": "deeperdarker:block/glowing_flowers", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/deeperdarker/lang/en_us.json b/src/generated/resources/assets/deeperdarker/lang/en_us.json index b059e094e..4eb098fcb 100644 --- a/src/generated/resources/assets/deeperdarker/lang/en_us.json +++ b/src/generated/resources/assets/deeperdarker/lang/en_us.json @@ -24,7 +24,6 @@ "biome.deeperdarker.echoing_forest": "Echoing Forest", "biome.deeperdarker.overcast_columns": "Overcast Columns", "block.deeperdarker.ancient_vase": "Ancient Vase", - "block.deeperdarker.blooming_flowers": "Blooming Flowers", "block.deeperdarker.blooming_moss_block": "Blooming Moss Block", "block.deeperdarker.blooming_sculk": "Blooming Sculk", "block.deeperdarker.blooming_stem": "Blooming Stem", @@ -87,6 +86,7 @@ "block.deeperdarker.gloomy_geyser": "Gloomy Geyser", "block.deeperdarker.gloomy_grass": "Gloomy Grass", "block.deeperdarker.gloomy_sculk": "Gloomy Sculk", + "block.deeperdarker.glowing_flowers": "Glowing Flowers", "block.deeperdarker.glowing_grass": "Glowing Grass", "block.deeperdarker.infested_sculk": "Infested Sculk", "block.deeperdarker.linked": "Linked transmitter", diff --git a/src/generated/resources/assets/deeperdarker/models/block/blooming_flowers.json b/src/generated/resources/assets/deeperdarker/models/block/blooming_flowers.json deleted file mode 100644 index cc106420b..000000000 --- a/src/generated/resources/assets/deeperdarker/models/block/blooming_flowers.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "deeperdarker:block/flowers", - "render_type": "minecraft:cutout", - "textures": { - "flowers": "deeperdarker:block/blooming_flowers", - "stem": "deeperdarker:block/blooming_flowers_stem" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deeperdarker/models/block/glowing_flowers.json b/src/generated/resources/assets/deeperdarker/models/block/glowing_flowers.json new file mode 100644 index 000000000..e6b054452 --- /dev/null +++ b/src/generated/resources/assets/deeperdarker/models/block/glowing_flowers.json @@ -0,0 +1,8 @@ +{ + "parent": "deeperdarker:block/flowers", + "render_type": "minecraft:cutout", + "textures": { + "flowers": "deeperdarker:block/glowing_flowers", + "stem": "deeperdarker:block/glowing_flowers_stem" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/deeperdarker/models/item/blooming_flowers.json b/src/generated/resources/assets/deeperdarker/models/item/glowing_flowers.json similarity index 66% rename from src/generated/resources/assets/deeperdarker/models/item/blooming_flowers.json rename to src/generated/resources/assets/deeperdarker/models/item/glowing_flowers.json index 428b1e1a5..19ac1e74b 100644 --- a/src/generated/resources/assets/deeperdarker/models/item/blooming_flowers.json +++ b/src/generated/resources/assets/deeperdarker/models/item/glowing_flowers.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "render_type": "minecraft:cutout", "textures": { - "layer0": "deeperdarker:item/blooming_flowers" + "layer0": "deeperdarker:item/glowing_flowers" } } \ No newline at end of file diff --git a/src/generated/resources/data/deeperdarker/loot_tables/blocks/blooming_flowers.json b/src/generated/resources/data/deeperdarker/loot_tables/blocks/glowing_flowers.json similarity index 72% rename from src/generated/resources/data/deeperdarker/loot_tables/blocks/blooming_flowers.json rename to src/generated/resources/data/deeperdarker/loot_tables/blocks/glowing_flowers.json index ec38c9dcd..f3a5b1c4b 100644 --- a/src/generated/resources/data/deeperdarker/loot_tables/blocks/blooming_flowers.json +++ b/src/generated/resources/data/deeperdarker/loot_tables/blocks/glowing_flowers.json @@ -11,11 +11,11 @@ "entries": [ { "type": "minecraft:item", - "name": "deeperdarker:blooming_flowers" + "name": "deeperdarker:glowing_flowers" } ], "rolls": 1.0 } ], - "random_sequence": "deeperdarker:blocks/blooming_flowers" + "random_sequence": "deeperdarker:blocks/glowing_flowers" } \ No newline at end of file diff --git a/src/generated/resources/data/deeperdarker/worldgen/configured_feature/blooming_sculk_vegetation.json b/src/generated/resources/data/deeperdarker/worldgen/configured_feature/blooming_sculk_vegetation.json index 9aa2a6237..8f1071acd 100644 --- a/src/generated/resources/data/deeperdarker/worldgen/configured_feature/blooming_sculk_vegetation.json +++ b/src/generated/resources/data/deeperdarker/worldgen/configured_feature/blooming_sculk_vegetation.json @@ -6,7 +6,7 @@ "entries": [ { "data": { - "Name": "deeperdarker:blooming_flowers", + "Name": "deeperdarker:glowing_flowers", "Properties": { "facing": "north" } diff --git a/src/generated/resources/data/minecraft/tags/blocks/flowers.json b/src/generated/resources/data/minecraft/tags/blocks/flowers.json index f50d39966..59e9cb01b 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/flowers.json +++ b/src/generated/resources/data/minecraft/tags/blocks/flowers.json @@ -1,5 +1,5 @@ { "values": [ - "deeperdarker:blooming_flowers" + "deeperdarker:glowing_flowers" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/inside_step_sound_blocks.json b/src/generated/resources/data/minecraft/tags/blocks/inside_step_sound_blocks.json index f50d39966..59e9cb01b 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/inside_step_sound_blocks.json +++ b/src/generated/resources/data/minecraft/tags/blocks/inside_step_sound_blocks.json @@ -1,5 +1,5 @@ { "values": [ - "deeperdarker:blooming_flowers" + "deeperdarker:glowing_flowers" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json index 532995f0c..f92afecf2 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json @@ -4,7 +4,7 @@ "deeperdarker:gloomy_sculk", "deeperdarker:gloomy_geyser", "deeperdarker:sculk_gleam", - "deeperdarker:blooming_flowers", + "deeperdarker:glowing_flowers", "deeperdarker:sculk_vines", "deeperdarker:sculk_vines_plant", "deeperdarker:infested_sculk", diff --git a/src/generated/resources/data/minecraft/tags/blocks/sword_efficient.json b/src/generated/resources/data/minecraft/tags/blocks/sword_efficient.json index 2e6b412ef..593262906 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/sword_efficient.json +++ b/src/generated/resources/data/minecraft/tags/blocks/sword_efficient.json @@ -1,7 +1,7 @@ { "values": [ "deeperdarker:glowing_grass", - "deeperdarker:blooming_flowers", + "deeperdarker:glowing_flowers", "deeperdarker:gloomy_grass" ] } \ No newline at end of file diff --git a/src/main/java/com/kyanite/deeperdarker/content/DDBlocks.java b/src/main/java/com/kyanite/deeperdarker/content/DDBlocks.java index 76550cefe..30af0cc75 100644 --- a/src/main/java/com/kyanite/deeperdarker/content/DDBlocks.java +++ b/src/main/java/com/kyanite/deeperdarker/content/DDBlocks.java @@ -174,7 +174,7 @@ public BlockEntity newBlockEntity(BlockPos pPos, BlockState pState) { public static final RegistryObject GLOOMSLATE_LAPIS_ORE = register("gloomslate_lapis_ore", () -> new DropExperienceBlock(BlockBehaviour.Properties.copy(GLOOMSLATE.get()), UniformInt.of(4, 8))); public static final RegistryObject GLOOMSLATE_DIAMOND_ORE = register("gloomslate_diamond_ore", () -> new DropExperienceBlock(BlockBehaviour.Properties.copy(GLOOMSLATE.get()), UniformInt.of(5, 10))); - public static final RegistryObject BLOOMING_FLOWERS = register("blooming_flowers", () -> new BloomingFlowersBlock(BlockBehaviour.Properties.copy(Blocks.PINK_PETALS).lightLevel(state -> 9))); + public static final RegistryObject GLOWING_FLOWERS = register("glowing_flowers", () -> new GlowingFlowersBlock(BlockBehaviour.Properties.copy(Blocks.PINK_PETALS).lightLevel(state -> 9))); public static final RegistryObject GLOWING_GRASS = register("glowing_grass", () -> new GlowingGrassBlock(BlockBehaviour.Properties.copy(Blocks.GRASS).lightLevel(state -> 11))); public static final RegistryObject GLOOMY_GRASS = register("gloomy_grass", () -> new GloomyGrassBlock(BlockBehaviour.Properties.copy(Blocks.GRASS).lightLevel(state -> 1))); public static final RegistryObject GLOOMY_CACTUS = register("gloomy_cactus", () -> new GloomyCactusBlock(BlockBehaviour.Properties.of().strength(0.5f).lightLevel(state -> 6).mapColor(MapColor.COLOR_ORANGE).sound(SoundType.WOOL))); diff --git a/src/main/java/com/kyanite/deeperdarker/content/blocks/vegetation/BloomingFlowersBlock.java b/src/main/java/com/kyanite/deeperdarker/content/blocks/vegetation/GlowingFlowersBlock.java similarity index 95% rename from src/main/java/com/kyanite/deeperdarker/content/blocks/vegetation/BloomingFlowersBlock.java rename to src/main/java/com/kyanite/deeperdarker/content/blocks/vegetation/GlowingFlowersBlock.java index 5fa9c05f7..6669efad6 100644 --- a/src/main/java/com/kyanite/deeperdarker/content/blocks/vegetation/BloomingFlowersBlock.java +++ b/src/main/java/com/kyanite/deeperdarker/content/blocks/vegetation/GlowingFlowersBlock.java @@ -18,10 +18,10 @@ import net.minecraft.world.phys.shapes.VoxelShape; @SuppressWarnings("deprecation, NullableProblems") -public class BloomingFlowersBlock extends BushBlock { +public class GlowingFlowersBlock extends BushBlock { public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; - public BloomingFlowersBlock(Properties pProperties) { + public GlowingFlowersBlock(Properties pProperties) { super(pProperties); this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH)); } diff --git a/src/main/java/com/kyanite/deeperdarker/datagen/assets/DDBlockStateProvider.java b/src/main/java/com/kyanite/deeperdarker/datagen/assets/DDBlockStateProvider.java index da7c33dc2..0b19870ee 100644 --- a/src/main/java/com/kyanite/deeperdarker/datagen/assets/DDBlockStateProvider.java +++ b/src/main/java/com/kyanite/deeperdarker/datagen/assets/DDBlockStateProvider.java @@ -143,7 +143,7 @@ protected void registerStatesAndModels() { simpleBlock(DDBlocks.GLOOMSLATE_LAPIS_ORE.get()); simpleBlock(DDBlocks.GLOOMSLATE_DIAMOND_ORE.get()); - horizontalBlock(DDBlocks.BLOOMING_FLOWERS.get(), models().withExistingParent(DDBlocks.BLOOMING_FLOWERS.getId().getPath(), modLoc("flowers")).texture("flowers", blockLoc(DDBlocks.BLOOMING_FLOWERS)).texture("stem", blockLoc(DDBlocks.BLOOMING_FLOWERS, "stem")).renderType("cutout")); + horizontalBlock(DDBlocks.GLOWING_FLOWERS.get(), models().withExistingParent(DDBlocks.GLOWING_FLOWERS.getId().getPath(), modLoc("flowers")).texture("flowers", blockLoc(DDBlocks.GLOWING_FLOWERS)).texture("stem", blockLoc(DDBlocks.GLOWING_FLOWERS, "stem")).renderType("cutout")); simpleBlock(DDBlocks.GLOWING_GRASS.get(), models().cross(DDBlocks.GLOWING_GRASS.getId().getPath(), blockLoc(DDBlocks.GLOWING_GRASS)).renderType("cutout")); simpleBlock(DDBlocks.GLOOMY_GRASS.get(), models().cross(DDBlocks.GLOOMY_GRASS.getId().getPath(), blockLoc(DDBlocks.GLOOMY_GRASS)).renderType("cutout")); simpleBlock(DDBlocks.GLOOMY_CACTUS.get(), models().withExistingParent(DDBlocks.GLOOMY_CACTUS.getId().getPath(), modLoc("block/cube_cactus")).texture("side", blockLoc(DDBlocks.GLOOMY_CACTUS, "side")).texture("top", blockLoc(DDBlocks.GLOOMY_CACTUS, "top"))); diff --git a/src/main/java/com/kyanite/deeperdarker/datagen/assets/DDItemModelProvider.java b/src/main/java/com/kyanite/deeperdarker/datagen/assets/DDItemModelProvider.java index 9f24fd94a..972cab00b 100644 --- a/src/main/java/com/kyanite/deeperdarker/datagen/assets/DDItemModelProvider.java +++ b/src/main/java/com/kyanite/deeperdarker/datagen/assets/DDItemModelProvider.java @@ -132,7 +132,7 @@ protected void registerModels() { blockModel(DDBlocks.GLOOMSLATE_LAPIS_ORE); blockModel(DDBlocks.GLOOMSLATE_DIAMOND_ORE); - itemModel(DDBlocks.BLOOMING_FLOWERS, GENERATED).renderType("cutout"); + itemModel(DDBlocks.GLOWING_FLOWERS, GENERATED).renderType("cutout"); blockItemModel(DDBlocks.GLOWING_GRASS, DDBlocks.GLOWING_GRASS, GENERATED); blockItemModel(DDBlocks.GLOOMY_GRASS, DDBlocks.GLOOMY_GRASS, GENERATED); blockModel(DDBlocks.GLOOMY_CACTUS); diff --git a/src/main/java/com/kyanite/deeperdarker/datagen/data/DDBlockTagsProvider.java b/src/main/java/com/kyanite/deeperdarker/datagen/data/DDBlockTagsProvider.java index 3073284f7..a0e96aa17 100644 --- a/src/main/java/com/kyanite/deeperdarker/datagen/data/DDBlockTagsProvider.java +++ b/src/main/java/com/kyanite/deeperdarker/datagen/data/DDBlockTagsProvider.java @@ -25,7 +25,7 @@ protected void addTags(HolderLookup.@NotNull Provider pProvider) { tag(BlockTags.MINEABLE_WITH_AXE).add(DDBlocks.ECHO_LOG.get(), DDBlocks.ECHO_WOOD.get(), DDBlocks.STRIPPED_ECHO_LOG.get(), DDBlocks.STRIPPED_ECHO_WOOD.get(), DDBlocks.ECHO_PLANKS.get(), DDBlocks.ECHO_STAIRS.get(), DDBlocks.ECHO_SLAB.get(), DDBlocks.ECHO_FENCE.get(), DDBlocks.ECHO_FENCE_GATE.get(), DDBlocks.ECHO_DOOR.get(), DDBlocks.ECHO_TRAPDOOR.get(), DDBlocks.ECHO_PRESSURE_PLATE.get(), DDBlocks.ECHO_BUTTON.get(), DDBlocks.BLOOMING_STEM.get(), DDBlocks.GLOWING_GRASS.get(), DDBlocks.GLOOMY_GRASS.get()); - tag(BlockTags.MINEABLE_WITH_HOE).add(DDBlocks.ECHO_LEAVES.get(), DDBlocks.GLOOMY_SCULK.get(), DDBlocks.GLOOMY_GEYSER.get(), DDBlocks.SCULK_GLEAM.get(), DDBlocks.BLOOMING_FLOWERS.get(), DDBlocks.SCULK_VINES.get(), DDBlocks.SCULK_VINES_PLANT.get(), DDBlocks.INFESTED_SCULK.get(), DDBlocks.SCULK_JAW.get()); + tag(BlockTags.MINEABLE_WITH_HOE).add(DDBlocks.ECHO_LEAVES.get(), DDBlocks.GLOOMY_SCULK.get(), DDBlocks.GLOOMY_GEYSER.get(), DDBlocks.SCULK_GLEAM.get(), DDBlocks.GLOWING_FLOWERS.get(), DDBlocks.SCULK_VINES.get(), DDBlocks.SCULK_VINES_PLANT.get(), DDBlocks.INFESTED_SCULK.get(), DDBlocks.SCULK_JAW.get()); tag(BlockTags.MINEABLE_WITH_PICKAXE).add(DDBlocks.SCULK_STONE.get(), DDBlocks.COBBLED_SCULK_STONE.get(), DDBlocks.POLISHED_SCULK_STONE.get(), DDBlocks.SCULK_STONE_BRICKS.get(), DDBlocks.SCULK_STONE_TILES.get(), DDBlocks.SMOOTH_SCULK_STONE.get(), DDBlocks.CUT_SCULK_STONE.get(), DDBlocks.CHISELED_SCULK_STONE.get(), DDBlocks.SCULK_STONE_STAIRS.get(), DDBlocks.COBBLED_SCULK_STONE_STAIRS.get(), DDBlocks.POLISHED_SCULK_STONE_STAIRS.get(), DDBlocks.SCULK_STONE_BRICK_STAIRS.get(), DDBlocks.SCULK_STONE_TILE_STAIRS.get(), DDBlocks.SMOOTH_SCULK_STONE_STAIRS.get(), DDBlocks.CUT_SCULK_STONE_STAIRS.get(), DDBlocks.SCULK_STONE_SLAB.get(), DDBlocks.COBBLED_SCULK_STONE_SLAB.get(), DDBlocks.POLISHED_SCULK_STONE_SLAB.get(), DDBlocks.SCULK_STONE_BRICK_SLAB.get(), DDBlocks.SCULK_STONE_TILE_SLAB.get(), DDBlocks.SMOOTH_SCULK_STONE_SLAB.get(), DDBlocks.CUT_SCULK_STONE_SLAB.get(), @@ -79,9 +79,9 @@ protected void addTags(HolderLookup.@NotNull Provider pProvider) { tag(BlockTags.SMALL_DRIPLEAF_PLACEABLE).add(DDBlocks.BLOOMING_MOSS_BLOCK.get()); tag(BlockTags.SNIFFER_DIGGABLE_BLOCK).add(DDBlocks.BLOOMING_MOSS_BLOCK.get()); tag(BlockTags.SNIFFER_EGG_HATCH_BOOST).add(DDBlocks.BLOOMING_MOSS_BLOCK.get()); - tag(BlockTags.FLOWERS).add(DDBlocks.BLOOMING_FLOWERS.get()); - tag(BlockTags.INSIDE_STEP_SOUND_BLOCKS).add(DDBlocks.BLOOMING_FLOWERS.get()); - tag(BlockTags.SWORD_EFFICIENT).add(DDBlocks.GLOWING_GRASS.get(), DDBlocks.BLOOMING_FLOWERS.get(), DDBlocks.GLOOMY_GRASS.get()); + tag(BlockTags.FLOWERS).add(DDBlocks.GLOWING_FLOWERS.get()); + tag(BlockTags.INSIDE_STEP_SOUND_BLOCKS).add(DDBlocks.GLOWING_FLOWERS.get()); + tag(BlockTags.SWORD_EFFICIENT).add(DDBlocks.GLOWING_GRASS.get(), DDBlocks.GLOWING_FLOWERS.get(), DDBlocks.GLOOMY_GRASS.get()); tag(BlockTags.CLIMBABLE).add(DDBlocks.SCULK_TENDRILS.get(), DDBlocks.SCULK_TENDRILS_PLANT.get(), DDBlocks.SCULK_VINES.get(), DDBlocks.SCULK_VINES_PLANT.get()); tag(BlockTags.PORTALS).add(DDBlocks.OTHERSIDE_PORTAL.get()); diff --git a/src/main/java/com/kyanite/deeperdarker/datagen/data/loot/DDBlockLoot.java b/src/main/java/com/kyanite/deeperdarker/datagen/data/loot/DDBlockLoot.java index b7650d1be..cd40b0c0e 100644 --- a/src/main/java/com/kyanite/deeperdarker/datagen/data/loot/DDBlockLoot.java +++ b/src/main/java/com/kyanite/deeperdarker/datagen/data/loot/DDBlockLoot.java @@ -148,7 +148,7 @@ protected void generate() { add(DDBlocks.GLOOMSLATE_LAPIS_ORE.get(), this::createLapisOreDrops); add(DDBlocks.GLOOMSLATE_DIAMOND_ORE.get(), (block) -> this.createOreDrop(block, Items.DIAMOND)); - dropSelf(DDBlocks.BLOOMING_FLOWERS.get()); + dropSelf(DDBlocks.GLOWING_FLOWERS.get()); add(DDBlocks.GLOWING_GRASS.get(), BlockLootSubProvider::createShearsOnlyDrop); add(DDBlocks.GLOOMY_GRASS.get(), BlockLootSubProvider::createShearsOnlyDrop); dropSelf(DDBlocks.GLOOMY_CACTUS.get()); diff --git a/src/main/java/com/kyanite/deeperdarker/util/DDCreativeTab.java b/src/main/java/com/kyanite/deeperdarker/util/DDCreativeTab.java index 9db62ef3c..0e09124c4 100644 --- a/src/main/java/com/kyanite/deeperdarker/util/DDCreativeTab.java +++ b/src/main/java/com/kyanite/deeperdarker/util/DDCreativeTab.java @@ -127,7 +127,7 @@ public static void buildCreativeTab(BuildCreativeModeTabContentsEvent event) { event.accept(DDBlocks.ECHO_LEAVES); event.accept(DDBlocks.ECHO_SAPLING); - event.accept(DDBlocks.BLOOMING_FLOWERS); + event.accept(DDBlocks.GLOWING_FLOWERS); event.accept(DDBlocks.GLOWING_GRASS); event.accept(DDBlocks.GLOOMY_GRASS); event.accept(DDBlocks.GLOOMY_CACTUS); diff --git a/src/main/java/com/kyanite/deeperdarker/world/DDConfiguredFeatures.java b/src/main/java/com/kyanite/deeperdarker/world/DDConfiguredFeatures.java index 21af71239..9d640bf59 100644 --- a/src/main/java/com/kyanite/deeperdarker/world/DDConfiguredFeatures.java +++ b/src/main/java/com/kyanite/deeperdarker/world/DDConfiguredFeatures.java @@ -117,7 +117,7 @@ public static void bootstrap(BootstapContext> context) { FeatureUtils.register(context, SURFACE_SCULK_STONE, Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(DDTags.Blocks.SCULK_REPLACEABLES, new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.SCULK.defaultBlockState(), 1).add(DDBlocks.SCULK_STONE.get().defaultBlockState(), 2)), PlacementUtils.inlinePlaced(configuredFeatures.getOrThrow(SCULK_STONE_GENERATION)), CaveSurface.FLOOR, ConstantInt.of(1), 0, 2, 0, UniformInt.of(1, 2), 0.3f)); FeatureUtils.register(context, SCULK_DECORATION, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.SCULK_VEIN.defaultBlockState().setValue(PipeBlock.DOWN, true), 47).add(Blocks.SCULK_SENSOR.defaultBlockState(), 16).add(Blocks.SCULK_CATALYST.defaultBlockState(), 2).add(Blocks.SCULK_SHRIEKER.defaultBlockState().setValue(BlockStateProperties.CAN_SUMMON, true), 1)))); FeatureUtils.register(context, SCULK_PATCH, Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(DDTags.Blocks.SCULK_REPLACEABLES, new WeightedStateProvider(SimpleWeightedRandomList.builder().add(Blocks.SCULK.defaultBlockState(), 6).add(DDBlocks.SCULK_STONE.get().defaultBlockState(), 2).add(DDBlocks.SCULK_GRIME.get().defaultBlockState(), 1)), PlacementUtils.inlinePlaced(configuredFeatures.getOrThrow(SCULK_DECORATION)), CaveSurface.FLOOR, ConstantInt.of(1), 0, 2, 0.2f, UniformInt.of(2, 3), 0.3f)); - FeatureUtils.register(context, BLOOMING_SCULK_VEGETATION, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(DDBlocks.BLOOMING_FLOWERS.get().defaultBlockState(), 1).add(DDBlocks.GLOWING_GRASS.get().defaultBlockState(), 1)))); + FeatureUtils.register(context, BLOOMING_SCULK_VEGETATION, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(DDBlocks.GLOWING_FLOWERS.get().defaultBlockState(), 1).add(DDBlocks.GLOWING_GRASS.get().defaultBlockState(), 1)))); FeatureUtils.register(context, BLOOMING_SCULK_PATCH, Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(DDTags.Blocks.GLOOMY_SCULK_REPLACEABLE, BlockStateProvider.simple(DDBlocks.BLOOMING_SCULK.get()), PlacementUtils.inlinePlaced(configuredFeatures.getOrThrow(BLOOMING_SCULK_VEGETATION)), CaveSurface.FLOOR, ConstantInt.of(1), 0, 2, 0.1f, UniformInt.of(1, 2), 0.5f)); FeatureUtils.register(context, GLOOMSLATE_GENERATION, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(DDBlocks.GLOOMSLATE.get()))); FeatureUtils.register(context, SURFACE_GLOOMSLATE, Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(DDTags.Blocks.GLOOMSLATE_REPLACEABLE, new WeightedStateProvider(SimpleWeightedRandomList.builder().add(DDBlocks.GLOOMY_SCULK.get().defaultBlockState(), 4).add(DDBlocks.GLOOMSLATE.get().defaultBlockState(), 1)), PlacementUtils.inlinePlaced(configuredFeatures.getOrThrow(GLOOMSLATE_GENERATION)), CaveSurface.FLOOR, ConstantInt.of(1), 0, 2, 0, ConstantInt.of(2), 0.3f)); diff --git a/src/main/resources/assets/deeperdarker/textures/block/blooming_flowers.png b/src/main/resources/assets/deeperdarker/textures/block/glowing_flowers.png similarity index 100% rename from src/main/resources/assets/deeperdarker/textures/block/blooming_flowers.png rename to src/main/resources/assets/deeperdarker/textures/block/glowing_flowers.png diff --git a/src/main/resources/assets/deeperdarker/textures/block/blooming_flowers_stem.png b/src/main/resources/assets/deeperdarker/textures/block/glowing_flowers_stem.png similarity index 100% rename from src/main/resources/assets/deeperdarker/textures/block/blooming_flowers_stem.png rename to src/main/resources/assets/deeperdarker/textures/block/glowing_flowers_stem.png diff --git a/src/main/resources/assets/deeperdarker/textures/item/blooming_flowers.png b/src/main/resources/assets/deeperdarker/textures/item/glowing_flowers.png similarity index 100% rename from src/main/resources/assets/deeperdarker/textures/item/blooming_flowers.png rename to src/main/resources/assets/deeperdarker/textures/item/glowing_flowers.png