Fixed Crash On Startup.

This commit is contained in:
AlgorithmX2 2014-02-07 14:56:50 -06:00
parent 5264a718f9
commit 30c1deb8cf
2 changed files with 6 additions and 4 deletions

View file

@ -16,7 +16,7 @@ public class AELog
private static void log(Level level, String format, Object... data)
{
if ( Configuration.instance.isFeatureEnabled( AEFeature.Logging ) )
if ( Configuration.instance == null || Configuration.instance.isFeatureEnabled( AEFeature.Logging ) )
{
FMLRelaunchLog.log( "AE2:" + (Platform.isServer() ? "S" : "C"), level, format, data );
}

View file

@ -86,7 +86,9 @@ public class AppEng
IntegrationSide.BOTH, "Factorization", "factorization", "FZ", // FZ
IntegrationSide.BOTH, "Forestry", "Forestry", "Forestry", // Forestry
IntegrationSide.BOTH, "Mekanism", "Mekanism", "Mekanism", // MeK
IntegrationSide.CLIENT, "Not Enought Items", "NotEnoughItems", "NEI", // Not Eneough Items
IntegrationSide.CLIENT, "Not Enought Items", "NotEnoughItems", "NEI", // Not
// Eneough
// Items
IntegrationSide.BOTH, "Forge MultiPart", "McMultipart", "FMP" } );
public boolean isIntegrationEnabled(String Name)
@ -109,11 +111,11 @@ public class AppEng
@EventHandler
void PreInit(FMLPreInitializationEvent event)
{
AELog.info( "Starting ( PreInit )" );
Configuration.instance = new Configuration( event.getModConfigurationDirectory() );
FacadeConfig.instance = new FacadeConfig( event.getModConfigurationDirectory() );
AELog.info( "Starting ( PreInit )" );
if ( Platform.isClient() )
{
CreativeTab.init();