Did what I could with mj6

This commit is contained in:
AlgorithmX2
2014-05-09 21:08:56 -05:00
parent 2f071e7341
commit 3491fe4e33
14 changed files with 213 additions and 37 deletions
+49 -6
View File
@@ -109,7 +109,8 @@ public class BC extends BaseModule implements IBC
{
if ( is == null )
return false;
return is.getItem() instanceof ItemFacade;
return is.getItem() instanceof ItemFacade && ItemFacade.getType( is ) == ItemFacade.TYPE_BASIC;
}
@Override
@@ -189,7 +190,7 @@ public class BC extends BaseModule implements IBC
addFacade( b.blockQuartz.stack( 1 ) );
addFacade( b.blockQuartzChiseled.stack( 1 ) );
addFacade( b.blockQuartzPiller.stack( 1 ) );
Block skyStone = b.blockSkyStone.block();
if ( skyStone != null )
{
@@ -211,8 +212,27 @@ public class BC extends BaseModule implements IBC
@Override
public IFacadePart createFacadePart(Block blk, int meta, ForgeDirection side)
{
ItemStack fs = ItemFacade.getStack( blk, meta );
return new FacadePart( fs, side );
try
{
ItemStack fs = ItemFacade.getFacade( blk, meta );
return new FacadePart( fs, side );
}
catch (Throwable t)
{
}
try
{
ItemStack fs = ItemFacade.getStack( blk, meta );
return new FacadePart( fs, side );
}
catch (Throwable t)
{
}
return null;
}
@Override
@@ -224,8 +244,31 @@ public class BC extends BaseModule implements IBC
@Override
public ItemStack getTextureForFacade(ItemStack facade)
{
Block blk = ItemFacade.getBlock( facade );
return new ItemStack( blk, 1, ItemFacade.getMetaData( facade ) );
try
{
Block blk[] = ItemFacade.getBlocks( facade );
int meta[] = ItemFacade.getMetaValues( facade );
if ( blk == null || blk.length < 1 )
return null;
return new ItemStack( blk[0], 1, meta[0] );
}
catch (Throwable t)
{
}
try
{
Block blk = ItemFacade.getBlock( facade );
return new ItemStack( blk, 1, ItemFacade.getMetaData( facade ) );
}
catch (Throwable t)
{
}
return null;
}
@Override