From 8cf49dc1c008ab5f1c35dfe201c03f6b1cc0110b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 3 May 2017 14:29:10 -0500 Subject: [PATCH] Reenable shifts on double plants as it works again for forge 2292+ --- .../vazkii/botania/common/block/BlockModDoubleFlower.java | 8 -------- .../botania/common/block/decor/BlockBuriedPetals.java | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index c9dc35373..b8f5b9eba 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -180,14 +180,6 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I stacks.add(new ItemStack(item, 1, i)); } - @Nonnull - @Override - @SideOnly(Side.CLIENT) - public Block.EnumOffsetType getOffsetType() - { - return Block.EnumOffsetType.NONE; - } - @Override @SideOnly(Side.CLIENT) public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index fdda51979..64d9b08a3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -14,6 +14,7 @@ import java.util.Random; import javax.annotation.Nonnull; +import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.item.EnumDyeColor; @@ -41,6 +42,13 @@ public class BlockBuriedPetals extends BlockModFlower { setLightLevel(0.25F); } + @Nonnull + @Override + @SideOnly(Side.CLIENT) + public Block.EnumOffsetType getOffsetType() { + return Block.EnumOffsetType.NONE; + } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos) {