From 8064b08ae90746c7b41accc69f0739deb460cde9 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 10 Jan 2019 11:34:58 +0200 Subject: [PATCH] Updated cloud slabs and chairs with the same properties as cloud blocks --- .../unicopia/block/BlockCloudSlab.java | 13 +++++++++++++ .../unicopia/block/BlockCloudStairs.java | 14 ++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockCloudSlab.java b/src/main/java/com/minelittlepony/unicopia/block/BlockCloudSlab.java index 68d3eee3..1f217c81 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/BlockCloudSlab.java +++ b/src/main/java/com/minelittlepony/unicopia/block/BlockCloudSlab.java @@ -16,6 +16,7 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -27,6 +28,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -108,6 +110,17 @@ public class BlockCloudSlab extends BlockSlab implements ICloudBlock { } } + @Deprecated + @Override + public RayTraceResult collisionRayTrace(IBlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { + if (worldIn.isRemote) { + if (!getCanInteract(blockState, Minecraft.getMinecraft().player)) { + return null; + } + } + return super.collisionRayTrace(blockState, worldIn, pos, start, end); + } + @Deprecated @Override public float getPlayerRelativeBlockHardness(IBlockState state, EntityPlayer player, World worldIn, BlockPos pos) { diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockCloudStairs.java b/src/main/java/com/minelittlepony/unicopia/block/BlockCloudStairs.java index bf6de28a..003d469f 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/BlockCloudStairs.java +++ b/src/main/java/com/minelittlepony/unicopia/block/BlockCloudStairs.java @@ -12,11 +12,14 @@ import net.minecraft.block.BlockSlab.EnumBlockHalf; import net.minecraft.block.BlockStairs; import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -102,6 +105,17 @@ public class BlockCloudStairs extends BlockStairs implements ICloudBlock { return theBlock.getPlayerRelativeBlockHardness(state, player, worldIn, pos); } + @Deprecated + @Override + public RayTraceResult collisionRayTrace(IBlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end) { + if (worldIn.isRemote) { + if (!getCanInteract(blockState, Minecraft.getMinecraft().player)) { + return null; + } + } + return super.collisionRayTrace(blockState, worldIn, pos, start, end); + } + @Override public boolean doesSideBlockRendering(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing face) { state = state.getActualState(world, pos);