From ad8cf9de8ad76427c099c6893e6136de2928dbe3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 26 Jan 2016 12:18:23 -0600 Subject: [PATCH] Blockstate tweak in flowers, pick block fix for tall flowers --- .../botania/common/block/BlockModDoubleFlower.java | 9 +++++++++ .../java/vazkii/botania/common/block/BlockModFlower.java | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index a3d12724b..1c6fba0c0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -27,6 +27,7 @@ import net.minecraft.stats.StatList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -233,4 +234,12 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I return state.withProperty(VARIANT, EnumPlantType.SUNFLOWER).withProperty(field_181084_N, EnumFacing.SOUTH); } + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + IBlockState state = world.getBlockState(pos); + state = state.getBlock().getActualState(state, world, pos); + PropertyEnum prop = second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1; + return new ItemStack(Item.getItemFromBlock(state.getBlock()), 1, state.getValue(prop).ordinal() - (second ? 8 : 0)); + } + } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 586cc9d5b..4cbbb92ac 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -27,6 +27,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.BlockPos; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.lexicon.ILexiconable; @@ -77,7 +79,12 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup if (meta >= EnumDyeColor.values().length) { meta = 0; } - return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)).withProperty(type, EnumFlowerType.POPPY); + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + return state.withProperty(type, EnumFlowerType.POPPY); } @Override