Merge fixes for interface.
This commit is contained in:
parent
c6b9926d7f
commit
210d5d2602
|
@ -40,6 +40,7 @@ import appeng.core.sync.GuiBridge;
|
||||||
import appeng.tile.misc.TileInterface;
|
import appeng.tile.misc.TileInterface;
|
||||||
import appeng.util.Platform;
|
import appeng.util.Platform;
|
||||||
|
|
||||||
|
|
||||||
public class BlockInterface extends AEBaseTileBlock
|
public class BlockInterface extends AEBaseTileBlock
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -55,7 +56,7 @@ public class BlockInterface extends AEBaseTileBlock
|
||||||
@Override
|
@Override
|
||||||
protected IProperty[] getAEStates()
|
protected IProperty[] getAEStates()
|
||||||
{
|
{
|
||||||
return new IProperty[] { AE_BLOCK_FORWARD, AE_BLOCK_UP, OMNIDIRECTIONAL };
|
return new IProperty[] { OMNIDIRECTIONAL };
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -64,7 +65,8 @@ public class BlockInterface extends AEBaseTileBlock
|
||||||
// Determine whether the interface is omni-directional or not
|
// Determine whether the interface is omni-directional or not
|
||||||
TileInterface te = getTileEntity( world, pos );
|
TileInterface te = getTileEntity( world, pos );
|
||||||
boolean omniDirectional = true; // The default
|
boolean omniDirectional = true; // The default
|
||||||
if (te != null) {
|
if( te != null )
|
||||||
|
{
|
||||||
omniDirectional = te.isOmniDirectional();
|
omniDirectional = te.isOmniDirectional();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -106,5 +108,4 @@ public class BlockInterface extends AEBaseTileBlock
|
||||||
( (TileInterface) rotatable ).setSide( axis );
|
( (TileInterface) rotatable ).setSide( axis );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue