MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cactus enhancements

Browse source
This commit is contained in:
paulevsGitch 2021-04-27 14:40:09 +03:00
parent b743aa62a2
commit 56d10bfcda
20 changed files with 269 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/main/java/ru/betterend/blocks/NeonCactusBlock.java
View file

@ -14,6 +14,7 @@ import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.LevelAccessor; 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.Block;
import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.Mirror; 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.FluidState;
import net.minecraft.world.level.material.Fluids; import net.minecraft.world.level.material.Fluids;
import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraft.world.phys.shapes.VoxelShape;
import ru.betterend.blocks.BlockProperties.CactusBottom; import ru.betterend.blocks.BlockProperties.CactusBottom;
import ru.betterend.blocks.BlockProperties.TripleShape; 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 BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
public static final DirectionProperty FACING = BlockStateProperties.FACING; public static final DirectionProperty FACING = BlockStateProperties.FACING;
private static final EnumMap<Direction, VoxelShape> BIG_SHAPES_OPEN = Maps.newEnumMap(Direction.class);
private static final EnumMap<Direction, VoxelShape> MEDIUM_SHAPES_OPEN = Maps.newEnumMap(Direction.class); private static final EnumMap<Direction, VoxelShape> MEDIUM_SHAPES_OPEN = Maps.newEnumMap(Direction.class);
private static final EnumMap<Direction, VoxelShape> SMALL_SHAPES_OPEN = Maps.newEnumMap(Direction.class); private static final EnumMap<Direction, VoxelShape> SMALL_SHAPES_OPEN = Maps.newEnumMap(Direction.class);
private static final EnumMap<Axis, VoxelShape> BIG_SHAPES = Maps.newEnumMap(Axis.class);
private static final EnumMap<Axis, VoxelShape> MEDIUM_SHAPES = Maps.newEnumMap(Axis.class); private static final EnumMap<Axis, VoxelShape> MEDIUM_SHAPES = Maps.newEnumMap(Axis.class);
private static final EnumMap<Axis, VoxelShape> SMALL_SHAPES = Maps.newEnumMap(Axis.class); private static final EnumMap<Axis, VoxelShape> SMALL_SHAPES = Maps.newEnumMap(Axis.class);
private static final int MAX_LENGTH = 10; private static final int MAX_LENGTH = 12;
public NeonCactusBlock() { public NeonCactusBlock() {
super(FabricBlockSettings.copyOf(Blocks.CACTUS).luminance(15).randomTicks()); 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)); world.getLiquidTicks().scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world));
} }
Direction dir = state.getValue(FACING); Direction dir = state.getValue(FACING);
BlockState down = world.getBlockState(pos.relative(dir.getOpposite())); if (!canSurvive(state, world, pos)) {
if (down.is(Blocks.END_STONE) || down.is(EndBlocks.ENDSTONE_DUST)) { 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); 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); state = state.setValue(CACTUS_BOTTOM, CactusBottom.MOSS);
} }
else { else {
@ -122,24 +127,38 @@ public class NeonCactusBlock extends BlockBaseNotFull implements SimpleWaterlogg
@Override @Override
public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) { public VoxelShape getShape(BlockState state, BlockGetter view, BlockPos pos, CollisionContext ePos) {
TripleShape shape = state.getValue(SHAPE); TripleShape shape = state.getValue(SHAPE);
if (shape == TripleShape.BOTTOM) {
return Shapes.block();
}
Direction dir = state.getValue(FACING); Direction dir = state.getValue(FACING);
BlockState next = view.getBlockState(pos.relative(dir)); BlockState next = view.getBlockState(pos.relative(dir));
if (next.is(this)) { if (next.is(this)) {
Axis axis = dir.getAxis(); 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); return shape == TripleShape.MIDDLE ? MEDIUM_SHAPES.get(axis) : SMALL_SHAPES.get(axis);
} }
else { 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); 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 @Override
public void randomTick(BlockState state, ServerLevel world, BlockPos pos, Random random) { public void randomTick(BlockState state, ServerLevel world, BlockPos pos, Random random) {
Direction dir = state.getValue(FACING); Direction dir = state.getValue(FACING);
if (!this.canSurvive(state, world, pos)) {
this.destroy(world, pos, state);
return;
}
if (!world.isEmptyBlock(pos.relative(dir))) { if (!world.isEmptyBlock(pos.relative(dir))) {
return; return;
} }
@ -227,20 +246,31 @@ public class NeonCactusBlock extends BlockBaseNotFull implements SimpleWaterlogg
} }
static { static {
MEDIUM_SHAPES.put(Axis.X, Block.box(0, 2, 2, 16, 14, 14)); BIG_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)); BIG_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.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.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.Y, Block.box(4, 0, 4, 12, 16, 12));
SMALL_SHAPES.put(Axis.Z, Block.box(4, 4, 0, 12, 12, 16)); 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)); BIG_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)); BIG_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)); BIG_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)); BIG_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)); BIG_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.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.UP, Block.box(4, 0, 4, 12, 12, 12));
SMALL_SHAPES_OPEN.put(Direction.DOWN, Block.box(4, 4, 4, 12, 16, 12)); SMALL_SHAPES_OPEN.put(Direction.DOWN, Block.box(4, 4, 4, 12, 16, 12));

53
src/main/resources/assets/betterend/models/block/neon_cactus_big.json
View file

@ -1,7 +1,46 @@
{ {
"parent": "betterend:block/column_noshade", "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
"textures": { "textures": {
"end": "betterend:block/neon_cactus_big_top", "particle": "betterend:block/neon_cactus_big_side",
"side": "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" }
}
}
]
}

90
src/main/resources/assets/betterend/models/block/neon_cactus_big_moss.json
View file

@ -1,34 +1,58 @@
{ {
"parent": "block/block", "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
"textures": { "textures": {
"end": "betterend:block/neon_cactus_big_top", "particle": "betterend:block/neon_cactus_big_side",
"side": "betterend:block/neon_cactus_big_side_moss", "overlay": "betterend:block/neon_cactus_big_side_moss_overlay",
"overlay": "betterend:block/neon_cactus_big_side_moss_overlay", "side": "betterend:block/neon_cactus_big_side_moss",
"particle": "#side" "top": "betterend:block/neon_cactus_medium_top"
}, },
"elements": [ "elements": [
{ {
"from": [ 0, 0, 0 ], "__comment": "Box1",
"to": [ 16, 16, 16 ], "from": [ 2, -2, 2 ],
"shade": false, "to": [ 14, 14, 14 ],
"faces": { "shade": false,
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#end", "cullface": "down" }, "faces": {
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#end", "cullface": "up" }, "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" },
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "north" }, "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south" }, "north": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" },
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" }, "south": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" } "west": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" },
} "east": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }
}, }
{ },
"from": [ 0, 0, 0 ], {
"to": [ 16, 16, 16 ], "__comment": "Box1",
"faces": { "from": [ 2, -2, 2 ],
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "north" }, "to": [ 14, 14, 14 ],
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "south" }, "faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "west" }, "north": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "east" } "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" }
}
}
]
} }

90
src/main/resources/assets/betterend/models/block/neon_cactus_big_sand.json
View file

@ -1,34 +1,58 @@
{ {
"parent": "block/block", "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
"textures": { "textures": {
"end": "betterend:block/neon_cactus_big_top", "particle": "betterend:block/neon_cactus_big_side",
"side": "betterend:block/neon_cactus_big_side_dust", "overlay": "betterend:block/neon_cactus_big_side_dust_overlay",
"overlay": "betterend:block/neon_cactus_big_side_dust_overlay", "side": "betterend:block/neon_cactus_big_side_dust",
"particle": "#side" "top": "betterend:block/neon_cactus_medium_top"
}, },
"elements": [ "elements": [
{ {
"from": [ 0, 0, 0 ], "__comment": "Box1",
"to": [ 16, 16, 16 ], "from": [ 2, -2, 2 ],
"shade": false, "to": [ 14, 14, 14 ],
"faces": { "shade": false,
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#end", "cullface": "down" }, "faces": {
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#end", "cullface": "up" }, "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" },
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "north" }, "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south" }, "north": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" },
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" }, "south": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" } "west": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" },
} "east": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }
}, }
{ },
"from": [ 0, 0, 0 ], {
"to": [ 16, 16, 16 ], "__comment": "Box1",
"faces": { "from": [ 2, -2, 2 ],
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "north" }, "to": [ 14, 14, 14 ],
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "south" }, "faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "west" }, "north": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "east" } "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" }
}
}
]
} }

28
src/main/resources/assets/betterend/models/block/neon_cactus_medium.json
View file

@ -8,23 +8,23 @@
"elements": [ "elements": [
{ {
"__comment": "Box1", "__comment": "Box1",
"from": [ 2, -2, 2 ], "from": [ 3, -3, 3 ],
"to": [ 14, 14, 14 ], "to": [ 13, 13, 13 ],
"shade": false, "shade": false,
"faces": { "faces": {
"down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" },
"up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" },
"north": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, "north": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" },
"south": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, "south": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" },
"west": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, "west": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" },
"east": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" } "east": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" }
} }
}, },
{ {
"__comment": "PlaneX2", "__comment": "PlaneX2",
"from": [ 0, -2, 0 ], "from": [ 0, -3, 0 ],
"to": [ 0.001, 14, 22.5 ], "to": [ 0.001, 13, 22.5 ],
"rotation": { "origin": [ 0, -2, 0 ], "axis": "y", "angle": 45 }, "rotation": { "origin": [ 0, -3, 0 ], "axis": "y", "angle": 45 },
"shade": false, "shade": false,
"faces": { "faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" },
@ -33,9 +33,9 @@
}, },
{ {
"__comment": "PlaneX2", "__comment": "PlaneX2",
"from": [ 16, -2, 0 ], "from": [ 16, -3, 0 ],
"to": [ 16.001, 14, 22.5 ], "to": [ 16.001, 13, 22.5 ],
"rotation": { "origin": [ 16, -2, 0 ], "axis": "y", "angle": -45 }, "rotation": { "origin": [ 16, -3, 0 ], "axis": "y", "angle": -45 },
"shade": false, "shade": false,
"faces": { "faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" },

58
src/main/resources/assets/betterend/models/block/neon_cactus_medium_moss.json
View file

@ -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" }
}
}
]
}

46
src/main/resources/assets/betterend/models/block/neon_cactus_medium_sand.json
View file

@ -1,42 +1,42 @@
{ {
"__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
"textures": { "textures": {
"particle": "betterend:block/neon_cactus_small_side", "particle": "betterend:block/neon_cactus_small_side_moss",
"overlay": "betterend:block/neon_cactus_medium_side_dust_overlay", "overlay": "betterend:block/neon_cactus_small_side_dust_overlay",
"side": "betterend:block/neon_cactus_medium_side_dust", "side": "betterend:block/neon_cactus_medium_side",
"top": "betterend:block/neon_cactus_medium_top" "top": "betterend:block/neon_cactus_medium_top"
}, },
"elements": [ "elements": [
{ {
"__comment": "Box1", "__comment": "Box1",
"from": [ 2, -2, 2 ], "from": [ 3, -3, 3 ],
"to": [ 14, 14, 14 ], "to": [ 13, 13, 13 ],
"shade": false, "shade": false,
"faces": { "faces": {
"down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" },
"up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" },
"north": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, "north": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" },
"south": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, "south": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" },
"west": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" }, "west": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" },
"east": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" } "east": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" }
} }
}, },
{ {
"__comment": "Box1", "__comment": "Box1",
"from": [ 2, -2, 2 ], "from": [ 3, -3, 3 ],
"to": [ 14, 14, 14 ], "to": [ 13, 13, 13 ],
"faces": { "faces": {
"north": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" }, "north": { "uv": [ 3, 0, 13, 16 ], "texture": "#overlay" },
"south": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" }, "south": { "uv": [ 3, 0, 13, 16 ], "texture": "#overlay" },
"west": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" }, "west": { "uv": [ 3, 0, 13, 16 ], "texture": "#overlay" },
"east": { "uv": [ 2, 0, 14, 16 ], "texture": "#overlay" } "east": { "uv": [ 3, 0, 13, 16 ], "texture": "#overlay" }
} }
}, },
{ {
"__comment": "PlaneX2", "__comment": "PlaneX2",
"from": [ 0, -2, 0 ], "from": [ 0, -3, 0 ],
"to": [ 0.001, 14, 22.5 ], "to": [ 0.001, 13, 22.5 ],
"rotation": { "origin": [ 0, -2, 0 ], "axis": "y", "angle": 45 }, "rotation": { "origin": [ 0, -3, 0 ], "axis": "y", "angle": 45 },
"shade": false, "shade": false,
"faces": { "faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" },
@ -45,9 +45,9 @@
}, },
{ {
"__comment": "PlaneX2", "__comment": "PlaneX2",
"from": [ 16, -2, 0 ], "from": [ 16, -3, 0 ],
"to": [ 16.001, 14, 22.5 ], "to": [ 16.001, 13, 22.5 ],
"rotation": { "origin": [ 16, -2, 0 ], "axis": "y", "angle": -45 }, "rotation": { "origin": [ 16, -3, 0 ], "axis": "y", "angle": -45 },
"shade": false, "shade": false,
"faces": { "faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" },

48
src/main/resources/assets/betterend/models/block/neon_cactus_small_moss.json
View file

@ -1,42 +1,42 @@
{ {
"__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
"parent": "block/block",
"textures": { "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", "overlay": "betterend:block/neon_cactus_small_side_moss_overlay",
"side": "betterend:block/neon_cactus_small_side", "side": "betterend:block/neon_cactus_medium_side",
"top": "betterend:block/neon_cactus_small_top" "top": "betterend:block/neon_cactus_medium_top"
}, },
"elements": [ "elements": [
{ {
"__comment": "Box1", "__comment": "Box1",
"from": [ 4, -4, 4 ], "from": [ 3, -3, 3 ],
"to": [ 12, 12, 12 ], "to": [ 13, 13, 13 ],
"shade": false, "shade": false,
"faces": { "faces": {
"down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, "down": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" },
"up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, "up": { "uv": [ 3, 3, 13, 13 ], "texture": "#top" },
"north": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, "north": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" },
"south": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, "south": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" },
"west": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, "west": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" },
"east": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" } "east": { "uv": [ 3, 0, 13, 16 ], "texture": "#side" }
} }
}, },
{ {
"from": [ 4, -4, 4 ], "__comment": "Box1",
"to": [ 12, 12, 12 ], "from": [ 3, -3, 3 ],
"to": [ 13, 13, 13 ],
"faces": { "faces": {
"north": { "uv": [ 4, 0, 12, 16 ], "texture": "#overlay" }, "north": { "uv": [ 3, 0, 13, 16 ], "texture": "#overlay" },
"south": { "uv": [ 4, 0, 12, 16 ], "texture": "#overlay" }, "south": { "uv": [ 3, 0, 13, 16 ], "texture": "#overlay" },
"west": { "uv": [ 4, 0, 12, 16 ], "texture": "#overlay" }, "west": { "uv": [ 3, 0, 13, 16 ], "texture": "#overlay" },
"east": { "uv": [ 4, 0, 12, 16 ], "texture": "#overlay" } "east": { "uv": [ 3, 0, 13, 16 ], "texture": "#overlay" }
} }
}, },
{ {
"__comment": "PlaneX2", "__comment": "PlaneX2",
"from": [ 0, -4, 0 ], "from": [ 0, -3, 0 ],
"to": [ 0.001, 12, 22.5 ], "to": [ 0.001, 13, 22.5 ],
"rotation": { "origin": [ 0, -4, 0 ], "axis": "y", "angle": 45 }, "rotation": { "origin": [ 0, -3, 0 ], "axis": "y", "angle": 45 },
"shade": false, "shade": false,
"faces": { "faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" },
@ -45,9 +45,9 @@
}, },
{ {
"__comment": "PlaneX2", "__comment": "PlaneX2",
"from": [ 16, -4, 0 ], "from": [ 16, -3, 0 ],
"to": [ 16.001, 12, 22.5 ], "to": [ 16.001, 13, 22.5 ],
"rotation": { "origin": [ 16, -4, 0 ], "axis": "y", "angle": -45 }, "rotation": { "origin": [ 16, -3, 0 ], "axis": "y", "angle": -45 },
"shade": false, "shade": false,
"faces": { "faces": {
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" },

BIN
src/main/resources/assets/betterend/textures/block/neon_cactus_big_side.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 270 B

After

Width:  |  Height:  |  Size: 271 B

Before After
Before After

BIN
src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_dust.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 303 B

Before After
Before After

BIN
src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_dust_overlay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 164 B

Before After
Before After

BIN
src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_moss.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 331 B

After

Width:  |  Height:  |  Size: 324 B

Before After
Before After

BIN
src/main/resources/assets/betterend/textures/block/neon_cactus_big_side_moss_overlay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 185 B

Before After
Before After

BIN
src/main/resources/assets/betterend/textures/block/neon_cactus_block_side.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 270 B

0
src/main/resources/assets/betterend/textures/block/neon_cactus_big_top.png → src/main/resources/assets/betterend/textures/block/neon_cactus_block_top.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 519 B

After

Width:  |  Height:  |  Size: 519 B

Before After
Before After

BIN
src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 271 B

After

Width:  |  Height:  |  Size: 458 B

Before After
Before After

BIN
src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_dust.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 569 B

Before After
Before After

BIN
src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_dust_overlay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 164 B

After

Width:  |  Height:  |  Size: 213 B

Before After
Before After

BIN
src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_moss.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 324 B

After

Width:  |  Height:  |  Size: 569 B

Before After
Before After

BIN
src/main/resources/assets/betterend/textures/block/neon_cactus_medium_side_moss_overlay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 292 B

Before After
Before After