LiteLoader 1.6.2 - replaced version.txt functionality with litemod.json, added v…

…ersion ordering and filtering for mods

LiteLoader 1.6.2 - replaced version.txt functionality with litemod.json, added v…
…ersion ordering and filtering for mods
Mumfrey
1 parent 70fa603a
Showing 9 changed files with 795 additions and 416 deletions
.classpath
java/com/mumfrey/liteloader/core/HookChat.java
java/com/mumfrey/liteloader/core/HookPluginChannels.java
java/com/mumfrey/liteloader/core/LiteLoader.java
java/com/mumfrey/liteloader/core/LiteLoaderVersion.java
java/com/mumfrey/liteloader/core/ModFile.java
java/com/mumfrey/liteloader/gui/GuiControlsPaginated.java
java/com/mumfrey/liteloader/permissions/PermissionsManager.java
java/com/mumfrey/liteloader/util/ModUtilities.java
@@ -6,5 +6,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/Client/jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0.jar"/>
 	<classpathentry kind="lib" path="/Client/jars/versions/1.6.2/1.6.2.jar"/>
+	<classpathentry kind="lib" path="/Client/jars/libraries/com/google/code/gson/gson/2.2.2/gson-2.2.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
@@ -136,39 +136,39 @@ public class HookChat extends Packet3Chat
 	/**
 	 * Register this packet as the new packet for packet ID 3
 	 */
-    public static void register()
-    {
-    	register(false);
-    }
-
-    /**
-     * Register this packet as the new packet for packet ID 3 and optionally force re-registration even
-     * if registration was performed already.
-     * 
-     * @param force Force registration even if registration was already performed previously.
-     */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
+	public static void register()
+	{
+		register(false);
+	}
+	
+	/**
+	 * Register this packet as the new packet for packet ID 3 and optionally force re-registration even
+	 * if registration was performed already.
+	 * 
+	 * @param force Force registration even if registration was already performed previously.
+	 */
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static void register(boolean force)
 	{
 		if (!registered || force)
 		{
 			try
 			{
-			    IntHashMap packetIdToClassMap = Packet.packetIdToClassMap;
-			    proxyClass = (Class<? extends Packet>)packetIdToClassMap.lookup(3);
-			    
-			    if (proxyClass.equals(Packet3Chat.class))
-			    {
-			    	proxyClass = null;
-			    }
-			    
-			    packetIdToClassMap.removeObject(3);
-			    packetIdToClassMap.addKey(3, HookChat.class);
-
-			    Map packetClassToIdMap = PrivateFields.StaticFields.packetClassToIdMap.get();
-			    packetClassToIdMap.put(HookChat.class, Integer.valueOf(3));
-			    
-			    registered = true;
+				IntHashMap packetIdToClassMap = Packet.packetIdToClassMap;
+				proxyClass = (Class<? extends Packet>)packetIdToClassMap.lookup(3);
+				
+				if (proxyClass.equals(Packet3Chat.class))
+				{
+					proxyClass = null;
+				}
+				
+				packetIdToClassMap.removeObject(3);
+				packetIdToClassMap.addKey(3, HookChat.class);
+				
+				Map packetClassToIdMap = PrivateFields.StaticFields.packetClassToIdMap.get();
+				packetClassToIdMap.put(HookChat.class, Integer.valueOf(3));
+				
+				registered = true;
 			}
 			catch (Exception ex)
 			{
@@ -128,39 +128,39 @@ public class HookPluginChannels extends Packet250CustomPayload
 	/**
 	 * Register this packet as the new packet for packet ID 250
 	 */
-    public static void register()
-    {
-    	register(false);
-    }
-
-    /**
-     * Register this packet as the new packet for packet ID 250 and optionally force re-registration even
-     * if registration was performed already.
-     * 
-     * @param force Force registration even if registration was already performed previously.
-     */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
+	public static void register()
+	{
+		register(false);
+	}
+	
+	/**
+	 * Register this packet as the new packet for packet ID 250 and optionally force re-registration even
+	 * if registration was performed already.
+	 * 
+	 * @param force Force registration even if registration was already performed previously.
+	 */
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static void register(boolean force)
 	{
 		if (!registered || force)
 		{
 			try
 			{
-			    IntHashMap packetIdToClassMap = Packet.packetIdToClassMap;
-			    proxyClass = (Class<? extends Packet>)packetIdToClassMap.lookup(250);
-			    
-			    if (proxyClass.equals(Packet250CustomPayload.class))
-			    {
-			    	proxyClass = null;
-			    }
-			    
-			    packetIdToClassMap.removeObject(250);
-			    packetIdToClassMap.addKey(250, HookPluginChannels.class);
-
-			    Map packetClassToIdMap = PrivateFields.StaticFields.packetClassToIdMap.get();
-			    packetClassToIdMap.put(HookPluginChannels.class, Integer.valueOf(250));
-			    
-			    registered = true;
+				IntHashMap packetIdToClassMap = Packet.packetIdToClassMap;
+				proxyClass = (Class<? extends Packet>)packetIdToClassMap.lookup(250);
+				
+				if (proxyClass.equals(Packet250CustomPayload.class))
+				{
+					proxyClass = null;
+				}
+				
+				packetIdToClassMap.removeObject(250);
+				packetIdToClassMap.addKey(250, HookPluginChannels.class);
+				
+				Map packetClassToIdMap = PrivateFields.StaticFields.packetClassToIdMap.get();
+				packetClassToIdMap.put(HookPluginChannels.class, Integer.valueOf(250));
+				
+				registered = true;
 			}
 			catch (Exception ex)
 			{
@@ -10,16 +10,23 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.net.URLDecoder;
 import java.nio.charset.Charset;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Properties;
+import java.util.TreeSet;
 import java.util.logging.FileHandler;
 import java.util.logging.Formatter;
 import java.util.logging.Level;
@@ -71,7 +78,6 @@ import com.mumfrey.liteloader.util.PrivateFields;
  * @author Adam Mummery-Smith
  * @version 1.6.2
  */
-@SuppressWarnings("rawtypes")
 public final class LiteLoader implements FilenameFilter, IPlayerUsage
 {
 	/**
@@ -115,6 +121,11 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	private static String profile = "";
 	/**
+	 * List of mods passed into the command line
+	 */
+	private static List<String> modNameFilter = null;
+	
+	/**
 	 * Mods folder which contains mods and legacy config files
 	 */
 	private File modsFolder;
@@ -173,6 +184,16 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	private Timer minecraftTimer;
 	/**
+	 * Classes to load, mapped by class name 
+	 */
+	private Map<String, Class<? extends LiteMod>> modsToLoad = new HashMap<String, Class<? extends LiteMod>>();
+	
+	/**
+	 * Mod metadata from version file 
+	 */
+	private Map<String, ModFile> modFiles = new HashMap<String, ModFile>();
+	
+	/**
 	 * List of loaded mods, for crash reporting
 	 */
 	private String loadedModsList = "none";
@@ -280,8 +301,8 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 * Permission Manager
 	 */
 	private static PermissionsManagerClient permissionsManager = PermissionsManagerClient.getInstance();
-	
-	public static final void init(File gameDirectory, File assetsDirectory, String profile)
+
+	public static final void init(File gameDirectory, File assetsDirectory, String profile, List<String> modNameFilter)
 	{
 		if (instance == null)
 		{
@@ -289,6 +310,22 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 			LiteLoader.assetsDirectory = assetsDirectory;
 			LiteLoader.profile = profile;
+			try
+			{
+				if (modNameFilter != null)
+				{
+					LiteLoader.modNameFilter = new ArrayList<String>();
+					for (String filterEntry : modNameFilter)
+					{
+						LiteLoader.modNameFilter.add(filterEntry.toLowerCase().trim());
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				LiteLoader.modNameFilter = null;
+			}
+			
 			instance = new LiteLoader();
 			instance.initLoader();
 		}
@@ -371,14 +408,10 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		this.commonConfigFolder = new File(this.configBaseFolder, "common");
 		this.versionConfigFolder = this.inflectVersionedConfigPath(LiteLoader.VERSION);
-		if (!this.modsFolder.exists())
-			this.modsFolder.mkdirs();
-		if (!this.configBaseFolder.exists())
-			this.configBaseFolder.mkdirs();
-		if (!this.commonConfigFolder.exists())
-			this.commonConfigFolder.mkdirs();
-		if (!this.versionConfigFolder.exists())
-			this.versionConfigFolder.mkdirs();
+		if (!this.modsFolder.exists()) this.modsFolder.mkdirs();
+		if (!this.configBaseFolder.exists()) this.configBaseFolder.mkdirs();
+		if (!this.commonConfigFolder.exists()) this.commonConfigFolder.mkdirs();
+		if (!this.versionConfigFolder.exists()) this.versionConfigFolder.mkdirs();
 		this.propertiesFile = new File(this.configBaseFolder, "liteloader.properties");
 	}
@@ -402,8 +435,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 */
 	private void initLoader()
 	{
-		if (this.loaderStartupDone)
-			return;
+		if (this.loaderStartupDone) return;
 		this.loaderStartupDone = true;
 		// Set up loader, initialises any reflection methods needed
@@ -700,8 +732,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	/**
 	 * Get a reference to a loaded mod, if the mod exists
 	 * 
-	 * @param modName
-	 *            Mod's name or class name
+	 * @param modName Mod's name or class name
 	 * @return
 	 * @throws InvalidActivityException
 	 */
@@ -728,13 +759,65 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	}
 	/**
+	 * Get whether the specified mod is installed
+	 *
+	 * @param modName
+	 * @return
+	 */
+	public boolean isModInstalled(String modName)
+	{
+		if (!this.loaderStartupComplete || modName == null) return false;
+		
+		for (LiteMod mod : this.mods)
+		{
+			if (modName.equalsIgnoreCase(mod.getName()) || modName.equalsIgnoreCase(mod.getClass().getSimpleName())) return true;
+		}
+		
+		return true;
+	}
+
+	/**
+	 * Get metadata for the specified mod, attempts to retrieve the mod by name first
+	 * 
+	 * @param mod
+	 * @param metaDataKey
+	 * @param defaultValue
+	 * @return
+	 * @throws InvalidActivityException
+	 * @throws IllegalArgumentException
+	 */
+	public String getModMetaData(String mod, String metaDataKey, String defaultValue) throws InvalidActivityException, IllegalArgumentException
+	{
+		return this.getModMetaData(this.getMod(mod), metaDataKey, defaultValue);
+	}
+	
+	/**
+	 * Get a metadata value for the specified mod
+	 * 
+	 * @param mod
+	 * @param metaDataKey
+	 * @param defaultValue
+	 * @return
+	 */
+	public String getModMetaData(LiteMod mod, String metaDataKey, String defaultValue)
+	{
+		if (mod == null || metaDataKey == null) return defaultValue;
+		
+		String modClassName = mod.getClass().getSimpleName();
+		if (!this.modFiles.containsKey(modClassName)) return defaultValue;
+		
+		ModFile modFile = this.modFiles.get(modClassName);
+		return modFile.getMetaValue(metaDataKey, defaultValue);
+	}
+	
+	/**
 	 * Enumerate the java class path and "mods" folder to find mod classes, then
 	 * load the classes
 	 */
 	private void prepareMods(boolean searchMods, boolean searchProtectionDomain, boolean searchClassPath)
 	{
 		// List of mod files in the "mods" folder
-		LinkedList<File> modFiles = new LinkedList<File>();
+		List<ModFile> modFiles = new LinkedList<ModFile>();
 		if (searchMods)
 		{
@@ -748,8 +831,6 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 			}
 		}
-		// Find and enumerate classes on the class path
-		HashMap<String, Class> modsToLoad = null;
 		try
 		{
 			logger.info("Enumerating class path...");
@@ -763,7 +844,8 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 			if (searchProtectionDomain || searchClassPath)
 				logger.info("Discovering mods on class path...");
-			modsToLoad = this.findModClasses(classPathEntries, modFiles, searchProtectionDomain, searchClassPath);
+			
+			this.findModClasses(classPathEntries, modFiles, searchProtectionDomain, searchClassPath);
 			logger.info("Mod class discovery completed");
 		}
@@ -773,44 +855,87 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 			return;
 		}
-		this.loadMods(modsToLoad);
+		this.loadMods();
 	}
 	/**
 	 * Find mod files in the "mods" folder
 	 * 
-	 * @param modFolder
-	 *            Folder to search
-	 * @param modFiles
-	 *            List of mod files to load
+	 * @param modFolder Folder to search
+	 * @param modFiles List of mod files to load
 	 */
-	protected void findModFiles(File modFolder, LinkedList<File> modFiles)
+	protected void findModFiles(File modFolder, List<ModFile> modFiles)
 	{
+		Map<String, TreeSet<ModFile>> versionOrderingSets = new HashMap<String, TreeSet<ModFile>>();
+		
 		for (File modFile : modFolder.listFiles(this))
 		{
 			try
 			{
+				String strVersion = null;
+				
 				// Check for a version file
 				ZipFile modZip = new ZipFile(modFile);
-				ZipEntry version = modZip.getEntry("version.txt");
+				ZipEntry version = modZip.getEntry("litemod.json");
+				
+				if (version == null)
+				{
+					version = modZip.getEntry("version.txt");
+				}
 				if (version != null)
 				{
-					// Read the version string
-					InputStream versionStream = modZip.getInputStream(version);
-					BufferedReader versionReader = new BufferedReader(new InputStreamReader(versionStream));
-					String strVersion = versionReader.readLine();
-					versionReader.close();
+					BufferedReader versionReader = null; 
+					StringBuilder versionBuilder = new StringBuilder();
-					// Only add the mod if the version matches and we were able
-					// to successfully add it to the class path
-					if (LiteLoader.VERSION.isVersionSupported(strVersion) && this.addURLToClassPath(modFile.toURI().toURL()))
+					try
 					{
-						modFiles.add(modFile);
+						// Read the version string
+						InputStream versionStream = modZip.getInputStream(version);
+						versionReader = new BufferedReader(new InputStreamReader(versionStream));
+
+						String versionFileLine;
+						while ((versionFileLine = versionReader.readLine()) != null)
+							versionBuilder.append(versionFileLine);
+						
+						strVersion = versionBuilder.toString();
 					}
-					else
+					catch (Exception ex)
+					{
+						logger.warning("Error reading version data from " + modFile.getName());
+					}
+					finally
 					{
-						logger.info("Not adding invalid or outdated mod file: " + modFile.getAbsolutePath());
+						if (versionReader != null) versionReader.close();
+					}
+					
+					if (strVersion != null)
+					{
+						ModFile modFileInfo = new ModFile(modFile, strVersion);
+						
+						if (modFileInfo.isValid())
+						{
+							// Only add the mod if the version matches and we were able
+							// to successfully add it to the class path
+							if (LiteLoader.VERSION.isVersionSupported(modFileInfo.getVersion()))
+							{
+								if (!modFileInfo.isJson())
+								{
+									logger.warning("Missing or invalid litemod.json reading mod file: " + modFile.getAbsolutePath());
+								}
+								
+								if (!versionOrderingSets.containsKey(modFileInfo.getName()))
+								{
+									versionOrderingSets.put(modFileInfo.getName(), new TreeSet<ModFile>());
+								}
+								
+								versionOrderingSets.get(modFileInfo.getName()).add(modFileInfo);
+							}
+							else
+							{
+								logger.info("Not adding invalid or outdated mod file: " + modFile.getAbsolutePath());
+							}
+						}
 					}
 				}
@@ -818,9 +943,28 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 			}
 			catch (Exception ex)
 			{
+				ex.printStackTrace(System.err);
 				logger.warning("Error enumerating '" + modFile.getAbsolutePath() + "': Invalid zip file or error reading file");
 			}
 		}
+
+		// Copy the first entry in every version set into the modfiles list
+		for (Entry<String, TreeSet<ModFile>> modFileEntry : versionOrderingSets.entrySet())
+		{
+			ModFile newestVersion = modFileEntry.getValue().iterator().next();
+
+			try
+			{
+				if (this.addURLToClassPath(newestVersion.toURI().toURL()))
+				{
+					modFiles.add(newestVersion);
+				}
+			}
+			catch (Exception ex)
+			{
+				logger.warning("Error injecting '" + newestVersion.getAbsolutePath() + "' into classPath. The mod will not be loaded");
+			}
+		}
 	}
 	/*
@@ -837,66 +981,15 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	/**
 	 * Find mod classes in the class path and enumerated mod files list
 	 * 
-	 * @param classPathEntries
-	 *            Java class path split into string entries
-	 * @return map of classes to load
+	 * @param classPathEntries Java class path split into string entries
 	 */
-	private HashMap<String, Class> findModClasses(String[] classPathEntries, LinkedList<File> modFiles, boolean searchProtectionDomain, boolean searchClassPath)
+	private void findModClasses(String[] classPathEntries, List<ModFile> modFiles, boolean searchProtectionDomain, boolean searchClassPath)
 	{
-		// To try to avoid loading the same mod multiple times if it appears in
-		// more than one entry in the class path, we index
-		// the mods by name and hopefully match only a single instance of a
-		// particular mod
-		HashMap<String, Class> modsToLoad = new HashMap<String, Class>();
-		
 		if (searchProtectionDomain)
 		{
 			try
 			{
-				logger.info("Searching protection domain code source...");
-				
-				File packagePath = null;
-				
-				URL protectionDomainLocation = LiteLoader.class.getProtectionDomain().getCodeSource().getLocation();
-				if (protectionDomainLocation != null)
-				{
-					if (protectionDomainLocation.toString().indexOf('!') > -1 && protectionDomainLocation.toString().startsWith("jar:"))
-					{
-						protectionDomainLocation = new URL(protectionDomainLocation.toString().substring(4, protectionDomainLocation.toString().indexOf('!')));
-					}
-					
-					packagePath = new File(protectionDomainLocation.toURI());
-				}
-				else
-				{
-					// Fix (?) for forge and other mods which screw up the
-					// protection domain
-					String reflectionClassPath = LiteLoader.class.getResource("/com/mumfrey/liteloader/core/LiteLoader.class").getPath();
-					
-					if (reflectionClassPath.indexOf('!') > -1)
-					{
-						reflectionClassPath = URLDecoder.decode(reflectionClassPath, "UTF-8");
-						packagePath = new File(reflectionClassPath.substring(5, reflectionClassPath.indexOf('!')));
-					}
-				}
-				
-				if (packagePath != null)
-				{
-					LinkedList<Class> modClasses = getSubclassesFor(packagePath, Minecraft.class.getClassLoader(), LiteMod.class, "LiteMod");
-					
-					for (Class mod : modClasses)
-					{
-						if (modsToLoad.containsKey(mod.getSimpleName()))
-						{
-							logger.warning("Mod name collision for mod with class '" + mod.getSimpleName() + "', maybe you have more than one copy?");
-						}
-						
-						modsToLoad.put(mod.getSimpleName(), mod);
-					}
-					
-					if (modClasses.size() > 0)
-						logger.info(String.format("Found %s potential matches", modClasses.size()));
-				}
+				this.searchProtectionDomain();
 			}
 			catch (Throwable th)
 			{
@@ -907,78 +1000,158 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		if (searchClassPath)
 		{
 			// Search through the class path and find mod classes
-			for (String classPathPart : classPathEntries)
+			this.searchClassPath(classPathEntries);
+		}
+		
+		// Search through mod files and find mod classes
+		this.searchModFiles(modFiles);
+	}
+
+	/**
+	 * @param modsToLoad
+	 * @throws MalformedURLException
+	 * @throws URISyntaxException
+	 * @throws UnsupportedEncodingException
+	 */
+	@SuppressWarnings("unchecked")
+	private void searchProtectionDomain() throws MalformedURLException, URISyntaxException, UnsupportedEncodingException
+	{
+		logger.info("Searching protection domain code source...");
+		
+		File packagePath = null;
+		
+		URL protectionDomainLocation = LiteLoader.class.getProtectionDomain().getCodeSource().getLocation();
+		if (protectionDomainLocation != null)
+		{
+			if (protectionDomainLocation.toString().indexOf('!') > -1 && protectionDomainLocation.toString().startsWith("jar:"))
 			{
-				logger.info(String.format("Searching %s...", classPathPart));
-				
-				File packagePath = new File(classPathPart);
-				LinkedList<Class> modClasses = getSubclassesFor(packagePath, Minecraft.class.getClassLoader(), LiteMod.class, "LiteMod");
+				protectionDomainLocation = new URL(protectionDomainLocation.toString().substring(4, protectionDomainLocation.toString().indexOf('!')));
+			}
+			
+			packagePath = new File(protectionDomainLocation.toURI());
+		}
+		else
+		{
+			// Fix (?) for forge and other mods which screw up the
+			// protection domain
+			String reflectionClassPath = LiteLoader.class.getResource("/com/mumfrey/liteloader/core/LiteLoader.class").getPath();
+			
+			if (reflectionClassPath.indexOf('!') > -1)
+			{
+				reflectionClassPath = URLDecoder.decode(reflectionClassPath, "UTF-8");
+				packagePath = new File(reflectionClassPath.substring(5, reflectionClassPath.indexOf('!')));
+			}
+		}
+		
+		if (packagePath != null)
+		{
+			LinkedList<Class<?>> modClasses = getSubclassesFor(packagePath, Minecraft.class.getClassLoader(), LiteMod.class, "LiteMod");
+			
+			for (Class<?> mod : modClasses)
+			{
+				if (this.modsToLoad.containsKey(mod.getSimpleName()))
+				{
+					logger.warning("Mod name collision for mod with class '" + mod.getSimpleName() + "', maybe you have more than one copy?");
+				}
-				for (Class mod : modClasses)
+				this.modsToLoad.put(mod.getSimpleName(), (Class<? extends LiteMod>)mod);
+			}
+			
+			if (modClasses.size() > 0)
+				logger.info(String.format("Found %s potential matches", modClasses.size()));
+		}
+	}
+
+	/**
+	 * @param classPathEntries
+	 * @param modsToLoad
+	 */
+	@SuppressWarnings("unchecked")
+	private void searchClassPath(String[] classPathEntries)
+	{
+		for (String classPathPart : classPathEntries)
+		{
+			logger.info(String.format("Searching %s...", classPathPart));
+			
+			File packagePath = new File(classPathPart);
+			LinkedList<Class<?>> modClasses = getSubclassesFor(packagePath, Minecraft.class.getClassLoader(), LiteMod.class, "LiteMod");
+			
+			for (Class<?> mod : modClasses)
+			{
+				if (this.modsToLoad.containsKey(mod.getSimpleName()))
 				{
-					if (modsToLoad.containsKey(mod.getSimpleName()))
-					{
-						logger.warning("Mod name collision for mod with class '" + mod.getSimpleName() + "', maybe you have more than one copy?");
-					}
-					
-					modsToLoad.put(mod.getSimpleName(), mod);
+					logger.warning("Mod name collision for mod with class '" + mod.getSimpleName() + "', maybe you have more than one copy?");
 				}
-				if (modClasses.size() > 0)
-					logger.info(String.format("Found %s potential matches", modClasses.size()));
+				this.modsToLoad.put(mod.getSimpleName(), (Class<? extends LiteMod>)mod);
 			}
+			
+			if (modClasses.size() > 0)
+				logger.info(String.format("Found %s potential matches", modClasses.size()));
 		}
-		
-		// Search through mod files and find mod classes
-		for (File modFile : modFiles)
+	}
+
+	/**
+	 * @param modFiles
+	 * @param modsToLoad
+	 */
+	@SuppressWarnings("unchecked")
+	private void searchModFiles(List<ModFile> modFiles)
+	{
+		for (ModFile modFile : modFiles)
 		{
 			logger.info(String.format("Searching %s...", modFile.getAbsolutePath()));
-			LinkedList<Class> modClasses = getSubclassesFor(modFile, Minecraft.class.getClassLoader(), LiteMod.class, "LiteMod");
+			LinkedList<Class<?>> modClasses = getSubclassesFor(modFile, Minecraft.class.getClassLoader(), LiteMod.class, "LiteMod");
-			for (Class mod : modClasses)
+			for (Class<?> mod : modClasses)
 			{
-				if (modsToLoad.containsKey(mod.getSimpleName()))
+				if (this.modsToLoad.containsKey(mod.getSimpleName()))
 				{
 					logger.warning("Mod name collision for mod with class '" + mod.getSimpleName() + "', maybe you have more than one copy?");
 				}
-				modsToLoad.put(mod.getSimpleName(), mod);
+				this.modsToLoad.put(mod.getSimpleName(), (Class<? extends LiteMod>)mod);
+				this.modFiles.put(mod.getSimpleName(), modFile);
 			}
 			if (modClasses.size() > 0)
 				logger.info(String.format("Found %s potential matches", modClasses.size()));
 		}
-		
-		return modsToLoad;
 	}
 	/**
 	 * Create mod instances from the enumerated classes
 	 * 
-	 * @param modsToLoad
-	 *            List of mods to load
+	 * @param modsToLoad List of mods to load
 	 */
-	private void loadMods(HashMap<String, Class> modsToLoad)
+	private void loadMods()
 	{
-		if (modsToLoad == null)
+		if (this.modsToLoad == null)
 		{
 			logger.info("Mod class discovery failed. Not loading any mods!");
 			return;
 		}
-		logger.info("Discovered " + modsToLoad.size() + " total mod(s)");
+		logger.info("Discovered " + this.modsToLoad.size() + " total mod(s)");
-		for (Class mod : modsToLoad.values())
+		for (Class<? extends LiteMod> mod : this.modsToLoad.values())
 		{
 			try
 			{
 				logger.info("Loading mod from " + mod.getName());
-				LiteMod newMod = (LiteMod)mod.newInstance();
-				this.mods.add(newMod);
+				LiteMod newMod = mod.newInstance();
-				logger.info("Successfully added mod " + newMod.getName() + " version " + newMod.getVersion());
+				if (this.shouldAddMod(newMod))
+				{
+					this.mods.add(newMod);
+					logger.info("Successfully added mod " + newMod.getName() + " version " + newMod.getVersion());
+				}
+				else
+				{
+					logger.info("Not loading mod " + newMod.getName() + ", excluded by filter");
+				}
 			}
 			catch (Throwable th)
 			{
@@ -989,6 +1162,26 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	}
 	/**
+	 * @param name
+	 * @return
+	 */
+	private boolean shouldAddMod(LiteMod mod)
+	{
+		if (this.modNameFilter == null) return true;
+		
+		String modClassName = mod.getClass().getSimpleName();
+		if (!this.modFiles.containsKey(modClassName)) return true;
+
+		String metaName = this.modFiles.get(modClassName).getModName().toLowerCase();
+		if (this.modNameFilter.contains(metaName))
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	/**
 	 * Initialise the mods which were loaded
 	 */
 	private void initMods()
@@ -999,28 +1192,29 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		for (Iterator<LiteMod> iter = this.mods.iterator(); iter.hasNext();)
 		{
 			LiteMod mod = iter.next();
+			String modName = mod.getName();
 			try
 			{
-				logger.info("Initialising mod " + mod.getName() + " version " + mod.getVersion());
+				logger.info("Initialising mod " + modName + " version " + mod.getVersion());
 				try
 				{
-					String modKey = this.getModNameForConfig(mod.getClass(), mod.getName());
+					String modKey = this.getModNameForConfig(mod.getClass(), modName);
 					LiteLoaderVersion lastModVersion = LiteLoaderVersion.getVersionFromRevision(this.getLastKnownModRevision(modKey));
 					if (LiteLoader.VERSION.getLoaderRevision() > lastModVersion.getLoaderRevision())
 					{
-						logger.info("Performing config upgrade for mod " + mod.getName() + ". Upgrading " + lastModVersion + " to " + LiteLoader.VERSION + "...");
+						logger.info("Performing config upgrade for mod " + modName + ". Upgrading " + lastModVersion + " to " + LiteLoader.VERSION + "...");
 						mod.upgradeSettings(LiteLoader.getVersion(), this.versionConfigFolder, this.inflectVersionedConfigPath(lastModVersion));
 						this.storeLastKnownModRevision(modKey);
-						logger.info("Config upgrade succeeded for mod " + mod.getName());
+						logger.info("Config upgrade succeeded for mod " + modName);
 					}
 				}
 				catch (Throwable th)
 				{
-					logger.warning("Error performing settings upgrade for " + mod.getName() + ". Settings may not be properly migrated");
+					logger.warning("Error performing settings upgrade for " + modName + ". Settings may not be properly migrated");
 				}
 				mod.init(this.modsFolder);
@@ -1059,7 +1253,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 				{
 					if (mod instanceof ChatFilter)
 					{
-						this.logger.warning(String.format("Interface error initialising mod '%1s'. A mod implementing ChatFilter and ChatListener is not supported! Remove one of these interfaces", mod.getName()));
+						this.logger.warning(String.format("Interface error initialising mod '%1s'. A mod implementing ChatFilter and ChatListener is not supported! Remove one of these interfaces", modName));
 					}
 					else
 					{
@@ -1092,12 +1286,12 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 					permissionsManager.registerPermissible((Permissible)mod);
 				}
-				this.loadedModsList += String.format("\n          - %s version %s", mod.getName(), mod.getVersion());
+				this.loadedModsList += String.format("\n          - %s version %s", modName, mod.getVersion());
 				loadedModsCount++;
 			}
 			catch (Throwable th)
 			{
-				logger.log(Level.WARNING, "Error initialising mod '" + mod.getName(), th);
+				logger.log(Level.WARNING, "Error initialising mod '" + modName, th);
 				iter.remove();
 			}
 		}
@@ -1304,9 +1498,9 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 * @param superClass
 	 * @return
 	 */
-	private static LinkedList<Class> getSubclassesFor(File packagePath, ClassLoader classloader, Class superClass, String prefix)
+	private static LinkedList<Class<?>> getSubclassesFor(File packagePath, ClassLoader classloader, Class<?> superClass, String prefix)
 	{
-		LinkedList<Class> classes = new LinkedList<Class>();
+		LinkedList<Class<?>> classes = new LinkedList<Class<?>>();
 		try
 		{
@@ -1335,7 +1529,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 * @throws FileNotFoundException
 	 * @throws IOException
 	 */
-	private static void enumerateCompressedPackage(String prefix, Class superClass, ClassLoader classloader, LinkedList<Class> classes, File packagePath) throws FileNotFoundException, IOException
+	private static void enumerateCompressedPackage(String prefix, Class<?> superClass, ClassLoader classloader, LinkedList<Class<?>> classes, File packagePath) throws FileNotFoundException, IOException
 	{
 		FileInputStream fileinputstream = new FileInputStream(packagePath);
 		ZipInputStream zipinputstream = new ZipInputStream(fileinputstream);
@@ -1377,7 +1571,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 * @param packagePath
 	 * @param packageName
 	 */
-	private static void enumerateDirectory(String prefix, Class superClass, ClassLoader classloader, LinkedList<Class> classes, File packagePath)
+	private static void enumerateDirectory(String prefix, Class<?> superClass, ClassLoader classloader, LinkedList<Class<?>> classes, File packagePath)
 	{
 		enumerateDirectory(prefix, superClass, classloader, classes, packagePath, "", 0);
 	}
@@ -1391,7 +1585,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 * @param packagePath
 	 * @param packageName
 	 */
-	private static void enumerateDirectory(String prefix, Class superClass, ClassLoader classloader, LinkedList<Class> classes, File packagePath, String packageName, int depth)
+	private static void enumerateDirectory(String prefix, Class<?> superClass, ClassLoader classloader, LinkedList<Class<?>> classes, File packagePath, String packageName, int depth)
 	{
 		// Prevent crash due to broken recursion
 		if (depth > MAX_DISCOVERY_DEPTH)
@@ -1423,15 +1617,14 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 * @param classes
 	 * @param className
 	 */
-	@SuppressWarnings("unchecked")
-	private static void checkAndAddClass(ClassLoader classloader, Class superClass, LinkedList<Class> classes, String className)
+	private static void checkAndAddClass(ClassLoader classloader, Class<?> superClass, LinkedList<Class<?>> classes, String className)
 	{
 		if (className.indexOf('$') > -1)
 			return;
 		try
 		{
-			Class subClass = classloader.loadClass(className);
+			Class<?> subClass = classloader.loadClass(className);
 			if (subClass != null && !superClass.equals(subClass) && superClass.isAssignableFrom(subClass) && !subClass.isInterface() && !classes.contains(subClass))
 			{
@@ -1447,8 +1640,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	/**
 	 * Add a URL to the Minecraft classloader class path
 	 * 
-	 * @param classUrl
-	 *            URL of the resource to add
+	 * @param classUrl URL of the resource to add
 	 */
 	private boolean addURLToClassPath(URL classUrl)
 	{
@@ -1596,8 +1788,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	/**
 	 * Callback from the tick hook, ticks all tickable mods
 	 * 
-	 * @param tick
-	 *            True if this is a new tick (otherwise it's just a new frame)
+	 * @param tick True if this is a new tick (otherwise it's just a new frame)
 	 */
 	public void onTick(Profiler profiler, boolean tick)
 	{
@@ -1728,10 +1919,8 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	/**
 	 * Delegate to ModUtilities.sendPluginChannelMessage
 	 * 
-	 * @param channel
-	 *            Channel to send data to
-	 * @param data
-	 *            Data to send
+	 * @param channel Channel to send data to
+	 * @param data Data to send
 	 */
 	public void sendPluginChannelMessage(String channel, byte[] data)
 	{
@@ -12,6 +12,8 @@ import java.util.Set;
 public enum LiteLoaderVersion
 {
 	LEGACY(0, "-", "-", "-"),
+	MC_1_5_2_R1(9, "1.5.2", "1.5.2", "1.5.2"),
+	MC_1_5_2_R2(10, "1.5.2", "1.5.2", "1.5.2"),
 	MC_1_6_1_R0(11, "1.6.1", "1.6.1", "1.6.1", "1.6.r1"),
 	MC_1_6_2_R0(12, "1.6.2", "1.6.2", "1.6.2", "1.6.r2");
+package com.mumfrey.liteloader.core;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+
+/**
+ * Wrapper for file which represents a mod file to load with associated version information and
+ * metadata. Retrieve this from litemod.xml at enumeration time. We also override comparable to 
+ * provide our own custom sorting logic based on version info.
+ *
+ * @author Adam Mummery-Smith
+ */
+public class ModFile extends File
+{
+	private static final long serialVersionUID = -7952147161905688459L;
+
+	/**
+	 * Gson parser for JSON
+	 */
+	private static Gson gson = new Gson();
+	
+	/**
+	 * True if the metadata information is parsed successfully, the mod will be added
+	 */
+	private boolean valid = false;
+	
+	/**
+	 * True if parsed from JSON, false if fallback mode using legacy version.txt
+	 */
+	private boolean json = false;
+	
+	/**
+	 * Name of the mod specified in the JSON file, this can be any string but should be the same between mod versions
+	 */
+	private String modName;
+	
+	/**
+	 * Loader version
+	 */
+	private String version;
+	
+	/**
+	 * File time stamp, used as sorting criteria when no revision information is found
+	 */
+	private long timeStamp;
+	
+	/**
+	 * Revision number from the json file
+	 */
+	private float revision = 0.0F;
+	
+	/**
+	 * True if the revision number was successfully read, used as a semaphore so that we know when revision is a valid number
+	 */
+	private boolean hasRevision = false;
+	
+	/**
+	 * ALL of the parsed metadata from the file, associated with the mod later on for retrieval via the loader
+	 */
+	private HashMap<String, String> metaData = new HashMap<String, String>();
+	
+	/**
+	 * @param file
+	 * @param strVersion
+	 */
+	public ModFile(File file, String strVersion)
+	{
+		super(file.getAbsolutePath());
+		
+		this.timeStamp = this.lastModified();
+		
+		this.parseVersionFile(strVersion);
+	}
+
+	@SuppressWarnings("unchecked")
+	private void parseVersionFile(String strVersionData)
+	{
+		// Assume that it's json if the file starts with a brace
+		if (strVersionData.trim().startsWith("{"))
+		{
+			try
+			{
+				this.metaData = ModFile.gson.fromJson(strVersionData, HashMap.class);
+			}
+			catch (JsonSyntaxException jsx)
+			{
+				LiteLoader.getLogger().warning("Error reading litemod.json in " + this.getName() + ", JSON syntax exception: " + jsx.getMessage());
+				return;
+			}
+			
+			this.modName = this.metaData.get("name");
+			
+			this.version = this.metaData.get("mcversion");
+			if (this.version == null)
+			{
+				LiteLoader.getLogger().warning("Mod in " + this.getName() + " has no loader version number reading litemod.json");
+				return;
+			}
+			
+			try
+			{
+				this.revision = Float.parseFloat(this.metaData.get("revision"));
+				this.hasRevision = true;
+			}
+			catch (Exception ex)
+			{
+				LiteLoader.getLogger().warning("Mod in " + this.getName() + " has an invalid revision number reading litemod.json");
+			}
+
+			this.valid = true;
+			this.json = true;
+		}
+		else
+		{
+			// Legacy version.txt file
+			this.version = strVersionData;
+			this.valid = true;
+		}
+		
+		if (this.modName == null)
+		{
+			this.modName = this.getName().replaceAll("[^a-zA-Z]", "");
+		}
+	}
+	
+	public String getModName()
+	{
+		return this.modName;
+	}
+	
+	public boolean isValid()
+	{
+		return this.valid;
+	}
+	
+	public boolean isJson()
+	{
+		return this.json;
+	}
+	
+	public String getVersion()
+	{
+		return this.version;
+	}
+	
+	public float getRevision()
+	{
+		return this.revision;
+	}
+	
+	public String getMetaValue(String metaKey, String defaultValue)
+	{
+		return this.metaData.containsKey(metaKey) ? this.metaData.get(metaKey) : defaultValue;
+	}
+
+	public Map<String, String> getMetaData()
+	{
+		return this.metaData;
+	}
+	
+	@Override
+	public int compareTo(File other)
+	{
+		if (other == null || !(other instanceof ModFile)) return -1;
+		
+		ModFile otherMod = (ModFile)other;
+		
+		// If the other object has a revision, compare revisions
+		if (otherMod.hasRevision)
+		{
+			return this.hasRevision && this.revision - otherMod.revision > 0 ? -1 : 1;
+		}
+
+		// If we have a revision and the other object doesn't, then we are higher
+		if (this.hasRevision)
+		{
+			return -1;
+		}
+
+		// Give up and use timestamp
+		return (int)(otherMod.timeStamp - this.timeStamp);
+	}
+}
@@ -20,58 +20,58 @@ public class GuiControlsPaginated extends GuiScreen
 	 * Pagination variables
 	 */
 	protected int controlsPerPage, startIndex, endIndex;
-
+	
 	/**
 	 * Parent screen which will be displayed when this screen is closed
 	 */
 	protected GuiScreen parentScreen;
-    
-    /**
-     * Game settings
-     */
+	
+	/**
+	 * Game settings
+	 */
 	protected GameSettings gameSettings;
-    
-    /**
-     * Additional buttons
-     */
+	
+	/**
+	 * Additional buttons
+	 */
 	protected GuiButton btnNext, btnPrevious;
-
-    /**
-     * Title to display
-     */
-    protected String screenTitle = "Controls";
-    
-    /**
-     * ID of the button currently being edited
-     */
-    protected int activeButtonId = -1;
-    
-    public GuiControlsPaginated(GuiScreen parentScreen, GameSettings gameSettings)
-    {
-        this.parentScreen = parentScreen;
-        this.gameSettings = gameSettings;
-        
-        // Pagination defaults
-        this.controlsPerPage = 14; 
-        this.endIndex = this.gameSettings.keyBindings.length - (this.gameSettings.keyBindings.length % this.controlsPerPage == 0 ? this.controlsPerPage : this.gameSettings.keyBindings.length % this.controlsPerPage); 
-    }
-    
-    @SuppressWarnings("unchecked")
+	
+	/**
+	 * Title to display
+	 */
+	protected String screenTitle = "Controls";
+	
+	/**
+	 * ID of the button currently being edited
+	 */
+	protected int activeButtonId = -1;
+	
+	public GuiControlsPaginated(GuiScreen parentScreen, GameSettings gameSettings)
+	{
+		this.parentScreen = parentScreen;
+		this.gameSettings = gameSettings;
+		
+		// Pagination defaults
+		this.controlsPerPage = 14; 
+		this.endIndex = this.gameSettings.keyBindings.length - (this.gameSettings.keyBindings.length % this.controlsPerPage == 0 ? this.controlsPerPage : this.gameSettings.keyBindings.length % this.controlsPerPage); 
+	}
+	
+	@SuppressWarnings("unchecked")
 	protected List<GuiButton> getLegacyControlList()
-    {
-    	return this.buttonList;
-    }
-    
-    protected final int getHeight()
-    {
-    	return this.height;
-    }
-    
-    protected final int getWidth()
-    {
-    	return this.width;
-    }
-
+	{
+		return this.buttonList;
+	}
+	
+	protected final int getHeight()
+	{
+		return this.height;
+	}
+	
+	protected final int getWidth()
+	{
+		return this.width;
+	}
+	
 	public GuiScreen getParentScreen()
 	{
 		return this.parentScreen;
@@ -84,40 +84,40 @@ public class GuiControlsPaginated extends GuiScreen
 	public void initGui()
 	{
 		this.getLegacyControlList().clear();
-        
+		
 		int oldControlsPerPage = this.controlsPerPage;
 		this.controlsPerPage = ((this.getHeight() - 70) / 24) * 2;
-        this.endIndex = this.gameSettings.keyBindings.length - (this.gameSettings.keyBindings.length % this.controlsPerPage == 0 ? this.controlsPerPage : this.gameSettings.keyBindings.length % this.controlsPerPage);
-        if (oldControlsPerPage != this.controlsPerPage) this.startIndex = 0;
-        
-        for (int controlId = 0; controlId < this.gameSettings.keyBindings.length; controlId++)
-        {
-            boolean buttonVisible = controlId >= this.startIndex && controlId < this.startIndex + this.controlsPerPage;
+		this.endIndex = this.gameSettings.keyBindings.length - (this.gameSettings.keyBindings.length % this.controlsPerPage == 0 ? this.controlsPerPage : this.gameSettings.keyBindings.length % this.controlsPerPage);
+		if (oldControlsPerPage != this.controlsPerPage) this.startIndex = 0;
+		
+		for (int controlId = 0; controlId < this.gameSettings.keyBindings.length; controlId++)
+		{
+			boolean buttonVisible = controlId >= this.startIndex && controlId < this.startIndex + this.controlsPerPage;
 			int left = buttonVisible ? this.getWidth() / 2 - 155 : this.getWidth() + 10000;
-            int top = this.getHeight() / 6 + 24 * ((controlId - this.startIndex) >> 1);
+			int top = this.getHeight() / 6 + 24 * ((controlId - this.startIndex) >> 1);
 			this.getLegacyControlList().add(new GuiSmallButton(controlId, left + ((controlId - this.startIndex) % 2) * 160, top, 70, 20, this.gameSettings.getOptionDisplayString(controlId)));
-        }
-        
-        int buttonY = this.getHeight() / 6 + (this.controlsPerPage >> 1) * 24;
-        
-        // Only bother paginating if there are too many controls to display
+		}
+		
+		int buttonY = this.getHeight() / 6 + (this.controlsPerPage >> 1) * 24;
+		
+		// Only bother paginating if there are too many controls to display
 		if (this.gameSettings.keyBindings.length > this.controlsPerPage)
-        {
-	        this.getLegacyControlList().add(this.btnNext = new GuiButton(201, this.getWidth() / 2 - 51, buttonY, 50, 20, ">>"));
-	        this.getLegacyControlList().add(this.btnPrevious = new GuiButton(202, this.getWidth() / 2 - 103, buttonY, 50, 20, "<<"));
-	        this.getLegacyControlList().add(new GuiButton(200, this.getWidth() / 2 + 1, buttonY, 100, 20, I18n.func_135053_a("gui.done")));
-
-	        this.btnNext.enabled = this.startIndex < this.endIndex;
-	        this.btnPrevious.enabled = this.startIndex > 0;
-        }
-        else
-        {
-        	this.getLegacyControlList().add(new GuiButton(200, this.getWidth() / 2 - 100, buttonY, I18n.func_135053_a("gui.done")));
-        }
-        
-        this.screenTitle = I18n.func_135053_a("controls.title");
+		{
+			this.getLegacyControlList().add(this.btnNext = new GuiButton(201, this.getWidth() / 2 - 51, buttonY, 50, 20, ">>"));
+			this.getLegacyControlList().add(this.btnPrevious = new GuiButton(202, this.getWidth() / 2 - 103, buttonY, 50, 20, "<<"));
+			this.getLegacyControlList().add(new GuiButton(200, this.getWidth() / 2 + 1, buttonY, 100, 20, I18n.func_135053_a("gui.done")));
+			
+			this.btnNext.enabled = this.startIndex < this.endIndex;
+			this.btnPrevious.enabled = this.startIndex > 0;
+		}
+		else
+		{
+			this.getLegacyControlList().add(new GuiButton(200, this.getWidth() / 2 - 100, buttonY, I18n.func_135053_a("gui.done")));
+		}
+		
+		this.screenTitle = I18n.func_135053_a("controls.title");
 	}
-
+	
 	/**
 	 * @param controlId
 	 * @return
@@ -136,103 +136,103 @@ public class GuiControlsPaginated extends GuiScreen
 	protected void actionPerformed(GuiButton guibutton)
 	{
 		// Update the button labels with the appropriate key names
-        for(int i = 0; i < this.gameSettings.keyBindings.length; i++)
-        {
-        	this.getLegacyControlList().get(i).displayString = this.gameSettings.getOptionDisplayString(i);
-        }
-
-        if (guibutton.id == 200) // Done button
-        {
-        	this.mc.displayGuiScreen(this.parentScreen);
-        }
-        else if (guibutton.id == 201) // Next button
-        {
-        	this.startIndex += this.controlsPerPage;
-        	this.startIndex = Math.min(this.endIndex, this.startIndex);
-        	this.initGui();
-        }
-        else if (guibutton.id == 202) // Previous button
-        {
-        	this.startIndex -= this.controlsPerPage;
-        	this.startIndex = Math.max(0, this.startIndex);
-        	this.initGui();
-        }
-        else
-        {
-            this.activeButtonId = guibutton.id;
-            guibutton.displayString = String.format("> %s <", this.gameSettings.getOptionDisplayString(guibutton.id));
-        }
+		for(int i = 0; i < this.gameSettings.keyBindings.length; i++)
+		{
+			this.getLegacyControlList().get(i).displayString = this.gameSettings.getOptionDisplayString(i);
+		}
+		
+		if (guibutton.id == 200) // Done button
+		{
+			this.mc.displayGuiScreen(this.parentScreen);
+		}
+		else if (guibutton.id == 201) // Next button
+		{
+			this.startIndex += this.controlsPerPage;
+			this.startIndex = Math.min(this.endIndex, this.startIndex);
+			this.initGui();
+		}
+		else if (guibutton.id == 202) // Previous button
+		{
+			this.startIndex -= this.controlsPerPage;
+			this.startIndex = Math.max(0, this.startIndex);
+			this.initGui();
+		}
+		else
+		{
+			this.activeButtonId = guibutton.id;
+			guibutton.displayString = String.format("> %s <", this.gameSettings.getOptionDisplayString(guibutton.id));
+		}
 	}
-
+	
 	@Override
-    protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
-    {
-        if (this.activeButtonId >= 0)
-        {
-            this.gameSettings.setKeyBinding(this.activeButtonId, -100 + mouseButton);
-            this.getLegacyControlList().get(this.activeButtonId).displayString = this.gameSettings.getOptionDisplayString(this.activeButtonId);
-            this.activeButtonId = -1;
-            KeyBinding.resetKeyBindingArrayAndHash();
-        }
-        else
-        {
-            super.mouseClicked(mouseX, mouseY, mouseButton);
-        }
-    }
-
+	protected void mouseClicked(int mouseX, int mouseY, int mouseButton)
+	{
+		if (this.activeButtonId >= 0)
+		{
+			this.gameSettings.setKeyBinding(this.activeButtonId, -100 + mouseButton);
+			this.getLegacyControlList().get(this.activeButtonId).displayString = this.gameSettings.getOptionDisplayString(this.activeButtonId);
+			this.activeButtonId = -1;
+			KeyBinding.resetKeyBindingArrayAndHash();
+		}
+		else
+		{
+			super.mouseClicked(mouseX, mouseY, mouseButton);
+		}
+	}
+	
 	@Override
-    protected void keyTyped(char keyChar, int keyCode)
-    {
-        if (this.activeButtonId >= 0)
-        {
-            this.gameSettings.setKeyBinding(this.activeButtonId, keyCode);
-            this.getLegacyControlList().get(this.activeButtonId).displayString = this.gameSettings.getOptionDisplayString(this.activeButtonId);
-            this.activeButtonId = -1;
-            KeyBinding.resetKeyBindingArrayAndHash();
-        }
-        else
-        {
-            super.keyTyped(keyChar, keyCode);
-        }
-    }
-
+	protected void keyTyped(char keyChar, int keyCode)
+	{
+		if (this.activeButtonId >= 0)
+		{
+			this.gameSettings.setKeyBinding(this.activeButtonId, keyCode);
+			this.getLegacyControlList().get(this.activeButtonId).displayString = this.gameSettings.getOptionDisplayString(this.activeButtonId);
+			this.activeButtonId = -1;
+			KeyBinding.resetKeyBindingArrayAndHash();
+		}
+		else
+		{
+			super.keyTyped(keyChar, keyCode);
+		}
+	}
+	
 	@Override
-    public void drawScreen(int mouseX, int mouseY, float partialTick)
-    {
-        this.drawDefaultBackground();
-        this.drawCenteredString(this.fontRenderer, this.screenTitle, this.width / 2, 20, 0xffffff);
-
-        // Draw key labels
-        for (int controlId = 0; controlId < this.gameSettings.keyBindings.length; controlId++)
-        {
-            boolean conflict = false;
-
-            for (int id = 0; id < this.gameSettings.keyBindings.length; id++)
-            {
-                if (id != controlId && this.gameSettings.keyBindings[controlId].keyCode == this.gameSettings.keyBindings[id].keyCode)
-                {
-                    conflict = true;
-                    break;
-                }
-            }
-
-            if (this.activeButtonId == controlId)
-            {
-            	this.getLegacyControlList().get(controlId).displayString = "\247f> \247e??? \247f<";
-            }
-            else if (conflict)
-            {
-            	this.getLegacyControlList().get(controlId).displayString = "\247c" + this.gameSettings.getOptionDisplayString(controlId);
-            }
-            else
-            {
-            	this.getLegacyControlList().get(controlId).displayString = this.gameSettings.getOptionDisplayString(controlId);
-            }
-
-            int left = (controlId >= this.startIndex && controlId < this.startIndex + this.controlsPerPage) ? this.getWidth() / 2 - 155 : this.getWidth() + 10000;
-            this.drawString(this.fontRenderer, this.getKeybindDescription(controlId), left + ((controlId - this.startIndex) % 2) * 160 + 70 + 6, this.getHeight() / 6 + 24 * ((controlId - this.startIndex) >> 1) + 7, 0xFFFFFF);
-        }
-        
-        super.drawScreen(mouseX, mouseY, partialTick);
-    }
+	public void drawScreen(int mouseX, int mouseY, float partialTick)
+	{
+		this.drawDefaultBackground();
+		this.drawCenteredString(this.fontRenderer, this.screenTitle, this.width / 2, 20, 0xffffff);
+		
+		// Draw key labels
+		for (int controlId = 0; controlId < this.gameSettings.keyBindings.length; controlId++)
+		{
+			boolean conflict = false;
+			
+			for (int id = 0; id < this.gameSettings.keyBindings.length; id++)
+			{
+				if (id != controlId && this.gameSettings.keyBindings[controlId].keyCode == this.gameSettings.keyBindings[id].keyCode)
+				{
+					conflict = true;
+					break;
+				}
+			}
+			
+			if (this.activeButtonId == controlId)
+			{
+				this.getLegacyControlList().get(controlId).displayString = "\247f> \247e??? \247f<";
+			}
+			else if (conflict)
+			{
+				this.getLegacyControlList().get(controlId).displayString = "\247c" + this.gameSettings.getOptionDisplayString(controlId);
+			}
+			else
+			{
+				this.getLegacyControlList().get(controlId).displayString = this.gameSettings.getOptionDisplayString(controlId);
+			}
+			
+			int left = (controlId >= this.startIndex && controlId < this.startIndex + this.controlsPerPage) ? this.getWidth() / 2 - 155 : this.getWidth() + 10000;
+			this.drawString(this.fontRenderer, this.getKeybindDescription(controlId), left + ((controlId - this.startIndex) % 2) * 160 + 70 + 6, this.getHeight() / 6 + 24 * ((controlId - this.startIndex) >> 1) + 7, 0xFFFFFF);
+		}
+		
+		super.drawScreen(mouseX, mouseY, partialTick);
+	}
 }
 \ No newline at end of file
@@ -58,13 +58,13 @@ public interface PermissionsManager
 	 */
 	public abstract void onCustomPayload(String channel, int length, byte[] data);
-    /**
-     * LiteLoader support, gets the list of plugin channels to listen on
-     * 
-     * @return
-     */
-    public abstract List<String> getChannels();
-    
+	/**
+	 * LiteLoader support, gets the list of plugin channels to listen on
+	 * 
+	 * @return
+	 */
+	public abstract List<String> getChannels();
+	
 	/**
 	 * Register a new event listener, the registered object will receive callbacks for permissions events
 	 * 
@@ -36,47 +36,47 @@ public abstract class ModUtilities
 	 * @param entityClass
 	 * @param renderer
 	 */
-    @SuppressWarnings("unchecked")
+	@SuppressWarnings("unchecked")
 	public static void addRenderer(Class<? extends Entity> entityClass, Render renderer)
-    {
-    	Map<Class<? extends Entity>, Render> entityRenderMap = PrivateFields.entityRenderMap.get(RenderManager.instance);
-    	entityRenderMap.put(entityClass, renderer);
-    	renderer.setRenderManager(RenderManager.instance);
-    }
-    
-    /**
-     * Register a packet override
-     * 
-     * @param packetId
-     * @param newPacket
-     */
-    @SuppressWarnings("unchecked")
-    public static boolean registerPacketOverride(int packetId, Class<? extends Packet> newPacket)
-    {
-    	if (overriddenPackets.contains(Integer.valueOf(packetId)))
-    	{
-    		LiteLoader.getLogger().warning(String.format("Packet with ID %s was already overridden by another mod, one or mods may not function correctly", packetId));
-    	}
-    	
-    	try
-    	{
-    		IntHashMap packetIdToClassMap = Packet.packetIdToClassMap;
-    		PrivateFields.StaticFields.packetClassToIdMap.get();
-    		Map<Class<? extends Packet>, Integer> packetClassToIdMap = PrivateFields.StaticFields.packetClassToIdMap.get();
-    		
-    		packetIdToClassMap.removeObject(packetId);
-    		packetIdToClassMap.addKey(packetId, newPacket);
-    		packetClassToIdMap.put(newPacket, Integer.valueOf(packetId));
-    		
-    		return true;
-    	}
-    	catch (Exception ex)
-    	{
-    		LiteLoader.logger.warning("Error registering packet override for packet id " + packetId + ": " + ex.getMessage());
-    		return false;
-    	}
-    }
-    
+	{
+		Map<Class<? extends Entity>, Render> entityRenderMap = PrivateFields.entityRenderMap.get(RenderManager.instance);
+		entityRenderMap.put(entityClass, renderer);
+		renderer.setRenderManager(RenderManager.instance);
+	}
+	
+	/**
+	 * Register a packet override
+	 * 
+	 * @param packetId
+	 * @param newPacket
+	 */
+	@SuppressWarnings("unchecked")
+	public static boolean registerPacketOverride(int packetId, Class<? extends Packet> newPacket)
+	{
+		if (overriddenPackets.contains(Integer.valueOf(packetId)))
+		{
+			LiteLoader.getLogger().warning(String.format("Packet with ID %s was already overridden by another mod, one or mods may not function correctly", packetId));
+		}
+		
+		try
+		{
+			IntHashMap packetIdToClassMap = Packet.packetIdToClassMap;
+			PrivateFields.StaticFields.packetClassToIdMap.get();
+			Map<Class<? extends Packet>, Integer> packetClassToIdMap = PrivateFields.StaticFields.packetClassToIdMap.get();
+			
+			packetIdToClassMap.removeObject(packetId);
+			packetIdToClassMap.addKey(packetId, newPacket);
+			packetClassToIdMap.put(newPacket, Integer.valueOf(packetId));
+			
+			return true;
+		}
+		catch (Exception ex)
+		{
+			LiteLoader.logger.warning("Error registering packet override for packet id " + packetId + ": " + ex.getMessage());
+			return false;
+		}
+	}
+	
 	/**
 	 * Send a plugin channel (custom payload) packet to the server
 	 *