From 967e0888ec02327952ff7c8e403e22b041e69001 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 2 Jan 2020 18:31:35 -0600 Subject: [PATCH] Fix #3086 --- .../botania/common/item/ItemTwigWand.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index a8b1506b8..4a4b6c437 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -24,6 +24,8 @@ import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.item.Rarity; +import net.minecraft.state.IProperty; +import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; @@ -185,7 +187,7 @@ public class ItemTwigWand extends ItemMod implements ICoordBoundItem { if(player.canPlayerEdit(pos, side, stack) && (!(block instanceof CommandBlockBlock) || player.canUseCommandBlock())) { - BlockState newState = state.rotate(world, pos, Rotation.CLOCKWISE_90); + BlockState newState = rotate(state, side.getAxis()); if(newState != state) { world.setBlockState(pos, newState); return ActionResultType.SUCCESS; @@ -226,6 +228,21 @@ public class ItemTwigWand extends ItemMod implements ICoordBoundItem { return ActionResultType.PASS; } + private static BlockState rotate(BlockState old, Direction.Axis axis) { + for (IProperty prop : old.getProperties()) { + if (prop.getName().equals("facing") && prop.getValueClass() == Direction.class) { + IProperty facingProp = (IProperty) prop; + + Direction newDir = old.get(facingProp).rotateAround(axis); + if (facingProp.getAllowedValues().contains(newDir)) { + return old.with(facingProp, newDir); + } + } + } + + return old.rotate(Rotation.CLOCKWISE_90); + } + public static void doParticleBeamWithOffset(World world, BlockPos orig, BlockPos end) { Vec3d origOffset = world.getBlockState(orig).getOffset(world, orig); Vector3 vorig = new Vector3(orig.getX() + origOffset.getX() + 0.5, orig.getY() + origOffset.getY() + 0.5, orig.getZ() + origOffset.getZ() + 0.5);