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

Added a new facade config. (#3706)

Browse Source 
The whitelist is now based on manually add explicit entries instead of
automatically adding every existing block. This alone should save a few
MB of RAM depending on the modpack size.

Additionally the FacadeConfig is no longer extending the normal
Configuration provided by Forge. It will only parse the file once per
start and store the settings in an optimised collection to further
reduce memory consumption.

Any full block without a TileEntity and having a model is whitelisted
automatically and does not need an explicit entry anymore.

By default vanilla and AE2 glass is added as they are no fullblocks
technically.

The whitelist technically allows many more blocks now. E.g. stairs,
slabs or even items like saplings. But with various rendering quality.

Further there is an option to allow facades based on TileEntities, this
is completely unsupported and can work or corrupt the whole save.
This commit is contained in:
yueh
2018-09-02 13:59:18 +02:00
committed by GitHub
parent 7ba2893635
commit b1ac0adfd8
2 changed files with 133 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/parts/ItemFacade.java
+22 -18
View File
@@ -130,11 +130,6 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
// just absorb..
}
}
if( FacadeConfig.instance().hasChanged() )
{
FacadeConfig.instance().save();
}
}
}
@@ -148,47 +143,56 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
return blockState.isFullCube();
}
public ItemStack createFacadeForItem( final ItemStack l, final boolean returnItem )
public ItemStack createFacadeForItem( final ItemStack itemStack, final boolean returnItem )
{
if( l.isEmpty() )
if( itemStack.isEmpty() )
{
return ItemStack.EMPTY;
}
final Block b = Block.getBlockFromItem( l.getItem() );
if( b == Blocks.AIR || l.hasTagCompound() )
final Block block = Block.getBlockFromItem( itemStack.getItem() );
if( block == Blocks.AIR || itemStack.hasTagCompound() )
{
return ItemStack.EMPTY;
}
final int metadata = l.getItem().getMetadata( l.getItemDamage() );
final boolean hasTile = b.hasTileEntity( b.getDefaultState() );
final int metadata = itemStack.getItem().getMetadata( itemStack.getItemDamage() );
// Try to get the block state based on the item stack's meta. If this fails, don't consider it for a facade
// This for example fails for Pistons because they hardcoded an invalid meta value in vanilla
IBlockState blockState;
try
{
blockState = b.getStateFromMeta( metadata );
blockState = block.getStateFromMeta( metadata );
}
catch( Exception e )
{
AELog.debug( e, "Cannot create a facade for " + b.getRegistryName() );
AELog.debug( e, "Cannot create a facade for " + block.getRegistryName() );
return ItemStack.EMPTY;
}
if( blockState.getRenderType() == EnumBlockRenderType.MODEL && !hasTile )
final boolean areTileEntitiesEnabled = FacadeConfig.instance().allowTileEntityFacades();
final boolean isWhiteListed = FacadeConfig.instance().isWhiteListed( block, metadata );
final boolean isModel = blockState.getRenderType() == EnumBlockRenderType.MODEL;
final IBlockState defaultState = block.getDefaultState();
final boolean isTileEntity = block.hasTileEntity( defaultState );
final boolean isFullCube = block.isFullCube( defaultState );
final boolean isTileEntityAllowed = !isTileEntity || ( areTileEntitiesEnabled && isWhiteListed );
final boolean isBlockAllowed = isFullCube || isWhiteListed;
if( isModel && isTileEntityAllowed && isBlockAllowed )
{
if( returnItem )
{
return l;
return itemStack;
}
final ItemStack is = new ItemStack( this );
final NBTTagCompound data = new NBTTagCompound();
data.setString( TAG_ITEM_ID, l.getItem().getRegistryName().toString() );
data.setInteger( TAG_DAMAGE, l.getItemDamage() );
data.setString( TAG_ITEM_ID, itemStack.getItem().getRegistryName().toString() );
data.setInteger( TAG_DAMAGE, itemStack.getItemDamage() );
is.setTagCompound( data );
return is;
}