diff --git a/core/AEConfig.java b/core/AEConfig.java index 75bd0d347..adfe47ae3 100644 --- a/core/AEConfig.java +++ b/core/AEConfig.java @@ -85,8 +85,8 @@ public class AEConfig extends Configuration implements IConfigureableObject, ICo public int portablecell_battery = 20000; public int staff_battery = 8000; - public AEConfig(File f) { - super( new File( f.getPath() + File.separator + "AppliedEnergistics2" + File.separator + "AppliedEnergistics2.cfg" ) ); + public AEConfig(String path) { + super( new File( path + "AppliedEnergistics2.cfg" ) ); final double DEFAULT_BC_EXCHANGE = 5.0; // final double DEFAULT_UE_EXCHANGE = 5.0; diff --git a/core/AppEng.java b/core/AppEng.java index 9626a5004..c7420e731 100644 --- a/core/AppEng.java +++ b/core/AppEng.java @@ -1,5 +1,7 @@ package appeng.core; +import java.io.File; + import appeng.core.crash.CrashEnhancement; import appeng.core.crash.CrashInfo; import appeng.core.features.AEFeature; @@ -26,6 +28,13 @@ import cpw.mods.fml.common.network.NetworkRegistry; public class AppEng { + private String configPath; + + public String getConfigPath() + { + return configPath; + } + public final static String modid = "appliedenergistics2"; public final static String name = "Applied Energistics 2"; @@ -45,7 +54,6 @@ public class AppEng + net.minecraftforge.common.ForgeVersion.buildVersion + ",)"; // buildVersion public AppEng() { - instance = this; for (CrashInfo ci : CrashInfo.values()) @@ -97,8 +105,10 @@ public class AppEng @EventHandler void PreInit(FMLPreInitializationEvent event) { - AEConfig.instance = new AEConfig( event.getModConfigurationDirectory() ); - FacadeConfig.instance = new FacadeConfig( event.getModConfigurationDirectory() ); + configPath = event.getModConfigurationDirectory().getPath() + File.separator + "AppliedEnergistics2" + File.separator; + + AEConfig.instance = new AEConfig( configPath ); + FacadeConfig.instance = new FacadeConfig( configPath ); AELog.info( "Starting ( PreInit )" ); diff --git a/core/FacadeConfig.java b/core/FacadeConfig.java index e3dc3278b..7b5c943ba 100644 --- a/core/FacadeConfig.java +++ b/core/FacadeConfig.java @@ -16,8 +16,8 @@ public class FacadeConfig extends Configuration public static FacadeConfig instance; Pattern replacementPattern; - public FacadeConfig(File f) { - super( new File( f.getPath() + File.separator + "AppliedEnergistics2" + File.separator + "Facades.cfg" ) ); + public FacadeConfig(String path) { + super( new File( path + "Facades.cfg" ) ); replacementPattern = Pattern.compile( "[^a-zA-Z0-9]" ); }