Save configuration during onDisable, formatting

MilkBowl · Aug 26, 2011 · 2c52fc4 · 2c52fc4
1 parent 31a9e03
commit 2c52fc4
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 47 deletions.
diff --git a/src/net/milkbowl/autosave/AutoSave.java b/src/net/milkbowl/autosave/AutoSave.java
@@ -51,6 +51,9 @@ public class AutoSave extends JavaPlugin {
 	@Override
 	public void onDisable() {
 
+		// Save config
+		config.save();
+
 		// Perform a Save NOW!
 		performSave();
 
@@ -94,13 +97,6 @@ public void onEnable() {
 		config = new AutoSaveConfig(getConfiguration());
 		config.load();
 
-		// Ensure our folder exists...
-		File dir = new File("plugins/AutoSave");
-		dir.mkdir();
-
-		// Load configuration
-		// loadConfigFile();
-
 		// Test the waters, make sure we are running a build that has the
 		// methods we NEED
 		try {
@@ -111,12 +107,8 @@ public void onEnable() {
 			org.bukkit.World.class.getMethod("save", new Class[] {});
 		} catch (NoSuchMethodException e) {
 			// Do error stuff
-			log.severe(String.format(
-					"[%s] ERROR: Server version is incompatible with %s!",
-					getDescription().getName(), getDescription().getName()));
-			log.severe(String.format(
-					"[%s] Could not find method \"%s\", disabling!",
-					getDescription().getName(), e.getMessage()));
+			log.severe(String.format("[%s] ERROR: Server version is incompatible with %s!", getDescription().getName(), getDescription().getName()));
+			log.severe(String.format("[%s] Could not find method \"%s\", disabling!", getDescription().getName(), e.getMessage()));
 
 			// Clean up
 			getPluginLoader().disablePlugin(this);
@@ -137,9 +129,7 @@ public void onEnable() {
 		startThread(ThreadType.SAVE);
 
 		// Notify on logger load
-		log.info(String.format("[%s] Version %s is enabled: %s",
-				getDescription().getName(), getDescription().getVersion(),
-				config.varUuid.toString()));
+		log.info(String.format("[%s] Version %s is enabled: %s", getDescription().getName(), getDescription().getVersion(), config.varUuid.toString()));
 	}
 
 	@Override

diff --git a/src/net/milkbowl/autosave/AutoSaveConfig.java b/src/net/milkbowl/autosave/AutoSaveConfig.java
@@ -20,15 +20,14 @@
 
 package net.milkbowl.autosave;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
 import org.bukkit.util.config.Configuration;
 
 public class AutoSaveConfig {
 
-	Configuration config;
+	private Configuration config;
 
 	public AutoSaveConfig(Configuration config) {
 		this.config = config;
@@ -69,34 +68,20 @@ public AutoSaveConfig(Configuration config) {
 	public void load() {
 
 		// Messages
-		messageBroadcastPre = config.getString("messages.broadcast.pre",
-				messageBroadcastPre);
-		messageBroadcastPost = config.getString("messages.broadcast.post",
-				messageBroadcastPost);
-		messageStatusFail = config.getString("messages.status.fail",
-				messageStatusFail);
-		messageStatusNotRun = config.getString("messages.status.notrun",
-				messageStatusNotRun);
-		messageStatusSuccess = config.getString("messages.status.success",
-				messageStatusSuccess);
-		messageStatusOff = config.getString("messages.status.off",
-				messageStatusOff);
-		messageInsufficientPermissions = config.getString(
-				"messages.insufficentpermissions",
-				messageInsufficientPermissions);
-		messageStopping = config
-				.getString("messages.stopping", messageStopping);
-		messageStarting = config
-				.getString("messages.starting", messageStarting);
+		messageBroadcastPre = config.getString("messages.broadcast.pre", messageBroadcastPre);
+		messageBroadcastPost = config.getString("messages.broadcast.post", messageBroadcastPost);
+		messageStatusFail = config.getString("messages.status.fail", messageStatusFail);
+		messageStatusNotRun = config.getString("messages.status.notrun", messageStatusNotRun);
+		messageStatusSuccess = config.getString("messages.status.success", messageStatusSuccess);
+		messageStatusOff = config.getString("messages.status.off", messageStatusOff);
+		messageInsufficientPermissions = config.getString("messages.insufficentpermissions", messageInsufficientPermissions);
+		messageStopping = config.getString("messages.stopping", messageStopping);
+		messageStarting = config.getString("messages.starting", messageStarting);
 		messageInfoNaN = config.getString("messages.info.nan", messageInfoNaN);
-		messageInfoChangeSuccess = config.getString(
-				"messages.info.changesuccess", messageInfoChangeSuccess);
-		messageInfoLookup = config.getString("messages.info.lookup",
-				messageInfoLookup);
-		messageInfoListLookup = config.getString("messages.info.listlookup",
-				messageInfoListLookup);
-		messageInfoInvalid = config.getString("messages.info.invalid",
-				messageInfoInvalid);
+		messageInfoChangeSuccess = config.getString("messages.info.changesuccess", messageInfoChangeSuccess);
+		messageInfoLookup = config.getString("messages.info.lookup", messageInfoLookup);
+		messageInfoListLookup = config.getString("messages.info.listlookup", messageInfoListLookup);
+		messageInfoInvalid = config.getString("messages.info.invalid", messageInfoInvalid);
 		messageVersion = config.getString("messages.version", messageVersion);
 		messageWarning = config.getString("messages.warning", messageWarning);
 
@@ -122,10 +107,26 @@ public void load() {
 			config.setProperty("var.warntime", varWarnTimes);
 		}
 
-		varUuid = UUID.fromString(config.getString("var.uuid", UUID
-				.randomUUID().toString()));
+		varUuid = UUID.fromString(config.getString("var.uuid", UUID.randomUUID().toString()));
 		varReport = config.getBoolean("var.report", varReport);
 
 		config.save();
 	}
+
+	public void save() {
+		// Values
+		config.setProperty("value.on", valueOn);
+		config.setProperty("value.off", valueOff);
+
+		// Variables
+		config.setProperty("var.debug", varDebug);
+		config.setProperty("var.broadcast", varBroadcast);
+		config.setProperty("var.interval", varInterval);
+		config.setProperty("var.mode", varMode.name());
+		config.setProperty("var.worlds", varWorlds);
+		config.setProperty("var.warntime", varWarnTimes);
+		config.setProperty("var.report", varReport);
+
+		config.save();
+	}
 }