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

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
+1 -1
View File
@@ -51,7 +51,7 @@ public enum PartRegistry
try
{
if ( this == CableBusPart )
return (TMultiPart) Api.INSTANCE.partHelper.getCombinedInstance( this.part.getName() ).newInstance();
return (TMultiPart) Api.INSTANCE.getPartHelper().getCombinedInstance( this.part.getName() ).newInstance();
else
return this.part.getConstructor( int.class ).newInstance( meta );
}
@@ -31,6 +31,8 @@ import codechicken.multipart.minecraft.McBlockPart;
import codechicken.multipart.minecraft.McSidedMetaPart;
import appeng.api.AEApi;
import appeng.api.exceptions.MissingDefinition;
public class QuartzTorchPart extends McSidedMetaPart implements IRandomDisplayTick
{
@@ -52,7 +54,12 @@ public class QuartzTorchPart extends McSidedMetaPart implements IRandomDisplayTi
@Override
public Block getBlock()
{
return AEApi.instance().blocks().blockQuartzTorch.block();
for ( Block torchBlock : AEApi.instance().definitions().blocks().quartzTorch().maybeBlock().asSet() )
{
return torchBlock;
}
throw new MissingDefinition( "Tried to retrieve a quartz torch, even though it is disabled." );
}
@Override