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 2c681c7d..1323e564 100644 Binary files a/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side.png and b/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_dust.png b/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_dust.png index 31a97598..0aba31b5 100644 Binary files a/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_dust.png and b/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_dust.png differ 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 ca8bb728..264be428 100644 Binary files a/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_dust_overlay.png and b/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_dust_overlay.png differ 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 3d9ea0d5..e22c2e9a 100644 Binary files a/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_moss.png and b/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_moss.png differ 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 6415e783..e6ac60a1 100644 Binary files a/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_moss_overlay.png and b/src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_moss_overlay.png differ diff --git a/src/main/resources/assets/betterend/textures/block/neon_cactus_block_side.png b/src/main/resources/assets/betterend/textures/block/neon_cactus_block_side.png new file mode 100644 index 00000000..2c681c7d Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/neon_cactus_block_side.png differ 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 1323e564..7fd0f467 100644 Binary files a/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side.png and b/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side.png differ 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 0aba31b5..a36b2e48 100644 Binary files a/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_dust.png and b/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_dust.png differ 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 264be428..e00a6131 100644 Binary files a/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_dust_overlay.png and b/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_dust_overlay.png differ 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 e22c2e9a..2887aae9 100644 Binary files a/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_moss.png and b/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_moss.png differ 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 e6ac60a1..1a10d5eb 100644 Binary files a/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_moss_overlay.png and b/src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_moss_overlay.png differ