Merge branch 'master' into 1.7.10

This commit is contained in:
octarine-noise
2014-07-06 21:14:46 +02:00
30 changed files with 887 additions and 338 deletions

View File

@@ -4,7 +4,7 @@ import java.io.File;
import java.util.Map;
import mods.betterfoliage.client.BetterFoliageClient;
import mods.betterfoliage.common.config.Config;
import mods.betterfoliage.common.config.BetterFoliageConfig;
import org.apache.logging.log4j.Logger;
@@ -24,6 +24,8 @@ public class BetterFoliage {
@Mod.Instance
public static BetterFoliage instance;
public static BetterFoliageConfig config = new BetterFoliageConfig();
public static Logger log;
public static File configDir;
@@ -34,7 +36,7 @@ public class BetterFoliage {
if (event.getSide() == Side.CLIENT) {
configDir = new File(event.getModConfigurationDirectory(), MOD_ID);
configDir.mkdir();
Config.load();
config.load(new File(configDir, "betterfoliage.cfg"));
BetterFoliageClient.preInit();
}
}