From e6cafec945f8554a5dc4fdc4f9f6431248558dcd Mon Sep 17 00:00:00 2001 From: Aleksey Date: Thu, 29 Oct 2020 12:11:01 +0300 Subject: [PATCH] Pedestal model change --- .../betterend/blocks/basis/BlockPedestal.java | 23 +++++++++++-------- .../betterend/models/block/pedestal_top.json | 22 +++++++++--------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/basis/BlockPedestal.java b/src/main/java/ru/betterend/blocks/basis/BlockPedestal.java index 98d0d97b..42d05042 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockPedestal.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockPedestal.java @@ -37,9 +37,9 @@ public class BlockPedestal extends BlockBaseNotFull implements BlockEntityProvid public final static EnumProperty STATE = BlockProperties.PEDESTAL_STATE; 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_COLUMN; + private static final VoxelShape SHAPE_PILLAR; private static final VoxelShape SHAPE_PEDESTAL_TOP; private static final VoxelShape SHAPE_COLUMN_TOP; private static final VoxelShape SHAPE_BOTTOM; @@ -261,14 +261,19 @@ public class BlockPedestal extends BlockBaseNotFull implements BlockEntityProvid } static { - VoxelShape basin = Block.createCuboidShape(0, 0, 0, 16, 4, 16); - VoxelShape pedestal_top = Block.createCuboidShape(1, 12, 1, 15, 14, 15); - VoxelShape column_top = Block.createCuboidShape(1, 14, 1, 15, 16, 15); - VoxelShape pillar = Block.createCuboidShape(3, 0, 3, 13, 14, 13); - SHAPE_DEFAULT = VoxelShapes.union(basin, pillar, pedestal_top); - SHAPE_PEDESTAL_TOP = VoxelShapes.union(pillar, pedestal_top); - SHAPE_COLUMN_TOP = VoxelShapes.union(SHAPE_PILLAR, column_top); - SHAPE_COLUMN = VoxelShapes.union(basin, SHAPE_PILLAR, column_top); + VoxelShape basinUp = Block.createCuboidShape(2, 3, 2, 14, 4, 14); + VoxelShape basinDown = Block.createCuboidShape(0, 0, 0, 16, 3, 16); + VoxelShape basin = VoxelShapes.union(basinDown, basinUp); + VoxelShape columnTop = Block.createCuboidShape(1, 14, 1, 15, 16, 15); + VoxelShape pedestalTop = Block.createCuboidShape(1, 8, 1, 15, 10, 15); + VoxelShape pedestalDefault = Block.createCuboidShape(1, 12, 1, 15, 14, 15); + VoxelShape pillar = Block.createCuboidShape(3, 0, 3, 13, 8, 13); + 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); } } diff --git a/src/main/resources/assets/betterend/models/block/pedestal_top.json b/src/main/resources/assets/betterend/models/block/pedestal_top.json index aedf1f75..5a5343aa 100644 --- a/src/main/resources/assets/betterend/models/block/pedestal_top.json +++ b/src/main/resources/assets/betterend/models/block/pedestal_top.json @@ -7,25 +7,25 @@ { "__comment": "pillar", "from": [ 3, 0, 3 ], - "to": [ 13, 12, 13 ], + "to": [ 13, 8, 13 ], "faces": { - "north": { "uv": [ 3, 0, 13, 12 ], "texture": "#pillar" }, - "south": { "uv": [ 3, 0, 13, 12 ], "texture": "#pillar" }, - "west": { "uv": [ 3, 0, 13, 12 ], "texture": "#pillar" }, - "east": { "uv": [ 3, 0, 13, 12 ], "texture": "#pillar" } + "north": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" }, + "south": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" }, + "west": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" }, + "east": { "uv": [ 3, 0, 13, 8 ], "texture": "#pillar" } } }, { "__comment": "top", - "from": [ 1, 12, 1 ], - "to": [ 15, 14, 15 ], + "from": [ 1, 8, 1 ], + "to": [ 15, 10, 15 ], "faces": { "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#base" }, "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" }, - "north": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }, - "south": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }, - "west": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" }, - "east": { "uv": [ 1, 12, 15, 14 ], "texture": "#base" } + "north": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" }, + "south": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" }, + "west": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" }, + "east": { "uv": [ 1, 8, 15, 10 ], "texture": "#base" } } } ]