PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-17 10:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Updated cloud slabs and chairs with the same properties as cloud blocks

Browse source
This commit is contained in:
Sollace 2019-01-10 11:34:58 +02:00
parent 8f61402191
commit 8064b08ae9
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/com/minelittlepony/unicopia/block/BlockCloudSlab.java
View file

@ -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) {

14
src/main/java/com/minelittlepony/unicopia/block/BlockCloudStairs.java
View file

@ -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);