From 56d10bfcdaeb1dcb45a979fa84ebad46f4073c04 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Tue, 27 Apr 2021 14:40:09 +0300 Subject: [PATCH] Cactus enhancements --- .../ru/betterend/blocks/NeonCactusBlock.java | 66 +++++++++---- .../models/block/neon_cactus_big.json | 53 +++++++++-- .../models/block/neon_cactus_big_moss.json | 90 +++++++++++------- .../models/block/neon_cactus_big_sand.json | 90 +++++++++++------- .../models/block/neon_cactus_medium.json | 28 +++--- .../models/block/neon_cactus_medium_moss.json | 58 ----------- .../models/block/neon_cactus_medium_sand.json | 46 ++++----- .../models/block/neon_cactus_small_moss.json | 48 +++++----- .../textures/block/neon_cactus_big_side.png | Bin 270 -> 271 bytes .../block/neon_cactus_big_side_dust.png | Bin 1834 -> 303 bytes .../neon_cactus_big_side_dust_overlay.png | Bin 1753 -> 164 bytes .../block/neon_cactus_big_side_moss.png | Bin 331 -> 324 bytes .../neon_cactus_big_side_moss_overlay.png | Bin 1765 -> 185 bytes .../textures/block/neon_cactus_block_side.png | Bin 0 -> 270 bytes ..._big_top.png => neon_cactus_block_top.png} | Bin .../block/neon_cactus_medium_side.png | Bin 271 -> 458 bytes .../block/neon_cactus_medium_side_dust.png | Bin 303 -> 569 bytes .../neon_cactus_medium_side_dust_overlay.png | Bin 164 -> 213 bytes .../block/neon_cactus_medium_side_moss.png | Bin 324 -> 569 bytes .../neon_cactus_medium_side_moss_overlay.png | Bin 185 -> 292 bytes 20 files changed, 269 insertions(+), 210 deletions(-) delete mode 100644 src/main/resources/assets/betterend/models/block/neon_cactus_medium_moss.json create mode 100644 src/main/resources/assets/betterend/textures/block/neon_cactus_block_side.png rename src/main/resources/assets/betterend/textures/block/{neon_cactus_big_top.png => neon_cactus_block_top.png} (100%) diff --git a/src/main/java/ru/betterend/blocks/NeonCactusBlock.java b/src/main/java/ru/betterend/blocks/NeonCactusBlock.java index 7107dd92..51955d76 100644 --- a/src/main/java/ru/betterend/blocks/NeonCactusBlock.java +++ b/src/main/java/ru/betterend/blocks/NeonCactusBlock.java @@ -14,6 +14,7 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Mirror; @@ -28,7 +29,6 @@ import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; import net.minecraft.world.phys.shapes.CollisionContext; -import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import ru.betterend.blocks.BlockProperties.CactusBottom; import ru.betterend.blocks.BlockProperties.TripleShape; @@ -45,11 +45,13 @@ public class NeonCactusBlock extends BlockBaseNotFull implements SimpleWaterlogg public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; public static final DirectionProperty FACING = BlockStateProperties.FACING; + private static final EnumMap BIG_SHAPES_OPEN = Maps.newEnumMap(Direction.class); private static final EnumMap MEDIUM_SHAPES_OPEN = Maps.newEnumMap(Direction.class); private static final EnumMap SMALL_SHAPES_OPEN = Maps.newEnumMap(Direction.class); + private static final EnumMap BIG_SHAPES = Maps.newEnumMap(Axis.class); private static final EnumMap MEDIUM_SHAPES = Maps.newEnumMap(Axis.class); private static final EnumMap SMALL_SHAPES = Maps.newEnumMap(Axis.class); - private static final int MAX_LENGTH = 10; + private static final int MAX_LENGTH = 12; public NeonCactusBlock() { super(FabricBlockSettings.copyOf(Blocks.CACTUS).luminance(15).randomTicks()); @@ -101,11 +103,14 @@ public class NeonCactusBlock extends BlockBaseNotFull implements SimpleWaterlogg world.getLiquidTicks().scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world)); } Direction dir = state.getValue(FACING); - BlockState down = world.getBlockState(pos.relative(dir.getOpposite())); - if (down.is(Blocks.END_STONE) || down.is(EndBlocks.ENDSTONE_DUST)) { + if (!canSurvive(state, world, pos)) { + return Blocks.AIR.defaultBlockState(); + } + BlockState downState = world.getBlockState(pos.relative(dir.getOpposite())); + if (downState.is(Blocks.END_STONE) || downState.is(EndBlocks.ENDSTONE_DUST)) { state = state.setValue(CACTUS_BOTTOM, CactusBottom.SAND); } - else if (down.is(EndBlocks.END_MOSS)) { + else if (downState.is(EndBlocks.END_MOSS)) { state = state.setValue(CACTUS_BOTTOM, CactusBottom.MOSS); } else { @@ -122,24 +127,38 @@ public class NeonCactusBlock extends BlockBaseNotFull implements SimpleWaterlogg @Override public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) { TripleShape shape = state.getValue(SHAPE); - - if (shape == TripleShape.BOTTOM) { - return Shapes.block(); - } Direction dir = state.getValue(FACING); BlockState next = view.getBlockState(pos.relative(dir)); if (next.is(this)) { Axis axis = dir.getAxis(); + if (shape == TripleShape.BOTTOM) { + return BIG_SHAPES.get(axis); + } return shape == TripleShape.MIDDLE ? MEDIUM_SHAPES.get(axis) : SMALL_SHAPES.get(axis); } else { + if (shape == TripleShape.BOTTOM) { + return BIG_SHAPES_OPEN.get(dir); + } return shape == TripleShape.MIDDLE ? MEDIUM_SHAPES_OPEN.get(dir) : SMALL_SHAPES_OPEN.get(dir); } } + @Override + public boolean canSurvive(BlockState state, LevelReader level, BlockPos pos) { + Direction dir = state.getValue(FACING); + BlockPos supportPos = pos.relative(dir.getOpposite()); + BlockState support = level.getBlockState(supportPos); + return support.is(this) || support.isFaceSturdy(level, supportPos, dir); + } + @Override public void randomTick(BlockState state, ServerLevel world, BlockPos pos, Random random) { Direction dir = state.getValue(FACING); + if (!this.canSurvive(state, world, pos)) { + this.destroy(world, pos, state); + return; + } if (!world.isEmptyBlock(pos.relative(dir))) { return; } @@ -227,20 +246,31 @@ public class NeonCactusBlock extends BlockBaseNotFull implements SimpleWaterlogg } static { - MEDIUM_SHAPES.put(Axis.X, Block.box(0, 2, 2, 16, 14, 14)); - MEDIUM_SHAPES.put(Axis.Y, Block.box(2, 0, 2, 14, 16, 14)); - MEDIUM_SHAPES.put(Axis.Z, Block.box(2, 2, 0, 14, 14, 16)); + BIG_SHAPES.put(Axis.X, Block.box(0, 2, 2, 16, 14, 14)); + BIG_SHAPES.put(Axis.Y, Block.box(2, 0, 2, 14, 16, 14)); + BIG_SHAPES.put(Axis.Z, Block.box(2, 2, 0, 14, 14, 16)); + + MEDIUM_SHAPES.put(Axis.X, Block.box(0, 3, 3, 16, 13, 13)); + MEDIUM_SHAPES.put(Axis.Y, Block.box(3, 0, 3, 13, 16, 13)); + MEDIUM_SHAPES.put(Axis.Z, Block.box(3, 3, 0, 13, 13, 16)); SMALL_SHAPES.put(Axis.X, Block.box(0, 4, 4, 16, 12, 12)); SMALL_SHAPES.put(Axis.Y, Block.box(4, 0, 4, 12, 16, 12)); SMALL_SHAPES.put(Axis.Z, Block.box(4, 4, 0, 12, 12, 16)); - MEDIUM_SHAPES_OPEN.put(Direction.UP, Block.box(2, 0, 2, 14, 14, 14)); - MEDIUM_SHAPES_OPEN.put(Direction.DOWN, Block.box(2, 2, 2, 14, 16, 14)); - MEDIUM_SHAPES_OPEN.put(Direction.NORTH, Block.box(2, 2, 2, 14, 14, 16)); - MEDIUM_SHAPES_OPEN.put(Direction.SOUTH, Block.box(2, 2, 0, 14, 14, 14)); - MEDIUM_SHAPES_OPEN.put(Direction.WEST, Block.box(2, 2, 2, 16, 14, 14)); - MEDIUM_SHAPES_OPEN.put(Direction.EAST, Block.box(0, 2, 2, 14, 14, 14)); + BIG_SHAPES_OPEN.put(Direction.UP, Block.box(2, 0, 2, 14, 14, 14)); + BIG_SHAPES_OPEN.put(Direction.DOWN, Block.box(2, 2, 2, 14, 16, 14)); + BIG_SHAPES_OPEN.put(Direction.NORTH, Block.box(2, 2, 2, 14, 14, 16)); + BIG_SHAPES_OPEN.put(Direction.SOUTH, Block.box(2, 2, 0, 14, 14, 14)); + BIG_SHAPES_OPEN.put(Direction.WEST, Block.box(2, 2, 2, 16, 14, 14)); + BIG_SHAPES_OPEN.put(Direction.EAST, Block.box(0, 2, 2, 14, 14, 14)); + + MEDIUM_SHAPES_OPEN.put(Direction.UP, Block.box(3, 0, 3, 13, 13, 13)); + MEDIUM_SHAPES_OPEN.put(Direction.DOWN, Block.box(3, 3, 3, 13, 16, 13)); + MEDIUM_SHAPES_OPEN.put(Direction.NORTH, Block.box(3, 3, 3, 13, 13, 16)); + MEDIUM_SHAPES_OPEN.put(Direction.SOUTH, Block.box(3, 3, 0, 13, 13, 13)); + MEDIUM_SHAPES_OPEN.put(Direction.WEST, Block.box(3, 3, 3, 16, 13, 13)); + MEDIUM_SHAPES_OPEN.put(Direction.EAST, Block.box(0, 3, 3, 13, 13, 13)); SMALL_SHAPES_OPEN.put(Direction.UP, Block.box(4, 0, 4, 12, 12, 12)); SMALL_SHAPES_OPEN.put(Direction.DOWN, Block.box(4, 4, 4, 12, 16, 12)); diff --git a/src/main/resources/assets/betterend/models/block/neon_cactus_big.json b/src/main/resources/assets/betterend/models/block/neon_cactus_big.json index a917c73f..7e2dac87 100644 --- a/src/main/resources/assets/betterend/models/block/neon_cactus_big.json +++ b/src/main/resources/assets/betterend/models/block/neon_cactus_big.json @@ -1,7 +1,46 @@ -{ - "parent": "betterend:block/column_noshade", - "textures": { - "end": "betterend:block/neon_cactus_big_top", - "side": "betterend:block/neon_cactus_big_side" - } -} +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/neon_cactus_big_side", + "side": "betterend:block/neon_cactus_big_side", + "top": "betterend:block/neon_cactus_medium_top" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 2, -2, 2 ], + "to": [ 14, 14, 14 ], + "shade": false, + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, + "north": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, + "south": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, + "west": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, + "east": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 0, -2, 0 ], + "to": [ 0.001, 14, 22.5 ], + "rotation": { "origin": [ 0, -2, 0 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 16, -2, 0 ], + "to": [ 16.001, 14, 22.5 ], + "rotation": { "origin": [ 16, -2, 0 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/neon_cactus_big_moss.json b/src/main/resources/assets/betterend/models/block/neon_cactus_big_moss.json index 2315eced..d8c3232a 100644 --- a/src/main/resources/assets/betterend/models/block/neon_cactus_big_moss.json +++ b/src/main/resources/assets/betterend/models/block/neon_cactus_big_moss.json @@ -1,34 +1,58 @@ -{ - "parent": "block/block", - "textures": { - "end": "betterend:block/neon_cactus_big_top", - "side": "betterend:block/neon_cactus_big_side_moss", - "overlay": "betterend:block/neon_cactus_big_side_moss_overlay", - "particle": "#side" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#end", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#end", "cullface": "up" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "north" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" } - } - }, - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "north" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "south" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "west" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "east" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/neon_cactus_big_side", + "overlay": "betterend:block/neon_cactus_big_side_moss_overlay", + "side": "betterend:block/neon_cactus_big_side_moss", + "top": "betterend:block/neon_cactus_medium_top" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 2, -2, 2 ], + "to": [ 14, 14, 14 ], + "shade": false, + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, + "north": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, + "south": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, + "west": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, + "east": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" } + } + }, + { + "__comment": "Box1", + "from": [ 2, -2, 2 ], + "to": [ 14, 14, 14 ], + "faces": { + "north": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" }, + "south": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" }, + "west": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" }, + "east": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 0, -2, 0 ], + "to": [ 0.001, 14, 22.5 ], + "rotation": { "origin": [ 0, -2, 0 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 16, -2, 0 ], + "to": [ 16.001, 14, 22.5 ], + "rotation": { "origin": [ 16, -2, 0 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/neon_cactus_big_sand.json b/src/main/resources/assets/betterend/models/block/neon_cactus_big_sand.json index be4e3c1c..addf607a 100644 --- a/src/main/resources/assets/betterend/models/block/neon_cactus_big_sand.json +++ b/src/main/resources/assets/betterend/models/block/neon_cactus_big_sand.json @@ -1,34 +1,58 @@ -{ - "parent": "block/block", - "textures": { - "end": "betterend:block/neon_cactus_big_top", - "side": "betterend:block/neon_cactus_big_side_dust", - "overlay": "betterend:block/neon_cactus_big_side_dust_overlay", - "particle": "#side" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "shade": false, - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#end", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#end", "cullface": "up" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "north" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" } - } - }, - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "north" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "south" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "west" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "east" } - } - } - ] +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/neon_cactus_big_side", + "overlay": "betterend:block/neon_cactus_big_side_dust_overlay", + "side": "betterend:block/neon_cactus_big_side_dust", + "top": "betterend:block/neon_cactus_medium_top" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 2, -2, 2 ], + "to": [ 14, 14, 14 ], + "shade": false, + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, + "north": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, + "south": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, + "west": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, + "east": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" } + } + }, + { + "__comment": "Box1", + "from": [ 2, -2, 2 ], + "to": [ 14, 14, 14 ], + "faces": { + "north": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" }, + "south": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" }, + "west": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" }, + "east": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 0, -2, 0 ], + "to": [ 0.001, 14, 22.5 ], + "rotation": { "origin": [ 0, -2, 0 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" } + } + }, + { + "__comment": "PlaneX2", + "from": [ 16, -2, 0 ], + "to": [ 16.001, 14, 22.5 ], + "rotation": { "origin": [ 16, -2, 0 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/neon_cactus_medium.json b/src/main/resources/assets/betterend/models/block/neon_cactus_medium.json index 56c8107c..b8f84530 100644 --- a/src/main/resources/assets/betterend/models/block/neon_cactus_medium.json +++ b/src/main/resources/assets/betterend/models/block/neon_cactus_medium.json @@ -8,23 +8,23 @@ "elements": [ { "__comment": "Box1", - "from": [ 2, -2, 2 ], - "to": [ 14, 14, 14 ], + "from": [ 3, -3, 3 ], + "to": [ 13, 13, 13 ], "shade": false, "faces": { - "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, - "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, - "north": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, - "south": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, - "west": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, - "east": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" } + "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" }, + "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" }, + "north": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" }, + "south": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" }, + "west": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" }, + "east": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" } } }, { "__comment": "PlaneX2", - "from": [ 0, -2, 0 ], - "to": [ 0.001, 14, 22.5 ], - "rotation": { "origin": [ 0, -2, 0 ], "axis": "y", "angle": 45 }, + "from": [ 0, -3, 0 ], + "to": [ 0.001, 13, 22.5 ], + "rotation": { "origin": [ 0, -3, 0 ], "axis": "y", "angle": 45 }, "shade": false, "faces": { "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, @@ -33,9 +33,9 @@ }, { "__comment": "PlaneX2", - "from": [ 16, -2, 0 ], - "to": [ 16.001, 14, 22.5 ], - "rotation": { "origin": [ 16, -2, 0 ], "axis": "y", "angle": -45 }, + "from": [ 16, -3, 0 ], + "to": [ 16.001, 13, 22.5 ], + "rotation": { "origin": [ 16, -3, 0 ], "axis": "y", "angle": -45 }, "shade": false, "faces": { "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, diff --git a/src/main/resources/assets/betterend/models/block/neon_cactus_medium_moss.json b/src/main/resources/assets/betterend/models/block/neon_cactus_medium_moss.json deleted file mode 100644 index b939193c..00000000 --- a/src/main/resources/assets/betterend/models/block/neon_cactus_medium_moss.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "textures": { - "particle": "betterend:block/neon_cactus_small_side", - "overlay": "betterend:block/neon_cactus_medium_side_moss_overlay", - "side": "betterend:block/neon_cactus_medium_side_moss", - "top": "betterend:block/neon_cactus_medium_top" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 2, -2, 2 ], - "to": [ 14, 14, 14 ], - "shade": false, - "faces": { - "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, - "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, - "north": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, - "south": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, - "west": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, - "east": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" } - } - }, - { - "__comment": "Box1", - "from": [ 2, -2, 2 ], - "to": [ 14, 14, 14 ], - "faces": { - "north": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" }, - "south": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" }, - "west": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" }, - "east": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" } - } - }, - { - "__comment": "PlaneX2", - "from": [ 0, -2, 0 ], - "to": [ 0.001, 14, 22.5 ], - "rotation": { "origin": [ 0, -2, 0 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" } - } - }, - { - "__comment": "PlaneX2", - "from": [ 16, -2, 0 ], - "to": [ 16.001, 14, 22.5 ], - "rotation": { "origin": [ 16, -2, 0 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/neon_cactus_medium_sand.json b/src/main/resources/assets/betterend/models/block/neon_cactus_medium_sand.json index 7fe12992..807dbf17 100644 --- a/src/main/resources/assets/betterend/models/block/neon_cactus_medium_sand.json +++ b/src/main/resources/assets/betterend/models/block/neon_cactus_medium_sand.json @@ -1,42 +1,42 @@ { "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", "textures": { - "particle": "betterend:block/neon_cactus_small_side", - "overlay": "betterend:block/neon_cactus_medium_side_dust_overlay", - "side": "betterend:block/neon_cactus_medium_side_dust", + "particle": "betterend:block/neon_cactus_small_side_moss", + "overlay": "betterend:block/neon_cactus_small_side_dust_overlay", + "side": "betterend:block/neon_cactus_medium_side", "top": "betterend:block/neon_cactus_medium_top" }, "elements": [ { "__comment": "Box1", - "from": [ 2, -2, 2 ], - "to": [ 14, 14, 14 ], + "from": [ 3, -3, 3 ], + "to": [ 13, 13, 13 ], "shade": false, "faces": { - "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, - "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, - "north": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, - "south": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, - "west": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, - "east": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" } + "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" }, + "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" }, + "north": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" }, + "south": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" }, + "west": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" }, + "east": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" } } }, { "__comment": "Box1", - "from": [ 2, -2, 2 ], - "to": [ 14, 14, 14 ], + "from": [ 3, -3, 3 ], + "to": [ 13, 13, 13 ], "faces": { - "north": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" }, - "south": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" }, - "west": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" }, - "east": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" } + "north": { "uv": [ 3, 0, 13, 16 ], "texture": "#overlay" }, + "south": { "uv": [ 3, 0, 13, 16 ], "texture": "#overlay" }, + "west": { "uv": [ 3, 0, 13, 16 ], "texture": "#overlay" }, + "east": { "uv": [ 3, 0, 13, 16 ], "texture": "#overlay" } } }, { "__comment": "PlaneX2", - "from": [ 0, -2, 0 ], - "to": [ 0.001, 14, 22.5 ], - "rotation": { "origin": [ 0, -2, 0 ], "axis": "y", "angle": 45 }, + "from": [ 0, -3, 0 ], + "to": [ 0.001, 13, 22.5 ], + "rotation": { "origin": [ 0, -3, 0 ], "axis": "y", "angle": 45 }, "shade": false, "faces": { "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, @@ -45,9 +45,9 @@ }, { "__comment": "PlaneX2", - "from": [ 16, -2, 0 ], - "to": [ 16.001, 14, 22.5 ], - "rotation": { "origin": [ 16, -2, 0 ], "axis": "y", "angle": -45 }, + "from": [ 16, -3, 0 ], + "to": [ 16.001, 13, 22.5 ], + "rotation": { "origin": [ 16, -3, 0 ], "axis": "y", "angle": -45 }, "shade": false, "faces": { "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, diff --git a/src/main/resources/assets/betterend/models/block/neon_cactus_small_moss.json b/src/main/resources/assets/betterend/models/block/neon_cactus_small_moss.json index a5125f93..19596490 100644 --- a/src/main/resources/assets/betterend/models/block/neon_cactus_small_moss.json +++ b/src/main/resources/assets/betterend/models/block/neon_cactus_small_moss.json @@ -1,42 +1,42 @@ { "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "parent": "block/block", "textures": { - "particle": "betterend:block/neon_cactus_small_side", + "particle": "betterend:block/neon_cactus_small_side_moss", "overlay": "betterend:block/neon_cactus_small_side_moss_overlay", - "side": "betterend:block/neon_cactus_small_side", - "top": "betterend:block/neon_cactus_small_top" + "side": "betterend:block/neon_cactus_medium_side", + "top": "betterend:block/neon_cactus_medium_top" }, "elements": [ { "__comment": "Box1", - "from": [ 4, -4, 4 ], - "to": [ 12, 12, 12 ], + "from": [ 3, -3, 3 ], + "to": [ 13, 13, 13 ], "shade": false, "faces": { - "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, - "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, - "north": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, - "south": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, - "west": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, - "east": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" } + "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" }, + "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" }, + "north": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" }, + "south": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" }, + "west": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" }, + "east": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" } } }, { - "from": [ 4, -4, 4 ], - "to": [ 12, 12, 12 ], + "__comment": "Box1", + "from": [ 3, -3, 3 ], + "to": [ 13, 13, 13 ], "faces": { - "north": { "uv": [ 4, 0, 12, 16 ], "texture": "#overlay" }, - "south": { "uv": [ 4, 0, 12, 16 ], "texture": "#overlay" }, - "west": { "uv": [ 4, 0, 12, 16 ], "texture": "#overlay" }, - "east": { "uv": [ 4, 0, 12, 16 ], "texture": "#overlay" } + "north": { "uv": [ 3, 0, 13, 16 ], "texture": "#overlay" }, + "south": { "uv": [ 3, 0, 13, 16 ], "texture": "#overlay" }, + "west": { "uv": [ 3, 0, 13, 16 ], "texture": "#overlay" }, + "east": { "uv": [ 3, 0, 13, 16 ], "texture": "#overlay" } } }, { "__comment": "PlaneX2", - "from": [ 0, -4, 0 ], - "to": [ 0.001, 12, 22.5 ], - "rotation": { "origin": [ 0, -4, 0 ], "axis": "y", "angle": 45 }, + "from": [ 0, -3, 0 ], + "to": [ 0.001, 13, 22.5 ], + "rotation": { "origin": [ 0, -3, 0 ], "axis": "y", "angle": 45 }, "shade": false, "faces": { "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, @@ -45,9 +45,9 @@ }, { "__comment": "PlaneX2", - "from": [ 16, -4, 0 ], - "to": [ 16.001, 12, 22.5 ], - "rotation": { "origin": [ 16, -4, 0 ], "axis": "y", "angle": -45 }, + "from": [ 16, -3, 0 ], + "to": [ 16.001, 13, 22.5 ], + "rotation": { "origin": [ 16, -3, 0 ], "axis": "y", "angle": -45 }, "shade": false, "faces": { "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, diff --git a/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side.png b/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side.png index 2c681c7d49e17f7e9fafe4b6493bfd72548bec66..1323e564aa84ca4dac0f946e533aacaf6ab357b8 100644 GIT binary patch delta 199 zcmV;&0671S0*?ZaIVECMYI0|Le0-aRlE9Cu$9lZUUDeCS$H&#x)#Kyi@$vD3Mr-Mj zUK@XbNkl^?^aD)61XsIZX!-yE002ovPDHLkV1n5R BUT6RS delta 198 zcmV;%06G7U0*(TZIVD|DeQacmc6q3OkjRLr&UCuaS=7UheZ`{A3y&1@#BFl%_olaUAj5@(fbuA|F3HU>Jcaj@(X78j|vV1 zbUOp(CVIL!hDc1c?Q;}jR^(u*pXnIWyyE}=+ylO?&7mgF-5mk5zy2!;c3LHL=G9rf z8Jt)4Iw)^0RsU){@7`L?yRK|TNq>c^EEnAJvJyVQ9mRUbH~uAmja%*POO9uDU*ec@ zxYK9$-$sU+Vb7TEc^_P*ApU)7-j$rz^`feCITZX7j=ROal2(^UpL=AnO!o1c>dz&9 bcGNINFK6|3TAOSMbRL7JtDnm{r-UW|Fkyxy literal 1834 zcmbVN3ry5z952KLX^OD6(5INZTj~Jj3!-HsK;kL$=H8GH~Whvw`J-*wy&L3Y=3N$8&x|keIF_d!BRB%2!sM%XpJbK5#=^<*4>8o?-NkY3*7+Voz$h zk~iL!GHdhFlZEl@q`faDS?Wtfc|z$Qaa-F?ewexRgSH*-TsVCraH_iZvk-HXK6>%> z&o73nTDQ4Nu!e&tTDtc&KSww8-s#?yeQu*TWy_g$L*L)na{F7pbJR?P-&Wt;IOjd# z(yNz;4&QWV`@F5o5AY(eqEQ!kyk5I9?@=6c>Xj!ryMm%n1# zwRvS%#~nNEZWwzgJ*Ao&JFF$6F>MKLMSeX#_iA`&O4G!~quc3sbI&HWbq4p;x4w3) zb@RRbSEeUdR9t=wNo`6+&i|ae=BZ|?Grj5FH{Zt)DWlh$(8j=@9ciBitM+$gwJ(cp zU0E~u(!vF^5O>d)9ad)HxDXp7Z{Ug(k*nT)w{CT;V}EQJ?>7H*<;lvp6N_tQaYk19 z!NTO++Ce|8^ZlN%yZz~xb_`!V=H;79){g249a)brm_IkJ*-o{c-!&*UZF<_a*{Nld zZ+GW7zUungOf7CXba-_l*%SUwJ5w2F25U~W@0yt2Te)LIkuRyB?%ehHn={rTT5a3f zg7PI*<7_DnaWO}}7(!MpDz8Ex?J71Xj#$TJ5i&+2w diff --git a/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_dust_overlay.png b/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_dust_overlay.png index ca8bb728f223e8d9fe3e578aec52753217820547..264be42897b131c4a4750fee9773c52fddf87e66 100644 GIT binary patch delta 147 zcmcb~yM%FqWIZzj1A~Sxe=v|@EDmyaVpw-h<|UBBAK(+>3ZxHgX+CkR@6yfLkKV6n zc=f{{D8yP4wx? literal 1753 zcmbVNPi)&%9Ckpf+Cfp-5Q;cZ&l3~>96vjDoLCE0mvkhkDODG#WnyA4?>#4`v7fQs zCMihmK#W!5#EAh14nty>4GHZu*w8>+Ktn}>3ox}H;J{&;U=k9O%5(mhu5_a!lH+Il zd*Ao{{`lwR$%!WicRsL_k`ln*>;D zOQlF-OE0z^N%+CoJPV_nkS)=Ex#bdRiuiQSLu728+1wjO;~F`Sz<_#XO6$EsP4+DF zxm;M7H2?6lnh9L8O?^ z3M}k|WnlwgsOxG*6R~PyQ8m?+2s5%Gnn_Isnw}y$)O-8$6wQUj4fl8Y98<(N{!xV$ z4d^<{gqf@WQPmk+MX#hqT|+3X5umDS+gQw zKlSI@H`NdJ@TtNbr~2`UH_ko!>4(346+flE7sop;tyTEzd@erx@pIRPKaZWf$9r)6 p*iu}2vu}Ce^ixYm`gXsv!dYh*ug8A9B!(ZK;@Cv~%z>jX{|%WKHU$6x diff --git a/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_moss.png b/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_moss.png index 3d9ea0d51a73dedbc682107c36c6cc251225d50f..e22c2e9aa54a93a79e11e13036d31dceb603bf2e 100644 GIT binary patch delta 212 zcmV;_04x8?0>lE4ITd16YI0|Le0-aRlE9Cu$9lZUUDeBxP9y{+qF_#ub|Zh5Nklg1!u{`Bu=~p2j+PNb1Q|N#YpQ^$r@-#4dV^g+%o+@!q8T9X z^_o+Mz>H{dRdn72)(#dKE!_p^0iz3MDv$IJyjOo)(goi4$^dga3|wv1e?ZLD7SsYi zmoj=1aQH2CMsP;jiPO@}pU5omjFX4^(t60By!?2iuXcoYj_-B+5d8vxBL+2L`3t!K O0000 delta 219 zcmV<103`p!0?PuBITc+|eQacmc6q3OkjRLr&UCuaS=7;yP9y}V@{-(~ixOoZDLh7#T0n4-d5QkCDjxw2 z(hYt@zFI-D$t?elCd6nO;}R2QC{(2Nhb}Rz;0~6GBsyl7>=YhZ@Ww?ALw|Y>I6y$nuUuUDqlKV5Jv-JcoJIf-$3HR&QrDo~4B5!^yFvk)`0|+U-_y>To V2@xw|87=?-002ovPDHLkV1i&rT^j%Z diff --git a/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_moss_overlay.png b/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_moss_overlay.png index 6415e7832d309b6336dfe34196b1c30833ad416c..e6ac60a105639beb82d14a025e3b0366d4b65fec 100644 GIT binary patch delta 136 zcmaFLyOVK(iYQ}okh>GZx^prw85kI(1AIbUf%HUQiHy@iSrI@cXGxG>FvEW+FlU;5 z1t@6l>Eak7G4*P9Bj*7F0j6A2+wb#t$X`-jr69BFOMU36ifo~&r+!QkS3Uao#+R2} h&gWZmp2eN>iBp=)@RePBzZ%d822WQ%mvv4FO#r=cHgy01 literal 1765 zcmbVNUx*t;7*8pRRt_sF)I(v}zTBak{g-UAOVevENlj{Vp1HtX9|UJ-CdqQyo$c=C z-=XL!NYx5fd=ei7A3RZus1M$WEeQ40ini$aR8YAGK@mB@Cm;0NB)49#*Lt|Hnc11& z{J!7!XTCf)J@w$ozR`WLSZt(J%vWICAHKKjh2JsZ_8AxsO&_loV0`qECz|ARySMb@ zOP`-w`Z`#-bmF_qtE;PPYisN4>l+&z_abw=<&Q5uBcFLiKl@I0<-=p2esb*lwWU8^ zz5?g(3Mx}GvA?f(&Mrw=}O`O zPLbr4D5XSM6(re^G(*+7;lqP9kJOAx{^-yad}a7X5V(dYb~>GSM~ySDF3P&Di;^NL ziU0_~?>PbL3XXqplOa!i>{)JLF^3Bok;z&?h6kks7i>48b^KwNAYft_xuP7GLYMkL zf+L*U@|u0)1dFsuZR!L*VC4wwHdw&?2D=V*w0)HU2yM9>+1OEwZAT{jpwI?4h5^|T z?N@s)6)V(dEf3Q|8)O~~y>X44M^V7MDr3#fL``o>=5o0(F==jW)^Z5z_~Tp7&^!ug zhF2s-7Nmrr$W=u#WZg(A_e-iFNdst^5v$hQ2Gy!^(ttF}sjHw+H3S9dKfweWHRjm} ze70;na*S0Ei5 zSeuj5Q&zd6e!_{473WHJU5LDL@%ZuMSFc`u{P^+5j~@m7&n^S1<0%R93ugF_0Gvkx z)PUj*o-U3d5>sQ(dkQfdaxgn|ALah@fB(ccPbLWmpH=wKa5U!f+RtJ<7W<9XWIg3+ za^3dejp=8`>YU6EjjP4y#N7ONT0vr=*M)@v4Nr46H){P&+@aXCnYGWO>3hS^v-Odo z%pcldh+TZo>Y<<7;e*^#Q4wh@*6=!Y-x`n~h)z4*} HQ$iB}Sl@Qk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/neon_cactus_big_top.png b/src/main/resources/assets/betterend/textures/block/neon_cactus_block_top.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/neon_cactus_big_top.png rename to src/main/resources/assets/betterend/textures/block/neon_cactus_block_top.png diff --git a/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side.png b/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side.png index 1323e564aa84ca4dac0f946e533aacaf6ab357b8..7fd0f467d4f47aad9bca05eff0b2fe89f1bf603d 100644 GIT binary patch delta 443 zcmV;s0Yv_f0?GrB8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00D$aL_t(IjeV25N&`U@ zhQG-Y43dRhY=RDGK*U-s)+ey=0jzBTY1ClnTUgj>si3x2HWogD0V@l$un3wgvr#l5 zS&J~^jJtTcnRENkH)jNvby~-1$)BfGUuLwqL{b*SzCcD(ynlx$lIVrFKj8fOROp-n zIkw;4agvMg6AJ6Ad7-lcy*cYZ_7>0Z$pGKuq;4eh2Kr^^`eC6)`+41K>tkkN+{Q;fBT>xY> zCH4j5x(ECNQA+7BP)f14<-U8`Y)~vOn6n1&FwpbqnR|@_mE?CiZ?0_onptKOE43-gsHO*u^e9JU*AnK1| l(~fj~_pN_3G8fj~{>h__4_?8>F76B*-tA;XeX!9tltbiZ^Y9GA-|~I21bL8N-(|@3^HLRfOTlf?;;6)^+8-2WJa&XL5bFYn*&Ma7R|yf(Ob^&2xi%{Da*D8II(5 u#WzUYUUs%9IcN4Y*0vdc>Z=?2zA*b7WC`D$nDGnf8U{~SKbLh*2~7YNhjByz diff --git a/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_dust.png b/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_dust.png index 0aba31b5d389db661e23d6d89648db07dbb8561d..a36b2e48aeb0cec93735c1a56622eb054ca38d2a 100644 GIT binary patch delta 555 zcmV+`0@VGl0=Wc`8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00Hw!L_t(IjeU|qYZE~j zhM#SWgtQB37J@++YcPmEz(Xt)PoAnbdrYJU3qdFr!Gj3>6&@-m3G`wW#NtU15Aozp z3`7EfnhhIEvRP)6ur?&?A?~n4t8<)rzxRE4zR`%Bovo)qLVr(^FjhFZaS3lp!__rR zdq%9*z_WkiIs;xFJlDdR1h*d6;Co|)5LlK4fVU*ulF*ZiRvLt2*BJot`k=;#(FvwKLmviAj2PSHb)}(c znwm5y6bhOULVu|o?@wj=*0mhb_d=m?8e;SkU}D5@bxkH(mWA()WlO~%3ej~2Oolz; z{i$T|=KC)`er_p)XF?1KKY8{L0Mnk~>KYRx_J4?`X(|ka5NzI@?>*%Ood0Su{XJ9~ zgy7Fb8EoDw2cdxwf>^D=;;@JRSL1tQ84xl%^%GO+Wq@^laMA49$i%e6^O-B7S|czIs=NOEW3Ma_|Ay;hd%drR`8t> zNkbkh!O>(PwHcAGmj83&;<21X<7L?EP?Z=D2X?Dr2=5dcb tQW+ih*d)Vgc1hUheZ`{A3y&1@#BFl%_olaUAj5@(fbuA|F3HU>Jcaj@(X78j|vV1 zbUOp(CVIL!hDc1c?Q;}jR^(u*pXnIWyyE}=+ylO?&7mgF-5mk5zy2!;c3LHL=G9rf z8Jt)4Iw)^0RsU){@7`L?yRK|TNq>c^EEnAJvJyVQ9mRUbH~uAmja%*POO9uDU*ec@ zxYK9$-$sU+Vb7TEc^_P*ApU)7-j$rz^`feCITZX7j=ROal2(^UpL=AnO!o1c>dz&9 bcGNINFK6|3TAOSMbRL7JtDnm{r-UW|HU@?% diff --git a/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_dust_overlay.png b/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_dust_overlay.png index 264be42897b131c4a4750fee9773c52fddf87e66..e00a6131307e8bda281446f18df1e4d4e377fdf3 100644 GIT binary patch delta 196 zcmV;#06YJr0o4JJ8Gi-<001BJ|6u?C00DDSM?wIu&K&6g0056kL_t(IjbmUK1*2eO zfCF2a|HIfPj`jUVmuDhm0EZAaUPDj}KvsBQOY{Fn?^pc)@$M^wgHJ8vrJJ+=|9JP6 zflHVdzm1RHulNr$2xiEMV}1W0yi8>?{2?f5K@(3U|?Wi5D?>KkQ0o6>jMBRWkyBHX^X4?00003ZxHgX+CkR@6yfLkKV6n zc=f{{D8yP4o-dP diff --git a/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_moss.png b/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_moss.png index e22c2e9aa54a93a79e11e13036d31dceb603bf2e..2887aae934744b9c291e5e2a48aa05fb79855563 100644 GIT binary patch delta 555 zcmV+`0@VG)0=Wc`8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00Hw!L_t(IjeU|qYZE~n z#edrn*_13MO%AJOz!gM#5WIL;ZyvlAgqD5)dkGXvK?D!t$?xFN4`2mP;vt9iP=X-n zp@tL>T`&W?;-|HNiQ~y!W3szc(70^`!ZHu74Zr=(X!y+-)!@Yea^I z@MaW_PZ@YWh|WV^AHC8N&l)S%;r>?6TO3BaJ7rbRc_bJ}!3B96{O0NxxO^Zxe*!kb|X=ft%Fhx=Q( zghB`{9bntGrhk;mMK1QI>Fv#1H^`pbw!I87y9p523PgsM-YBJHG8m;Pa|5yvqw|n> z7*Om_QwDFp{iOBrEN5H^F(Lfy#bW@3HzP7M;#%SV5QPvq21+UR?k#%%rEPHOvt;^b z$Omyb)g<6^43hUX-S0>#`Es=mfzPLhcZi1plPJVL*ndGOl`>oUiT=S3)J7@-Rj*J&?O{o6tUQ5Pm9y_7SLrHl1wkLaXJ<@V<477~bhStkras`V-p t>Eg8UheZ`{A3y&1@uN&)l4fbKW@EGA#3`2R);R9k;&o`R*R`vvixT{R z`bA2D{DK+&V}e}|lUFh@)H6);ba4!km}=V>Sa#TegC$Y0t4ZkLp}+5=HvB$yzi*nL z3yY-H^Xyd(E0-U5x2CE&*5Qm4&w@pg3h%$p3T{8plTjF2a*yR2pO~cXUDg+ji@DRZ z`oHk+39pa7#Cq@hDTZQeo|xRL^$usQid|u{pKeqoRPaN$)UCknR_EnQXXopl_|P-C u{r9D+6Z7}{saUeUtfjo~ed!;8zf29vY^I4nxpxBnz~JfX=d#Wzp$PzDxRf~n diff --git a/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_moss_overlay.png b/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_moss_overlay.png index e6ac60a105639beb82d14a025e3b0366d4b65fec..1a10d5eb2d82216f701eac1ab5a2510732e8191d 100644 GIT binary patch delta 276 zcmV+v0qg#`0i*(u8Gi-<001BJ|6u?C00DDSM?wIu&K&6g007=eL_t(IjqQ*L6|FYj{oOfu*Jy%iiutV>{yGM05Mjh*o zM55J(wosQl5Q!uZfd}szP5QpTZfnA)?4&PW@E|a~A&Mi0M$;CGV46bTA;Ji|tr3az a1bb9~VW;z3P7V720000@2^0LeMd~43LxN|;nN|PDBvWxFm1De6$ M>FVdQ&MBb@0I)qlcmMzZ