Skip to content

Commit

Permalink
Renamed "Blooming Flowers" to "Glowing Flowers" to match Glowing Gras…
Browse files Browse the repository at this point in the history
…s, make translation more sensible.
  • Loading branch information
nitrodynamite18 committed Nov 1, 2023
1 parent 1f43b8a commit 81412e7
Show file tree
Hide file tree
Showing 29 changed files with 64 additions and 64 deletions.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "deeperdarker:block/flowers",
"render_type": "minecraft:cutout",
"textures": {
"flowers": "deeperdarker:block/glowing_flowers",
"stem": "deeperdarker:block/glowing_flowers_stem"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"parent": "minecraft:item/generated",
"render_type": "minecraft:cutout",
"textures": {
"layer0": "deeperdarker:item/blooming_flowers"
"layer0": "deeperdarker:item/glowing_flowers"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"entries": [
{
"data": {
"Name": "deeperdarker:blooming_flowers",
"Name": "deeperdarker:glowing_flowers",
"Properties": {
"facing": "north"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"values": [
"deeperdarker:blooming_flowers"
"deeperdarker:glowing_flowers"
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"values": [
"deeperdarker:blooming_flowers"
"deeperdarker:glowing_flowers"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"values": [
"deeperdarker:glowing_grass",
"deeperdarker:blooming_flowers",
"deeperdarker:glowing_flowers",
"deeperdarker:gloomy_grass"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public BlockEntity newBlockEntity(BlockPos pPos, BlockState pState) {
public static final RegistryObject<Block> GLOOMSLATE_LAPIS_ORE = register("gloomslate_lapis_ore", () -> new DropExperienceBlock(BlockBehaviour.Properties.copy(GLOOMSLATE.get()), UniformInt.of(4, 8)));
public static final RegistryObject<Block> GLOOMSLATE_DIAMOND_ORE = register("gloomslate_diamond_ore", () -> new DropExperienceBlock(BlockBehaviour.Properties.copy(GLOOMSLATE.get()), UniformInt.of(5, 10)));

public static final RegistryObject<Block> BLOOMING_FLOWERS = register("blooming_flowers", () -> new BloomingFlowersBlock(BlockBehaviour.Properties.copy(Blocks.PINK_PETALS).lightLevel(state -> 9)));
public static final RegistryObject<Block> GLOWING_FLOWERS = register("glowing_flowers", () -> new GlowingFlowersBlock(BlockBehaviour.Properties.copy(Blocks.PINK_PETALS).lightLevel(state -> 9)));
public static final RegistryObject<Block> GLOWING_GRASS = register("glowing_grass", () -> new GlowingGrassBlock(BlockBehaviour.Properties.copy(Blocks.GRASS).lightLevel(state -> 11)));
public static final RegistryObject<Block> GLOOMY_GRASS = register("gloomy_grass", () -> new GloomyGrassBlock(BlockBehaviour.Properties.copy(Blocks.GRASS).lightLevel(state -> 1)));
public static final RegistryObject<Block> GLOOMY_CACTUS = register("gloomy_cactus", () -> new GloomyCactusBlock(BlockBehaviour.Properties.of().strength(0.5f).lightLevel(state -> 6).mapColor(MapColor.COLOR_ORANGE).sound(SoundType.WOOL)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading

0 comments on commit 81412e7

Please sign in to comment.