Skip to content

Commit

Permalink
Renamed "Blooming Sculk" to "Blooming Sculk Stone".
Browse files Browse the repository at this point in the history
Echo Saplings can now also be placed on Sculk Grime.
Removed Blooming Stem from various log-related data.
Misc. datagen tweaks.
  • Loading branch information
nitrodynamite18 committed Nov 6, 2023
1 parent 41ff0bd commit adcf520
Show file tree
Hide file tree
Showing 37 changed files with 89 additions and 80 deletions.
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
// 1.20.1 2023-11-01T14:34:16.9971116 Registries
// 1.20.1 2023-11-06T13:11:21.4069459 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
e7bebee214c738b7a13868c0fd4e804954087c04 data/deeperdarker/worldgen/configured_feature/blooming_sculk_patch.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
091c066d3e288c08e5d68a8aca7b3fb0e6e5639b data/deeperdarker/worldgen/configured_feature/gloomy_sculk_vegetation.json
9973648607e0cc301d46c77f4021d725ca22b533 data/deeperdarker/worldgen/configured_feature/ore_blooming_moss.json
0150a1b84d07f143eac3a8f3f6f434ac3565b489 data/deeperdarker/worldgen/configured_feature/ore_blooming_moss.json
1b6dbe9c2e15df01aa9a3c27beb46ccc4e91d5df data/deeperdarker/worldgen/configured_feature/ore_echo_soil.json
a7efce9cf36bea20e3226c6fcb962b41b78df3f6 data/deeperdarker/worldgen/configured_feature/ore_gloomslate_coal.json
e21d4d48d366ec5aa99fce98c51d5ae4c947c350 data/deeperdarker/worldgen/configured_feature/ore_gloomslate_copper.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// 1.20.1 2023-11-01T14:34:17.0061135 Block States: deeperdarker
// 1.20.1 2023-11-06T13:11:21.4205293 Block States: deeperdarker
4394f02c270408be611b2f3ba7abfbfd658cb0ff assets/deeperdarker/blockstates/ancient_vase.json
165980177c5adcf470b9a08fe401e3bb1a4966f0 assets/deeperdarker/blockstates/blooming_moss_block.json
498227afd0f8c9b0fa72dfef97bf22b886a9069f assets/deeperdarker/blockstates/blooming_sculk.json
c90869597c5f9312912c741c7edfc5974762efd9 assets/deeperdarker/blockstates/blooming_sculk_stone.json
a9636c05e9a8e2c7566c106f3dbbbd86c8097a4e assets/deeperdarker/blockstates/blooming_stem.json
b618639a1bd650f5bbceed1f24a777ca15ae37fe assets/deeperdarker/blockstates/chiseled_gloomslate.json
389153807c5651eba34cf020ac7d3b675b0418a2 assets/deeperdarker/blockstates/chiseled_sculk_stone.json
Expand Down Expand Up @@ -119,7 +119,7 @@ e94fc45e791c65302fcc908ab5d32adc564c5e88 assets/deeperdarker/blockstates/strippe
1482ba18bb49fe90f1bb3d0b7aec7963e6c0ac9f assets/deeperdarker/blockstates/stripped_echo_wood.json
690d24d273d0514954cb5395b0a6220314038cfd assets/deeperdarker/models/block/ancient_vase.json
5f6d78b44fd7067c2670c9e989ce03e4e9aac70f assets/deeperdarker/models/block/blooming_moss_block.json
446377a22c7cd0fa8486a0da7afe4adf393c90e2 assets/deeperdarker/models/block/blooming_sculk.json
416d91b16ee3ac223bea2e60faef786f20eb1fa8 assets/deeperdarker/models/block/blooming_sculk_stone.json
0c90c3f2270980d69f3a46e4826ab53ce84ec3f4 assets/deeperdarker/models/block/blooming_stem.json
6fae9a607b167f9c128d9fe1584b440069918f0e assets/deeperdarker/models/block/blooming_stem_horizontal.json
44cf74d85128376b4eac3aa6d1e8511756ab23f3 assets/deeperdarker/models/block/blooming_stem_vertical.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// 1.20.1 2023-11-01T14:34:16.9781214 Tags for minecraft:block mod id deeperdarker
453499b5116c2c24d57c28ec55db0211260f511d data/deeperdarker/tags/blocks/echo_soil.json
// 1.20.1 2023-11-06T13:11:21.3683441 Tags for minecraft:block mod id deeperdarker
3254a070f3d679712b15610724ab74c5900e0204 data/deeperdarker/tags/blocks/echo_logs.json
7bc8986cab053fefad0438a574d6ee6ae0f5a2b2 data/deeperdarker/tags/blocks/echo_sapling_placeable.json
5fc75620cbf33b6fbe8762687116de2f0df1bd34 data/deeperdarker/tags/blocks/gloomslate_replaceable.json
1b524a72db2dc423a915068148fa9e921f2e46f5 data/deeperdarker/tags/blocks/gloomy_sculk_replaceable.json
8578e12406e1c266232a54a95ac849d05041d948 data/deeperdarker/tags/blocks/infiniburn_otherside.json
Expand All @@ -25,15 +26,16 @@ dc2be5311ef04baad7565936ffafc6dcea324cf1 data/minecraft/tags/blocks/copper_ores.
41a0ed1cf9fcf4b0f4e41d3155f010eb069e2edc data/minecraft/tags/blocks/emerald_ores.json
4b1b7b3d622aeb255906e952be4ddaf003b6026f data/minecraft/tags/blocks/fence_gates.json
81a54dc6ee81c739615aa27a3e28b941ba65077e data/minecraft/tags/blocks/flowers.json
15974f1aa70f695dbcc29d783956bcdab88647ec data/minecraft/tags/blocks/flower_pots.json
a84d63160bb42d942778124d8368b9db10ef6ed2 data/minecraft/tags/blocks/gold_ores.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
752c867b12898f827516ba241d49038161772f49 data/minecraft/tags/blocks/logs_that_burn.json
f7e256dd1d5e6019b4d5f567311a3c83e0fcc213 data/minecraft/tags/blocks/mineable/axe.json
7b8019698b80745368a00837d63c6265a4e8b120 data/minecraft/tags/blocks/mineable/hoe.json
ad177a07d9375078090756e86bdf590b27cd0566 data/minecraft/tags/blocks/mineable/pickaxe.json
64233959059c6b6d92305cd775cf39b7f4568548 data/minecraft/tags/blocks/mineable/pickaxe.json
f7b6f4235356ecc4395d064f20adbb6abb2fb51a data/minecraft/tags/blocks/mineable/shovel.json
6349c914702ba9732f2266363153bb5d75633878 data/minecraft/tags/blocks/needs_iron_tool.json
33d07a5e8b6e764033ad98c304357baa651ed25c data/minecraft/tags/blocks/needs_stone_tool.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// 1.20.1 2023-11-01T14:34:16.9861195 Item Models: deeperdarker
// 1.20.1 2023-11-06T13:11:21.3862597 Item Models: deeperdarker
b36185a1f9e1c105ef9ef404ee0483eedd9ecd79 assets/deeperdarker/models/item/ancient_vase.json
f2fe62e9aa1b817d10053a94259d530922d39562 assets/deeperdarker/models/item/blooming_moss_block.json
2072c85056b9991df1889bc23b0e49f44e63bb56 assets/deeperdarker/models/item/blooming_sculk.json
f2108fa9acd703168e4f624814814d262e868c9b assets/deeperdarker/models/item/blooming_sculk_stone.json
4008c5aef5f4571e735d6e479a6a223fde438539 assets/deeperdarker/models/item/blooming_stem.json
bc192f3477fde8efde3aba14cdd0016b9b4c74cf assets/deeperdarker/models/item/chiseled_gloomslate.json
89f7cacebe1029e9f27884b1aeba759b4f9c978f assets/deeperdarker/models/item/chiseled_sculk_stone.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// 1.20.1 2023-11-01T14:34:16.9931119 Loot Tables
// 1.20.1 2023-11-06T13:11:21.3977923 Loot Tables
f4fe1f635cb6e3e68f5aaae0488de719277f01f2 data/deeperdarker/loot_tables/blocks/ancient_vase.json
006429d2ca86d8c54cd1448e51b2ffd95ef52b52 data/deeperdarker/loot_tables/blocks/blooming_moss_block.json
d95dd7543f0edaed48f7e47c555fd9a2b5c517d4 data/deeperdarker/loot_tables/blocks/blooming_sculk.json
c209ce4d7dc1ed8f9a102cdb6e1361d06ecf276a data/deeperdarker/loot_tables/blocks/blooming_sculk_stone.json
18b211bff5cec0e373e6c336bb3f27cad8c1ed81 data/deeperdarker/loot_tables/blocks/blooming_stem.json
55589564f7ea5847138db468199d54cd1142b139 data/deeperdarker/loot_tables/blocks/chiseled_gloomslate.json
c29aeb5add1d38dc94087bd93c15ff08dab7a74d data/deeperdarker/loot_tables/blocks/chiseled_sculk_stone.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2023-10-29T13:48:21.804504 Tags for minecraft:item mod id deeperdarker
// 1.20.1 2023-11-06T13:11:21.3791528 Tags for minecraft:item mod id deeperdarker
a84781beeff4cf18e5532d7e95fe62956c365027 data/deeperdarker/tags/items/dampens_vibrations.json
3254a070f3d679712b15610724ab74c5900e0204 data/deeperdarker/tags/items/echo_logs.json
a84781beeff4cf18e5532d7e95fe62956c365027 data/forge/tags/items/armors/boots.json
Expand Down Expand Up @@ -29,7 +29,6 @@ a84d63160bb42d942778124d8368b9db10ef6ed2 data/minecraft/tags/items/gold_ores.jso
08b0595e3c0290061ed898dfbeb230d6c4f95eeb data/minecraft/tags/items/iron_ores.json
e85880d9acf64424927082c80e9af7c9f50de52f data/minecraft/tags/items/lapis_ores.json
65c3a4802e5e6412bef926f01f45d3e81de4c779 data/minecraft/tags/items/leaves.json
21ba86398acef0f961c304fe5b2fd972455e0e3d data/minecraft/tags/items/logs_that_burn.json
11f14987f1510c7fba24ae72c2eeae6ec44275bf data/minecraft/tags/items/pickaxes.json
a3dbfaeb7781a16a5f0d599aec390339e541834c data/minecraft/tags/items/planks.json
b87f41ec93385cf003a9e81713446620acd52b86 data/minecraft/tags/items/redstone_ores.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.1 2023-11-04T19:02:03.1924776 Languages: en_us
05b11a966f6d28508801c922a3bb0d249cc4b34c assets/deeperdarker/lang/en_us.json
// 1.20.1 2023-11-06T13:28:26.6147954 Languages: en_us
d0f2718edf354febe4e6d2c785da187d855d4b82 assets/deeperdarker/lang/en_us.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "deeperdarker:block/blooming_sculk_stone"
}
}
}
4 changes: 2 additions & 2 deletions src/generated/resources/assets/deeperdarker/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"biome.deeperdarker.overcast_columns": "Overcast Columns",
"block.deeperdarker.ancient_vase": "Ancient Vase",
"block.deeperdarker.blooming_moss_block": "Blooming Moss Block",
"block.deeperdarker.blooming_sculk": "Blooming Sculk",
"block.deeperdarker.blooming_sculk_stone": "Blooming Sculk Stone",
"block.deeperdarker.blooming_stem": "Blooming Stem",
"block.deeperdarker.chiseled_gloomslate": "Chiseled Gloomslate",
"block.deeperdarker.chiseled_sculk_stone": "Chiseled Sculk Stone",
Expand Down Expand Up @@ -150,7 +150,7 @@
"enchantment.deeperdarker.catalysis": "Catalysis",
"enchantment.deeperdarker.catalysis.desc": "Spreads sculk when mobs are killed.",
"enchantment.deeperdarker.sculk_smite": "Sculk Smite",
"enchantment.deeperdarker.sculk_smite.desc": "Increases damage against sculk mobs such as Wardens and Shattered.",
"enchantment.deeperdarker.sculk_smite.desc": "Increases damage against sculk mobs such as Shattered and the Warden.",
"entity.deeperdarker.boat": "Boat",
"entity.deeperdarker.chest_boat": "Boat with Chest",
"entity.deeperdarker.sculk_centipede": "Sculk Centipede",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "deeperdarker:block/sculk_stone",
"side": "deeperdarker:block/blooming_sculk",
"top": "deeperdarker:block/blooming_sculk_top"
"side": "deeperdarker:block/blooming_sculk_stone",
"top": "deeperdarker:block/blooming_sculk_stone_top"
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "deeperdarker:block/blooming_sculk_stone"
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
}
}
],
"name": "deeperdarker:blooming_sculk"
"name": "deeperdarker:blooming_sculk_stone"
},
{
"type": "minecraft:item",
Expand All @@ -41,5 +41,5 @@
"rolls": 1.0
}
],
"random_sequence": "deeperdarker:blocks/blooming_sculk"
"random_sequence": "deeperdarker:blocks/blooming_sculk_stone"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
"deeperdarker:echo_log",
"deeperdarker:echo_wood",
"deeperdarker:stripped_echo_log",
"deeperdarker:stripped_echo_wood"
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"values": [
"deeperdarker:echo_soil",
"deeperdarker:sculk_grime",
"minecraft:sculk"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"ground_state": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "deeperdarker:blooming_sculk"
"Name": "deeperdarker:blooming_sculk_stone"
}
},
"replaceable": "#deeperdarker:gloomy_sculk_replaceable",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"Name": "deeperdarker:blooming_moss_block"
},
"target": {
"block": "deeperdarker:blooming_sculk",
"block": "deeperdarker:blooming_sculk_stone",
"predicate_type": "minecraft:block_match"
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"deeperdarker:potted_echo_sapling"
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"values": [
"deeperdarker:echo_log",
"deeperdarker:blooming_stem"
"#deeperdarker:echo_logs"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"deeperdarker:sculk_stone_tile_wall",
"deeperdarker:smooth_sculk_stone_wall",
"deeperdarker:cut_sculk_stone_wall",
"deeperdarker:blooming_sculk",
"deeperdarker:blooming_sculk_stone",
"deeperdarker:blooming_moss_block",
"deeperdarker:gloomslate",
"deeperdarker:cobbled_gloomslate",
Expand Down

This file was deleted.

Loading

0 comments on commit adcf520

Please sign in to comment.