diff --git a/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomSapling.java b/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomSapling.java index fc39646a..4a8ad413 100644 --- a/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomSapling.java +++ b/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomSapling.java @@ -2,10 +2,9 @@ package ru.betterend.blocks; import ru.betterend.blocks.basis.BlockFeatureSapling; import ru.betterend.registry.FeatureRegistry; -import ru.betterend.world.features.DefaultFeature; public class BlockMossyGlowshroomSapling extends BlockFeatureSapling { public BlockMossyGlowshroomSapling() { - super((DefaultFeature) FeatureRegistry.MOSSY_GLOWSHROOM.getFeature(), 7); + super(FeatureRegistry.MOSSY_GLOWSHROOM, 7); } } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockFeatureSapling.java b/src/main/java/ru/betterend/blocks/basis/BlockFeatureSapling.java index e119ee14..b365408c 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockFeatureSapling.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockFeatureSapling.java @@ -23,13 +23,13 @@ import ru.betterend.client.ERenderLayer; import ru.betterend.client.IRenderTypeable; import ru.betterend.registry.BlockTagRegistry; import ru.betterend.util.BlocksHelper; -import ru.betterend.world.features.DefaultFeature; +import ru.betterend.world.features.EndFeature; public class BlockFeatureSapling extends BlockBaseNotFull implements Fertilizable, IRenderTypeable { private static final VoxelShape SHAPE = Block.createCuboidShape(4, 2, 4, 12, 16, 12); - private final DefaultFeature feature; + private final EndFeature feature; - public BlockFeatureSapling(DefaultFeature feature) { + public BlockFeatureSapling(EndFeature feature) { super(FabricBlockSettings.of(Material.PLANT) .breakByHand(true) .collidable(false) @@ -39,7 +39,7 @@ public class BlockFeatureSapling extends BlockBaseNotFull implements Fertilizabl this.feature = feature; } - public BlockFeatureSapling(DefaultFeature feature, int light) { + public BlockFeatureSapling(EndFeature feature, int light) { super(FabricBlockSettings.of(Material.PLANT) .breakByHand(true) .collidable(false) @@ -81,7 +81,7 @@ public class BlockFeatureSapling extends BlockBaseNotFull implements Fertilizabl @Override public void grow(ServerWorld world, Random random, BlockPos pos, BlockState state) { BlocksHelper.setWithoutUpdate(world, pos, Blocks.AIR.getDefaultState()); - feature.generate(world, world.getChunkManager().getChunkGenerator(), random, pos, DefaultFeatureConfig.INSTANCE); + feature.getFeature().generate(world, world.getChunkManager().getChunkGenerator(), random, pos, DefaultFeatureConfig.INSTANCE); } @Override diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side.png index b9859e8f..cf710533 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_2.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_2.png index d993d7a2..dbea1685 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_2.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_3.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_3.png index 0a24225f..cef550ca 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_3.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_3.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_4.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_4.png index 95112942..34d1c0fe 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_4.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_4.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_5.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_5.png index 71bacf23..3db2e15b 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_5.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_5.png differ