diff --git a/src/main/java/ru/betterend/blocks/BlockGlowingPillarSeed.java b/src/main/java/ru/betterend/blocks/BlockGlowingPillarSeed.java index 9efc0fd4..7bb20c66 100644 --- a/src/main/java/ru/betterend/blocks/BlockGlowingPillarSeed.java +++ b/src/main/java/ru/betterend/blocks/BlockGlowingPillarSeed.java @@ -2,7 +2,11 @@ package ru.betterend.blocks; import java.util.Random; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; import net.minecraft.block.BlockState; +import net.minecraft.block.Material; +import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos.Mutable; @@ -15,6 +19,16 @@ import ru.betterend.util.BlocksHelper; import ru.betterend.util.MHelper; public class BlockGlowingPillarSeed extends BlockPlantWithAge { + public BlockGlowingPillarSeed() { + super(FabricBlockSettings.of(Material.PLANT) + .luminance((state) -> { return state.get(AGE) * 3 + 3; }) + .breakByTool(FabricToolTags.SHEARS) + .sounds(BlockSoundGroup.GRASS) + .breakByHand(true) + .ticksRandomly() + .noCollision()); + } + @Override public void growAdult(StructureWorldAccess world, Random random, BlockPos pos) { int height = MHelper.randRange(1, 2, random); diff --git a/src/main/java/ru/betterend/blocks/basis/BlockPlantWithAge.java b/src/main/java/ru/betterend/blocks/basis/BlockPlantWithAge.java index 00a347f7..2d13df0d 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockPlantWithAge.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockPlantWithAge.java @@ -18,7 +18,7 @@ public abstract class BlockPlantWithAge extends BlockPlant { public static final IntProperty AGE = IntProperty.of("age", 0, 3); public BlockPlantWithAge() { - super(FabricBlockSettings.of(Material.PLANT) + this(FabricBlockSettings.of(Material.PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.GRASS) .breakByHand(true) @@ -26,6 +26,10 @@ public abstract class BlockPlantWithAge extends BlockPlant { .noCollision()); } + public BlockPlantWithAge(FabricBlockSettings settings) { + super(settings); + } + @Override protected void appendProperties(StateManager.Builder stateManager) { stateManager.add(AGE); diff --git a/src/main/resources/assets/betterend/blockstates/glowing_pillar_seed.json b/src/main/resources/assets/betterend/blockstates/glowing_pillar_seed.json new file mode 100644 index 00000000..e8f26ae9 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/glowing_pillar_seed.json @@ -0,0 +1,8 @@ +{ + "variants": { + "age=0": { "model": "betterend:block/glowing_pillar_seed_0" }, + "age=1": { "model": "betterend:block/glowing_pillar_seed_1" }, + "age=2": { "model": "betterend:block/glowing_pillar_seed_2" }, + "age=3": { "model": "betterend:block/glowing_pillar_seed_3" } + } +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/glowing_pillar_leaves.json b/src/main/resources/assets/betterend/materialmaps/block/glowing_pillar_leaves.json new file mode 100644 index 00000000..f50cc590 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/glowing_pillar_leaves.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_wall_glow_all" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/helix_tree_luminophor.json b/src/main/resources/assets/betterend/materialmaps/block/glowing_pillar_luminophor.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/helix_tree_luminophor.json rename to src/main/resources/assets/betterend/materialmaps/block/glowing_pillar_luminophor.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/glowing_pillar_seed.json b/src/main/resources/assets/betterend/materialmaps/block/glowing_pillar_seed.json new file mode 100644 index 00000000..6ea7e2b4 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/glowing_pillar_seed.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_floor_glow_inc" +} diff --git a/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_0.json b/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_0.json new file mode 100644 index 00000000..50c56fac --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_0.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/glowing_pillar_seed_0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_1.json b/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_1.json new file mode 100644 index 00000000..b4eff720 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/glowing_pillar_seed_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_2.json b/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_2.json new file mode 100644 index 00000000..d433e150 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/glowing_pillar_seed_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_3.json b/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_3.json new file mode 100644 index 00000000..336ffab0 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_3.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/glowing_pillar_seed_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/glowing_pillar_seed.json b/src/main/resources/assets/betterend/models/item/glowing_pillar_seed.json new file mode 100644 index 00000000..08d1672b --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/glowing_pillar_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:item/glowing_pillar_seed" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_0.png b/src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_0.png new file mode 100644 index 00000000..2caba256 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_0.png differ diff --git a/src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_1.png b/src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_1.png new file mode 100644 index 00000000..37459310 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_1.png differ diff --git a/src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_2.png b/src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_2.png new file mode 100644 index 00000000..91737a69 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_3.png b/src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_3.png new file mode 100644 index 00000000..208e8b41 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_3.png differ diff --git a/src/main/resources/assets/betterend/textures/item/glowing_pillar_seed.png b/src/main/resources/assets/betterend/textures/item/glowing_pillar_seed.png new file mode 100644 index 00000000..ac725f13 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/glowing_pillar_seed.png differ