LiteLoader 1.6.4_02 - fixed missing config dir causing crash with new startup or…

…der, minor config changes

LiteLoader 1.6.4_02 - fixed missing config dir causing crash with new startup or…
…der, minor config changes
Mumfrey
1 parent 86bd548c
Showing 4 changed files with 45 additions and 18 deletions
java/com/mumfrey/liteloader/core/LiteLoader.java
java/com/mumfrey/liteloader/core/LiteLoaderBootstrap.java
java/com/mumfrey/liteloader/core/LiteLoaderEnumerator.java
res/liteloader.properties
@@ -51,6 +51,10 @@ import com.mumfrey.liteloader.util.PrivateFields;
  */
 public final class LiteLoader
 {
+	private static final String OPTION_MOD_INFO_SCREEN   = "modInfoScreen";
+	private static final String OPTION_SOUND_MANAGER_FIX = "soundManagerFix";
+	private static final String OPTION_CONTROLS_PAGES    = "controls.pages";
+
 	/**
 	 * LiteLoader is a singleton, this is the singleton instance
 	 */
@@ -314,9 +318,9 @@ public final class LiteLoader
 				catch (Exception ex) {}
 			}
-			this.paginateControls = this.bootstrap.getAndStoreBooleanProperty("controls.pages", true);
-			this.inhibitSoundManagerReload = this.bootstrap.getAndStoreBooleanProperty("soundManagerFix", true);
-			this.displayModInfoScreenTab = this.bootstrap.getAndStoreBooleanProperty("modInfoScreen", true);
+			this.paginateControls = this.bootstrap.getAndStoreBooleanProperty(OPTION_CONTROLS_PAGES, true);
+			this.inhibitSoundManagerReload = this.bootstrap.getAndStoreBooleanProperty(OPTION_SOUND_MANAGER_FIX, true);
+			this.displayModInfoScreenTab = this.bootstrap.getAndStoreBooleanProperty(OPTION_MOD_INFO_SCREEN, true);
 			this.enumerator.discoverModClasses();
 		}
@@ -1034,7 +1038,7 @@ public final class LiteLoader
 	public void setDisplayModInfoScreenTab(boolean show)
 	{
 		this.displayModInfoScreenTab = show;
-		this.bootstrap.setBooleanProperty("modInfoScreen", show);
+		this.bootstrap.setBooleanProperty(OPTION_MOD_INFO_SCREEN, show);
 		this.bootstrap.writeProperties();
 	}
@@ -123,6 +123,9 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 		this.configBaseFolder = new File(this.gameDirectory,    "liteconfig");
 		this.logFile          = new File(this.configBaseFolder, "liteloader.log");
 		this.propertiesFile   = new File(this.configBaseFolder, "liteloader.properties");
+
+		if (!this.modsFolder.exists()) this.modsFolder.mkdirs();
+		if (!this.configBaseFolder.exists()) this.configBaseFolder.mkdirs();
 	}
 	/* (non-Javadoc)
@@ -156,6 +159,9 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 	@Override
 	public void init(List<String> modsToLoad, LaunchClassLoader classLoader)
 	{
+		// PreInit failed
+		if (this.enumerator == null) return;
+		
 		try
 		{
 			if (LiteLoaderBootstrap.logger.getHandlers().length < 1)
@@ -173,6 +179,9 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 	@Override
 	public void postInit()
 	{
+		// PreInit failed
+		if (this.enumerator == null) return;
+		
 		try
 		{
 			if (LiteLoaderBootstrap.logger.getHandlers().length < 1)
@@ -43,6 +43,12 @@ import com.mumfrey.liteloader.launch.LiteLoaderTweaker;
  */
 class LiteLoaderEnumerator implements FilenameFilter
 {
+	private static final String OPTION_SEARCH_ZIPFILES  = "search.zipfiles";
+	private static final String OPTION_SEARCH_JARFILES  = "search.jarfiles";
+	private static final String OPTION_SEARCH_MODS      = "search.mods";
+	private static final String OPTION_SEARCH_JAR       = "search.jar";
+	private static final String OPTION_SEARCH_CLASSPATH = "search.classpath";
+
 	/**
 	 * Maximum recursion depth for mod discovery
 	 */
@@ -111,6 +117,9 @@ class LiteLoaderEnumerator implements FilenameFilter
 		// Read the discovery settings from the properties 
 		this.readSettings();
+		
+		// Write settings back to the properties file, in case they changed 
+		this.writeSettings();
 	}
 	/**
@@ -176,13 +185,13 @@ class LiteLoaderEnumerator implements FilenameFilter
 	/**
 	 * Get the discovery settings from the properties file
 	 */
-	public void readSettings()
+	private void readSettings()
 	{
-		this.readZipFiles           = this.bootstrap.getAndStoreBooleanProperty("search.zips",     false);
-		this.readZipFiles           = this.bootstrap.getAndStoreBooleanProperty("search.jars",      true);
-		this.searchModsFolder       = this.bootstrap.getAndStoreBooleanProperty("search.mods",      true);
-		this.searchProtectionDomain = this.bootstrap.getAndStoreBooleanProperty("search.jar",       true);
-		this.searchClassPath        = this.bootstrap.getAndStoreBooleanProperty("search.classpath", true);
+		this.readZipFiles           = this.bootstrap.getAndStoreBooleanProperty(OPTION_SEARCH_ZIPFILES,  false);
+		this.readJarFiles           = this.bootstrap.getAndStoreBooleanProperty(OPTION_SEARCH_JARFILES,  true);
+		this.searchModsFolder       = this.bootstrap.getAndStoreBooleanProperty(OPTION_SEARCH_MODS,      true);
+		this.searchProtectionDomain = this.bootstrap.getAndStoreBooleanProperty(OPTION_SEARCH_JAR,       true);
+		this.searchClassPath        = this.bootstrap.getAndStoreBooleanProperty(OPTION_SEARCH_CLASSPATH, true);
 		if (!this.searchModsFolder && !this.searchProtectionDomain && !this.searchClassPath)
 		{
@@ -192,12 +201,18 @@ class LiteLoaderEnumerator implements FilenameFilter
 			this.searchProtectionDomain = true;
 			this.searchClassPath        = true;
 		}
-		
-		this.bootstrap.setBooleanProperty("search.zips",      this.readZipFiles);
-		this.bootstrap.setBooleanProperty("search.jars",      this.readJarFiles);
-		this.bootstrap.setBooleanProperty("search.mods",      this.searchModsFolder);
-		this.bootstrap.setBooleanProperty("search.jar",       this.searchProtectionDomain);
-		this.bootstrap.setBooleanProperty("search.classpath", this.searchClassPath);
+	}
+
+	/**
+	 * Write settings
+	 */
+	private void writeSettings()
+	{
+		this.bootstrap.setBooleanProperty(OPTION_SEARCH_ZIPFILES,  this.readZipFiles);
+		this.bootstrap.setBooleanProperty(OPTION_SEARCH_JARFILES,  this.readJarFiles);
+		this.bootstrap.setBooleanProperty(OPTION_SEARCH_MODS,      this.searchModsFolder);
+		this.bootstrap.setBooleanProperty(OPTION_SEARCH_JAR,       this.searchProtectionDomain);
+		this.bootstrap.setBooleanProperty(OPTION_SEARCH_CLASSPATH, this.searchClassPath);
 	}
 	/**
@@ -3,5 +3,4 @@ search.jar=true
 search.classpath=true
 log=stderr
 controls.pages=true
-brand=The Voxel Modpack
-
+brand=Development version (NOT FOR RELEASE)
 \ No newline at end of file