diff --git a/src/mantle/compat/MantleCompat.scala b/src/mantle/compat/MantleCompat.scala index d5f5102..4f4d65b 100644 --- a/src/mantle/compat/MantleCompat.scala +++ b/src/mantle/compat/MantleCompat.scala @@ -6,6 +6,8 @@ import cpw.mods.fml.common.Mod.EventHandler import mantle.compat.lib.CompatRepo._ import mantle.compat.plugins.{PluginDebug, PluginManager} +import mantle.compat.lib.CompatConfig +import net.minecraftforge.common.Configuration /** * Mantle-Compat @@ -28,6 +30,8 @@ object MantleCompat { def preInit(evt:FMLPreInitializationEvent) { logger.setParent(FMLCommonHandler.instance().getFMLLogger) + CompatConfig.loadConfiguration(new Configuration(evt.getSuggestedConfigurationFile)) + if (debugCompatPlugins) PluginManager.registerPluginCandidate(PluginDebug) PluginManager.preInitPlugins() } diff --git a/src/mantle/compat/package.scala b/src/mantle/compat/package.scala new file mode 100644 index 0000000..3bf5c49 --- /dev/null +++ b/src/mantle/compat/package.scala @@ -0,0 +1,11 @@ +package mantle + +/** + * Mantle Compat + * + * Provides a plugin framework for modules that handle interaction with 'the outside world', + * such as mod APIs and certain Minecraft functions. + * + * @author Sunstrike + */ +package object compat {} diff --git a/src/mantle/core/MantleCore.scala b/src/mantle/core/MantleCore.scala index 7818fe5..6b4b7b8 100644 --- a/src/mantle/core/MantleCore.scala +++ b/src/mantle/core/MantleCore.scala @@ -5,6 +5,8 @@ import cpw.mods.fml.common.event.{FMLPostInitializationEvent, FMLInitializationE import cpw.mods.fml.common.Mod.EventHandler import mantle.core.lib.CoreRepo._ +import net.minecraftforge.common.Configuration +import mantle.core.lib.CoreConfig /** * Mantle-Core @@ -26,6 +28,9 @@ object MantleCore { @EventHandler def preInit(evt:FMLPreInitializationEvent) { logger.setParent(FMLCommonHandler.instance().getFMLLogger) + + CoreConfig.loadConfiguration(new Configuration(evt.getSuggestedConfigurationFile)) + logger.info("Mantle (" + modVersion + ") -- Preparing for launch.") logger.info("Entering preinitialization phase.") } diff --git a/src/mantle/router/MantleRouter.scala b/src/mantle/router/MantleRouter.scala index 55ffd65..a4055ec 100644 --- a/src/mantle/router/MantleRouter.scala +++ b/src/mantle/router/MantleRouter.scala @@ -6,6 +6,8 @@ import cpw.mods.fml.common.Mod.EventHandler import mantle.router.lib.RouterRepo._ import mantle.router.routing.{UnitDebugLogger, RouterCoordinator} +import mantle.router.lib.RouterConfig +import net.minecraftforge.common.Configuration /** * Mantle-Router @@ -27,6 +29,9 @@ object MantleRouter { @EventHandler def preInit(evt:FMLPreInitializationEvent) { logger.setParent(FMLCommonHandler.instance().getFMLLogger) + + RouterConfig.loadConfiguration(new Configuration(evt.getSuggestedConfigurationFile)) + registerStandardUnits() RouterCoordinator.processQueue() }