tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Merge pull request #625 from thatsIch/b-624-pickaxe

Browse source 
Fixes #624 Missing check to disable features
This commit is contained in:
thatsIch 2014-12-27 19:05:37 +01:00
parent 366d1a0a5d 21b70d0dda
commit f7323289a5
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main/java/appeng/core/Registration.java
View file

@ -118,6 +118,7 @@ import appeng.core.features.AEFeature;
import appeng.core.features.ColoredItemDefinition;
import appeng.core.features.DamagedItemDefinition;
import appeng.core.features.IAEFeature;
import appeng.core.features.IFeatureHandler;
import appeng.core.features.IStackSrc;
import appeng.core.features.ItemStackSrc;
import appeng.core.features.NullItemDefinition;
@ -506,26 +507,33 @@ public class Registration
private AEItemDefinition addFeature( Class<? extends IAEFeature> featureClass, Object... args )
{
ClassInstantiation<IAEFeature> instantiation = new ClassInstantiation<IAEFeature>( featureClass, args );
Optional<IAEFeature> instance = instantiation.get();
final ClassInstantiation<IAEFeature> instantiation = new ClassInstantiation<IAEFeature>( featureClass, args );
final Optional<IAEFeature> instance = instantiation.get();
if ( instance.isPresent() )
{
IAEFeature feature = instance.get();
for ( AEFeature f : feature.handler().getFeatures() )
final IAEFeature feature = instance.get();
final IFeatureHandler handler = feature.handler();
if ( handler.isFeatureAvailable() )
{
this.featuresToEntities.put( f, featureClass );
for ( AEFeature f : handler.getFeatures() )
{
this.featuresToEntities.put( f, featureClass );
}
handler.register();
feature.postInit();
return handler.getDefinition();
}
else
{
return null;
}
feature.handler().register();
feature.postInit();
return feature.handler().getDefinition();
}
else
{
throw new RuntimeException( "Error with Feature: " + featureClass.getName() );
throw new RuntimeException( "Error upon Class Instantiation with Feature: " + featureClass.getName() );
}
}