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

Pedestal model change

Browse source
This commit is contained in:
Aleksey 2020-10-29 12:11:01 +03:00
parent ba4f126786
commit e6cafec945
2 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/ru/betterend/blocks/basis/BlockPedestal.java
View file

@ -37,9 +37,9 @@ public class BlockPedestal extends BlockBaseNotFull implements BlockEntityProvid
public final static EnumProperty<PedestalState> STATE = BlockProperties.PEDESTAL_STATE; public final static EnumProperty<PedestalState> STATE = BlockProperties.PEDESTAL_STATE;
public static final BooleanProperty HAS_ITEM = BlockProperties.HAS_ITEM; public static final BooleanProperty HAS_ITEM = BlockProperties.HAS_ITEM;
private static final VoxelShape SHAPE_PILLAR = Block.createCuboidShape(3, 0, 3, 13, 16, 13);
private static final VoxelShape SHAPE_DEFAULT; private static final VoxelShape SHAPE_DEFAULT;
private static final VoxelShape SHAPE_COLUMN; private static final VoxelShape SHAPE_COLUMN;
private static final VoxelShape SHAPE_PILLAR;
private static final VoxelShape SHAPE_PEDESTAL_TOP; private static final VoxelShape SHAPE_PEDESTAL_TOP;
private static final VoxelShape SHAPE_COLUMN_TOP; private static final VoxelShape SHAPE_COLUMN_TOP;
private static final VoxelShape SHAPE_BOTTOM; private static final VoxelShape SHAPE_BOTTOM;
@ -261,14 +261,19 @@ public class BlockPedestal extends BlockBaseNotFull implements BlockEntityProvid
} }
static { static {
VoxelShape basin = Block.createCuboidShape(0, 0, 0, 16, 4, 16); VoxelShape basinUp = Block.createCuboidShape(2, 3, 2, 14, 4, 14);
VoxelShape pedestal_top = Block.createCuboidShape(1, 12, 1, 15, 14, 15); VoxelShape basinDown = Block.createCuboidShape(0, 0, 0, 16, 3, 16);
VoxelShape column_top = Block.createCuboidShape(1, 14, 1, 15, 16, 15); VoxelShape basin = VoxelShapes.union(basinDown, basinUp);
VoxelShape pillar = Block.createCuboidShape(3, 0, 3, 13, 14, 13); VoxelShape columnTop = Block.createCuboidShape(1, 14, 1, 15, 16, 15);
SHAPE_DEFAULT = VoxelShapes.union(basin, pillar, pedestal_top); VoxelShape pedestalTop = Block.createCuboidShape(1, 8, 1, 15, 10, 15);
SHAPE_PEDESTAL_TOP = VoxelShapes.union(pillar, pedestal_top); VoxelShape pedestalDefault = Block.createCuboidShape(1, 12, 1, 15, 14, 15);
SHAPE_COLUMN_TOP = VoxelShapes.union(SHAPE_PILLAR, column_top); VoxelShape pillar = Block.createCuboidShape(3, 0, 3, 13, 8, 13);
SHAPE_COLUMN = VoxelShapes.union(basin, SHAPE_PILLAR, column_top); VoxelShape pillarDefault = Block.createCuboidShape(3, 0, 3, 13, 12, 13);
SHAPE_PILLAR = Block.createCuboidShape(3, 0, 3, 13, 16, 13);
SHAPE_DEFAULT = VoxelShapes.union(basin, pillarDefault, pedestalDefault);
SHAPE_PEDESTAL_TOP = VoxelShapes.union(pillar, pedestalTop);
SHAPE_COLUMN_TOP = VoxelShapes.union(SHAPE_PILLAR, columnTop);
SHAPE_COLUMN = VoxelShapes.union(basin, SHAPE_PILLAR, columnTop);
SHAPE_BOTTOM = VoxelShapes.union(basin, SHAPE_PILLAR); SHAPE_BOTTOM = VoxelShapes.union(basin, SHAPE_PILLAR);
} }
} }

22
src/main/resources/assets/betterend/models/block/pedestal_top.json
View file

@ -7,25 +7,25 @@
{ {
"__comment": "pillar", "__comment": "pillar",
"from": [ 3, 0, 3 ], "from": [ 3, 0, 3 ],
"to": [ 13, 12, 13 ], "to": [ 13, 8, 13 ],
"faces": { "faces": {
"north": { "uv": [ 3, 0, 13, 12 ], "texture": "#pillar" }, "north": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" },
"south": { "uv": [ 3, 0, 13, 12 ], "texture": "#pillar" }, "south": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" },
"west": { "uv": [ 3, 0, 13, 12 ], "texture": "#pillar" }, "west": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" },
"east": { "uv": [ 3, 0, 13, 12 ], "texture": "#pillar" } "east": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" }
} }
}, },
{ {
"__comment": "top", "__comment": "top",
"from": [ 1, 12, 1 ], "from": [ 1, 8, 1 ],
"to": [ 15, 14, 15 ], "to": [ 15, 10, 15 ],
"faces": { "faces": {
"down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" },
"up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" }, "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" },
"north": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }, "north": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" },
"south": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }, "south": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" },
"west": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }, "west": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" },
"east": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" } "east": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" }
} }
} }
] ]