From 0b5e8daa81086bddbf8f9b4b5c8dd625b94416eb Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Thu, 22 Oct 2020 14:11:07 +0300 Subject: [PATCH] Stem fixes --- .../ru/betterend/blocks/BlockEndLotusStem.java | 15 +++++++++++++-- .../betterend/blockstates/end_lotus_stem.json | 6 +++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/BlockEndLotusStem.java b/src/main/java/ru/betterend/blocks/BlockEndLotusStem.java index 9e1f6f46..d57de4a2 100644 --- a/src/main/java/ru/betterend/blocks/BlockEndLotusStem.java +++ b/src/main/java/ru/betterend/blocks/BlockEndLotusStem.java @@ -1,5 +1,9 @@ package ru.betterend.blocks; +import java.util.Map; + +import com.google.common.collect.Maps; + import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -17,6 +21,7 @@ import net.minecraft.util.BlockMirror; import net.minecraft.util.BlockRotation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Direction.Axis; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.WorldAccess; @@ -29,7 +34,7 @@ public class BlockEndLotusStem extends BlockBase implements Waterloggable { public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; public static final BooleanProperty LEAF = BooleanProperty.of("leaf"); public static final EnumProperty SHAPE = BlockProperties.TRIPLE_SHAPE; - private static final VoxelShape VSHAPE = Block.createCuboidShape(6, 0, 6, 10, 16, 10); + private static final Map SHAPES = Maps.newEnumMap(Axis.class); public BlockEndLotusStem() { super(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS)); @@ -38,7 +43,7 @@ public class BlockEndLotusStem extends BlockBase implements Waterloggable { @Override public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ePos) { - return VSHAPE; + return SHAPES.get(state.get(FACING).getAxis()); } @Override @@ -75,4 +80,10 @@ public class BlockEndLotusStem extends BlockBase implements Waterloggable { } return state; } + + static { + SHAPES.put(Axis.X, Block.createCuboidShape(0, 6, 6, 16, 10, 10)); + SHAPES.put(Axis.Y, Block.createCuboidShape(6, 0, 6, 10, 16, 10)); + SHAPES.put(Axis.Z, Block.createCuboidShape(6, 6, 0, 10, 10, 16)); + } } diff --git a/src/main/resources/assets/betterend/blockstates/end_lotus_stem.json b/src/main/resources/assets/betterend/blockstates/end_lotus_stem.json index f970af2c..45193a34 100644 --- a/src/main/resources/assets/betterend/blockstates/end_lotus_stem.json +++ b/src/main/resources/assets/betterend/blockstates/end_lotus_stem.json @@ -15,9 +15,9 @@ "leaf=false,shape=bottom,facing=down": { "model": "betterend:block/end_lotus_roots" }, "leaf=false,shape=middle,facing=north": { "model": "betterend:block/end_lotus_stem", "x": 90 }, - "leaf=false,shape=middle,facing=south": { "model": "betterend:block/end_lotus_stem", "z": 90 }, - "leaf=false,shape=middle,facing=east": { "model": "betterend:block/end_lotus_stem", "x": 90 }, - "leaf=false,shape=middle,facing=west": { "model": "betterend:block/end_lotus_stem", "z": 90 }, + "leaf=false,shape=middle,facing=south": { "model": "betterend:block/end_lotus_stem", "x": 90 }, + "leaf=false,shape=middle,facing=east": { "model": "betterend:block/end_lotus_stem", "x": 90, "y": 90 }, + "leaf=false,shape=middle,facing=west": { "model": "betterend:block/end_lotus_stem", "x": 90, "y": 90 }, "leaf=false,shape=middle,facing=up": { "model": "betterend:block/end_lotus_stem" }, "leaf=false,shape=middle,facing=down": { "model": "betterend:block/end_lotus_stem" },