From a0a352a3d9280b53c410ea6737ed3d8fc6856d47 Mon Sep 17 00:00:00 2001 From: muhta Date: Sun, 29 Oct 2023 15:15:32 -0500 Subject: [PATCH] added blooming stem --- .../16a987815a5a6d3b74a700570adf310b2e53ecae | 4 ++- .../2b1c4c301b77a741c666834d476e7a049e70d3df | 6 ++-- .../2cdab8a05c139b60806a3879962e52a7f2933554 | 3 +- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 3 +- .../b2a5cff36cd7898e89c581bb80c5da767a3f79d1 | 4 +-- .../c622617f6fabf890a00b9275cd5f643584a8a2c8 | 4 +-- .../blockstates/blooming_stem.json | 16 ++++++++++ .../assets/deeperdarker/lang/en_us.json | 1 + .../models/block/blooming_stem.json | 6 ++++ .../models/item/blooming_stem.json | 3 ++ .../loot_tables/blocks/blooming_stem.json | 21 +++++++++++++ .../minecraft/tags/blocks/logs_that_burn.json | 3 +- .../minecraft/tags/blocks/mineable/axe.json | 1 + .../minecraft/tags/items/logs_that_burn.json | 3 +- .../deeperdarker/content/DDBlocks.java | 2 ++ .../blocks/flammable/BloomingStemBlock.java | 28 ++++++++++++++++++ .../datagen/assets/DDBlockStateProvider.java | 2 ++ .../datagen/assets/DDItemModelProvider.java | 2 ++ .../datagen/data/DDBlockTagsProvider.java | 3 +- .../datagen/data/loot/DDBlockLoot.java | 2 ++ .../deeperdarker/util/DDCreativeTab.java | 2 ++ .../deeperdarker/models/block/stem.json | 20 +++++++++++++ .../textures/block/blooming_stem.png | Bin 0 -> 453 bytes 23 files changed, 126 insertions(+), 13 deletions(-) create mode 100644 src/generated/resources/assets/deeperdarker/blockstates/blooming_stem.json create mode 100644 src/generated/resources/assets/deeperdarker/models/block/blooming_stem.json create mode 100644 src/generated/resources/assets/deeperdarker/models/item/blooming_stem.json create mode 100644 src/generated/resources/data/deeperdarker/loot_tables/blocks/blooming_stem.json create mode 100644 src/main/java/com/kyanite/deeperdarker/content/blocks/flammable/BloomingStemBlock.java create mode 100644 src/main/resources/assets/deeperdarker/models/block/stem.json create mode 100644 src/main/resources/assets/deeperdarker/textures/block/blooming_stem.png diff --git a/src/generated/resources/.cache/16a987815a5a6d3b74a700570adf310b2e53ecae b/src/generated/resources/.cache/16a987815a5a6d3b74a700570adf310b2e53ecae index 4be593601..c7f7dd2c6 100644 --- a/src/generated/resources/.cache/16a987815a5a6d3b74a700570adf310b2e53ecae +++ b/src/generated/resources/.cache/16a987815a5a6d3b74a700570adf310b2e53ecae @@ -1,8 +1,9 @@ -// 1.20.1 2023-10-26T17:32:29.6568093 Block States: deeperdarker +// 1.20.1 2023-10-29T14:19:37.0146147 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 +57383ac6efb1e22c062918a53dec426e8966f718 assets/deeperdarker/blockstates/blooming_stem.json b618639a1bd650f5bbceed1f24a777ca15ae37fe assets/deeperdarker/blockstates/chiseled_gloomslate.json 389153807c5651eba34cf020ac7d3b675b0418a2 assets/deeperdarker/blockstates/chiseled_sculk_stone.json 68002cff985c9e3e803a31cbe314c4e4d6ac9e36 assets/deeperdarker/blockstates/cobbled_gloomslate.json @@ -120,6 +121,7 @@ e94fc45e791c65302fcc908ab5d32adc564c5e88 assets/deeperdarker/blockstates/strippe 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 b00bfe63a4595969e6f0a510761702536bf5c367 assets/deeperdarker/models/block/chiseled_gloomslate.json 72cffa498213da488cf3a2f3f60488de0a5fab6a assets/deeperdarker/models/block/chiseled_sculk_stone.json 95d18c450b387ca11be36213e2be0e675b3a7440 assets/deeperdarker/models/block/cobbled_gloomslate.json diff --git a/src/generated/resources/.cache/2b1c4c301b77a741c666834d476e7a049e70d3df b/src/generated/resources/.cache/2b1c4c301b77a741c666834d476e7a049e70d3df index 557f1657d..e4f34bb9a 100644 --- a/src/generated/resources/.cache/2b1c4c301b77a741c666834d476e7a049e70d3df +++ b/src/generated/resources/.cache/2b1c4c301b77a741c666834d476e7a049e70d3df @@ -1,4 +1,4 @@ -// 1.20.1 2023-10-26T17:32:29.6413502 Tags for minecraft:block mod id deeperdarker +// 1.20.1 2023-10-29T13:48:21.7994946 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 @@ -30,8 +30,8 @@ a84d63160bb42d942778124d8368b9db10ef6ed2 data/minecraft/tags/blocks/gold_ores.js 08b0595e3c0290061ed898dfbeb230d6c4f95eeb data/minecraft/tags/blocks/iron_ores.json e85880d9acf64424927082c80e9af7c9f50de52f data/minecraft/tags/blocks/lapis_ores.json 65c3a4802e5e6412bef926f01f45d3e81de4c779 data/minecraft/tags/blocks/leaves.json -615016fb2f7bd4866e694de5e712cb29bb434032 data/minecraft/tags/blocks/logs_that_burn.json -722e1c5cba20bee7da835bd56f9611ad437dcafa data/minecraft/tags/blocks/mineable/axe.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 ad177a07d9375078090756e86bdf590b27cd0566 data/minecraft/tags/blocks/mineable/pickaxe.json f7b6f4235356ecc4395d064f20adbb6abb2fb51a data/minecraft/tags/blocks/mineable/shovel.json diff --git a/src/generated/resources/.cache/2cdab8a05c139b60806a3879962e52a7f2933554 b/src/generated/resources/.cache/2cdab8a05c139b60806a3879962e52a7f2933554 index 9967cda6c..6e3bea4bb 100644 --- a/src/generated/resources/.cache/2cdab8a05c139b60806a3879962e52a7f2933554 +++ b/src/generated/resources/.cache/2cdab8a05c139b60806a3879962e52a7f2933554 @@ -1,8 +1,9 @@ -// 1.20.1 2023-10-26T17:32:29.6413502 Item Models: deeperdarker +// 1.20.1 2023-10-29T13:48:21.8075044 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 bc192f3477fde8efde3aba14cdd0016b9b4c74cf assets/deeperdarker/models/item/chiseled_gloomslate.json 89f7cacebe1029e9f27884b1aeba759b4f9c978f assets/deeperdarker/models/item/chiseled_sculk_stone.json 0eb658806d9c4c3faa4843fa00fd273b3d44dbdc assets/deeperdarker/models/item/cobbled_gloomslate.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 806f246e2..16dbd1524 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,8 +1,9 @@ -// 1.20.1 2023-10-26T17:32:29.6489197 Loot Tables +// 1.20.1 2023-10-29T13:48:21.8115283 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 55589564f7ea5847138db468199d54cd1142b139 data/deeperdarker/loot_tables/blocks/chiseled_gloomslate.json c29aeb5add1d38dc94087bd93c15ff08dab7a74d data/deeperdarker/loot_tables/blocks/chiseled_sculk_stone.json debbc9e18c6194b29378fce6394766e7864f9ee7 data/deeperdarker/loot_tables/blocks/cobbled_gloomslate.json diff --git a/src/generated/resources/.cache/b2a5cff36cd7898e89c581bb80c5da767a3f79d1 b/src/generated/resources/.cache/b2a5cff36cd7898e89c581bb80c5da767a3f79d1 index 735cd3947..3dfccf170 100644 --- a/src/generated/resources/.cache/b2a5cff36cd7898e89c581bb80c5da767a3f79d1 +++ b/src/generated/resources/.cache/b2a5cff36cd7898e89c581bb80c5da767a3f79d1 @@ -1,4 +1,4 @@ -// 1.20.1 2023-09-20T17:04:06.9062911 Tags for minecraft:item mod id deeperdarker +// 1.20.1 2023-10-29T13:48:21.804504 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 @@ -29,7 +29,7 @@ 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 -615016fb2f7bd4866e694de5e712cb29bb434032 data/minecraft/tags/items/logs_that_burn.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 diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index 052815bc8..3092bee53 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.20.1 2023-10-28T16:34:56.705504 Languages: en_us -7adeccca0263b927e5c267ee276d9052ba5d3a1c assets/deeperdarker/lang/en_us.json +// 1.20.1 2023-10-29T13:48:21.814529 Languages: en_us +8a1cda8296f91906dfd5279c8e3db2d37bbb929b assets/deeperdarker/lang/en_us.json diff --git a/src/generated/resources/assets/deeperdarker/blockstates/blooming_stem.json b/src/generated/resources/assets/deeperdarker/blockstates/blooming_stem.json new file mode 100644 index 000000000..28b0608d7 --- /dev/null +++ b/src/generated/resources/assets/deeperdarker/blockstates/blooming_stem.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "deeperdarker:block/blooming_stem", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "deeperdarker:block/blooming_stem" + }, + "axis=z": { + "model": "deeperdarker:block/blooming_stem", + "x": 90 + } + } +} \ 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 2b8c6b5fc..b059e094e 100644 --- a/src/generated/resources/assets/deeperdarker/lang/en_us.json +++ b/src/generated/resources/assets/deeperdarker/lang/en_us.json @@ -27,6 +27,7 @@ "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", "block.deeperdarker.chiseled_gloomslate": "Chiseled Gloomslate", "block.deeperdarker.chiseled_sculk_stone": "Chiseled Sculk Stone", "block.deeperdarker.cobbled_gloomslate": "Cobbled Gloomslate", diff --git a/src/generated/resources/assets/deeperdarker/models/block/blooming_stem.json b/src/generated/resources/assets/deeperdarker/models/block/blooming_stem.json new file mode 100644 index 000000000..3d45f15da --- /dev/null +++ b/src/generated/resources/assets/deeperdarker/models/block/blooming_stem.json @@ -0,0 +1,6 @@ +{ + "parent": "deeperdarker:block/stem", + "textures": { + "stem": "deeperdarker:block/blooming_stem" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/deeperdarker/models/item/blooming_stem.json b/src/generated/resources/assets/deeperdarker/models/item/blooming_stem.json new file mode 100644 index 000000000..b311a5ead --- /dev/null +++ b/src/generated/resources/assets/deeperdarker/models/item/blooming_stem.json @@ -0,0 +1,3 @@ +{ + "parent": "deeperdarker:block/blooming_stem" +} \ No newline at end of file diff --git a/src/generated/resources/data/deeperdarker/loot_tables/blocks/blooming_stem.json b/src/generated/resources/data/deeperdarker/loot_tables/blocks/blooming_stem.json new file mode 100644 index 000000000..8f03311a7 --- /dev/null +++ b/src/generated/resources/data/deeperdarker/loot_tables/blocks/blooming_stem.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "deeperdarker:blooming_stem" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "deeperdarker:blocks/blooming_stem" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json b/src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json index de3d24f06..896c4fba6 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json +++ b/src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json @@ -1,5 +1,6 @@ { "values": [ - "deeperdarker:echo_log" + "deeperdarker:echo_log", + "deeperdarker:blooming_stem" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index b0fe1c372..90a0314bd 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -13,6 +13,7 @@ "deeperdarker:echo_trapdoor", "deeperdarker:echo_pressure_plate", "deeperdarker:echo_button", + "deeperdarker:blooming_stem", "deeperdarker:glowing_grass", "deeperdarker:gloomy_grass" ] diff --git a/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json b/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json index de3d24f06..896c4fba6 100644 --- a/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json +++ b/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json @@ -1,5 +1,6 @@ { "values": [ - "deeperdarker:echo_log" + "deeperdarker:echo_log", + "deeperdarker:blooming_stem" ] } \ 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 55af8ba62..5f98a4126 100644 --- a/src/main/java/com/kyanite/deeperdarker/content/DDBlocks.java +++ b/src/main/java/com/kyanite/deeperdarker/content/DDBlocks.java @@ -80,6 +80,8 @@ public BlockEntity newBlockEntity(BlockPos pPos, BlockState pState) { }); public static final RegistryObject POTTED_ECHO_SAPLING = BLOCKS.register("potted_echo_sapling", () -> new FlowerPotBlock(() -> (FlowerPotBlock) Blocks.FLOWER_POT, ECHO_SAPLING, BlockBehaviour.Properties.copy(Blocks.POTTED_OAK_SAPLING))); + public static final RegistryObject BLOOMING_STEM = register("blooming_stem", () -> new BloomingStemBlock(BlockBehaviour.Properties.copy(Blocks.OAK_LOG).noOcclusion(), 2, 4)); + public static final RegistryObject SCULK_STONE = register("sculk_stone", () -> new Block(BlockBehaviour.Properties.copy(Blocks.STONE).mapColor(MapColor.COLOR_CYAN).sound(DDSounds.SCULK_STONE).requiresCorrectToolForDrops())); public static final RegistryObject SCULK_STONE_STAIRS = register("sculk_stone_stairs", () -> new StairBlock(() -> SCULK_STONE.get().defaultBlockState(), BlockBehaviour.Properties.copy(SCULK_STONE.get()))); public static final RegistryObject SCULK_STONE_SLAB = register("sculk_stone_slab", () -> new SlabBlock(BlockBehaviour.Properties.copy(SCULK_STONE.get()))); diff --git a/src/main/java/com/kyanite/deeperdarker/content/blocks/flammable/BloomingStemBlock.java b/src/main/java/com/kyanite/deeperdarker/content/blocks/flammable/BloomingStemBlock.java new file mode 100644 index 000000000..0d6c83fea --- /dev/null +++ b/src/main/java/com/kyanite/deeperdarker/content/blocks/flammable/BloomingStemBlock.java @@ -0,0 +1,28 @@ +package com.kyanite.deeperdarker.content.blocks.flammable; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.VoxelShape; + +@SuppressWarnings("deprecation, NullableProblems") +public class BloomingStemBlock extends RotatedFlammableBlock { + private static final VoxelShape Y_AXIS = Block.box(5, 0, 5, 11, 16, 11); + private static final VoxelShape X_AXIS = Block.box(0, 5, 5, 16, 11, 11); + private static final VoxelShape Z_AXIS = Block.box(5, 5, 0, 11, 11, 16); + + public BloomingStemBlock(Properties pProperties, int flammability, int spread) { + super(pProperties, flammability, spread); + } + + @Override + public VoxelShape getShape(BlockState pState, BlockGetter pLevel, BlockPos pPos, CollisionContext pContext) { + return switch (pState.getValue(AXIS)) { + default -> Y_AXIS; + case X -> X_AXIS; + case Z -> Z_AXIS; + }; + } +} 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 6a5f20bae..abf505ad9 100644 --- a/src/main/java/com/kyanite/deeperdarker/datagen/assets/DDBlockStateProvider.java +++ b/src/main/java/com/kyanite/deeperdarker/datagen/assets/DDBlockStateProvider.java @@ -38,6 +38,8 @@ protected void registerStatesAndModels() { simpleBlock(DDBlocks.ECHO_WALL_HANGING_SIGN.get(), models().sign(DDBlocks.ECHO_HANGING_SIGN.getId().getPath(), blockLoc(DDBlocks.STRIPPED_ECHO_LOG))); simpleBlock(DDBlocks.POTTED_ECHO_SAPLING.get(), models().withExistingParent(DDBlocks.POTTED_ECHO_SAPLING.getId().getPath(), mcLoc("flower_pot_cross")).texture("plant", blockLoc(DDBlocks.ECHO_SAPLING)).renderType("cutout")); + axisBlock(DDBlocks.BLOOMING_STEM.get(), models().withExistingParent(DDBlocks.BLOOMING_STEM.getId().getPath(), modLoc("stem")).texture("stem", blockLoc(DDBlocks.BLOOMING_STEM)), models().withExistingParent(DDBlocks.BLOOMING_STEM.getId().getPath(), modLoc("stem")).texture("stem", blockLoc(DDBlocks.BLOOMING_STEM))); + simpleBlock(DDBlocks.SCULK_STONE.get()); stairsBlock(DDBlocks.SCULK_STONE_STAIRS.get(), blockLoc(DDBlocks.SCULK_STONE)); slabBlock(DDBlocks.SCULK_STONE_SLAB.get(), blockLoc(DDBlocks.SCULK_STONE), blockLoc(DDBlocks.SCULK_STONE)); 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 de8f946c2..9f24fd94a 100644 --- a/src/main/java/com/kyanite/deeperdarker/datagen/assets/DDItemModelProvider.java +++ b/src/main/java/com/kyanite/deeperdarker/datagen/assets/DDItemModelProvider.java @@ -38,6 +38,8 @@ protected void registerModels() { blockModel(DDBlocks.ECHO_LEAVES); blockItemModel(DDBlocks.ECHO_SAPLING, DDBlocks.ECHO_SAPLING, GENERATED); + blockModel(DDBlocks.BLOOMING_STEM); + blockModel(DDBlocks.SCULK_STONE); blockModel(DDBlocks.SCULK_STONE_STAIRS); blockModel(DDBlocks.SCULK_STONE_SLAB); 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 05ef7fe5d..3073284f7 100644 --- a/src/main/java/com/kyanite/deeperdarker/datagen/data/DDBlockTagsProvider.java +++ b/src/main/java/com/kyanite/deeperdarker/datagen/data/DDBlockTagsProvider.java @@ -23,6 +23,7 @@ public DDBlockTagsProvider(PackOutput output, CompletableFuture this.createSingleItemTableWithSilkTouch(block, DDBlocks.COBBLED_SCULK_STONE.get())); dropSelf(DDBlocks.SCULK_STONE_STAIRS.get()); add(DDBlocks.SCULK_STONE_SLAB.get(), this::createSlabItemTable); diff --git a/src/main/java/com/kyanite/deeperdarker/util/DDCreativeTab.java b/src/main/java/com/kyanite/deeperdarker/util/DDCreativeTab.java index 3ef523766..9db62ef3c 100644 --- a/src/main/java/com/kyanite/deeperdarker/util/DDCreativeTab.java +++ b/src/main/java/com/kyanite/deeperdarker/util/DDCreativeTab.java @@ -31,6 +31,8 @@ public static void buildCreativeTab(BuildCreativeModeTabContentsEvent event) { event.accept(DDBlocks.ECHO_PRESSURE_PLATE); event.accept(DDBlocks.ECHO_BUTTON); + event.accept(DDBlocks.BLOOMING_STEM); + event.accept(DDBlocks.SCULK_STONE); event.accept(DDBlocks.SCULK_STONE_STAIRS); event.accept(DDBlocks.SCULK_STONE_SLAB); diff --git a/src/main/resources/assets/deeperdarker/models/block/stem.json b/src/main/resources/assets/deeperdarker/models/block/stem.json new file mode 100644 index 000000000..b435932b0 --- /dev/null +++ b/src/main/resources/assets/deeperdarker/models/block/stem.json @@ -0,0 +1,20 @@ +{ + "parent": "block/block", + "textures": { + "particle": "#stem" + }, + "elements": [ + { + "from": [5, 0, 5], + "to": [11, 16, 11], + "faces": { + "north": {"uv": [0, 0, 6, 16], "texture": "#stem"}, + "east": {"uv": [0, 0, 6, 16], "texture": "#stem"}, + "south": {"uv": [0, 0, 6, 16], "texture": "#stem"}, + "west": {"uv": [0, 0, 6, 16], "texture": "#stem"}, + "up": {"uv": [6, 0, 12, 6], "texture": "#stem"}, + "down": {"uv": [6, 6, 12, 12], "texture": "#stem"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/deeperdarker/textures/block/blooming_stem.png b/src/main/resources/assets/deeperdarker/textures/block/blooming_stem.png new file mode 100644 index 0000000000000000000000000000000000000000..75ad946189918e31721be91ccf13876fc19a9f72 GIT binary patch literal 453 zcmV;$0XqJPP)Px$eMv+?R5(wSQ{PL%U=%%)%rGfa7L}kG2nqd^z?YsH^yGiwzu9w7z4RhQg@uqQ z6wy#;tdYa<#l73NrrU(>%iZ^l?{Mxp=O&hR&jhFx1yGWJJ>?^8+wHRGKLF?HDiOR+ zFhDj7Se6SwWzx5T`hJyFxt<$g?_8j;<;t*{f&FCyy3S+NYe!6d3QJwxD<7(iqj=4YZ~p>azS1EDPj9<@DrF#7;ND#=r=~A_zb(