diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java index e0d3b804d..52b1f3381 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java @@ -6,6 +6,7 @@ import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; @@ -21,7 +22,8 @@ public class BehaviourFelPumpkin extends BehaviorDefaultDispenseItem { protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) { World world = source.getWorld(); - BlockPos blockpos = source.getBlockPos().offset(BlockDispenser.getFacing(source.getBlockMetadata())); + EnumFacing facing = world.getBlockState(source.getBlockPos()).getValue(BlockDispenser.FACING); + BlockPos blockpos = source.getBlockPos().offset(facing); Block blockpumpkin = ModBlocks.felPumpkin; if (world.isAirBlock(blockpos) && world.getBlockState(blockpos.down()).getBlock() == Blocks.IRON_BARS diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java index 57f8d55d2..62f67508b 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -30,8 +30,8 @@ public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { @Nonnull @Override public ItemStack dispenseStack(IBlockSource source, ItemStack stack) { - EnumFacing enumfacing = BlockDispenser.getFacing(source.getBlockMetadata()); World world = source.getWorld(); + EnumFacing enumfacing = world.getBlockState(source.getBlockPos()).getValue(BlockDispenser.FACING); double d0 = source.getX() + enumfacing.getFrontOffsetX() * 1.125F; double d1 = source.getY() + enumfacing.getFrontOffsetY() * 1.125F; double d2 = source.getZ() + enumfacing.getFrontOffsetZ() * 1.125F; diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java index c3492adc1..23c700885 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java @@ -31,10 +31,10 @@ public class BehaviourSeeds extends BehaviorDefaultDispenseItem { @Nonnull @Override - public ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { - EnumFacing facing = BlockDispenser.getFacing(par1IBlockSource.getBlockMetadata()); - BlockPos pos = par1IBlockSource.getBlockPos().offset(facing); - World world = par1IBlockSource.getWorld(); + public ItemStack dispenseStack(IBlockSource source, ItemStack par2ItemStack) { + World world = source.getWorld(); + EnumFacing facing = world.getBlockState(source.getBlockPos()).getValue(BlockDispenser.FACING); + BlockPos pos = source.getBlockPos().offset(facing); if(world.getBlockState(pos).getBlock().isAir(world.getBlockState(pos), world, pos) && block.canPlaceBlockAt(world, pos)) { world.setBlockState(pos, block.getDefaultState()); @@ -42,7 +42,7 @@ public class BehaviourSeeds extends BehaviorDefaultDispenseItem { return par2ItemStack; } - return super.dispenseStack(par1IBlockSource, par2ItemStack); + return super.dispenseStack(source, par2ItemStack); } } diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java index 3adace8f6..506849d73 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java @@ -26,17 +26,17 @@ public class BehaviourWand extends BehaviorDefaultDispenseItem { @Nonnull @Override - protected ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { - EnumFacing facing = BlockDispenser.getFacing(par1IBlockSource.getBlockMetadata()); - BlockPos pos = par1IBlockSource.getBlockPos().offset(facing); - World world = par1IBlockSource.getWorld(); + protected ItemStack dispenseStack(IBlockSource source, ItemStack par2ItemStack) { + World world = source.getWorld(); + EnumFacing facing = world.getBlockState(source.getBlockPos()).getValue(BlockDispenser.FACING); + BlockPos pos = source.getBlockPos().offset(facing); Block block = world.getBlockState(pos).getBlock(); if(block instanceof IWandable) { ((IWandable) block).onUsedByWand(null, par2ItemStack, world, pos, facing.getOpposite()); return par2ItemStack; } - return super.dispenseStack(par1IBlockSource, par2ItemStack); + return super.dispenseStack(source, par2ItemStack); } }