Critical bug fix, config invalidation

IceDragon200 · IceDragon200 · commit 161797b2e87c · 2015-10-11T23:39:36.000-05:00
Config options would be reset after the Config was initialized, since fields
take their default value AFTER the object's constructor is called
diff --git a/src/java/growthcraft/apples/Config.java b/src/java/growthcraft/apples/Config.java
@@ -16,11 +16,6 @@ public class Config extends ConfigBase
 	public boolean generateAppleFarms = false;
 	public final int appleCiderColor = 0x855425;
 
-	public Config(File configDir, String filename)
-	{
-		super(configDir, filename);
-	}
-
 	protected void loadConfig()
 	{
 		this.appleGrowthRate = config.get(Configuration.CATEGORY_GENERAL, "Apple growth rate", appleGrowthRate, "[Higher -> Slower] Default : " + appleGrowthRate).getInt();
diff --git a/src/java/growthcraft/apples/GrowthCraftApples.java b/src/java/growthcraft/apples/GrowthCraftApples.java
@@ -76,7 +76,8 @@ public static growthcraft.apples.Config getConfig()
 	@EventHandler
 	public void preload(FMLPreInitializationEvent event)
 	{
-		config = new growthcraft.apples.Config(event.getModConfigurationDirectory(), "growthcraft/apples.conf");
+		config = new growthcraft.apples.Config();
+		config.load(event.getModConfigurationDirectory(), "growthcraft/apples.conf");
 
 		//====================
 		// INIT
diff --git a/src/java/growthcraft/bamboo/Config.java b/src/java/growthcraft/bamboo/Config.java
@@ -19,11 +19,6 @@ public class Config extends ConfigBase
 	public int bambooWorldGenDensity = 64;
 	public int bambooWorldGenRarity = 32;
 
-	public Config(File configDir, String filename)
-	{
-		super(configDir, filename);
-	}
-
 	protected void loadConfig()
 	{
 		this.bambooBiomeID = config.get("Biomes", "Bamboo Forest biome ID", bambooBiomeID).getInt();
diff --git a/src/java/growthcraft/bamboo/GrowthCraftBamboo.java b/src/java/growthcraft/bamboo/GrowthCraftBamboo.java
@@ -98,7 +98,8 @@ public static growthcraft.bamboo.Config getConfig()
 	@EventHandler
 	public void preload(FMLPreInitializationEvent event)
 	{
-		config = new growthcraft.bamboo.Config(event.getModConfigurationDirectory(), "growthcraft/bamboo.conf");
+		config = new growthcraft.bamboo.Config();
+		config.load(event.getModConfigurationDirectory(), "growthcraft/bamboo.conf");
 
 		//====================
 		// INIT
diff --git a/src/java/growthcraft/bees/Config.java b/src/java/growthcraft/bees/Config.java
@@ -17,11 +17,6 @@ public class Config extends ConfigBase
 	public boolean generateApiaristStructure = false;
 	public final int honeyMeadColor = 0xA3610C;
 
-	public Config(File configDir, String filename)
-	{
-		super(configDir, filename);
-	}
-
 	protected void loadConfig()
 	{
 		this.villagerApiaristID = config.get("Villager", "Apiarist ID", villagerApiaristID).getInt();
diff --git a/src/java/growthcraft/bees/GrowthCraftBees.java b/src/java/growthcraft/bees/GrowthCraftBees.java
@@ -85,7 +85,8 @@ public static growthcraft.bees.Config getConfig()
 	@EventHandler
 	public void preload(FMLPreInitializationEvent event)
 	{
-		config = new growthcraft.bees.Config(event.getModConfigurationDirectory(), "growthcraft/bees.conf");
+		config = new growthcraft.bees.Config();
+		config.load(event.getModConfigurationDirectory(), "growthcraft/bees.conf");
 
 		//====================
 		// INIT
diff --git a/src/java/growthcraft/cellar/Config.java b/src/java/growthcraft/cellar/Config.java
@@ -13,11 +13,6 @@ public class Config extends ConfigBase
 	public final int fermentBarrelMaxCap = 3000;
 	public final int brewKettleMaxCap = 1000;
 
-	public Config(File dirname, String filename)
-	{
-		super(dirname, filename);
-	}
-
 	protected void loadConfig()
 	{
 		this.potionTipsyID = config.get("Potions", "Potion Tipsy ID", 50).getInt();
diff --git a/src/java/growthcraft/cellar/GrowthCraftCellar.java b/src/java/growthcraft/cellar/GrowthCraftCellar.java
@@ -91,7 +91,8 @@ public static growthcraft.cellar.Config getConfig()
 	@EventHandler
 	public void preload(FMLPreInitializationEvent event)
 	{
-		config = new growthcraft.cellar.Config(event.getModConfigurationDirectory(), "growthcraft/cellar.conf");
+		config = new growthcraft.cellar.Config();
+		config.load(event.getModConfigurationDirectory(), "growthcraft/cellar.conf");
 
 		//====================
 		// INIT
diff --git a/src/java/growthcraft/core/Config.java b/src/java/growthcraft/core/Config.java
@@ -6,10 +6,6 @@
 
 public class Config extends ConfigBase
 {
-	public Config(File dirname, String filename)
-	{
-		super(dirname, filename);
-	}
 
 	protected void loadConfig()
 	{
diff --git a/src/java/growthcraft/core/ConfigBase.java b/src/java/growthcraft/core/ConfigBase.java
@@ -13,15 +13,6 @@ public abstract class ConfigBase
 {
 	protected Configuration config;
 
-	/**
-	 * @param configDir - the minecraft configuration directory
-	 * @param filename - config filename
-	 */
-	public ConfigBase(File configDir, String filename)
-	{
-		load(configDir, filename);
-	}
-
 	/**
 	 * Overwrite this method in your extended class and read the config,
 	 * define variables as needed, in short: "I don't care how you do it, just
@@ -36,7 +27,7 @@ public ConfigBase(File configDir, String filename)
 	 * @param configDir - root config directory
 	 * @param filename - config filename
 	 */
-	private void load(File configDir, String filename)
+	public void load(File configDir, String filename)
 	{
 		config = new Configuration(new File(configDir, filename));
 		try
diff --git a/src/java/growthcraft/core/GrowthCraftCore.java b/src/java/growthcraft/core/GrowthCraftCore.java
@@ -61,7 +61,8 @@ public static growthcraft.core.Config getConfig()
 	@EventHandler
 	public void preload(FMLPreInitializationEvent event)
 	{
-		config = new growthcraft.core.Config(event.getModConfigurationDirectory(), "growthcraft/core.conf");
+		config = new growthcraft.core.Config();
+		config.load(event.getModConfigurationDirectory(), "growthcraft/core.conf");
 
 		tab =  new CreativeTabGrowthcraft("tabGrowthCraft");
 
diff --git a/src/java/growthcraft/fishtrap/Config.java b/src/java/growthcraft/fishtrap/Config.java
@@ -10,11 +10,6 @@ public class Config extends ConfigBase
 	public boolean useBiomeDict = true;
 	public String biomesList = "0;7;24";
 
-	public Config(File dirname, String filename)
-	{
-		super(dirname, filename);
-	}
-
 	protected void loadConfig()
 	{
 		this.fishTrapCatchRate = (float)config.get(Configuration.CATEGORY_GENERAL, "Fish Trap catching rate", (double)fishTrapCatchRate, "[Higher -> Slower] Default : " + fishTrapCatchRate).getDouble();
diff --git a/src/java/growthcraft/fishtrap/GrowthCraftFishTrap.java b/src/java/growthcraft/fishtrap/GrowthCraftFishTrap.java
@@ -47,7 +47,8 @@ public static growthcraft.fishtrap.Config getConfig()
 	@EventHandler
 	public void preload(FMLPreInitializationEvent event)
 	{
-		config = new growthcraft.fishtrap.Config(event.getModConfigurationDirectory(), "growthcraft/fishtrap.conf");
+		config = new growthcraft.fishtrap.Config();
+		config.load(event.getModConfigurationDirectory(), "growthcraft/fishtrap.conf");
 
 		//====================
 		// INIT
diff --git a/src/java/growthcraft/grapes/Config.java b/src/java/growthcraft/grapes/Config.java
@@ -15,11 +15,6 @@ public class Config extends ConfigBase
 	public boolean generateGrapeVineyardStructure = true;
 	public final int grapeWineColor = 5574180;
 
-	public Config(File dirname, String filename)
-	{
-		super(dirname, filename);
-	}
-
 	protected void loadConfig()
 	{
 		this.grapeVineSeedlingGrowthRate = (float)config.get(Configuration.CATEGORY_GENERAL, "Grape Vine (Seedling) growth rate", (double)grapeVineSeedlingGrowthRate, "[Higher -> Slower] Default : " + grapeVineSeedlingGrowthRate).getDouble();
diff --git a/src/java/growthcraft/grapes/GrowthCraftGrapes.java b/src/java/growthcraft/grapes/GrowthCraftGrapes.java
@@ -86,7 +86,8 @@ public static growthcraft.grapes.Config getConfig()
 	@EventHandler
 	public void preload(FMLPreInitializationEvent event)
 	{
-		config = new growthcraft.grapes.Config(event.getModConfigurationDirectory(), "growthcraft/grapes.conf");
+		config = new growthcraft.grapes.Config();
+		config.load(event.getModConfigurationDirectory(), "growthcraft/grapes.conf");
 
 		//====================
 		// INIT
diff --git a/src/java/growthcraft/hops/Config.java b/src/java/growthcraft/hops/Config.java
@@ -15,11 +15,6 @@ public class Config extends ConfigBase
 
 	public final int hopAleColor = 0xCACA47;
 
-	public Config(File dirname, String filename)
-	{
-		super(dirname, filename);
-	}
-
 	protected void loadConfig()
 	{
 		this.hopVineGrowthRate = (float)config.get(Configuration.CATEGORY_GENERAL, "Hop (Vine) growth rate", (double)hopVineGrowthRate, "[Higher -> Slower] Default : " + hopVineGrowthRate).getDouble();
diff --git a/src/java/growthcraft/hops/GrowthCraftHops.java b/src/java/growthcraft/hops/GrowthCraftHops.java
@@ -81,7 +81,8 @@ public static growthcraft.hops.Config getConfig()
 	@EventHandler
 	public void preload(FMLPreInitializationEvent event)
 	{
-		config = new growthcraft.hops.Config(event.getModConfigurationDirectory(), "growthcraft/hops.conf");
+		config = new growthcraft.hops.Config();
+		config.load(event.getModConfigurationDirectory(), "growthcraft/hops.conf");
 
 		//====================
 		// INIT
diff --git a/src/java/growthcraft/rice/Config.java b/src/java/growthcraft/rice/Config.java
@@ -13,11 +13,6 @@ public class Config extends ConfigBase
 	public final int paddyFieldMax = 7;
 	public final int riceSakeColor = 0xE9EFF7;
 
-	public Config(File dirname, String filename)
-	{
-		super(dirname, filename);
-	}
-
 	protected void loadConfig()
 	{
 		this.riceGrowthRate = (float)config.get(Configuration.CATEGORY_GENERAL, "Rice growth rate", (double)riceGrowthRate, "[Higher -> Slower] Default : " + riceGrowthRate).getDouble();
diff --git a/src/java/growthcraft/rice/GrowthCraftRice.java b/src/java/growthcraft/rice/GrowthCraftRice.java
@@ -80,7 +80,8 @@ public static growthcraft.rice.Config getConfig()
 	@EventHandler
 	public void preload(FMLPreInitializationEvent event)
 	{
-		config = new growthcraft.rice.Config(event.getModConfigurationDirectory(), "growthcraft/rice.conf");
+		config = new growthcraft.rice.Config();
+		config.load(event.getModConfigurationDirectory(), "growthcraft/rice.conf");
 
 		//====================
 		// INIT

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@ public static growthcraft.apples.Config getConfig()`
`76`	`76`	`@EventHandler`
`77`	`77`	`public void preload(FMLPreInitializationEvent event)`
`78`	`78`	`{`
`79`		`- config = new growthcraft.apples.Config(event.getModConfigurationDirectory(), "growthcraft/apples.conf");`
	`79`	`+ config = new growthcraft.apples.Config();`
	`80`	`+ config.load(event.getModConfigurationDirectory(), "growthcraft/apples.conf");`
`80`	`81`
`81`	`82`	`//====================`
`82`	`83`	`// INIT`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,8 @@ public static growthcraft.bamboo.Config getConfig()`
`98`	`98`	`@EventHandler`
`99`	`99`	`public void preload(FMLPreInitializationEvent event)`
`100`	`100`	`{`
`101`		`- config = new growthcraft.bamboo.Config(event.getModConfigurationDirectory(), "growthcraft/bamboo.conf");`
	`101`	`+ config = new growthcraft.bamboo.Config();`
	`102`	`+ config.load(event.getModConfigurationDirectory(), "growthcraft/bamboo.conf");`
`102`	`103`
`103`	`104`	`//====================`
`104`	`105`	`// INIT`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,8 @@ public static growthcraft.bees.Config getConfig()`
`85`	`85`	`@EventHandler`
`86`	`86`	`public void preload(FMLPreInitializationEvent event)`
`87`	`87`	`{`
`88`		`- config = new growthcraft.bees.Config(event.getModConfigurationDirectory(), "growthcraft/bees.conf");`
	`88`	`+ config = new growthcraft.bees.Config();`
	`89`	`+ config.load(event.getModConfigurationDirectory(), "growthcraft/bees.conf");`
`89`	`90`
`90`	`91`	`//====================`
`91`	`92`	`// INIT`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,8 @@ public static growthcraft.cellar.Config getConfig()`
`91`	`91`	`@EventHandler`
`92`	`92`	`public void preload(FMLPreInitializationEvent event)`
`93`	`93`	`{`
`94`		`- config = new growthcraft.cellar.Config(event.getModConfigurationDirectory(), "growthcraft/cellar.conf");`
	`94`	`+ config = new growthcraft.cellar.Config();`
	`95`	`+ config.load(event.getModConfigurationDirectory(), "growthcraft/cellar.conf");`
`95`	`96`
`96`	`97`	`//====================`
`97`	`98`	`// INIT`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,6 @@`
`6`	`6`
`7`	`7`	`public class Config extends ConfigBase`
`8`	`8`	`{`
`9`		`- public Config(File dirname, String filename)`
`10`		`- {`
`11`		`- super(dirname, filename);`
`12`		`- }`
`13`	`9`
`14`	`10`	`protected void loadConfig()`
`15`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,8 @@ public static growthcraft.core.Config getConfig()`
`61`	`61`	`@EventHandler`
`62`	`62`	`public void preload(FMLPreInitializationEvent event)`
`63`	`63`	`{`
`64`		`- config = new growthcraft.core.Config(event.getModConfigurationDirectory(), "growthcraft/core.conf");`
	`64`	`+ config = new growthcraft.core.Config();`
	`65`	`+ config.load(event.getModConfigurationDirectory(), "growthcraft/core.conf");`
`65`	`66`
`66`	`67`	`tab = new CreativeTabGrowthcraft("tabGrowthCraft");`
`67`	`68`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ public static growthcraft.fishtrap.Config getConfig()`
`47`	`47`	`@EventHandler`
`48`	`48`	`public void preload(FMLPreInitializationEvent event)`
`49`	`49`	`{`
`50`		`- config = new growthcraft.fishtrap.Config(event.getModConfigurationDirectory(), "growthcraft/fishtrap.conf");`
	`50`	`+ config = new growthcraft.fishtrap.Config();`
	`51`	`+ config.load(event.getModConfigurationDirectory(), "growthcraft/fishtrap.conf");`
`51`	`52`
`52`	`53`	`//====================`
`53`	`54`	`// INIT`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,8 @@ public static growthcraft.grapes.Config getConfig()`
`86`	`86`	`@EventHandler`
`87`	`87`	`public void preload(FMLPreInitializationEvent event)`
`88`	`88`	`{`
`89`		`- config = new growthcraft.grapes.Config(event.getModConfigurationDirectory(), "growthcraft/grapes.conf");`
	`89`	`+ config = new growthcraft.grapes.Config();`
	`90`	`+ config.load(event.getModConfigurationDirectory(), "growthcraft/grapes.conf");`
`90`	`91`
`91`	`92`	`//====================`
`92`	`93`	`// INIT`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@ public static growthcraft.hops.Config getConfig()`
`81`	`81`	`@EventHandler`
`82`	`82`	`public void preload(FMLPreInitializationEvent event)`
`83`	`83`	`{`
`84`		`- config = new growthcraft.hops.Config(event.getModConfigurationDirectory(), "growthcraft/hops.conf");`
	`84`	`+ config = new growthcraft.hops.Config();`
	`85`	`+ config.load(event.getModConfigurationDirectory(), "growthcraft/hops.conf");`
`85`	`86`
`86`	`87`	`//====================`
`87`	`88`	`// INIT`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,8 @@ public static growthcraft.rice.Config getConfig()`
`80`	`80`	`@EventHandler`
`81`	`81`	`public void preload(FMLPreInitializationEvent event)`
`82`	`82`	`{`
`83`		`- config = new growthcraft.rice.Config(event.getModConfigurationDirectory(), "growthcraft/rice.conf");`
	`83`	`+ config = new growthcraft.rice.Config();`
	`84`	`+ config.load(event.getModConfigurationDirectory(), "growthcraft/rice.conf");`
`84`	`85`
`85`	`86`	`//====================`
`86`	`87`	`// INIT`