LiteLoader 1.6.4_02 - experimental - multi-stage startup process to support twea…

…k injection and loading mods from jars, added meta to allow FML to load LL

LiteLoader 1.6.4_02 - experimental - multi-stage startup process to support twea…
…k injection and loading mods from jars, added meta to allow FML to load LL
Mumfrey
1 parent 07ffd14f
Showing 18 changed files with 1611 additions and 1218 deletions
ant/build_liteloader.xml
java/com/mumfrey/liteloader/core/ClassPathMod.java
java/com/mumfrey/liteloader/core/Events.java
java/com/mumfrey/liteloader/core/LiteLoader.java
java/com/mumfrey/liteloader/core/LiteLoaderBootstrap.java
java/com/mumfrey/liteloader/core/LiteLoaderEnumerator.java
java/com/mumfrey/liteloader/core/LiteLoaderVersion.java
java/com/mumfrey/liteloader/core/ModFile.java
java/com/mumfrey/liteloader/core/PluginChannels.java
java/com/mumfrey/liteloader/core/SoundManagerReloadInhibitor.java
java/com/mumfrey/liteloader/core/hooks/HookProfiler.java
java/com/mumfrey/liteloader/core/CallableLiteLoaderBrand.java → java/com/mumfrey/liteloader/crashreport/CallableLiteLoaderBrand.java
java/com/mumfrey/liteloader/core/CallableLiteLoaderMods.java → java/com/mumfrey/liteloader/crashreport/CallableLiteLoaderMods.java
java/com/mumfrey/liteloader/launch/ILoaderBootstrap.java
java/com/mumfrey/liteloader/launch/LiteLoaderTransformer.java
java/com/mumfrey/liteloader/launch/LiteLoaderTweaker.java
java/com/mumfrey/liteloader/log/LiteLoaderLogFormatter.java
java/com/mumfrey/liteloader/util/ModUtilities.java
@@ -13,6 +13,7 @@
 	<property name="project" value="LiteLoader" />
 	<property name="md5set" value="mcp" />
 	<property name="outmd5set" value="liteloader" />
+	<property name="tweakclass" value="com.mumfrey.liteloader.launch.LiteLoaderTweaker" />
  
 	<property name="mcp.dir" location="../../.." />
 	<property name="build" location="${mcp.dir}/build" />
@@ -202,12 +203,14 @@
 		<echo level="info" message="Building final output" />
  
 		<mkdir dir="${dist.dir}" />
+		
 		<jar destfile="${dist.dir}/${ant.project.name}-${mcversion}.${filetype}" duplicate="preserve" index="true" manifestencoding="UTF-8">
 			<manifest>
 				<attribute name="Built-By" value="MCP (http://mcp.ocean-labs.de)" />
 				<attribute name="Implementation-Vendor" value="${author}" />
 				<attribute name="Implementation-Title" value="${ant.project.name}" />
 				<attribute name="Implementation-Version" value="${version}" />
+				<attribute name="TweakClass" value="${tweakclass}" />
 			</manifest>
 			<fileset dir="${stage.dir}" />
 		</jar>
 package com.mumfrey.liteloader.core;
  
 import java.io.File;
+import java.util.logging.Logger;
  
 import com.mumfrey.liteloader.resources.ModResourcePack;
 import com.mumfrey.liteloader.resources.ModResourcePackDir;
@@ -13,8 +14,10 @@ import com.mumfrey.liteloader.resources.ModResourcePackDir;
 public class ClassPathMod extends ModFile
 {
 	private static final long serialVersionUID = -4759310661966590773L;
+	
+	private static final Logger logger = Logger.getLogger("liteloader");
  
-	public ClassPathMod(File file, String name, String version)
+	ClassPathMod(File file, String name, String version)
 	{
 		super(file, "");
  
@@ -29,22 +32,22 @@ public class ClassPathMod extends ModFile
 	}
  
 	@Override
-	public boolean registerAsResourcePack(String name)
+	public boolean canRegisterAsResourcePack(String name)
 	{
 		if (this.resourcePack == null)
 		{
 			if (this.isDirectory())
 			{
-				LiteLoader.getLogger().info(String.format("Registering \"%s/%s\" as mod resource pack with identifier \"%s\"", this.getParentFile().getName(), this.getName(), name));
+				ClassPathMod.logger.info(String.format("Registering \"%s/%s\" as mod resource pack with identifier \"%s\"", this.getParentFile().getName(), this.getName(), name));
 				this.resourcePack = new ModResourcePackDir(name, this);
 			}
 			else
 			{
-				LiteLoader.getLogger().info(String.format("Registering \"%s\" as mod resource pack with identifier \"%s\"", this.getName(), name));
+				ClassPathMod.logger.info(String.format("Registering \"%s\" as mod resource pack with identifier \"%s\"", this.getName(), name));
 				this.resourcePack = new ModResourcePack(name, this);
 			}
  
-			return LiteLoader.getInstance().registerModResourcePack(this.resourcePack);
+			return true;
 		}
  
 		return false;
@@ -129,7 +129,14 @@ public class Events implements IPlayerUsage
 	 */
 	private LinkedList<PreLoginListener> preLoginListeners = new LinkedList<PreLoginListener>();
  
-	public Events(LiteLoader loader, Minecraft minecraft, PluginChannels pluginChannels)
+	/**
+	 * Package private ctor
+	 * 
+	 * @param loader
+	 * @param minecraft
+	 * @param pluginChannels
+	 */
+	Events(LiteLoader loader, Minecraft minecraft, PluginChannels pluginChannels)
 	{
 		this.loader = loader;
 		this.minecraft = minecraft;
@@ -405,9 +412,9 @@ public class Events implements IPlayerUsage
 	/**
 	 * Late initialisation callback
 	 */
-	public void onInit()
+	public void preBeginGame()
 	{
-		this.loader.refreshResources();
+		this.loader.preInitMods();
  
 		if (!this.lateInitDone)
 		{
@@ -427,7 +434,7 @@ public class Events implements IPlayerUsage
 			}
 		}
  
-		this.loader.onInit();
+		this.loader.preBeginGame();
 	}
  
 	/**
 package com.mumfrey.liteloader.core;
  
-import java.io.*;
-import java.lang.reflect.Field;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLDecoder;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -14,23 +13,12 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Properties;
-import java.util.TreeSet;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-import java.util.logging.FileHandler;
-import java.util.logging.Formatter;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.logging.StreamHandler;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
  
 import javax.activity.InvalidActivityException;
  
-import net.minecraft.client.ClientBrandRetriever;
 import net.minecraft.launchwrapper.LaunchClassLoader;
 import net.minecraft.src.CrashReport;
 import net.minecraft.src.GuiControls;
@@ -43,9 +31,9 @@ import net.minecraft.src.ResourcePack;
 import net.minecraft.src.SimpleReloadableResourceManager;
  
 import com.mumfrey.liteloader.*;
+import com.mumfrey.liteloader.crashreport.CallableLiteLoaderBrand;
+import com.mumfrey.liteloader.crashreport.CallableLiteLoaderMods;
 import com.mumfrey.liteloader.gui.GuiControlsPaginated;
-import com.mumfrey.liteloader.launch.LiteLoaderTweaker;
-import com.mumfrey.liteloader.log.LiteLoaderLogFormatter;
 import com.mumfrey.liteloader.permissions.PermissionsManagerClient;
 import com.mumfrey.liteloader.util.PrivateFields;
  
@@ -54,21 +42,11 @@ import com.mumfrey.liteloader.util.PrivateFields;
  * lightweight mods
  * 
  * @author Adam Mummery-Smith
- * @version 1.6.4_01
+ * @version 1.6.4_02
  */
-public final class LiteLoader implements FilenameFilter
+public final class LiteLoader
 {
 	/**
-	 * Liteloader version
-	 */
-	private static final LiteLoaderVersion VERSION = LiteLoaderVersion.MC_1_6_4_R1;
-	
-	/**
-	 * Maximum recursion depth for mod discovery
-	 */
-	private static final int MAX_DISCOVERY_DEPTH = 16;
-	
-	/**
 	 * LiteLoader is a singleton, this is the singleton instance
 	 */
 	private static LiteLoader instance;
@@ -79,26 +57,6 @@ public final class LiteLoader implements FilenameFilter
 	private static final Logger logger = Logger.getLogger("liteloader");
  
 	/**
-	 * Use stdout rather than stderr
-	 */
-	private static boolean useStdOut = false;
-	
-	/**
-	 * Game dir from launcher
-	 */
-	private static File gameDirectory;
-	
-	/**
-	 * Assets dir from launcher
-	 */
-	private static File assetsDirectory;
-	
-	/**
-	 * Profile name from launcher
-	 */
-	private static String profile = "";
-	
-	/**
 	 * Tweak system class loader 
 	 */
 	private static LaunchClassLoader classLoader;
@@ -135,51 +93,25 @@ public final class LiteLoader implements FilenameFilter
 	private File enabledModsFile;
  
 	/**
-	 * File to write log entries to
-	 */
-	private File logFile;
-	
-	/**
 	 * Reference to the Minecraft game instance
 	 */
 	private Minecraft minecraft;
  
 	/**
-	 * File containing the properties
-	 */
-	private File propertiesFile;
-	
-	/**
-	 * Internal properties loaded from inside the jar
-	 */
-	private Properties internalProperties = new Properties();
-	
-	/**
-	 * LiteLoader properties
-	 */
-	private Properties localProperties = new Properties();
-	
-	/**
-	 * Pack brand from properties, used to put the modpack/compilation name in
-	 * crash reports
-	 */
-	private String branding = null;
-	
-	/**
 	 * Setting value, if true we will swap out the MC "Controls" GUI for our
 	 * custom, paginated one
 	 */
 	private boolean paginateControls = true;
  
 	/**
-	 * Classes to load, mapped by class name 
+	 * Loader Bootstrap instance 
 	 */
-	private final Map<String, Class<? extends LiteMod>> modsToLoad = new HashMap<String, Class<? extends LiteMod>>();
+	private final LiteLoaderBootstrap bootstrap;
  
 	/**
-	 * Mod metadata from version file 
+	 * Mod enumerator instance
 	 */
-	private final Map<String, ModFile> modFiles = new HashMap<String, ModFile>();
+	private final LiteLoaderEnumerator enumerator;
  
 	/**
 	 * Registered resource packs 
@@ -224,7 +156,7 @@ public final class LiteLoader implements FilenameFilter
 	/**
 	 * Flag which keeps track of whether late initialisation has been done
 	 */
-	private boolean preInitStarted, preInitCompleted, postInitStarted, startupComplete;
+	private boolean postInitStarted, startupComplete;
  
 	/**
 	 * True while initialising mods if we need to do a resource manager reload once the process is completed
@@ -263,20 +195,6 @@ public final class LiteLoader implements FilenameFilter
 	private Map<KeyBinding, Integer> storedModKeyBindings = new HashMap<KeyBinding, Integer>();
  
 	/**
-	 * True if liteloader should also search files ending with .zip
-	 */
-	private boolean readZipFiles = false;
-	
-	/**
-	 * True if the loader is allowed to load tweak classes from mod files 
-	 */
-	private final boolean loadTweaks;
-
-	private boolean searchModsFolder = true;
-	private boolean searchProtectionDomain = true;
-	private boolean searchClassPath = true;
-	
-	/**
 	 * Pre-init routine, called using reflection by the tweaker
 	 * 
 	 * @param gameDirectory Game directory passed to the tweaker
@@ -285,26 +203,21 @@ public final class LiteLoader implements FilenameFilter
 	 * @param modNameFilter List of mod names parsed from the command line
 	 * @param classLoader LaunchClassLoader
 	 */
-	@SuppressWarnings("unused")
-	private static final void preInit(File gameDirectory, File assetsDirectory, String profile, List<String> modNameFilter, LaunchClassLoader classLoader, boolean loadTweaks)
+	static final void init(LiteLoaderBootstrap bootstrap, LiteLoaderEnumerator enumerator, List<String> modNameFilter, LaunchClassLoader classLoader)
 	{
 		if (LiteLoader.instance == null)
 		{
-			LiteLoader.gameDirectory = gameDirectory;
-			LiteLoader.assetsDirectory = assetsDirectory;
-			LiteLoader.profile = profile;
 			LiteLoader.classLoader = classLoader;
  
-			LiteLoader.instance = new LiteLoader(profile, modNameFilter, loadTweaks);
-			LiteLoader.instance.onPreInit();
+			LiteLoader.instance = new LiteLoader(bootstrap, enumerator, modNameFilter);
+			LiteLoader.instance.onInit();
 		}
 	}
  
 	/**
 	 * Post-init routine, initialises and loads mods enumerated in preInit
 	 */
-	@SuppressWarnings("unused")
-	private static final void postInit()
+	static final void postInit()
 	{
 		if (LiteLoader.instance != null)
 		{
@@ -318,39 +231,34 @@ public final class LiteLoader implements FilenameFilter
 	 * @param profile 
 	 * @param modNameFilter 
 	 */
-	private LiteLoader(String profile, List<String> modNameFilter, boolean loadTweaks)
+	private LiteLoader(LiteLoaderBootstrap bootstrap, LiteLoaderEnumerator enumerator, List<String> modNameFilter)
 	{
-		// This valus is passed through from the tweaker, if we are being called pre-startup then this will be true
-		// since we are starting up early enough to load tweaks. At the moment we can't do this because if we start
-		// before a name transformer then all hell breaks loose later on. Need to split the mod enumeration into a separate
-		// class before this is likely to work as intended.
-		this.loadTweaks = loadTweaks;
-
-		this.initPaths();
+		this.bootstrap = bootstrap;
+		this.enumerator = enumerator;
+		
+		this.setupPaths(bootstrap);
  
 		this.enabledModsList = EnabledModsList.createFrom(this.enabledModsFile);
-		this.enabledModsList.processModsList(profile, modNameFilter);
+		this.enabledModsList.processModsList(bootstrap.getProfile(), modNameFilter);
 	}
  
 	/**
 	 * Set up paths used by the loader
 	 */
-	private void initPaths()
+	private void setupPaths(LiteLoaderBootstrap bootstrap)
 	{
-		this.modsFolder = new File(LiteLoader.gameDirectory, "mods");
-		this.configBaseFolder = new File(LiteLoader.gameDirectory, "liteconfig");
+		this.modsFolder = bootstrap.getModsFolder();
+		this.configBaseFolder = bootstrap.getConfigBaseFolder();
  
 		this.commonConfigFolder = new File(this.configBaseFolder, "common");
-		this.versionConfigFolder = this.inflectVersionedConfigPath(LiteLoader.VERSION);
+		this.versionConfigFolder = this.inflectVersionedConfigPath(LiteLoaderBootstrap.VERSION);
  
 		if (!this.modsFolder.exists()) this.modsFolder.mkdirs();
 		if (!this.configBaseFolder.exists()) this.configBaseFolder.mkdirs();
 		if (!this.commonConfigFolder.exists()) this.commonConfigFolder.mkdirs();
 		if (!this.versionConfigFolder.exists()) this.versionConfigFolder.mkdirs();
  
-		this.propertiesFile = new File(this.configBaseFolder, "liteloader.properties");
 		this.enabledModsFile = new File(this.configBaseFolder, "liteloader.profiles.json");
-		this.logFile = new File(this.configBaseFolder, "liteloader.log");
 		this.keyMapSettingsFile = new File(this.configBaseFolder, "liteloader.keys.properties");
 	}
  
@@ -358,7 +266,7 @@ public final class LiteLoader implements FilenameFilter
 	 * @param version
 	 * @return
 	 */
-	protected File inflectVersionedConfigPath(LiteLoaderVersion version)
+	private File inflectVersionedConfigPath(LiteLoaderVersion version)
 	{
 		if (version.equals(LiteLoaderVersion.LEGACY))
 		{
@@ -367,45 +275,40 @@ public final class LiteLoader implements FilenameFilter
  
 		return new File(this.configBaseFolder, String.format("config.%s", version.getMinecraftVersion()));
 	}
-	
+
 	/**
-	 * Loader initialisation
+	 * Set up reflection methods required by the loader
 	 */
-	private void onPreInit()
+	private boolean onInit()
 	{
-		if (this.preInitStarted) return;
-		this.preInitStarted = true;
-		
-		// Set up loader, initialises any reflection methods needed
-		if (this.prepareLoader())
+		try
 		{
-			LiteLoader.logInfo("LiteLoader %s starting up...", VERSION.getLoaderVersion());
-			
-			// Print the branding version if any was provided
-			if (this.branding != null)
+			if (this.keyMapSettingsFile.exists())
 			{
-				LiteLoader.logInfo("Active Pack: %s", this.branding);
+				try
+				{
+					this.keyMapSettings.load(new FileReader(this.keyMapSettingsFile));
+				}
+				catch (Exception ex) {}
 			}
  
-			LiteLoader.logInfo("Java reports OS=\"%s\"", System.getProperty("os.name").toLowerCase());
-			
-			// Read the discovery settings from the properties 
-			this.prepareDiscoverySettings();
+			this.paginateControls = this.bootstrap.getAndStoreBooleanProperty("controls.pages", true);
+			this.inhibitSoundManagerReload = this.bootstrap.getAndStoreBooleanProperty("soundManagerFix", true);
  
-			// Examines the class path and mods folder and locates loadable mods
-			this.discoverMods();
-
-			// Set the loader branding in ClientBrandRetriever using reflection
-			this.setBranding("LiteLoader");
-			
-			LiteLoader.logInfo("LiteLoader PreInit completed");
-			this.preInitCompleted = true;
+			this.enumerator.discoverModClasses();
+		}
+		catch (Throwable th)
+		{
+			LiteLoader.getLogger().log(Level.SEVERE, "Error initialising LiteLoader", th);
+			return false;
 		}
+		
+		return true;
 	}
  
 	private void onPostInit(Minecraft minecraft)
 	{
-		if (!this.preInitCompleted || this.postInitStarted) return;
+		if (this.postInitStarted) return;
 		this.postInitStarted = true;
  
 		// Cache local minecraft reference
@@ -425,178 +328,11 @@ public final class LiteLoader implements FilenameFilter
 		this.startupComplete = true;
  
 		this.enabledModsList.saveTo(this.enabledModsFile);
-		this.writeProperties();
-	}
-
-	/**
-	 * Set up reflection methods required by the loader
-	 */
-	private boolean prepareLoader()
-	{
-		try
-		{
-			// Prepare the properties
-			this.prepareProperties();
-			
-			// Prepare the log writer
-			this.prepareLogger();
-			
-			this.paginateControls = this.localProperties.getProperty("controls.pages", "true").equalsIgnoreCase("true");
-			this.localProperties.setProperty("controls.pages", String.valueOf(this.paginateControls));
-			
-			this.inhibitSoundManagerReload = this.localProperties.getProperty("soundManagerFix", "true").equalsIgnoreCase("true");
-			this.localProperties.setProperty("soundManagerFix", String.valueOf(this.inhibitSoundManagerReload));
-			
-			this.branding = this.internalProperties.getProperty("brand", null);
-			if (this.branding != null && this.branding.length() < 1)
-				this.branding = null;
-			
-			// Save appropriate branding in the local properties file
-			if (this.branding != null)
-				this.localProperties.setProperty("brand", this.branding);
-			else
-				this.localProperties.remove("brand");
-			
-		}
-		catch (Throwable th)
-		{
-			LiteLoader.getLogger().log(Level.SEVERE, "Error initialising LiteLoader", th);
-			return false;
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * @throws SecurityException
-	 * @throws IOException
-	 */
-	private void prepareLogger() throws SecurityException, IOException
-	{
-		Formatter logFormatter = new LiteLoaderLogFormatter();
-		
-		LiteLoader.logger.setUseParentHandlers(false);
-		LiteLoader.useStdOut = System.getProperty("liteloader.log", "stderr").equalsIgnoreCase("stdout") || this.localProperties.getProperty("log", "stderr").equalsIgnoreCase("stdout");
-		
-		StreamHandler consoleHandler = useStdOut ? new com.mumfrey.liteloader.util.log.ConsoleHandler() : new java.util.logging.ConsoleHandler();
-		consoleHandler.setFormatter(logFormatter);
-		LiteLoader.logger.addHandler(consoleHandler);
-		
-		FileHandler logFileHandler = new FileHandler(this.logFile.getAbsolutePath());
-		logFileHandler.setFormatter(logFormatter);
-		LiteLoader.logger.addHandler(logFileHandler);
-	}
-	
-	/**
-	 * Prepare the loader properties
-	 */
-	private void prepareProperties()
-	{
-		try
-		{
-			InputStream propertiesStream = LiteLoader.class.getResourceAsStream("/liteloader.properties");
-			
-			if (propertiesStream != null)
-			{
-				this.internalProperties.load(propertiesStream);
-				propertiesStream.close();
-			}
-		}
-		catch (Throwable th)
-		{
-			this.internalProperties = new Properties();
-		}
-		
-		try
-		{
-			this.localProperties = new Properties(this.internalProperties);
-			InputStream localPropertiesStream = this.getLocalPropertiesStream();
-			
-			if (localPropertiesStream != null)
-			{
-				this.localProperties.load(localPropertiesStream);
-				localPropertiesStream.close();
-			}
-		}
-		catch (Throwable th)
-		{
-			this.localProperties = new Properties(this.internalProperties);
-		}
-
-		if (this.keyMapSettingsFile.exists())
-		{
-			try
-			{
-				this.keyMapSettings.load(new FileReader(this.keyMapSettingsFile));
-			}
-			catch (Exception ex) {}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void prepareDiscoverySettings()
-	{
-		this.readZipFiles           = this.localProperties.getProperty("search.zips",     "false").equalsIgnoreCase("true");
-		this.searchModsFolder       = this.localProperties.getProperty("search.mods",      "true").equalsIgnoreCase("true");
-		this.searchProtectionDomain = this.localProperties.getProperty("search.jar",       "true").equalsIgnoreCase("true");
-		this.searchClassPath        = this.localProperties.getProperty("search.classpath", "true").equalsIgnoreCase("true");
-		
-		if (!this.searchModsFolder && !this.searchProtectionDomain && !this.searchClassPath)
-		{
-			LiteLoader.logWarning("Invalid configuration, no search locations defined. Enabling all search locations.");
-			
-			this.searchModsFolder       = true;
-			this.searchProtectionDomain = true;
-			this.searchClassPath        = true;
-		}
-		
-		this.localProperties.setProperty("search.zips",      String.valueOf(this.readZipFiles));
-		this.localProperties.setProperty("search.mods",      String.valueOf(this.searchModsFolder));
-		this.localProperties.setProperty("search.jar",       String.valueOf(this.searchProtectionDomain));
-		this.localProperties.setProperty("search.classpath", String.valueOf(this.searchClassPath));
-	}
-
-	/**
-	 * Get the properties stream either from the jar or from the properties file
-	 * in the minecraft folder
-	 * 
-	 * @return
-	 * @throws FileNotFoundException
-	 */
-	private InputStream getLocalPropertiesStream() throws FileNotFoundException
-	{
-		if (this.propertiesFile.exists())
-		{
-			return new FileInputStream(this.propertiesFile);
-		}
-		
-		// Otherwise read settings from the config
-		return LiteLoader.class.getResourceAsStream("/liteloader.properties");
-	}
-	
-	/**
-	 * Write current properties to the properties file
-	 */
-	private void writeProperties()
-	{
-		try
-		{
-			this.localProperties.store(new FileWriter(this.propertiesFile), String.format("Properties for LiteLoader %s", VERSION));
-		}
-		catch (Throwable th)
-		{
-			LiteLoader.getLogger().log(Level.WARNING, "Error writing liteloader properties", th);
-		}
+		this.bootstrap.writeProperties();
 	}
  
-	/**
-	 * Register a 
-	 * 
-	 * @param name
-	 * @param resourcePack
-	 * @return
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.core.ICustomResourcePackManager#registerModResourcePack(net.minecraft.src.ResourcePack)
 	 */
 	public boolean registerModResourcePack(ResourcePack resourcePack)
 	{
@@ -616,9 +352,8 @@ public final class LiteLoader implements FilenameFilter
 		return false;
 	}
  
-	/**
-	 * @param name
-	 * @return
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.core.ICustomResourcePackManager#unRegisterModResourcePack(net.minecraft.src.ResourcePack)
 	 */
 	public boolean unRegisterModResourcePack(ResourcePack resourcePack)
 	{
@@ -674,7 +409,7 @@ public final class LiteLoader implements FilenameFilter
 	 */
 	public static final PrintStream getConsoleStream()
 	{
-		return LiteLoader.useStdOut ? System.out : System.err;
+		return LiteLoaderBootstrap.getConsoleStream();
 	}
  
 	/**
@@ -684,7 +419,7 @@ public final class LiteLoader implements FilenameFilter
 	 */
 	public static final String getVersion()
 	{
-		return LiteLoader.VERSION.getLoaderVersion();
+		return LiteLoaderBootstrap.VERSION.getLoaderVersion();
 	}
  
 	/**
@@ -694,7 +429,7 @@ public final class LiteLoader implements FilenameFilter
 	 */
 	public static final int getRevision()
 	{
-		return LiteLoader.VERSION.getLoaderRevision();
+		return LiteLoaderBootstrap.VERSION.getLoaderRevision();
 	}
  
 	/**
@@ -754,7 +489,7 @@ public final class LiteLoader implements FilenameFilter
 	 */
 	public static File getGameDirectory()
 	{
-		return LiteLoader.gameDirectory;
+		return LiteLoader.getInstance().bootstrap.getGameDirectory();
 	}
  
 	/**
@@ -762,7 +497,7 @@ public final class LiteLoader implements FilenameFilter
 	 */
 	public static File getAssetsDirectory()
 	{
-		return LiteLoader.assetsDirectory;
+		return LiteLoader.getInstance().bootstrap.getAssetsDirectory();
 	}
  
 	/**
@@ -770,7 +505,7 @@ public final class LiteLoader implements FilenameFilter
 	 */
 	public static String getProfile()
 	{
-		return LiteLoader.profile;
+		return LiteLoader.getInstance().bootstrap.getProfile();
 	}
  
 	/**
@@ -806,7 +541,7 @@ public final class LiteLoader implements FilenameFilter
 	 */
 	public String getBranding()
 	{
-		return this.branding;
+		return this.bootstrap.getBranding();
 	}
  
 	/**
@@ -827,37 +562,6 @@ public final class LiteLoader implements FilenameFilter
 	}
  
 	/**
-	 * Store current revision for mod in the config file
-	 * 
-	 * @param modKey
-	 */
-	private void storeLastKnownModRevision(String modKey)
-	{
-		if (this.localProperties != null)
-		{
-			this.localProperties.setProperty(modKey, String.valueOf(LiteLoader.VERSION.getLoaderRevision()));
-			this.writeProperties();
-		}
-	}
-	
-	/**
-	 * Get last know revision for mod from the config file 
-	 * 
-	 * @param modKey
-	 * @return
-	 */
-	private int getLastKnownModRevision(String modKey)
-	{
-		if (this.localProperties != null)
-		{
-			String storedRevision = this.localProperties.getProperty(modKey, "0");
-			return Integer.parseInt(storedRevision);
-		}
-		
-		return 0;
-	}
-	
-	/**
 	 * Get a reference to a loaded mod, if the mod exists
 	 * 
 	 * @param modName Mod's name or class name
@@ -954,7 +658,7 @@ public final class LiteLoader implements FilenameFilter
 	public String getModMetaData(LiteMod mod, String metaDataKey, String defaultValue)
 	{
 		if (mod == null || metaDataKey == null) return defaultValue;
-		return this.getModMetaData(mod.getClass(), metaDataKey, defaultValue);
+		return this.enumerator.getModMetaData(mod.getClass(), metaDataKey, defaultValue);
 	}
  
 	/**
@@ -967,17 +671,7 @@ public final class LiteLoader implements FilenameFilter
 	 */
 	public String getModMetaData(Class<? extends LiteMod> modClass, String metaDataKey, String defaultValue)
 	{
-		ModFile modFile = this.getModFile(modClass);
-		return modFile != null ? modFile.getMetaValue(metaDataKey, defaultValue) : defaultValue;
-	}
-	
-	/**
-	 * @param mod
-	 * @return
-	 */
-	private ModFile getModFile(Class<? extends LiteMod> modClass)
-	{
-		return this.modFiles.get(modClass.getSimpleName());
+		return this.enumerator.getModMetaData(modClass, metaDataKey, defaultValue);
 	}
  
 	/**
@@ -988,466 +682,83 @@ public final class LiteLoader implements FilenameFilter
 	 */
 	public String getModMetaName(Class<? extends LiteMod> modClass)
 	{
-		String modClassName = modClass.getSimpleName();
-		if (!this.modFiles.containsKey(modClassName)) return null;
-		return this.modFiles.get(modClassName).getModName().toLowerCase();
+		return this.enumerator.getModMetaName(modClass);
 	}
  
 	/**
-	 * Enumerate the java class path and "mods" folder to find mod classes, then
-	 * load the classes
+	 * Create mod instances from the enumerated classes
+	 * 
+	 * @param modsToLoad List of mods to load
 	 */
-	private void discoverMods()
+	private void loadMods()
 	{
-		// List of mod files in the "mods" folder
-		List<ModFile> modFiles = new LinkedList<ModFile>();
-		
-		if (this.searchModsFolder)
-		{
-			// Find and enumerate the "mods" folder
-			File modFolder = LiteLoader.getModsFolder();
-			if (modFolder.exists() && modFolder.isDirectory())
-			{
-				LiteLoader.logInfo("Mods folder found, searching %s", modFolder.getPath());
-				this.findModFiles(modFolder, modFiles);
-				LiteLoader.logInfo("Found %d mod file(s)", modFiles.size());
-			}
-		}
-		
-		try
-		{
-			LiteLoader.logInfo("Enumerating class path...");
-			
-			String classPath = System.getProperty("java.class.path");
-			String classPathSeparator = System.getProperty("path.separator");
-			String[] classPathEntries = classPath.split(classPathSeparator);
-			
-			LiteLoader.logInfo("Class path separator=\"%s\"", classPathSeparator);
-			LiteLoader.logInfo("Class path entries=(\n   classpathEntry=%s\n)", classPath.replace(classPathSeparator, "\n   classpathEntry="));
-			
-			if (this.searchProtectionDomain || this.searchClassPath)
-				LiteLoader.logInfo("Discovering mods on class path...");
-			
-			this.findModClasses(modFiles, classPathEntries);
-			
-			LiteLoader.logInfo("Mod class discovery completed");
-		}
-		catch (Throwable th)
+		if (!this.enumerator.hasModsToLoad())
 		{
-			LiteLoader.getLogger().log(Level.WARNING, "Mod class discovery failed", th);
+			LiteLoader.logInfo("Mod class discovery failed or no mod classes were found. Not loading any mods.");
 			return;
 		}
-	}
-	
-	/**
-	 * Find mod files in the "mods" folder
-	 * 
-	 * @param modFolder Folder to search
-	 * @param modFiles List of mod files to load
-	 */
-	protected void findModFiles(File modFolder, List<ModFile> modFiles)
-	{
-		Map<String, TreeSet<ModFile>> versionOrderingSets = new HashMap<String, TreeSet<ModFile>>();
  
-		for (File modFile : modFolder.listFiles(this))
+		LiteLoader.logInfo("Discovered %d total mod(s)", this.enumerator.modsToLoadCount());
+		
+		this.pendingResourceReload = false;
+		this.soundManagerReloadInhibitor = new SoundManagerReloadInhibitor((SimpleReloadableResourceManager)this.minecraft.getResourceManager(), this.minecraft.sndManager);
+		if (this.inhibitSoundManagerReload) this.soundManagerReloadInhibitor.inhibit();
+		
+		for (Class<? extends LiteMod> mod : this.enumerator.getModsToLoad())
 		{
 			try
 			{
-				String strVersion = null;
-				
-				// Check for a version file
-				ZipFile modZip = new ZipFile(modFile);
-				ZipEntry version = modZip.getEntry("litemod.json");
-
-				// Not supporting this past 1.6.2
-//				if (version == null)
-//				{
-//					version = modZip.getEntry("version.txt");
-//				}
-				
-				if (version != null)
+				String metaName = this.getModMetaName(mod);
+				if (metaName == null || this.enabledModsList.isEnabled(this.bootstrap.getProfile(), metaName))
 				{
-					BufferedReader versionReader = null; 
-					StringBuilder versionBuilder = new StringBuilder();
+					LiteLoader.logInfo("Loading mod from %s", mod.getName());
  
-					try
-					{
-						// Read the version string
-						InputStream versionStream = modZip.getInputStream(version);
-						versionReader = new BufferedReader(new InputStreamReader(versionStream));
-
-						String versionFileLine;
-						while ((versionFileLine = versionReader.readLine()) != null)
-							versionBuilder.append(versionFileLine);
-						
-						strVersion = versionBuilder.toString();
-					}
-					catch (Exception ex)
-					{
-						LiteLoader.logWarning("Error reading version data from %s", modFile.getName());
-					}
-					finally
-					{
-						if (versionReader != null) versionReader.close();
-					}
+					LiteMod newMod = mod.newInstance();
+					
+					this.mods.add(newMod);
+					String modName = newMod.getName();
+					if (modName == null && metaName != null) modName = metaName;
+					LiteLoader.logInfo("Successfully added mod %s version %s", modName, newMod.getVersion());
  
-					if (strVersion != null)
+					// Get the mod file and register it as a resource pack if it exists
+					ModFile modFile = this.enumerator.getModFile(mod);
+					if (modFile != null)
 					{
-						ModFile modFileInfo = new ModFile(modFile, strVersion);
+						this.disabledMods.remove(modFile);
  
-						if (modFileInfo.isValid())
+						LiteLoader.logInfo("Adding \"%s\" to active resource pack set", modFile.getAbsolutePath());
+						if (modName != null && modFile.canRegisterAsResourcePack(modName))
 						{
-							// Only add the mod if the version matches and we were able
-							// to successfully add it to the class path
-							if (LiteLoader.VERSION.isVersionSupported(modFileInfo.getVersion()))
-							{
-//								if (!modFileInfo.isJson())
-//								{
-//									LiteLoader.logWarning("Missing or invalid litemod.json reading mod file: %s", modFile.getAbsolutePath());
-//								}
-								
-								if (!versionOrderingSets.containsKey(modFileInfo.getName()))
-								{
-									versionOrderingSets.put(modFileInfo.getModName(), new TreeSet<ModFile>());
-								}
-								
-								LiteLoader.logInfo("Considering valid mod file: %s", modFileInfo.getAbsolutePath());
-								versionOrderingSets.get(modFileInfo.getModName()).add(modFileInfo);
-							}
-							else
+							if (this.registerModResourcePack((ResourcePack)modFile.getResourcePack()))
 							{
-								LiteLoader.logInfo("Not adding invalid or outdated mod file: %s", modFile.getAbsolutePath());
+								LiteLoader.logInfo("Successfully added \"%s\" to active resource pack set", modFile.getAbsolutePath());
 							}
 						}
 					}
 				}
 				else
 				{
-					ZipEntry legacyVersion = modZip.getEntry("version.txt");
-					if (legacyVersion != null)
-					{
-						LiteLoader.logWarning("version.txt is no longer supported, ignoring outdated mod file: %s", modFile.getAbsolutePath());
-					}
+					LiteLoader.logInfo("Not loading mod %s, excluded by filter", metaName);
+					this.disabledMods.add(this.enumerator.getModFile(mod));
 				}
-				
-				modZip.close();
 			}
-			catch (Exception ex)
+			catch (Throwable th)
 			{
-				ex.printStackTrace(System.err);
-				LiteLoader.logInfo("Error enumerating '%s': Invalid zip file or error reading file", modFile.getAbsolutePath());
+				th.printStackTrace(System.out);
+				LiteLoader.getLogger().log(Level.WARNING, String.format("Error loading mod from %s", mod.getName()), th);
 			}
 		}
+	}
  
-		// Copy the first entry in every version set into the modfiles list
-		for (Entry<String, TreeSet<ModFile>> modFileEntry : versionOrderingSets.entrySet())
-		{
-			ModFile newestVersion = modFileEntry.getValue().iterator().next();
-
-			try
-			{
-				LiteLoader.logInfo("Adding newest valid mod file '%s' at revision %.4f: ", newestVersion.getAbsolutePath(), newestVersion.getRevision());
-
-				LiteLoader.classLoader.addURL(newestVersion.toURI().toURL());
-				modFiles.add(newestVersion);
-			}
-			catch (Exception ex)
-			{
-				LiteLoader.logWarning("Error injecting '%s' into classPath. The mod will not be loaded", newestVersion.getAbsolutePath());
-			}
-			
-			// Tweak load functionality, currently not used
-			if (this.loadTweaks)
-			{
-				try
-				{
-					this.addTweaksFrom(newestVersion);
-				}
-				catch (Throwable th)
-				{
-					LiteLoader.logWarning("Error adding tweaks from '%s'", newestVersion.getAbsolutePath());
-				}
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.FilenameFilter#accept(java.io.File, java.lang.String)
-	 */
-	@Override
-	public boolean accept(File dir, String fileName)
-	{
-		fileName = fileName.toLowerCase();
-		return fileName.endsWith(".litemod") || (this.readZipFiles && (fileName.endsWith(".zip") || fileName.endsWith(".jar")));
-	}
-
-	/**
-	 * @param modFile
-	 * @throws IOException
-	 */
-	private void addTweaksFrom(ModFile modFile)
-	{
-		JarFile jar = null;
-		
-		LiteLoader.logInfo("Adding tweaks from file '%s'", modFile.getName());
-		try
-		{
-			jar = new JarFile(modFile);
-			Attributes manifestAttributes = jar.getManifest().getMainAttributes();
-			
-			String tweakClass = manifestAttributes.getValue("TweakClass");
-			if (tweakClass != null)
-			{
-				LiteLoader.logInfo("Mod file '%s' provides tweakClass '%s', adding to Launch queue", modFile.getName(), tweakClass);
-				
-				if (LiteLoaderTweaker.addTweaker(modFile.toURI().toURL(), tweakClass))
-				{
-					LiteLoader.logInfo("tweakClass '%s' was successfully added", tweakClass);
-				}
-			}
-			
-			String classPath = manifestAttributes.getValue("Class-Path");
-			if (classPath != null)
-			{
-				String[] classPathEntries = classPath.split(" ");
-				for (String classPathEntry : classPathEntries)
-				{
-					File classPathJar = new File(LiteLoader.gameDirectory, classPathEntry);
-					URL jarUrl = classPathJar.toURI().toURL();
-					
-					LiteLoader.logInfo("Adding Class-Path entry: %s", classPathEntry); 
-					LiteLoaderTweaker.addURLToParentClassLoader(jarUrl);
-					LiteLoader.classLoader.addURL(jarUrl);
-				}
-			}
-		}
-		catch (Exception ex)
-		{
-			LiteLoader.logWarning("Error parsing tweak class manifest entry in '%s'", modFile.getAbsolutePath());
-		}
-		finally
-		{
-			try
-			{
-				if (jar != null) jar.close();
-			}
-			catch (IOException ex) {}
-		}
-	}
-	
-	/**
-	 * Find mod classes in the class path and enumerated mod files list
-	 * @param classPathEntries Java class path split into string entries
-	 */
-	private void findModClasses(List<ModFile> modFiles, String[] classPathEntries)
-	{
-		if (this.searchProtectionDomain)
-		{
-			try
-			{
-				this.searchProtectionDomain();
-			}
-			catch (Throwable th)
-			{
-				LiteLoader.logWarning("Error loading from local class path: %s", th.getMessage());
-			}
-		}
-		
-		if (this.searchClassPath)
-		{
-			// Search through the class path and find mod classes
-			this.searchClassPath(classPathEntries);
-		}
-		
-		// Search through mod files and find mod classes
-		this.searchModFiles(modFiles);
-	}
-
-	/**
-	 * @param modsToLoad
-	 * @throws MalformedURLException
-	 * @throws URISyntaxException
-	 * @throws UnsupportedEncodingException
-	 */
-	@SuppressWarnings("unchecked")
-	private void searchProtectionDomain() throws MalformedURLException, URISyntaxException, UnsupportedEncodingException
-	{
-		LiteLoader.logInfo("Searching protection domain code source...");
-		
-		File packagePath = null;
-		
-		URL protectionDomainLocation = LiteLoader.class.getProtectionDomain().getCodeSource().getLocation();
-		if (protectionDomainLocation != null)
-		{
-			if (protectionDomainLocation.toString().indexOf('!') > -1 && protectionDomainLocation.toString().startsWith("jar:"))
-			{
-				protectionDomainLocation = new URL(protectionDomainLocation.toString().substring(4, protectionDomainLocation.toString().indexOf('!')));
-			}
-			
-			packagePath = new File(protectionDomainLocation.toURI());
-		}
-		else
-		{
-			// Fix (?) for forge and other mods which screw up the
-			// protection domain
-			String reflectionClassPath = LiteLoader.class.getResource("/com/mumfrey/liteloader/core/LiteLoader.class").getPath();
-			
-			if (reflectionClassPath.indexOf('!') > -1)
-			{
-				reflectionClassPath = URLDecoder.decode(reflectionClassPath, "UTF-8");
-				packagePath = new File(reflectionClassPath.substring(5, reflectionClassPath.indexOf('!')));
-			}
-		}
-		
-		if (packagePath != null)
-		{
-			LinkedList<Class<?>> modClasses = getSubclassesFor(packagePath, LiteLoader.classLoader, LiteMod.class, "LiteMod");
-			
-			for (Class<?> mod : modClasses)
-			{
-				if (this.modsToLoad.containsKey(mod.getSimpleName()))
-				{
-					LiteLoader.logWarning("Mod name collision for mod with class '%s', maybe you have more than one copy?", mod.getSimpleName());
-				}
-				
-				this.modsToLoad.put(mod.getSimpleName(), (Class<? extends LiteMod>)mod);
-			}
-			
-			if (modClasses.size() > 0)
-				LiteLoader.logInfo("Found %s potential matches", modClasses.size());
-		}
-	}
-
-	/**
-	 * @param classPathEntries
-	 * @param modsToLoad
-	 */
-	@SuppressWarnings("unchecked")
-	private void searchClassPath(String[] classPathEntries)
-	{
-		for (String classPathPart : classPathEntries)
-		{
-			LiteLoader.logInfo("Searching %s...", classPathPart);
-			
-			File packagePath = new File(classPathPart);
-			LinkedList<Class<?>> modClasses = getSubclassesFor(packagePath, LiteLoader.classLoader, LiteMod.class, "LiteMod");
-			
-			for (Class<?> mod : modClasses)
-			{
-				if (this.modsToLoad.containsKey(mod.getSimpleName()))
-				{
-					LiteLoader.logWarning("Mod name collision for mod with class '%s', maybe you have more than one copy?", mod.getSimpleName());
-				}
-				
-				this.modsToLoad.put(mod.getSimpleName(), (Class<? extends LiteMod>)mod);
-				this.modFiles.put(mod.getSimpleName(), new ClassPathMod(packagePath, mod.getSimpleName().substring(7), LiteLoader.getVersion()));
-			}
-			
-			if (modClasses.size() > 0)
-				LiteLoader.logInfo("Found %s potential matches", modClasses.size());
-		}
-	}
-
-	/**
-	 * @param modFiles
-	 * @param modsToLoad
-	 */
-	@SuppressWarnings("unchecked")
-	private void searchModFiles(List<ModFile> modFiles)
-	{
-		for (ModFile modFile : modFiles)
-		{
-			LiteLoader.logInfo("Searching %s...", modFile.getAbsolutePath());
-			
-			LinkedList<Class<?>> modClasses = LiteLoader.getSubclassesFor(modFile, LiteLoader.classLoader, LiteMod.class, "LiteMod");
-			
-			for (Class<?> mod : modClasses)
-			{
-				if (this.modsToLoad.containsKey(mod.getSimpleName()))
-				{
-					LiteLoader.logWarning("Mod name collision for mod with class '%s', maybe you have more than one copy?", mod.getSimpleName());
-				}
-				
-				this.modsToLoad.put(mod.getSimpleName(), (Class<? extends LiteMod>)mod);
-				this.modFiles.put(mod.getSimpleName(), modFile);
-			}
-			
-			if (modClasses.size() > 0)
-				LiteLoader.logInfo("Found %s potential matches", modClasses.size());
-		}
-	}
-	
-	/**
-	 * Create mod instances from the enumerated classes
-	 * 
-	 * @param modsToLoad List of mods to load
-	 */
-	private void loadMods()
-	{
-		if (this.modsToLoad == null)
-		{
-			LiteLoader.logInfo("Mod class discovery failed. Not loading any mods!");
-			return;
-		}
-		
-		LiteLoader.logInfo("Discovered %d total mod(s)", this.modsToLoad.size());
-		
-		this.pendingResourceReload = false;
-		this.soundManagerReloadInhibitor = new SoundManagerReloadInhibitor((SimpleReloadableResourceManager)this.minecraft.getResourceManager(), this.minecraft.sndManager);
-		if (this.inhibitSoundManagerReload) this.soundManagerReloadInhibitor.inhibit();
-		
-		for (Class<? extends LiteMod> mod : this.modsToLoad.values())
-		{
-			try
-			{
-				String metaName = this.getModMetaName(mod);
-				if (metaName == null || this.enabledModsList.isEnabled(LiteLoader.profile, metaName))
-				{
-					LiteLoader.logInfo("Loading mod from %s", mod.getName());
-					
-					LiteMod newMod = mod.newInstance();
-					
-					this.mods.add(newMod);
-					String modName = newMod.getName();
-					if (modName == null && metaName != null) modName = metaName;
-					LiteLoader.logInfo("Successfully added mod %s version %s", modName, newMod.getVersion());
-					
-					// Get the mod file and register it as a resource pack if it exists
-					ModFile modFile = this.getModFile(mod);
-					if (modFile != null)
-					{
-						this.disabledMods.remove(modFile);
-						
-						if (modName != null && modFile.registerAsResourcePack(modName))
-						{
-							LiteLoader.logInfo("Successfully added \"%s\" to active resource pack set", modFile.getAbsolutePath());
-						}
-					}
-				}
-				else
-				{
-					LiteLoader.logInfo("Not loading mod %s, excluded by filter", metaName);
-					this.disabledMods.add(this.getModFile(mod));
-				}
-			}
-			catch (Throwable th)
-			{
-				LiteLoader.getLogger().log(Level.WARNING, String.format("Error loading mod from %s", mod.getName()), th);
-			}
-		}
-	}
-
-	/**
-	 * Initialise the mods which were loaded
-	 */
-	private void initMods()
-	{
-		this.loadedModsList = "";
-		int loadedModsCount = 0;
-		
-		for (Iterator<LiteMod> iter = this.mods.iterator(); iter.hasNext();)
+	/**
+	 * Initialise the mods which were loaded
+	 */
+	private void initMods()
+	{
+		this.loadedModsList = "";
+		int loadedModsCount = 0;
+		
+		for (Iterator<LiteMod> iter = this.mods.iterator(); iter.hasNext();)
 		{
 			LiteMod mod = iter.next();
 			String modName = mod.getName();
@@ -1459,14 +770,14 @@ public final class LiteLoader implements FilenameFilter
 				try
 				{
 					String modKey = this.getModNameForConfig(mod.getClass(), modName);
-					LiteLoaderVersion lastModVersion = LiteLoaderVersion.getVersionFromRevision(this.getLastKnownModRevision(modKey));
+					LiteLoaderVersion lastModVersion = LiteLoaderVersion.getVersionFromRevision(this.bootstrap.getLastKnownModRevision(modKey));
  
-					if (LiteLoader.VERSION.getLoaderRevision() > lastModVersion.getLoaderRevision())
+					if (LiteLoaderBootstrap.VERSION.getLoaderRevision() > lastModVersion.getLoaderRevision())
 					{
-						LiteLoader.logInfo("Performing config upgrade for mod %s. Upgrading %s to %s...", modName, lastModVersion, LiteLoader.VERSION);
-						mod.upgradeSettings(VERSION.getMinecraftVersion(), this.versionConfigFolder, this.inflectVersionedConfigPath(lastModVersion));
+						LiteLoader.logInfo("Performing config upgrade for mod %s. Upgrading %s to %s...", modName, lastModVersion, LiteLoaderBootstrap.VERSION);
+						mod.upgradeSettings(LiteLoaderBootstrap.VERSION.getMinecraftVersion(), this.versionConfigFolder, this.inflectVersionedConfigPath(lastModVersion));
  
-						this.storeLastKnownModRevision(modKey);
+						this.bootstrap.storeLastKnownModRevision(modKey);
 						LiteLoader.logInfo("Config upgrade succeeded for mod %s", modName);
 					}
 				}
@@ -1500,152 +811,9 @@ public final class LiteLoader implements FilenameFilter
 	}
  
 	/**
-	 * Enumerate classes on the classpath which are subclasses of the specified
-	 * class
-	 * 
-	 * @param superClass
-	 * @return
-	 */
-	private static LinkedList<Class<?>> getSubclassesFor(File packagePath, ClassLoader classloader, Class<?> superClass, String prefix)
-	{
-		LinkedList<Class<?>> classes = new LinkedList<Class<?>>();
-		
-		try
-		{
-			if (packagePath.isDirectory())
-			{
-				enumerateDirectory(prefix, superClass, classloader, classes, packagePath);
-			}
-			else if (packagePath.isFile() && (packagePath.getName().endsWith(".jar") || packagePath.getName().endsWith(".zip") || packagePath.getName().endsWith(".litemod")))
-			{
-				enumerateCompressedPackage(prefix, superClass, classloader, classes, packagePath);
-			}
-		}
-		catch (Throwable th)
-		{
-			LiteLoader.getLogger().log(Level.WARNING, "Enumeration error", th);
-		}
-		
-		return classes;
-	}
-	
-	/**
-	 * @param superClass
-	 * @param classloader
-	 * @param classes
-	 * @param packagePath
-	 * @throws FileNotFoundException
-	 * @throws IOException
-	 */
-	private static void enumerateCompressedPackage(String prefix, Class<?> superClass, ClassLoader classloader, LinkedList<Class<?>> classes, File packagePath) throws FileNotFoundException, IOException
-	{
-		FileInputStream fileinputstream = new FileInputStream(packagePath);
-		ZipInputStream zipinputstream = new ZipInputStream(fileinputstream);
-		
-		ZipEntry zipentry = null;
-		
-		do
-		{
-			zipentry = zipinputstream.getNextEntry();
-			
-			if (zipentry != null && zipentry.getName().endsWith(".class"))
-			{
-				String classFileName = zipentry.getName();
-				String className = classFileName.lastIndexOf('/') > -1 ? classFileName.substring(classFileName.lastIndexOf('/') + 1) : classFileName;
-				
-				if (prefix == null || className.startsWith(prefix))
-				{
-					try
-					{
-						String fullClassName = classFileName.substring(0, classFileName.length() - 6).replaceAll("/", ".");
-						checkAndAddClass(classloader, superClass, classes, fullClassName);
-					}
-					catch (Exception ex)
-					{
-					}
-				}
-			}
-		} while (zipentry != null);
-		
-		fileinputstream.close();
-	}
-	
-	/**
-	 * Recursive function to enumerate classes inside a classpath folder
-	 * 
-	 * @param superClass
-	 * @param classloader
-	 * @param classes
-	 * @param packagePath
-	 * @param packageName
-	 */
-	private static void enumerateDirectory(String prefix, Class<?> superClass, ClassLoader classloader, LinkedList<Class<?>> classes, File packagePath)
-	{
-		enumerateDirectory(prefix, superClass, classloader, classes, packagePath, "", 0);
-	}
-	
-	/**
-	 * Recursive function to enumerate classes inside a classpath folder
-	 * 
-	 * @param superClass
-	 * @param classloader
-	 * @param classes
-	 * @param packagePath
-	 * @param packageName
-	 */
-	private static void enumerateDirectory(String prefix, Class<?> superClass, ClassLoader classloader, LinkedList<Class<?>> classes, File packagePath, String packageName, int depth)
-	{
-		// Prevent crash due to broken recursion
-		if (depth > MAX_DISCOVERY_DEPTH)
-			return;
-		
-		File[] classFiles = packagePath.listFiles();
-		
-		for (File classFile : classFiles)
-		{
-			if (classFile.isDirectory())
-			{
-				enumerateDirectory(prefix, superClass, classloader, classes, classFile, packageName + classFile.getName() + ".", depth + 1);
-			}
-			else
-			{
-				if (classFile.getName().endsWith(".class") && (prefix == null || classFile.getName().startsWith(prefix)))
-				{
-					String classFileName = classFile.getName();
-					String className = packageName + classFileName.substring(0, classFileName.length() - 6);
-					checkAndAddClass(classloader, superClass, classes, className);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * @param classloader
-	 * @param superClass
-	 * @param classes
-	 * @param className
+	 * Called before mod late initialisation, refresh the resources that have been added so that mods can use them
 	 */
-	private static void checkAndAddClass(ClassLoader classloader, Class<?> superClass, LinkedList<Class<?>> classes, String className)
-	{
-		if (className.indexOf('$') > -1)
-			return;
-		
-		try
-		{
-			Class<?> subClass = classloader.loadClass(className);
-			
-			if (subClass != null && !superClass.equals(subClass) && superClass.isAssignableFrom(subClass) && !subClass.isInterface() && !classes.contains(subClass))
-			{
-				classes.add(subClass);
-			}
-		}
-		catch (Throwable th)
-		{
-			LiteLoader.getLogger().log(Level.WARNING, "checkAndAddClass error", th);
-		}
-	}
-
-	public void refreshResources()
+	void preInitMods()
 	{
 		if (this.pendingResourceReload)
 		{
@@ -1654,20 +822,32 @@ public final class LiteLoader implements FilenameFilter
 		}
 	}
  
-	public void onInit()
+	/**
+	 * Called after mod late init
+	 */
+	void preBeginGame()
 	{
+		// Set the loader branding in ClientBrandRetriever using reflection
+		LiteLoaderBootstrap.setBranding("LiteLoader");
+		
 		if (this.soundManagerReloadInhibitor != null && this.soundManagerReloadInhibitor.isInhibited())
 		{
 			this.soundManagerReloadInhibitor.unInhibit(true);
 		}
 	}
  
-	public void onLogin(NetHandler netHandler, Packet1Login loginPacket)
+	/**
+	 * Called on login
+	 * 
+	 * @param netHandler
+	 * @param loginPacket
+	 */
+	void onLogin(NetHandler netHandler, Packet1Login loginPacket)
 	{
 		this.permissionsManager.onLogin(netHandler, loginPacket);
 	}
  
-	public void onRender()
+	void onRender()
 	{
 		if (this.paginateControls && this.minecraft.currentScreen != null && this.minecraft.currentScreen.getClass().equals(GuiControls.class))
 		{
@@ -1683,7 +863,7 @@ public final class LiteLoader implements FilenameFilter
 		}
 	}
  
-	public void onTick(float partialTicks, boolean inGame)
+	void onTick(float partialTicks, boolean inGame)
 	{
 		// Tick the permissions manager
 		this.permissionsManager.onTick(this.minecraft, partialTicks, inGame);
@@ -1748,7 +928,7 @@ public final class LiteLoader implements FilenameFilter
 	/**
 	 * Writes mod bindings to disk
 	 */
-	protected void storeBindings()
+	private void storeBindings()
 	{
 		try
 		{
@@ -1756,132 +936,22 @@ public final class LiteLoader implements FilenameFilter
 		}
 		catch (IOException ex) {}
 	}
-	
-	/**
-	 * Set the brand in ClientBrandRetriever to the specified brand 
-	 * 
-	 * @param brand
-	 */
-	private void setBranding(String brand)
-	{
-		try
-		{
-			String oldBrand = ClientBrandRetriever.getClientModName();
-			
-			if (oldBrand.equals("vanilla"))
-			{
-				char[] newValue = brand.toCharArray();
-				
-				Field stringValue = String.class.getDeclaredField("value");
-				stringValue.setAccessible(true);
-				stringValue.set(oldBrand, newValue);
-				
-				try
-				{
-					Field stringCount = String.class.getDeclaredField("count");
-					stringCount.setAccessible(true);
-					stringCount.set(oldBrand, newValue.length);
-				}
-				catch (NoSuchFieldException ex) {} // java 1.7 doesn't have this member
-			}
-		}
-		catch (Exception ex)
-		{
-			LiteLoader.getLogger().log(Level.WARNING, "Setting branding failed", ex);
-		}
-	}
  
 	private static void logInfo(String string, Object... args)
 	{
-		LiteLoader.getLogger().info(String.format(string, args));
-	}
-	
-	private static void logWarning(String string, Object... args)
-	{
-		LiteLoader.getLogger().warning(String.format(string, args));
+//		System.out.println("<INFO> " + String.format(string, args));
+		LiteLoader.logger.info(String.format(string, args));
 	}
  
-	public static void populateCrashReport(CrashReport par1CrashReport)
-	{
-		par1CrashReport.getCategory().addCrashSectionCallable("Mod Pack",       new CallableLiteLoaderBrand(par1CrashReport));
-		par1CrashReport.getCategory().addCrashSectionCallable("LiteLoader Mods", new CallableLiteLoaderMods(par1CrashReport));
-	}
-	
-	// -----------------------------------------------------------------------------------------------------------
-	// TODO Remove delegates below after 1.6.4
-	// -----------------------------------------------------------------------------------------------------------
-	
-	/**
-	 * Delegate to PluginChannels.sendMessage. Deprecated and will be removed
-	 * 
-	 * @param channel Channel to send data to
-	 * @param data Data to send
-	 * 
-	 * @deprecated User PluginChannels.sendMessage(channel, data) instead.
-	 */
-	@Deprecated
-	public void sendPluginChannelMessage(String channel, byte[] data)
-	{
-		PluginChannels.sendMessage(channel, data);
-	}
-
-	@Deprecated
-	public void addTickListener(Tickable tickable)
-	{
-		this.events.addTickListener(tickable);
-	}
-	
-	@Deprecated
-	public void addLoopListener(GameLoopListener loopListener)
-	{
-		this.events.addLoopListener(loopListener);
-	}
-	
-	@Deprecated
-	public void addInitListener(InitCompleteListener initCompleteListener)
-	{
-		this.events.addInitListener(initCompleteListener);
-	}
-	
-	@Deprecated
-	public void addRenderListener(RenderListener renderListener)
-	{
-		this.events.addRenderListener(renderListener);
-	}
-	
-	@Deprecated
-	public void addPostRenderListener(PostRenderListener postRenderListener)
-	{
-		this.events.addPostRenderListener(postRenderListener);
-	}
-	
-	@Deprecated
-	public void addChatFilter(ChatFilter chatFilter)
-	{
-		this.events.addChatFilter(chatFilter);
-	}
-	
-	@Deprecated
-	public void addChatListener(ChatListener chatListener)
-	{
-		this.events.addChatListener(chatListener);
-	}
-	
-	@Deprecated
-	public void addChatRenderListener(ChatRenderListener chatRenderListener)
-	{
-		this.events.addChatRenderListener(chatRenderListener);
-	}
-	
-	@Deprecated
-	public void addPreLoginListener(PreLoginListener loginListener)
+	private static void logWarning(String string, Object... args)
 	{
-		this.events.addPreLoginListener(loginListener);
+//		System.out.println("<WARN> " + String.format(string, args));
+		LiteLoader.logger.warning(String.format(string, args));
 	}
  
-	@Deprecated
-	public void addLoginListener(LoginListener loginListener)
+	public static void populateCrashReport(CrashReport crashReport)
 	{
-		this.events.addLoginListener(loginListener);
+		crashReport.getCategory().addCrashSectionCallable("Mod Pack",        new CallableLiteLoaderBrand(crashReport));
+		crashReport.getCategory().addCrashSectionCallable("LiteLoader Mods", new CallableLiteLoaderMods(crashReport));
 	}
 }
 \ No newline at end of file
+package com.mumfrey.liteloader.core;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.Properties;
+import java.util.logging.FileHandler;
+import java.util.logging.Formatter;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.logging.StreamHandler;
+
+import net.minecraft.client.ClientBrandRetriever;
+import net.minecraft.launchwrapper.LaunchClassLoader;
+
+import com.mumfrey.liteloader.launch.ILoaderBootstrap;
+import com.mumfrey.liteloader.log.LiteLoaderLogFormatter;
+
+/**
+ * LiteLoaderBootstrap is a proxy class which handles the early part of the LiteLoader startup process which
+ * used to be handled by the loader itself, this is to ensure that NONE of the Minecraft classes which by
+ * necessity the Loader references get loaded before the pre-init stage has completed. This allows us to load
+ * transforming tweakers in the pre-init stage without all hell breaking loose because class names have changed
+ * between initialisation stages!
+ * 
+ * This class handles setting up requisite resources like the logger and the enumerator and passes init calls
+ * through to the LiteLoader instance at the appropriate points during startup. Because this class is the first
+ * part of the loader to get loaded, we also keep central references like the paths and version in here.
+ *
+ * @author Adam Mummery-Smith
+ */
+class LiteLoaderBootstrap implements ILoaderBootstrap
+{
+	/**
+	 * Liteloader version
+	 */
+	public static final LiteLoaderVersion VERSION = LiteLoaderVersion.MC_1_6_4_R1;
+
+	/**
+	 * Local logger reference
+	 */
+	private static final Logger logger = Logger.getLogger("liteloader");
+
+	/**
+	 * True to use stdout instead of stderr
+	 */
+	private static boolean useStdOut;
+	
+	/**
+	 * Base game directory, passed in from the tweaker
+	 */
+	private final File gameDirectory;
+	
+	/**
+	 * Assets directory, passed in from the tweaker 
+	 */
+	private final File assetsDirectory;
+	
+	/**
+	 * Active profile, passed in from the tweaker 
+	 */
+	private final String profile;
+	
+	/**
+	 * "Mods" folder to use
+	 */
+	private final File modsFolder;
+	
+	/**
+	 * Base "liteconfig" folder under which all other lite mod configs and liteloader configs are placed 
+	 */
+	private final File configBaseFolder;
+	
+	/**
+	 * File to write log entries to
+	 */
+	private File logFile;
+
+	/**
+	 * File containing the properties
+	 */
+	private File propertiesFile;
+
+	/**
+	 * Internal properties loaded from inside the jar
+	 */
+	private Properties internalProperties = new Properties();
+	
+	/**
+	 * LiteLoader properties
+	 */
+	private Properties localProperties = new Properties();
+	
+	/**
+	 * Pack brand from properties, used to put the modpack/compilation name in
+	 * crash reports
+	 */
+	private String branding = null;
+
+	/**
+	 * The mod enumerator instance
+	 */
+	private LiteLoaderEnumerator enumerator;
+
+	/**
+	 * @param gameDirectory
+	 * @param assetsDirectory
+	 * @param profile
+	 */
+	public LiteLoaderBootstrap(File gameDirectory, File assetsDirectory, String profile)
+	{
+		this.gameDirectory    = gameDirectory;
+		this.assetsDirectory  = assetsDirectory;
+		this.profile          = profile;
+		
+		this.modsFolder       = new File(this.gameDirectory,    "mods");
+		this.configBaseFolder = new File(this.gameDirectory,    "liteconfig");
+		this.logFile          = new File(this.configBaseFolder, "liteloader.log");
+		this.propertiesFile   = new File(this.configBaseFolder, "liteloader.properties");
+	}
+	
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.launch.ILoaderBootstrap#preInit(net.minecraft.launchwrapper.LaunchClassLoader, boolean)
+	 */
+	@Override
+	public void preInit(LaunchClassLoader classLoader, boolean loadTweaks)
+	{
+		// Set up the bootstrap
+		if (!this.prepare()) return;
+		
+		LiteLoaderBootstrap.logInfo("LiteLoader %s starting up...", LiteLoaderBootstrap.VERSION.getLoaderVersion());
+		
+		// Print the branding version if any was provided
+		if (this.branding != null)
+		{
+			LiteLoaderBootstrap.logInfo("Active Pack: %s", this.branding);
+		}
+		
+		LiteLoaderBootstrap.logInfo("Java reports OS=\"%s\"", System.getProperty("os.name").toLowerCase());
+		
+		this.enumerator = new LiteLoaderEnumerator(this, classLoader, loadTweaks);
+		this.enumerator.discoverModFiles();
+
+		LiteLoaderBootstrap.logInfo("LiteLoader PreInit completed");
+	}
+	
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.launch.ILoaderBootstrap#init(java.util.List, net.minecraft.launchwrapper.LaunchClassLoader)
+	 */
+	@Override
+	public void init(List<String> modsToLoad, LaunchClassLoader classLoader)
+	{
+		try
+		{
+			if (LiteLoaderBootstrap.logger.getHandlers().length < 1)
+				this.prepareLogger();
+		}
+		catch (Exception ex) {}
+
+		LiteLoaderBootstrap.logger.info("Beginning LiteLoader Init...");
+		LiteLoader.init(this, this.enumerator, modsToLoad, classLoader);
+	}
+
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.launch.ILoaderBootstrap#postInit()
+	 */
+	@Override
+	public void postInit()
+	{
+		try
+		{
+			if (LiteLoaderBootstrap.logger.getHandlers().length < 1)
+				this.prepareLogger();
+		}
+		catch (Exception ex) {}
+		
+		LiteLoaderBootstrap.logger.info("Beginning LiteLoader PostInit...");
+		LiteLoader.postInit();
+	}
+
+	/**
+	 * Set up reflection methods required by the loader
+	 */
+	private boolean prepare()
+	{
+		try
+		{
+			// Prepare the properties
+			this.prepareProperties();
+			
+			// Prepare the log writer
+			this.prepareLogger();
+			
+			this.branding = this.internalProperties.getProperty("brand", null);
+			if (this.branding != null && this.branding.length() < 1)
+				this.branding = null;
+			
+			// Save appropriate branding in the local properties file
+			if (this.branding != null)
+				this.localProperties.setProperty("brand", this.branding);
+			else
+				this.localProperties.remove("brand");
+		}
+		catch (Throwable th)
+		{
+			LiteLoaderBootstrap.logger.log(Level.SEVERE, "Error initialising LiteLoader Bootstrap", th);
+			return false;
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * @throws SecurityException
+	 * @throws IOException
+	 */
+	private void prepareLogger() throws SecurityException, IOException
+	{
+		Formatter logFormatter = new LiteLoaderLogFormatter();
+		
+		LiteLoaderBootstrap.logger.setUseParentHandlers(false);
+		LiteLoaderBootstrap.useStdOut = System.getProperty("liteloader.log", "stderr").equalsIgnoreCase("stdout") || this.localProperties.getProperty("log", "stderr").equalsIgnoreCase("stdout");
+		
+		StreamHandler consoleHandler = useStdOut ? new com.mumfrey.liteloader.util.log.ConsoleHandler() : new java.util.logging.ConsoleHandler();
+		consoleHandler.setFormatter(logFormatter);
+		LiteLoaderBootstrap.logger.addHandler(consoleHandler);
+		
+		FileHandler logFileHandler = new FileHandler(this.logFile.getAbsolutePath());
+		logFileHandler.setFormatter(logFormatter);
+		LiteLoaderBootstrap.logger.addHandler(logFileHandler);
+	}
+	
+	/**
+	 * Get the output stream which we are using for console output
+	 * 
+	 * @return
+	 */
+	public static final PrintStream getConsoleStream()
+	{
+		return LiteLoaderBootstrap.useStdOut ? System.out : System.err;
+	}
+
+	/**
+	 * Prepare the loader properties
+	 */
+	private void prepareProperties()
+	{
+		try
+		{
+			InputStream propertiesStream = LiteLoaderBootstrap.class.getResourceAsStream("/liteloader.properties");
+			
+			if (propertiesStream != null)
+			{
+				this.internalProperties.load(propertiesStream);
+				propertiesStream.close();
+			}
+		}
+		catch (Throwable th)
+		{
+			this.internalProperties = new Properties();
+		}
+		
+		try
+		{
+			this.localProperties = new Properties(this.internalProperties);
+			InputStream localPropertiesStream = this.getLocalPropertiesStream();
+			
+			if (localPropertiesStream != null)
+			{
+				this.localProperties.load(localPropertiesStream);
+				localPropertiesStream.close();
+			}
+		}
+		catch (Throwable th)
+		{
+			this.localProperties = new Properties(this.internalProperties);
+		}
+	}
+
+	/**
+	 * Get the properties stream either from the jar or from the properties file
+	 * in the minecraft folder
+	 * 
+	 * @return
+	 * @throws FileNotFoundException
+	 */
+	private InputStream getLocalPropertiesStream() throws FileNotFoundException
+	{
+		if (this.propertiesFile.exists())
+		{
+			return new FileInputStream(this.propertiesFile);
+		}
+		
+		// Otherwise read settings from the config
+		return LiteLoaderBootstrap.class.getResourceAsStream("/liteloader.properties");
+	}
+	
+	/**
+	 * Write current properties to the properties file
+	 */
+	public void writeProperties()
+	{
+		try
+		{
+			this.localProperties.store(new FileWriter(this.propertiesFile), String.format("Properties for LiteLoader %s", LiteLoaderBootstrap.VERSION));
+		}
+		catch (Throwable th)
+		{
+			LiteLoaderBootstrap.logger.log(Level.WARNING, "Error writing liteloader properties", th);
+		}
+	}
+
+	/**
+	 * Get the game directory
+	 */
+	public File getGameDirectory()
+	{
+		return this.gameDirectory;
+	}
+	
+	/**
+	 * Get the assets directory
+	 */
+	public File getAssetsDirectory()
+	{
+		return this.assetsDirectory;
+	}
+
+	/**
+	 * Get the profile directory
+	 */
+	public String getProfile()
+	{
+		return this.profile;
+	}
+
+	/**
+	 * Get the mods folder
+	 */
+	public File getModsFolder()
+	{
+		return this.modsFolder;
+	}
+
+	/**
+	 * Get the base "liteconfig" folder
+	 */
+	public File getConfigBaseFolder()
+	{
+		return this.configBaseFolder;
+	}
+
+	/**
+	 * Get a boolean propery from the properties file and also write the new value back to the properties file
+	 * 
+	 * @param propertyName
+	 * @param defaultValue
+	 * @return
+	 */
+	public boolean getAndStoreBooleanProperty(String propertyName, boolean defaultValue)
+	{
+		boolean result = this.localProperties.getProperty(propertyName, String.valueOf(defaultValue)).equalsIgnoreCase("true");
+		this.localProperties.setProperty(propertyName, String.valueOf(result));
+		return result;
+	}
+	
+	/**
+	 * Set a boolean property
+	 * 
+	 * @param propertyName
+	 * @param value
+	 */
+	public void setBooleanProperty(String propertyName, boolean value)
+	{
+		this.localProperties.setProperty(propertyName, String.valueOf(value));
+	}
+
+	/**
+	 * Store current revision for mod in the config file
+	 * 
+	 * @param modKey
+	 */
+	public void storeLastKnownModRevision(String modKey)
+	{
+		if (this.localProperties != null)
+		{
+			this.localProperties.setProperty(modKey, String.valueOf(LiteLoaderBootstrap.VERSION.getLoaderRevision()));
+			this.writeProperties();
+		}
+	}
+	
+	/**
+	 * Get last know revision for mod from the config file 
+	 * 
+	 * @param modKey
+	 * @return
+	 */
+	public int getLastKnownModRevision(String modKey)
+	{
+		if (this.localProperties != null)
+		{
+			String storedRevision = this.localProperties.getProperty(modKey, "0");
+			return Integer.parseInt(storedRevision);
+		}
+		
+		return 0;
+	}
+
+	/**
+	 * Used to get the name of the modpack being used
+	 * 
+	 * @return name of the modpack in use or null if no pack
+	 */
+	public String getBranding()
+	{
+		return this.branding;
+	}
+	
+	/**
+	 * Set the brand in ClientBrandRetriever to the specified brand 
+	 * 
+	 * @param brand
+	 */
+	static void setBranding(String brand)
+	{
+		try
+		{
+			String oldBrand = ClientBrandRetriever.getClientModName();
+			
+			if (oldBrand.equals("vanilla"))
+			{
+				char[] newValue = brand.toCharArray();
+				
+				Field stringValue = String.class.getDeclaredField("value");
+				stringValue.setAccessible(true);
+				stringValue.set(oldBrand, newValue);
+				
+				try
+				{
+					Field stringCount = String.class.getDeclaredField("count");
+					stringCount.setAccessible(true);
+					stringCount.set(oldBrand, newValue.length);
+				}
+				catch (NoSuchFieldException ex) {} // java 1.7 doesn't have this member
+			}
+		}
+		catch (Throwable th)
+		{
+			LiteLoaderBootstrap.logger.log(Level.WARNING, "Setting branding failed", th);
+		}
+	}
+	
+	/**
+	 * @param string
+	 * @param args
+	 */
+	private static void logInfo(String string, Object... args)
+	{
+		LiteLoaderBootstrap.logger.info(String.format(string, args));
+	}
+}
+package com.mumfrey.liteloader.core;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeSet;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
+
+import net.minecraft.launchwrapper.LaunchClassLoader;
+
+import com.mumfrey.liteloader.LiteMod;
+import com.mumfrey.liteloader.launch.LiteLoaderTweaker;
+
+/**
+ * The enumerator performs all mod discovery functions for LiteLoader, this includes locating mod files to load
+ * as well as searching for mod classes within the class path and discovered mod files.
+ *
+ * @author Adam Mummery-Smith
+ */
+class LiteLoaderEnumerator implements FilenameFilter
+{
+	/**
+	 * Maximum recursion depth for mod discovery
+	 */
+	private static final int MAX_DISCOVERY_DEPTH = 16;
+
+	/**
+	 * Local logger reference
+	 */
+	private static Logger logger = Logger.getLogger("liteloader");
+	
+	/**
+	 * Reference to the bootstrap agent 
+	 */
+	private final LiteLoaderBootstrap bootstrap;
+
+	/**
+	 * Reference to the launch classloader
+	 */
+	private final LaunchClassLoader classLoader;
+
+	/**
+	 * Classes to load, mapped by class name 
+	 */
+	private final Map<String, Class<? extends LiteMod>> modsToLoad = new HashMap<String, Class<? extends LiteMod>>();
+	
+	/**
+	 * URLs to add once init is completed
+	 */
+	private final List<ModFile> allModFiles = new ArrayList<ModFile>();
+	
+	/**
+	 * Mod metadata from version file 
+	 */
+	private final Map<String, ModFile> modFiles = new HashMap<String, ModFile>();
+	
+	/**
+	 * True if the loader is allowed to load tweak classes from mod files 
+	 */
+	private final boolean loadTweaks;
+	
+	/**
+	 * True if liteloader should also search files ending with .zip
+	 */
+	private boolean readZipFiles = false;
+	
+	/**
+	 * True if liteloader should also search files ending with .jar
+	 */
+	private boolean readJarFiles = true;
+
+	private boolean searchModsFolder = true;
+	private boolean searchProtectionDomain = true;
+	private boolean searchClassPath = true;
+
+	/**
+	 * @param properties
+	 * @param gameFolder
+	 * @param classLoader
+	 * @param loadTweaks
+	 */
+	public LiteLoaderEnumerator(LiteLoaderBootstrap bootstrap, LaunchClassLoader classLoader, boolean loadTweaks)
+	{
+		this.bootstrap   = bootstrap;
+		this.classLoader = classLoader;
+		this.loadTweaks  = loadTweaks;
+		
+		// Read the discovery settings from the properties 
+		this.readSettings();
+	}
+
+	/**
+	 * Get the list of all enumerated mod classes to load
+	 */
+	public Collection<Class<? extends LiteMod>> getModsToLoad()
+	{
+		return this.modsToLoad.values();
+	}
+
+	/**
+	 * Get the number of mods to load
+	 */
+	public int modsToLoadCount()
+	{
+		return this.modsToLoad.size();
+	}
+	
+	/**
+	 * @return
+	 */
+	public boolean hasModsToLoad()
+	{
+		return this.modsToLoad.size() > 0;
+	}
+
+	/**
+	 * Get a metadata value for the specified mod
+	 * 
+	 * @param modClassName
+	 * @param metaDataKey
+	 * @param defaultValue
+	 * @return
+	 */
+	public String getModMetaData(Class<? extends LiteMod> modClass, String metaDataKey, String defaultValue)
+	{
+		ModFile modFile = this.getModFile(modClass);
+		return modFile != null ? modFile.getMetaValue(metaDataKey, defaultValue) : defaultValue;
+	}
+	
+	/**
+	 * @param mod
+	 * @return
+	 */
+	public ModFile getModFile(Class<? extends LiteMod> modClass)
+	{
+		return this.modFiles.get(modClass.getSimpleName());
+	}
+
+	/**
+	 * Get the mod "name" metadata key, this is used for versioning, exclusivity, and enablement checks
+	 * 
+	 * @param modClass
+	 * @return
+	 */
+	public String getModMetaName(Class<? extends LiteMod> modClass)
+	{
+		String modClassName = modClass.getSimpleName();
+		if (!this.modFiles.containsKey(modClassName)) return null;
+		return this.modFiles.get(modClassName).getModName().toLowerCase();
+	}
+
+	/**
+	 * Get the discovery settings from the properties file
+	 */
+	public 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);
+		
+		if (!this.searchModsFolder && !this.searchProtectionDomain && !this.searchClassPath)
+		{
+			LiteLoaderEnumerator.logWarning("Invalid configuration, no search locations defined. Enabling all search locations.");
+			
+			this.searchModsFolder       = true;
+			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);
+	}
+
+	/**
+	 * Enumerate the "mods" folder to find mod files
+	 */
+	protected void discoverModFiles()
+	{
+		if (this.searchModsFolder)
+		{
+			// Find and enumerate the "mods" folder
+			File modsFolder = this.bootstrap.getModsFolder();
+			if (modsFolder.exists() && modsFolder.isDirectory())
+			{
+				LiteLoaderEnumerator.logInfo("Mods folder found, searching %s", modsFolder.getPath());
+				this.findModFiles(modsFolder, false);
+				LiteLoaderEnumerator.logInfo("Found %d mod file(s)", this.allModFiles.size());
+				
+				File versionedModsFolder = new File(modsFolder, LiteLoaderBootstrap.VERSION.getMinecraftVersion());
+				if (versionedModsFolder.exists() && versionedModsFolder.isDirectory())
+				{
+					LiteLoaderEnumerator.logInfo("Versioned mods folder found, searching %s", versionedModsFolder.getPath());
+					this.findModFiles(versionedModsFolder, true);
+					LiteLoaderEnumerator.logInfo("Found %d mod file(s)", this.allModFiles.size());
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Enumerate class path and discovered mod files to find mod classes
+	 */
+	protected void discoverModClasses()
+	{
+		try
+		{
+			// Inject mod files discovered earlier into the class loader
+			this.injectIntoClassPath();
+			
+			// Split the environment classpath into entries
+			String[] classPathEntries = this.readClassPath();
+			
+			// then search through all sources to find mod classes
+			this.findModClasses(classPathEntries);
+		}
+		catch (Throwable th)
+		{
+			LiteLoaderEnumerator.logger.log(Level.WARNING, "Mod class discovery failed", th);
+			return;
+		}
+	}
+
+	/**
+	 * Injects all external mod files into the launch classloader's class path
+	 */
+	private void injectIntoClassPath()
+	{
+		LiteLoaderEnumerator.logInfo("Injecting external mods into class path...");
+		
+		for (ModFile file : this.allModFiles)
+		{
+			try
+			{
+				LiteLoaderEnumerator.logInfo("Injecting mod file '%s' into classpath", file.getAbsolutePath());
+				this.classLoader.addURL(file.toURI().toURL());
+			}
+			catch (Exception ex)
+			{
+				LiteLoaderEnumerator.logWarning("Error injecting '%s' into classPath. The mod will not be loaded", file.getAbsolutePath());
+			}
+		}
+	}
+
+	/**
+	 * Reads the class path entries that were supplied to the JVM and returns them as an array
+	 */
+	private String[] readClassPath()
+	{
+		LiteLoaderEnumerator.logInfo("Enumerating class path...");
+		
+		String classPath = System.getProperty("java.class.path");
+		String classPathSeparator = System.getProperty("path.separator");
+		String[] classPathEntries = classPath.split(classPathSeparator);
+		
+		LiteLoaderEnumerator.logInfo("Class path separator=\"%s\"", classPathSeparator);
+		LiteLoaderEnumerator.logInfo("Class path entries=(\n   classpathEntry=%s\n)", classPath.replace(classPathSeparator, "\n   classpathEntry="));
+		return classPathEntries;
+	}
+
+	/**
+	 * For FilenameFilter interface
+	 * 
+	 * @see java.io.FilenameFilter#accept(java.io.File, java.lang.String)
+	 */
+	@Override
+	public boolean accept(File dir, String fileName)
+	{
+		fileName = fileName.toLowerCase();
+		return                       fileName.endsWith(".litemod")
+			|| (this.readZipFiles && fileName.endsWith(".zip"))
+			|| (this.readJarFiles && fileName.endsWith(".jar"));
+	}
+
+	/**
+	 * Find mod files in the "mods" folder
+	 * 
+	 * @param modFolder Folder to search
+	 * @param isVersionedModFolder This is true if we will also allow non-metadata-containing jars to be examined for tweaks
+	 */
+	protected void findModFiles(File modFolder, boolean isVersionedModFolder)
+	{
+		Map<String, TreeSet<ModFile>> versionOrderingSets = new HashMap<String, TreeSet<ModFile>>();
+		
+		for (File modFile : modFolder.listFiles(this))
+		{
+			try
+			{
+				ZipFile modZip = new ZipFile(modFile);
+				ZipEntry versionEntry = modZip.getEntry("litemod.json");
+				ZipEntry legacyVersionEntry = modZip.getEntry("version.txt");
+
+				// Check for a version file
+				if (versionEntry != null)
+				{
+					String strVersion = this.readVersion(modZip, versionEntry);
+					
+					if (strVersion != null)
+					{
+						ModFile modFileInfo = new ModFile(modFile, strVersion);
+						
+						if (modFileInfo.isValid())
+						{
+							// Only add the mod if the version matches, we add candidates to the versionOrderingSets in
+							// order to determine the most recent version available.
+							if (LiteLoaderBootstrap.VERSION.isVersionSupported(modFileInfo.getVersion()))
+							{
+								if (!versionOrderingSets.containsKey(modFileInfo.getName()))
+								{
+									versionOrderingSets.put(modFileInfo.getModName(), new TreeSet<ModFile>());
+								}
+								
+								LiteLoaderEnumerator.logInfo("Considering valid mod file: %s", modFileInfo.getAbsolutePath());
+								versionOrderingSets.get(modFileInfo.getModName()).add(modFileInfo);
+							}
+							else
+							{
+								LiteLoaderEnumerator.logInfo("Not adding invalid or outdated mod file: %s", modFile.getAbsolutePath());
+							}
+						}
+					}
+				}
+				else if (legacyVersionEntry != null)
+				{
+					LiteLoaderEnumerator.logWarning("version.txt is no longer supported, ignoring outdated mod file: %s", modFile.getAbsolutePath());
+				}
+				else if (isVersionedModFolder && this.loadTweaks && this.readJarFiles && modFile.getName().toLowerCase().endsWith(".jar"))
+				{
+					this.addTweaksFrom(modFile);
+				}
+				
+				modZip.close();
+			}
+			catch (Exception ex)
+			{
+				ex.printStackTrace(System.err);
+				LiteLoaderEnumerator.logInfo("Error enumerating '%s': Invalid zip file or error reading file", modFile.getAbsolutePath());
+			}
+		}
+
+		// Copy the first entry in every version set into the modfiles list
+		for (Entry<String, TreeSet<ModFile>> modFileEntry : versionOrderingSets.entrySet())
+		{
+			ModFile newestVersion = modFileEntry.getValue().iterator().next();
+
+			LiteLoaderEnumerator.logInfo("Adding newest valid mod file '%s' at revision %.4f: ", newestVersion.getAbsolutePath(), newestVersion.getRevision());
+			this.allModFiles.add(newestVersion);
+			
+			if (this.loadTweaks)
+			{
+				try
+				{
+					this.addTweaksFrom(newestVersion);
+
+				}
+				catch (Throwable th)
+				{
+					LiteLoaderEnumerator.logWarning("Error adding tweaks from '%s'", newestVersion.getAbsolutePath());
+				}
+			}
+		}
+	}
+
+	/**
+	 * @param strVersion
+	 * @param modZip
+	 * @param versionEntry
+	 * @return
+	 * @throws IOException
+	 */
+	public String readVersion(ZipFile modZip, ZipEntry versionEntry) throws IOException
+	{
+		String strVersion = null;
+		BufferedReader versionReader = null; 
+		StringBuilder versionBuilder = new StringBuilder();
+		
+		try
+		{
+			// Read the version string
+			InputStream versionStream = modZip.getInputStream(versionEntry);
+			versionReader = new BufferedReader(new InputStreamReader(versionStream));
+
+			String versionFileLine;
+			while ((versionFileLine = versionReader.readLine()) != null)
+				versionBuilder.append(versionFileLine);
+			
+			strVersion = versionBuilder.toString();
+		}
+		catch (Exception ex)
+		{
+			LiteLoaderEnumerator.logWarning("Error reading version data from %s", modZip.getName());
+		}
+		finally
+		{
+			if (versionReader != null) versionReader.close();
+		}
+		return strVersion;
+	}
+
+	/**
+	 * @param jarFile
+	 * @throws IOException
+	 */
+	private void addTweaksFrom(File jarFile)
+	{
+		JarFile jar = null;
+		
+		LiteLoaderEnumerator.logInfo("Searching for tweaks in '%s'", jarFile.getName());
+		try
+		{
+			jar = new JarFile(jarFile);
+			Attributes manifestAttributes = jar.getManifest().getMainAttributes();
+			
+			String tweakClass = manifestAttributes.getValue("TweakClass");
+			if (tweakClass != null)
+			{
+				LiteLoaderEnumerator.logInfo("Mod file '%s' provides tweakClass '%s', adding to Launch queue", jarFile.getName(), tweakClass);
+				
+				if (LiteLoaderTweaker.addTweaker(jarFile.toURI().toURL(), tweakClass))
+				{
+					LiteLoaderEnumerator.logInfo("tweakClass '%s' was successfully added", tweakClass);
+					this.classLoader.addURL(jarFile.toURI().toURL());
+				}
+			}
+			
+			String classPath = manifestAttributes.getValue("Class-Path");
+			if (classPath != null)
+			{
+				String[] classPathEntries = classPath.split(" ");
+				for (String classPathEntry : classPathEntries)
+				{
+					File classPathJar = new File(this.bootstrap.getGameDirectory(), classPathEntry);
+					URL jarUrl = classPathJar.toURI().toURL();
+					
+					LiteLoaderEnumerator.logInfo("Adding Class-Path entry: %s", classPathEntry); 
+					LiteLoaderTweaker.addURLToParentClassLoader(jarUrl);
+					this.classLoader.addURL(jarUrl);
+				}
+			}
+		}
+		catch (Exception ex)
+		{
+			LiteLoaderEnumerator.logWarning("Error parsing tweak class manifest entry in '%s'", jarFile.getAbsolutePath());
+		}
+		finally
+		{
+			try
+			{
+				if (jar != null) jar.close();
+			}
+			catch (IOException ex) {}
+		}
+	}
+
+	/**
+	 * Find mod classes in the class path and enumerated mod files list
+	 * @param classPathEntries Java class path split into string entries
+	 */
+	private void findModClasses(String[] classPathEntries)
+	{
+		if (this.searchProtectionDomain || this.searchClassPath)
+			LiteLoaderEnumerator.logInfo("Discovering mods on class path...");
+		
+		if (this.searchProtectionDomain)
+		{
+			try
+			{
+				this.findModsInProtectionDomain();
+			}
+			catch (Throwable th)
+			{
+				LiteLoaderEnumerator.logWarning("Error loading from local class path: %s", th.getMessage());
+			}
+		}
+		
+		if (this.searchClassPath)
+		{
+			// Search through the class path and find mod classes
+			this.findModsInClassPath(classPathEntries);
+		}
+		
+		// Search through mod files and find mod classes
+		this.findModsInFiles();
+		
+		LiteLoaderEnumerator.logInfo("Mod class discovery completed");
+	}
+
+	/**
+	 * @param modsToLoad
+	 * @throws MalformedURLException
+	 * @throws URISyntaxException
+	 * @throws UnsupportedEncodingException
+	 */
+	@SuppressWarnings("unchecked")
+	private void findModsInProtectionDomain() throws MalformedURLException, URISyntaxException, UnsupportedEncodingException
+	{
+		LiteLoaderEnumerator.logInfo("Searching protection domain code source...");
+		
+		File packagePath = null;
+		
+		URL protectionDomainLocation = LiteLoaderEnumerator.class.getProtectionDomain().getCodeSource().getLocation();
+		if (protectionDomainLocation != null)
+		{
+			if (protectionDomainLocation.toString().indexOf('!') > -1 && protectionDomainLocation.toString().startsWith("jar:"))
+			{
+				protectionDomainLocation = new URL(protectionDomainLocation.toString().substring(4, protectionDomainLocation.toString().indexOf('!')));
+			}
+			
+			packagePath = new File(protectionDomainLocation.toURI());
+		}
+		else
+		{
+			// Fix (?) for forge and other mods which mangle the protection domain
+			String reflectionClassPath = LiteLoaderEnumerator.class.getResource("/com/mumfrey/liteloader/core/LiteLoader.class").getPath();
+			
+			if (reflectionClassPath.indexOf('!') > -1)
+			{
+				reflectionClassPath = URLDecoder.decode(reflectionClassPath, "UTF-8");
+				packagePath = new File(reflectionClassPath.substring(5, reflectionClassPath.indexOf('!')));
+			}
+		}
+		
+		if (packagePath != null)
+		{
+			LinkedList<Class<?>> modClasses = LiteLoaderEnumerator.getSubclassesFor(packagePath, this.classLoader, LiteMod.class, "LiteMod");
+			
+			for (Class<?> mod : modClasses)
+			{
+				if (this.modsToLoad.containsKey(mod.getSimpleName()))
+				{
+					LiteLoaderEnumerator.logWarning("Mod name collision for mod with class '%s', maybe you have more than one copy?", mod.getSimpleName());
+				}
+				
+				this.modsToLoad.put(mod.getSimpleName(), (Class<? extends LiteMod>)mod);
+			}
+			
+			if (modClasses.size() > 0)
+				LiteLoaderEnumerator.logInfo("Found %s potential matches", modClasses.size());
+		}
+	}
+
+	/**
+	 * @param classPathEntries
+	 * @param modsToLoad
+	 */
+	@SuppressWarnings("unchecked")
+	private void findModsInClassPath(String[] classPathEntries)
+	{
+		for (String classPathPart : classPathEntries)
+		{
+			LiteLoaderEnumerator.logInfo("Searching %s...", classPathPart);
+			
+			File packagePath = new File(classPathPart);
+			LinkedList<Class<?>> modClasses = LiteLoaderEnumerator.getSubclassesFor(packagePath, this.classLoader, LiteMod.class, "LiteMod");
+			
+			for (Class<?> mod : modClasses)
+			{
+				if (this.modsToLoad.containsKey(mod.getSimpleName()))
+				{
+					LiteLoaderEnumerator.logWarning("Mod name collision for mod with class '%s', maybe you have more than one copy?", mod.getSimpleName());
+				}
+				
+				this.modsToLoad.put(mod.getSimpleName(), (Class<? extends LiteMod>)mod);
+				this.modFiles.put(mod.getSimpleName(), new ClassPathMod(packagePath, mod.getSimpleName().substring(7), LiteLoaderBootstrap.VERSION.getLoaderVersion()));
+			}
+			
+			if (modClasses.size() > 0)
+				LiteLoaderEnumerator.logInfo("Found %s potential matches", modClasses.size());
+		}
+	}
+
+	/**
+	 */
+	@SuppressWarnings("unchecked")
+	private void findModsInFiles()
+	{
+		for (ModFile modFile : this.allModFiles)
+		{
+			LiteLoaderEnumerator.logInfo("Searching %s...", modFile.getAbsolutePath());
+			
+			LinkedList<Class<?>> modClasses = LiteLoaderEnumerator.getSubclassesFor(modFile, this.classLoader, LiteMod.class, "LiteMod");
+			
+			for (Class<?> mod : modClasses)
+			{
+				if (this.modsToLoad.containsKey(mod.getSimpleName()))
+				{
+					LiteLoaderEnumerator.logWarning("Mod name collision for mod with class '%s', maybe you have more than one copy?", mod.getSimpleName());
+				}
+				
+				this.modsToLoad.put(mod.getSimpleName(), (Class<? extends LiteMod>)mod);
+				this.modFiles.put(mod.getSimpleName(), modFile);
+			}
+			
+			if (modClasses.size() > 0)
+				LiteLoaderEnumerator.logInfo("Found %s potential matches", modClasses.size());
+		}
+	}
+
+	/**
+	 * Enumerate classes on the classpath which are subclasses of the specified
+	 * class
+	 * 
+	 * @param superClass
+	 * @return
+	 */
+	private static LinkedList<Class<?>> getSubclassesFor(File packagePath, ClassLoader classloader, Class<?> superClass, String prefix)
+	{
+		LinkedList<Class<?>> classes = new LinkedList<Class<?>>();
+		
+		try
+		{
+			if (packagePath.isDirectory())
+			{
+				LiteLoaderEnumerator.enumerateDirectory(prefix, superClass, classloader, classes, packagePath);
+			}
+			else if (packagePath.isFile() && (packagePath.getName().endsWith(".jar") || packagePath.getName().endsWith(".zip") || packagePath.getName().endsWith(".litemod")))
+			{
+				LiteLoaderEnumerator.enumerateCompressedPackage(prefix, superClass, classloader, classes, packagePath);
+			}
+		}
+		catch (Throwable th)
+		{
+			LiteLoaderEnumerator.logger.log(Level.WARNING, "Enumeration error", th);
+		}
+		
+		return classes;
+	}
+
+	/**
+	 * @param superClass
+	 * @param classloader
+	 * @param classes
+	 * @param packagePath
+	 * @throws FileNotFoundException
+	 * @throws IOException
+	 */
+	private static void enumerateCompressedPackage(String prefix, Class<?> superClass, ClassLoader classloader, LinkedList<Class<?>> classes, File packagePath) throws FileNotFoundException, IOException
+	{
+		FileInputStream fileinputstream = new FileInputStream(packagePath);
+		ZipInputStream zipinputstream = new ZipInputStream(fileinputstream);
+		
+		ZipEntry zipentry = null;
+		
+		do
+		{
+			zipentry = zipinputstream.getNextEntry();
+			
+			if (zipentry != null && zipentry.getName().endsWith(".class"))
+			{
+				String classFileName = zipentry.getName();
+				String className = classFileName.lastIndexOf('/') > -1 ? classFileName.substring(classFileName.lastIndexOf('/') + 1) : classFileName;
+				
+				if (prefix == null || className.startsWith(prefix))
+				{
+					try
+					{
+						String fullClassName = classFileName.substring(0, classFileName.length() - 6).replaceAll("/", ".");
+						LiteLoaderEnumerator.checkAndAddClass(classloader, superClass, classes, fullClassName);
+					}
+					catch (Exception ex) {}
+				}
+			}
+		} while (zipentry != null);
+		
+		fileinputstream.close();
+	}
+
+	/**
+	 * Recursive function to enumerate classes inside a classpath folder
+	 * 
+	 * @param superClass
+	 * @param classloader
+	 * @param classes
+	 * @param packagePath
+	 * @param packageName
+	 */
+	private static void enumerateDirectory(String prefix, Class<?> superClass, ClassLoader classloader, LinkedList<Class<?>> classes, File packagePath)
+	{
+		LiteLoaderEnumerator.enumerateDirectory(prefix, superClass, classloader, classes, packagePath, "", 0);
+	}
+
+	/**
+	 * Recursive function to enumerate classes inside a classpath folder
+	 * 
+	 * @param superClass
+	 * @param classloader
+	 * @param classes
+	 * @param packagePath
+	 * @param packageName
+	 */
+	private static void enumerateDirectory(String prefix, Class<?> superClass, ClassLoader classloader, LinkedList<Class<?>> classes, File packagePath, String packageName, int depth)
+	{
+		// Prevent crash due to broken recursion
+		if (depth > MAX_DISCOVERY_DEPTH)
+			return;
+		
+		File[] classFiles = packagePath.listFiles();
+		
+		for (File classFile : classFiles)
+		{
+			if (classFile.isDirectory())
+			{
+				LiteLoaderEnumerator.enumerateDirectory(prefix, superClass, classloader, classes, classFile, packageName + classFile.getName() + ".", depth + 1);
+			}
+			else
+			{
+				if (classFile.getName().endsWith(".class") && (prefix == null || classFile.getName().startsWith(prefix)))
+				{
+					String classFileName = classFile.getName();
+					String className = packageName + classFileName.substring(0, classFileName.length() - 6);
+					LiteLoaderEnumerator.checkAndAddClass(classloader, superClass, classes, className);
+				}
+			}
+		}
+	}
+
+	/**
+	 * @param classloader
+	 * @param superClass
+	 * @param classes
+	 * @param className
+	 */
+	private static void checkAndAddClass(ClassLoader classloader, Class<?> superClass, LinkedList<Class<?>> classes, String className)
+	{
+		if (className.indexOf('$') > -1)
+			return;
+		
+		try
+		{
+			Class<?> subClass = classloader.loadClass(className);
+			
+			if (subClass != null && !superClass.equals(subClass) && superClass.isAssignableFrom(subClass) && !subClass.isInterface() && !classes.contains(subClass))
+			{
+				classes.add(subClass);
+			}
+		}
+		catch (Throwable th)
+		{
+			LiteLoaderEnumerator.logger.log(Level.WARNING, "checkAndAddClass error", th);
+		}
+	}
+
+	private static void logInfo(String string, Object... args)
+	{
+		LiteLoaderEnumerator.logger.info(String.format(string, args));
+	}
+
+	private static void logWarning(String string, Object... args)
+	{
+		LiteLoaderEnumerator.logger.warning(String.format(string, args));
+	}
+}
@@ -7,7 +7,7 @@ import java.util.Set;
  * LiteLoader version table
  *
  * @author Adam Mummery-Smith
- * @version 1.6.4_01
+ * @version 1.6.4_02
  */
 public enum LiteLoaderVersion
 {
@@ -23,7 +23,8 @@ public enum LiteLoaderVersion
 	MC_1_6_2_R4(15, "1.6.2", "1.6.2_04", "1.6.2", "1.6.r2"),
 	MC_1_6_3_R0(16, "1.6.3", "1.6.3",    "1.6.3", "1.6.r3"),
 	MC_1_6_4_R0(17, "1.6.4", "1.6.4",    "1.6.4", "1.6.r4"),
-	MC_1_6_4_R1(18, "1.6.4", "1.6.4_01", "1.6.4", "1.6.r4");
+	MC_1_6_4_R1(18, "1.6.4", "1.6.4_01", "1.6.4", "1.6.r4"),
+	MC_1_6_4_R2(19, "1.6.4", "1.6.4_02", "1.6.4", "1.6.r4");
  
 	private int revision;
  
@@ -3,8 +3,7 @@ package com.mumfrey.liteloader.core;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
-
-import net.minecraft.src.ResourcePack;
+import java.util.logging.Logger;
  
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
@@ -21,6 +20,8 @@ public class ModFile extends File
 {
 	private static final long serialVersionUID = -7952147161905688459L;
  
+	private static final Logger logger = Logger.getLogger("liteloader");
+
 	/**
 	 * Gson parser for JSON
 	 */
@@ -64,7 +65,7 @@ public class ModFile extends File
 	/**
 	 * Resource pack we have registered with minecraft
 	 */
-	protected ResourcePack resourcePack = null;
+	protected Object resourcePack = null;
  
 	/**
 	 * ALL of the parsed metadata from the file, associated with the mod later on for retrieval via the loader
@@ -75,7 +76,7 @@ public class ModFile extends File
 	 * @param file
 	 * @param strVersion
 	 */
-	public ModFile(File file, String strVersion)
+	ModFile(File file, String strVersion)
 	{
 		super(file.getAbsolutePath());
  
@@ -87,47 +88,36 @@ public class ModFile extends File
 	@SuppressWarnings("unchecked")
 	protected void parseVersionFile(String strVersionData)
 	{
-		// Assume that it's json if the file starts with a brace
-//		if (strVersionData.trim().startsWith("{"))
-//		{
-			try
-			{
-				this.metaData = ModFile.gson.fromJson(strVersionData, HashMap.class);
-			}
-			catch (JsonSyntaxException jsx)
-			{
-				LiteLoader.getLogger().warning("Error reading litemod.json in " + this.getName() + ", JSON syntax exception: " + jsx.getMessage());
-				return;
-			}
-			
-			this.modName = this.metaData.get("name");
-			
-			this.version = this.metaData.get("mcversion");
-			if (this.version == null)
-			{
-				LiteLoader.getLogger().warning("Mod in " + this.getName() + " has no loader version number reading litemod.json");
-				return;
-			}
-			
-			try
-			{
-				this.revision = Float.parseFloat(this.metaData.get("revision"));
-				this.hasRevision = true;
-			}
-			catch (Exception ex)
-			{
-				LiteLoader.getLogger().warning("Mod in " + this.getName() + " has an invalid revision number reading litemod.json");
-			}
+		try
+		{
+			this.metaData = ModFile.gson.fromJson(strVersionData, HashMap.class);
+		}
+		catch (JsonSyntaxException jsx)
+		{
+			ModFile.logger.warning("Error reading litemod.json in " + this.getName() + ", JSON syntax exception: " + jsx.getMessage());
+			return;
+		}
+		
+		this.modName = this.metaData.get("name");
+		
+		this.version = this.metaData.get("mcversion");
+		if (this.version == null)
+		{
+			ModFile.logger.warning("Mod in " + this.getName() + " has no loader version number reading litemod.json");
+			return;
+		}
+		
+		try
+		{
+			this.revision = Float.parseFloat(this.metaData.get("revision"));
+			this.hasRevision = true;
+		}
+		catch (Exception ex)
+		{
+			ModFile.logger.warning("Mod in " + this.getName() + " has an invalid revision number reading litemod.json");
+		}
  
-			this.valid = true;
-//			this.json = true;
-//		}
-//		else
-//		{
-//			// Legacy version.txt file
-//			this.version = strVersionData;
-//			this.valid = true;
-//		}
+		this.valid = true;
  
 		if (this.modName == null)
 		{
@@ -145,11 +135,6 @@ public class ModFile extends File
 		return this.valid;
 	}
  
-//	public boolean isJson()
-//	{
-//		return this.json;
-//	}
-	
 	public String getVersion()
 	{
 		return this.version;
@@ -170,19 +155,25 @@ public class ModFile extends File
 		return this.metaData;
 	}
  
+	@SuppressWarnings("unchecked")
+	public <T> T getResourcePack()
+	{
+		return (T)this.resourcePack;
+	}
+	
 	/**
 	 * Registers this file as a minecraft resource pack 
 	 * 
 	 * @param name
 	 * @return true if the pack was added
 	 */
-	public boolean registerAsResourcePack(String name)
+	public boolean canRegisterAsResourcePack(String name)
 	{
 		if (this.resourcePack == null)
 		{
-			LiteLoader.getLogger().info(String.format("Registering \"%s\" as mod resource pack with identifier \"%s\"", this.getName(), name));
+			ModFile.logger.info(String.format("Registering \"%s\" as mod resource pack with identifier \"%s\"", this.getName(), name));
 			this.resourcePack = new ModResourcePack(name, this);
-			return LiteLoader.getInstance().registerModResourcePack(this.resourcePack);
+			return true;
 		}
  
 		return false;
@@ -41,11 +41,9 @@ public class PluginChannels
 	private LinkedList<PluginChannelListener> pluginChannelListeners = new LinkedList<PluginChannelListener>();
  
 	/**
-	 * @param loader
+	 * Package private
 	 */
-	public PluginChannels()
-	{
-	}
+	PluginChannels() {}
  
 	/**
 	 * 
@@ -145,7 +143,7 @@ public class PluginChannels
 			}
  
 			byte[] registrationData = channelList.toString().getBytes(Charset.forName("UTF8"));
-			PluginChannels.sendMessage(CHANNEL_REGISTER, registrationData);
+			PluginChannels.dispatch(new Packet250CustomPayload(CHANNEL_REGISTER, registrationData));
 		}
 	}
  
@@ -176,20 +174,33 @@ public class PluginChannels
 		}
 	}
  
+	/**
+	 * Send a message on a plugin channel
+	 * 
+	 * @param channel Channel to send, must not be a reserved channel name
+	 * @param data
+	 */
 	public static void sendMessage(String channel, byte[] data)
 	{
-		if (channel == null || channel.length() > 16)
+		if (channel == null || channel.length() > 16 || CHANNEL_REGISTER.equals(channel) || CHANNEL_UNREGISTER.equals(channel))
 			throw new RuntimeException("Invalid channel name specified"); 
  
+		Packet250CustomPayload payload = new Packet250CustomPayload(channel, data);
+		PluginChannels.dispatch(payload);
+	}
+
+	/**
+	 * @param channel
+	 * @param data
+	 */
+	private static void dispatch(Packet250CustomPayload payload)
+	{
 		try
 		{
 			Minecraft minecraft = Minecraft.getMinecraft();
  
 			if (minecraft.thePlayer != null && minecraft.thePlayer.sendQueue != null)
-			{
-				Packet250CustomPayload payload = new Packet250CustomPayload(channel, data);
 				minecraft.thePlayer.sendQueue.addToSendQueue(payload);
-			}
 		}
 		catch (Exception ex) {}
 	}
@@ -35,7 +35,7 @@ public class SoundManagerReloadInhibitor
 	 */
 	private int storedIndex;
  
-	public SoundManagerReloadInhibitor(SimpleReloadableResourceManager resourceManager, SoundManager soundManager)
+	SoundManagerReloadInhibitor(SimpleReloadableResourceManager resourceManager, SoundManager soundManager)
 	{
 		this.resourceManager = resourceManager;
 		this.soundManager = soundManager;
@@ -146,7 +146,7 @@ public class HookProfiler extends Profiler
 		if (!this.initDone)
 		{
 			this.initDone = true;
-			this.events.onInit();
+			this.events.preBeginGame();
 		}
  
 		if ("gameRenderer".equals(sectionName) && "root".equals(this.sectionStack.getLast()))
@@ -249,14 +249,4 @@ public class HookProfiler extends Profiler
 			throw new ProfilerStackCorruptionException("Corrupted Profiler stack detected");
 		}
 	}
-//	
-//	@Override
-//	public void dumpState()
-//	{
-//		String endingSection = this.sectionStack.size() > 0 ? this.sectionStack.getLast() : null;
-//		String nextSection = this.sectionStack.size() > 1 ? this.sectionStack.get(sectionStack.size() - 2) : null;
-//		
-//		System.out.println("endingSection=" + endingSection + "   nextSection=" + nextSection);
-//	}
-
-}
+}
 \ No newline at end of file
-package com.mumfrey.liteloader.core;
+package com.mumfrey.liteloader.crashreport;
  
 import java.util.concurrent.Callable;
  
+import com.mumfrey.liteloader.core.LiteLoader;
+
 import net.minecraft.src.CrashReport;
  
 public class CallableLiteLoaderBrand implements Callable<String>
-package com.mumfrey.liteloader.core;
+package com.mumfrey.liteloader.crashreport;
  
 import java.util.concurrent.Callable;
  
+import com.mumfrey.liteloader.core.LiteLoader;
+
 import net.minecraft.src.CrashReport;
  
 public class CallableLiteLoaderMods implements Callable<String>
+package com.mumfrey.liteloader.launch;
+
+import java.util.List;
+
+import net.minecraft.launchwrapper.LaunchClassLoader;
+
+/**
+ * Interface for the loader bootstrap, this is loaded in the parent classloader for convenience
+ * otherwise it would be necessary to call the initialisation functions using reflection which
+ * just gets boring very quickly.
+ * 
+ * @author Adam Mummery-Smith
+ */
+public interface ILoaderBootstrap
+{
+	/**
+	 * Pre-init, perform mod file discovery and initial setup (eg. logger, properties)
+	 * 
+	 * @param classLoader
+	 * @param loadTweaks
+	 */
+	public abstract void preInit(LaunchClassLoader classLoader, boolean loadTweaks);
+	
+	/**
+	 * Init, create the loader instance and load mods
+	 * 
+	 * @param modsToLoad
+	 * @param classLoader
+	 */
+	public abstract void init(List<String> modsToLoad, LaunchClassLoader classLoader);
+	
+	/**
+	 * Post-init, initialise loaded mods
+	 */
+	public abstract void postInit();
+}
@@ -17,8 +17,8 @@ public class LiteLoaderTransformer implements IClassTransformer
 		if ((classMappingRenderLightningBolt.equals(name) || classMappingRenderLightningBoltObf.equals(name)) && !LiteLoaderTransformer.postInit)
 		{
 			LiteLoaderTransformer.postInit = true;
-			LiteLoaderTweaker.preInitLoader(); // This is here at the moment, it will move later
-			LiteLoaderTweaker.postInitLoader();
+			LiteLoaderTweaker.init();
+			LiteLoaderTweaker.postInit();
 		}
  
 		return basicClass;
 package com.mumfrey.liteloader.launch;
  
 import java.io.File;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -16,6 +18,8 @@ import joptsimple.ArgumentAcceptingOptionSpec;
 import joptsimple.NonOptionArgumentSpec;
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
+import net.minecraft.client.ClientBrandRetriever;
+import net.minecraft.launchwrapper.IClassTransformer;
 import net.minecraft.launchwrapper.ITweaker;
 import net.minecraft.launchwrapper.Launch;
 import net.minecraft.launchwrapper.LaunchClassLoader;
@@ -32,6 +36,8 @@ public class LiteLoaderTweaker implements ITweaker
  
 	private static boolean preInit = true;
  
+	private static boolean init = true;
+	
 	private static File gameDirectory;
  
 	private static File assetsDirectory;
@@ -40,6 +46,8 @@ public class LiteLoaderTweaker implements ITweaker
  
 	private static List<String> modsToLoad;
  
+	private static ILoaderBootstrap bootstrap;
+	
 	private List<String> singularLaunchArgs = new ArrayList<String>();
  
 	private Map<String, String> launchArgs;
@@ -84,7 +92,7 @@ public class LiteLoaderTweaker implements ITweaker
 			LiteLoaderTweaker.modsToLoad = this.modsOption.values(this.parsedOptions);
 		}
  
-//		LiteLoaderTweaker.preInitLoader(); // for future version with tweak support
+		this.preInit();
 	}
  
 	/**
@@ -166,21 +174,6 @@ public class LiteLoaderTweaker implements ITweaker
  
 		return args.toArray(new String[args.size()]);
 	}
-
-	public File getGameDirectory()
-	{
-		return LiteLoaderTweaker.gameDirectory;
-	}
-
-	public File getAssetsDirectory()
-	{
-		return LiteLoaderTweaker.assetsDirectory;
-	}
-	
-	public String getProfile()
-	{
-		return LiteLoaderTweaker.profile;
-	}
  
 	public static boolean addTweaker(URL tweakSource, String tweakClass)
 	{
@@ -204,22 +197,58 @@ public class LiteLoaderTweaker implements ITweaker
  
 		return false;
 	}
-	
+
+	/**
+	 * @param url URL to add
+	 */
+	public static boolean addURLToParentClassLoader(URL url)
+	{
+		if (LiteLoaderTweaker.preInit)
+		{
+			try
+			{
+				URLClassLoader classLoader = (URLClassLoader)Launch.class.getClassLoader();
+				Method mAddUrl = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
+				mAddUrl.setAccessible(true);
+				mAddUrl.invoke(classLoader, url);
+				
+				return true;
+			}
+			catch (Exception ex)
+			{
+				LiteLoaderTweaker.logger.log(Level.WARNING, String.format("addURLToParentClassLoader failed: %s", ex.getMessage()), ex);
+			}
+		}
+			
+		return false;
+	}
+
+	@SuppressWarnings("unchecked")
+	private static void spawnBootstrap() throws ClassNotFoundException, NoSuchMethodException, SecurityException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException
+	{
+		Class<? extends ILoaderBootstrap> bootstrapClass = (Class<? extends ILoaderBootstrap>)Class.forName("com.mumfrey.liteloader.core.LiteLoaderBootstrap", false, Launch.classLoader);
+		Constructor<? extends ILoaderBootstrap> bootstrapCtor = bootstrapClass.getDeclaredConstructor(File.class, File.class, String.class);
+		bootstrapCtor.setAccessible(true);
+		
+		LiteLoaderTweaker.bootstrap = bootstrapCtor.newInstance(LiteLoaderTweaker.gameDirectory, LiteLoaderTweaker.assetsDirectory, LiteLoaderTweaker.profile);
+	}
+
 	/**
 	 * Do the first stage of loader startup, which enumerates mod sources and finds tweakers
 	 */
-	protected static void preInitLoader()
+	private void preInit()
 	{
 		if (!LiteLoaderTweaker.preInit) throw new IllegalStateException("Attempt to perform LiteLoader PreInit but PreInit was already completed");
-		LiteLoaderTweaker.logger.info("Beginning LiteLoader PreInit...");
  
 		try
 		{
-			Class<?> loaderClass = Class.forName("com.mumfrey.liteloader.core.LiteLoader", false, Launch.classLoader);
-			Method mPreInit = loaderClass.getDeclaredMethod("preInit", File.class, File.class, String.class, List.class, LaunchClassLoader.class, Boolean.TYPE);
-			mPreInit.setAccessible(true);
-			mPreInit.invoke(null, LiteLoaderTweaker.gameDirectory, LiteLoaderTweaker.assetsDirectory, LiteLoaderTweaker.profile, LiteLoaderTweaker.modsToLoad, Launch.classLoader, false);
-
+			LiteLoaderTweaker.logger.info("Bootstrapping LiteLoader " + LiteLoaderTweaker.VERSION);
+			
+			LiteLoaderTweaker.spawnBootstrap();
+			
+			LiteLoaderTweaker.logger.info("Beginning LiteLoader PreInit...");
+			
+			LiteLoaderTweaker.bootstrap.preInit(Launch.classLoader, true);
 			LiteLoaderTweaker.preInit = false;
 		}
 		catch (Throwable th)
@@ -227,51 +256,53 @@ public class LiteLoaderTweaker implements ITweaker
 			LiteLoaderTweaker.logger.log(Level.SEVERE, String.format("Error during LiteLoader PreInit: %s", th.getMessage()), th);
 		}
 	}
-	
+
 	/**
 	 * Do the second stage of loader startup
 	 */
-	protected static void postInitLoader()
+	protected static void init()
 	{
-		if (LiteLoaderTweaker.preInit) throw new IllegalStateException("Attempt to perform LiteLoader PostInit but PreInit was not completed");
-		LiteLoaderTweaker.logger.info("Beginning LiteLoader PostInit...");
+		if (LiteLoaderTweaker.preInit) throw new IllegalStateException("Attempt to perform LiteLoader Init but PreInit was not completed");
+		LiteLoaderTweaker.init = true;
  
 		try
 		{
-			Class<?> loaderClass = Class.forName("com.mumfrey.liteloader.core.LiteLoader", false, Launch.classLoader);
-			Method mPostInit = loaderClass.getDeclaredMethod("postInit");
-			mPostInit.setAccessible(true);
-			mPostInit.invoke(null);
+			LiteLoaderTweaker.bootstrap.init(LiteLoaderTweaker.modsToLoad, Launch.classLoader);
+			LiteLoaderTweaker.init = false;
+		}
+		catch (Throwable th)
+		{
+			LiteLoaderTweaker.logger.log(Level.SEVERE, String.format("Error during LiteLoader Init: %s", th.getMessage()), th);
+		}
+	}
+	
+	/**
+	 * Do the second stage of loader startup
+	 */
+	protected static void postInit()
+	{
+		if (LiteLoaderTweaker.init) throw new IllegalStateException("Attempt to perform LiteLoader PostInit but Init was not completed");
+
+		try
+		{
+			LiteLoaderTweaker.bootstrap.postInit();
 		}
 		catch (Throwable th)
 		{
-			th.printStackTrace(System.out);
 			LiteLoaderTweaker.logger.log(Level.SEVERE, String.format("Error during LiteLoader PostInit: %s", th.getMessage()), th);
 		}
 	}
  
 	/**
-	 * @param url URL to add
+	 * Naive implementation to check whether Forge ModLoader (FML) is loaded
 	 */
-	public static boolean addURLToParentClassLoader(URL url)
+	public static boolean fmlIsPresent()
 	{
-		if (LiteLoaderTweaker.preInit)
-		{
-			try
-			{
-				URLClassLoader classLoader = (URLClassLoader)Launch.class.getClassLoader();
-				Method mAddUrl = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
-				mAddUrl.setAccessible(true);
-				mAddUrl.invoke(classLoader, url);
+		if (ClientBrandRetriever.getClientModName().contains("fml")) return true;
  
-				return true;
-			}
-			catch (Exception ex)
-			{
-				LiteLoaderTweaker.logger.log(Level.WARNING, String.format("addURLToParentClassLoader failed: %s", ex.getMessage()), ex);
-			}
-		}
-			
+		for (IClassTransformer transformer : Launch.classLoader.getTransformers())
+			if (transformer.getClass().getName().contains("fml")) return true;
+		
 		return false;
 	}
 }
 \ No newline at end of file
@@ -16,12 +16,12 @@ public class LiteLoaderLogFormatter extends Formatter
 	{
 		StringBuilder sb = new StringBuilder();
 		sb.append(this.simpleDateFormatLogFormatter.format(Long.valueOf(logRecord.getMillis())));
-		Level var3 = logRecord.getLevel();
+		Level level = logRecord.getLevel();
  
-		if (var3 == Level.SEVERE)
-			sb.append(" [").append(var3.getLocalizedName()).append("] ");
+		if (level == Level.SEVERE)
+			sb.append(" [").append(level.getLocalizedName()).append("] ");
 		else
-			sb.append(" [").append(var3.toString().toUpperCase()).append("] ");
+			sb.append(" [").append(level.toString().toUpperCase()).append("] ");
  
 		sb.append(logRecord.getMessage());
 		sb.append('\n');
@@ -8,8 +8,8 @@ import java.util.Set;
  
 import com.mumfrey.liteloader.core.LiteLoader;
 import com.mumfrey.liteloader.core.PluginChannels;
+import com.mumfrey.liteloader.launch.LiteLoaderTweaker;
  
-import net.minecraft.client.ClientBrandRetriever;
 import net.minecraft.src.*;
  
 public abstract class ModUtilities
@@ -27,7 +27,7 @@ public abstract class ModUtilities
 	static
 	{
 		// Check for FML
-		ModUtilities.forgeModLoader = ClientBrandRetriever.getClientModName().contains("fml");
+		ModUtilities.forgeModLoader = LiteLoaderTweaker.fmlIsPresent();
 	}
  
 	/**