merged changes from Permissions branch to Trunk

Mumfrey
1 parent 4e3e54ae
Showing 29 changed files with 2026 additions and 501 deletions
.classpath
ant/ant-contrib.jar
ant/build_liteloader.xml
java/com/mumfrey/liteloader/ChatFilter.java
java/com/mumfrey/liteloader/ChatListener.java
java/com/mumfrey/liteloader/GameLoopListener.java
java/com/mumfrey/liteloader/InitCompleteListener.java
java/com/mumfrey/liteloader/LiteMod.java
java/com/mumfrey/liteloader/Permissible.java
java/com/mumfrey/liteloader/Tickable.java
java/com/mumfrey/liteloader/core/HookChat.java
java/com/mumfrey/liteloader/core/HookPluginChannels.java
java/com/mumfrey/liteloader/core/HookProfiler.java
java/com/mumfrey/liteloader/core/LiteLoader.java
java/com/mumfrey/liteloader/core/LiteLoaderVersion.java
java/com/mumfrey/liteloader/gui/GuiControlsPaginated.java
java/com/mumfrey/liteloader/permissions/LocalPermissions.java
java/com/mumfrey/liteloader/permissions/PermissibleAllMods.java
java/com/mumfrey/liteloader/permissions/Permission.java
java/com/mumfrey/liteloader/permissions/Permissions.java
@@ -3,10 +3,8 @@
 	<classpathentry kind="src" path="java"/>
 	<classpathentry kind="src" path="res"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Client"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre6"/>
-	<classpathentry kind="lib" path="/Client/jars/bin/jinput.jar"/>
-	<classpathentry kind="lib" path="/Client/jars/bin/lwjgl_util.jar"/>
-	<classpathentry kind="lib" path="/Client/jars/bin/lwjgl.jar"/>
-	<classpathentry kind="lib" path="/Client/jars/bin/minecraft.jar"/>
+	<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="output" path="bin"/>
 </classpath>
+<?xml version="1.0" encoding="UTF-8" ?>
+<project name="liteloader" basedir="." default="rebuild">
+
+	<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
+	
+    <!-- Versions !!IMPORTANT -->
+	<property name="version" value="1.6.2" />
+    <property name="mcversion" value="1.6.2" />
+    <property name="author" value="Mumfrey" />
+	
+    <!-- Project definitions and dependencies -->
+	<property name="upstream" value="LiteLoader,LegacyLauncher" />
+	<property name="project" value="LiteLoaderLauncher" />
+	<property name="md5set" value="legacylauncher" />
+    <property name="outmd5set" value="liteloader" />
+	
+	<property name="mcp.dir" location="../../.." />
+    <property name="build" location="${mcp.dir}/build" />
+    <property name="eclipse" location="${mcp.dir}/eclipse" />
+    <property name="src" location="${mcp.dir}/src/minecraft" />
+    <property name="temp" location="${mcp.dir}/temp" />
+    <property name="md5.dir" location="${mcp.dir}/md5" />
+    <property name="mc.src" location="${mcp.dir}/src/mcp" />
+
+	<property name="dist.dir" location="${build}/dist" />
+	<property name="stage.dir" location="${build}/stage/${ant.project.name}/${version}" />
+    <property name="filetype" value="jar" />
+
+	<property name="python" location="${mcp.dir}/runtime/bin/python/python_mcp.exe" />
+
+	<!-- Main target -->
+    <target name="rebuild" description="Perform all tasks for a build" depends="init, recompile, reobfuscate, savemd5, stage, zip" />
+
+	<target name="clean">
+        <delete dir="${src}" />
+        <delete dir="${mcp.dir}/reobf" />
+    </target>
+	
+	<target name="contributesource" description="Contribute an upstream project source code to the source path">
+		<echo level="info" message="Contributing project ${lib}" />
+        <copy todir="${src}" verbose="false" overwrite="true" failonerror="false">
+            <fileset dir="${eclipse}/${lib}/java" />
+            <fileset dir="${eclipse}/${lib}/src" />
+        </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}/res" excludes=".svn/**">
+                <exclude name="**/Thumbs.db" />            	
+            </fileset>
+        </copy>
+    </target>
+    
+    <target name="preparemd5" description="Copy patched MD5 to the temp directory" depends="clean">
+        <echo level="info" message="Prepare exclusion MD5s, using exclusion set &quot;${md5set}&quot;" />
+
+    	<copy tofile="${temp}/client.md5" file="${md5.dir}/client_${md5set}.md5" failonerror="true" verbose="true" overwrite="true" />
+    </target>
+        
+	<target name="prepare" description="Prepare source for MCP" depends="preparemd5">
+        <echo level="info" message="Prepare sources for compile" />
+
+    	<copy todir="${src}" verbose="false" overwrite="true">
+			<fileset dir="${mc.src}" />
+		</copy>
+		
+		<foreach list="${upstream}" param="lib" target="contributesource" />
+
+		<antcall target="contributesource">
+			<param name="lib" value="${project}" />
+		</antcall>
+	</target>
+
+	<target name="init" description="Initialize build environment" depends="prepare">
+		<echo level="info" message="Cleaning old stage and dist, MCP reobf directories" />
+
+		<delete dir="${stage.dir}" />
+
+		<echo level="info" message="Creating stage and dist dirs" />
+		<mkdir dir="${stage.dir}" />
+		<mkdir dir="${dist.dir}" />
+		<mkdir dir="${md5.dir}" />
+	</target>
+
+	<target name="recompile" description="MCP recompile">
+        <echo level="info" message="Compiling projects" />
+
+		<exec executable="${python}" dir="${mcp.dir}">
+			<arg value="runtime/recompile.py" />
+			<arg value="--client" />
+			<arg value="%*" />
+		</exec>
+	</target>
+
+	<target name="reobfuscate" description="MCP reobfuscate">
+        <echo level="info" message="Obfuscating classes" />
+
+		<exec executable="${python}" dir="${mcp.dir}">
+			<arg value="runtime/reobfuscate.py" />
+            <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" />
+
+		<copy file="${temp}/client_reobf.md5" tofile="${md5.dir}/client_${outmd5set}.md5" overwrite="true" verbose="true" />
+	</target>
+
+	<target name="stage" description="Stage resources into staging directory">
+        <echo level="info" message="Staging resources" />
+
+		<copy todir="${stage.dir}">
+			<fileset dir="${mcp.dir}/reobf/minecraft" excludes=".svn/**, *.txt" />
+		</copy>
+
+        <foreach list="${upstream}" param="lib" target="contributeresources" />
+
+        <antcall target="contributeresources">
+            <param name="lib" value="${project}" />
+        </antcall>
+		
+	</target>
+
+	<target name="zip" description="Build the output zip file">
+        <echo level="info" message="Building final output" />
+
+		<mkdir dir="${dist.dir}" />
+		<jar destfile="${dist.dir}/${ant.project.name}-${mcversion}.${filetype}" duplicate="preserve" index="true" manifestencoding="UTF-8">
+			<manifest>
+				<attribute name="Built-By" value="MCP (http://mcp.ocean-labs.de)" />
+				<attribute name="Implementation-Vendor" value="${author}" />
+				<attribute name="Implementation-Title" value="${ant.project.name}" />
+				<attribute name="Implementation-Version" value="${version}" />
+			</manifest>
+			<fileset dir="${stage.dir}" />
+		</jar>
+	</target>
+
+</project>
 \ No newline at end of file
 package com.mumfrey.liteloader;
+import net.minecraft.src.ChatMessageComponent;
 import net.minecraft.src.Packet3Chat;
 /**
@@ -13,7 +14,9 @@ public interface ChatFilter extends LiteMod
 	 * Chat filter function, return false to filter this packet, true to pass the packet
 	 * 
 	 * @param chatPacket Chat packet to examine
+	 * @param chat ChatMessageComponent parsed from the chat packet
+	 * @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);
+	public abstract boolean onChat(Packet3Chat chatPacket, ChatMessageComponent chat, String message);
 }
 package com.mumfrey.liteloader;
+import net.minecraft.src.ChatMessageComponent;
+
 /**
  * Interface for mods which receive inbound chat
  *
@@ -10,7 +12,8 @@ public interface ChatListener extends LiteMod
 	/**
 	 * Handle an inbound message
 	 * 
-	 * @param message
+	 * @param chat ChatMessageComponent parsed from the chat packet
+	 * @param message Chat message parsed from the chat message component
 	 */
-	public abstract void onChat(String message);
+	public abstract void onChat(ChatMessageComponent chat, String message);
 }
 package com.mumfrey.liteloader;
-import net.minecraft.client.Minecraft;
+import net.minecraft.src.Minecraft;
 /**
  * Interface for mods which want a frame notification every single game loop
 package com.mumfrey.liteloader;
-import net.minecraft.client.Minecraft;
+import net.minecraft.src.Minecraft;
 import com.mumfrey.liteloader.core.LiteLoader;
 package com.mumfrey.liteloader;
+import java.io.File;
+
 /**
  * Base interface for mods
  *
@@ -24,6 +26,17 @@ public interface LiteMod
 	/**
 	 * Do startup stuff here, minecraft is not fully initialised when this function is called so mods *must not*
 	 * interact with minecraft in any way here
+	 * 
+	 * @param configPath Configuration path to use
+	 */
+	public abstract void init(File configPath);
+	
+	/**
+	 * Called when the loader detects that a version change has happened since this mod was last loaded
+	 * 
+	 * @param version new version
+	 * @param configPath Path for the new version-specific config
+	 * @param oldConfigPath Path for the old version-specific config
 	 */
-	public abstract void init();
+	public abstract void upgradeSettings(String version, File configPath, File oldConfigPath);
 }
+package com.mumfrey.liteloader;
+
+import com.mumfrey.liteloader.permissions.PermissionsManager;
+import com.mumfrey.liteloader.permissions.PermissionsManagerClient;
+
+/**
+ * Interface for mods which use the ClientPermissions system
+ *
+ * @author Adam Mummery-Smith
+ */
+public interface Permissible extends LiteMod
+{
+	/**
+	 * Returns the node name of the mod, replicated permissions will be of the form mod.<name>.permission.node so this
+	 * method must return a valid name for use in permission nodes. This method must also return the same value every
+	 * time it is called since permissible names are not necessarily cached.
+	 * 
+	 * @return Permissible name
+	 */
+	public abstract String getPermissibleModName();
+	
+	/**
+	 * The mod version to replicate to the server
+	 * 
+	 * @return Mod version as a float
+	 */
+	public abstract float getPermissibleModVersion();
+	
+	/**
+	 * Called by the permissions manager at initialisation to instruct the mod to populate the list of permissions it
+	 * supports. This method should call back against the supplied permissions manager to register the permissions to
+	 * be sent to the server when connecting.
+	 * 
+	 * @param permissionsManager Client permissions manager
+	 */
+	public abstract void registerPermissions(PermissionsManagerClient permissionsManager);
+
+	/**
+	 * Called when the permissions set is cleared
+	 * 
+	 * @param manager
+	 */
+	public abstract void onPermissionsCleared(PermissionsManager manager);
+	
+	/**
+	 * Called when the permissions are changed (eg. when new permissions are received from the server)
+	 * 
+	 * @param manager
+	 */
+	public abstract void onPermissionsChanged(PermissionsManager manager);
+}
 package com.mumfrey.liteloader;
-import net.minecraft.client.Minecraft;
+import net.minecraft.src.Minecraft;
 /**
  * Interface for mods which want tick events
 package com.mumfrey.liteloader.core;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 import java.util.Map;
-import com.mumfrey.liteloader.util.PrivateFields;
+import net.minecraft.src.IntHashMap;
+import net.minecraft.src.NetHandler;
+import net.minecraft.src.Packet;
+import net.minecraft.src.Packet3Chat;
-import net.minecraft.src.*;
+import com.mumfrey.liteloader.util.PrivateFields;
 /**
  * Proxy packet which we will register in place of the original chat packet. The class will proxy the function calls
@@ -80,7 +83,7 @@ public class HookChat extends Packet3Chat
 	}
 	@Override
-	public void readPacketData(DataInputStream datainputstream) throws IOException
+	public void readPacketData(DataInput datainputstream) throws IOException
 	{
 		if (proxyPacket != null)
 		{
@@ -92,7 +95,7 @@ public class HookChat extends Packet3Chat
 	}
 	@Override
-	public void writePacketData(DataOutputStream dataoutputstream) throws IOException
+	public void writePacketData(DataOutput dataoutputstream) throws IOException
 	{
 		if (proxyPacket != null)
 			proxyPacket.writePacketData(dataoutputstream);
 package com.mumfrey.liteloader.core;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 import java.util.Map;
-import com.mumfrey.liteloader.util.PrivateFields;
+import net.minecraft.src.IntHashMap;
+import net.minecraft.src.NetHandler;
+import net.minecraft.src.Packet;
+import net.minecraft.src.Packet250CustomPayload;
-import net.minecraft.src.*;
+import com.mumfrey.liteloader.util.PrivateFields;
 public class HookPluginChannels extends Packet250CustomPayload
 {
@@ -68,7 +71,7 @@ public class HookPluginChannels extends Packet250CustomPayload
 	@Override
-	public void readPacketData(DataInputStream datainputstream) throws IOException
+	public void readPacketData(DataInput datainputstream) throws IOException
 	{
 		if (proxyPacket != null)
 		{
@@ -82,7 +85,7 @@ public class HookPluginChannels extends Packet250CustomPayload
 	}
 	@Override
-	public void writePacketData(DataOutputStream dataoutputstream) throws IOException
+	public void writePacketData(DataOutput dataoutputstream) throws IOException
 	{
 		if (proxyPacket != null)
 			proxyPacket.writePacketData(dataoutputstream);
@@ -6,7 +6,7 @@ import java.util.LinkedList;
 import java.util.NoSuchElementException;
 import java.util.logging.Logger;
-import net.minecraft.client.Minecraft;
+import net.minecraft.src.Minecraft;
 import net.minecraft.src.GameSettings;
 import net.minecraft.src.Profiler;
 package com.mumfrey.liteloader.core;
 import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -16,7 +15,6 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.net.URLDecoder;
 import java.nio.charset.Charset;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -33,7 +31,8 @@ import java.util.zip.ZipInputStream;
 import javax.activity.InvalidActivityException;
-import net.minecraft.client.Minecraft;
+import net.minecraft.src.ChatMessageComponent;
+import net.minecraft.src.Minecraft;
 import net.minecraft.src.GuiControls;
 import net.minecraft.src.GuiNewChat;
 import net.minecraft.src.GuiScreen;
@@ -54,40 +53,31 @@ import com.mumfrey.liteloader.GameLoopListener;
 import com.mumfrey.liteloader.InitCompleteListener;
 import com.mumfrey.liteloader.LiteMod;
 import com.mumfrey.liteloader.LoginListener;
+import com.mumfrey.liteloader.Permissible;
 import com.mumfrey.liteloader.PluginChannelListener;
 import com.mumfrey.liteloader.PostRenderListener;
 import com.mumfrey.liteloader.PreLoginListener;
 import com.mumfrey.liteloader.RenderListener;
 import com.mumfrey.liteloader.Tickable;
 import com.mumfrey.liteloader.gui.GuiControlsPaginated;
+import com.mumfrey.liteloader.permissions.PermissionsManagerClient;
 import com.mumfrey.liteloader.util.ModUtilities;
 import com.mumfrey.liteloader.util.PrivateFields;
 /**
- * LiteLoader is a simple loader which loads and provides useful callbacks to lightweight mods 
- *
+ * LiteLoader is a simple loader which loads and provides useful callbacks to
+ * lightweight mods
+ * 
  * @author Adam Mummery-Smith
- * @version 1.5.2
+ * @version 1.6.2
  */
 @SuppressWarnings("rawtypes")
 public final class LiteLoader implements FilenameFilter, IPlayerUsage
 {
 	/**
-	 * Liteloader version 
+	 * Liteloader version
 	 */
-	private static final String LOADER_VERSION = "1.5.2";
-	
-	/**
-	 * Loader revision, can be used by mods to determine whether the loader is sufficiently up-to-date 
-	 */
-	private static final int LOADER_REVISION = 9;
-	
-	/**
-	 * Minecraft versions that we will load mods for, this will be compared
-	 * against the version.txt value in mod files to prevent outdated mods being
-	 * loaded!!!
-	 */
-	private static final String[] SUPPORTED_VERSIONS = { "1.5.2", "1.5.r1" };
+	private static final LiteLoaderVersion VERSION = LiteLoaderVersion.MC_1_6_2_R0;
 	/**
 	 * Maximum recursion depth for mod discovery
@@ -110,11 +100,42 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	private static boolean useStdOut = false;
 	/**
-	 * "mods" folder which contains mods and config files
+	 * Game dir from launcher
+	 */
+	private static File gameDirectory;
+	
+	/**
+	 * Assets dir from launcher
+	 */
+	private static File assetsDirectory;
+	
+	/**
+	 * Profile name from launcher
+	 */
+	private static String profile = "";
+	
+	/**
+	 * Mods folder which contains mods and legacy config files
 	 */
 	private File modsFolder;
 	/**
+	 * Base config folder which contains LiteLoader config files and versioned
+	 * subfolders
+	 */
+	private File configBaseFolder;
+	
+	/**
+	 * Folder containing version-independent configuration
+	 */
+	private File commonConfigFolder;
+	
+	/**
+	 * Folder containing version-specific configuration
+	 */
+	private File versionConfigFolder;
+	
+	/**
 	 * Reference to the Minecraft game instance
 	 */
 	private Minecraft minecraft = Minecraft.getMinecraft();
@@ -122,25 +143,27 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	/**
 	 * File containing the properties
 	 */
-	private File propertiesFile = new File(Minecraft.getMinecraftDir(), "liteloader.properties");
-
+	private File propertiesFile;
+	
 	/**
 	 * Internal properties loaded from inside the jar
 	 */
 	private Properties internalProperties = new Properties();
-
+	
 	/**
-	 * LiteLoader properties 
+	 * LiteLoader properties
 	 */
 	private Properties localProperties = new Properties();
 	/**
-	 * Pack brand from properties, used to put the modpack/compilation name in crash reports
+	 * Pack brand from properties, used to put the modpack/compilation name in
+	 * crash reports
 	 */
 	private String branding = null;
 	/**
-	 * Setting value, if true we will swap out the MC "Controls" GUI for our custom, paginated one 
+	 * Setting value, if true we will swap out the MC "Controls" GUI for our
+	 * custom, paginated one
 	 */
 	private boolean paginateControls = true;
@@ -148,7 +171,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 * Reference to the minecraft timer
 	 */
 	private Timer minecraftTimer;
-
+	
 	/**
 	 * List of loaded mods, for crash reporting
 	 */
@@ -166,7 +189,8 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	private LinkedList<Tickable> tickListeners = new LinkedList<Tickable>();
 	/**
-	 * List of mods which implement the GameLoopListener interface and will receive loop events
+	 * List of mods which implement the GameLoopListener interface and will
+	 * receive loop events
 	 */
 	private LinkedList<GameLoopListener> loopListeners = new LinkedList<GameLoopListener>();
@@ -176,18 +200,20 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	private LinkedList<InitCompleteListener> initListeners = new LinkedList<InitCompleteListener>();
 	/**
-	 * List of mods which implement RenderListener interface and will receive render events
-	 * events
+	 * List of mods which implement RenderListener interface and will receive
+	 * render events events
 	 */
 	private LinkedList<RenderListener> renderListeners = new LinkedList<RenderListener>();
 	/**
-	 * List of mods which implement the PostRenderListener interface and want to render entities
+	 * List of mods which implement the PostRenderListener interface and want to
+	 * render entities
 	 */
 	private LinkedList<PostRenderListener> postRenderListeners = new LinkedList<PostRenderListener>();
 	/**
-	 * List of mods which implement ChatRenderListener and want to know when chat is rendered
+	 * List of mods which implement ChatRenderListener and want to know when
+	 * chat is rendered
 	 */
 	private LinkedList<ChatRenderListener> chatRenderListeners = new LinkedList<ChatRenderListener>();
@@ -204,12 +230,14 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	private LinkedList<ChatFilter> chatFilters = new LinkedList<ChatFilter>();
 	/**
-	 * List of mods which implement LoginListener interface and will receive client login events
+	 * List of mods which implement LoginListener interface and will receive
+	 * client login events
 	 */
 	private LinkedList<LoginListener> loginListeners = new LinkedList<LoginListener>();
 	/**
-	 * List of mods which implement LoginListener interface and will receive client login events
+	 * List of mods which implement LoginListener interface and will receive
+	 * client login events
 	 */
 	private LinkedList<PreLoginListener> preLoginListeners = new LinkedList<PreLoginListener>();
@@ -217,11 +245,11 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 * List of mods which implement PluginChannelListener interface
 	 */
 	private LinkedList<PluginChannelListener> pluginChannelListeners = new LinkedList<PluginChannelListener>();
-
+	
 	/**
-	 * Mapping of plugin channel names to listeners 
+	 * Mapping of plugin channel names to listeners
 	 */
-	private HashMap<String,LinkedList<PluginChannelListener>> pluginChannels = new HashMap<String, LinkedList<PluginChannelListener>>();
+	private HashMap<String, LinkedList<PluginChannelListener>> pluginChannels = new HashMap<String, LinkedList<PluginChannelListener>>();
 	/**
 	 * Reference to the addUrl method on URLClassLoader
@@ -232,37 +260,50 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 * Flag which keeps track of whether late initialisation has been done
 	 */
 	private boolean loaderStartupDone, loaderStartupComplete, lateInitDone;
-
+	
 	/**
 	 * Flags which keep track of whether hooks have been applied
 	 */
 	private boolean chatHooked, loginHooked, pluginChannelHooked, tickHooked;
-
+	
 	/**
 	 * Profiler hook objects
 	 */
 	private HookProfiler profilerHook = new HookProfiler(this, logger);
-
+	
 	/**
 	 * ScaledResolution used by the pre-chat and post-chat render callbacks
 	 */
 	private ScaledResolution currentResolution;
 	/**
-	 * Get the singleton instance of LiteLoader, initialises the loader if necessary
-	 * 
-	 * @return LiteLoader instance
+	 * Permission Manager
 	 */
-	public static final LiteLoader getInstance()
+	private static PermissionsManagerClient permissionsManager = PermissionsManagerClient.getInstance();
+	
+	public static final void init(File gameDirectory, File assetsDirectory, String profile)
 	{
 		if (instance == null)
 		{
-			// Return immediately to stop calls to getInstance causing re-init if they arrive
-			// before init is completed
+			LiteLoader.gameDirectory = gameDirectory;
+			LiteLoader.assetsDirectory = assetsDirectory;
+			LiteLoader.profile = profile;
+			
 			instance = new LiteLoader();
 			instance.initLoader();
 		}
+	}
+	
+	/**
+	 * Get the singleton instance of LiteLoader, initialises the loader if
+	 * necessary
+	 * 
+	 * @param locationProvider
+	 * @return LiteLoader instance
+	 */
+	public static final LiteLoader getInstance()
+	{
 		return instance;
 	}
@@ -293,7 +334,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 */
 	public static final String getVersion()
 	{
-		return LOADER_VERSION;
+		return VERSION.getLoaderVersion();
 	}
 	/**
@@ -303,7 +344,12 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 */
 	public static final int getRevision()
 	{
-		return LOADER_REVISION;
+		return VERSION.getLoaderRevision();
+	}
+	
+	public static final PermissionsManagerClient getPermissionsManager()
+	{
+		return permissionsManager;
 	}
 	/**
@@ -311,20 +357,59 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 */
 	private LiteLoader()
 	{
+		this.initPaths();
+	}
+	
+	/**
+	 * Set up paths used by the loader
+	 */
+	private void initPaths()
+	{
+		this.modsFolder = new File(LiteLoader.gameDirectory, "mods");
+		this.configBaseFolder = new File(LiteLoader.gameDirectory, "liteconfig");
+		
+		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();
+		
+		this.propertiesFile = new File(this.configBaseFolder, "liteloader.properties");
+	}
+	
+	/**
+	 * @param version
+	 * @return
+	 */
+	protected File inflectVersionedConfigPath(LiteLoaderVersion version)
+	{
+		if (version.equals(LiteLoaderVersion.LEGACY))
+		{
+			return this.modsFolder;
+		}
+		
+		return new File(this.configBaseFolder, String.format("config.%s", version.getLoaderVersion()));
 	}
+	/**
+	 * Loader initialisation
+	 */
 	private void initLoader()
 	{
-		if (this.loaderStartupDone) return;
+		if (this.loaderStartupDone)
+			return;
 		this.loaderStartupDone = true;
-		// Set up base class overrides
-		this.prepareClassOverrides();
-		
 		// Set up loader, initialises any reflection methods needed
 		if (this.prepareLoader())
 		{
-			logger.info(String.format("LiteLoader %s starting up...", LOADER_VERSION));
+			logger.info(String.format("LiteLoader %s starting up...", VERSION));
 			// Print the branding version if any was provided
 			if (this.branding != null)
@@ -334,23 +419,23 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 			logger.info(String.format("Java reports OS=\"%s\"", System.getProperty("os.name").toLowerCase()));
-			boolean searchMods             = this.localProperties.getProperty("search.mods",      "true").equalsIgnoreCase("true");
-			boolean searchProtectionDomain = this.localProperties.getProperty("search.jar",       "true").equalsIgnoreCase("true");
-			boolean searchClassPath        = this.localProperties.getProperty("search.classpath", "true").equalsIgnoreCase("true");
+			boolean searchMods = this.localProperties.getProperty("search.mods", "true").equalsIgnoreCase("true");
+			boolean searchProtectionDomain = this.localProperties.getProperty("search.jar", "true").equalsIgnoreCase("true");
+			boolean searchClassPath = this.localProperties.getProperty("search.classpath", "true").equalsIgnoreCase("true");
 			if (!searchMods && !searchProtectionDomain && !searchClassPath)
 			{
 				logger.warning("Invalid configuration, no search locations defined. Enabling all search locations.");
-				this.localProperties.setProperty("search.mods",      "true");
-				this.localProperties.setProperty("search.jar",       "true");
+				this.localProperties.setProperty("search.mods", "true");
+				this.localProperties.setProperty("search.jar", "true");
 				this.localProperties.setProperty("search.classpath", "true");
-				searchMods             = true;
+				searchMods = true;
 				searchProtectionDomain = true;
-				searchClassPath        = true;
+				searchClassPath = true;
 			}
-	
+			
 			// Examines the class path and mods folder and locates loadable mods
 			this.prepareMods(searchMods, searchProtectionDomain, searchClassPath);
@@ -367,64 +452,13 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	}
 	/**
-	 * Do dirty non-base-clean overrides
-	 */
-	private void prepareClassOverrides()
-	{
-		this.registerBaseClassOverride(ModUtilities.getObfuscatedFieldName("net.minecraft.src.CallableJVMFlags", "h", "h"), "h");
-	}
-	
-	/**
-	 * Reads a base class overrride from a resource file
-	 * 
-	 * @param binaryClassName
-	 * @param fileName
-	 */
-	private void registerBaseClassOverride(String binaryClassName, String fileName)
-	{
-		try
-		{
-			Method mDefineClass = ClassLoader.class.getDeclaredMethod("defineClass", String.class, byte[].class, int.class, int.class); 
-			mDefineClass.setAccessible(true);
-			
-			InputStream resourceInputStream = LiteLoader.class.getResourceAsStream("/classes/" + fileName + ".bin");
-			
-			if (resourceInputStream != null)
-			{
-				ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-				
-				for (int readBytes = resourceInputStream.read(); readBytes >= 0; readBytes = resourceInputStream.read())
-				{
-					outputStream.write(readBytes);
-				}
-			
-				byte[] data = outputStream.toByteArray();
-
-				outputStream.close();
-				resourceInputStream.close();
-
-				logger.info("Defining class override for " + binaryClassName);
-				mDefineClass.invoke(Minecraft.class.getClassLoader(), binaryClassName, data, 0, data.length);
-			}
-			else
-			{
-				logger.info("Error defining class override for " + binaryClassName + ", file not found");
-			}
-		}
-		catch (Throwable th)
-		{
-			logger.log(Level.WARNING, "Error defining class override for " + binaryClassName, th);
-		}
-	}
-	
-	/**
 	 * Set up reflection methods required by the loader
 	 */
 	private boolean prepareLoader()
 	{
 		try
 		{
-			// addURL method is used by the class loader to 
+			// addURL method is used by the class loader to
 			this.mAddUrl = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
 			this.mAddUrl.setAccessible(true);
@@ -438,7 +472,8 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 			this.localProperties.setProperty("controls.pages", String.valueOf(this.paginateControls));
 			this.branding = this.internalProperties.getProperty("brand", null);
-			if (this.branding != null && this.branding.length() < 1) this.branding = null;
+			if (this.branding != null && this.branding.length() < 1)
+				this.branding = null;
 			// Save appropriate branding in the local properties file
 			if (this.branding != null)
@@ -455,7 +490,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		return true;
 	}
-
+	
 	/**
 	 * @throws SecurityException
 	 * @throws IOException
@@ -471,7 +506,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		consoleHandler.setFormatter(logFormatter);
 		logger.addHandler(consoleHandler);
-		FileHandler logFileHandler = new FileHandler(new File(Minecraft.getMinecraftDir(), "LiteLoader.txt").getAbsolutePath());
+		FileHandler logFileHandler = new FileHandler(new File(this.configBaseFolder, "LiteLoader.txt").getAbsolutePath());
 		logFileHandler.setFormatter(logFormatter);
 		logger.addHandler(logFileHandler);
 	}
@@ -495,7 +530,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		{
 			this.internalProperties = new Properties();
 		}
-
+		
 		try
 		{
 			this.localProperties = new Properties(this.internalProperties);
@@ -514,10 +549,11 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	}
 	/**
-	 * Get the properties stream either from the jar or from the properties file in the minecraft folder
+	 * Get the properties stream either from the jar or from the properties file
+	 * in the minecraft folder
 	 * 
 	 * @return
-	 * @throws FileNotFoundException 
+	 * @throws FileNotFoundException
 	 */
 	private InputStream getLocalPropertiesStream() throws FileNotFoundException
 	{
@@ -525,7 +561,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		{
 			return new FileInputStream(this.propertiesFile);
 		}
-
+		
 		// Otherwise read settings from the config
 		return LiteLoader.class.getResourceAsStream("/liteloader.properties");
 	}
@@ -537,38 +573,63 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	{
 		try
 		{
-			this.localProperties.store(new FileWriter(this.propertiesFile), String.format("Properties for LiteLoader %s", LOADER_VERSION));
+			this.localProperties.store(new FileWriter(this.propertiesFile), String.format("Properties for LiteLoader %s", VERSION));
 		}
 		catch (Throwable th)
 		{
 			logger.log(Level.WARNING, "Error writing liteloader properties", th);
 		}
 	}
-
+	
 	/**
 	 * Get the "mods" folder
 	 */
 	public File getModsFolder()
 	{
-		if (this.modsFolder == null)
-		{
-			this.modsFolder = new File(Minecraft.getMinecraftDir(), "mods");
-			
-			if (!this.modsFolder.exists() || !this.modsFolder.isDirectory())
-			{
-				try
-				{
-					// Attempt to create the "mods" folder if it does not already exist
-					this.modsFolder.mkdirs();
-				}
-				catch (Exception ex) {}
-			}
-		}
-		
 		return this.modsFolder;
 	}
 	/**
+	 * Get the common (version-independent) config folder
+	 */
+	public File getCommonConfigFolder()
+	{
+		return this.commonConfigFolder;
+	}
+	
+	/**
+	 * Get the config folder for this version
+	 */
+	public File getConfigFolder()
+	{
+		return this.versionConfigFolder;
+	}
+	
+	/**
+	 * @return
+	 */
+	public static File getGameDirectory()
+	{
+		return LiteLoader.gameDirectory;
+	}
+	
+	/**
+	 * @return
+	 */
+	public static File getAssetsDirectory()
+	{
+		return LiteLoader.assetsDirectory;
+	}
+	
+	/**
+	 * @return
+	 */
+	public static String getProfile()
+	{
+		return LiteLoader.profile;
+	}
+	
+	/**
 	 * Used for crash reporting
 	 * 
 	 * @return List of loaded mods as a string
@@ -589,9 +650,58 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	}
 	/**
+	 * Used by the version upgrade code, gets a version of the mod name suitable
+	 * for inclusion in the properties file
+	 * 
+	 * @param modName
+	 * @return
+	 */
+	private String getModNameForConfig(Class<? extends LiteMod> modClass, String modName)
+	{
+		if (modName == null || modName.isEmpty())
+		{
+			modName = modClass.getSimpleName().toLowerCase();
+		}
+		
+		return String.format("version.%s", modName.toLowerCase().replaceAll("[^a-z0-9_\\-\\.]", ""));
+	}
+	
+	/**
+	 * Store current revision for mod in the config file
+	 * 
+	 * @param modKey
+	 */
+	private void storeLastKnownModRevision(String modKey)
+	{
+		if (this.localProperties != null)
+		{
+			this.localProperties.setProperty(modKey, String.valueOf(LiteLoader.VERSION.getLoaderRevision()));
+			this.writeProperties();
+		}
+	}
+	
+	/**
+	 * Get last know revision for mod from the config file 
+	 * 
+	 * @param modKey
+	 * @return
+	 */
+	private int getLastKnownModRevision(String modKey)
+	{
+		if (this.localProperties != null)
+		{
+			String storedRevision = this.localProperties.getProperty(modKey, "0");
+			return Integer.parseInt(storedRevision);
+		}
+		
+		return 0;
+	}
+	
+	/**
 	 * Get a reference to a loaded mod, if the mod exists
 	 * 
-	 * @param modName Mod's name or class name
+	 * @param modName
+	 *            Mod's name or class name
 	 * @return
 	 * @throws InvalidActivityException
 	 */
@@ -607,17 +717,19 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		{
 			throw new IllegalArgumentException("Attempted to get a reference to a mod without specifying a mod name");
 		}
-			
+		
 		for (LiteMod mod : this.mods)
 		{
-			if (modName.equalsIgnoreCase(mod.getName()) || modName.equalsIgnoreCase(mod.getClass().getSimpleName())) return (T)mod;
+			if (modName.equalsIgnoreCase(mod.getName()) || modName.equalsIgnoreCase(mod.getClass().getSimpleName()))
+				return (T)mod;
 		}
 		return null;
 	}
 	/**
-	 * Enumerate the java class path and "mods" folder to find mod classes, then load the classes
+	 * 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)
 	{
@@ -635,13 +747,13 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 				logger.info("Found " + modFiles.size() + " mod file(s)");
 			}
 		}
-
+		
 		// Find and enumerate classes on the class path
 		HashMap<String, Class> modsToLoad = null;
 		try
 		{
 			logger.info("Enumerating class path...");
-
+			
 			String classPath = System.getProperty("java.class.path");
 			String classPathSeparator = System.getProperty("path.separator");
 			String[] classPathEntries = classPath.split(classPathSeparator);
@@ -649,9 +761,10 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 			logger.info(String.format("Class path separator=\"%s\"", classPathSeparator));
 			logger.info(String.format("Class path entries=(\n   classpathEntry=%s\n)", classPath.replace(classPathSeparator, "\n   classpathEntry=")));
-			if (searchProtectionDomain || searchClassPath) logger.info("Discovering mods on class path...");
+			if (searchProtectionDomain || searchClassPath)
+				logger.info("Discovering mods on class path...");
 			modsToLoad = this.findModClasses(classPathEntries, modFiles, searchProtectionDomain, searchClassPath);
-
+			
 			logger.info("Mod class discovery completed");
 		}
 		catch (Throwable th)
@@ -666,13 +779,13 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	/**
 	 * 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)
 	{
-		List<String> supportedVerions = Arrays.asList(SUPPORTED_VERSIONS);
-		
 		for (File modFile : modFolder.listFiles(this))
 		{
 			try
@@ -689,14 +802,15 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 					String strVersion = versionReader.readLine();
 					versionReader.close();
-					// Only add the mod if the version matches and we were able to successfully add it to the class path
-					if (supportedVerions.contains(strVersion) && this.addURLToClassPath(modFile.toURI().toURL()))
+					// 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()))
 					{
 						modFiles.add(modFile);
 					}
 					else
 					{
-						logger.info("Not adding invalid or outdated mod file: " +  modFile.getAbsolutePath());
+						logger.info("Not adding invalid or outdated mod file: " + modFile.getAbsolutePath());
 					}
 				}
@@ -709,7 +823,9 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		}
 	}
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see java.io.FilenameFilter#accept(java.io.File, java.lang.String)
 	 */
 	@Override
@@ -721,15 +837,18 @@ 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
+	 * @param classPathEntries
+	 *            Java class path split into string entries
 	 * @return map of classes to load
 	 */
 	private HashMap<String, Class> findModClasses(String[] classPathEntries, LinkedList<File> 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
+		// 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
@@ -745,12 +864,13 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 					{
 						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 
+					// 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)
@@ -774,7 +894,8 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 						modsToLoad.put(mod.getSimpleName(), mod);
 					}
-					if (modClasses.size() > 0) logger.info(String.format("Found %s potential matches", modClasses.size()));
+					if (modClasses.size() > 0)
+						logger.info(String.format("Found %s potential matches", modClasses.size()));
 				}
 			}
 			catch (Throwable th)
@@ -782,7 +903,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 				logger.warning("Error loading from local class path: " + th.getMessage());
 			}
 		}
-
+		
 		if (searchClassPath)
 		{
 			// Search through the class path and find mod classes
@@ -803,7 +924,8 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 					modsToLoad.put(mod.getSimpleName(), mod);
 				}
-				if (modClasses.size() > 0) logger.info(String.format("Found %s potential matches", modClasses.size()));
+				if (modClasses.size() > 0)
+					logger.info(String.format("Found %s potential matches", modClasses.size()));
 			}
 		}
@@ -823,8 +945,9 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 				modsToLoad.put(mod.getSimpleName(), mod);
 			}
-
-			if (modClasses.size() > 0) logger.info(String.format("Found %s potential matches", modClasses.size()));
+			
+			if (modClasses.size() > 0)
+				logger.info(String.format("Found %s potential matches", modClasses.size()));
 		}
 		return modsToLoad;
@@ -833,7 +956,8 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	/**
 	 * 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)
 	{
@@ -880,7 +1004,26 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 			{
 				logger.info("Initialising mod " + mod.getName() + " version " + mod.getVersion());
-				mod.init();
+				try
+				{
+					String modKey = this.getModNameForConfig(mod.getClass(), mod.getName());
+					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 + "...");
+						mod.upgradeSettings(LiteLoader.getVersion(), this.versionConfigFolder, this.inflectVersionedConfigPath(lastModVersion));
+						
+						this.storeLastKnownModRevision(modKey);
+						logger.info("Config upgrade succeeded for mod " + mod.getName());
+					}
+				}
+				catch (Throwable th)
+				{
+					logger.warning("Error performing settings upgrade for " + mod.getName() + ". Settings may not be properly migrated");
+				}
+				
+				mod.init(this.modsFolder);
 				if (mod instanceof Tickable)
 				{
@@ -891,7 +1034,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 				{
 					this.addLoopListener((GameLoopListener)mod);
 				}
-
+				
 				if (mod instanceof InitCompleteListener)
 				{
 					this.addInitListener((InitCompleteListener)mod);
@@ -944,6 +1087,11 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 					this.addPluginChannelListener((PluginChannelListener)mod);
 				}
+				if (mod instanceof Permissible)
+				{
+					permissionsManager.registerPermissible((Permissible)mod);
+				}
+				
 				this.loadedModsList += String.format("\n          - %s version %s", mod.getName(), mod.getVersion());
 				loadedModsCount++;
 			}
@@ -956,7 +1104,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		this.loadedModsList = String.format("%s loaded mod(s)%s", loadedModsCount, this.loadedModsList);
 	}
-
+	
 	/**
 	 * Initialise mod hooks
 	 */
@@ -1005,7 +1153,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 			ex.printStackTrace();
 		}
 	}
-
+	
 	/**
 	 * @param tickable
 	 */
@@ -1014,7 +1162,8 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		if (!this.tickListeners.contains(tickable))
 		{
 			this.tickListeners.add(tickable);
-			if (this.loaderStartupComplete) this.initHooks();
+			if (this.loaderStartupComplete)
+				this.initHooks();
 		}
 	}
@@ -1026,7 +1175,8 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		if (!this.loopListeners.contains(loopListener))
 		{
 			this.loopListeners.add(loopListener);
-			if (this.loaderStartupComplete) this.initHooks();
+			if (this.loaderStartupComplete)
+				this.initHooks();
 		}
 	}
@@ -1038,10 +1188,11 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		if (!this.initListeners.contains(initCompleteListener))
 		{
 			this.initListeners.add(initCompleteListener);
-			if (this.loaderStartupComplete) this.initHooks();
+			if (this.loaderStartupComplete)
+				this.initHooks();
 		}
 	}
-
+	
 	/**
 	 * @param tickable
 	 */
@@ -1050,10 +1201,11 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		if (!this.renderListeners.contains(tickable))
 		{
 			this.renderListeners.add(tickable);
-			if (this.loaderStartupComplete) this.initHooks();
+			if (this.loaderStartupComplete)
+				this.initHooks();
 		}
 	}
-
+	
 	/**
 	 * @param tickable
 	 */
@@ -1062,10 +1214,11 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		if (!this.postRenderListeners.contains(tickable))
 		{
 			this.postRenderListeners.add(tickable);
-			if (this.loaderStartupComplete) this.initHooks();
+			if (this.loaderStartupComplete)
+				this.initHooks();
 		}
 	}
-
+	
 	/**
 	 * @param chatFilter
 	 */
@@ -1074,10 +1227,11 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		if (!this.chatFilters.contains(chatFilter))
 		{
 			this.chatFilters.add(chatFilter);
-			if (this.loaderStartupComplete) this.initHooks();
+			if (this.loaderStartupComplete)
+				this.initHooks();
 		}
 	}
-
+	
 	/**
 	 * @param chatListener
 	 */
@@ -1086,7 +1240,8 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		if (!this.chatListeners.contains(chatListener))
 		{
 			this.chatListeners.add(chatListener);
-			if (this.loaderStartupComplete) this.initHooks();
+			if (this.loaderStartupComplete)
+				this.initHooks();
 		}
 	}
@@ -1098,10 +1253,11 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		if (!this.chatRenderListeners.contains(chatRenderListener))
 		{
 			this.chatRenderListeners.add(chatRenderListener);
-			if (this.loaderStartupComplete) this.initHooks();
+			if (this.loaderStartupComplete)
+				this.initHooks();
 		}
 	}
-
+	
 	/**
 	 * @param loginListener
 	 */
@@ -1110,10 +1266,11 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		if (!this.preLoginListeners.contains(loginListener))
 		{
 			this.preLoginListeners.add(loginListener);
-			if (this.loaderStartupComplete) this.initHooks();
+			if (this.loaderStartupComplete)
+				this.initHooks();
 		}
 	}
-
+	
 	/**
 	 * @param loginListener
 	 */
@@ -1122,10 +1279,11 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		if (!this.loginListeners.contains(loginListener))
 		{
 			this.loginListeners.add(loginListener);
-			if (this.loaderStartupComplete) this.initHooks();
+			if (this.loaderStartupComplete)
+				this.initHooks();
 		}
 	}
-
+	
 	/**
 	 * @param pluginChannelListener
 	 */
@@ -1134,10 +1292,11 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		if (!this.pluginChannelListeners.contains(pluginChannelListener))
 		{
 			this.pluginChannelListeners.add(pluginChannelListener);
-			if (this.loaderStartupComplete) this.initHooks();
+			if (this.loaderStartupComplete)
+				this.initHooks();
 		}
 	}
-
+	
 	/**
 	 * Enumerate classes on the classpath which are subclasses of the specified
 	 * class
@@ -1235,7 +1394,8 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	private static void enumerateDirectory(String prefix, Class superClass, ClassLoader classloader, LinkedList<Class> classes, File packagePath, String packageName, int depth)
 	{
 		// Prevent crash due to broken recursion
-		if (depth > MAX_DISCOVERY_DEPTH) return;
+		if (depth > MAX_DISCOVERY_DEPTH)
+			return;
 		File[] classFiles = packagePath.listFiles();
@@ -1287,7 +1447,8 @@ 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)
 	{
@@ -1307,7 +1468,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		return false;
 	}
-
+	
 	/**
 	 * Late initialisation callback
 	 */
@@ -1331,7 +1492,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 			}
 		}
 	}
-
+	
 	/**
 	 * Callback from the tick hook, pre render
 	 */
@@ -1345,31 +1506,33 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 				GuiScreen parentScreen = PrivateFields.guiControlsParentScreen.get((GuiControls)this.minecraft.currentScreen);
 				this.minecraft.displayGuiScreen(new GuiControlsPaginated(parentScreen, this.minecraft.gameSettings));
 			}
-			catch (Exception ex) { }
+			catch (Exception ex)
+			{
+			}
 		}
 		for (RenderListener renderListener : this.renderListeners)
 			renderListener.onRender();
 	}
-
+	
 	/**
 	 * Callback from the tick hook, post render entities
 	 */
 	public void postRenderEntities()
 	{
 		float partialTicks = (this.minecraftTimer != null) ? this.minecraftTimer.elapsedPartialTicks : 0.0F;
-
+		
 		for (PostRenderListener renderListener : this.postRenderListeners)
 			renderListener.onPostRenderEntities(partialTicks);
 	}
-
+	
 	/**
 	 * Callback from the tick hook, post render
 	 */
 	public void postRender()
 	{
 		float partialTicks = (this.minecraftTimer != null) ? this.minecraftTimer.elapsedPartialTicks : 0.0F;
-
+		
 		for (PostRenderListener renderListener : this.postRenderListeners)
 			renderListener.onPostRender(partialTicks);
 	}
@@ -1382,7 +1545,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		for (RenderListener renderListener : this.renderListeners)
 			renderListener.onRenderGui(this.minecraft.currentScreen);
 	}
-
+	
 	/**
 	 * Called immediately after the world/camera transform is initialised
 	 */
@@ -1397,64 +1560,70 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 */
 	public void onBeforeChatRender()
 	{
-        this.currentResolution = new ScaledResolution(this.minecraft.gameSettings, this.minecraft.displayWidth, this.minecraft.displayHeight);
-        int screenWidth = this.currentResolution.getScaledWidth();
-        int screenHeight = this.currentResolution.getScaledHeight();
-
-        GuiNewChat chat = this.minecraft.ingameGUI.getChatGUI();
+		this.currentResolution = new ScaledResolution(this.minecraft.gameSettings, this.minecraft.displayWidth, this.minecraft.displayHeight);
+		int screenWidth = this.currentResolution.getScaledWidth();
+		int screenHeight = this.currentResolution.getScaledHeight();
+		
+		GuiNewChat chat = this.minecraft.ingameGUI.getChatGUI();
 		for (ChatRenderListener chatRenderListener : this.chatRenderListeners)
 			chatRenderListener.onPreRenderChat(screenWidth, screenHeight, chat);
 	}
-
+	
 	/**
 	 * Called immediately after the chat log is rendered
 	 */
 	public void onAfterChatRender()
 	{
-        int screenWidth = this.currentResolution.getScaledWidth();
-        int screenHeight = this.currentResolution.getScaledHeight();
-
-        GuiNewChat chat = this.minecraft.ingameGUI.getChatGUI();
+		int screenWidth = this.currentResolution.getScaledWidth();
+		int screenHeight = this.currentResolution.getScaledHeight();
+		
+		GuiNewChat chat = this.minecraft.ingameGUI.getChatGUI();
 		for (ChatRenderListener chatRenderListener : this.chatRenderListeners)
 			chatRenderListener.onPostRenderChat(screenWidth, screenHeight, chat);
 	}
-
+	
 	/**
-	 * Callback from the tick hook, called every frame when the timer is updated 
+	 * Callback from the tick hook, called every frame when the timer is updated
 	 */
 	public void onTimerUpdate()
 	{
 		for (GameLoopListener loopListener : this.loopListeners)
 			loopListener.onRunGameLoop(this.minecraft);
 	}
-
+	
 	/**
 	 * 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)
 	{
 		float partialTicks = 0.0F;
-		// Try to get the minecraft timer object and determine the value of the partialTicks
+		// Try to get the minecraft timer object and determine the value of the
+		// partialTicks
 		if (tick || this.minecraftTimer == null)
 		{
 			this.minecraftTimer = PrivateFields.minecraftTimer.get(this.minecraft);
 		}
-			
+		
 		// Hooray, we got the timer reference
 		if (this.minecraftTimer != null)
 		{
 			partialTicks = this.minecraftTimer.renderPartialTicks;
 			tick = this.minecraftTimer.elapsedTicks > 0;
 		}
-	
+		
 		// Flag indicates whether we are in game at the moment
 		boolean inGame = this.minecraft.renderViewEntity != null && this.minecraft.renderViewEntity.worldObj != null;
+		// Tick the permissions manager
+		if (tick)
+			permissionsManager.onTick(this.minecraft, partialTicks, inGame);
+		
 		// Iterate tickable mods
 		for (Tickable tickable : this.tickListeners)
 		{
@@ -1472,18 +1641,25 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 */
 	public boolean onChat(Packet3Chat chatPacket)
 	{
-		// Chat filters get a stab at the chat first, if any filter returns false the chat is discarded
+		if (chatPacket.message == null)
+			return true;
+		
+		ChatMessageComponent chat = ChatMessageComponent.func_111078_c(chatPacket.message);
+		String message = chat.func_111068_a(true);
+		
+		// Chat filters get a stab at the chat first, if any filter returns
+		// false the chat is discarded
 		for (ChatFilter chatFilter : this.chatFilters)
-			if (!chatFilter.onChat(chatPacket))
+			if (!chatFilter.onChat(chatPacket, chat, message))
 				return false;
 		// Chat listeners get the chat if no filter removed it
 		for (ChatListener chatListener : this.chatListeners)
-			chatListener.onChat(chatPacket.message);
+			chatListener.onChat(chat, message);
 		return true;
 	}
-
+	
 	/**
 	 * Pre-login callback from the login hook
 	 * 
@@ -1511,6 +1687,8 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 */
 	public void onConnectToServer(NetHandler netHandler, Packet1Login loginPacket)
 	{
+		permissionsManager.onLogin(netHandler, loginPacket);
+		
 		for (LoginListener loginListener : this.loginListeners)
 			loginListener.onLogin(netHandler, loginPacket);
@@ -1526,13 +1704,23 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	{
 		if (hookPluginChannels != null && hookPluginChannels.channel != null && this.pluginChannels.containsKey(hookPluginChannels.channel))
 		{
+			try
+			{
+				permissionsManager.onCustomPayload(hookPluginChannels.channel, hookPluginChannels.length, hookPluginChannels.data);
+			}
+			catch (Exception ex)
+			{
+			}
+			
 			for (PluginChannelListener pluginChannelListener : this.pluginChannels.get(hookPluginChannels.channel))
 			{
 				try
 				{
 					pluginChannelListener.onCustomPayload(hookPluginChannels.channel, hookPluginChannels.length, hookPluginChannels.data);
 				}
-				catch (Exception ex) {}
+				catch (Exception ex)
+				{
+				}
 			}
 		}
 	}
@@ -1540,8 +1728,10 @@ 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)
 	{
@@ -1549,35 +1739,22 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	}
 	/**
-	 * Query loaded mods for registered channels 
+	 * Query loaded mods for registered channels
 	 */
 	protected void setupPluginChannels()
 	{
 		// Clear any channels from before
 		this.pluginChannels.clear();
+		// Add the permissions manager channels
+		this.addPluginChannelsFor(permissionsManager);
+		
 		// Enumerate mods for plugin channels
 		for (PluginChannelListener pluginChannelListener : this.pluginChannelListeners)
 		{
-			List<String> channels = pluginChannelListener.getChannels();
-			
-			if (channels != null)
-			{
-				for (String channel : channels)
-				{
-					if (channel.length() > 16 || channel.toUpperCase().equals("REGISTER") || channel.toUpperCase().equals("UNREGISTER"))
-						continue;
-					
-					if (!this.pluginChannels.containsKey(channel))
-					{
-						this.pluginChannels.put(channel, new LinkedList<PluginChannelListener>());
-					}
-					
-					this.pluginChannels.get(channel).add(pluginChannelListener);
-				}
-			}
+			this.addPluginChannelsFor(pluginChannelListener);
 		}
-
+		
 		// If any mods have registered channels, send the REGISTER packet
 		if (this.pluginChannels.keySet().size() > 0)
 		{
@@ -1586,7 +1763,8 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 			for (String channel : this.pluginChannels.keySet())
 			{
-				if (separator) channelList.append("\u0000");
+				if (separator)
+					channelList.append("\u0000");
 				channelList.append(channel);
 				separator = true;
 			}
@@ -1596,18 +1774,53 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 			this.sendPluginChannelMessage("REGISTER", registrationData);
 		}
 	}
-
-	/* (non-Javadoc)
-	 * @see net.minecraft.src.IPlayerUsage#addServerStatsToSnooper(net.minecraft.src.PlayerUsageSnooper)
+	
+	/**
+	 * Adds plugin channels for the specified listener to the local channels
+	 * collection
+	 * 
+	 * @param pluginChannelListener
+	 */
+	private void addPluginChannelsFor(PluginChannelListener pluginChannelListener)
+	{
+		List<String> channels = pluginChannelListener.getChannels();
+		
+		if (channels != null)
+		{
+			for (String channel : channels)
+			{
+				if (channel.length() > 16 || channel.toUpperCase().equals("REGISTER") || channel.toUpperCase().equals("UNREGISTER"))
+					continue;
+				
+				if (!this.pluginChannels.containsKey(channel))
+				{
+					this.pluginChannels.put(channel, new LinkedList<PluginChannelListener>());
+				}
+				
+				this.pluginChannels.get(channel).add(pluginChannelListener);
+			}
+		}
+	}
+	
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * net.minecraft.src.IPlayerUsage#addServerStatsToSnooper(net.minecraft.
+	 * src.PlayerUsageSnooper)
 	 */
 	@Override
 	public void addServerStatsToSnooper(PlayerUsageSnooper var1)
 	{
 		this.minecraft.addServerStatsToSnooper(var1);
 	}
-
-	/* (non-Javadoc)
-	 * @see net.minecraft.src.IPlayerUsage#addServerTypeToSnooper(net.minecraft.src.PlayerUsageSnooper)
+	
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * net.minecraft.src.IPlayerUsage#addServerTypeToSnooper(net.minecraft.src
+	 * .PlayerUsageSnooper)
 	 */
 	@Override
 	public void addServerTypeToSnooper(PlayerUsageSnooper var1)
@@ -1615,8 +1828,10 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		this.sanityCheck();
 		this.minecraft.addServerTypeToSnooper(var1);
 	}
-
-	/* (non-Javadoc)
+	
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see net.minecraft.src.IPlayerUsage#isSnooperEnabled()
 	 */
 	@Override
@@ -1624,8 +1839,10 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	{
 		return this.minecraft.isSnooperEnabled();
 	}
-
-	/* (non-Javadoc)
+	
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see net.minecraft.src.IPlayerUsage#getLogAgent()
 	 */
 	@Override
+package com.mumfrey.liteloader.core;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * LiteLoader version table
+ *
+ * @author Adam Mummery-Smith
+ * @version 1.6.2
+ */
+public enum LiteLoaderVersion
+{
+	LEGACY(0, "-", "-", "-"),
+	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");
+	
+	private int revision;
+	
+	private String minecraftVersion;
+	
+	private String loaderVersion;
+	
+	private Set<String> supportedVersions = new HashSet<String>();
+
+	private LiteLoaderVersion(int revision, String minecraftVersion, String loaderVersion, String... supportedVersions)
+	{
+		this.revision = revision;
+		this.minecraftVersion = minecraftVersion;
+		this.loaderVersion = loaderVersion;
+		
+		for (String supportedVersion : supportedVersions)
+			this.supportedVersions.add(supportedVersion);
+	}
+
+	public int getLoaderRevision()
+	{
+		return this.revision;
+	}
+
+	public String getMinecraftVersion()
+	{
+		return this.minecraftVersion;
+	}
+
+	public String getLoaderVersion()
+	{
+		return this.loaderVersion;
+	}
+	
+	public static LiteLoaderVersion getVersionFromRevision(int revision)
+	{
+		for (LiteLoaderVersion version : LiteLoaderVersion.values())
+		{
+			if (version.getLoaderRevision() == revision)
+				return version;
+		}
+		
+		return LiteLoaderVersion.LEGACY;
+	}
+
+	public boolean isVersionSupported(String version)
+	{
+		return this.supportedVersions.contains(version);
+	}
+	
+	@Override
+	public String toString()
+	{
+		return this == LiteLoaderVersion.LEGACY ? "Unknown" : this.loaderVersion;
+	}
+}
@@ -6,8 +6,8 @@ import net.minecraft.src.GameSettings;
 import net.minecraft.src.GuiButton;
 import net.minecraft.src.GuiScreen;
 import net.minecraft.src.GuiSmallButton;
+import net.minecraft.src.I18n;
 import net.minecraft.src.KeyBinding;
-import net.minecraft.src.StringTranslate;
 /**
  * Extended "Controls" screen with pages
@@ -83,7 +83,6 @@ public class GuiControlsPaginated extends GuiScreen
 	@Override
 	public void initGui()
 	{
-		StringTranslate stringtranslate = StringTranslate.getInstance();
 		this.getLegacyControlList().clear();
 		int oldControlsPerPage = this.controlsPerPage;
@@ -106,17 +105,17 @@ public class GuiControlsPaginated extends GuiScreen
         {
 	        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, stringtranslate.translateKey("gui.done")));
+	        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, stringtranslate.translateKey("gui.done")));
+        	this.getLegacyControlList().add(new GuiButton(200, this.getWidth() / 2 - 100, buttonY, I18n.func_135053_a("gui.done")));
         }
-        this.screenTitle = stringtranslate.translateKey("controls.title");
+        this.screenTitle = I18n.func_135053_a("controls.title");
 	}
 	/**
+package com.mumfrey.liteloader.permissions;
+
+
+public class LocalPermissions implements Permissions
+{
+	@Override
+	public boolean getPermissionSet(String permission)
+	{
+		return true;
+	}
+	
+	@Override
+	public boolean getHasPermission(String permission)
+	{
+		return true;
+	}
+	
+	@Override
+	public boolean getHasPermission(String permission, boolean defaultValue)
+	{
+		return defaultValue;
+	}
+	
+}
+package com.mumfrey.liteloader.permissions;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.mumfrey.liteloader.Permissible;
+
+public class PermissibleAllMods implements Permissible
+{
+	private Set<Permissible> permissibles = new HashSet<Permissible>();
+	
+	public void addPermissible(Permissible permissible)
+	{
+		this.permissibles.add(permissible);
+	}
+	
+	@Override
+	public String getName()
+	{
+		return "All Mods";
+	}
+	
+	@Override
+	public String getVersion()
+	{
+		return "0.0";
+	}
+	
+	@Override
+	public void init(File configPath)
+	{
+	}
+
+	@Override
+	public void upgradeSettings(String version, File configPath, File oldConfigPath)
+	{
+	}
+
+	@Override
+	public String getPermissibleModName()
+	{
+		return "all";
+	}
+	
+	@Override
+	public float getPermissibleModVersion()
+	{
+		return 0.0F;
+	}
+	
+	@Override
+	public void registerPermissions(PermissionsManagerClient permissionsManager)
+	{
+	}
+	
+	@Override
+	public void onPermissionsCleared(PermissionsManager manager)
+	{
+		for (Permissible permissible : this.permissibles)
+			permissible.onPermissionsCleared(manager);
+	}
+	
+	@Override
+	public void onPermissionsChanged(PermissionsManager manager)
+	{
+		for (Permissible permissible : this.permissibles)
+			permissible.onPermissionsChanged(manager);
+	}
+}
+package com.mumfrey.liteloader.permissions;
+
+import java.util.Hashtable;
+import java.util.Map;
+
+/**
+ * Class which represents a permission node
+ *
+ * @author Adam Mummery-Smith
+ */
+public class Permission
+{
+	/**
+	 * True if this node is the root of the permission tree 
+	 */
+	private final boolean isRootNode;
+	
+	/**
+	 * True if this node is a wildcard node (can match any query)
+	 */
+	private final boolean isWildcardNode;
+	
+	/**
+	 * Node name
+	 */
+	private final String nodeName;
+	
+	/**
+	 * Nodes which are children of this node
+	 */
+	private final Map<String, Permission> childNodes = new Hashtable<String, Permission>();
+	
+	/**
+	 * Node value 
+	 */
+	private boolean value;
+	
+	/**
+	 * Create a new root node 
+	 */
+	public Permission()
+	{
+		this.isRootNode     = true;
+		this.isWildcardNode = false;
+		this.value          = true;
+		this.nodeName       = "root";
+	}
+	
+	/**
+	 * Create a new child node with the specified name and value
+	 * 
+	 * @param permissionName Name of the permission node
+	 * @param value Initial value for the permission node
+	 */
+	public Permission(String permissionName, boolean value)
+	{
+		this.isRootNode     = false;
+		this.isWildcardNode = permissionName.equals("*");
+		this.value          = value;
+		this.nodeName       = permissionName;
+	}
+	
+	/**
+	 * Create a new child node with the specified name
+	 * 
+	 * @param permissionName Name of the permission node
+	 */
+	public Permission(String permissionName)
+	{
+		this(permissionName, true);
+	}
+	
+	/**
+	 * Get whether this node is a root node (read only)
+	 * 
+	 * @return
+	 */
+	public boolean isRoot()
+	{
+		return this.isRootNode;
+	}
+	
+	/**
+	 * Get whether this node is a wildcard node 
+	 * 
+	 * @return
+	 */
+	public boolean isWildcard()
+	{
+		return this.isWildcardNode;
+	}
+	
+	/**
+	 * Get the name of this permission node
+	 * 
+	 * @return
+	 */
+	public String getName()
+	{
+		return this.nodeName;
+	}
+	
+	/**
+	 * Get the value of this permission node
+	 * 
+	 * @return
+	 */
+	public boolean getValue()
+	{
+		return this.value;
+	}
+	
+	/**
+	 * Set the value of this permission node
+	 * 
+	 * @param newValue
+	 */
+	public void setValue(boolean newValue)
+	{
+		this.value = newValue;
+	}
+	
+	/**
+	 * Get the specified node name
+	 * 
+	 * @param name
+	 * @return
+	 */
+	public Permission getPermission(String name)
+	{
+		Permission fallback = (this.isWildcardNode) ? this : null;
+		
+		if (name.indexOf('.') > -1)
+		{
+			String head = name.substring(0, name.indexOf('.'));
+			String tail = name.substring(name.indexOf('.') + 1);
+			
+			Permission child = this.getPermission(head);
+			
+			if (child != null)
+			{
+				return child.getPermission(tail);
+			}
+		}
+		else if (this.childNodes.containsKey(name))
+		{
+			return this.childNodes.get(name);
+		}
+
+		for (Permission childPermission : this.childNodes.values())
+		{
+			if (childPermission.isWildcard())
+			{
+				return childPermission;
+			}
+		}
+
+		return fallback;
+	}
+	
+	/**
+	 * Set the specified node name
+	 * 
+	 * @param name
+	 * @return
+	 */
+	public Permission setPermission(String name)
+	{
+		return this.setPermission(name, true);
+	}
+
+	/**
+	 * Set the specified permission to the specified value
+	 * 
+	 * @param name
+	 * @param value
+	 * @return
+	 */
+	public Permission setPermission(String name, boolean value)
+	{
+		if (name.indexOf('.') > -1)
+		{
+			String head = name.substring(0, name.indexOf('.'));
+			String tail = name.substring(name.indexOf('.') + 1);
+			
+			Permission child = this.setPermission(head, false);
+			return child.setPermission(tail, value);
+		}
+		
+		Permission child = this.getPermission(name);
+		
+		if (child == null || child.isWildcard())
+		{
+			child = new Permission(name, value);
+			this.childNodes.put(child.getName(), child);
+		}
+		else
+		{
+			child.setValue(value | child.value);
+		}
+		
+		return child;
+	}
+	
+	/**
+	 * Sets a permission and also explicitly sets the permission value, this allows negated permissions to be set
+	 * 
+	 * @param name
+	 * @param value
+	 * @return
+	 */
+	public Permission setPermissionAndValue(String name, boolean value)
+	{
+		Permission permission = this.setPermission(name, value);
+		permission.setValue(value);
+		return permission;
+	}
+	
+	/**
+	 * Check whether the specified permission is set
+	 * 
+	 * @param name
+	 * @param value
+	 * @return
+	 */
+	public boolean isSet(String name, boolean value)
+	{
+		Permission child = this.getPermission(name);
+		return child == null ? value : child.getValue();
+	}
+}
+package com.mumfrey.liteloader.permissions;
+
+/**
+ * Represents a set of permissions assigned by an authority
+ *
+ * @author Adam Mummery-Smith
+ */
+public interface Permissions
+{
+	/**
+	 * Returns true if the specified permission is set in this permission container
+	 * 
+	 * @param permission Name of the permission to test for
+	 * @return True if the permission exists in this set
+	 */
+	public abstract boolean getPermissionSet(String permission);
+
+	/**
+	 * Returns true if the authority says we have this permission or false if the permission is denied or not set
+	 * 
+	 * @param permission Name of the permission to test for
+	 * @return
+	 */
+	public abstract boolean getHasPermission(String permission);
+
+	/**
+	 * Returns true if the authority says we have this permission or if the permission is not specified by the authority returns the default value
+	 * 
+	 * @param permission Name of the permission to test for
+	 * @param defaultValue Value to return if the permission is NOT specified by the authority
+	 * 
+	 * @return State of the authority permission or default value if not specified
+	 */
+	public abstract boolean getHasPermission(String permission, boolean defaultValue);
+}
+package com.mumfrey.liteloader.permissions;
+
+import java.util.List;
+
+import com.mumfrey.liteloader.Permissible;
+
+import net.minecraft.src.Minecraft;
+import net.minecraft.src.NetHandler;
+import net.minecraft.src.Packet1Login;
+
+/**
+ * Interface for permissions manager implementations
+ * 
+ * @author Adam Mummery-Smith
+ */
+public interface PermissionsManager
+{
+	/**
+	 * Get the underlying permissions node for this manager for the specified mod
+	 * 
+	 * @param modName Mod to fetch permissions for
+	 * @return
+	 */
+	public abstract Permissions getPermissions(Permissible mod);
+	
+	/**
+	 * Get the time the permissions for the specified mod were last updated
+	 * 
+	 * @param mod Mod to check for
+	 * @return Timestamp when the permissions were last updated
+	 */
+	public abstract Long getPermissionUpdateTime(Permissible mod);
+	
+	/**
+	 * Handler for login event, should be called when connecting to a new server. Clears the replicated
+	 * permissions ready to receive new permissions from the server
+	 * 
+	 * @param netHandler
+	 * @param loginPacket
+	 */
+	public abstract void onLogin(NetHandler netHandler, Packet1Login loginPacket);
+
+	/**
+	 * Handler for tick event
+	 * 
+	 * @param minecraft
+	 * @param partialTicks
+	 * @param inGame
+	 */
+	public abstract void onTick(Minecraft minecraft, float partialTicks, boolean inGame);
+
+	/**
+	 * Handler for custom payload
+	 * 
+	 * @param channel
+	 * @param length
+	 * @param data
+	 */
+	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();
+    
+	/**
+	 * Register a new event listener, the registered object will receive callbacks for permissions events
+	 * 
+	 * @param permissible
+	 */
+	public abstract void registerPermissible(Permissible permissible);
+	
+	/**
+	 * Perform any necessary validation to check for a tamper condition, can and should be called from as
+	 * many places as possible 
+	 */
+	public abstract void tamperCheck();
+}
+package com.mumfrey.liteloader.permissions;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import net.eq2online.permissions.ReplicatedPermissionsContainer;
+import net.minecraft.src.Minecraft;
+import net.minecraft.src.NetHandler;
+import net.minecraft.src.Packet1Login;
+
+import com.mumfrey.liteloader.Permissible;
+import com.mumfrey.liteloader.PluginChannelListener;
+import com.mumfrey.liteloader.util.ModUtilities;
+
+/**
+ * This class manages permissions on the client, it is a singleton class which can manage permissions for multiple 
+ * client mods. It manages the client/server communication used to replicate permissions and serves as a hub for
+ * permissions objects which keep track of the permissions available on the client
+ * 
+ * @author Adam Mummery-Smith
+ */
+public class PermissionsManagerClient implements PermissionsManager, PluginChannelListener
+{
+	/**
+	 * Singleton instance of the client permissions manager 
+	 */
+	private static PermissionsManagerClient instance;
+	
+	/**
+	 * Permissions permissible which is a proxy for permissions that are common to all mods
+	 */
+	private static Permissible allMods = new PermissibleAllMods();
+	
+	/**
+	 * Minecraft instance 
+	 */
+	private Minecraft minecraft;
+	
+	/**
+	 * List of registered client mods supporting permissions
+	 */
+	private Map<String, Permissible> registeredClientMods = new HashMap<String, Permissible>();
+	
+	/**
+	 * List of registered client permissions, grouped by mod
+	 */
+	private Map<Permissible, TreeSet<String>> registeredClientPermissions = new HashMap<Permissible, TreeSet<String>>();
+	
+	/**
+	 * Objects which listen to events generated by this object
+	 */
+	private Set<Permissible> permissibles = new HashSet<Permissible>();
+	
+	/**
+	 * Local permissions, used when server permissions are not available
+	 */
+	private LocalPermissions localPermissions = new LocalPermissions();
+	
+	/**
+	 * Server permissions, indexed by mod
+	 */
+	private Map<String, ServerPermissions> serverPermissions = new HashMap<String, ServerPermissions>();
+	
+	/**
+	 * Last time onTick was called, used to detect tamper condition if no ticks are being received
+	 */
+	private long lastTickTime = System.currentTimeMillis();
+	
+	/**
+	 * Delay counter for when joining a server
+	 */
+	private int loginRegisterTicks = 0;
+	
+	private int menuTicks = 0;
+
+	/**
+	 * Get a reference to the singleton instance of the client permissions manager
+	 * 
+	 * @return
+	 */
+	public static PermissionsManagerClient getInstance()
+	{
+		if (instance == null)
+		{
+			instance = new PermissionsManagerClient();
+		}
+		
+		return instance;
+	}
+	
+	/**
+	 * Private .ctor, for singleton pattern
+	 */
+	private PermissionsManagerClient()
+	{
+		this.registerClientMod("all", allMods);
+	}
+	
+	/* (non-Javadoc)
+	 * @see net.eq2online.permissions.PermissionsManager#getPermissions(java.lang.String)
+	 */
+	@Override
+	public Permissions getPermissions(Permissible mod)
+	{
+		if (mod == null) mod = allMods;
+		String modName = mod.getPermissibleModName();
+
+		ServerPermissions modPermissions = this.serverPermissions.get(modName);
+		return modPermissions != null ? modPermissions : this.localPermissions;
+	}
+	
+	/* (non-Javadoc)
+	 * @see net.eq2online.permissions.PermissionsManager#getPermissionUpdateTime(java.lang.String)
+	 */
+	@Override
+	public Long getPermissionUpdateTime(Permissible mod)
+	{
+		if (mod == null) mod = allMods;
+		String modName = mod.getPermissibleModName();
+
+		ServerPermissions modPermissions = this.serverPermissions.get(modName);
+		return modPermissions != null ? modPermissions.getReplicationTime() : 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see net.eq2online.permissions.PermissionsManager#registerListener(net.eq2online.permissions.PermissionsListener)
+	 */
+	@Override
+	public void registerPermissible(Permissible permissible)
+	{
+		if (!this.permissibles.contains(permissible) && permissible.getPermissibleModName() != null)
+		{
+			this.registerClientMod(permissible.getPermissibleModName(), permissible);
+			permissible.registerPermissions(this);
+		}
+		
+		this.permissibles.add(permissible);
+	}
+	
+	/**
+	 * Register a new client mod with this manager
+	 * 
+	 * @param modName Mod name
+	 * @param modVersion Mod version
+	 */
+	private void registerClientMod(String modName, Permissible mod)
+	{
+		if (this.registeredClientMods.containsKey(modName))
+		{
+			throw new IllegalArgumentException("Cannot register mod \"" + modName + "\"! The mod was already registered with the permissions manager.");
+		}
+		
+		this.registeredClientMods.put(modName, mod);
+		this.registeredClientPermissions.put(mod, new TreeSet<String>());
+	}
+
+	/* (non-Javadoc)
+	 * @see net.eq2online.permissions.PermissionsManager#onLogin(net.minecraft.src.NetHandler, net.minecraft.src.Packet1Login)
+	 */
+	@Override
+	public void onLogin(NetHandler netHandler, Packet1Login loginPacket)
+	{
+		this.loginRegisterTicks = 2;
+		this.clearServerPermissions();
+	}
+
+	/**
+	 * Clears the current replicated server permissions 
+	 */
+	protected void clearServerPermissions()
+	{
+		this.serverPermissions.clear();
+		
+		for (Permissible permissible : this.permissibles)
+			permissible.onPermissionsCleared(this);
+	}
+
+	/**
+	 * Send permission query packets to the server for all registered mods
+	 * 
+	 * @param minecraft Minecraft instance
+	 */
+	protected void sendPermissionQueries()
+	{
+		for (Permissible mod : this.registeredClientMods.values())
+			this.sendPermissionQuery(mod);
+	}
+
+	/**
+	 * Send a permission query packet to the server for the specified mod. You do not need to call this method because it is
+	 * issued automatically by the client permissions manager when connecting to a new server. However you can call use this
+	 * method to "force" a refresh of permissions when needed.
+	 * 
+	 * @param modName name of the mod to send a query packet for
+	 */
+	public void sendPermissionQuery(Permissible mod)
+	{
+		String modName = mod.getPermissibleModName();
+		
+		if (this.minecraft != null && this.minecraft.thePlayer != null && this.minecraft.theWorld != null && this.minecraft.theWorld.isRemote)
+		{
+			if (!this.registeredClientMods.containsValue(mod))
+			{
+				throw new IllegalArgumentException("The specified mod \"" + modName + "\" was not registered with the permissions system");
+			}
+			
+			Float modVersion = mod.getPermissibleModVersion();
+			Set<String> modPermissions = this.registeredClientPermissions.get(mod);
+			
+			if (modPermissions != null)
+			{
+				ReplicatedPermissionsContainer query = new ReplicatedPermissionsContainer(modName, modVersion, modPermissions);
+	
+				if (!query.modName.equals("all") || query.permissions.size() > 0)
+				{
+					byte[] data = query.getBytes();
+					ModUtilities.sendPluginChannelMessage(ReplicatedPermissionsContainer.CHANNEL, data);
+				}
+			}
+		}
+		else
+		{
+			this.serverPermissions.remove(modName);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see net.eq2online.permissions.PermissionsManager#onTick(net.minecraft.src.Minecraft, float, boolean)
+	 */
+	@Override
+	public void onTick(Minecraft minecraft, float partialTicks, boolean inGame)
+	{
+		this.minecraft = minecraft;
+		this.lastTickTime = System.currentTimeMillis();
+		
+		if (this.loginRegisterTicks > 0)
+		{
+			this.loginRegisterTicks--;
+			
+			if (this.loginRegisterTicks == 0 && inGame)
+			{
+				this.sendPermissionQueries();
+				return;
+			}
+		}
+		
+		for (Map.Entry<String, ServerPermissions> modPermissions : this.serverPermissions.entrySet())
+		{
+			if (!modPermissions.getValue().isValid())
+			{
+				modPermissions.getValue().notifyRefreshPending();
+				this.sendPermissionQuery(this.registeredClientMods.get(modPermissions.getKey()));
+			}
+		}
+		
+		if (inGame) this.menuTicks = 0; else this.menuTicks++;
+		
+		if (this.menuTicks == 200)
+		{
+			this.clearServerPermissions();
+		}
+	}
+	
+	/* (non-Javadoc)
+	 * @see net.eq2online.permissions.PermissionsManager#tamperCheck()
+	 */
+	@Override
+	public void tamperCheck()
+	{
+		if (System.currentTimeMillis() - this.lastTickTime > 60000L)
+		{
+			throw new IllegalStateException("Client permissions manager was not ticked for 60 seconds, tamper.");
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see net.eq2online.permissions.PermissionsManager#onCustomPayload(java.lang.String, int, byte[])
+	 */
+	@Override
+	public void onCustomPayload(String channel, int length, byte[] data)
+	{
+		if (channel.equals(ReplicatedPermissionsContainer.CHANNEL) && !Minecraft.getMinecraft().isSingleplayer())
+		{
+			ServerPermissions modPermissions = null;
+			try
+			{
+				modPermissions = new ServerPermissions(data);
+			}
+			catch (Exception ex) {}
+			
+			if (modPermissions != null && modPermissions.getModName() != null)
+			{
+				this.serverPermissions.put(modPermissions.getModName(), modPermissions);
+	
+				Permissible permissible = this.registeredClientMods.get(modPermissions.getModName());
+				if (permissible != null) permissible.onPermissionsChanged(this);
+			}
+		}
+	}
+	
+	/* (non-Javadoc)
+	 * @see net.eq2online.permissions.PermissionsManager#getChannels()
+	 */
+	@Override
+	public List<String> getChannels()
+	{
+		return Arrays.asList(new String[] { ReplicatedPermissionsContainer.CHANNEL });
+	}
+	
+	/**
+	 * Register a permission for all mods, the permission will be prefixed with "mod.all." to provide
+	 * a common namespace for client mods when permissions are replicated to the server
+	 * 
+	 * @param permission
+	 */
+	public void registerPermission(String permission)
+	{
+		this.registerModPermission(allMods, permission);
+	}
+	
+	/**
+	 * Register a permission for the specified mod, the permission will be prefixed with "mod.<modname>." to provide
+	 * a common namespace for client mods when permissions are replicated to the server
+	 * 
+	 * @param mod
+	 * @param permission
+	 */
+	public void registerModPermission(Permissible mod, String permission)
+	{
+		if (mod == null) mod = allMods;
+		String modName = mod.getPermissibleModName();
+		
+		if (!this.registeredClientMods.containsValue(mod))
+		{
+			throw new IllegalArgumentException("Cannot register a mod permission for mod \"" + modName + "\"! The mod was not registered with the permissions manager.");
+		}
+		
+		permission = formatModPermission(modName, permission);
+		
+		Set<String> modPermissions = this.registeredClientPermissions.get(mod);
+		if (modPermissions != null && !modPermissions.contains(permission))
+		{
+			modPermissions.add(permission);
+		}
+	}
+	
+	/**
+	 * Get the value of the specified permission for all mods.
+	 * 
+	 * @param permission Permission to check for
+	 * @return
+	 */
+	public boolean getPermission(String permission)
+	{
+		return this.getModPermission(allMods, permission);
+	}
+	
+	/**
+	 * Get the value of the specified permission for all mods and return the default value if the permission is not set
+	 * 
+	 * @param permission Permission to check for
+	 * @param defaultValue Value to return if the permission is not set
+	 * @return
+	 */
+	public boolean getPermission(String permission, boolean defaultValue)
+	{
+		return this.getModPermission(allMods, permission, defaultValue);
+	}
+	
+	/**
+	 * Get the value of the specified permission for the specified mod. The permission will be prefixed with "mod.<modname>."
+	 * in keeping with registerModPermission as a convenience.
+	 * 
+	 * @param mod
+	 * @param permission
+	 * @return
+	 */
+	public boolean getModPermission(Permissible mod, String permission)
+	{
+		if (mod == null) mod = this.allMods;
+		permission = formatModPermission(mod.getPermissibleModName(), permission);
+		Permissions permissions = this.getPermissions(mod);
+		
+		if (permissions != null)
+		{
+			return permissions.getHasPermission(permission);
+		}
+		
+		return true;
+	}
+
+	/**
+	 * Get the value of the specified permission for the specified mod. The permission will be prefixed with "mod.<modname>."
+	 * in keeping with registerModPermission as a convenience.
+	 * 
+	 * @param modName
+	 * @param permission
+	 * @return
+	 */
+	public boolean getModPermission(String modName, String permission)
+	{
+		Permissible mod = this.registeredClientMods.get(modName);
+		return mod != null ? this.getModPermission(mod, permission) : false;
+	}
+	
+	/**
+	 * Get the value of the specified permission for the specified mod. The permission will be prefixed with "mod.<modname>."
+	 * in keeping with registerModPermission as a convenience. If the permission does not exist, the specified default value
+	 * will be returned.
+	 * 
+	 * @param mod
+	 * @param permission
+	 * @param defaultValue
+	 * @return
+	 */
+	public boolean getModPermission(Permissible mod, String permission, boolean defaultValue)
+	{
+		if (mod == null) mod = allMods;
+		permission = formatModPermission(mod.getPermissibleModName(), permission);
+		Permissions permissions = this.getPermissions(mod);
+		
+		if (permissions != null && permissions.getPermissionSet(permission))
+		{
+			return permissions.getHasPermission(permission);
+		}
+		
+		return defaultValue;
+	}
+
+	/**
+	 * Get the value of the specified permission for the specified mod. The permission will be prefixed with "mod.<modname>."
+	 * in keeping with registerModPermission as a convenience.
+	 * 
+	 * @param modName
+	 * @param permission
+	 * @return
+	 */
+	public boolean getModPermission(String modName, String permission, boolean defaultValue)
+	{
+		Permissible mod = this.registeredClientMods.get(modName);
+		return mod != null ? this.getModPermission(mod, permission, defaultValue) : defaultValue;
+	}
+	
+	/**
+	 * @param modName
+	 * @param permission
+	 * @return
+	 */
+	protected static String formatModPermission(String modName, String permission)
+	{
+		return String.format("mod.%s.%s", modName, permission);
+	}
+
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.LiteMod#getName()
+	 */
+	@Override
+	public String getName()
+	{
+		// Stub for PluginChannelListener interface
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.LiteMod#getVersion()
+	 */
+	@Override
+	public String getVersion()
+	{
+		// Stub for PluginChannelListener interface
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.LiteMod#init()
+	 */
+	@Override
+	public void init(File configPath)
+	{
+		// Stub for PluginChannelListener interface
+	}
+	
+	@Override
+	public void upgradeSettings(String version, File configPath, File oldConfigPath)
+	{
+	}
+}
+package com.mumfrey.liteloader.permissions;
+
+/**
+ * Represents a set of permissions assigned by a remote authority such as a server
+ *
+ * @author Adam Mummery-Smith
+ */
+public interface ReplicatedPermissions extends Permissions
+{
+	/**
+	 * Get the time that this object was received from the remote authority
+	 * 
+	 * @return
+	 */
+	public abstract long getReplicationTime();
+	
+	/**
+	 * True if this permissions object is valid (within cache period)
+	 * 
+	 * @return
+	 */
+	public abstract boolean isValid();
+	
+	/**
+	 * Forcibly invalidate this permission container, forces update at the next opportunity
+	 */
+	public abstract void invalidate();
+
+	/**
+	 * Temporarily forces the permissions object to be valid to prevent repeated revalidation
+	 */
+	public abstract void notifyRefreshPending();
+}
+package com.mumfrey.liteloader.permissions;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import net.eq2online.permissions.ReplicatedPermissionsContainer;
+
+
+/**
+ * Replicated permissions implementation
+ *
+ * @author Adam Mummery-Smith
+ */
+public class ServerPermissions implements ReplicatedPermissions
+{
+	/**
+	 * Pattern for recognising valid permissions in the server feed
+	 */
+	private static final Pattern permissionPattern = Pattern.compile("^([\\+\\-])(([a-z0-9]+\\.)*[a-z0-9\\*]+)$", Pattern.CASE_INSENSITIVE);
+	
+	protected String modName;
+	
+	/**
+	 * Root permission node
+	 */
+	protected Permission permissions = new Permission();
+	
+	/**
+	 * Time the permissions were updated
+	 */
+	protected long createdTime = 0L;
+	
+	/**
+	 * Expiry time of the current data cache
+	 */
+	protected long validUntil = 0L;
+	
+	/**
+	 * Time to cache server responses by default
+	 */
+	protected long cacheTime = 10L * 60L * 1000L;	// 10 minutes
+	
+	/**
+	 * Time to wait when refreshing server permissions before trying again
+	 */
+	protected long refreshTime = 15L * 1000L;		// 15 seconds
+	
+	/**
+	 * @param data
+	 */
+	public ServerPermissions(byte[] data)
+	{
+		this.createdTime = System.currentTimeMillis();
+		this.validUntil = this.createdTime + this.cacheTime;
+		
+		ReplicatedPermissionsContainer response = ReplicatedPermissionsContainer.fromBytes(data);
+		
+		if (response != null)
+		{
+			response.sanitise();
+			
+			this.modName = response.modName;
+			this.validUntil = System.currentTimeMillis() + response.remoteCacheTimeSeconds * 1000L; 
+			
+			for (String permissionString : response.permissions)
+			{
+				Matcher permissionMatcher = permissionPattern.matcher(permissionString);
+				
+				if (permissionMatcher.matches())
+				{
+					String name = permissionMatcher.group(2);
+					boolean value = permissionMatcher.group(1).equals("+");
+					
+					this.permissions.setPermissionAndValue(name, value);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * @return
+	 */
+	public String getModName()
+	{
+		return this.modName;
+	}
+	
+	/* (non-Javadoc)
+	 * @see net.eq2online.permissions.Permissions#getPermissionSet(java.lang.String)
+	 */
+	@Override
+	public boolean getPermissionSet(String permission)
+	{
+		return this.permissions.getPermission(permission) != null;
+	}
+	
+	/* (non-Javadoc)
+	 * @see net.eq2online.permissions.Permissions#getHasPermission(java.lang.String)
+	 */
+	@Override
+	public boolean getHasPermission(String permission)
+	{
+		Permission perm = this.permissions.getPermission(permission);
+		return perm != null && perm.getValue();
+	}
+	
+	/* (non-Javadoc)
+	 * @see net.eq2online.permissions.Permissions#getHasPermission(java.lang.String, boolean)
+	 */
+	@Override
+	public boolean getHasPermission(String permission, boolean defaultValue)
+	{
+		Permission perm = this.permissions.getPermission(permission);
+
+		return perm != null ? perm.getValue() : defaultValue;  
+	}
+	
+	/* (non-Javadoc)
+	 * @see net.eq2online.permissions.ReplicatedPermissions#getReplicationTime()
+	 */
+	@Override
+	public long getReplicationTime()
+	{
+		return this.createdTime;
+	}
+
+	/* (non-Javadoc)
+	 * @see net.eq2online.permissions.ReplicatedPermissions#isValid()
+	 */
+	@Override
+	public boolean isValid()
+	{
+		return System.currentTimeMillis() < this.validUntil;
+	}
+	
+	/* (non-Javadoc)
+	 * @see net.eq2online.permissions.ReplicatedPermissions#invalidate()
+	 */
+	@Override
+	public void invalidate()
+	{
+		this.validUntil = 0L;
+	}
+
+	@Override
+	public void notifyRefreshPending()
+	{
+		this.validUntil = System.currentTimeMillis() + this.refreshTime;
+	}
+}
@@ -9,7 +9,7 @@ import java.util.Set;
 import com.mumfrey.liteloader.core.LiteLoader;
 import net.minecraft.client.ClientBrandRetriever;
-import net.minecraft.client.Minecraft;
+import net.minecraft.src.Minecraft;
 import net.minecraft.src.*;
 public abstract class ModUtilities
@@ -4,7 +4,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.Map;
-import net.minecraft.client.Minecraft;
+import net.minecraft.src.Minecraft;
 import net.minecraft.src.*;
 /**
@@ -15,7 +15,7 @@ import net.minecraft.src.*;
  * @param <P> Parent class type, the type of the class that owns the field
  * @param <T> Field type, the type of the field value
  * 
- * TODO Obfuscation - updated 1.5.2
+ * TODO Obfuscation - updated 1.6.2
  */
 @SuppressWarnings("rawtypes")
 public class PrivateFields<P, T>
@@ -70,7 +70,7 @@ public class PrivateFields&lt;P, T&gt;
 	{
 		try
 		{
-			Field field = parentClass.getDeclaredField(fieldName);
+			Field field = this.parentClass.getDeclaredField(this.fieldName);
 			field.setAccessible(true);
 			return (T)field.get(instance);
 		}
@@ -79,7 +79,7 @@ public class PrivateFields&lt;P, T&gt;
 			return null;
 		}
 	}
-	
+
 	/**
 	 * Set the value of this field on the instance class supplied
 	 * 
@@ -91,11 +91,11 @@ public class PrivateFields&lt;P, T&gt;
 	{
 		try
 		{
-			Field field = parentClass.getDeclaredField(fieldName);
+			Field field = this.parentClass.getDeclaredField(this.fieldName);
 			field.setAccessible(true);
 			field.set(instance, value);
 		}
-		catch (Exception ex) {}
+		catch (Exception ex) { }
 		return value;
 	}
@@ -114,12 +114,12 @@ public class PrivateFields&lt;P, T&gt;
 			Field modifiers = Field.class.getDeclaredField("modifiers");
 			modifiers.setAccessible(true);
-			Field field = parentClass.getDeclaredField(fieldName);
+			Field field = this.parentClass.getDeclaredField(fieldName);
 			modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
 			field.setAccessible(true);
 			field.set(instance, value);
 		}
-		catch (Exception ex) {}
+		catch (Exception ex) { }
 		return value;
 	}
@@ -141,8 +141,8 @@ public class PrivateFields&lt;P, T&gt;
 		public static final StaticFields<TileEntity, Map> tileEntityNameToClassMap = new StaticFields<TileEntity, Map> (TileEntity.class, "nameToClassMap",     "a", "field_70326_a"); // TileEntity/nameToClassMap
 	}
-	public static final PrivateFields<Minecraft, Timer>                       minecraftTimer = new PrivateFields<Minecraft, Timer>                (Minecraft.class,          "timer",                "V", "field_71428_T");  // Minecraft/timer
-	public static final PrivateFields<Minecraft, Profiler>                 minecraftProfiler = new PrivateFields<Minecraft, Profiler>             (Minecraft.class,          "mcProfiler",           "J", "field_71424_I");  // Minecraft/mcProfiler
+	public static final PrivateFields<Minecraft, Timer>                       minecraftTimer = new PrivateFields<Minecraft, Timer>                (Minecraft.class,          "timer",                "S", "field_71428_T");  // Minecraft/timer
+	public static final PrivateFields<Minecraft, Profiler>                 minecraftProfiler = new PrivateFields<Minecraft, Profiler>             (Minecraft.class,          "mcProfiler",           "C", "field_71424_I");  // Minecraft/mcProfiler
 	public static final PrivateFields<RenderManager, Map>                    entityRenderMap = new PrivateFields<RenderManager, Map>              (RenderManager.class,      "entityRenderMap",      "q", "field_78729_o");  // RenderManager/entityRenderMap
 	public static final PrivateFields<GuiControls, GuiScreen>        guiControlsParentScreen = new PrivateFields<GuiControls, GuiScreen>          (GuiControls.class,        "parentScreen",         "b", "field_73909_b");  // GuiControls/parentScreen
 	public static final PrivateFields<PlayerUsageSnooper, IPlayerUsage> playerStatsCollector = new PrivateFields<PlayerUsageSnooper, IPlayerUsage>(PlayerUsageSnooper.class, "playerStatsCollector", "d", "field_76478_d");  // PlayerUsageSnooper/playerStatsCollector
+package net.eq2online.permissions;
+
+import java.io.*;
+import java.util.Collection;
+import java.util.Set;
+import java.util.TreeSet;
+
+/**
+ * Serializable container object
+ * 
+ * @author Adam Mummery-Smith
+ */
+public class ReplicatedPermissionsContainer implements Serializable
+{
+	/**
+	 * Serial version UID to suppoer Serializable interface 
+	 */
+	private static final long serialVersionUID = -764940324881984960L;
+	
+	/**
+	 * Mod name
+	 */
+	public String modName = "all";
+	
+	/**
+	 * Mod version
+	 */
+	public Float modVersion = 0.0F;
+
+	/**
+	 * List of permissions to replicate, prepend "-" for a negated permission and "+" for a granted permission
+	 */
+	public Set<String> permissions = new TreeSet<String>();
+	
+	/**
+	 * Amount of time in seconds that the client will trust these permissions for before requesting an update 
+	 */
+	public long remoteCacheTimeSeconds = 600L;	// 10 minutes
+	
+	public static final String CHANNEL = "PERMISSIONSREPL";
+	
+	public ReplicatedPermissionsContainer()
+	{
+	}
+	
+	public ReplicatedPermissionsContainer(String modName, Float modVersion, Collection<String> permissions)
+	{
+		this.modName = modName;
+		this.modVersion = modVersion;
+		this.permissions.addAll(permissions);
+	}
+	
+	/**
+	 * Add all of the listed permissions to this container
+	 * 
+	 * @param permissions
+	 */
+	public void addAll(Collection<String> permissions)
+	{
+		this.permissions.addAll(permissions);
+	}
+
+	/**
+	 * Check and correct  
+	 */
+	public void sanitise()
+	{
+		if (this.modName == null || this.modName.length() < 1) this.modName = "all";
+		if (this.modVersion == null || this.modVersion < 0.0F) this.modVersion = 0.0F;
+		if (this.remoteCacheTimeSeconds < 0) this.remoteCacheTimeSeconds = 600L;
+	}
+
+	/**
+	 * Serialise this container to a byte array for transmission to a remote host
+	 * 
+	 * @return
+	 */
+	public byte[] getBytes()
+	{
+		try
+		{
+			ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+			new ObjectOutputStream(byteStream).writeObject(this);
+			return byteStream.toByteArray();
+		}
+		catch (IOException e) {}
+		
+		return new byte[0];
+	}
+	
+	/**
+	 * Deserialises a replicated permissions container from a byte array
+	 * 
+	 * @param data Byte array containing the serialised data
+	 * @return new container or null if deserialisation failed
+	 */
+	public static ReplicatedPermissionsContainer fromBytes(byte[] data)
+	{
+		try
+		{
+			ObjectInputStream inputStream = new ObjectInputStream(new ByteArrayInputStream(data));
+			ReplicatedPermissionsContainer object = (ReplicatedPermissionsContainer)inputStream.readObject();
+			return object;
+		}
+		catch (IOException e) { }
+		catch (ClassNotFoundException e) { }
+		catch (ClassCastException e) { }
+		
+		return null;
+	}
+}
-package net.minecraft.src;
-
-import java.lang.management.ManagementFactory;
-import java.lang.management.RuntimeMXBean;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-import com.mumfrey.liteloader.core.CallableLiteLoaderBrand;
-import com.mumfrey.liteloader.core.CallableLiteLoaderMods;
-
-class CallableJVMFlags implements Callable<String>
-{
-    /** Reference to the CrashReport object. */
-    final CrashReport theCrashReport;
-
-    CallableJVMFlags(CrashReport par1CrashReport)
-    {
-        this.theCrashReport = par1CrashReport;
-        par1CrashReport.func_85056_g().addCrashSectionCallable("Mod Pack", new CallableLiteLoaderBrand(par1CrashReport));
-        par1CrashReport.func_85056_g().addCrashSectionCallable("LiteLoader Mods", new CallableLiteLoaderMods(par1CrashReport));
-    }
-
-    /**
-     * Returns the number of JVM Flags along with the passed JVM Flags.
-     */
-    public String getJVMFlagsAsString()
-    {
-        RuntimeMXBean var1 = ManagementFactory.getRuntimeMXBean();
-        List<String> var2 = var1.getInputArguments();
-        int var3 = 0;
-        StringBuilder var4 = new StringBuilder();
-        Iterator<String> var5 = var2.iterator();
-
-        while (var5.hasNext())
-        {
-            String var6 = var5.next();
-
-            if (var6.startsWith("-X"))
-            {
-                if (var3++ > 0)
-                {
-                    var4.append(" ");
-                }
-
-                var4.append(var6);
-            }
-        }
-
-        return String.format("%d total; %s", new Object[] {Integer.valueOf(var3), var4.toString()});
-    }
-
-    @Override
-	public String call()
-    {
-        return this.getJVMFlagsAsString();
-    }
-}
-package net.minecraft.src;
-
-import java.util.Random;
-import org.lwjgl.opengl.GL11;
-
-import com.mumfrey.liteloader.core.LiteLoader;
-
-public class RenderLightningBolt extends Render
-{
-	static
-	{
-		// LiteLoader init
-		LiteLoader.getInstance();
-	}
-	
-    /**
-     * Actually renders the lightning bolt. This method is called through the doRender method.
-     */
-    @SuppressWarnings("cast")
-	public void doRenderLightningBolt(EntityLightningBolt par1EntityLightningBolt, double par2, double par4, double par6, float par8, float par9)
-    {
-        Tessellator var10 = Tessellator.instance;
-        GL11.glDisable(GL11.GL_TEXTURE_2D);
-        GL11.glDisable(GL11.GL_LIGHTING);
-        GL11.glEnable(GL11.GL_BLEND);
-        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
-        double[] var11 = new double[8];
-        double[] var12 = new double[8];
-        double var13 = 0.0D;
-        double var15 = 0.0D;
-        Random var17 = new Random(par1EntityLightningBolt.boltVertex);
-
-        for (int var18 = 7; var18 >= 0; --var18)
-        {
-            var11[var18] = var13;
-            var12[var18] = var15;
-            var13 += (double)(var17.nextInt(11) - 5);
-            var15 += (double)(var17.nextInt(11) - 5);
-        }
-
-        for (int var45 = 0; var45 < 4; ++var45)
-        {
-            Random var46 = new Random(par1EntityLightningBolt.boltVertex);
-
-            for (int var19 = 0; var19 < 3; ++var19)
-            {
-                int var20 = 7;
-                int var21 = 0;
-
-                if (var19 > 0)
-                {
-                    var20 = 7 - var19;
-                }
-
-                if (var19 > 0)
-                {
-                    var21 = var20 - 2;
-                }
-
-                double var22 = var11[var20] - var13;
-                double var24 = var12[var20] - var15;
-
-                for (int var26 = var20; var26 >= var21; --var26)
-                {
-                    double var27 = var22;
-                    double var29 = var24;
-
-                    if (var19 == 0)
-                    {
-                        var22 += (double)(var46.nextInt(11) - 5);
-                        var24 += (double)(var46.nextInt(11) - 5);
-                    }
-                    else
-                    {
-                        var22 += (double)(var46.nextInt(31) - 15);
-                        var24 += (double)(var46.nextInt(31) - 15);
-                    }
-
-                    var10.startDrawing(5);
-                    float var31 = 0.5F;
-                    var10.setColorRGBA_F(0.9F * var31, 0.9F * var31, 1.0F * var31, 0.3F);
-                    double var32 = 0.1D + (double)var45 * 0.2D;
-
-                    if (var19 == 0)
-                    {
-                        var32 *= (double)var26 * 0.1D + 1.0D;
-                    }
-
-                    double var34 = 0.1D + (double)var45 * 0.2D;
-
-                    if (var19 == 0)
-                    {
-                        var34 *= (double)(var26 - 1) * 0.1D + 1.0D;
-                    }
-
-                    for (int var36 = 0; var36 < 5; ++var36)
-                    {
-                        double var37 = par2 + 0.5D - var32;
-                        double var39 = par6 + 0.5D - var32;
-
-                        if (var36 == 1 || var36 == 2)
-                        {
-                            var37 += var32 * 2.0D;
-                        }
-
-                        if (var36 == 2 || var36 == 3)
-                        {
-                            var39 += var32 * 2.0D;
-                        }
-
-                        double var41 = par2 + 0.5D - var34;
-                        double var43 = par6 + 0.5D - var34;
-
-                        if (var36 == 1 || var36 == 2)
-                        {
-                            var41 += var34 * 2.0D;
-                        }
-
-                        if (var36 == 2 || var36 == 3)
-                        {
-                            var43 += var34 * 2.0D;
-                        }
-
-                        var10.addVertex(var41 + var22, par4 + (double)(var26 * 16), var43 + var24);
-                        var10.addVertex(var37 + var27, par4 + (double)((var26 + 1) * 16), var39 + var29);
-                    }
-
-                    var10.draw();
-                }
-            }
-        }
-
-        GL11.glDisable(GL11.GL_BLEND);
-        GL11.glEnable(GL11.GL_LIGHTING);
-        GL11.glEnable(GL11.GL_TEXTURE_2D);
-    }
-
-    /**
-     * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
-     * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
-     * (Render<T extends Entity) and this method has signature public void doRender(T entity, double d, double d1,
-     * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
-     */
-    @Override
-	public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9)
-    {
-        this.doRenderLightningBolt((EntityLightningBolt)par1Entity, par2, par4, par6, par8, par9);
-    }
-}