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

Fixes #675 No disabled feature should log spam or crash anymore.

Browse Source 
Deprecates the old usage of the AEItemDefinitions via the direct method access of

* blocks()
* parts()
* items()
* materials()

and thus use the new re-direct via definitions().

All definitions are now initialized, no matter what. But SubItems, Items and Blocks are not registered, if by chance are disabled.
This commit is contained in:
thatsIch
2015-01-03 02:53:14 +01:00
parent 3dd81433ac
commit 9986ffc458
385 changed files with 12477 additions and 8292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/me/storage/SecurityInventory.java
+10 -7
View File
@@ -63,16 +63,19 @@ public class SecurityInventory implements IMEInventoryHandler<IAEItemStack>
@Override
public IAEItemStack injectItems(IAEItemStack input, Actionable type, BaseActionSource src)
{
if ( this.hasPermission( src ) && AEApi.instance().items().itemBiometricCard.sameAsStack( input.getItemStack() ) )
if ( this.hasPermission( src ) )
{
if ( this.canAccept( input ) )
if ( AEApi.instance().definitions().items().biometricCard().isSameAs( input.getItemStack() ) )
{
if ( type == Actionable.SIMULATE )
return null;
if ( this.canAccept( input ) )
{
if ( type == Actionable.SIMULATE )
return null;
this.storedItems.add( input );
this.securityTile.inventoryChanged();
return null;
this.storedItems.add( input );
this.securityTile.inventoryChanged();
return null;
}
}
}
return input;