fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes and cleanup

Browse Source 
- Compile error fixes (blame @biggles2206). Fixes #53.
- UVLModelLoader is now cross compatible with vanilla (vanilla can use
uvl parents who have vanilla parents).
- Due to it, now using uvlMarker instead of .uvl.
- General code reformatting and cleanup.
This commit is contained in:
elix-x
2016-08-15 18:19:33 +02:00
parent 24ddc0e574
commit 63f426336b
10 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/decorative/solid/QuartzPillarBlock.java
+5 -5
View File
@@ -38,7 +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 static final PropertyEnum<EnumFacing.Axis> AXIS_ORIENTATION = PropertyEnum.create( "axis", EnumFacing.Axis.class );
public QuartzPillarBlock()
{
@@ -49,15 +49,15 @@ public class QuartzPillarBlock extends AEBaseBlock implements IOrientableBlock
@Override
public int getMetaFromState( final IBlockState state )
{
return state.getValue(AXIS_ORIENTATION).ordinal();
return state.getValue( AXIS_ORIENTATION ).ordinal();
}
@Override
public IBlockState getStateFromMeta( final int meta )
{
// Simply use the ordinal here
EnumFacing.Axis axis = EnumFacing.Axis.values()[meta];
return this.getDefaultState().withProperty(AXIS_ORIENTATION, axis);
// Simply use the ordinal here
EnumFacing.Axis axis = EnumFacing.Axis.values()[meta];
return this.getDefaultState().withProperty( AXIS_ORIENTATION, axis );
}
@Override