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

Fixed blocks state <-> meta conversion (#31)

Browse Source 
-Added missing state <-> meta conversion methods to blocks. Fixes #23.
This commit is contained in:
shartte
2016-08-11 11:40:34 +02:00
committed by Elix_x
parent 2208083b03
commit 8ddff3f459
4 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/helpers/MetaRotation.java
+9 -10
View File
@@ -19,7 +19,7 @@
package appeng.helpers;
import net.minecraft.block.BlockTorch;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumFacing.Axis;
@@ -34,15 +34,15 @@ import appeng.block.AEBaseBlock;
public class MetaRotation implements IOrientable
{
private final boolean useFacing;
private final IProperty<EnumFacing> facingProp;
private final IBlockAccess w;
private final BlockPos pos;
public MetaRotation( final IBlockAccess world, final BlockPos pos, final boolean FullFacing )
public MetaRotation( final IBlockAccess world, final BlockPos pos, final IProperty<EnumFacing> facingProp )
{
this.w = world;
this.pos = pos;
this.useFacing = FullFacing;
this.facingProp = facingProp;
}
@Override
@@ -66,13 +66,12 @@ public class MetaRotation implements IOrientable
{
final IBlockState state = this.w.getBlockState( this.pos );
if( this.useFacing )
if( this.facingProp != null )
{
final EnumFacing f = state == null ? EnumFacing.UP : (EnumFacing) state.getValue( BlockTorch.FACING );
return f;
return state.getValue( facingProp );
}
Axis a = state == null ? null : (Axis) state.getValue( AEBaseBlock.AXIS_ORIENTATION );
Axis a = state.getValue( AEBaseBlock.AXIS_ORIENTATION );
if( a == null )
{
@@ -96,9 +95,9 @@ public class MetaRotation implements IOrientable
{
if( this.w instanceof World )
{
if( this.useFacing )
if( facingProp != null )
{
( (World) this.w ).setBlockState( this.pos, this.w.getBlockState( this.pos ).withProperty( BlockTorch.FACING, up ) );
( (World) this.w ).setBlockState( this.pos, this.w.getBlockState( this.pos ).withProperty( facingProp, up ) );
}
else
{