mirror of
https://github.com/barkeser2002/CatServer.git
synced 2026-09-25 01:39:52 +03:00
45 lines
2.5 KiB
Diff
45 lines
2.5 KiB
Diff
--- ../src-base/minecraft/net/minecraft/block/BlockPistonExtension.java
|
|
+++ ../src-work/minecraft/net/minecraft/block/BlockPistonExtension.java
|
|
@@ -27,7 +27,7 @@
|
|
|
|
public class BlockPistonExtension extends BlockDirectional
|
|
{
|
|
- public static final PropertyEnum<BlockPistonExtension.EnumPistonType> TYPE = PropertyEnum.<BlockPistonExtension.EnumPistonType>create("type", BlockPistonExtension.EnumPistonType.class);
|
|
+ public static final PropertyEnum<EnumPistonType> TYPE = PropertyEnum.<EnumPistonType>create("type", EnumPistonType.class);
|
|
public static final PropertyBool SHORT = PropertyBool.create("short");
|
|
protected static final AxisAlignedBB PISTON_EXTENSION_EAST_AABB = new AxisAlignedBB(0.75D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
|
|
protected static final AxisAlignedBB PISTON_EXTENSION_WEST_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.25D, 1.0D, 1.0D);
|
|
@@ -51,7 +51,7 @@
|
|
public BlockPistonExtension()
|
|
{
|
|
super(Material.PISTON);
|
|
- this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(TYPE, BlockPistonExtension.EnumPistonType.DEFAULT).withProperty(SHORT, Boolean.valueOf(false)));
|
|
+ this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(TYPE, EnumPistonType.DEFAULT).withProperty(SHORT, Boolean.valueOf(false)));
|
|
this.setSoundType(SoundType.STONE);
|
|
this.setHardness(0.5F);
|
|
}
|
|
@@ -195,12 +195,12 @@
|
|
|
|
public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state)
|
|
{
|
|
- return new ItemStack(state.getValue(TYPE) == BlockPistonExtension.EnumPistonType.STICKY ? Blocks.STICKY_PISTON : Blocks.PISTON);
|
|
+ return new ItemStack(state.getValue(TYPE) == EnumPistonType.STICKY ? Blocks.STICKY_PISTON : Blocks.PISTON);
|
|
}
|
|
|
|
public IBlockState getStateFromMeta(int meta)
|
|
{
|
|
- return this.getDefaultState().withProperty(FACING, getFacing(meta)).withProperty(TYPE, (meta & 8) > 0 ? BlockPistonExtension.EnumPistonType.STICKY : BlockPistonExtension.EnumPistonType.DEFAULT);
|
|
+ return this.getDefaultState().withProperty(FACING, getFacing(meta)).withProperty(TYPE, (meta & 8) > 0 ? EnumPistonType.STICKY : EnumPistonType.DEFAULT);
|
|
}
|
|
|
|
public int getMetaFromState(IBlockState state)
|
|
@@ -208,7 +208,7 @@
|
|
int i = 0;
|
|
i = i | ((EnumFacing)state.getValue(FACING)).getIndex();
|
|
|
|
- if (state.getValue(TYPE) == BlockPistonExtension.EnumPistonType.STICKY)
|
|
+ if (state.getValue(TYPE) == EnumPistonType.STICKY)
|
|
{
|
|
i |= 8;
|
|
}
|