tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Move AXIS_ORIENTATION into QuartzPillarBlock

Browse source
This commit is contained in:
Thomas Saunders 2016-08-14 10:17:50 +01:00
parent 92b931434e f2cceda471
commit 8882c16cbf
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/appeng/block/AEBaseBlock.java
View file

@ -67,8 +67,11 @@ import appeng.util.Platform;
public abstract class AEBaseBlock extends Block implements IAEFeature public abstract class AEBaseBlock extends Block implements IAEFeature
{ {
<<<<<<< HEAD
public static final PropertyEnum<EnumFacing.Axis> AXIS_ORIENTATION = PropertyEnum.create( "axis", EnumFacing.Axis.class ); public static final PropertyEnum<EnumFacing.Axis> AXIS_ORIENTATION = PropertyEnum.create( "axis", EnumFacing.Axis.class );
=======
>>>>>>> refs/heads/pr/38
private final String featureFullName; private final String featureFullName;
private final Optional<String> featureSubName; private final Optional<String> featureSubName;
private boolean isOpaque = true; private boolean isOpaque = true;

2
src/main/java/appeng/decorative/solid/QuartzPillarBlock.java
View file

@ -23,6 +23,7 @@ import java.util.EnumSet;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@ -37,6 +38,7 @@ import appeng.helpers.MetaRotation;
public class QuartzPillarBlock extends AEBaseBlock implements IOrientableBlock public class QuartzPillarBlock extends AEBaseBlock implements IOrientableBlock
{ {
public static final PropertyEnum AXIS_ORIENTATION = PropertyEnum.create( "axis", EnumFacing.Axis.class );
public QuartzPillarBlock() public QuartzPillarBlock()
{ {