From eb6d36b5ddd3b84a41d9b3162ae8c658f129a487 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Fri, 4 Dec 2020 22:27:42 +0300 Subject: [PATCH] Flower enhancements --- .../ru/betterend/blocks/BlockHydralux.java | 24 ++++ ...uxSpore.java => BlockHydraluxSapling.java} | 2 +- .../java/ru/betterend/registry/EndBlocks.java | 4 +- .../blockstates/hydralux_sapling.json | 8 ++ .../betterend/blockstates/hydralux_spore.json | 8 -- .../materialmaps/block/hydralux.json | 42 +++++++ .../block/hydralux_flower_big_1_bottom.json | 4 +- .../block/hydralux_flower_big_2_bottom.json | 5 +- .../block/hydralux_flower_big_3_bottom.json | 4 +- .../models/block/hydralux_flower_big_top.json | 14 +-- .../models/block/hydralux_roots.json | 105 +++++------------- ...lux_spore.json => hydralux_sapling_1.json} | 2 +- .../models/block/hydralux_sapling_2.json | 6 + .../models/block/hydralux_sapling_3.json | 6 + .../models/block/hydralux_sapling_4.json | 6 + .../betterend/models/hydralux_roots.json | 76 +++++++++++++ .../textures/block/hydralux_bloom_side.png | Bin 268 -> 0 bytes .../textures/block/hydralux_flower_bottom.png | Bin 1850 -> 2022 bytes .../textures/block/hydralux_roots.png | Bin 2071 -> 363 bytes .../textures/block/hydralux_sapling_1.png | Bin 0 -> 316 bytes .../textures/block/hydralux_sapling_2.png | Bin 0 -> 350 bytes .../textures/block/hydralux_sapling_3.png | Bin 0 -> 400 bytes .../textures/block/hydralux_sapling_4.png | Bin 0 -> 379 bytes .../textures/block/hydralux_spore.png | Bin 250 -> 0 bytes .../textures/block/hydralux_vine_bottom.png | Bin 0 -> 451 bytes 25 files changed, 215 insertions(+), 101 deletions(-) rename src/main/java/ru/betterend/blocks/{BlockHydraluxSpore.java => BlockHydraluxSapling.java} (93%) create mode 100644 src/main/resources/assets/betterend/blockstates/hydralux_sapling.json delete mode 100644 src/main/resources/assets/betterend/blockstates/hydralux_spore.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/hydralux.json rename src/main/resources/assets/betterend/models/block/{hydralux_spore.json => hydralux_sapling_1.json} (56%) create mode 100644 src/main/resources/assets/betterend/models/block/hydralux_sapling_2.json create mode 100644 src/main/resources/assets/betterend/models/block/hydralux_sapling_3.json create mode 100644 src/main/resources/assets/betterend/models/block/hydralux_sapling_4.json create mode 100644 src/main/resources/assets/betterend/models/hydralux_roots.json delete mode 100644 src/main/resources/assets/betterend/textures/block/hydralux_bloom_side.png create mode 100644 src/main/resources/assets/betterend/textures/block/hydralux_sapling_1.png create mode 100644 src/main/resources/assets/betterend/textures/block/hydralux_sapling_2.png create mode 100644 src/main/resources/assets/betterend/textures/block/hydralux_sapling_3.png create mode 100644 src/main/resources/assets/betterend/textures/block/hydralux_sapling_4.png delete mode 100644 src/main/resources/assets/betterend/textures/block/hydralux_spore.png create mode 100644 src/main/resources/assets/betterend/textures/block/hydralux_vine_bottom.png diff --git a/src/main/java/ru/betterend/blocks/BlockHydralux.java b/src/main/java/ru/betterend/blocks/BlockHydralux.java index aba2384c..b1405666 100644 --- a/src/main/java/ru/betterend/blocks/BlockHydralux.java +++ b/src/main/java/ru/betterend/blocks/BlockHydralux.java @@ -1,12 +1,20 @@ package ru.betterend.blocks; +import java.util.Collections; +import java.util.List; import java.util.Random; +import com.google.common.collect.Lists; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Material; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; import net.minecraft.state.property.EnumProperty; @@ -17,6 +25,7 @@ import net.minecraft.world.WorldView; import ru.betterend.blocks.BlockProperties.HydraluxShape; import ru.betterend.blocks.basis.BlockUnderwaterPlant; import ru.betterend.registry.EndBlocks; +import ru.betterend.util.MHelper; public class BlockHydralux extends BlockUnderwaterPlant { public static final EnumProperty SHAPE = BlockProperties.HYDRALUX_SHAPE; @@ -59,4 +68,19 @@ public class BlockHydralux extends BlockUnderwaterPlant { public boolean canGrow(World world, Random random, BlockPos pos, BlockState state) { return false; } + + @Override + @Environment(EnvType.CLIENT) + public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) { + return new ItemStack(EndBlocks.HYDRALUX_SAPLING); + } + + @Override + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + HydraluxShape shape = state.get(SHAPE); + if (shape == HydraluxShape.ROOTS) { + return Lists.newArrayList(new ItemStack(EndBlocks.HYDRALUX_SAPLING, MHelper.randRange(1, 2, MHelper.RANDOM))); + } + return Collections.emptyList(); + } } diff --git a/src/main/java/ru/betterend/blocks/BlockHydraluxSpore.java b/src/main/java/ru/betterend/blocks/BlockHydraluxSapling.java similarity index 93% rename from src/main/java/ru/betterend/blocks/BlockHydraluxSpore.java rename to src/main/java/ru/betterend/blocks/BlockHydraluxSapling.java index 75df7e2a..b3615fe3 100644 --- a/src/main/java/ru/betterend/blocks/BlockHydraluxSpore.java +++ b/src/main/java/ru/betterend/blocks/BlockHydraluxSapling.java @@ -13,7 +13,7 @@ import ru.betterend.registry.EndBlocks; import ru.betterend.util.BlocksHelper; import ru.betterend.util.MHelper; -public class BlockHydraluxSpore extends BlockUnderwaterPlantWithAge { +public class BlockHydraluxSapling extends BlockUnderwaterPlantWithAge { @Override public void grow(StructureWorldAccess world, Random random, BlockPos pos) { int h = MHelper.randRange(4, 8, random); diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 80a3e588..be87968f 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -29,7 +29,7 @@ import ru.betterend.blocks.BlockEndLotusStem; import ru.betterend.blocks.BlockEndstoneDust; import ru.betterend.blocks.BlockGlowingMoss; import ru.betterend.blocks.BlockHydralux; -import ru.betterend.blocks.BlockHydraluxSpore; +import ru.betterend.blocks.BlockHydraluxSapling; import ru.betterend.blocks.BlockHydrothermalVent; import ru.betterend.blocks.BlockLacugroveSapling; import ru.betterend.blocks.BlockMossyGlowshroomCap; @@ -166,7 +166,7 @@ public class EndBlocks { public static final Block END_LILY = registerBlockNI("end_lily", new BlockEndLily()); public static final Block END_LILY_SEED = registerBlock("end_lily_seed", new BlockEndLilySeed()); - public static final Block HYDRALUX_SPORE = registerBlock("hydralux_spore", new BlockHydraluxSpore()); + public static final Block HYDRALUX_SAPLING = registerBlock("hydralux_sapling", new BlockHydraluxSapling()); public static final Block HYDRALUX = registerBlock("hydralux", new BlockHydralux()); public static final Block CAVE_BUSH = registerBlock("cave_bush", new BlockSimpleLeaves(MaterialColor.MAGENTA)); diff --git a/src/main/resources/assets/betterend/blockstates/hydralux_sapling.json b/src/main/resources/assets/betterend/blockstates/hydralux_sapling.json new file mode 100644 index 00000000..0db9745c --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/hydralux_sapling.json @@ -0,0 +1,8 @@ +{ + "variants": { + "age=0": { "model": "betterend:block/hydralux_sapling_1" }, + "age=1": { "model": "betterend:block/hydralux_sapling_2" }, + "age=2": { "model": "betterend:block/hydralux_sapling_3" }, + "age=3": { "model": "betterend:block/hydralux_sapling_4" } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/hydralux_spore.json b/src/main/resources/assets/betterend/blockstates/hydralux_spore.json deleted file mode 100644 index af85a8d3..00000000 --- a/src/main/resources/assets/betterend/blockstates/hydralux_spore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "age=0": { "model": "betterend:block/hydralux_spore" }, - "age=1": { "model": "betterend:block/hydralux_spore" }, - "age=2": { "model": "betterend:block/hydralux_spore" }, - "age=3": { "model": "betterend:block/hydralux_spore" } - } -} diff --git a/src/main/resources/assets/betterend/materialmaps/block/hydralux.json b/src/main/resources/assets/betterend/materialmaps/block/hydralux.json new file mode 100644 index 00000000..d5bae077 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/hydralux.json @@ -0,0 +1,42 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/hydralux_flower_petal", + "material": "betterend:waving_glow_inc" + }, + { + "sprite": "betterend:block/hydralux_flower_bud_petal_side", + "material": "betterend:waving_glow_inc" + }, + { + "sprite": "betterend:block/hydralux_flower_bud_petal_top", + "material": "betterend:waving_glow_inc" + }, + { + "sprite": "betterend:block/hydralux_bloom_bottom", + "material": "betterend:waving" + }, + { + "sprite": "betterend:block/hydralux_bloom_top", + "material": "betterend:waving" + }, + { + "sprite": "betterend:block/hydralux_vine", + "material": "betterend:waving" + }, + { + "sprite": "betterend:block/hydralux_flower_bottom", + "material": "betterend:waving_glow_inc" + }, + { + "sprite": "betterend:block/hydralux_flower_bud", + "material": "betterend:waving" + }, + { + "sprite": "betterend:block/hydralux_vine_bottom", + "material": "betterend:waving_floor" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/hydralux_flower_big_1_bottom.json b/src/main/resources/assets/betterend/models/block/hydralux_flower_big_1_bottom.json index abc5294e..992b96ac 100644 --- a/src/main/resources/assets/betterend/models/block/hydralux_flower_big_1_bottom.json +++ b/src/main/resources/assets/betterend/models/block/hydralux_flower_big_1_bottom.json @@ -3,7 +3,7 @@ "textures": { "particle": "betterend:block/hydralux_flower_bottom", "texture": "betterend:block/hydralux_flower_bottom", - "petal_bottom": "betterend:block/hydralux_flower_bud_petal_bottom", + "petal_bottom": "betterend:block/hydralux_bloom_bottom", "petal_side": "betterend:block/hydralux_flower_bud_petal_side", "petal": "betterend:block/hydralux_flower_petal", "top": "betterend:block/hydralux_bloom_top" @@ -49,7 +49,7 @@ "to": [ 13, 16, 13 ], "shade": false, "faces": { - "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#texture" }, + "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#petal_bottom" }, "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" }, "north": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" }, "south": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" }, diff --git a/src/main/resources/assets/betterend/models/block/hydralux_flower_big_2_bottom.json b/src/main/resources/assets/betterend/models/block/hydralux_flower_big_2_bottom.json index 27cdfd0f..3fdfdafe 100644 --- a/src/main/resources/assets/betterend/models/block/hydralux_flower_big_2_bottom.json +++ b/src/main/resources/assets/betterend/models/block/hydralux_flower_big_2_bottom.json @@ -3,7 +3,7 @@ "textures": { "particle": "betterend:block/hydralux_flower_bottom", "texture": "betterend:block/hydralux_flower_bottom", - "petal_bottom": "betterend:block/hydralux_flower_bud_petal_bottom", + "petal_bottom": "betterend:block/hydralux_bloom_bottom", "petal_side": "betterend:block/hydralux_flower_bud_petal_side", "petal": "betterend:block/hydralux_flower_petal", "top": "betterend:block/hydralux_bloom_top" @@ -49,7 +49,7 @@ "to": [ 13, 16, 13 ], "shade": false, "faces": { - "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#texture" }, + "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#petal_bottom" }, "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" }, "north": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" }, "south": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" }, @@ -81,7 +81,6 @@ "__comment": "PlaneY7", "from": [ 13, 16, 0 ], "to": [ 29, 16.001, 16 ], - "rotation": { "origin": [ 13, 16, 0 ], "axis": "z", "angle": 0 }, "shade": false, "faces": { "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#petal", "rotation": 90 }, diff --git a/src/main/resources/assets/betterend/models/block/hydralux_flower_big_3_bottom.json b/src/main/resources/assets/betterend/models/block/hydralux_flower_big_3_bottom.json index c21ff703..d7b1b2f3 100644 --- a/src/main/resources/assets/betterend/models/block/hydralux_flower_big_3_bottom.json +++ b/src/main/resources/assets/betterend/models/block/hydralux_flower_big_3_bottom.json @@ -3,7 +3,7 @@ "textures": { "particle": "betterend:block/hydralux_flower_bottom", "texture": "betterend:block/hydralux_flower_bottom", - "petal_bottom": "betterend:block/hydralux_flower_bud_petal_bottom", + "petal_bottom": "betterend:block/hydralux_bloom_bottom", "petal_side": "betterend:block/hydralux_flower_bud_petal_side", "petal": "betterend:block/hydralux_flower_petal", "top": "betterend:block/hydralux_bloom_top" @@ -49,7 +49,7 @@ "to": [ 13, 16, 13 ], "shade": false, "faces": { - "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#texture" }, + "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#petal_bottom" }, "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" }, "north": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" }, "south": { "uv": [ 3, 0, 13, 8 ], "texture": "#texture" }, diff --git a/src/main/resources/assets/betterend/models/block/hydralux_flower_big_top.json b/src/main/resources/assets/betterend/models/block/hydralux_flower_big_top.json index f8861c1a..24cc4a5f 100644 --- a/src/main/resources/assets/betterend/models/block/hydralux_flower_big_top.json +++ b/src/main/resources/assets/betterend/models/block/hydralux_flower_big_top.json @@ -7,14 +7,14 @@ "elements": [ { "__comment": "Box3", - "from": [ 4, 0, 4 ], - "to": [ 12, 3, 12 ], + "from": [ 5, 0, 5 ], + "to": [ 11, 2, 11 ], "faces": { - "up": { "uv": [ 0, 0, 8, 8 ], "texture": "#texture" }, - "north": { "uv": [ 0, 8, 8, 11 ], "texture": "#texture" }, - "south": { "uv": [ 0, 8, 8, 11 ], "texture": "#texture" }, - "west": { "uv": [ 0, 8, 8, 11 ], "texture": "#texture" }, - "east": { "uv": [ 0, 8, 8, 11 ], "texture": "#texture" } + "up": { "uv": [ 1, 1, 7, 7 ], "texture": "#texture" }, + "north": { "uv": [ 1, 8, 7, 10 ], "texture": "#texture" }, + "south": { "uv": [ 1, 8, 7, 10 ], "texture": "#texture" }, + "west": { "uv": [ 1, 8, 7, 10 ], "texture": "#texture" }, + "east": { "uv": [ 1, 8, 7, 10 ], "texture": "#texture" } } }, { diff --git a/src/main/resources/assets/betterend/models/block/hydralux_roots.json b/src/main/resources/assets/betterend/models/block/hydralux_roots.json index 4d0ba2b8..22560827 100644 --- a/src/main/resources/assets/betterend/models/block/hydralux_roots.json +++ b/src/main/resources/assets/betterend/models/block/hydralux_roots.json @@ -1,76 +1,31 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/hydralux_vine", - "texture": "betterend:block/hydralux_vine", - "roots": "betterend:block/hydralux_roots" - }, - "elements": [ - { - "__comment": "PlaneX1", - "from": [ 2.375, 0, 2.25 ], - "to": [ 2.376, 16, 18.25 ], - "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX1", - "from": [ 13.75, 0, 2.25 ], - "to": [ 13.751, 16, 18.25 ], - "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 5, 0, 0.5 ], - "to": [ 5.001, 16, 16.5 ], - "rotation": { "origin": [ 5, 0, 0.5 ], "axis": "y", "angle": 22.5 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } - } - }, - { - "__comment": "PlaneZ5", - "from": [ 0.5, 0, 11 ], - "to": [ 16.5, 16, 11.001 ], - "rotation": { "origin": [ 0.5, 0, 11 ], "axis": "y", "angle": 22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } - } - }, - { - "__comment": "PlaneX4", - "from": [ 11, 0, 0.5 ], - "to": [ 11.001, 16, 16.5 ], - "rotation": { "origin": [ 11, 0, 0.5 ], "axis": "y", "angle": -22.5 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } - } - }, - { - "__comment": "PlaneZ5", - "from": [ 0.5, 0, 5 ], - "to": [ 16.5, 16, 5.001 ], - "rotation": { "origin": [ 0.5, 0, 5 ], "axis": "y", "angle": -22.5 }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/hydralux_vine_bottom", + "texture": "betterend:block/hydralux_vine_bottom" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 2.375, 0, 2.25 ], + "to": [ 2.376, 16, 18.25 ], + "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 13.75, 0, 2.25 ], + "to": [ 13.751, 16, 18.25 ], + "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/hydralux_spore.json b/src/main/resources/assets/betterend/models/block/hydralux_sapling_1.json similarity index 56% rename from src/main/resources/assets/betterend/models/block/hydralux_spore.json rename to src/main/resources/assets/betterend/models/block/hydralux_sapling_1.json index c7a7897e..03a16dfb 100644 --- a/src/main/resources/assets/betterend/models/block/hydralux_spore.json +++ b/src/main/resources/assets/betterend/models/block/hydralux_sapling_1.json @@ -1,6 +1,6 @@ { "parent": "betterend:block/cross_no_distortion", "textures": { - "texture": "betterend:block/hydralux_spore" + "texture": "betterend:block/hydralux_sapling_1" } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/hydralux_sapling_2.json b/src/main/resources/assets/betterend/models/block/hydralux_sapling_2.json new file mode 100644 index 00000000..35e4df6c --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/hydralux_sapling_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/hydralux_sapling_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/hydralux_sapling_3.json b/src/main/resources/assets/betterend/models/block/hydralux_sapling_3.json new file mode 100644 index 00000000..6f1007dc --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/hydralux_sapling_3.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/hydralux_sapling_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/hydralux_sapling_4.json b/src/main/resources/assets/betterend/models/block/hydralux_sapling_4.json new file mode 100644 index 00000000..8b50f5a5 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/hydralux_sapling_4.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/hydralux_sapling_4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/hydralux_roots.json b/src/main/resources/assets/betterend/models/hydralux_roots.json new file mode 100644 index 00000000..8ee64882 --- /dev/null +++ b/src/main/resources/assets/betterend/models/hydralux_roots.json @@ -0,0 +1,76 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/hydralux_vine_bottom", + "texture": "betterend:block/hydralux_vine_bottom", + "roots": "betterend:block/hydralux_roots" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 2.375, 0, 2.25 ], + "to": [ 2.376, 16, 18.25 ], + "rotation": { "origin": [ 2.375, 0, 2.25 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 13.75, 0, 2.25 ], + "to": [ 13.751, 16, 18.25 ], + "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 5, 0, 0.5 ], + "to": [ 5.001, 16, 16.5 ], + "rotation": { "origin": [ 5, 0, 0.5 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneZ5", + "from": [ 0.5, 0, 11 ], + "to": [ 16.5, 16, 11.001 ], + "rotation": { "origin": [ 0.5, 0, 11 ], "axis": "y", "angle": 22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 11, 0, 0.5 ], + "to": [ 11.001, 16, 16.5 ], + "rotation": { "origin": [ 11, 0, 0.5 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + }, + { + "__comment": "PlaneZ5", + "from": [ 0.5, 0, 5 ], + "to": [ 16.5, 16, 5.001 ], + "rotation": { "origin": [ 0.5, 0, 5 ], "axis": "y", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#roots" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_bloom_side.png b/src/main/resources/assets/betterend/textures/block/hydralux_bloom_side.png deleted file mode 100644 index d66a4c18ce2284f358ee4db655bfb9f4ef22e2f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!G)eKjv*HQ$$$R;w`W#u;Pjfz%XW`pih;&! zj(`6jeDh|Lv-4ZQ!F+hS|9wf3kfR54CdhQ$4c$0RP=|pBvwIgYevx=m|l6k&Gw*LqRm=!u#XGb0B> zhS|LFcFsJ9Sq=6uTx#%9X3j~9U=~bM?r|$)-IeY3nTeU1!R~6tp7sr0r-6=T@O1Ta JS?83{1OQM;Rwn=e diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_flower_bottom.png b/src/main/resources/assets/betterend/textures/block/hydralux_flower_bottom.png index dbd33c141905f81619601181e784a5844f4b3256..22e70a26999d2c54f13340338aa19f09b807b339 100644 GIT binary patch delta 634 zcmdnR_l$pniWFmUkh>GZx^prw85kH?(j9#r85lP9bN@+Xov0|z#3nP*%AbjsYhqU} zGcT9I#P3e5KuSSjvnAt2CQ~pI$g`=)E%5cV^2jVM$uFw3g9!sAic-?7f>R5TgcK&L zupgt?0&fL_J zL=exuq98FjJGDe1H7~_hsYuD*j#WW*8Uq7keXysCV~B-+@1*@+%#H%>&s|!YC6Xr0 zN$6@2+xXc(bM4fXHR2xyj~qL9iCrLPi@=smn}oQ#xjQB}9pql5$i}2Jr>?l~&9ie4 z*pJ^ickWMGdReoH@6j7KZ~IMG%N8=7^~vzf$>>jO{>{wrTXv{RW$v~k^J8z`x8*E( zJiAkV^&XY_TFd_TCISLRA2z!8bgL%_R8-WgTE4*Q|BtQ{oL_c1Yfg1udBw^1$!h(u ztH!2svGK)e@Ue8PVVsg)#;U3ep z*NfuY%%!I;EuR14|HXq(-%B^lIgpmEyEG}&N?KvZ>+a3c{s*$M6*-uA*Xf6p=GvNv zKTECL`*FWyO#IP?&t;ucLK6Vvg7g0X delta 467 zcmaFHzl(2z%0x#ICf17+!~Gc*Ca%bxEWzlsIiB$%lazu@MQ(wwua!q;aY=qrrJaIJ zQA(OsaB895WJ6Z*$u%s?ne;)-bM^W_IenNUkcqAjEa#G1oLrPyP?DLS2U8y8;s#H(hilcN1Tzo5Bkxv4oaUIEp5(xkA6Lh8S?N(tLXTeGxnl+l zk%A}8W+*C1#VY$T+wJ+)mn6`^f4N78omuCE%!K+xlTAr8EUcstv);)0@#&{^SmB&F zhD?WL8&5v`!nDgf!DN$L$#nyz<;)RL4Xg?$_AfAD>|%}hHRJmJ`q_f(x%Fgf8MaMq zpDvvDxc9UF!J3@JMj^JIo}PrWMyH%K{H_~JNi*0Grl7~uC%@-h#>oYpkMw7VZ(v;0 z$Wd%}A}m6#qUgKqje;h&9ls?0P7f4pQjZUCcyy^JkzrHXjI|pK7}`$PXDAp6ePI$) i|IaSjq$|cyHE)~JT!yo^8Mql37(8A5T-G@yGywoXq_rmi diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_roots.png b/src/main/resources/assets/betterend/textures/block/hydralux_roots.png index a1ee21419b6cb4633e9fdff147587acad8ca9ccb..1238efff7bfff718aa7cc4fdc3fff0be6cfad566 100644 GIT binary patch delta 336 zcmV-W0k8g-5bFYvB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic z000ic0Tn1pfB*mi07*naR5(xFlD`W{w&vH3B{U}ECGH7E-uHa1U5 z85my4@KVOd_i%JPHv^k*-CpboiYcnL^1LRnsH}iauO22dF-p4$+HHJZ!yFL6wcY@7AYXFn=m)glo(T3aha{kuvD$6X5{@Sgw$Ix{y|MfoBHtWT=86 i5H0x|&%uSiL_}9+y>_g4(RBs@0000^>GyM+FM(=0}~(k z7)Cb@YJA{h^AWeO&8eBo20E3X;$sPMINhSSpl0(iM2(8i{d*iYT+o?a((AwN_y4}{ z_vo*SiwY+uYF^Vo5R~Z5b4&*3B=s23AN;4@d`yAUz+m3HG6W4uR*yJn-TD*=N@(HT z9>wD-AZan6r5Mr6YQupbKts^jap53E&tw(Y%ldf1hIG{bh`>B!L#7&CxGQL9OZdD> zi7l=ybkmhHX)A+_%Yny+Nk9-_6$%aq{DMq|ZAgTd1Z(v+hQJYsGSh~PR|R2@s|dD> z5(^u(CX^-&I@oO05+>ZLGi1X$oG@d!86)&4PLQ~X)LY@`4*_Zt!;zC6xlt`}WkX67 zB}igeC=}9$^jcB!VT9Fc#c&;_)1d%?$`yh_g;7CH>tS%PGA;2zg%<@_Wu&}fnPNkL z)9w%g!5FO|N7DonhJ~phMrd(0qzI6qW4K_MJK#D&X6It5vw1e$d^YzPQj%kvCrrY&BYvzSnvvwBh1Xuwg6nKPnh1LZYYImXKo zvHcE_E>nxE?(gn%Mx+79KdKyOHX3Nkh#DZ&uY60~lGW$zZh5U?c9;qgK{HqgD=(c^O7Wn@mR9NLbW{j`Rqb$IGC47139u znEf!i^7C+{El7%1+uerHYMogIiQeY>$j5UjNB4(HSU~!W;&-ddBBz8Xi5>3)xqF`e z!k*?|rplk~{`soeZL7EYKKt>1x{oG@E};Y;3nnOrsPSOxtm!Td_V21ip7okbJ#aAW z)MaeSf{WOkW(7bkfhk<2Ie!3x;;uR!^Dwx{+fulF z1wdI|)g;tSspE4tjXB@mdAf4%bg1j$rrMPF4ct#lnhuU$m7i%DF}OTuQ~UIOU!3ui z$LB7py5E-e{*GThJ9yTS^c!qPtg8AG&Ci8NQd&94# z-|i}}A6c+=D6}Sbn&+&>d? j^-F&^{Q7?FH@8ybca(9}ld9EEKjfTH==l2W8C8D+Yl_-SV~B-+@}K|z?GHCFPI%fAV8*5JM9a;s z!)$_;nn5>{!$w9G=9Kq>Pg^VRO8$40IHk(lU}9HQ^7a4K)w>_IO?cCEe*S#Jnwq~& z4^O_e4iF4!FqKN&mb<@h=E2}#@ija1uE}kPny~i7#S=_vii{J|rhkapa8{wl+ZYutCz|c4{K@Ha_{fCZHc2-Fsf~;+i99?ETN+zf<*b`_13ky!>FVdQ I&MBb@0E3@(^Z)<= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_sapling_2.png b/src/main/resources/assets/betterend/textures/block/hydralux_sapling_2.png new file mode 100644 index 0000000000000000000000000000000000000000..774fa495a6bfbe376024bbd01495e9d4b2791d4d GIT binary patch literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@Uy3jV~B-+@}K|z?GHCFPI%fAV8*5JM9a;s z!)#J4|D}dCoXfcr7HFPjUAHUmnp{PN;_e34Gl!TQW(jAh8P)vz)AR80YjK5z{~dZI z8qcvT-N-Z{O=3qm^FcSZ2;PR9Oq+gQySbQ0U;ZxZ=Z%a#1`L_=?oZ}4dwAiQbAq8j zM8ONG2we}ke2E5=-7U`#&8`1?Ub~IkUB2Pw4TdoN15EEuzP0AbkE?6yN@BOz%W&yW zf8;zfUkzY)E1_ks{&7W?(pj^#sFV))QS5 s{_+d8OZKecTg|Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TOn#=#IS9kwEc3|;;5E~?h z>;e#*1X zA)R2S_1`}w49vcKUl>o48R%& zAk8k}xnSpmz~QHN7#Kc%2eZ)u&M<)a{mJb+3{UR7V^}r!2#RZA07DSwM35^$nm;S@ zF|X*Z@Ku0|Nk3!=u9nRBey|00000fhdEP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T6Y59fkzW|R}TuMH06p(s(n-h#EI9K zd!r-bt`fy^<|`Z}vTcX5`4l2v#q5A+JTygCcu2M_B=_2b^yQxD;vGU zW7=F8#u=QBmK5)QEJ=vfxwxN6Xa;iP*AHdt)d=r~37%mxF*bmBJY4?OWfQ*BAcS~G zG~+!Q@ZQ+qX|P)m)pYP*4eFm&(d&%7zn|UwMDo3KFwnp+1pQ*rXkbb;iNS{kLBbma Z{Q@xqVL}PwD|-L{002ovPDHLkV1g?Fn%V#W literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/hydralux_spore.png b/src/main/resources/assets/betterend/textures/block/hydralux_spore.png deleted file mode 100644 index 560562628a45505f7f636099dbfee7ae6a0103f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!G2E{#}EtuWC>PfrZcb4{op?opqI(8Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T$p-S=kZ?OGs(!{Z&(UaQkANon{pq1&qg?@NC8JfVxTJC9Se(L-mwLG5mx_WGL! z~JS~=pvMi_8>JsH9r}6uglFyWWzO$e@5F~U(bOO9Sjl7XGf&>5& zL=mdg%7HI}s0XuY%H*$)lo!a_7ki8m2;cw?a@DyI=7tEyh>1iy0QvF$&9y5cF|dF! z#x0Fl9^!!Hy$<#dwoIjJjhjb&^T$63MiA!_MdavY*Ig|P)o=n*U0MWSB61+Z!0{-t zJAYu4;Hn&i0Ny-+_rKhz@o$jjE!hAL#S)PaM881v%}|OL+SvdA002ovPDHLkV1mHs!}I_E literal 0 HcmV?d00001