Move AXIS_ORIENTATION into QuartzPillarBlock
This commit is contained in:
commit
8882c16cbf
|
@ -67,8 +67,11 @@ import appeng.util.Platform;
|
|||
public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||
{
|
||||
|
||||
<<<<<<< HEAD
|
||||
public static final PropertyEnum<EnumFacing.Axis> AXIS_ORIENTATION = PropertyEnum.create( "axis", EnumFacing.Axis.class );
|
||||
|
||||
=======
|
||||
>>>>>>> refs/heads/pr/38
|
||||
private final String featureFullName;
|
||||
private final Optional<String> featureSubName;
|
||||
private boolean isOpaque = true;
|
||||
|
|
|
@ -23,6 +23,7 @@ import java.util.EnumSet;
|
|||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.properties.IProperty;
|
||||
import net.minecraft.block.properties.PropertyEnum;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
|
@ -37,6 +38,7 @@ import appeng.helpers.MetaRotation;
|
|||
|
||||
public class QuartzPillarBlock extends AEBaseBlock implements IOrientableBlock
|
||||
{
|
||||
public static final PropertyEnum AXIS_ORIENTATION = PropertyEnum.create( "axis", EnumFacing.Axis.class );
|
||||
|
||||
public QuartzPillarBlock()
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue