From 8529cd2ae9db91d83b42fc234cd783cdda3c0972 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 16 Mar 2017 19:57:34 -0500 Subject: [PATCH] Mod flowers bounding boxes now match their shift, like vanilla flowers --- .../java/vazkii/botania/common/block/BlockModFlower.java | 2 +- .../vazkii/botania/common/block/BlockSpecialFlower.java | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 3f1e0d6ea..b73985ee7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -82,7 +82,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos) { - return AABB; + return AABB.move(state.getOffset(world, pos)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index bee546184..ecc71b8b5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -136,7 +136,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos) { - return AABB; + return AABB.move(state.getOffset(world, pos)); } @Nonnull @@ -205,13 +205,6 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I return true; } - @SideOnly(Side.CLIENT) - @Nonnull - @Override - public BlockRenderLayer getBlockLayer() { - return BlockRenderLayer.CUTOUT; - } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull NonNullList stacks) {