merging 1.7.2 development branch into trunk

Mumfrey
1 parent 2953b223
Showing 35 changed files with 1917 additions and 743 deletions
.classpath
.settings/org.eclipse.core.resources.prefs
.settings/org.eclipse.jdt.ui.prefs
ant/build_liteloader.xml
ant/seed_md5.xml
debug/com/mumfrey/liteloader/debug/LoginManager.java
debug/com/mumfrey/liteloader/debug/LoginPanel.java
debug/com/mumfrey/liteloader/debug/Start.java
java/com/mumfrey/liteloader/ChatFilter.java
java/com/mumfrey/liteloader/ChatListener.java
java/com/mumfrey/liteloader/ChatRenderListener.java
java/com/mumfrey/liteloader/GameLoopListener.java
java/com/mumfrey/liteloader/InitCompleteListener.java
java/com/mumfrey/liteloader/PreLoginListener.java → java/com/mumfrey/liteloader/JoinGameListener.java
java/com/mumfrey/liteloader/OutboundChatListener.java
java/com/mumfrey/liteloader/PluginChannelListener.java
java/com/mumfrey/liteloader/PostLoginListener.java
java/com/mumfrey/liteloader/LoginListener.java → java/com/mumfrey/liteloader/PreJoinGameListener.java
java/com/mumfrey/liteloader/RenderListener.java
java/com/mumfrey/liteloader/ServerChatFilter.java
@@ -6,15 +6,17 @@
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Client"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="lib" path="/Client/jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0.jar"/>
-	<classpathentry kind="lib" path="/Client/jars/libraries/com/google/code/gson/gson/2.2.2/gson-2.2.2.jar"/>
-	<classpathentry kind="lib" path="/Client/jars/libraries/com/google/guava/guava/14.0/guava-14.0.jar"/>
+	<classpathentry kind="lib" path="/Client/jars/libraries/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar"/>
+	<classpathentry kind="lib" path="/Client/jars/libraries/com/google/guava/guava/15.0/guava-15.0.jar"/>
 	<classpathentry kind="lib" path="/Client/jars/libraries/commons-io/commons-io/2.4/commons-io-2.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/launchwrapper-1.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/launchwrapper-1.9.jar" sourcepath="externals/launchwrapper/src"/>
 	<classpathentry exported="true" kind="lib" path="lib/asm-debug-all-4.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/authlib-1.3.jar" sourcepath="/AuthLib/java"/>
 	<classpathentry kind="lib" path="/Client/jars/libraries/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/log4j-api-2.0-beta9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/log4j-core-2.0-beta9.jar"/>
 	<classpathentry kind="lib" path="/Client/jars/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="/Client/jars/libraries/io/netty/netty-all/4.0.10.Final/netty-all-4.0.10.Final.jar"/>
+	<classpathentry exported="true" kind="lib" path="/Client/jars/libraries/com/mojang/authlib/1.3/authlib-1.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="/Client/jars/libraries/org/apache/logging/log4j/log4j-api/2.0-beta9/log4j-api-2.0-beta9.jar"/>
+	<classpathentry exported="true" kind="lib" path="/Client/jars/libraries/org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.jar"/>
+	<classpathentry kind="lib" path="/Client/jars/libraries/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
+eclipse.preferences.version=1
+encoding//resources/assets/liteloader/lang/en_US.lang=UTF-8
-#Fri Aug 17 17:54:35 BST 2012
 eclipse.preferences.version=1
 formatter_settings_version=11
 <?xml version="1.0" encoding="UTF-8" ?>
-<project name="liteloader" basedir="." default="rebuild">
+<project name="liteloader" basedir="." default="development">
  
 	<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="tasks/ant-contrib.jar" />
  
 	<!-- Versions !!IMPORTANT -->
-	<property name="version" value="1.6.4_02" />
-	<property name="mcversion" value="1.6.4" />
+	<property name="version" value="1.7.2_02" />
+	<property name="mcversion" value="1.7.2" />
 	<property name="author" value="Mumfrey" />
  
 	<!-- Project definitions and dependencies -->
@@ -28,41 +28,51 @@
  
 	<property name="python" location="${mcp.dir}/runtime/bin/python/python_mcp.exe" />
  
-    <target name="findmcp">
-        <echo level="info" message="Searching for clean MCP source..." />
-        <condition property="mcpsrc.exists">
-            <available file="${mcp.dir}/src/mcp" type="dir"/>
-        </condition>
-    </target>
-    
+	<target name="findmcp">
+		<echo level="info" message="Searching for clean MCP source..." />
+		<condition property="mcpsrc.exists">
+			<available file="${mcp.dir}/src/mcp" type="dir"/>
+		</condition>
+	</target>
+	
+	<target name="setup_development">
+	    <property name="skipremoval" value="DEV" />
+	</target>
+	
+	<target name="setup_production">
+	    <property name="skipremoval" value="" />
+	</target>
+	
 	<!-- Main target -->
-	<target name="rebuild" depends="findmcp, setdirsold, setdirsnew, build" description="Entry point" />
+	<target name="development" depends="setup_development, findmcp, setdirsold, setdirsnew, build" description="Entry point for MCP and upstream builds" />
+	
+	<target name="production" depends="setup_production, findmcp, setdirsold, setdirsnew, build" description="Entry point for production builds" />
  
 	<target name="setdirsnew" description="Set the MCP source directories for the new layout" unless="mcpsrc.exists">
 		<echo level="info" message="Setting MCP source directories for NEW configuration" />
-	    <property name="src" location="${build}/src"/>
-	    <property name="mc.src" location="${mcp.dir}/src/minecraft" />
+		<property name="src" location="${build}/src"/>
+		<property name="mc.src" location="${mcp.dir}/src/minecraft" />
 		<echo append="false" file="${temp}/build.cfg" message="[OUTPUT]&#x0A;SrcClient  = build/src" />
-    </target>
+	</target>
  
 	<target name="setdirsold" description="Set the MCP source directories for the old layout" if="mcpsrc.exists">
-        <echo level="warning" message="--------------------------------------------------------------------------------" />
-        <echo level="warning" message=" "                                                                                />
-        <echo level="warning" message=" Setting MCP source directories for OLD configuration!"                           />
-        <echo level="warning" message=" "                                                                                />
-        <echo level="warning" message=" Renaming the MCP 'src' directory is no longer required and support for this"     />
-        <echo level="warning" message=" be removed in a future version."                                                 />
-        <echo level="warning" message=" "                                                                                />
-        <echo level="warning" message="--------------------------------------------------------------------------------" />
-	    <property name="src" location="${mcp.dir}/src/minecraft"/>
-	    <property name="mc.src" location="${mcp.dir}/src/mcp" />
-    </target>
+		<echo level="warning" message="--------------------------------------------------------------------------------" />
+		<echo level="warning" message=" "                                                                                />
+		<echo level="warning" message=" Setting MCP source directories for OLD configuration!"                           />
+		<echo level="warning" message=" "                                                                                />
+		<echo level="warning" message=" Renaming the MCP 'src' directory is no longer required and support for this"     />
+		<echo level="warning" message=" be removed in a future version."                                                 />
+		<echo level="warning" message=" "                                                                                />
+		<echo level="warning" message="--------------------------------------------------------------------------------" />
+		<property name="src" location="${mcp.dir}/src/minecraft"/>
+		<property name="mc.src" location="${mcp.dir}/src/mcp" />
+	</target>
  
 	<target name="build" description="Perform all tasks for a build" depends="init, recompile, reobfuscate, savemd5, stage, zip" >
 	</target>
  
 	<target name="clean">
-        <echo level="info" message="Cleaning output directories" />
+		<echo level="info" message="Cleaning output directories" />
  
 		<delete dir="${src}" />
 		<delete dir="${mcp.dir}/reobf" />
@@ -76,41 +86,46 @@
 				<exclude name="**/debug/*.java" />
 			</fileset>
 			<fileset dir="${eclipse}/${lib}/src" />
+			<filterchain>
+				<linecontains negate="true">
+					<contains value="@MCPONLY${skipremoval}" />
+				</linecontains>
+			</filterchain>
 		</copy>
 	</target>
  
 	<target name="contributeresources" description="Contribute resources to the staging path">
 		<echo level="info" message="Contributing project resources for ${lib}" />
 		<copy todir="${stage.dir}" verbose="false" failonerror="false">
-            <fileset dir="${eclipse}/${lib}/resources" excludes=".svn/**">
-                <exclude name="**/Thumbs.db" />
-                <exclude name="**/minecraft.key" />
-            </fileset>
+			<fileset dir="${eclipse}/${lib}/resources" excludes=".svn/**">
+				<exclude name="**/Thumbs.db" />
+				<exclude name="**/minecraft.key" />
+			</fileset>
 		</copy>
 	</target>
  
 	<target name="findmd5dir">
-        <echo level="info" message="Searching for existing MD5 directory..." />
+		<echo level="info" message="Searching for existing MD5 directory..." />
 		<condition property="md5dir.exists">
 			<available file="${md5.dir}" type="dir"/>
 		</condition>
 	</target>
  
 	<target name="findmd5" depends="findmd5dir">
-        <echo level="info" message="Searching for existing MD5 sets..." />
-        <condition property="md5set.exists">
-            <available file="${md5.dir}/client_${md5set}.md5" type="file"/>
-        </condition>
+		<echo level="info" message="Searching for existing MD5 sets..." />
+		<condition property="md5set.exists">
+			<available file="${md5.dir}/client_${md5set}.md5" type="file"/>
+		</condition>
 	</target>
  
 	<target name="seedmd5" depends="findmd5" unless="md5set.exists">
-        <echo level="info" message="MD5 sets not found, seeding..." />
+		<echo level="info" message="MD5 sets not found, seeding..." />
 		<ant target="genmd5" antfile="seed_md5.xml" inheritall="true" />
 	</target>
  
-    <target name="notifymd5ok" depends="findmd5" if="md5set.exists">
-    	<echo level="info" message="MD5 sets already exist, skipping MD5 set seeding" />
-    </target>
+	<target name="notifymd5ok" depends="findmd5" if="md5set.exists">
+		<echo level="info" message="MD5 sets already exist, skipping MD5 set seeding" />
+	</target>
  
 	<target name="preparemd5" description="Copy patched MD5 to the temp directory" depends="seedmd5, notifymd5ok, clean">
 		<echo level="info" message="Prepare exclusion MD5s, using exclusion set &quot;${md5set}&quot;" />
@@ -186,7 +201,8 @@
  
 		<copy todir="${stage.dir}">
 			<fileset dir="${mcp.dir}/reobf/minecraft" excludes=".svn/**, *.txt">
-                <exclude name="/*.class" />
+				<exclude name="/*.class" />
+				<exclude name="/com/mumfrey/liteloader/core/gen/**" />
 			</fileset>
 		</copy>
  
@@ -220,7 +236,7 @@
  
 	<property environment="env" />
  
-	<target name="deploy" depends="rebuild" description="Deploy artifact to local minecraft installation in APPDATA">
+	<target name="deploy" depends="production" description="Deploy artifact to local minecraft installation in APPDATA">
 		<mkdir dir="${env.APPDATA}/.minecraft/libraries/com/mumfrey/liteloader/1.7.2"/>
 		<copy todir="${env.APPDATA}/.minecraft/libraries/com/mumfrey/liteloader/1.7.2" file="${dist.dir}/${ant.project.name}-${mcversion}.${filetype}" failonerror="false" overwrite="true" />
 	</target>
 <?xml version="1.0" encoding="UTF-8" ?>
 <project name="mcp" basedir="." default="genmd5">
  
-    <!-- ========================================================================== -->
-    <!-- DO NOT RUN THIS SCRIPT DIRECTLY                                            -->
-    <!-- ========================================================================== -->
-        
-    <!-- This script is called by the LiteLoader build script if the initial MD5s   -->
-    <!-- are missing. If you want to fire this script then delete the 'md5' folder  -->
-    <!-- before running the LiteLoader build.                                       -->
-    
-    <target name="genmd5" description="Seed the initial MCP md5 set">
-        <echo level="info" message="MCP md5set was not found, making a clean compile" />
-    	<antcall target="clean" />
-    	<antcall target="init" />
-    	<antcall target="recompile" />
-        <antcall target="reobfuscate" />
-        <antcall target="savemd5" />
+	<!-- ========================================================================== -->
+	<!-- DO NOT RUN THIS SCRIPT DIRECTLY                                            -->
+	<!-- ========================================================================== -->
+		
+	<!-- This script is called by the LiteLoader build script if the initial MD5s   -->
+	<!-- are missing. If you want to fire this script then delete the 'md5' folder  -->
+	<!-- before running the LiteLoader build.                                       -->
+	
+	<target name="genmd5" description="Seed the initial MCP md5 set">
+		<echo level="info" message="MCP md5set was not found, making a clean compile" />
+		<antcall target="clean" />
+		<antcall target="init" />
+		<antcall target="recompile" />
+		<antcall target="reobfuscate" />
+		<antcall target="savemd5" />
 	</target>
  
 	<target name="clean">
-        <echo level="info" message="Cleaning output directories" />
+		<echo level="info" message="Cleaning output directories" />
  
-        <delete dir="${src}" />
-        <delete dir="${mcp.dir}/reobf" />
-    </target>
+		<delete dir="${src}" />
+		<delete dir="${mcp.dir}/reobf" />
+	</target>
  
 	<target name="init" description="Initialize environment">
-        <echo level="info" message="Initialising environment" />
+		<echo level="info" message="Initialising environment" />
  
-    	<mkdir dir="${md5.dir}" />
+		<mkdir dir="${md5.dir}" />
  
-        <copy todir="${src}" verbose="false" overwrite="true">
-            <fileset dir="${mc.src}" />
-        </copy>
+		<copy todir="${src}" verbose="false" overwrite="true">
+			<fileset dir="${mc.src}" />
+		</copy>
 	</target>
  
 	<target name="recompile" description="MCP recompile">
-        <echo level="info" message="Compiling MCP sources" />
+		<echo level="info" message="Compiling MCP sources" />
  
 		<exec executable="${python}" dir="${mcp.dir}">
 			<arg value="runtime/recompile.py" />
@@ -46,17 +46,17 @@
 	</target>
  
 	<target name="reobfuscate" description="MCP reobfuscate">
-        <echo level="info" message="Obfuscating classes" />
+		<echo level="info" message="Obfuscating classes" />
  
 		<exec executable="${python}" dir="${mcp.dir}">
 			<arg value="runtime/reobfuscate.py" />
-            <arg value="--client" />
+			<arg value="--client" />
 			<arg value="%*" />
 		</exec>
 	</target>
  
-    <target name="savemd5" description="Put post-obfuscation MD5 to stored md5 set" if="outmd5set">
-        <echo level="info" message="Storing obfuscated MD5s" />
+	<target name="savemd5" description="Put post-obfuscation MD5 to stored md5 set" if="outmd5set">
+		<echo level="info" message="Storing obfuscated MD5s" />
  
 		<copy file="${temp}/client_reobf.md5" tofile="${md5.dir}/client_mcp.md5" overwrite="true" verbose="true" />
 	</target>
@@ -8,7 +8,6 @@ import java.net.Proxy;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
-import java.util.logging.Logger;
  
 import javax.swing.JOptionPane;
  
@@ -22,6 +21,7 @@ import com.mojang.authlib.exceptions.AuthenticationException;
 import com.mojang.authlib.exceptions.InvalidCredentialsException;
 import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
 import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication;
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  
 /**
  * Manages login requests against Yggdrasil for use in MCP
@@ -31,11 +31,6 @@ import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication;
 public class LoginManager
 {
 	/**
-	 * Logger instance
-	 */
-	private static Logger logger = Logger.getLogger("liteloader");
-	
-	/**
 	 * Gson instance for serialising and deserialising the authentication data
 	 */
 	private static Gson gson = new GsonBuilder().setPrettyPrinting().create();
@@ -120,7 +115,7 @@ public class LoginManager
  
 				if (authData != null && authData.validate())
 				{
-					this.logInfo("Initialising Yggdrasil authentication service with client token: %s", authData.getClientToken());
+					LiteLoaderLogger.info("Initialising Yggdrasil authentication service with client token: %s", authData.getClientToken());
 					this.authService = new YggdrasilAuthenticationService(Proxy.NO_PROXY, authData.getClientToken());
 					this.authentication = new YggdrasilUserAuthentication(this.authService, Agent.MINECRAFT);
 					authData.loadFromStorage(this.authentication);
@@ -187,30 +182,30 @@ public class LoginManager
 	{
 		if (this.offline || remainingTries == 0)
 		{
-			this.logInfo("LoginManager is set to work offline, skipping login");
+			LiteLoaderLogger.info("LoginManager is set to work offline, skipping login");
 			return false;
 		}
  
-		this.logInfo("Remaining login tries: %s", remainingTries > 0 ? remainingTries : "unlimited");
+		LiteLoaderLogger.info("Remaining login tries: %s", remainingTries > 0 ? remainingTries : "unlimited");
  
 		try
 		{
-			this.logInfo("Attempting login, contacting Mojang auth servers...");
+			LiteLoaderLogger.info("Attempting login, contacting Mojang auth servers...");
  
 			this.authentication.logIn();
  
 			if (this.authentication.isLoggedIn())
 			{
-				this.logInfo("LoginManager logged in successfully. Can play online = %s", this.authentication.canPlayOnline());
+				LiteLoaderLogger.info("LoginManager logged in successfully. Can play online = %s", this.authentication.canPlayOnline());
 				this.save();
 				return true;
 			}
  
-			this.logInfo("LoginManager failed to log in, unspecified status.");
+			LiteLoaderLogger.info("LoginManager failed to log in, unspecified status.");
 		}
 		catch (InvalidCredentialsException ex)
 		{
-			this.logInfo("Authentication agent reported invalid credentials: %s", ex.getMessage());
+			LiteLoaderLogger.info("Authentication agent reported invalid credentials: %s", ex.getMessage());
 			this.resetAuth();
  
 			if (remainingTries > 1)
@@ -229,7 +224,7 @@ public class LoginManager
  
 					if (!dialogResult)
 					{
-						this.logInfo("User cancelled login dialog");
+						LiteLoaderLogger.info("User cancelled login dialog");
 						return false;
 					}
  
@@ -292,6 +287,15 @@ public class LoginManager
 	}
  
 	/**
+	 * Get the profile name (minecraft player name) from login
+	 */
+	public String getUUID()
+	{
+		GameProfile selectedProfile = this.authentication.getSelectedProfile();
+		return selectedProfile != null ? selectedProfile.getId() : this.defaultDisplayName;
+	}
+	
+	/**
 	 * Get the session token
 	 */
 	public String getAuthenticatedToken()
@@ -300,11 +304,6 @@ public class LoginManager
 		return accessToken != null ? accessToken : "-";
 	}
  
-	private void logInfo(String message, Object... params)
-	{
-		LoginManager.logger.info(String.format(message, params));
-	}
-
 	/**
 	 * Struct for Gson serialisation of authenticaion settings
 	 * 
 package com.mumfrey.liteloader.debug;
  
-import javax.swing.JPanel;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.BorderLayout;
-
-import javax.swing.JLabel;
-
-import java.awt.Font;
-
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.JDialog;
-import javax.swing.UIManager;
-import javax.swing.JCheckBox;
-
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.FlowLayout;
-import java.awt.FocusTraversalPolicy;
-import java.awt.TextField;
-import java.awt.GridBagLayout;
-import java.awt.GridBagConstraints;
-import java.awt.Insets;
+import static javax.swing.WindowConstants.*;
  
-import javax.swing.JButton;
-
-import java.awt.event.ActionListener;
+import java.awt.*;
 import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 import java.util.List;
  
-import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
  
 /**
  * JPanel displayed in a JDialog to prompt the user for login credentials for minecraft
 package com.mumfrey.liteloader.debug;
 import java.io.File;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Handler;
-import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.List;
  
 import net.minecraft.launchwrapper.Launch;
  
 import com.mumfrey.liteloader.launch.LiteLoaderTweaker;
-import com.mumfrey.liteloader.util.log.LiteLoaderLogFormatter;
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  
 /**
  * Wrapper class for LaunchWrapper Main class, which logs into minecraft.net first so that online shizzle can be tested
  * 
  * @author Adam Mummery-Smith
- * @version 0.6
+ * @version 0.6.2
  */
 public abstract class Start
 {
-	private static Logger logger = Logger.getLogger("liteloader");
+	private static final String FML_TWEAKER_NAME = "cpw.mods.fml.common.launcher.FMLTweaker";
  
 	/**
 	 * Entry point.
@@ -26,8 +25,21 @@ public abstract class Start
 	 */
 	public static void main(String[] args)
 	{
-		Start.prepareLogger();
+		System.setProperty("mcpenv", "true");
  
+		boolean fmlDetected = false;
+		List<String> argsList = new ArrayList<String>();
+
+		// Detect the FML tweaker specified on the command line, this likely means someone has pulled us
+		// into a Forge MCP workspace
+		for (String arg : args) fmlDetected |= FML_TWEAKER_NAME.equals(arg);
+		
+		if (fmlDetected)
+		{
+			args = new String[0];
+			argsList.add("--tweakClass");argsList.add(FML_TWEAKER_NAME);
+		}
+
 		String usernameFromCmdLine = (args.length > 0) ? args[0] : null;
 		String passwordFromCmdLine = (args.length > 1) ? args[1] : null;
  
@@ -35,31 +47,19 @@ public abstract class Start
 		LoginManager loginManager = new LoginManager(loginJson);
 		loginManager.login(usernameFromCmdLine, passwordFromCmdLine, 5);
  
-		Start.logger.info(String.format("Launching game as %s", loginManager.getProfileName()));
+		LiteLoaderLogger.info("Launching game as %s", loginManager.getProfileName());
  
 		File gameDir = new File(System.getProperty("user.dir"));
-		File assetsDir = new File(gameDir, "assets");
-		
-		args = new String[] {
-			"--tweakClass", LiteLoaderTweaker.class.getName(),
-			"--username",   loginManager.getProfileName(),
-			"--session",    loginManager.getAuthenticatedToken(),
-			"--version",    "mcp",
-			"--gameDir",    gameDir.getAbsolutePath(),
-			"--assetsDir",  assetsDir.getAbsolutePath()
-		};
-		
-		Launch.main(args);
-	}
-	
-	private static void prepareLogger()
-	{
-		System.setProperty("liteloaderFormatLog", "true");
+		File assetsDir = new File(gameDir, "assets/virtual/legacy");
+
+		argsList.add("--tweakClass");  argsList.add(LiteLoaderTweaker.class.getName());
+		argsList.add("--username");    argsList.add(loginManager.getProfileName());
+		argsList.add("--uuid");        argsList.add(loginManager.getUUID());
+		argsList.add("--accessToken"); argsList.add(loginManager.getAuthenticatedToken());
+		argsList.add("--version");     argsList.add("mcp");
+		argsList.add("--gameDir");     argsList.add(gameDir.getAbsolutePath());
+		argsList.add("--assetsDir");   argsList.add(assetsDir.getAbsolutePath());
  
-		for (Handler handler : Start.logger.getParent().getHandlers())
-		{
-			if (handler instanceof ConsoleHandler)
-				handler.setFormatter(new LiteLoaderLogFormatter(false));
-		}
+		Launch.main(argsList.toArray(args));
 	}
 }
 package com.mumfrey.liteloader;
  
-import net.minecraft.src.ChatMessageComponent;
-import net.minecraft.src.Packet3Chat;
+import net.minecraft.network.play.server.S02PacketChat;
+import net.minecraft.util.IChatComponent;
+
  
 /**
  * Interface for mods which can filter inbound chat
@@ -18,5 +19,5 @@ public interface ChatFilter extends LiteMod
 	 * @param message Chat message parsed from the chat message component
 	 * @return True to keep the packet, false to discard
 	 */
-	public abstract boolean onChat(Packet3Chat chatPacket, ChatMessageComponent chat, String message);
+	public abstract boolean onChat(S02PacketChat chatPacket, IChatComponent chat, String message);
 }
 package com.mumfrey.liteloader;
  
-import net.minecraft.src.ChatMessageComponent;
+import net.minecraft.util.IChatComponent;
+
  
 /**
  * Interface for mods which receive inbound chat
@@ -15,5 +16,5 @@ public interface ChatListener extends LiteMod
 	 * @param chat ChatMessageComponent parsed from the chat packet
 	 * @param message Chat message parsed from the chat message component
 	 */
-	public abstract void onChat(ChatMessageComponent chat, String message);
+	public abstract void onChat(IChatComponent chat, String message);
 }
 package com.mumfrey.liteloader;
  
-import net.minecraft.src.GuiNewChat;
+import net.minecraft.client.gui.GuiNewChat;
  
 /**
  * Interface for mods which want to alter the chat display
 package com.mumfrey.liteloader;
  
-import net.minecraft.src.Minecraft;
+import net.minecraft.client.Minecraft;
  
 /**
  * Interface for mods which want a frame notification every single game loop
 package com.mumfrey.liteloader;
  
-import net.minecraft.src.Minecraft;
+import net.minecraft.client.Minecraft;
  
 import com.mumfrey.liteloader.core.LiteLoader;
  
 package com.mumfrey.liteloader;
  
-import net.minecraft.src.NetHandler;
-import net.minecraft.src.Packet1Login;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.play.server.S01PacketJoinGame;
+
  
 /**
  * Interface for mods which wish to be notified when the player connects to a server (or local game)
  *
  * @author Adam Mummery-Smith
  */
-public interface PreLoginListener extends LiteMod
+public interface JoinGameListener extends LiteMod
 {
 	/**
-	 * Called on login
+	 * Called on join game
 	 * 
 	 * @param netHandler Net handler
-	 * @param loginPacket Login packet
+	 * @param joinGamePacket Join game packet
 	 */
-	public abstract boolean onPreLogin(NetHandler netHandler, Packet1Login loginPacket);
+	public abstract void onJoinGame(INetHandler netHandler, S01PacketJoinGame joinGamePacket);
 }
+package com.mumfrey.liteloader;
+
+import net.minecraft.network.play.client.C01PacketChatMessage;
+
+/**
+ * Interface for mods which want to monitor outbound chat
+ *
+ * @author Adam Mummery-Smith
+ */
+public interface OutboundChatListener extends LiteMod
+{
+	/**
+	 * Raised when a new chat packet is created (not necessarily transmitted, something could be trolling us)
+	 * 
+	 * @param packet
+	 * @param message
+	 */
+	public abstract void onSendChatMessage(C01PacketChatMessage packet, String message);
+}
 package com.mumfrey.liteloader;
  
-import java.util.List;
+import com.mumfrey.liteloader.core.CommonPluginChannelListener;
  
 /**
  * Interface for mods which want to use plugin channels
  *
  * @author Adam Mummery-Smith
  */
-public interface PluginChannelListener extends LoginListener
+public interface PluginChannelListener extends CommonPluginChannelListener, JoinGameListener
 {
 	/**
-	 * Return a list of the plugin channels the mod wants to register
-	 * 
-	 * @return
-	 */
-	public abstract List<String> getChannels();
-	
-	/**
 	 * Called when a custom payload packet arrives on a channel this mod has registered
 	 * 
 	 * @param channel Channel on which the custom payload was received
+package com.mumfrey.liteloader;
+
+import net.minecraft.network.login.INetHandlerLoginClient;
+import net.minecraft.network.login.server.S02PacketLoginSuccess;
+
+/**
+ *
+ * @author Adam Mummery-Smith
+ */
+public interface PostLoginListener extends LiteMod
+{
+	public abstract void onPostLogin(INetHandlerLoginClient netHandler, S02PacketLoginSuccess packet);
+}
 package com.mumfrey.liteloader;
  
-import net.minecraft.src.NetHandler;
-import net.minecraft.src.Packet1Login;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.play.server.S01PacketJoinGame;
+
  
 /**
  * Interface for mods which wish to be notified when the player connects to a server (or local game)
  *
  * @author Adam Mummery-Smith
  */
-public interface LoginListener extends LiteMod
+public interface PreJoinGameListener extends LiteMod
 {
 	/**
 	 * Called on login
 	 * 
 	 * @param netHandler Net handler
-	 * @param loginPacket Login packet
+	 * @param joinGamePacket Join game packet
 	 */
-	public abstract void onLogin(NetHandler netHandler, Packet1Login loginPacket);
+	public abstract boolean onPreJoinGame(INetHandler netHandler, S01PacketJoinGame joinGamePacket);
 }
 package com.mumfrey.liteloader;
  
-import net.minecraft.src.GuiScreen;
+import net.minecraft.client.gui.GuiScreen;
  
 /**
  * Interface for objects which want a pre-render callback
+package com.mumfrey.liteloader;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.play.client.C01PacketChatMessage;
+
+/**
+ * Interface for mods which can filter inbound chat
+ *
+ * @author Adam Mummery-Smith
+ */
+public interface ServerChatFilter extends LiteMod
+{
+	/**
+	 * Chat filter function, return false to filter this packet, true to pass the packet
+	 * 
+	 * @param chatPacket Chat packet to examine
+	 * @param message Chat message
+	 * @return True to keep the packet, false to discard
+	 */
+	public abstract boolean onChat(EntityPlayerMP player, C01PacketChatMessage chatPacket, String message);
+}
+package com.mumfrey.liteloader;
+
+import net.minecraft.command.ServerCommandManager;
+
+
+/**
+ * Interface for mods which provide commands to the local integrated server
+ *
+ * @author Adam Mummery-Smith
+ */
+public interface ServerCommandProvider extends LiteMod
+{
+	/**
+	 * Allows the mod to provide commands to the server command manager my invoking commandManager.registerCommand() to
+	 * provide new commands for single player and lan worlds
+	 * 
+	 * @param commandManager
+	 */
+	public abstract void provideCommands(ServerCommandManager commandManager);
+}
+package com.mumfrey.liteloader;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+
+import com.mojang.authlib.GameProfile;
+
+/**
+ * Interface for mods which want to handle players joining and leaving a LAN game (or single player game)
+ *
+ * @author Adam Mummery-Smith
+ */
+public interface ServerPlayerListener extends LiteMod
+{
+	/**
+	 * Called when a player connects to the server and the EntityPlayerMP instance is created, the player has not logged
+	 * in at this point and may be disconnected if login fails
+	 * 
+	 * @param player Player attempting to connect
+	 * @param profile Player's GameProfile from the authentication service
+	 */
+	public abstract void onPlayerConnect(EntityPlayerMP player, GameProfile profile);
+	
+	/**
+	 * Called once the player has successfully logged in and all player variables are initialised and replicated
+	 * 
+	 * @param player Player connected
+	 */
+	public abstract void onPlayerLoggedIn(EntityPlayerMP player);
+	
+	/**
+	 * Called when a player respawns. This event is raised when a player respawns after dying or conquers the end 
+	 * 
+	 * @param player New player instance
+	 * @param oldPlayer Old player instance being discarded
+	 * @param newDimension Dimension the player is respawning in
+	 * @param playerWonTheGame True if the player conquered the end (this respawn is NOT as the result of a death)
+	 */
+	public abstract void onPlayerRespawn(EntityPlayerMP player, EntityPlayerMP oldPlayer, int newDimension, boolean playerWonTheGame);
+
+	/**
+	 * Called when a player disconnects from the game
+	 * 
+	 * @param player Player disconnecting
+	 */
+	public abstract void onPlayerLogout(EntityPlayerMP player);
+}
+package com.mumfrey.liteloader;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+
+import com.mumfrey.liteloader.core.CommonPluginChannelListener;
+
+/**
+ * Interface for mods which want to use plugin channels on the (integrated) server side
+ *
+ * @author Adam Mummery-Smith
+ */
+public interface ServerPluginChannelListener extends CommonPluginChannelListener
+{
+	/**
+	 * Called when a custom payload packet arrives on a channel this mod has registered
+	 * 
+	 * @param channel Channel on which the custom payload was received
+	 * @param length Length of the custom payload data
+	 * @param data Custom payload data
+	 */
+	public abstract void onCustomPayload(EntityPlayerMP sender, String channel, int length, byte[] data);
+}
 package com.mumfrey.liteloader;
  
-import net.minecraft.src.Minecraft;
+import net.minecraft.client.Minecraft;
  
 /**
  * Interface for mods which want tick events
+package com.mumfrey.liteloader.core;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.network.NetHandlerLoginClient;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.login.INetHandlerLoginClient;
+import net.minecraft.network.login.server.S02PacketLoginSuccess;
+import net.minecraft.network.play.INetHandlerPlayClient;
+import net.minecraft.network.play.client.C17PacketCustomPayload;
+import net.minecraft.network.play.server.S01PacketJoinGame;
+import net.minecraft.network.play.server.S3FPacketCustomPayload;
+
+import com.mumfrey.liteloader.LiteMod;
+import com.mumfrey.liteloader.PluginChannelListener;
+import com.mumfrey.liteloader.core.exceptions.UnregisteredChannelException;
+import com.mumfrey.liteloader.permissions.PermissionsManagerClient;
+import com.mumfrey.liteloader.util.PrivateFields;
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
+
+/**
+ * Handler for client plugin channels
+ * 
+ * @author Adam Mummery-Smith
+ */
+public class ClientPluginChannels extends PluginChannels<PluginChannelListener>
+{
+	private static ClientPluginChannels instance;
+	
+	ClientPluginChannels()
+	{
+		super();
+		
+		ClientPluginChannels.instance = this;
+	}
+	
+	static ClientPluginChannels getInstance()
+	{
+		return instance;
+	}
+
+	/**
+	 * @param listener
+	 */
+	void addListener(LiteMod listener)
+	{
+		if (listener instanceof PluginChannelListener)
+		{
+			this.addPluginChannelListener((PluginChannelListener)listener);
+		}
+	}
+
+	/**
+	 * @param netHandler
+	 * @param loginPacket
+	 */
+	void onPostLogin(INetHandlerLoginClient netHandler, S02PacketLoginSuccess loginPacket)
+	{
+		this.clearPluginChannels(netHandler);
+	}
+
+	/**
+	 * @param netHandler
+	 * @param loginPacket
+	 */
+	void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
+	{
+		this.sendRegisteredPluginChannels(netHandler);
+	}
+	
+	/**
+	 * Callback for the plugin channel hook
+	 * 
+	 * @param customPayload
+	 */
+	public void onPluginChannelMessage(S3FPacketCustomPayload customPayload)
+	{
+		if (customPayload != null && customPayload.func_149169_c() != null) // getChannel
+		{
+			String channel = customPayload.func_149169_c(); // getChannel
+			byte[] data = customPayload.func_149168_d(); // getData
+			
+			if (PluginChannels.CHANNEL_REGISTER.equals(channel))
+			{
+				this.onRegisterPacketReceived(data);
+			}
+			else if (this.pluginChannels.containsKey(channel))
+			{
+				try
+				{
+					PermissionsManagerClient permissionsManager = LiteLoader.getPermissionsManager();
+					if (permissionsManager != null)
+					{
+						permissionsManager.onCustomPayload(channel, data.length, data);
+					}
+				}
+				catch (Exception ex) {}
+				
+				this.onModPacketReceived(channel, data, data.length);
+			}
+		}
+	}
+
+	/**
+	 * @param channel
+	 * @param data
+	 * @param length
+	 */
+	protected void onModPacketReceived(String channel, byte[] data, int length)
+	{
+		for (PluginChannelListener pluginChannelListener : this.pluginChannels.get(channel))
+		{
+			try
+			{
+				pluginChannelListener.onCustomPayload(channel, length, data);
+				throw new RuntimeException();
+			}
+			catch (Exception ex)
+			{
+				int failCount = 1;
+				if (this.faultingPluginChannelListeners.containsKey(pluginChannelListener))
+					failCount = this.faultingPluginChannelListeners.get(pluginChannelListener).intValue() + 1;
+				
+				if (failCount >= PluginChannels.WARN_FAULT_THRESHOLD)
+				{
+					LiteLoaderLogger.warning("Plugin channel listener %s exceeded fault threshold on channel %s with %s", pluginChannelListener.getName(), channel, ex.getClass().getSimpleName());
+					this.faultingPluginChannelListeners.remove(pluginChannelListener);
+				}
+				else
+				{
+					this.faultingPluginChannelListeners.put(pluginChannelListener, Integer.valueOf(failCount));
+				}
+			}
+		}
+	}
+	
+	protected void sendRegisteredPluginChannels(INetHandler netHandler)
+	{
+		// Add the permissions manager channels
+		this.addPluginChannelsFor(LiteLoader.getPermissionsManager());
+		
+		try
+		{
+			byte[] registrationData = this.getRegistrationData();
+			if (registrationData != null)
+			{
+				this.sendRegistrationData(netHandler, registrationData);
+			}
+		}
+		catch (Exception ex)
+		{
+			LiteLoaderLogger.warning(ex, "Error dispatching REGISTER packet to server %s", ex.getClass().getSimpleName());
+		}
+	}
+
+	/**
+	 * @param netHandler
+	 * @param registrationData
+	 */
+	protected void sendRegistrationData(INetHandler netHandler, byte[] registrationData)
+	{
+		if (netHandler instanceof INetHandlerLoginClient)
+		{
+			NetworkManager networkManager = PrivateFields.netManager.get(((NetHandlerLoginClient)netHandler));
+			networkManager.scheduleOutboundPacket(new C17PacketCustomPayload(CHANNEL_REGISTER, registrationData));
+		}
+		else if (netHandler instanceof INetHandlerPlayClient)
+		{
+			ClientPluginChannels.dispatch(new C17PacketCustomPayload(CHANNEL_REGISTER, registrationData));
+		}
+	}
+
+	/**
+	 * @param channel
+	 * @param data
+	 */
+	static boolean dispatch(C17PacketCustomPayload payload)
+	{
+		try
+		{
+			Minecraft minecraft = Minecraft.getMinecraft();
+			
+			if (minecraft.thePlayer != null && minecraft.thePlayer.sendQueue != null)
+			{
+				minecraft.thePlayer.sendQueue.addToSendQueue(payload);
+				return true;
+			}
+		}
+		catch (Exception ex) {}
+		
+		return false;
+	}
+	
+	/**
+	 * Send a message to the server on a plugin channel
+	 * 
+	 * @param channel Channel to send, must not be a reserved channel name
+	 * @param data
+	 */
+	public static boolean sendMessage(String channel, byte[] data, ChannelPolicy policy)
+	{
+		if (!policy.allows(ClientPluginChannels.getInstance(), channel))
+		{
+			if (policy.isSilent()) return false;
+			throw new UnregisteredChannelException(channel);
+		}
+		
+		if (channel == null || channel.length() > 16 || CHANNEL_REGISTER.equals(channel) || CHANNEL_UNREGISTER.equals(channel))
+			throw new RuntimeException("Invalid channel name specified"); 
+		
+		C17PacketCustomPayload payload = new C17PacketCustomPayload(channel, data);
+		return ClientPluginChannels.dispatch(payload);
+	}
+}
+package com.mumfrey.liteloader.core;
+
+import java.util.List;
+
+import com.mumfrey.liteloader.LiteMod;
+
+/**
+ * Common interface for the client/server plugin channel listeners. DO NOT IMPLEMENT THIS INTERFACE DIRECTLY, nothing will happen!
+ * 
+ * @author Adam Mummery-Smith
+ */
+public interface CommonPluginChannelListener extends LiteMod
+{
+	/**
+	 * Return a list of the plugin channels the mod wants to register
+	 * 
+	 * @return
+	 */
+	public abstract List<String> getChannels();
+}
@@ -54,33 +54,33 @@ public class EnabledModsList
 	 * Check whether a particular mod is enabled
 	 * 
 	 * @param profileName
-	 * @param name
+	 * @param identifier
 	 * @return
 	 */
-	public boolean isEnabled(String profileName, String name)
+	public boolean isEnabled(String profileName, String identifier)
 	{
 		Map<String, Boolean> profile = this.getProfile(profileName);
-		name = name.toLowerCase().trim();
+		identifier = identifier.toLowerCase().trim();
  
-		if (!profile.containsKey(name))
+		if (!profile.containsKey(identifier))
 		{
-			profile.put(name, this.defaultEnabledValue);
+			profile.put(identifier, this.defaultEnabledValue);
 		}
  
-		return profile.get(name);
+		return profile.get(identifier);
 	}
  
 	/**
 	 * Set the enablement state of a mod in the specified profile
 	 * 
 	 * @param profileName
-	 * @param name
+	 * @param identifier
 	 * @param enabled
 	 */
-	public void setEnabled(String profileName, String name, boolean enabled)
+	public void setEnabled(String profileName, String identifier, boolean enabled)
 	{
 		Map<String, Boolean> profile = this.getProfile(profileName);
-		profile.put(name.toLowerCase().trim(), Boolean.valueOf(enabled));
+		profile.put(identifier.toLowerCase().trim(), Boolean.valueOf(enabled));
  
 		this.allowSave = true;
 	}
+package com.mumfrey.liteloader.core;
+
+import net.minecraft.launchwrapper.LaunchClassLoader;
+
+/**
+ * Interface for objects which can enumerate mods in places
+ * 
+ * @author Adam Mummery-Smith
+ *
+ * @param <T>
+ */
+public interface EnumeratorModule<T>
+{
+	/**
+	 * @param enumerator
+	 */
+	public abstract void init(PluggableEnumerator enumerator);
+
+	/**
+	 * @param enumerator
+	 */
+	public abstract void writeSettings(PluggableEnumerator enumerator);
+	
+	/**
+	 * Find loadable mods in this enumerator's domain
+	 * 
+	 * @param enumerator
+	 * @param enabledModsList
+	 * @param profile
+	 */
+	public abstract void enumerate(PluggableEnumerator enumerator, EnabledModsList enabledModsList, String profile);
+	
+	/**
+	 * @param enumerator
+	 * @param classLoader
+	 * @param enabledModsList
+	 * @param profile
+	 */
+	public abstract void injectIntoClassLoader(PluggableEnumerator enumerator, LaunchClassLoader classLoader, EnabledModsList enabledModsList, String profile);
+
+	/**
+	 * @param enumerator
+	 * @param classLoader
+	 */
+	public abstract void registerMods(PluggableEnumerator enumerator, LaunchClassLoader classLoader);
+}
 \ No newline at end of file
+package com.mumfrey.liteloader.core;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.launchwrapper.LaunchClassLoader;
+
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
+
+/**
+ * Enumerator module which searches for mods on the classpath
+ * 
+ * @author Adam Mummery-Smith
+ */
+public class EnumeratorModuleClassPath implements EnumeratorModule<File>
+{
+	/**
+	 * Array of class path entries specified to the JVM instance 
+	 */
+	private final String[] classPathEntries;
+	
+	/**
+	 * URLs to add once init is completed
+	 */
+	private final List<LoadableMod<File>> loadableMods = new ArrayList<LoadableMod<File>>();
+	
+	private boolean loadTweaks;
+
+	/**
+	 * @param parent
+	 * @param searchProtectionDomain
+	 * @param searchClassPath
+	 * @param loadTweaks
+	 */
+	public EnumeratorModuleClassPath(boolean loadTweaks)
+	{
+		// Read the JVM class path into the local array
+		this.classPathEntries = this.readClassPath();
+		
+		this.loadTweaks = loadTweaks;
+	}
+	
+	@Override
+	public String toString()
+	{
+		return "<Java Class Path>";
+	}
+	
+	@Override
+	public void init(PluggableEnumerator enumerator)
+	{
+	}
+
+	@Override
+	public void writeSettings(PluggableEnumerator enumerator)
+	{
+	}
+
+	/**
+	 * Reads the class path entries that were supplied to the JVM and returns them as an array
+	 */
+	private String[] readClassPath()
+	{
+		LiteLoaderLogger.info("Enumerating class path...");
+		
+		String classPath = System.getProperty("java.class.path");
+		String classPathSeparator = System.getProperty("path.separator");
+		String[] classPathEntries = classPath.split(classPathSeparator);
+		
+		LiteLoaderLogger.info("Class path separator=\"%s\"", classPathSeparator);
+		LiteLoaderLogger.info("Class path entries=(\n   classpathEntry=%s\n)", classPath.replace(classPathSeparator, "\n   classpathEntry="));
+		return classPathEntries;
+	}
+
+	@Override
+	public void enumerate(PluggableEnumerator enumerator, EnabledModsList enabledModsList, String profile)
+	{
+		if (this.loadTweaks)
+		{
+			LiteLoaderLogger.info("Discovering tweaks on class path...");
+			
+			for (String classPathPart : this.classPathEntries)
+			{
+				File packagePath = new File(classPathPart);
+				if (packagePath.exists())
+				{
+					LoadableModClassPath classPathMod = new LoadableModClassPath(packagePath);
+					if (enumerator.isContainerEnabled(classPathMod))
+					{
+						this.loadableMods.add(classPathMod);
+						if (classPathMod.hasTweakClass() || classPathMod.hasClassTransformers())
+						{
+							enumerator.registerTweakContainer(classPathMod);
+						}
+					}
+					else
+					{
+						LiteLoaderLogger.info("Mod %s is disabled or missing a required dependency, not injecting tranformers", classPathMod.getIdentifier());
+					}
+				}
+			}
+		}
+	}
+	
+	@Override
+	public void injectIntoClassLoader(PluggableEnumerator enumerator, LaunchClassLoader classLoader, EnabledModsList enabledModsList, String profile)
+	{
+	}
+
+	/**
+	 * @param classLoader
+	 */
+	@Override
+	public void registerMods(PluggableEnumerator enumerator, LaunchClassLoader classLoader)
+	{
+		LiteLoaderLogger.info("Discovering mods on class path...");
+		
+		for (LoadableMod<File> classPathMod : this.loadableMods)
+		{
+			LiteLoaderLogger.info("Searching %s...", classPathMod);
+			enumerator.registerModsFrom(classPathMod, true);
+		}
+	}
+}
+package com.mumfrey.liteloader.core;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+import java.util.Map.Entry;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import net.minecraft.launchwrapper.LaunchClassLoader;
+
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
+
+/**
+ * Enumerator module which searches for mods and tweaks in a folder
+ * 
+ * @author Adam Mummery-Smith
+ */
+public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule<File>
+{
+	private static final String OPTION_SEARCH_ZIPFILES  = "search.zipfiles";
+	private static final String OPTION_SEARCH_JARFILES  = "search.jarfiles";
+
+	/**
+	 * Ordered sets used to sort mods by version/revision  
+	 */
+	private final Map<String, TreeSet<LoadableMod<File>>> versionOrderingSets = new HashMap<String, TreeSet<LoadableMod<File>>>();
+	
+	/**
+	 * Mods to add once init is completed
+	 */
+	private final List<LoadableMod<File>> loadableMods = new ArrayList<LoadableMod<File>>();
+
+	private File directory;
+
+	private boolean readZipFiles;
+	private boolean readJarFiles;
+	private boolean loadTweaks;
+
+	/**
+	 * True if this is a general, unversioned folder and the enumerator should only add files which have valid version metadata
+	 */
+	private final boolean requireMetaData;
+
+	public EnumeratorModuleFolder(File directory, boolean loadTweaks, boolean requireMetaData)
+	{
+		this.directory       = directory;
+		this.loadTweaks      = loadTweaks;
+		this.requireMetaData = requireMetaData;
+	}
+	
+	@Override
+	public void init(PluggableEnumerator enumerator)
+	{
+		this.readZipFiles = enumerator.getAndStoreBooleanProperty(OPTION_SEARCH_ZIPFILES,  false);
+		this.readJarFiles = enumerator.getAndStoreBooleanProperty(OPTION_SEARCH_JARFILES,  true);
+	}
+	
+	/**
+	 * Write settings
+	 */
+	@Override
+	public void writeSettings(PluggableEnumerator enumerator)
+	{
+		enumerator.setBooleanProperty(OPTION_SEARCH_ZIPFILES, this.readZipFiles);
+		enumerator.setBooleanProperty(OPTION_SEARCH_JARFILES, this.readJarFiles);
+	}
+	
+	@Override
+	public String toString()
+	{
+		return this.directory.getAbsolutePath();
+	}
+	
+	/**
+	 * @return
+	 */
+	public File getDirectory()
+	{
+		return this.directory;
+	}
+	
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.core.Enumerator#getLoadableMods()
+	 */
+	public List<LoadableMod<File>> getLoadableMods()
+	{
+		return this.loadableMods;
+	}
+
+	/**
+	 * 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"));
+	}
+	
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.core.Enumerator#enumerate(com.mumfrey.liteloader.core.EnabledModsList, java.lang.String)
+	 */
+	@Override
+	public void enumerate(PluggableEnumerator enumerator, EnabledModsList enabledModsList, String profile)
+	{
+		if (this.directory.exists() && this.directory.isDirectory())
+		{
+			LiteLoaderLogger.info("Discovering valid mod files in folder %s", this.directory.getPath());
+
+			this.findValidFiles(enumerator, enabledModsList, profile);
+			this.sortAndAllocateFiles(enumerator, enabledModsList, profile);
+			this.versionOrderingSets.clear();
+		}
+	}
+	
+	/**
+	 * @param enabledModsList
+	 * @param profile
+	 */
+	private void findValidFiles(PluggableEnumerator enumerator, EnabledModsList enabledModsList, String profile)
+	{
+		for (File candidateFile : this.directory.listFiles(this))
+		{
+			ZipFile candidateZip = null;
+			
+			try
+			{
+				candidateZip = new ZipFile(candidateFile);
+				ZipEntry versionEntry = candidateZip.getEntry(LoadableMod.METADATA_FILENAME);
+				ZipEntry legacyVersionEntry = candidateZip.getEntry(LoadableMod.LEGACY_METADATA_FILENAME);
+
+				// Check for a version file
+				if (versionEntry != null)
+				{
+					String strVersion = null;
+					try
+					{
+						strVersion = LoadableModFile.zipEntryToString(candidateZip, versionEntry);
+					}
+					catch (IOException ex)
+					{
+						LiteLoaderLogger.warning("Error reading version data from %s", candidateZip.getName());
+					}
+					
+					if (strVersion != null)
+					{
+						this.addModFile(candidateFile, strVersion);
+					}
+				}
+				else if (legacyVersionEntry != null)
+				{
+					LiteLoaderLogger.warning("%s is no longer supported, ignoring outdated mod file: %s", LoadableMod.LEGACY_METADATA_FILENAME, candidateFile.getAbsolutePath());
+				}
+				else if (!this.requireMetaData && this.loadTweaks && this.readJarFiles && candidateFile.getName().toLowerCase().endsWith(".jar"))
+				{
+					LoadableFile container = new LoadableFile(candidateFile);
+					enumerator.registerTweakContainer(container);
+				}
+			}
+			catch (Exception ex)
+			{
+				LiteLoaderLogger.info("Error enumerating '%s': Invalid zip file or error reading file", candidateFile.getAbsolutePath());
+			}
+			finally
+			{
+				if (candidateZip != null)
+				{
+					try
+					{
+						candidateZip.close();
+					}
+					catch (IOException ex) {}
+				}
+			}
+		}
+	}
+
+	/**
+	 * @param candidateFile
+	 * @param strVersion
+	 */
+	private void addModFile(File candidateFile, String strVersion)
+	{
+		LoadableModFile modFile = new LoadableModFile(candidateFile, strVersion);
+		
+		if (modFile.hasValidMetaData())
+		{
+			// Only add the mod if the version matches, we add candidates to the versionOrderingSets in
+			// order to determine the most recent version available.
+			if (LiteLoaderVersion.CURRENT.isVersionSupported(modFile.getTargetVersion()))
+			{
+				if (!this.versionOrderingSets.containsKey(modFile.getName()))
+				{
+					this.versionOrderingSets.put(modFile.getModName(), new TreeSet<LoadableMod<File>>());
+				}
+				
+				LiteLoaderLogger.info("Considering valid mod file: %s", modFile.getAbsolutePath());
+				this.versionOrderingSets.get(modFile.getModName()).add(modFile);
+			}
+			else
+			{
+				LiteLoaderLogger.info("Not adding invalid or outdated mod file: %s", candidateFile.getAbsolutePath());
+			}
+		}
+	}
+
+	/**
+	 * @param enumerator 
+	 * @param enabledModsList 
+	 * @param enabledModsList
+	 * @param profile 
+	 * @param profile
+	 */
+	@SuppressWarnings("unchecked")
+	private void sortAndAllocateFiles(PluggableEnumerator enumerator, EnabledModsList enabledModsList, String profile)
+	{
+		// Copy the first entry in every version set into the modfiles list
+		for (Entry<String, TreeSet<LoadableMod<File>>> modFileEntry : this.versionOrderingSets.entrySet())
+		{
+			LoadableMod<File> newestVersion = modFileEntry.getValue().iterator().next();
+
+			if (enumerator.isContainerEnabled(newestVersion))
+			{
+				LiteLoaderLogger.info("Adding newest valid mod file '%s' at revision %.4f", newestVersion.getLocation(), newestVersion.getRevision());
+				this.loadableMods.add(newestVersion);
+			}
+			else
+			{
+				LiteLoaderLogger.info("Not adding valid mod file '%s', the specified mod is disabled or missing a required dependency", newestVersion.getLocation());
+			}
+			
+			if (this.loadTweaks)
+			{
+				try
+				{
+					if (newestVersion instanceof TweakContainer)
+					{
+						enumerator.registerTweakContainer((TweakContainer<File>)newestVersion);
+					}
+				}
+				catch (Throwable th)
+				{
+					LiteLoaderLogger.warning("Error adding tweaks from '%s'", newestVersion.getLocation());
+				}
+			}
+		}
+	}
+	
+	@Override
+	public void injectIntoClassLoader(PluggableEnumerator enumerator, LaunchClassLoader classLoader, EnabledModsList enabledModsList, String profile)
+	{
+		LiteLoaderLogger.info("Injecting external mods into class path...");
+		
+		for (LoadableMod<?> loadableMod : this.loadableMods)
+		{
+			try
+			{
+				if (loadableMod.injectIntoClassPath(classLoader, false))
+				{
+					LiteLoaderLogger.info("Successfully injected mod file '%s' into classpath", loadableMod.getLocation());
+				}
+			}
+			catch (MalformedURLException ex)
+			{
+				LiteLoaderLogger.warning("Error injecting '%s' into classPath. The mod will not be loaded", loadableMod.getLocation());
+			}
+		}
+	}
+	
+	@Override
+	public void registerMods(PluggableEnumerator enumerator, LaunchClassLoader classLoader)
+	{
+		LiteLoaderLogger.info("Discovering mods in valid mod files...");
+
+		for (LoadableMod<?> modFile : this.loadableMods)
+		{
+			LiteLoaderLogger.info("Searching %s...", modFile.getLocation());
+			enumerator.registerModsFrom(modFile, true);
+		}
+	}
+}
+package com.mumfrey.liteloader.core;
+
+import java.io.File;
+import java.net.URL;
+import java.net.URLDecoder;
+
+import net.minecraft.launchwrapper.LaunchClassLoader;
+
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
+
+/**
+ * Enumerator module which searches for mods on the classpath
+ * 
+ * @author Adam Mummery-Smith
+ */
+public class EnumeratorModuleProtectionDomain implements EnumeratorModule<File>
+{
+	private LoadableMod<File> codeSource;
+
+	/**
+	 * @param parent
+	 * @param searchProtectionDomain
+	 * @param searchClassPath
+	 * @param loadTweaks
+	 */
+	public EnumeratorModuleProtectionDomain(boolean loadTweaks)
+	{
+		this.initPackagePath();
+	}
+	
+	@Override
+	public String toString()
+	{
+		return this.codeSource != null ? this.codeSource.getName() : "<None>";
+	}
+	
+	private void initPackagePath()
+	{
+		try
+		{
+			URL protectionDomainLocation = EnumeratorModuleProtectionDomain.class.getProtectionDomain().getCodeSource().getLocation();
+			if (protectionDomainLocation != null)
+			{
+				LiteLoaderLogger.info("Determining code source using protection domain");
+				if (protectionDomainLocation.toString().indexOf('!') > -1 && protectionDomainLocation.toString().startsWith("jar:"))
+				{
+					LiteLoaderLogger.info("Protection domain references a jar file");
+					protectionDomainLocation = new URL(protectionDomainLocation.toString().substring(4, protectionDomainLocation.toString().indexOf('!')));
+				}
+				
+				File packagePath = new File(protectionDomainLocation.toURI());
+				if (packagePath.isFile() && packagePath.getName().endsWith(".class"))
+				{
+					packagePath = packagePath.getParentFile();
+				}
+				
+				this.codeSource = new LoadableModClassPath(packagePath);
+			}
+			else
+			{
+				LiteLoaderLogger.info("Determining code source using resource");
+				String reflectionClassPath = EnumeratorModuleProtectionDomain.class.getResource("/net/minecraft/client/main/Main.class").getPath();
+				
+				if (reflectionClassPath.indexOf('!') > -1)
+				{
+					reflectionClassPath = URLDecoder.decode(reflectionClassPath, "UTF-8");
+					this.codeSource = new LoadableModClassPath(new File(reflectionClassPath.substring(5, reflectionClassPath.indexOf('!'))));
+				}
+			}
+		}
+		catch (Throwable th)
+		{
+			LiteLoaderLogger.warning("Error determining local protection domain: %s", th.getMessage());
+		}
+	}
+	
+	@Override
+	public void init(PluggableEnumerator enumerator)
+	{
+	}
+
+	@Override
+	public void writeSettings(PluggableEnumerator enumerator)
+	{
+	}
+
+	@Override
+	public void enumerate(PluggableEnumerator enumerator, EnabledModsList enabledModsList, String profile)
+	{
+	}
+	
+	@Override
+	public void injectIntoClassLoader(PluggableEnumerator enumerator, LaunchClassLoader classLoader, EnabledModsList enabledModsList, String profile)
+	{
+	}
+
+	/**
+	 * @param classLoader
+	 */
+	@Override
+	public void registerMods(PluggableEnumerator enumerator, LaunchClassLoader classLoader)
+	{
+		LiteLoaderLogger.info("Discovering mods in protection domain...");
+
+		try
+		{
+			if (this.codeSource != null)
+			{
+				enumerator.registerModsFrom(this.codeSource, false);
+			}
+		}
+		catch (Throwable th)
+		{
+			LiteLoaderLogger.warning("Error loading from local class path: %s", th.getMessage());
+		}
+	}
+}
 package com.mumfrey.liteloader.core;
  
 import java.util.LinkedList;
-import java.util.logging.Level;
  
-import org.lwjgl.input.Mouse;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiNewChat;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.command.ICommandManager;
+import net.minecraft.command.ServerCommandManager;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.login.INetHandlerLoginClient;
+import net.minecraft.network.login.server.S02PacketLoginSuccess;
+import net.minecraft.network.play.INetHandlerPlayServer;
+import net.minecraft.network.play.client.C01PacketChatMessage;
+import net.minecraft.network.play.server.S01PacketJoinGame;
+import net.minecraft.network.play.server.S02PacketChat;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.server.integrated.IntegratedServer;
+import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.Timer;
+import net.minecraft.world.WorldSettings;
  
-import net.minecraft.src.*;
+import org.lwjgl.input.Mouse;
  
+import com.mojang.authlib.GameProfile;
 import com.mumfrey.liteloader.*;
-import com.mumfrey.liteloader.Tickable;
-import com.mumfrey.liteloader.core.hooks.HookProfiler;
+import com.mumfrey.liteloader.core.gen.GenProfiler;
+import com.mumfrey.liteloader.core.overlays.IMinecraft;
 import com.mumfrey.liteloader.util.PrivateFields;
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  
 /**
  *
  * @author Adam Mummery-Smith
  */
-public class Events implements IPlayerUsage
+public class Events
 {
 	/**
 	 * Reference to the loader instance
@@ -29,9 +50,14 @@ public class Events implements IPlayerUsage
 	private final Minecraft minecraft;
  
 	/**
-	 * Plugin channel manager
+	 * Client plugin channel manager
+	 */
+	private final ClientPluginChannels clientPluginChannels;
+	
+	/**
+	 * Server plugin channel manager
 	 */
-	private final PluginChannels pluginChannels;
+	private final ServerPluginChannels serverPluginChannels;
  
 	/**
 	 * Reference to the minecraft timer
@@ -41,12 +67,12 @@ public class Events implements IPlayerUsage
 	/**
 	 * Flags which keep track of whether hooks have been applied
 	 */
-	private boolean hookInitDone, lateInitDone, tickHooked;
+	private boolean hookInitDone, lateInitDone, profilerHooked;
  
 	/**
 	 * Profiler hook objects
 	 */
-	private final HookProfiler profilerHook = new HookProfiler(this);
+	private Profiler genProfiler = null;
  
 	/**
 	 * ScaledResolution used by the pre-chat and post-chat render callbacks
@@ -117,16 +143,41 @@ public class Events implements IPlayerUsage
 	private LinkedList<ChatFilter> chatFilters = new LinkedList<ChatFilter>();
  
 	/**
+	 * List of mods which implement PostLoginListener and want to be notified post login
+	 */
+	private LinkedList<PostLoginListener> postLoginListeners = new LinkedList<PostLoginListener>();
+	
+	/**
 	 * List of mods which implement LoginListener interface and will receive
 	 * client login events
 	 */
-	private LinkedList<LoginListener> loginListeners = new LinkedList<LoginListener>();
+	private LinkedList<JoinGameListener> joinGameListeners = new LinkedList<JoinGameListener>();
  
 	/**
 	 * List of mods which implement LoginListener interface and will receive
 	 * client login events
 	 */
-	private LinkedList<PreLoginListener> preLoginListeners = new LinkedList<PreLoginListener>();
+	private LinkedList<PreJoinGameListener> preJoinGameListeners = new LinkedList<PreJoinGameListener>();
+	
+	/**
+	 * List of mods which can filter server chat
+	 */
+	private LinkedList<ServerChatFilter> serverChatFilters = new LinkedList<ServerChatFilter>();
+	
+	/**
+	 * List of mods which provide server commands
+	 */
+	private LinkedList<ServerCommandProvider> serverCommandProviders = new LinkedList<ServerCommandProvider>();
+	
+	/**
+	 * List of mods which monitor server player events
+	 */
+	private LinkedList<ServerPlayerListener> serverPlayerListeners = new LinkedList<ServerPlayerListener>();
+	
+	/**
+	 * List of mods which monitor outbound chat
+	 */
+	private LinkedList<OutboundChatListener> outboundChatListeners = new LinkedList<OutboundChatListener>();
  
 	/**
 	 * Hash code of the current world. We don't store the world reference here because we don't want
@@ -141,11 +192,23 @@ public class Events implements IPlayerUsage
 	 * @param minecraft
 	 * @param pluginChannels
 	 */
-	Events(LiteLoader loader, Minecraft minecraft, PluginChannels pluginChannels)
+	Events(LiteLoader loader, Minecraft minecraft, ClientPluginChannels pluginChannels, ServerPluginChannels serverPluginChannels, boolean genMappings)
 	{
 		this.loader = loader;
 		this.minecraft = minecraft;
-		this.pluginChannels = pluginChannels;
+		this.clientPluginChannels = pluginChannels;
+		this.serverPluginChannels = serverPluginChannels;
+		try
+		{
+			if (genMappings)
+			{
+				this.genProfiler = GenProfiler.class.newInstance();
+			}
+		}
+		catch (Throwable th)
+		{
+//			th.printStackTrace();
+		}
 	}
  
 	/**
@@ -189,7 +252,7 @@ public class Events implements IPlayerUsage
 		{
 			if (listener instanceof ChatFilter)
 			{
-				LiteLoader.getLogger().warning(String.format("Interface error initialising mod '%1s'. A mod implementing ChatFilter and ChatListener is not supported! Remove one of these interfaces", listener.getName()));
+				LiteLoaderLogger.warning("Interface error initialising mod '%1s'. A mod implementing ChatFilter and ChatListener is not supported! Remove one of these interfaces", listener.getName());
 			}
 			else
 			{
@@ -207,47 +270,69 @@ public class Events implements IPlayerUsage
 			this.addHUDRenderListener((HUDRenderListener)listener);
 		}
  
-		if (listener instanceof PreLoginListener)
+		if (listener instanceof PreJoinGameListener)
+		{
+			this.addPreJoinGameListener((PreJoinGameListener)listener);
+		}
+		
+		if (listener instanceof JoinGameListener)
 		{
-			this.addPreLoginListener((PreLoginListener)listener);
+			this.addJoinGameListener((JoinGameListener)listener);
 		}
  
-		if (listener instanceof LoginListener)
+		if (listener instanceof ServerChatFilter)
 		{
-			this.addLoginListener((LoginListener)listener);
+			this.addServerChatFilter((ServerChatFilter)listener);
 		}
  
-		if (listener instanceof PluginChannelListener)
+		if (listener instanceof ServerCommandProvider)
 		{
-			this.pluginChannels.addPluginChannelListener((PluginChannelListener)listener);
+			this.addServerCommandProvider((ServerCommandProvider)listener);
+		}
+		
+		if (listener instanceof ServerPlayerListener)
+		{
+			this.addServerPlayerListener((ServerPlayerListener)listener);
+		}
+		
+		if (listener instanceof OutboundChatListener)
+		{
+			this.addOutboundChatListener((OutboundChatListener)listener);
+		}
+		
+		this.clientPluginChannels.addListener(listener);
+		this.serverPluginChannels.addListener(listener);
+		
+		if (listener instanceof CommonPluginChannelListener && !(listener instanceof PluginChannelListener) && !(listener instanceof ServerPluginChannelListener))
+		{
+			LiteLoaderLogger.warning("Interface error for mod '%1s'. Implementing CommonPluginChannelListener has no effect! Use PluginChannelListener or ServerPluginChannelListener instead", listener.getName());
 		}
 	}
  
 	/**
-	 * Initialise mod hooks
+	 * Initialise hooks
 	 */
 	public void initHooks()
 	{
-		try
+		if (this.genProfiler != null)
 		{
-			LiteLoader.getLogger().info("Event manager is registering hooks");
-			
-			// Tick hook
-			if (!this.tickHooked)
+			try
 			{
-				this.tickHooked = true;
-				PrivateFields.minecraftProfiler.setFinal(this.minecraft, this.profilerHook);
+				LiteLoaderLogger.info("Event manager is registering the mapping generator hook");
+				
+				// Tick hook
+				if (!this.profilerHooked)
+				{
+					this.profilerHooked = true;
+					PrivateFields.minecraftProfiler.setFinal(this.minecraft, this.genProfiler);
+				}
 			}
-			
-			// Sanity hook
-			PlayerUsageSnooper snooper = this.minecraft.getPlayerUsageSnooper();
-			PrivateFields.playerStatsCollector.setFinal(snooper, this);
-		}
-		catch (Exception ex)
-		{
-			LiteLoader.getLogger().log(Level.WARNING, "Error creating hooks", ex);
-			ex.printStackTrace();
-		}
+			catch (Exception ex)
+			{
+				LiteLoaderLogger.warning(ex, "Error creating hook");
+				ex.printStackTrace();
+			}
+		}	
  
 		this.hookInitDone = true;
 	}
@@ -325,8 +410,6 @@ public class Events implements IPlayerUsage
 		if (!this.chatFilters.contains(chatFilter))
 		{
 			this.chatFilters.add(chatFilter);
-			if (this.hookInitDone)
-				this.initHooks();
 		}
 	}
  
@@ -338,8 +421,6 @@ public class Events implements IPlayerUsage
 		if (!this.chatListeners.contains(chatListener))
 		{
 			this.chatListeners.add(chatListener);
-			if (this.hookInitDone)
-				this.initHooks();
 		}
 	}
  
@@ -370,28 +451,79 @@ public class Events implements IPlayerUsage
 	}
  
 	/**
-	 * @param loginListener
+	 * @param postLoginListener
 	 */
-	public void addPreLoginListener(PreLoginListener loginListener)
+	public void addPreJoinGameListener(PostLoginListener postLoginListener)
 	{
-		if (!this.preLoginListeners.contains(loginListener))
+		if (!this.postLoginListeners.contains(postLoginListener))
 		{
-			this.preLoginListeners.add(loginListener);
-			if (this.hookInitDone)
-				this.initHooks();
+			this.postLoginListeners.add(postLoginListener);
 		}
 	}
  
 	/**
-	 * @param loginListener
+	 * @param joinGameListener
 	 */
-	public void addLoginListener(LoginListener loginListener)
+	public void addPreJoinGameListener(PreJoinGameListener joinGameListener)
 	{
-		if (!this.loginListeners.contains(loginListener))
+		if (!this.preJoinGameListeners.contains(joinGameListener))
 		{
-			this.loginListeners.add(loginListener);
-			if (this.hookInitDone)
-				this.initHooks();
+			this.preJoinGameListeners.add(joinGameListener);
+		}
+	}
+	
+	/**
+	 * @param joinGameListener
+	 */
+	public void addJoinGameListener(JoinGameListener joinGameListener)
+	{
+		if (!this.joinGameListeners.contains(joinGameListener))
+		{
+			this.joinGameListeners.add(joinGameListener);
+		}
+	}
+
+	/**
+	 * @param serverChatFilter
+	 */
+	public void addServerChatFilter(ServerChatFilter serverChatFilter)
+	{
+		if (!this.serverChatFilters.contains(serverChatFilter))
+		{
+			this.serverChatFilters.add(serverChatFilter);
+		}
+	}
+
+	/**
+	 * @param serverCommandProvider
+	 */
+	public void addServerCommandProvider(ServerCommandProvider serverCommandProvider)
+	{
+		if (!this.serverCommandProviders.contains(serverCommandProvider))
+		{
+			this.serverCommandProviders.add(serverCommandProvider);
+		}
+	}
+
+	/**
+	 * @param serverPlayerListener
+	 */
+	public void addServerPlayerListener(ServerPlayerListener serverPlayerListener)
+	{
+		if (!this.serverPlayerListeners.contains(serverPlayerListener))
+		{
+			this.serverPlayerListeners.add(serverPlayerListener);
+		}
+	}
+
+	/**
+	 * @param outboundChatListener
+	 */
+	private void addOutboundChatListener(OutboundChatListener outboundChatListener)
+	{
+		if (!this.outboundChatListeners.contains(outboundChatListener))
+		{
+			this.outboundChatListeners.add(outboundChatListener);
 		}
 	}
  
@@ -410,12 +542,12 @@ public class Events implements IPlayerUsage
 			{
 				try
 				{
-					LiteLoader.getLogger().info("Calling late init for mod " + initMod.getName());
+					LiteLoaderLogger.info("Calling late init for mod " + initMod.getName());
 					initMod.onInitCompleted(this.minecraft, this.loader);
 				}
 				catch (Throwable th)
 				{
-					LiteLoader.getLogger().log(Level.WARNING, "Error initialising mod " + initMod.getName(), th);
+					LiteLoaderLogger.warning(th, "Error initialising mod %s", initMod.getName());
 				}
 			}
 		}
@@ -432,8 +564,6 @@ public class Events implements IPlayerUsage
 		this.screenWidth = this.currentResolution.getScaledWidth();
 		this.screenHeight = this.currentResolution.getScaledHeight();
  
-		this.loader.onRender();
-		
 		for (RenderListener renderListener : this.renderListeners)
 			renderListener.onRender();
 	}
@@ -463,10 +593,13 @@ public class Events implements IPlayerUsage
 	/**
 	 * Called immediately before the current GUI is rendered
 	 */
-	public void preRenderGUI()
+	public void preRenderGUI(int ref)
 	{
-		for (RenderListener renderListener : this.renderListeners)
-			renderListener.onRenderGui(this.minecraft.currentScreen);
+		if (!this.minecraft.skipRenderWorld && ref == (this.minecraft.theWorld == null ? 1 : 2))
+		{
+			for (RenderListener renderListener : this.renderListeners)
+				renderListener.onRenderGui(this.minecraft.currentScreen);
+		}
 	}
  
 	/**
@@ -538,15 +671,16 @@ public class Events implements IPlayerUsage
 	 * 
 	 * @param clock True if this is a new tick (otherwise it's just a new frame)
 	 */
-	public void onTick(Profiler profiler, boolean clock)
+	public void onTick(boolean clock)
 	{
+		this.minecraft.mcProfiler.startSection("litemods");
 		float partialTicks = 0.0F;
  
 		// Try to get the minecraft timer object and determine the value of the
 		// partialTicks
 		if (clock || this.minecraftTimer == null)
 		{
-			this.minecraftTimer = PrivateFields.minecraftTimer.get(this.minecraft);
+			this.minecraftTimer = ((IMinecraft)this.minecraft).getTimer();
 		}
  
 		// Hooray, we got the timer reference
@@ -559,21 +693,21 @@ public class Events implements IPlayerUsage
 		// Flag indicates whether we are in game at the moment
 		boolean inGame = this.minecraft.renderViewEntity != null && this.minecraft.renderViewEntity.worldObj != null;
  
-		if (clock)
-		{
-			this.loader.onTick(partialTicks, inGame);
-		}
+		this.minecraft.mcProfiler.startSection("loader");
+		this.loader.onTick(clock, partialTicks, inGame);
  
 		int mouseX = Mouse.getX() * this.screenWidth / this.minecraft.displayWidth;
 		int mouseY = this.screenHeight - Mouse.getY() * this.screenHeight / this.minecraft.displayHeight - 1;
+		this.minecraft.mcProfiler.endStartSection("postrender");
 		this.loader.postRender(mouseX, mouseY, partialTicks);
+		this.minecraft.mcProfiler.endSection();
  
 		// Iterate tickable mods
 		for (Tickable tickable : this.tickListeners)
 		{
-			profiler.startSection(tickable.getClass().getSimpleName());
+			this.minecraft.mcProfiler.startSection(tickable.getClass().getSimpleName().toLowerCase());
 			tickable.onTick(this.minecraft, partialTicks, inGame, clock);
-			profiler.endSection();
+			this.minecraft.mcProfiler.endSection();
 		}
  
 		// Detected world change
@@ -590,21 +724,23 @@ public class Events implements IPlayerUsage
 			this.worldHashCode = 0;
 			this.loader.onWorldChanged(null);
 		}
+
+		this.minecraft.mcProfiler.endSection();
 	}
  
 	/**
-	 * Callback from the reflective chat hook
+	 * Callback from the chat hook
 	 * 
 	 * @param chatPacket
 	 * @return
 	 */
-	public boolean onChat(Packet3Chat chatPacket)
+	public boolean onChat(S02PacketChat chatPacket)
 	{
-		if (chatPacket.message == null)
+		if (chatPacket.func_148915_c() == null)
 			return true;
  
-		ChatMessageComponent chat = ChatMessageComponent.createFromJson(chatPacket.message);
-		String message = chat.toStringWithFormatting(true);
+		IChatComponent chat = chatPacket.func_148915_c();
+		String message = chat.getUnformattedText();
  
 		// Chat filters get a stab at the chat first, if any filter returns
 		// false the chat is discarded
@@ -612,8 +748,8 @@ public class Events implements IPlayerUsage
 		{
 			if (chatFilter.onChat(chatPacket, chat, message))
 			{
-				chat = ChatMessageComponent.createFromJson(chatPacket.message);
-				message = chat.toStringWithFormatting(true);
+				chat = chatPacket.func_148915_c();
+				message = chat.getUnformattedText();
 			}
 			else
 			{
@@ -627,99 +763,157 @@ public class Events implements IPlayerUsage
  
 		return true;
 	}
+
+	/**
+	 * @param packet
+	 * @param message
+	 */
+	public void onSendChatMessage(C01PacketChatMessage packet, String message)
+	{
+		for (OutboundChatListener outboundChatListener : this.outboundChatListeners)
+		{
+			outboundChatListener.onSendChatMessage(packet, message);
+		}
+	}
+
+	/**
+	 * @param netHandler
+	 * @param loginPacket
+	 */
+	public void onPostLogin(INetHandlerLoginClient netHandler, S02PacketLoginSuccess loginPacket)
+	{
+		this.clientPluginChannels.onPostLogin(netHandler, loginPacket);
+
+		for (PostLoginListener loginListener : this.postLoginListeners)
+			loginListener.onPostLogin(netHandler, loginPacket);
+	}
  
 	/**
-	 * Pre-login callback from the login hook
+	 * Pre join game callback from the login hook
 	 * 
 	 * @param netHandler
 	 * @param hookLogin
 	 * @return
 	 */
-	public boolean onPreLogin(NetHandler netHandler, Packet1Login loginPacket)
+	public boolean onPreJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
 	{
 		boolean cancelled = false;
  
-		for (PreLoginListener loginListener : this.preLoginListeners)
+		for (PreJoinGameListener joinGameListener : this.preJoinGameListeners)
 		{
-			cancelled |= !loginListener.onPreLogin(netHandler, loginPacket);
+			cancelled |= !joinGameListener.onPreJoinGame(netHandler, loginPacket);
 		}
  
 		return !cancelled;
 	}
  
 	/**
-	 * Callback from the login hook
+	 * Callback from the join game hook
 	 * 
 	 * @param netHandler
 	 * @param loginPacket
 	 */
-	public void onConnectToServer(NetHandler netHandler, Packet1Login loginPacket)
+	public void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
 	{
-		this.loader.onLogin(netHandler, loginPacket);
+		this.loader.onJoinGame(netHandler, loginPacket);
+		this.clientPluginChannels.onJoinGame(netHandler, loginPacket);
  
-		for (LoginListener loginListener : this.loginListeners)
-			loginListener.onLogin(netHandler, loginPacket);
-		
-		this.pluginChannels.onConnectToServer(netHandler, loginPacket);
+		for (JoinGameListener joinGameListener : this.joinGameListeners)
+			joinGameListener.onJoinGame(netHandler, loginPacket);
 	}
  
-	/*
-	 * (non-Javadoc)
+	/**
+	 * Callback from the chat hook
+	 * @param netHandler 
 	 * 
-	 * @see
-	 * net.minecraft.src.IPlayerUsage#addServerStatsToSnooper(net.minecraft.
-	 * src.PlayerUsageSnooper)
+	 * @param chatPacket
+	 * @return
 	 */
-	@Override
-	public void addServerStatsToSnooper(PlayerUsageSnooper var1)
+	public boolean onServerChat(INetHandlerPlayServer netHandler, C01PacketChatMessage chatPacket)
 	{
-		this.minecraft.addServerStatsToSnooper(var1);
+		EntityPlayerMP player = netHandler instanceof NetHandlerPlayServer ? ((NetHandlerPlayServer)netHandler).playerEntity : null;
+		
+		for (ServerChatFilter chatFilter : this.serverChatFilters)
+		{
+			if (!chatFilter.onChat(player, chatPacket, chatPacket.func_149439_c()))
+			{
+				return false;
+			}
+		}
+
+		return true;
 	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * net.minecraft.src.IPlayerUsage#addServerTypeToSnooper(net.minecraft.src
-	 * .PlayerUsageSnooper)
+
+	/**
+	 * @param instance
+	 * @param folderName
+	 * @param worldName
+	 * @param worldSettings
+	 */
+	public void onStartIntegratedServer(IntegratedServer instance, String folderName, String worldName, WorldSettings worldSettings)
+	{
+		ICommandManager commandManager = instance.getCommandManager();
+		
+		if (commandManager instanceof ServerCommandManager)
+		{
+			ServerCommandManager serverCommandManager = (ServerCommandManager)commandManager;
+			
+			for (ServerCommandProvider commandProvider : this.serverCommandProviders)
+				commandProvider.provideCommands(serverCommandManager);
+		}
+	}
+
+	/**
+	 * @param scm
+	 * @param player
+	 * @param profile
 	 */
-	@Override
-	public void addServerTypeToSnooper(PlayerUsageSnooper var1)
+	public void onSpawnPlayer(ServerConfigurationManager scm, EntityPlayerMP player, GameProfile profile)
 	{
-		this.sanityCheck();
-		this.minecraft.addServerTypeToSnooper(var1);
+		for (ServerPlayerListener serverPlayerListener : this.serverPlayerListeners)
+			serverPlayerListener.onPlayerConnect(player, profile);
 	}
  
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see net.minecraft.src.IPlayerUsage#isSnooperEnabled()
+	/**
+	 * @param scm
+	 * @param player
 	 */
-	@Override
-	public boolean isSnooperEnabled()
+	public void onPlayerLogin(ServerConfigurationManager scm, EntityPlayerMP player)
 	{
-		return this.minecraft.isSnooperEnabled();
+		this.serverPluginChannels.onPlayerJoined(player);
 	}
  
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see net.minecraft.src.IPlayerUsage#getLogAgent()
+	/**
+	 * @param scm
+	 * @param netManager
+	 * @param player
 	 */
-	@Override
-	public ILogAgent getLogAgent()
+	public void onInitializePlayerConnection(ServerConfigurationManager scm, NetworkManager netManager, EntityPlayerMP player)
 	{
-		return this.minecraft.getLogAgent();
+		for (ServerPlayerListener serverPlayerListener : this.serverPlayerListeners)
+			serverPlayerListener.onPlayerLoggedIn(player);
 	}
-	
+
 	/**
-	 * Check that the profiler hook hasn't been overridden by something else
+	 * @param scm
+	 * @param player
+	 * @param oldPlayer
+	 * @param dimension
+	 * @param copy
 	 */
-	private void sanityCheck()
+	public void onRespawnPlayer(ServerConfigurationManager scm, EntityPlayerMP player, EntityPlayerMP oldPlayer, int dimension, boolean won)
 	{
-		if (this.tickHooked && this.minecraft.mcProfiler != this.profilerHook)
-		{
-			PrivateFields.minecraftProfiler.setFinal(this.minecraft, this.profilerHook);
-		}
+		for (ServerPlayerListener serverPlayerListener : this.serverPlayerListeners)
+			serverPlayerListener.onPlayerRespawn(player, oldPlayer, dimension, won);
+	}
+
+	/**
+	 * @param scm
+	 * @param player
+	 */
+	public void onPlayerLogout(ServerConfigurationManager scm, EntityPlayerMP player)
+	{
+		for (ServerPlayerListener serverPlayerListener : this.serverPlayerListeners)
+			serverPlayerListener.onPlayerLogout(player);
 	}
 }
+package com.mumfrey.liteloader.core;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import com.mumfrey.liteloader.launch.InjectionStrategy;
+
+import net.minecraft.launchwrapper.LaunchClassLoader;
+
+/**
+ * Interface for objects which can be injected into the classpath
+ *
+ * @author Adam Mummery-Smith
+ */
+public interface Injectable
+{
+	/**
+	 * Get the URL of this injectable resource
+	 * @throws MalformedURLException
+	 */
+	public abstract URL getURL() throws MalformedURLException;
+	
+	/**
+	 * Returns true if this object has been injected already
+	 */
+	public abstract boolean isInjected();
+	
+	/**
+	 * @param classLoader
+	 * @param injectIntoParent
+	 * @return
+	 * @throws MalformedURLException
+	 */
+	public abstract boolean injectIntoClassPath(LaunchClassLoader classLoader, boolean injectIntoParent) throws MalformedURLException;
+	
+	public abstract InjectionStrategy getInjectionStrategy();
+}
 package com.mumfrey.liteloader.core;
  
 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;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.util.*;
  
 import javax.activity.InvalidActivityException;
  
-import org.lwjgl.input.Keyboard;
-
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.IResourcePack;
+import net.minecraft.client.resources.SimpleReloadableResourceManager;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.crash.CrashReport;
 import net.minecraft.launchwrapper.LaunchClassLoader;
-import net.minecraft.src.CrashReport;
-import net.minecraft.src.GuiControls;
-import net.minecraft.src.GuiMainMenu;
-import net.minecraft.src.GuiScreen;
-import net.minecraft.src.KeyBinding;
-import net.minecraft.src.Minecraft;
-import net.minecraft.src.NetHandler;
-import net.minecraft.src.Packet1Login;
-import net.minecraft.src.ResourcePack;
-import net.minecraft.src.SimpleReloadableResourceManager;
-import net.minecraft.src.World;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.play.server.S01PacketJoinGame;
+import net.minecraft.world.World;
+
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.input.Keyboard;
  
-import com.mumfrey.liteloader.*;
+import com.mumfrey.liteloader.LiteMod;
+import com.mumfrey.liteloader.core.overlays.IMinecraft;
+import com.mumfrey.liteloader.crashreport.CallableLaunchWrapper;
 import com.mumfrey.liteloader.crashreport.CallableLiteLoaderBrand;
 import com.mumfrey.liteloader.crashreport.CallableLiteLoaderMods;
-import com.mumfrey.liteloader.gui.GuiControlsPaginated;
 import com.mumfrey.liteloader.gui.GuiScreenModInfo;
 import com.mumfrey.liteloader.modconfig.ConfigManager;
 import com.mumfrey.liteloader.modconfig.Exposable;
 import com.mumfrey.liteloader.permissions.PermissionsManagerClient;
-import com.mumfrey.liteloader.util.PrivateFields;
+import com.mumfrey.liteloader.util.Input;
+import com.mumfrey.liteloader.resources.InternalResourcePack;
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  
 /**
  * LiteLoader is a simple loader which loads and provides useful callbacks to
  * lightweight mods
  * 
  * @author Adam Mummery-Smith
- * @version 1.6.4_02
+ * @version 1.7.2_02
  */
 public final class LiteLoader
 {
+	public static final String MOD_SYSTEM = "liteloader";
+	
 	private static final String OPTION_MOD_INFO_SCREEN   = "modInfoScreen";
 	private static final String OPTION_SOUND_MANAGER_FIX = "soundManagerFix";
-	private static final String OPTION_CONTROLS_PAGES    = "controls.pages";
+	private static final String OPTION_GENERATE_MAPPINGS = "genMappings";
  
 	/**
 	 * LiteLoader is a singleton, this is the singleton instance
@@ -65,7 +56,7 @@ public final class LiteLoader
 	/**
 	 * Logger for LiteLoader events
 	 */
-	private static final Logger logger = Logger.getLogger("liteloader");
+	private static final Logger logger = LiteLoaderLogger.getLogger();
  
 	/**
 	 * Tweak system class loader 
@@ -73,11 +64,6 @@ public final class LiteLoader
 	private static LaunchClassLoader classLoader;
  
 	/**
-	 * List of mods passed into the command line
-	 */
-	private EnabledModsList enabledModsList = null;
-	
-	/**
 	 * Mods folder which contains mods and legacy config files
 	 */
 	private File modsFolder;
@@ -99,22 +85,11 @@ public final class LiteLoader
 	private File versionConfigFolder;
  
 	/**
-	 * JSON file containing the list of enabled/disabled mods by profile
-	 */
-	private File enabledModsFile;
-	
-	/**
 	 * Reference to the Minecraft game instance
 	 */
 	private Minecraft minecraft;
  
 	/**
-	 * Setting value, if true we will swap out the MC "Controls" GUI for our
-	 * custom, paginated one
-	 */
-	private boolean paginateControls = true;
-	
-	/**
 	 * Loader Bootstrap instance 
 	 */
 	private final LiteLoaderBootstrap bootstrap;
@@ -125,9 +100,14 @@ public final class LiteLoader
 	private final LiteLoaderEnumerator enumerator;
  
 	/**
+	 * List of mods passed into the command line
+	 */
+	private final EnabledModsList enabledModsList;
+	
+	/**
 	 * Registered resource packs 
 	 */
-	private final Map<String, ResourcePack> registeredResourcePacks = new HashMap<String, ResourcePack>();
+	private final Map<String, IResourcePack> registeredResourcePacks = new HashMap<String, IResourcePack>();
  
 	/**
 	 * List of loaded mods, for crash reporting
@@ -147,7 +127,7 @@ public final class LiteLoader
 	/**
 	 * Mods which are loaded but disabled
 	 */
-	private final LinkedList<ModFile> disabledMods = new LinkedList<ModFile>();
+	private final LinkedList<Loadable<?>> disabledMods = new LinkedList<Loadable<?>>();
  
 	/**
 	 * Event manager
@@ -157,7 +137,12 @@ public final class LiteLoader
 	/**
 	 * Plugin channel manager 
 	 */
-	private final PluginChannels pluginChannels = new PluginChannels();
+	private final ClientPluginChannels clientPluginChannels = new ClientPluginChannels();
+	
+	/**
+	 * Server channel manager 
+	 */
+	private final ServerPluginChannels serverPluginChannels = new ServerPluginChannels();
  
 	/**
 	 * Permission Manager
@@ -170,9 +155,9 @@ public final class LiteLoader
 	private final ConfigManager configManager;
  
 	/**
-	 * Flag which keeps track of whether late initialisation has been done
+	 * Flag which keeps track of whether late initialisation has completed
 	 */
-	private boolean postInitStarted, startupComplete;
+	private boolean startupComplete;
  
 	/**
 	 * True while initialising mods if we need to do a resource manager reload once the process is completed
@@ -187,29 +172,13 @@ public final class LiteLoader
 	/**
 	 * If inhibit is enabled, this object is used to reflectively inhibit the sound manager's reload process during startup by removing it from the reloadables list
 	 */
-	private SoundManagerReloadInhibitor soundManagerReloadInhibitor;
-
-	/**
-	 * File in which we will store mod key mappings
-	 */
-	private File keyMapSettingsFile = null;
+	private SoundHandlerReloadInhibitor soundHandlerReloadInhibitor;
  
 	/**
-	 * Properties object which stores mod key mappings
-	 */
-	private Properties keyMapSettings = new Properties();
-	
-	/**
-	 * List of all registered mod keys
-	 */
-	private List<KeyBinding> modKeyBindings = new ArrayList<KeyBinding>();
-	
-	/**
-	 * Map of mod key bindings to their key codes, stored so that we don't need to cast from
-	 * string in the properties file every tick
+	 * 
 	 */
-	private Map<KeyBinding, Integer> storedModKeyBindings = new HashMap<KeyBinding, Integer>();
-	
+	private Input input;
+
 	/**
 	 * Setting which determines whether we show the "mod info" screen tab in the main menu
 	 */
@@ -228,53 +197,20 @@ public final class LiteLoader
 	private GuiScreenModInfo modInfoScreen;
  
 	/**
-	 * Pre-init routine, called using reflection by the tweaker
-	 * 
-	 * @param gameDirectory Game directory passed to the tweaker
-	 * @param assetsDirectory Assets directory passed to the tweaker
-	 * @param profile Launch profile name supplied with --version parameter
-	 * @param modNameFilter List of mod names parsed from the command line
-	 * @param classLoader LaunchClassLoader
-	 */
-	static final void init(LiteLoaderBootstrap bootstrap, LiteLoaderEnumerator enumerator, List<String> modNameFilter, LaunchClassLoader classLoader)
-	{
-		if (LiteLoader.instance == null)
-		{
-			LiteLoader.classLoader = classLoader;
-			
-			LiteLoader.instance = new LiteLoader(bootstrap, enumerator, modNameFilter);
-			LiteLoader.instance.onInit();
-		}
-	}
-	
-	/**
-	 * Post-init routine, initialises and loads mods enumerated in preInit
-	 */
-	static final void postInit()
-	{
-		if (LiteLoader.instance != null)
-		{
-			final Minecraft minecraft = Minecraft.getMinecraft();
-			LiteLoader.instance.onPostInit(minecraft);
-		}
-	}
-
-	/**
 	 * LiteLoader constructor
 	 * @param profile 
 	 * @param modNameFilter 
 	 */
-	private LiteLoader(LiteLoaderBootstrap bootstrap, LiteLoaderEnumerator enumerator, List<String> modNameFilter)
+	private LiteLoader(LiteLoaderBootstrap bootstrap, LiteLoaderEnumerator enumerator, EnabledModsList enabledModsList)
 	{
 		this.bootstrap = bootstrap;
 		this.enumerator = enumerator;
+		this.enabledModsList = enabledModsList;
  
 		this.setupPaths(bootstrap);
  
-		this.enabledModsList = EnabledModsList.createFrom(this.enabledModsFile);
-		this.enabledModsList.processModsList(bootstrap.getProfile(), modNameFilter);
-		
 		this.configManager = new ConfigManager();
+		this.input = new Input(new File(this.commonConfigFolder, "liteloader.keys.properties"));
 	}
  
 	/**
@@ -286,15 +222,12 @@ public final class LiteLoader
 		this.configBaseFolder = bootstrap.getConfigBaseFolder();
  
 		this.commonConfigFolder = new File(this.configBaseFolder, "common");
-		this.versionConfigFolder = this.inflectVersionedConfigPath(LiteLoaderBootstrap.VERSION);
+		this.versionConfigFolder = this.inflectVersionedConfigPath(LiteLoaderVersion.CURRENT);
  
 		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.enabledModsFile = new File(this.configBaseFolder, "liteloader.profiles.json");
-		this.keyMapSettingsFile = new File(this.configBaseFolder, "liteloader.keys.properties");
 	}
  
 	/**
@@ -310,48 +243,38 @@ public final class LiteLoader
  
 		return new File(this.configBaseFolder, String.format("config.%s", version.getMinecraftVersion()));
 	}
-
-	/**
+	
+		/**
 	 * Set up reflection methods required by the loader
 	 */
-	private boolean onInit()
+	void init()
 	{
 		try
 		{
-			if (this.keyMapSettingsFile.exists())
-			{
-				try
-				{
-					this.keyMapSettings.load(new FileReader(this.keyMapSettingsFile));
-				}
-				catch (Exception ex) {}
-			}
+			this.input.init();
  
-			this.paginateControls = this.bootstrap.getAndStoreBooleanProperty(OPTION_CONTROLS_PAGES, true);
 			this.inhibitSoundManagerReload = this.bootstrap.getAndStoreBooleanProperty(OPTION_SOUND_MANAGER_FIX, true);
 			this.displayModInfoScreenTab = this.bootstrap.getAndStoreBooleanProperty(OPTION_MOD_INFO_SCREEN, true);
  
 			this.enumerator.discoverModClasses();
+			this.disabledMods.addAll(this.enumerator.getDisabledMods());
 		}
 		catch (Throwable th)
 		{
-			LiteLoader.getLogger().log(Level.SEVERE, "Error initialising LiteLoader", th);
-			return false;
+			LiteLoaderLogger.severe("Error initialising LiteLoader", th);
 		}
-		
-		return true;
 	}
  
-	private void onPostInit(Minecraft minecraft)
+	void postInit()
 	{
-		if (this.postInitStarted) return;
-		this.postInitStarted = true;
-
 		// Cache local minecraft reference
-		this.minecraft = minecraft;
-
+		this.minecraft = Minecraft.getMinecraft();
+		
+		// Add self as a resource pack for texture/lang resources
+		this.registerModResourcePack(new InternalResourcePack("LiteLoader", LiteLoader.class, "liteloader"));
+		
 		// Create the event broker
-		this.events = new Events(this, this.minecraft, this.pluginChannels);
+		this.events = new Events(this, this.minecraft, this.clientPluginChannels, this.serverPluginChannels, this.bootstrap.getBooleanProperty(OPTION_GENERATE_MAPPINGS));
  
 		// Spawn mod instances
 		this.loadMods();
@@ -359,24 +282,27 @@ public final class LiteLoader
 		// Initialises enumerated mods
 		this.initMods();
  
+		this.updateSharedModList();
+		
 		// Initialises the required hooks for loaded mods
 		this.events.initHooks();
 		this.startupComplete = true;
  
-		this.enabledModsList.saveTo(this.enabledModsFile);
+		// Save stuff
+		this.enabledModsList.save();
 		this.bootstrap.writeProperties();
 	}
-	
+
 	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.core.ICustomResourcePackManager#registerModResourcePack(net.minecraft.src.ResourcePack)
+	 * @see com.mumfrey.liteloader.core.ICustomResourcePackManager#registerModResourcePack(net.minecraft.client.resources.ResourcePack)
 	 */
-	public boolean registerModResourcePack(ResourcePack resourcePack)
+	public boolean registerModResourcePack(IResourcePack resourcePack)
 	{
 		if (!this.registeredResourcePacks.containsKey(resourcePack.getPackName()))
 		{
 			this.pendingResourceReload = true;
  
-			List<ResourcePack> defaultResourcePacks = PrivateFields.defaultResourcePacks.get(this.minecraft);
+			List<IResourcePack> defaultResourcePacks = ((IMinecraft)this.minecraft).getDefaultResourcePacks();
 			if (!defaultResourcePacks.contains(resourcePack))
 			{
 				defaultResourcePacks.add(resourcePack);
@@ -389,15 +315,15 @@ public final class LiteLoader
 	}
  
 	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.core.ICustomResourcePackManager#unRegisterModResourcePack(net.minecraft.src.ResourcePack)
+	 * @see com.mumfrey.liteloader.core.ICustomResourcePackManager#unRegisterModResourcePack(net.minecraft.client.resources.ResourcePack)
 	 */
-	public boolean unRegisterModResourcePack(ResourcePack resourcePack)
+	public boolean unRegisterModResourcePack(IResourcePack resourcePack)
 	{
 		if (this.registeredResourcePacks.containsValue(resourcePack))
 		{
 			this.pendingResourceReload = true;
  
-			List<ResourcePack> defaultResourcePacks = PrivateFields.defaultResourcePacks.get(this.minecraft);
+			List<IResourcePack> defaultResourcePacks = ((IMinecraft)this.minecraft).getDefaultResourcePacks();
 			this.registeredResourcePacks.remove(resourcePack.getPackName());
 			defaultResourcePacks.remove(resourcePack);
 			return true;
@@ -422,7 +348,9 @@ public final class LiteLoader
 	 * Get the LiteLoader logger object
 	 * 
 	 * @return
+	 * @deprecated use LiteLoaderLogger instead
 	 */
+	@Deprecated
 	public static final Logger getLogger()
 	{
 		return LiteLoader.logger;
@@ -441,11 +369,13 @@ public final class LiteLoader
 	/**
 	 * Get the output stream which we are using for console output
 	 * 
-	 * @return
+	 * @return System.err
+	 * @deprecated use log4j instead
 	 */
+	@Deprecated
 	public static final PrintStream getConsoleStream()
 	{
-		return LiteLoaderBootstrap.getConsoleStream();
+		return System.err;
 	}
  
 	/**
@@ -455,7 +385,17 @@ public final class LiteLoader
 	 */
 	public static final String getVersion()
 	{
-		return LiteLoaderBootstrap.VERSION.getLoaderVersion();
+		return LiteLoaderVersion.CURRENT.getLoaderVersion();
+	}
+	
+	/**
+	 * Get LiteLoader version
+	 * 
+	 * @return
+	 */
+	public static final String getVersionDisplayString()
+	{
+		return String.format("LiteLoader %s", LiteLoaderVersion.CURRENT.getLoaderVersion());
 	}
  
 	/**
@@ -465,7 +405,7 @@ public final class LiteLoader
 	 */
 	public static final int getRevision()
 	{
-		return LiteLoaderBootstrap.VERSION.getLoaderRevision();
+		return LiteLoaderVersion.CURRENT.getLoaderRevision();
 	}
  
 	/**
@@ -490,13 +430,43 @@ public final class LiteLoader
 	 * Get the plugin channel manager
 	 * 
 	 * @return
+	 * @deprecated use LiteLoader.getClientPluginChannels()
 	 */
-	public static PluginChannels getPluginChannels()
+	@Deprecated
+	public static ClientPluginChannels getPluginChannels()
 	{
-		return LiteLoader.getInstance().pluginChannels;
+		return LiteLoader.getInstance().clientPluginChannels;
 	}
  
 	/**
+	 * Get the client-side plugin channel manager
+	 * 
+	 * @return
+	 */
+	public static ClientPluginChannels getClientPluginChannels()
+	{
+		return LiteLoader.getInstance().clientPluginChannels;
+	}
+	
+	/**
+	 * Get the server-side plugin channel manager
+	 * 
+	 * @return
+	 */
+	public static ServerPluginChannels getServerPluginChannels()
+	{
+		return LiteLoader.getInstance().serverPluginChannels;
+	}
+	
+	/**
+	 * Get the input manager
+	 */
+	public static Input getInput()
+	{
+		return LiteLoader.getInstance().input;
+	}
+	
+	/**
 	 * Get the "mods" folder
 	 */
 	public static File getModsFolder()
@@ -545,6 +515,24 @@ public final class LiteLoader
 	}
  
 	/**
+	 * Used to get the name of the modpack being used
+	 * 
+	 * @return name of the modpack in use or null if no pack
+	 */
+	public static String getBranding()
+	{
+		return LiteLoader.getInstance().bootstrap.getBranding();
+	}
+	
+	/**
+	 * @return
+	 */
+	public static boolean isDevelopmentEnvironment()
+	{
+		return "true".equals(System.getProperty("mcpenv"));
+	}
+	
+	/**
 	 * Used for crash reporting, returns a text list of all loaded mods
 	 * 
 	 * @return List of loaded mods as a string
@@ -565,25 +553,22 @@ public final class LiteLoader
 	/**
 	 * Get a list containing all mod files which were NOT loaded
 	 */
-	public List<ModFile> getDisabledMods()
+	public List<Loadable<?>> getDisabledMods()
 	{
 		return Collections.unmodifiableList(this.disabledMods);
 	}
-	
 	/**
-	 * Used to get the name of the modpack being used
-	 * 
-	 * @return name of the modpack in use or null if no pack
+	 * Get the list of injected tweak containers
 	 */
-	public String getBranding()
+	public Collection<Loadable<File>> getInjectedTweaks()
 	{
-		return this.bootstrap.getBranding();
+		return Collections.unmodifiableCollection(this.enumerator.getInjectedTweaks());
 	}
-	
+
 	/**
 	 * Get a reference to a loaded mod, if the mod exists
 	 * 
-	 * @param modName Mod's name, meta name or class name
+	 * @param modName Mod's name, identifier or class name
 	 * @return
 	 * @throws InvalidActivityException
 	 */
@@ -602,9 +587,10 @@ public final class LiteLoader
  
 		for (LiteMod mod : this.mods)
 		{
-			String metaName = this.getModMetaName(mod.getClass());
+			Class<? extends LiteMod> modClass = mod.getClass();
+			String modId = this.getModIdentifier(modClass);
  
-			if (modName.equalsIgnoreCase(mod.getName()) || modName.equalsIgnoreCase(metaName) || modName.equalsIgnoreCase(mod.getClass().getSimpleName()))
+			if (modName.equalsIgnoreCase(mod.getName()) || modName.equalsIgnoreCase(modId) || modName.equalsIgnoreCase(modClass.getSimpleName()))
 				return (T)mod;
 		}
  
@@ -656,16 +642,16 @@ public final class LiteLoader
 	/**
 	 * Get a metadata value for the specified mod
 	 * 
-	 * @param mod
+	 * @param modNameOrId
 	 * @param metaDataKey
 	 * @param defaultValue
 	 * @return
 	 * @throws InvalidActivityException Thrown by getMod if init is not complete 
 	 * @throws IllegalArgumentException Thrown by getMod if argument is null
 	 */
-	public String getModMetaData(String mod, String metaDataKey, String defaultValue) throws InvalidActivityException, IllegalArgumentException
+	public String getModMetaData(String modNameOrId, String metaDataKey, String defaultValue) throws InvalidActivityException, IllegalArgumentException
 	{
-		return this.getModMetaData(this.getMod(mod), metaDataKey, defaultValue);
+		return this.getModMetaData(this.getMod(modNameOrId), metaDataKey, defaultValue);
 	}
  
 	/**
@@ -685,40 +671,74 @@ public final class LiteLoader
 	/**
 	 * Get a metadata value for the specified mod
 	 * 
-	 * @param modClassName
+	 * @param modClass
 	 * @param metaDataKey
 	 * @param defaultValue
 	 * @return
 	 */
 	public String getModMetaData(Class<? extends LiteMod> modClass, String metaDataKey, String defaultValue)
 	{
+		if (modClass == null || metaDataKey == null) return defaultValue;
 		return this.enumerator.getModMetaData(modClass, metaDataKey, defaultValue);
 	}
  
 	/**
-	 * Get the mod "name" metadata key, this is used for versioning, exclusivity, and enablement checks
+	 * Get the mod identifier, this is used for versioning, exclusivity, and enablement checks
 	 * 
 	 * @param modClass
 	 * @return
 	 */
-	public String getModMetaName(Class<? extends LiteMod> modClass)
+	public String getModIdentifier(Class<? extends LiteMod> modClass)
 	{
-		return this.enumerator.getModMetaName(modClass);
+		return this.enumerator.getModIdentifier(modClass);
 	}
  
 	/**
-	 * Get the mod "name" metadata key, this is used for versioning, exclusivity, and enablement checks
+	 * Get the mod identifier, this is used for versioning, exclusivity, and enablement checks
 	 * 
 	 * @param modClass
 	 * @return
 	 */
-	public Class<? extends LiteMod> getModFromMetaName(String modName)
+	public String getModIdentifier(LiteMod mod)
 	{
-		if (modName == null) return null;
+		return mod == null ? null : this.enumerator.getModIdentifier(mod.getClass());
+	}
+	
+	/**
+	 * Get the container (mod file, classpath jar or folder) for the specified mod
+	 * 
+	 * @param modClass
+	 * @return
+	 */
+	public LoadableMod<?> getModContainer(Class<? extends LiteMod> modClass)
+	{
+		return this.enumerator.getModContainer(modClass);
+	}
+	
+	/**
+	 * Get the container (mod file, classpath jar or folder) for the specified mod
+	 * 
+	 * @param modClass
+	 * @return
+	 */
+	public LoadableMod<?> getModContainer(LiteMod mod)
+	{
+		return mod == null ? null : this.enumerator.getModContainer(mod.getClass());
+	}
+	
+	/**
+	 * Get the mod which matches the specified identifier
+	 * 
+	 * @param identifier
+	 * @return
+	 */
+	public Class<? extends LiteMod> getModFromIdentifier(String identifier)
+	{
+		if (identifier == null) return null;
  
 		for (LiteMod mod : this.mods)
 		{
-			if (modName.equalsIgnoreCase(this.enumerator.getModMetaName(mod.getClass())))
+			if (identifier.equalsIgnoreCase(this.enumerator.getModIdentifier(mod.getClass())))
 			{
 				return mod.getClass();
 			}
@@ -728,29 +748,29 @@ public final class LiteLoader
 	}
  
 	/**
-	 * @param modMetaName Mod meta name to enable
+	 * @param identifier Identifier of the mod to enable
 	 */
-	public void enableMod(String modMetaName)
+	public void enableMod(String identifier)
 	{
-		this.setModEnabled(modMetaName, true);
+		this.setModEnabled(identifier, true);
 	}
  
 	/**
-	 * @param modMetaName Mod meta name to disable
+	 * @param identifier Identifier of the mod to disable
 	 */
-	public void disableMod(String modMetaName)
+	public void disableMod(String identifier)
 	{
-		this.setModEnabled(modMetaName, false);
+		this.setModEnabled(identifier, false);
 	}
  
 	/**
-	 * @param modMetaName Mod meta name to enable/disable
+	 * @param identifier Identifier of the mod to enable/disable
 	 * @param enabled
 	 */
-	public void setModEnabled(String modMetaName, boolean enabled)
+	public void setModEnabled(String identifier, boolean enabled)
 	{
-		this.enabledModsList.setEnabled(this.bootstrap.getProfile(), modMetaName, enabled);
-		this.enabledModsList.saveTo(this.enabledModsFile);
+		this.enabledModsList.setEnabled(this.bootstrap.getProfile(), identifier, enabled);
+		this.enabledModsList.save();
 	}
  
 	/**
@@ -772,7 +792,7 @@ public final class LiteLoader
  
 		for (LiteMod mod : this.loadedMods)
 		{
-			if (modName.equalsIgnoreCase(this.enumerator.getModMetaName(mod.getClass())))
+			if (modName.equalsIgnoreCase(this.enumerator.getModIdentifier(mod.getClass())))
 			{
 				return true;
 			}
@@ -810,70 +830,79 @@ public final class LiteLoader
 	{
 		if (!this.enumerator.hasModsToLoad())
 		{
-			LiteLoader.logInfo("Mod class discovery failed or no mod classes were found. Not loading any mods.");
+			LiteLoaderLogger.info("Mod class discovery failed or no mod classes were found. Not loading any mods.");
 			return;
 		}
  
-		LiteLoader.logInfo("Discovered %d total mod(s)", this.enumerator.modsToLoadCount());
+		LiteLoaderLogger.info("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();
+		this.soundHandlerReloadInhibitor = new SoundHandlerReloadInhibitor((SimpleReloadableResourceManager)this.minecraft.getResourceManager(), this.minecraft.getSoundHandler());
+		if (this.inhibitSoundManagerReload) this.soundHandlerReloadInhibitor.inhibit();
  
 		for (Class<? extends LiteMod> mod : this.enumerator.getModsToLoad())
 		{
+			LoadableMod<?> container = this.enumerator.getModContainer(mod);
+
 			try
 			{
-				String metaName = this.getModMetaName(mod);
-				if (metaName == null || this.enabledModsList.isEnabled(this.bootstrap.getProfile(), metaName))
+				String identifier = this.getModIdentifier(mod);
+				if (identifier == null || this.enabledModsList.isEnabled(this.bootstrap.getProfile(), identifier))
 				{
-					this.loadMod(metaName, mod);
+					if (this.enumerator.checkDependencies(container))
+					{
+						this.loadMod(identifier, mod, container);
+					}
+					else
+					{
+						LiteLoaderLogger.info("Not loading mod %s, the mod was missing a required dependency", identifier);
+						if (container != LoadableMod.NONE && !this.disabledMods.contains(container)) this.disabledMods.add(container);
+					}
 				}
 				else
 				{
-					LiteLoader.logInfo("Not loading mod %s, excluded by filter", metaName);
-					this.disabledMods.add(this.enumerator.getModFile(mod));
+					LiteLoaderLogger.info("Not loading mod %s, excluded by filter", identifier);
+					if (container != LoadableMod.NONE && !this.disabledMods.contains(container)) this.disabledMods.add(container);
 				}
 			}
 			catch (Throwable th)
 			{
-				th.printStackTrace(System.out);
-				LiteLoader.getLogger().log(Level.WARNING, String.format("Error loading mod from %s", mod.getName()), th);
+				th.printStackTrace();
+				LiteLoaderLogger.warning(th, "Error loading mod from %s", mod.getName());
+				if (container != LoadableMod.NONE && !this.disabledMods.contains(container)) this.disabledMods.add(container);
 			}
 		}
 	}
  
 	/**
-	 * @param metaName
+	 * @param identifier
 	 * @param mod
+	 * @param container 
 	 * @throws InstantiationException
 	 * @throws IllegalAccessException
 	 */
-	protected void loadMod(String metaName, Class<? extends LiteMod> mod) throws InstantiationException, IllegalAccessException
+	protected void loadMod(String identifier, Class<? extends LiteMod> mod, LoadableMod<?> container) throws InstantiationException, IllegalAccessException
 	{
-		LiteLoader.logInfo("Loading mod from %s", mod.getName());
+		LiteLoaderLogger.info("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());
+		if (modName == null && identifier != null) modName = identifier;
+		LiteLoaderLogger.info("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.enumerator.getModFile(mod);
-		if (modFile != null)
+		// Register the mod as a resource pack if the container exists
+		if (container != null)
 		{
-			this.disabledMods.remove(modFile);
-			
-			LiteLoader.logInfo("Adding \"%s\" to active resource pack set", modFile.getAbsolutePath());
+			LiteLoaderLogger.info("Adding \"%s\" to active resource pack set", container.getLocation());
 			if (modName != null)
 			{
-				modFile.initResourcePack(modName);
+				container.initResourcePack(modName);
  
-				if (modFile.hasResourcePack() && this.registerModResourcePack((ResourcePack)modFile.getResourcePack()))
+				if (container.hasResourcePack() && this.registerModResourcePack((IResourcePack)container.getResourcePack()))
 				{
-					LiteLoader.logInfo("Successfully added \"%s\" to active resource pack set", modFile.getAbsolutePath());
+					LiteLoaderLogger.info("Successfully added \"%s\" to active resource pack set", container.getLocation());
 				}
 			}
 		}
@@ -898,7 +927,7 @@ public final class LiteLoader
 			}
 			catch (Throwable th)
 			{
-				LiteLoader.getLogger().log(Level.WARNING, "Error initialising mod '" + mod.getName() + "'", th);
+				LiteLoaderLogger.warning(th, "Error initialising mod '%s'", mod.getName());
 				iter.remove();
 			}
 		}
@@ -911,7 +940,7 @@ public final class LiteLoader
 	 */
 	protected void initMod(LiteMod mod)
 	{
-		LiteLoader.logInfo("Initialising mod %s version %s", mod.getName(), mod.getVersion());
+		LiteLoaderLogger.info("Initialising mod %s version %s", mod.getName(), mod.getVersion());
  
 		// register mod config panel if configurable
 		this.configManager.registerMod(mod);
@@ -922,7 +951,7 @@ public final class LiteLoader
 		}
 		catch (Throwable th)
 		{
-			LiteLoader.logWarning("Error performing settings upgrade for %s. Settings may not be properly migrated", mod.getName());
+			LiteLoaderLogger.warning("Error performing settings upgrade for %s. Settings may not be properly migrated", mod.getName());
 		}
  
 		// Init mod config if there is any
@@ -949,18 +978,18 @@ public final class LiteLoader
 		String modKey = this.getModNameForConfig(mod.getClass(), mod.getName());
 		LiteLoaderVersion lastModVersion = LiteLoaderVersion.getVersionFromRevision(this.bootstrap.getLastKnownModRevision(modKey));
  
-		if (LiteLoaderBootstrap.VERSION.getLoaderRevision() > lastModVersion.getLoaderRevision())
+		if (LiteLoaderVersion.CURRENT.getLoaderRevision() > lastModVersion.getLoaderRevision())
 		{
-			LiteLoader.logInfo("Performing config upgrade for mod %s. Upgrading %s to %s...", mod.getName(), lastModVersion, LiteLoaderBootstrap.VERSION);
+			LiteLoaderLogger.info("Performing config upgrade for mod %s. Upgrading %s to %s...", mod.getName(), lastModVersion, LiteLoaderVersion.CURRENT);
  
 			// Migrate versioned config if any is present
 			this.configManager.migrateModConfig(mod, this.versionConfigFolder, this.inflectVersionedConfigPath(lastModVersion));
  
 			// Let the mod upgrade
-			mod.upgradeSettings(LiteLoaderBootstrap.VERSION.getMinecraftVersion(), this.versionConfigFolder, this.inflectVersionedConfigPath(lastModVersion));
+			mod.upgradeSettings(LiteLoaderVersion.CURRENT.getMinecraftVersion(), this.versionConfigFolder, this.inflectVersionedConfigPath(lastModVersion));
  
 			this.bootstrap.storeLastKnownModRevision(modKey);
-			LiteLoader.logInfo("Config upgrade succeeded for mod %s", mod.getName());
+			LiteLoaderLogger.info("Config upgrade succeeded for mod %s", mod.getName());
 		}
 	}
  
@@ -1001,9 +1030,9 @@ public final class LiteLoader
 		// Set the loader branding in ClientBrandRetriever using reflection
 		LiteLoaderBootstrap.setBranding("LiteLoader");
  
-		if (this.soundManagerReloadInhibitor != null && this.soundManagerReloadInhibitor.isInhibited())
+		if (this.soundHandlerReloadInhibitor != null && this.soundHandlerReloadInhibitor.isInhibited())
 		{
-			this.soundManagerReloadInhibitor.unInhibit(true);
+			this.soundHandlerReloadInhibitor.unInhibit(true);
 		}
 	}
  
@@ -1013,9 +1042,9 @@ public final class LiteLoader
 	 * @param netHandler
 	 * @param loginPacket
 	 */
-	void onLogin(NetHandler netHandler, Packet1Login loginPacket)
+	void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
 	{
-		this.permissionsManager.onLogin(netHandler, loginPacket);
+		this.permissionsManager.onJoinGame(netHandler, loginPacket);
 	}
  
 	/**
@@ -1031,37 +1060,18 @@ public final class LiteLoader
 			this.permissionsManager.scheduleRefresh();
 		}
 	}
-
-	/**
-	 * On render callback
-	 */
-	void onRender()
-	{
-		if (this.paginateControls && this.minecraft.currentScreen != null && this.minecraft.currentScreen.getClass().equals(GuiControls.class))
-		{
-			try
-			{
-				// Try to get the parent screen entry from the existing screen
-				GuiScreen parentScreen = PrivateFields.guiControlsParentScreen.get((GuiControls)this.minecraft.currentScreen);
-				this.minecraft.displayGuiScreen(new GuiControlsPaginated(parentScreen, this.minecraft.gameSettings));
-			}
-			catch (Exception ex)
-			{
-			}
-		}
-	}
  
 	/**
 	 * @param partialTicks
 	 */
 	void postRender(int mouseX, int mouseY, float partialTicks)
 	{
-		if (this.minecraft.currentScreen instanceof GuiMainMenu && ((this.displayModInfoScreenTab && !this.hideModInfoScreenTab) || (this.modInfoScreen != null && this.modInfoScreen.isTweeningOrOpen())))
+		if (GuiScreenModInfo.isSupportedOnScreen(this.minecraft.currentScreen) && ((this.displayModInfoScreenTab && !this.hideModInfoScreenTab) || (this.modInfoScreen != null && this.modInfoScreen.isTweeningOrOpen())))
 		{
 			// If we're at the main menu, prepare the overlay
-			if (this.modInfoScreen == null || this.modInfoScreen.getMenu() != this.minecraft.currentScreen)
+			if (this.modInfoScreen == null || this.modInfoScreen.getScreen() != this.minecraft.currentScreen)
 			{
-				this.modInfoScreen = new GuiScreenModInfo(this.minecraft, (GuiMainMenu)this.minecraft.currentScreen, this, this.enabledModsList, this.configManager, this.hideModInfoScreenTab);
+				this.modInfoScreen = new GuiScreenModInfo(this.minecraft, this.minecraft.currentScreen, this, this.enabledModsList, this.configManager, this.hideModInfoScreenTab);
 			}
  
 			this.modInfoScreen.drawScreen(mouseX, mouseY, partialTicks);
@@ -1072,9 +1082,9 @@ public final class LiteLoader
 			this.modInfoScreen.release();
 			this.modInfoScreen = null;
 		}
-		else if (this.minecraft.currentScreen instanceof GuiMainMenu && Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) && Keyboard.isKeyDown(Keyboard.KEY_TAB))
+		else if (GuiScreenModInfo.isSupportedOnScreen(this.minecraft.currentScreen) && Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) && Keyboard.isKeyDown(Keyboard.KEY_TAB))
 		{
-			this.displayModInfoScreen((GuiMainMenu)this.minecraft.currentScreen);
+			this.displayModInfoScreen(this.minecraft.currentScreen);
 		}			
 	}
  
@@ -1082,32 +1092,39 @@ public final class LiteLoader
 	 * @param partialTicks
 	 * @param inGame
 	 */
-	void onTick(float partialTicks, boolean inGame)
+	void onTick(boolean clock, float partialTicks, boolean inGame)
 	{
-		// Tick the permissions manager
-		this.permissionsManager.onTick(this.minecraft, partialTicks, inGame);
-		
-		// Tick the config manager
-		this.configManager.onTick();
-		
-		this.checkAndStoreKeyBindings();
-		
-		if (this.modInfoScreen != null && this.minecraft.currentScreen != this.modInfoScreen)
+		if (clock)
 		{
-			this.modInfoScreen.updateScreen();
-		}
-		
-		if (!PrivateFields.gameIsRunning.get(this.minecraft))
-		{
-			this.onShutDown();
+			// Tick the permissions manager
+			this.minecraft.mcProfiler.startSection("permissionsmanager");
+			this.permissionsManager.onTick(this.minecraft, partialTicks, inGame);
+			
+			// Tick the config manager
+			this.minecraft.mcProfiler.endStartSection("configmanager");
+			this.configManager.onTick();
+			
+			if (this.modInfoScreen != null && this.minecraft.currentScreen != this.modInfoScreen)
+			{
+				this.modInfoScreen.updateScreen();
+			}
+			
+			if (!((IMinecraft)this.minecraft).isRunning())
+			{
+				this.onShutDown();
+			}
 		}
+
+		this.minecraft.mcProfiler.endStartSection("keybindings");
+		this.input.onTick(clock);
+		this.minecraft.mcProfiler.endSection();
 	}
  
 	private void onShutDown()
 	{
-		LiteLoader.logInfo("LiteLoader is shutting down, syncing configuration");
+		LiteLoaderLogger.info("LiteLoader is shutting down, syncing configuration");
  
-		this.storeBindings();
+		this.input.storeBindings();
 		this.configManager.syncConfig();
 	}
  
@@ -1115,71 +1132,12 @@ public final class LiteLoader
 	 * Register a key for a mod
 	 * 
 	 * @param binding
+	 * @deprecated Deprecated : use LiteLoader.getInput().registerKeyBinding() instead
 	 */
+	@Deprecated
 	public void registerModKey(KeyBinding binding)
 	{
-		LinkedList<KeyBinding> keyBindings = new LinkedList<KeyBinding>();
-		keyBindings.addAll(Arrays.asList(this.minecraft.gameSettings.keyBindings));
-		
-		if (!keyBindings.contains(binding))
-		{
-			if (this.keyMapSettings.containsKey(binding.keyDescription))
-			{
-				try
-				{
-					binding.keyCode = Integer.parseInt(this.keyMapSettings.getProperty(binding.keyDescription, String.valueOf(binding.keyCode)));
-				}
-				catch (NumberFormatException ex) {}
-			}
-
-			keyBindings.add(binding);
-			this.minecraft.gameSettings.keyBindings = keyBindings.toArray(new KeyBinding[0]);
-			this.modKeyBindings.add(binding);
-			
-			this.updateBinding(binding);
-			this.storeBindings();
-		}
-	}
-	
-	/**
-	 * Checks for changed mod keybindings and stores any that have changed 
-	 */
-	private void checkAndStoreKeyBindings()
-	{
-		boolean updated = false;
-		
-		for (KeyBinding binding : this.modKeyBindings)
-		{
-			if (binding.keyCode != this.storedModKeyBindings.get(binding))
-			{
-				this.updateBinding(binding);
-				updated = true;
-			}
-		}
-		
-		if (updated)
-			this.storeBindings();
-	}
-	
-	/**
-	 * @param binding
-	 */
-	private void updateBinding(KeyBinding binding)
-	{
-		this.keyMapSettings.setProperty(binding.keyDescription, String.valueOf(binding.keyCode));
-		this.storedModKeyBindings.put(binding, Integer.valueOf(binding.keyCode));
-	}
-
-	/**
-	 * Writes mod bindings to disk
-	 */
-	private void storeBindings()
-	{
-		try
-		{
-			this.keyMapSettings.store(new FileWriter(this.keyMapSettingsFile), "Mod key mappings for LiteLoader mods, stored here to avoid losing settings stored in options.txt");
-		}
-		catch (IOException ex) {}
+		this.input.registerKeyBinding(binding);
 	}
  
 	/**
@@ -1209,24 +1167,17 @@ public final class LiteLoader
 	}
  
 	/**
-	 * Display the "mod info" overlay over the specified main menu GUI
+	 * Display the "mod info" overlay over the specified GUI
 	 * 
 	 * @param parentScreen
 	 */
-	public void displayModInfoScreen(GuiMainMenu parentScreen)
-	{
-		this.modInfoScreen = new GuiScreenModInfo(this.minecraft, parentScreen, this, this.enabledModsList, this.configManager, this.hideModInfoScreenTab);
-		this.minecraft.displayGuiScreen(this.modInfoScreen);
-	}
-
-	private static void logInfo(String string, Object... args)
+	public void displayModInfoScreen(GuiScreen parentScreen)
 	{
-		LiteLoader.logger.info(String.format(string, args));
-	}
-
-	private static void logWarning(String string, Object... args)
-	{
-		LiteLoader.logger.warning(String.format(string, args));
+		if (GuiScreenModInfo.isSupportedOnScreen(parentScreen))
+		{
+			this.modInfoScreen = new GuiScreenModInfo(this.minecraft, parentScreen, this, this.enabledModsList, this.configManager, this.hideModInfoScreenTab);
+			this.minecraft.displayGuiScreen(this.modInfoScreen);
+		}
 	}
  
 	/**
@@ -1239,6 +1190,46 @@ public final class LiteLoader
 			CrashReport crashReport = (CrashReport)objCrashReport;
 			crashReport.getCategory().addCrashSectionCallable("Mod Pack",        new CallableLiteLoaderBrand(crashReport));
 			crashReport.getCategory().addCrashSectionCallable("LiteLoader Mods", new CallableLiteLoaderMods(crashReport));
+			crashReport.getCategory().addCrashSectionCallable("LaunchWrapper",   new CallableLaunchWrapper(crashReport));
 		}
 	}
+
+	static final void init(LiteLoaderBootstrap bootstrap, LiteLoaderEnumerator enumerator, EnabledModsList enabledModsList, LaunchClassLoader classLoader)
+	{
+		if (LiteLoader.instance == null)
+		{
+			LiteLoader.classLoader = classLoader;
+			
+			LiteLoader.instance = new LiteLoader(bootstrap, enumerator, enabledModsList);
+			LiteLoader.instance.init();
+		}
+	}
+	
+	private void updateSharedModList()
+	{
+		Map<String, Map<String, String>> modList = this.enumerator.getSharedModList();
+		if (modList == null) return;
+		
+		for (LiteMod mod : this.mods)
+		{
+			String modKey = String.format("%s:%s", LiteLoader.MOD_SYSTEM, this.getModIdentifier(mod));
+			modList.put(modKey, this.packModInfoToMap(mod));
+		}
+	}
+
+	private Map<String, String> packModInfoToMap(LiteMod mod)
+	{
+		Map<String, String> modInfo = new HashMap<String, String>();
+		LoadableMod<?> container = this.getModContainer(mod);
+		
+		modInfo.put("modsystem",   LiteLoader.MOD_SYSTEM);
+		modInfo.put("id",          this.getModIdentifier(mod));
+		modInfo.put("version",     mod.getVersion());
+		modInfo.put("name",        mod.getName());
+		modInfo.put("url",         container.getMetaValue("url", ""));
+		modInfo.put("authors",     container.getAuthor());
+		modInfo.put("description", container.getDescription(LiteLoaderEnumerator.getModClassName(mod)));
+		
+		return modInfo;
+	}
 }
 \ No newline at end of file
@@ -6,20 +6,21 @@ import java.io.FileNotFoundException;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.PrintStream;
+import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Properties;
-import java.util.logging.FileHandler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.logging.StreamHandler;
+
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.core.appender.FileAppender;
+import org.apache.logging.log4j.core.layout.PatternLayout;
  
 import net.minecraft.client.ClientBrandRetriever;
 import net.minecraft.launchwrapper.LaunchClassLoader;
  
 import com.mumfrey.liteloader.launch.ILoaderBootstrap;
-import com.mumfrey.liteloader.util.log.LiteLoaderLogFormatter;
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  
 /**
  * LiteLoaderBootstrap is a proxy class which handles the early part of the LiteLoader startup process which
@@ -39,19 +40,9 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 	/**
 	 * Liteloader version
 	 */
-	public static final LiteLoaderVersion VERSION = LiteLoaderVersion.MC_1_6_4_R2;
-
-	/**
-	 * Local logger reference
-	 */
-	private static final Logger logger = Logger.getLogger("liteloader");
+	public static final LiteLoaderVersion VERSION = LiteLoaderVersion.CURRENT;
  
 	/**
-	 * True to use stdout instead of stderr
-	 */
-	private static boolean useStdOut;
-	
-	/**
 	 * Base game directory, passed in from the tweaker
 	 */
 	private final File gameDirectory;
@@ -72,6 +63,11 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 	private final File modsFolder;
  
 	/**
+	 * "Mods" folder to use
+	 */
+	private final File versionedModsFolder;
+	
+	/**
 	 * Base "liteconfig" folder under which all other lite mod configs and liteloader configs are placed 
 	 */
 	private final File configBaseFolder;
@@ -85,6 +81,11 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 	 * File containing the properties
 	 */
 	private File propertiesFile;
+	
+	/**
+	 * JSON file containing the list of enabled/disabled mods by profile
+	 */
+	private File enabledModsFile;
  
 	/**
 	 * Internal properties loaded from inside the jar
@@ -108,22 +109,30 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 	private LiteLoaderEnumerator enumerator;
  
 	/**
+	 * List of mods passed into the command line
+	 */
+	private EnabledModsList enabledModsList;
+	
+	/**
 	 * @param gameDirectory
 	 * @param assetsDirectory
 	 * @param profile
 	 */
 	public LiteLoaderBootstrap(File gameDirectory, File assetsDirectory, String profile)
 	{
-		this.gameDirectory    = gameDirectory;
-		this.assetsDirectory  = assetsDirectory;
-		this.profile          = 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");
+		this.modsFolder          = new File(this.gameDirectory,    "mods");
+		this.versionedModsFolder = new File(this.modsFolder,       LiteLoaderVersion.CURRENT.getMinecraftVersion());
+		this.configBaseFolder    = new File(this.gameDirectory,    "liteconfig");
+		this.logFile             = new File(this.configBaseFolder, "liteloader.log");
+		this.propertiesFile      = new File(this.configBaseFolder, "liteloader.properties");
+		this.enabledModsFile     = new File(this.configBaseFolder, "liteloader.profiles.json");
  
 		if (!this.modsFolder.exists()) this.modsFolder.mkdirs();
+		if (!this.versionedModsFolder.exists()) this.versionedModsFolder.mkdirs();
 		if (!this.configBaseFolder.exists()) this.configBaseFolder.mkdirs();
 	}
  
@@ -131,45 +140,43 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 	 * @see com.mumfrey.liteloader.launch.ILoaderBootstrap#preInit(net.minecraft.launchwrapper.LaunchClassLoader, boolean)
 	 */
 	@Override
-	public void preInit(LaunchClassLoader classLoader, boolean loadTweaks)
+	public void preInit(LaunchClassLoader classLoader, boolean loadTweaks, List<String> modsToLoad)
 	{
+		LiteLoaderLogger.info("LiteLoader begin PREINIT...");
+
 		// Set up the bootstrap
 		if (!this.prepare()) return;
  
-		LiteLoaderBootstrap.logInfo("LiteLoader %s starting up...", LiteLoaderBootstrap.VERSION.getLoaderVersion());
+		LiteLoaderLogger.info("LiteLoader %s starting up...", LiteLoaderVersion.CURRENT.getLoaderVersion());
  
 		// Print the branding version if any was provided
 		if (this.branding != null)
 		{
-			LiteLoaderBootstrap.logInfo("Active Pack: %s", this.branding);
+			LiteLoaderLogger.info("Active Pack: %s", this.branding);
 		}
  
-		LiteLoaderBootstrap.logInfo("Java reports OS=\"%s\"", System.getProperty("os.name").toLowerCase());
+		LiteLoaderLogger.info("Java reports OS=\"%s\"", System.getProperty("os.name").toLowerCase());
  
-		this.enumerator = new LiteLoaderEnumerator(this, classLoader, loadTweaks);
-		this.enumerator.discoverMods();
+		this.enabledModsList = EnabledModsList.createFrom(this.enabledModsFile);
+		this.enabledModsList.processModsList(this.profile, modsToLoad);
  
-		LiteLoaderBootstrap.logInfo("LiteLoader PreInit completed");
+		this.enumerator = new LiteLoaderEnumerator(this, classLoader, this.enabledModsList, loadTweaks);
+		this.enumerator.discoverMods();
+		
+		LiteLoaderLogger.info("LiteLoader PREINIT complete");
 	}
  
 	/* (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)
+	public void init(LaunchClassLoader classLoader)
 	{
 		// PreInit failed
 		if (this.enumerator == null) return;
  
-		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);
+		LiteLoaderLogger.info("LiteLoader begin INIT...");
+		LiteLoader.init(this, this.enumerator, this.enabledModsList, classLoader);
 	}
  
 	/* (non-Javadoc)
@@ -181,15 +188,8 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 		// PreInit failed
 		if (this.enumerator == null) return;
  
-		try
-		{
-			if (LiteLoaderBootstrap.logger.getHandlers().length < 1)
-				this.prepareLogger();
-		}
-		catch (Exception ex) {}
-		
-		LiteLoaderBootstrap.logger.info("Beginning LiteLoader PostInit...");
-		LiteLoader.postInit();
+		LiteLoaderLogger.info("LiteLoader begin POSTINIT...");
+		LiteLoader.getInstance().postInit();
 	}
  
 	/**
@@ -217,7 +217,7 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 		}
 		catch (Throwable th)
 		{
-			LiteLoaderBootstrap.logger.log(Level.SEVERE, "Error initialising LiteLoader Bootstrap", th);
+			LiteLoaderLogger.severe(th, "Error initialising LiteLoader Bootstrap");
 			return false;
 		}
  
@@ -230,26 +230,11 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 	 */
 	private void prepareLogger() throws SecurityException, IOException
 	{
-		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(new LiteLoaderLogFormatter(false));
-		LiteLoaderBootstrap.logger.addHandler(consoleHandler);
-		
-		FileHandler logFileHandler = new FileHandler(this.logFile.getAbsolutePath());
-		logFileHandler.setFormatter(new LiteLoaderLogFormatter(true));
-		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;
+		Logger logger = LiteLoaderLogger.getLogger();
+		Layout<? extends Serializable> layout = PatternLayout.createLayout("[%d{HH:mm:ss}] [%t/%level]: %msg%n", logger.getContext().getConfiguration(), null, "UTF-8", "True");
+		FileAppender fileAppender = FileAppender.createAppender(this.logFile.getAbsolutePath(), "False", "False", "LiteLoader", "True", "True", "True", layout, null, "False", "", logger.getContext().getConfiguration());
+		fileAppender.start();
+		logger.addAppender(fileAppender);
 	}
  
 	/**
@@ -314,11 +299,11 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 	{
 		try
 		{
-			this.localProperties.store(new FileWriter(this.propertiesFile), String.format("Properties for LiteLoader %s", LiteLoaderBootstrap.VERSION));
+			this.localProperties.store(new FileWriter(this.propertiesFile), String.format("Properties for LiteLoader %s", LiteLoaderVersion.CURRENT));
 		}
 		catch (Throwable th)
 		{
-			LiteLoaderBootstrap.logger.log(Level.WARNING, "Error writing liteloader properties", th);
+			LiteLoaderLogger.warning(th, "Error writing liteloader properties");
 		}
 	}
  
@@ -355,6 +340,14 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 	}
  
 	/**
+	 * Get the mods folder
+	 */
+	public File getVersionedModsFolder()
+	{
+		return this.versionedModsFolder;
+	}
+	
+	/**
 	 * Get the base "liteconfig" folder
 	 */
 	public File getConfigBaseFolder()
@@ -369,6 +362,7 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 	 * @param defaultValue
 	 * @return
 	 */
+	@Override
 	public boolean getAndStoreBooleanProperty(String propertyName, boolean defaultValue)
 	{
 		boolean result = this.localProperties.getProperty(propertyName, String.valueOf(defaultValue)).equalsIgnoreCase("true");
@@ -377,11 +371,25 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 	}
  
 	/**
+	 * Get a boolean propery from the properties file and also write the new value back to the properties file
+	 * 
+	 * @param propertyName
+	 * @param defaultValue
+	 * @return
+	 */
+	@Override
+	public boolean getBooleanProperty(String propertyName)
+	{
+		return this.localProperties.getProperty(propertyName, "false").equalsIgnoreCase("true");
+	}
+	
+	/**
 	 * Set a boolean property
 	 * 
 	 * @param propertyName
 	 * @param value
 	 */
+	@Override
 	public void setBooleanProperty(String propertyName, boolean value)
 	{
 		this.localProperties.setProperty(propertyName, String.valueOf(value));
@@ -396,7 +404,7 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 	{
 		if (this.localProperties != null)
 		{
-			this.localProperties.setProperty(modKey, String.valueOf(LiteLoaderBootstrap.VERSION.getLoaderRevision()));
+			this.localProperties.setProperty(modKey, String.valueOf(LiteLoaderVersion.CURRENT.getLoaderRevision()));
 			this.writeProperties();
 		}
 	}
@@ -458,16 +466,7 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 		}
 		catch (Throwable th)
 		{
-			LiteLoaderBootstrap.logger.log(Level.WARNING, "Setting branding failed", th);
+			LiteLoaderLogger.warning(th, "Setting branding failed");
 		}
 	}
-	
-	/**
-	 * @param string
-	 * @param args
-	 */
-	private static void logInfo(String string, Object... args)
-	{
-		LiteLoaderBootstrap.logger.info(String.format(string, args));
-	}
 }