Style update part 1 - tabs to spaces

Mumfrey
1 parent 11a9a320
Showing 32 changed files with 2277 additions and 2277 deletions
src/client/java/com/mumfrey/liteloader/ChatFilter.java
src/client/java/com/mumfrey/liteloader/ChatListener.java
src/client/java/com/mumfrey/liteloader/ChatRenderListener.java
src/client/java/com/mumfrey/liteloader/EntityRenderListener.java
src/client/java/com/mumfrey/liteloader/FrameBufferListener.java
src/client/java/com/mumfrey/liteloader/GameLoopListener.java
src/client/java/com/mumfrey/liteloader/HUDRenderListener.java
src/client/java/com/mumfrey/liteloader/InitCompleteListener.java
src/client/java/com/mumfrey/liteloader/JoinGameListener.java
src/client/java/com/mumfrey/liteloader/OutboundChatFilter.java
src/client/java/com/mumfrey/liteloader/OutboundChatListener.java
src/client/java/com/mumfrey/liteloader/PostLoginListener.java
src/client/java/com/mumfrey/liteloader/PostRenderListener.java
src/client/java/com/mumfrey/liteloader/PreRenderListener.java
src/client/java/com/mumfrey/liteloader/RenderListener.java
src/client/java/com/mumfrey/liteloader/ScreenshotListener.java
src/client/java/com/mumfrey/liteloader/Tickable.java
src/client/java/com/mumfrey/liteloader/ViewportListener.java
src/client/java/com/mumfrey/liteloader/client/CallbackProxyClient.java
src/client/java/com/mumfrey/liteloader/client/ClientPluginChannelsClient.java
@@ -12,14 +12,14 @@ import net.minecraft.util.IChatComponent;
  */
 public interface ChatFilter extends LiteMod
 {
-	/**
-	 * Chat filter function, return false to filter this packet, true to pass the packet
-	 * 
-	 * @param chat ChatMessageComponent parsed from the chat packet
-	 * @param message Chat message parsed from the chat message component
-	 * @param newMessage If you wish to mutate the message, set the value using newMessage.set()
-	 * 
-	 * @return True to keep the packet, false to discard
-	 */
-	public abstract boolean onChat(IChatComponent chat, String message, ReturnValue<IChatComponent> newMessage);
+    /**
+     * Chat filter function, return false to filter this packet, true to pass the packet
+     * 
+     * @param chat ChatMessageComponent parsed from the chat packet
+     * @param message Chat message parsed from the chat message component
+     * @param newMessage If you wish to mutate the message, set the value using newMessage.set()
+     * 
+     * @return True to keep the packet, false to discard
+     */
+    public abstract boolean onChat(IChatComponent chat, String message, ReturnValue<IChatComponent> newMessage);
 }
@@ -10,11 +10,11 @@ import net.minecraft.util.IChatComponent;
  */
 public interface ChatListener extends LiteMod
 {
-	/**
-	 * Handle an inbound message
-	 * 
-	 * @param chat IChatComponent parsed from the chat packet
-	 * @param message Chat message parsed from the chat message component
-	 */
-	public abstract void onChat(IChatComponent chat, String message);
+    /**
+     * Handle an inbound message
+     * 
+     * @param chat IChatComponent parsed from the chat packet
+     * @param message Chat message parsed from the chat message component
+     */
+    public abstract void onChat(IChatComponent chat, String message);
 }
@@ -9,7 +9,7 @@ import net.minecraft.client.gui.GuiNewChat;
  */
 public interface ChatRenderListener extends LiteMod
 {
-	public abstract void onPreRenderChat(int screenWidth, int screenHeight, GuiNewChat chat);
-	
-	public abstract void onPostRenderChat(int screenWidth, int screenHeight, GuiNewChat chat);
+    public abstract void onPreRenderChat(int screenWidth, int screenHeight, GuiNewChat chat);
+
+    public abstract void onPostRenderChat(int screenWidth, int screenHeight, GuiNewChat chat);
 }
@@ -10,29 +10,29 @@ import net.minecraft.entity.Entity;
  */
 public interface EntityRenderListener extends LiteMod
 {
-	/**
-	 * Called immediately prior to an entity being rendered
-	 * 
-	 * @param render 
-	 * @param entity
-	 * @param xPos
-	 * @param yPos
-	 * @param zPos
-	 * @param yaw
-	 * @param partialTicks
-	 */
-	public abstract void onRenderEntity(Render render, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks);
+    /**
+     * Called immediately prior to an entity being rendered
+     * 
+     * @param render 
+     * @param entity
+     * @param xPos
+     * @param yPos
+     * @param zPos
+     * @param yaw
+     * @param partialTicks
+     */
+    public abstract void onRenderEntity(Render render, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks);
-	/**
-	 * Called immediately following an entity being rendered
-	 * 
-	 * @param render 
-	 * @param entity
-	 * @param xPos
-	 * @param yPos
-	 * @param zPos
-	 * @param yaw
-	 * @param partialTicks
-	 */
-	public abstract void onPostRenderEntity(Render render, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks);
+    /**
+     * Called immediately following an entity being rendered
+     * 
+     * @param render 
+     * @param entity
+     * @param xPos
+     * @param yPos
+     * @param zPos
+     * @param yaw
+     * @param partialTicks
+     */
+    public abstract void onPostRenderEntity(Render render, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks);
 }
@@ -9,23 +9,23 @@ import net.minecraft.client.shader.Framebuffer;
  */
 public interface FrameBufferListener extends LiteMod
 {
-	/**
-	 * Called before the FBO is rendered. Useful if you want to interact with the FBO before it is drawn to the screen 
-	 */
-	public abstract void preRenderFBO(Framebuffer fbo);
-	
-	/**
-	 * Called immediately before the FBO is rendered to the screen, after the appropriate IGL modes and matrix transforms
-	 * have been set but before the FBO is actually rendered into the main output buffer.
-	 *   
-	 * @param fbo FBO instance
-	 * @param width FBO width
-	 * @param height FBO height
-	 */
-	public abstract void onRenderFBO(Framebuffer fbo, int width, int height);
+    /**
+     * Called before the FBO is rendered. Useful if you want to interact with the FBO before it is drawn to the screen 
+     */
+    public abstract void preRenderFBO(Framebuffer fbo);
-	/**
-	 * Called after the FBO is rendered whilst still inside the FBO transform
-	 */
-	public abstract void postRenderFBO(Framebuffer fbo);
+    /**
+     * Called immediately before the FBO is rendered to the screen, after the appropriate IGL modes and matrix transforms
+     * have been set but before the FBO is actually rendered into the main output buffer.
+     *   
+     * @param fbo FBO instance
+     * @param width FBO width
+     * @param height FBO height
+     */
+    public abstract void onRenderFBO(Framebuffer fbo, int width, int height);
+
+    /**
+     * Called after the FBO is rendered whilst still inside the FBO transform
+     */
+    public abstract void postRenderFBO(Framebuffer fbo);
 }
@@ -9,10 +9,10 @@ import net.minecraft.client.Minecraft;
  */
 public interface GameLoopListener extends LiteMod
 {
-	/**
-	 * Called every frame, before the world is ticked
-	 * 
-	 * @param minecraft
-	 */
-	public abstract void onRunGameLoop(Minecraft minecraft);
+    /**
+     * Called every frame, before the world is ticked
+     * 
+     * @param minecraft
+     */
+    public abstract void onRunGameLoop(Minecraft minecraft);
 }
@@ -7,7 +7,7 @@ package com.mumfrey.liteloader;
  */
 public interface HUDRenderListener extends LiteMod
 {
-	public abstract void onPreRenderHUD(int screenWidth, int screenHeight);
-	
-	public abstract void onPostRenderHUD(int screenWidth, int screenHeight);
+    public abstract void onPreRenderHUD(int screenWidth, int screenHeight);
+
+    public abstract void onPostRenderHUD(int screenWidth, int screenHeight);
 }
@@ -12,11 +12,11 @@ import com.mumfrey.liteloader.core.LiteLoader;
  */
 public interface InitCompleteListener extends Tickable
 {
-	/**
-	 * Called as soon as the game is initialised and the main game loop is running
-	 * 
-	 * @param minecraft Minecraft instance
-	 * @param loader LiteLoader instance
-	 */
-	public abstract void onInitCompleted(Minecraft minecraft, LiteLoader loader);
+    /**
+     * Called as soon as the game is initialised and the main game loop is running
+     * 
+     * @param minecraft Minecraft instance
+     * @param loader LiteLoader instance
+     */
+    public abstract void onInitCompleted(Minecraft minecraft, LiteLoader loader);
 }
@@ -14,13 +14,13 @@ import com.mojang.realmsclient.dto.RealmsServer;
  */
 public interface JoinGameListener extends LiteMod
 {
-	/**
-	 * Called on join game
-	 * 
-	 * @param netHandler Net handler
-	 * @param joinGamePacket Join game packet
-	 * @param serverData ServerData object representing the server being connected to
-	 * @param realmsServer If connecting to a realm, a reference to the RealmsServer object
-	 */
-	public abstract void onJoinGame(INetHandler netHandler, S01PacketJoinGame joinGamePacket, ServerData serverData, RealmsServer realmsServer);
+    /**
+     * Called on join game
+     * 
+     * @param netHandler Net handler
+     * @param joinGamePacket Join game packet
+     * @param serverData ServerData object representing the server being connected to
+     * @param realmsServer If connecting to a realm, a reference to the RealmsServer object
+     */
+    public abstract void onJoinGame(INetHandler netHandler, S01PacketJoinGame joinGamePacket, ServerData serverData, RealmsServer realmsServer);
 }
@@ -7,10 +7,10 @@ package com.mumfrey.liteloader;
  */
 public interface OutboundChatFilter extends LiteMod
 {
-	/**
-	 * Raised when a chat message is being sent, return false to filter this message or true to allow it to be sent
-	 * 
-	 * @param message
-	 */
-	public abstract boolean onSendChatMessage(String message); 
+    /**
+     * Raised when a chat message is being sent, return false to filter this message or true to allow it to be sent
+     * 
+     * @param message
+     */
+    public abstract boolean onSendChatMessage(String message); 
 }
@@ -9,11 +9,11 @@ import net.minecraft.network.play.client.C01PacketChatMessage;
  */
 public interface OutboundChatListener extends LiteMod
 {
-	/**
-	 * Raised when a new chat packet is created (not necessarily transmitted, something could be trolling us)
-	 * 
-	 * @param packet
-	 * @param message
-	 */
-	public abstract void onSendChatMessage(C01PacketChatMessage packet, String message);
+    /**
+     * Raised when a new chat packet is created (not necessarily transmitted, something could be trolling us)
+     * 
+     * @param packet
+     * @param message
+     */
+    public abstract void onSendChatMessage(C01PacketChatMessage packet, String message);
 }
@@ -9,12 +9,12 @@ import net.minecraft.network.login.server.S02PacketLoginSuccess;
  */
 public interface PostLoginListener extends LiteMod
 {
-	/**
-	 * Called immediately after login, before the player has properly joined the game. Note that this event is raised
-	 * <b>in the network thread</b> and is not marshalled to the main thread as other packet-generated events are.
-	 * 
-	 * @param netHandler
-	 * @param packet
-	 */
-	public abstract void onPostLogin(INetHandlerLoginClient netHandler, S02PacketLoginSuccess packet);
+    /**
+     * Called immediately after login, before the player has properly joined the game. Note that this event is raised
+     * <b>in the network thread</b> and is not marshalled to the main thread as other packet-generated events are.
+     * 
+     * @param netHandler
+     * @param packet
+     */
+    public abstract void onPostLogin(INetHandlerLoginClient netHandler, S02PacketLoginSuccess packet);
 }
@@ -7,17 +7,17 @@ package com.mumfrey.liteloader;
  */
 public interface PostRenderListener extends LiteMod
 {
-	/**
-	 * Called after entities are rendered but before particles
-	 * 
-	 * @param partialTicks
-	 */
-	public abstract void onPostRenderEntities(float partialTicks);
+    /**
+     * Called after entities are rendered but before particles
+     * 
+     * @param partialTicks
+     */
+    public abstract void onPostRenderEntities(float partialTicks);
-	/**
-	 * Called after all world rendering is completed
-	 * 
-	 * @param partialTicks
-	 */
-	public abstract void onPostRender(float partialTicks);
+    /**
+     * Called after all world rendering is completed
+     * 
+     * @param partialTicks
+     */
+    public abstract void onPostRender(float partialTicks);
 }
@@ -9,44 +9,44 @@ import net.minecraft.client.renderer.RenderGlobal;
  */
 public interface PreRenderListener extends LiteMod
 {
-	/**
-	 * Called immediately before rendering of the world (including the sky) is started.
-	 * 
-	 * @param partialTicks
-	 */
-	public abstract void onRenderWorld(float partialTicks);
-	
-	/**
-	 * Called <b>after</b> the world camera transform is initialised, may be called more than once per frame if anaglyph is enabled
-	 * 
-	 * @param partialTicks
-	 * @param pass
-	 * @param timeSlice
-	 */
-	public abstract void onSetupCameraTransform(float partialTicks, int pass, long timeSlice);
-	
-	/**
-	 * Called when the sky is rendered, may be called more than once per frame if anaglyph is enabled 
-	 * 
-	 * @param partialTicks
-	 * @param pass
-	 */
-	public abstract void onRenderSky(float partialTicks, int pass);
-	
-	/**
-	 * Called immediately before the clouds are rendered, may be called more than once per frame if anaglyph is enabled
-	 * 
-	 * @param renderGlobal
-	 * @param partialTicks
-	 * @param pass
-	 */
-	public abstract void onRenderClouds(float partialTicks, int pass, RenderGlobal renderGlobal);
+    /**
+     * Called immediately before rendering of the world (including the sky) is started.
+     * 
+     * @param partialTicks
+     */
+    public abstract void onRenderWorld(float partialTicks);
-	/**
-	 * Called before the terrain is rendered, may be called more than once per frame if anaglyph is enabled
-	 * 
-	 * @param partialTicks
-	 * @param pass
-	 */
-	public abstract void onRenderTerrain(float partialTicks, int pass);
+    /**
+     * Called <b>after</b> the world camera transform is initialised, may be called more than once per frame if anaglyph is enabled
+     * 
+     * @param partialTicks
+     * @param pass
+     * @param timeSlice
+     */
+    public abstract void onSetupCameraTransform(float partialTicks, int pass, long timeSlice);
+
+    /**
+     * Called when the sky is rendered, may be called more than once per frame if anaglyph is enabled 
+     * 
+     * @param partialTicks
+     * @param pass
+     */
+    public abstract void onRenderSky(float partialTicks, int pass);
+
+    /**
+     * Called immediately before the clouds are rendered, may be called more than once per frame if anaglyph is enabled
+     * 
+     * @param renderGlobal
+     * @param partialTicks
+     * @param pass
+     */
+    public abstract void onRenderClouds(float partialTicks, int pass, RenderGlobal renderGlobal);
+
+    /**
+     * Called before the terrain is rendered, may be called more than once per frame if anaglyph is enabled
+     * 
+     * @param partialTicks
+     * @param pass
+     */
+    public abstract void onRenderTerrain(float partialTicks, int pass);
 }
@@ -9,28 +9,28 @@ import net.minecraft.client.gui.GuiScreen;
  */
 public interface RenderListener extends LiteMod
 {
-	/**
-	 * Callback when a frame is rendered
-	 */
-	public abstract void onRender();
-	
-	/**
-	 * Called immediately before the current GUI is rendered
-	 * 
-	 * @param currentScreen Current screen (if any)
-	 */
-	public abstract void onRenderGui(GuiScreen currentScreen);
-	
-	/**
-	 * Called when the world is rendered
-	 * 
-	 * @deprecated Use PreRenderListener::onRenderWorld(F)V instead
-	 */
-	@Deprecated
-	public abstract void onRenderWorld();
+    /**
+     * Callback when a frame is rendered
+     */
+    public abstract void onRender();
-	/**
-	 * Called immediately after the world/camera transform is initialised
-	 */
-	public abstract void onSetupCameraTransform();
+    /**
+     * Called immediately before the current GUI is rendered
+     * 
+     * @param currentScreen Current screen (if any)
+     */
+    public abstract void onRenderGui(GuiScreen currentScreen);
+
+    /**
+     * Called when the world is rendered
+     * 
+     * @deprecated Use PreRenderListener::onRenderWorld(F)V instead
+     */
+    @Deprecated
+    public abstract void onRenderWorld();
+
+    /**
+     * Called immediately after the world/camera transform is initialised
+     */
+    public abstract void onSetupCameraTransform();
 }
@@ -12,16 +12,16 @@ import com.mumfrey.liteloader.core.LiteLoaderEventBroker.ReturnValue;
  */
 public interface ScreenshotListener extends LiteMod
 {
-	/**
-	 * Called when a screenshot is taken, mods should return FALSE to suspend further processing, or TRUE to allow
-	 * processing to continue normally
-	 * 
-	 * @param screenshotName
-	 * @param width
-	 * @param height
-	 * @param fbo
-	 * @param message Message to return if the event is cancelled
-	 * @return FALSE to suspend further processing, or TRUE to allow processing to continue normally
-	 */
-	public boolean onSaveScreenshot(String screenshotName, int width, int height, Framebuffer fbo, ReturnValue<IChatComponent> message);
+    /**
+     * Called when a screenshot is taken, mods should return FALSE to suspend further processing, or TRUE to allow
+     * processing to continue normally
+     * 
+     * @param screenshotName
+     * @param width
+     * @param height
+     * @param fbo
+     * @param message Message to return if the event is cancelled
+     * @return FALSE to suspend further processing, or TRUE to allow processing to continue normally
+     */
+    public boolean onSaveScreenshot(String screenshotName, int width, int height, Framebuffer fbo, ReturnValue<IChatComponent> message);
 }
@@ -9,13 +9,13 @@ import net.minecraft.client.Minecraft;
  */
 public interface Tickable extends LiteMod
 {
-	/**
-	 * Called every frame
-	 * 
-	 * @param minecraft Minecraft instance
-	 * @param partialTicks Partial tick value 
-	 * @param inGame True if in-game, false if in the menu
-	 * @param clock True if this is a new tick, otherwise false if it's a regular frame
-	 */
-	public abstract void onTick(Minecraft minecraft, float partialTicks, boolean inGame, boolean clock);
+    /**
+     * Called every frame
+     * 
+     * @param minecraft Minecraft instance
+     * @param partialTicks Partial tick value 
+     * @param inGame True if in-game, false if in the menu
+     * @param clock True if this is a new tick, otherwise false if it's a regular frame
+     */
+    public abstract void onTick(Minecraft minecraft, float partialTicks, boolean inGame, boolean clock);
 }
@@ -4,7 +4,7 @@ import net.minecraft.client.gui.ScaledResolution;
 public interface ViewportListener extends LiteMod
 {
-	public abstract void onViewportResized(ScaledResolution resolution, int displayWidth, int displayHeight);
-	
-	public abstract void onFullScreenToggled(boolean fullScreen);
+    public abstract void onViewportResized(ScaledResolution resolution, int displayWidth, int displayHeight);
+
+    public abstract void onFullScreenToggled(boolean fullScreen);
 }
@@ -34,180 +34,180 @@ import com.mumfrey.liteloader.transformers.event.ReturnEventInfo;
  */
 public abstract class CallbackProxyClient extends CallbackProxyCommon
 {
-	private static LiteLoaderEventBrokerClient clientEventBroker;
-
-	private static boolean fboEnabled;
-
-	private static boolean renderingFBO;
-	
-	private CallbackProxyClient() {}
-	
-	public static void onStartupComplete(EventInfo<Minecraft> e)
-	{
-		CallbackProxyCommon.onStartupComplete();
-		
-		CallbackProxyClient.clientEventBroker = LiteLoaderEventBrokerClient.getInstance();
-		
-		if (CallbackProxyClient.clientEventBroker == null)
-		{
-			throw new RuntimeException("LiteLoader failed to start up properly. The game is in an unstable state and must shut down now. Check the developer log for startup errors");
-		}
-		
-		CallbackProxyClient.clientEventBroker.onStartupComplete();
-	}
-	
-	public static void onTimerUpdate(EventInfo<Minecraft> e)
-	{
-		CallbackProxyClient.clientEventBroker.onTimerUpdate();
-	}
-	
-	public static void newTick(EventInfo<Minecraft> e)
-	{
-	}
-	
-	public static void onTick(EventInfo<Minecraft> e)
-	{
-		CallbackProxyClient.clientEventBroker.onTick();
-	}
-	
-	public static void onRender(EventInfo<Minecraft> e)
-	{
-		CallbackProxyClient.clientEventBroker.onRender();
-	}
-	
-	public static void preRenderGUI(EventInfo<EntityRenderer> e, float partialTicks)
-	{
-		CallbackProxyClient.clientEventBroker.preRenderGUI(partialTicks);
-	}
-	
-	public static void onSetupCameraTransform(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
-	{
-		CallbackProxyClient.clientEventBroker.onSetupCameraTransform(pass, partialTicks, timeSlice);
-	}
-	
-	public static void postRenderEntities(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
-	{
-		CallbackProxyClient.clientEventBroker.postRenderEntities(partialTicks, timeSlice);
-	}
-	
-	public static void postRender(EventInfo<EntityRenderer> e, float partialTicks, long timeSlice)
-	{
-		CallbackProxyClient.clientEventBroker.postRender(partialTicks, timeSlice);
-	}
-	
-	public static void onRenderHUD(EventInfo<EntityRenderer> e, float partialTicks)
-	{
-		CallbackProxyClient.clientEventBroker.onRenderHUD(partialTicks);
-	}
-	
-	public static void onRenderChat(EventInfo<GuiIngame> e, float partialTicks)
-	{
-		CallbackProxyClient.clientEventBroker.onRenderChat(e.getSource().getChatGUI(), partialTicks);
-	}
-	
-	public static void postRenderChat(EventInfo<GuiIngame> e, float partialTicks)
-	{
-		CallbackProxyClient.clientEventBroker.postRenderChat(e.getSource().getChatGUI(), partialTicks);
-	}
-	
-	public static void postRenderHUD(EventInfo<EntityRenderer> e, float partialTicks)
-	{
-		CallbackProxyClient.clientEventBroker.postRenderHUD(partialTicks);
-	}
-	
-	public static void IntegratedServerCtor(EventInfo<IntegratedServer> e, Minecraft minecraft, String folderName, String worldName, WorldSettings worldSettings)
-	{
-		CallbackProxyClient.clientEventBroker.onStartServer(e.getSource(), folderName, worldName, worldSettings);
-	}
-	
-	public static void onOutboundChat(EventInfo<EntityPlayerSP> e, String message)
-	{
-		CallbackProxyClient.clientEventBroker.onSendChatMessage(e, message);
-	}
-	
-	public static void onResize(EventInfo<Minecraft> e)
-	{
-		if (CallbackProxyClient.clientEventBroker == null) return;
-		CallbackProxyClient.clientEventBroker.onResize(e.getSource());
-	}
-	
-	public static void preRenderFBO(EventInfo<Minecraft> e)
-	{
-		if (CallbackProxyClient.clientEventBroker == null) return;
-		CallbackProxyClient.fboEnabled = OpenGlHelper.isFramebufferEnabled();
-		
-		if (CallbackProxyClient.fboEnabled)
-		{
-			CallbackProxyClient.renderingFBO = true;
-			CallbackProxyClient.clientEventBroker.preRenderFBO(e.getSource().getFramebuffer());
-		}
-	}
-	
-	public static void postRenderFBO(EventInfo<Minecraft> e)
-	{
-		if (CallbackProxyClient.clientEventBroker == null) return;
-		CallbackProxyClient.renderingFBO = false;
-
-		if (CallbackProxyClient.fboEnabled)
-		{
-			CallbackProxyClient.clientEventBroker.postRenderFBO(e.getSource().getFramebuffer());
-		}
-	}
-	
-	public static void renderFBO(EventInfo<Framebuffer> e, int width, int height, boolean flag)
-	{
-		if (CallbackProxyClient.clientEventBroker == null) return;
-		if (CallbackProxyClient.renderingFBO)
-		{
-			CallbackProxyClient.clientEventBroker.onRenderFBO(e.getSource(), width, height);
-		}
-		
-		CallbackProxyClient.renderingFBO = false;
-	}
-	
-	public static void onRenderWorld(EventInfo<EntityRenderer> e, float partialTicks, long timeSlice)
-	{
-		CallbackProxyClient.clientEventBroker.onRenderWorld(partialTicks, timeSlice);
-	}
-	
-	public static void onRenderSky(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
-	{
-		CallbackProxyClient.clientEventBroker.onRenderSky(partialTicks, pass, timeSlice);
-	}
-	
-	public static void onRenderClouds(EventInfo<EntityRenderer> e, RenderGlobal renderGlobalIn, float partialTicks, int pass)
-	{
-		CallbackProxyClient.clientEventBroker.onRenderClouds(partialTicks, pass, renderGlobalIn);
-	}
-	
-	public static void onRenderTerrain(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
-	{
-		CallbackProxyClient.clientEventBroker.onRenderTerrain(partialTicks, pass, timeSlice);
-	}
-	
-	public static void onSaveScreenshot(ReturnEventInfo<ScreenShotHelper, IChatComponent> e, File gameDir, String name, int width, int height, Framebuffer fbo)
-	{
-		CallbackProxyClient.clientEventBroker.onScreenshot(e, name, width, height, fbo);
-	}
-	
-	public static void onRenderEntity(ReturnEventInfo<RenderManager, Boolean> e, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks, boolean hideBoundingBox, Render render)
-	{
-		CallbackProxyClient.clientEventBroker.onRenderEntity(e.getSource(), entity, xPos, yPos, zPos, yaw, partialTicks, render);
-	}
-	
-	public static void onPostRenderEntity(ReturnEventInfo<RenderManager, Boolean> e, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks, boolean hideBoundingBox, Render render)
-	{
-		CallbackProxyClient.clientEventBroker.onPostRenderEntity(e.getSource(), entity, xPos, yPos, zPos, yaw, partialTicks, render);
-	}
-	
-	/**
-	 * Compatiblbe behaviour with FML, this method is called to generate a consistent offline UUID between client and server
-	 * for a given username.
-	 */
-	public static void generateOfflineUUID(ReturnEventInfo<Session, GameProfile> e)
-	{
-		Session session = e.getSource();
-		UUID uuid = EntityPlayer.getUUID(new GameProfile((UUID)null, session.getUsername()));
-		e.setReturnValue(new GameProfile(uuid, session.getUsername()));
-	}
+    private static LiteLoaderEventBrokerClient clientEventBroker;
+
+    private static boolean fboEnabled;
+
+    private static boolean renderingFBO;
+
+    private CallbackProxyClient() {}
+
+    public static void onStartupComplete(EventInfo<Minecraft> e)
+    {
+        CallbackProxyCommon.onStartupComplete();
+
+        CallbackProxyClient.clientEventBroker = LiteLoaderEventBrokerClient.getInstance();
+
+        if (CallbackProxyClient.clientEventBroker == null)
+        {
+            throw new RuntimeException("LiteLoader failed to start up properly. The game is in an unstable state and must shut down now. Check the developer log for startup errors");
+        }
+
+        CallbackProxyClient.clientEventBroker.onStartupComplete();
+    }
+
+    public static void onTimerUpdate(EventInfo<Minecraft> e)
+    {
+        CallbackProxyClient.clientEventBroker.onTimerUpdate();
+    }
+
+    public static void newTick(EventInfo<Minecraft> e)
+    {
+    }
+
+    public static void onTick(EventInfo<Minecraft> e)
+    {
+        CallbackProxyClient.clientEventBroker.onTick();
+    }
+
+    public static void onRender(EventInfo<Minecraft> e)
+    {
+        CallbackProxyClient.clientEventBroker.onRender();
+    }
+
+    public static void preRenderGUI(EventInfo<EntityRenderer> e, float partialTicks)
+    {
+        CallbackProxyClient.clientEventBroker.preRenderGUI(partialTicks);
+    }
+
+    public static void onSetupCameraTransform(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
+    {
+        CallbackProxyClient.clientEventBroker.onSetupCameraTransform(pass, partialTicks, timeSlice);
+    }
+
+    public static void postRenderEntities(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
+    {
+        CallbackProxyClient.clientEventBroker.postRenderEntities(partialTicks, timeSlice);
+    }
+
+    public static void postRender(EventInfo<EntityRenderer> e, float partialTicks, long timeSlice)
+    {
+        CallbackProxyClient.clientEventBroker.postRender(partialTicks, timeSlice);
+    }
+
+    public static void onRenderHUD(EventInfo<EntityRenderer> e, float partialTicks)
+    {
+        CallbackProxyClient.clientEventBroker.onRenderHUD(partialTicks);
+    }
+
+    public static void onRenderChat(EventInfo<GuiIngame> e, float partialTicks)
+    {
+        CallbackProxyClient.clientEventBroker.onRenderChat(e.getSource().getChatGUI(), partialTicks);
+    }
+
+    public static void postRenderChat(EventInfo<GuiIngame> e, float partialTicks)
+    {
+        CallbackProxyClient.clientEventBroker.postRenderChat(e.getSource().getChatGUI(), partialTicks);
+    }
+
+    public static void postRenderHUD(EventInfo<EntityRenderer> e, float partialTicks)
+    {
+        CallbackProxyClient.clientEventBroker.postRenderHUD(partialTicks);
+    }
+
+    public static void IntegratedServerCtor(EventInfo<IntegratedServer> e, Minecraft minecraft, String folderName, String worldName, WorldSettings worldSettings)
+    {
+        CallbackProxyClient.clientEventBroker.onStartServer(e.getSource(), folderName, worldName, worldSettings);
+    }
+
+    public static void onOutboundChat(EventInfo<EntityPlayerSP> e, String message)
+    {
+        CallbackProxyClient.clientEventBroker.onSendChatMessage(e, message);
+    }
+
+    public static void onResize(EventInfo<Minecraft> e)
+    {
+        if (CallbackProxyClient.clientEventBroker == null) return;
+        CallbackProxyClient.clientEventBroker.onResize(e.getSource());
+    }
+
+    public static void preRenderFBO(EventInfo<Minecraft> e)
+    {
+        if (CallbackProxyClient.clientEventBroker == null) return;
+        CallbackProxyClient.fboEnabled = OpenGlHelper.isFramebufferEnabled();
+
+        if (CallbackProxyClient.fboEnabled)
+        {
+            CallbackProxyClient.renderingFBO = true;
+            CallbackProxyClient.clientEventBroker.preRenderFBO(e.getSource().getFramebuffer());
+        }
+    }
+
+    public static void postRenderFBO(EventInfo<Minecraft> e)
+    {
+        if (CallbackProxyClient.clientEventBroker == null) return;
+        CallbackProxyClient.renderingFBO = false;
+
+        if (CallbackProxyClient.fboEnabled)
+        {
+            CallbackProxyClient.clientEventBroker.postRenderFBO(e.getSource().getFramebuffer());
+        }
+    }
+
+    public static void renderFBO(EventInfo<Framebuffer> e, int width, int height, boolean flag)
+    {
+        if (CallbackProxyClient.clientEventBroker == null) return;
+        if (CallbackProxyClient.renderingFBO)
+        {
+            CallbackProxyClient.clientEventBroker.onRenderFBO(e.getSource(), width, height);
+        }
+
+        CallbackProxyClient.renderingFBO = false;
+    }
+
+    public static void onRenderWorld(EventInfo<EntityRenderer> e, float partialTicks, long timeSlice)
+    {
+        CallbackProxyClient.clientEventBroker.onRenderWorld(partialTicks, timeSlice);
+    }
+
+    public static void onRenderSky(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
+    {
+        CallbackProxyClient.clientEventBroker.onRenderSky(partialTicks, pass, timeSlice);
+    }
+
+    public static void onRenderClouds(EventInfo<EntityRenderer> e, RenderGlobal renderGlobalIn, float partialTicks, int pass)
+    {
+        CallbackProxyClient.clientEventBroker.onRenderClouds(partialTicks, pass, renderGlobalIn);
+    }
+
+    public static void onRenderTerrain(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
+    {
+        CallbackProxyClient.clientEventBroker.onRenderTerrain(partialTicks, pass, timeSlice);
+    }
+
+    public static void onSaveScreenshot(ReturnEventInfo<ScreenShotHelper, IChatComponent> e, File gameDir, String name, int width, int height, Framebuffer fbo)
+    {
+        CallbackProxyClient.clientEventBroker.onScreenshot(e, name, width, height, fbo);
+    }
+
+    public static void onRenderEntity(ReturnEventInfo<RenderManager, Boolean> e, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks, boolean hideBoundingBox, Render render)
+    {
+        CallbackProxyClient.clientEventBroker.onRenderEntity(e.getSource(), entity, xPos, yPos, zPos, yaw, partialTicks, render);
+    }
+
+    public static void onPostRenderEntity(ReturnEventInfo<RenderManager, Boolean> e, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks, boolean hideBoundingBox, Render render)
+    {
+        CallbackProxyClient.clientEventBroker.onPostRenderEntity(e.getSource(), entity, xPos, yPos, zPos, yaw, partialTicks, render);
+    }
+
+    /**
+     * Compatiblbe behaviour with FML, this method is called to generate a consistent offline UUID between client and server
+     * for a given username.
+     */
+    public static void generateOfflineUUID(ReturnEventInfo<Session, GameProfile> e)
+    {
+        Session session = e.getSource();
+        UUID uuid = EntityPlayer.getUUID(new GameProfile((UUID)null, session.getUsername()));
+        e.setReturnValue(new GameProfile(uuid, session.getUsername()));
+    }
 }
@@ -23,98 +23,98 @@ import com.mumfrey.liteloader.core.exceptions.UnregisteredChannelException;
  */
 public class ClientPluginChannelsClient extends ClientPluginChannels
 {
-	/**
-	 * @param netHandler
-	 * @param loginPacket
-	 */
-	void onPostLogin(INetHandlerLoginClient netHandler, S02PacketLoginSuccess loginPacket)
-	{
-		this.clearPluginChannels(netHandler);
-	}
+    /**
+     * @param netHandler
+     * @param loginPacket
+     */
+    void onPostLogin(INetHandlerLoginClient netHandler, S02PacketLoginSuccess loginPacket)
+    {
+        this.clearPluginChannels(netHandler);
+    }
-	/**
-	 * @param netHandler
-	 * @param loginPacket
-	 */
-	void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
-	{
-		this.sendRegisteredPluginChannels(netHandler);
-	}
+    /**
+     * @param netHandler
+     * @param loginPacket
+     */
+    void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
+    {
+        this.sendRegisteredPluginChannels(netHandler);
+    }
-	/**
-	 * Callback for the plugin channel hook
-	 * 
-	 * @param customPayload
-	 */
-	@Override
-	public void onPluginChannelMessage(S3FPacketCustomPayload customPayload)
-	{
-		if (customPayload != null && customPayload.getChannelName() != null)
-		{
-			String channel = customPayload.getChannelName();
-			PacketBuffer data = customPayload.getBufferData();
-			
-			this.onPluginChannelMessage(channel, data);
-		}
-	}
+    /**
+     * Callback for the plugin channel hook
+     * 
+     * @param customPayload
+     */
+    @Override
+    public void onPluginChannelMessage(S3FPacketCustomPayload customPayload)
+    {
+        if (customPayload != null && customPayload.getChannelName() != null)
+        {
+            String channel = customPayload.getChannelName();
+            PacketBuffer data = customPayload.getBufferData();
-	/**
-	 * @param netHandler
-	 * @param registrationData
-	 */
-	@Override
-	protected void sendRegistrationData(INetHandler netHandler, PacketBuffer registrationData)
-	{
-		if (netHandler instanceof INetHandlerLoginClient)
-		{
-			NetworkManager networkManager = PrivateFieldsClient.netManager.get(((NetHandlerLoginClient)netHandler));
-			networkManager.sendPacket(new C17PacketCustomPayload(CHANNEL_REGISTER, registrationData));
-		}
-		else if (netHandler instanceof INetHandlerPlayClient)
-		{
-			ClientPluginChannelsClient.dispatch(new C17PacketCustomPayload(CHANNEL_REGISTER, registrationData));
-		}
-	}
+            this.onPluginChannelMessage(channel, data);
+        }
+    }
-	/**
-	 * Send a message to the server on a plugin channel
-	 * 
-	 * @param channel Channel to send, must not be a reserved channel name
-	 * @param data
-	 */
-	@Override
-	protected boolean send(String channel, PacketBuffer data, ChannelPolicy policy)
-	{
-		if (channel == null || channel.length() > 16 || CHANNEL_REGISTER.equals(channel) || CHANNEL_UNREGISTER.equals(channel))
-			throw new RuntimeException("Invalid channel name specified"); 
-		
-		if (!policy.allows(this, channel))
-		{
-			if (policy.isSilent()) return false;
-			throw new UnregisteredChannelException(channel);
-		}
-		
-		C17PacketCustomPayload payload = new C17PacketCustomPayload(channel, data);
-		return ClientPluginChannelsClient.dispatch(payload);
-	}
+    /**
+     * @param netHandler
+     * @param registrationData
+     */
+    @Override
+    protected void sendRegistrationData(INetHandler netHandler, PacketBuffer registrationData)
+    {
+        if (netHandler instanceof INetHandlerLoginClient)
+        {
+            NetworkManager networkManager = PrivateFieldsClient.netManager.get(((NetHandlerLoginClient)netHandler));
+            networkManager.sendPacket(new C17PacketCustomPayload(CHANNEL_REGISTER, registrationData));
+        }
+        else if (netHandler instanceof INetHandlerPlayClient)
+        {
+            ClientPluginChannelsClient.dispatch(new C17PacketCustomPayload(CHANNEL_REGISTER, registrationData));
+        }
+    }
-	/**
-	 * @param payload
-	 */
-	static boolean dispatch(C17PacketCustomPayload payload)
-	{
-		try
-		{
-			Minecraft minecraft = Minecraft.getMinecraft();
-			
-			if (minecraft.thePlayer != null && minecraft.thePlayer.sendQueue != null)
-			{
-				minecraft.thePlayer.sendQueue.addToSendQueue(payload);
-				return true;
-			}
-		}
-		catch (Exception ex) {}
-		
-		return false;
-	}
+    /**
+     * Send a message to the server on a plugin channel
+     * 
+     * @param channel Channel to send, must not be a reserved channel name
+     * @param data
+     */
+    @Override
+    protected boolean send(String channel, PacketBuffer data, ChannelPolicy policy)
+    {
+        if (channel == null || channel.length() > 16 || CHANNEL_REGISTER.equals(channel) || CHANNEL_UNREGISTER.equals(channel))
+            throw new RuntimeException("Invalid channel name specified"); 
+
+        if (!policy.allows(this, channel))
+        {
+            if (policy.isSilent()) return false;
+            throw new UnregisteredChannelException(channel);
+        }
+
+        C17PacketCustomPayload payload = new C17PacketCustomPayload(channel, data);
+        return ClientPluginChannelsClient.dispatch(payload);
+    }
+
+    /**
+     * @param payload
+     */
+    static boolean dispatch(C17PacketCustomPayload payload)
+    {
+        try
+        {
+            Minecraft minecraft = Minecraft.getMinecraft();
+
+            if (minecraft.thePlayer != null && minecraft.thePlayer.sendQueue != null)
+            {
+                minecraft.thePlayer.sendQueue.addToSendQueue(payload);
+                return true;
+            }
+        }
+        catch (Exception ex) {}
+
+        return false;
+    }
 }
@@ -24,135 +24,135 @@ import com.mumfrey.liteloader.common.Resources;
  */
 public class GameEngineClient implements GameEngine<Minecraft, IntegratedServer>
 {
-	private final Minecraft engine = Minecraft.getMinecraft();
-	
-	private final Resources<?, ?> resources = new ResourcesClient();
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.common.GameEngine#getProfiler()
-	 */
-	@Override
-	public Profiler getProfiler()
-	{
-		return this.engine.mcProfiler;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.common.GameEngine#isClient()
-	 */
-	@Override
-	public boolean isClient()
-	{
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.common.GameEngine#isServer()
-	 */
-	@Override
-	public boolean isServer()
-	{
-		return this.isSinglePlayer();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.common.GameEngine#isInGame()
-	 */
-	@Override
-	public boolean isInGame()
-	{
-		return this.engine.thePlayer != null && this.engine.theWorld != null && this.engine.theWorld.isRemote;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.common.GameEngine#isRunning()
-	 */
-	@Override
-	public boolean isRunning()
-	{
-		return ((IMinecraft)this.engine).isRunning();
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.common.GameEngine#isSingleplayer()
-	 */
-	@Override
-	public boolean isSinglePlayer()
-	{
-		return this.engine.isSingleplayer();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.common.GameEngine#getClient()
-	 */
-	@Override
-	public Minecraft getClient()
-	{
-		return this.engine;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.common.GameEngine#getServer()
-	 */
-	@Override
-	public IntegratedServer getServer()
-	{
-		return this.engine.getIntegratedServer();
-	}
-	
-	@Override
-	public Resources<?, ?> getResources()
-	{
-		return this.resources;
-	}
-	
-	public GameSettings getGameSettings()
-	{
-		return this.engine.gameSettings;
-	}
-
-	public ScaledResolution getScaledResolution()
-	{
-		return new ScaledResolution(this.engine, this.engine.displayWidth, this.engine.displayHeight);
-	}
-
-	public GuiNewChat getChatGUI()
-	{
-		return this.engine.ingameGUI.getChatGUI();
-	}
-
-	public GuiScreen getCurrentScreen()
-	{
-		return this.engine.currentScreen;
-	}
-
-	public boolean hideGUI()
-	{
-		return this.engine.gameSettings.hideGUI;
-	}
-
-	public SoundHandler getSoundHandler()
-	{
-		return this.engine.getSoundHandler();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.common.GameEngine#getKeyBindings()
-	 */
-	@Override
-	public List<KeyBinding> getKeyBindings()
-	{
-		LinkedList<KeyBinding> keyBindings = new LinkedList<KeyBinding>();
-		keyBindings.addAll(Arrays.asList(this.engine.gameSettings.keyBindings));
-		return keyBindings;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.common.GameEngine#setKeyBindings(java.util.List)
-	 */
-	@Override
-	public void setKeyBindings(List<KeyBinding> keyBindings)
-	{
-		this.engine.gameSettings.keyBindings = keyBindings.toArray(new KeyBinding[0]);
-	}
+    private final Minecraft engine = Minecraft.getMinecraft();
+
+    private final Resources<?, ?> resources = new ResourcesClient();
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.common.GameEngine#getProfiler()
+     */
+    @Override
+    public Profiler getProfiler()
+    {
+        return this.engine.mcProfiler;
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.common.GameEngine#isClient()
+     */
+    @Override
+    public boolean isClient()
+    {
+        return true;
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.common.GameEngine#isServer()
+     */
+    @Override
+    public boolean isServer()
+    {
+        return this.isSinglePlayer();
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.common.GameEngine#isInGame()
+     */
+    @Override
+    public boolean isInGame()
+    {
+        return this.engine.thePlayer != null && this.engine.theWorld != null && this.engine.theWorld.isRemote;
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.common.GameEngine#isRunning()
+     */
+    @Override
+    public boolean isRunning()
+    {
+        return ((IMinecraft)this.engine).isRunning();
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.common.GameEngine#isSingleplayer()
+     */
+    @Override
+    public boolean isSinglePlayer()
+    {
+        return this.engine.isSingleplayer();
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.common.GameEngine#getClient()
+     */
+    @Override
+    public Minecraft getClient()
+    {
+        return this.engine;
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.common.GameEngine#getServer()
+     */
+    @Override
+    public IntegratedServer getServer()
+    {
+        return this.engine.getIntegratedServer();
+    }
+
+    @Override
+    public Resources<?, ?> getResources()
+    {
+        return this.resources;
+    }
+
+    public GameSettings getGameSettings()
+    {
+        return this.engine.gameSettings;
+    }
+
+    public ScaledResolution getScaledResolution()
+    {
+        return new ScaledResolution(this.engine, this.engine.displayWidth, this.engine.displayHeight);
+    }
+
+    public GuiNewChat getChatGUI()
+    {
+        return this.engine.ingameGUI.getChatGUI();
+    }
+
+    public GuiScreen getCurrentScreen()
+    {
+        return this.engine.currentScreen;
+    }
+
+    public boolean hideGUI()
+    {
+        return this.engine.gameSettings.hideGUI;
+    }
+
+    public SoundHandler getSoundHandler()
+    {
+        return this.engine.getSoundHandler();
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.common.GameEngine#getKeyBindings()
+     */
+    @Override
+    public List<KeyBinding> getKeyBindings()
+    {
+        LinkedList<KeyBinding> keyBindings = new LinkedList<KeyBinding>();
+        keyBindings.addAll(Arrays.asList(this.engine.gameSettings.keyBindings));
+        return keyBindings;
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.common.GameEngine#setKeyBindings(java.util.List)
+     */
+    @Override
+    public void setKeyBindings(List<KeyBinding> keyBindings)
+    {
+        this.engine.gameSettings.keyBindings = keyBindings.toArray(new KeyBinding[0]);
+    }
 }
@@ -22,84 +22,84 @@ import com.mumfrey.liteloader.resources.InternalResourcePack;
  */
 public class LiteLoaderCoreProviderClient implements CoreProvider
 {
-	/**
-	 * Loader Properties adapter 
-	 */
-	private final LoaderProperties properties;
-	
-	/**
-	 * Read from the properties file, if true we will inhibit the sound manager reload during startup to avoid getting in trouble with OpenAL
-	 */
-	private boolean inhibitSoundManagerReload = true;
-	
-	/**
-	 * If inhibit is enabled, this object is used to reflectively inhibit the sound manager's reload process during startup by removing it from the reloadables list
-	 */
-	private SoundHandlerReloadInhibitor soundHandlerReloadInhibitor;
-	
-	public LiteLoaderCoreProviderClient(LoaderProperties properties)
-	{
-		this.properties = properties;
-	}
-
-	@Override
-	public void onInit()
-	{
-		this.inhibitSoundManagerReload = this.properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_SOUND_MANAGER_FIX, true);
-	}
-	
-	@SuppressWarnings("unchecked")
-	@Override
-	public void onPostInit(GameEngine<?, ?> engine)
-	{
-		this.soundHandlerReloadInhibitor = new SoundHandlerReloadInhibitor((SimpleReloadableResourceManager)engine.getResources().getResourceManager(), ((GameEngineClient)engine).getSoundHandler());
-		
-		if (this.inhibitSoundManagerReload)
-		{
-			this.soundHandlerReloadInhibitor.inhibit();
-		}
-
-		// Add self as a resource pack for texture/lang resources
-		Resources<IResourceManager, IResourcePack> resources = (Resources<IResourceManager, IResourcePack>)LiteLoader.getGameEngine().getResources();
-		resources.registerResourcePack(new InternalResourcePack("LiteLoader", LiteLoader.class, "liteloader"));
-	}
-	
-	@Override
-	public void onPostInitComplete(LiteLoaderMods mods)
-	{
-	}
-	
-	@Override
-	public void onStartupComplete()
-	{
-		if (this.soundHandlerReloadInhibitor != null && this.soundHandlerReloadInhibitor.isInhibited())
-		{
-			this.soundHandlerReloadInhibitor.unInhibit(true);
-		}
-	}
-	
-	@Override
-	public void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
-	{
-	}
-	
-	@Override
-	public void onPostRender(int mouseX, int mouseY, float partialTicks)
-	{
-	}
-	
-	@Override
-	public void onTick(boolean clock, float partialTicks, boolean inGame)
-	{
-	}
-	
-	@Override
-	public void onWorldChanged(World world)
-	{
-	}
-	
-	@Override
-	public void onShutDown()
-	{
-	}
+    /**
+     * Loader Properties adapter 
+     */
+    private final LoaderProperties properties;
+
+    /**
+     * Read from the properties file, if true we will inhibit the sound manager reload during startup to avoid getting in trouble with OpenAL
+     */
+    private boolean inhibitSoundManagerReload = true;
+
+    /**
+     * If inhibit is enabled, this object is used to reflectively inhibit the sound manager's reload process during startup by removing it from the reloadables list
+     */
+    private SoundHandlerReloadInhibitor soundHandlerReloadInhibitor;
+
+    public LiteLoaderCoreProviderClient(LoaderProperties properties)
+    {
+        this.properties = properties;
+    }
+
+    @Override
+    public void onInit()
+    {
+        this.inhibitSoundManagerReload = this.properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_SOUND_MANAGER_FIX, true);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void onPostInit(GameEngine<?, ?> engine)
+    {
+        this.soundHandlerReloadInhibitor = new SoundHandlerReloadInhibitor((SimpleReloadableResourceManager)engine.getResources().getResourceManager(), ((GameEngineClient)engine).getSoundHandler());
+
+        if (this.inhibitSoundManagerReload)
+        {
+            this.soundHandlerReloadInhibitor.inhibit();
+        }
+
+        // Add self as a resource pack for texture/lang resources
+        Resources<IResourceManager, IResourcePack> resources = (Resources<IResourceManager, IResourcePack>)LiteLoader.getGameEngine().getResources();
+        resources.registerResourcePack(new InternalResourcePack("LiteLoader", LiteLoader.class, "liteloader"));
+    }
+
+    @Override
+    public void onPostInitComplete(LiteLoaderMods mods)
+    {
+    }
+
+    @Override
+    public void onStartupComplete()
+    {
+        if (this.soundHandlerReloadInhibitor != null && this.soundHandlerReloadInhibitor.isInhibited())
+        {
+            this.soundHandlerReloadInhibitor.unInhibit(true);
+        }
+    }
+
+    @Override
+    public void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
+    {
+    }
+
+    @Override
+    public void onPostRender(int mouseX, int mouseY, float partialTicks)
+    {
+    }
+
+    @Override
+    public void onTick(boolean clock, float partialTicks, boolean inGame)
+    {
+    }
+
+    @Override
+    public void onWorldChanged(World world)
+    {
+    }
+
+    @Override
+    public void onShutDown()
+    {
+    }
 }
@@ -37,526 +37,526 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker<Minecraft, IntegratedServer> implements IResourceManagerReloadListener
 {	
-	private static LiteLoaderEventBrokerClient instance;
-
-	/**
-	 * Reference to the game
-	 */
-	protected final GameEngineClient engineClient;
-
-	/**
-	 * Current screen width
-	 */
-	private int screenWidth = 854;
-
-	/**
-	 * Current screen height
-	 */
-	private int screenHeight = 480;
-	
-	/**
-	 * 
-	 */
-	private boolean wasFullScreen = false;
-
-	/**
-	 * Hash code of the current world. We don't store the world reference here because we don't want
-	 * to mess with world GC by mistake
-	 */
-	private int worldHashCode = 0;
-
-	private FastIterableDeque<Tickable>             tickListeners;
-	private FastIterableDeque<GameLoopListener>     loopListeners         = new HandlerList<GameLoopListener>(GameLoopListener.class);
-	private FastIterableDeque<RenderListener>       renderListeners       = new HandlerList<RenderListener>(RenderListener.class);
-	private FastIterableDeque<PreRenderListener>    preRenderListeners    = new HandlerList<PreRenderListener>(PreRenderListener.class);
-	private FastIterableDeque<PostRenderListener>   postRenderListeners   = new HandlerList<PostRenderListener>(PostRenderListener.class);
-	private FastIterableDeque<HUDRenderListener>    hudRenderListeners    = new HandlerList<HUDRenderListener>(HUDRenderListener.class);
-	private FastIterableDeque<ChatRenderListener>   chatRenderListeners   = new HandlerList<ChatRenderListener>(ChatRenderListener.class);
-	private FastIterableDeque<OutboundChatListener> outboundChatListeners = new HandlerList<OutboundChatListener>(OutboundChatListener.class);
-	private FastIterableDeque<ViewportListener>     viewportListeners     = new HandlerList<ViewportListener>(ViewportListener.class);
-	private FastIterableDeque<FrameBufferListener>  frameBufferListeners  = new HandlerList<FrameBufferListener>(FrameBufferListener.class);
-	private FastIterableDeque<InitCompleteListener> initListeners         = new HandlerList<InitCompleteListener>(InitCompleteListener.class);
-	private FastIterableDeque<OutboundChatFilter>   outboundChatFilters   = new HandlerList<OutboundChatFilter>(OutboundChatFilter.class, ReturnLogicOp.AND);
-	private FastIterableDeque<ScreenshotListener>   screenshotListeners   = new HandlerList<ScreenshotListener>(ScreenshotListener.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
-	private FastIterableDeque<EntityRenderListener> entityRenderListeners = new HandlerList<EntityRenderListener>(EntityRenderListener.class);
-
-	@SuppressWarnings("cast")
-	public LiteLoaderEventBrokerClient(LiteLoader loader, GameEngineClient engine, LoaderProperties properties)
-	{
-		super(loader, engine, properties);
-		
-		LiteLoaderEventBrokerClient.instance = this;
-		
-		this.engineClient = (GameEngineClient)engine;
-		this.tickListeners = new ProfilingHandlerList<Tickable>(Tickable.class, this.engineClient.getProfiler());
-	}
-	
-	static LiteLoaderEventBrokerClient getInstance()
-	{
-		return LiteLoaderEventBrokerClient.instance;
-	}
-	
-	@Override
-	public void onResourceManagerReload(IResourceManager resourceManager)
-	{
-		LoadingProgress.setMessage("Reloading Resources...");
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.InterfaceProvider#registerInterfaces(com.mumfrey.liteloader.core.InterfaceRegistrationDelegate)
-	 */
-	@Override
-	public void registerInterfaces(InterfaceRegistrationDelegate delegate)
-	{
-		super.registerInterfaces(delegate);
-		
-		delegate.registerInterface(Tickable.class);
-		delegate.registerInterface(GameLoopListener.class);
-		delegate.registerInterface(RenderListener.class);
-		delegate.registerInterface(PreRenderListener.class);
-		delegate.registerInterface(PostRenderListener.class);
-		delegate.registerInterface(HUDRenderListener.class);
-		delegate.registerInterface(ChatRenderListener.class);
-		delegate.registerInterface(OutboundChatListener.class);
-		delegate.registerInterface(ViewportListener.class);
-		delegate.registerInterface(FrameBufferListener.class);
-		delegate.registerInterface(InitCompleteListener.class);
-		delegate.registerInterface(OutboundChatFilter.class);
-		delegate.registerInterface(ScreenshotListener.class);
-		delegate.registerInterface(EntityRenderListener.class);
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.InterfaceProvider#initProvider()
-	 */
-	@Override
-	public void initProvider()
-	{
-	}
-
-	/**
-	 * @param tickable
-	 */
-	public void addTickListener(Tickable tickable)
-	{
-		this.tickListeners.add(tickable);
-	}
-	
-	/**
-	 * @param loopListener
-	 */
-	public void addLoopListener(GameLoopListener loopListener)
-	{
-		this.loopListeners.add(loopListener);
-	}
-	
-	/**
-	 * @param initCompleteListener
-	 */
-	public void addInitListener(InitCompleteListener initCompleteListener)
-	{
-		this.initListeners.add(initCompleteListener);
-	}
-	
-	/**
-	 * @param renderListener
-	 */
-	public void addRenderListener(RenderListener renderListener)
-	{
-		this.renderListeners.add(renderListener);
-	}
-	
-	/**
-	 * @param preRenderListener
-	 */
-	public void addPreRenderListener(PreRenderListener preRenderListener)
-	{
-		this.preRenderListeners.add(preRenderListener);
-	}
-	
-	/**
-	 * @param postRenderListener
-	 */
-	public void addPostRenderListener(PostRenderListener postRenderListener)
-	{
-		this.postRenderListeners.add(postRenderListener);
-	}
-	
-	/**
-	 * @param chatRenderListener
-	 */
-	public void addChatRenderListener(ChatRenderListener chatRenderListener)
-	{
-		this.chatRenderListeners.add(chatRenderListener);
-	}
-	
-	/**
-	 * @param hudRenderListener
-	 */
-	public void addHUDRenderListener(HUDRenderListener hudRenderListener)
-	{
-		this.hudRenderListeners.add(hudRenderListener);
-	}
-
-	/**
-	 * @param outboundChatListener
-	 */
-	public void addOutboundChatListener(OutboundChatListener outboundChatListener)
-	{
-		this.outboundChatListeners.add(outboundChatListener);
-	}
-	
-	/**
-	 * @param outboundChatFilter
-	 */
-	public void addOutboundChatFiler(OutboundChatFilter outboundChatFilter)
-	{
-		this.outboundChatFilters.add(outboundChatFilter);
-	}
-	
-	/**
-	 * @param viewportListener
-	 */
-	public void addViewportListener(ViewportListener viewportListener)
-	{
-		this.viewportListeners.add(viewportListener);
-	}
-	
-	/**
-	 * @param frameBufferListener
-	 */
-	public void addFrameBufferListener(FrameBufferListener frameBufferListener)
-	{
-		this.frameBufferListeners.add(frameBufferListener);
-	}
-	
-	/**
-	 * @param screenshotListener
-	 */
-	public void addScreenshotListener(ScreenshotListener screenshotListener)
-	{
-		this.screenshotListeners.add(screenshotListener);
-	}
-	
-	/**
-	 * @param entityRenderListener
-	 */
-	public void addEntityRenderListener(EntityRenderListener entityRenderListener)
-	{
-		this.entityRenderListeners.add(entityRenderListener);
-	}
-
-	/**
-	 * Late initialisation callback
-	 */
-	@Override
-	protected void onStartupComplete()
-	{
-		this.engine.getResources().refreshResources(false);
-		
-		for (InitCompleteListener initMod : this.initListeners)
-		{
-			try
-			{
-				LoadingProgress.setMessage("Calling late init for mod %s...", initMod.getName());
-				LiteLoaderLogger.info("Calling late init for mod %s", initMod.getName());
-				initMod.onInitCompleted(this.engine.getClient(), this.loader);
-			}
-			catch (Throwable th)
-			{
-				this.mods.onLateInitFailed(initMod, th);
-				LiteLoaderLogger.warning(th, "Error calling late init for mod %s", initMod.getName());
-			}
-		}
-		
-		this.onResize(this.engineClient.getClient());
-
-		super.onStartupComplete();
-	}
-
-	public void onResize(Minecraft minecraft)
-	{
-		ScaledResolution currentResolution = this.engineClient.getScaledResolution();
-		this.screenWidth = currentResolution.getScaledWidth();
-		this.screenHeight = currentResolution.getScaledHeight();
-		
-		if (this.wasFullScreen != minecraft.isFullScreen())
-		{
-			this.viewportListeners.all().onFullScreenToggled(minecraft.isFullScreen());
-		}
-		
-		this.wasFullScreen = minecraft.isFullScreen();
-		this.viewportListeners.all().onViewportResized(currentResolution, minecraft.displayWidth, minecraft.displayHeight);
-	}
-	
-	/**
-	 * Callback from the tick hook, pre render
-	 */
-	void onRender()
-	{
-		this.renderListeners.all().onRender();
-	}
-	
-	/**
-	 * Callback from the tick hook, post render entities
-	 * 
-	 * @param partialTicks
-	 * @param timeSlice 
-	 */
-	void postRenderEntities(float partialTicks, long timeSlice)
-	{
-		this.postRenderListeners.all().onPostRenderEntities(partialTicks);
-	}
-	
-	/**
-	 * Callback from the tick hook, post render
-	 * 
-	 * @param partialTicks 
-	 * @param timeSlice 
-	 */
-	void postRender(float partialTicks, long timeSlice)
-	{
-		((IEntityRenderer)this.engineClient.getClient().entityRenderer).setupCamera(partialTicks, 0);
-		this.postRenderListeners.all().onPostRender(partialTicks);
-	}
-	
-	/**
-	 * Called immediately before the current GUI is rendered
-	 */
-	void preRenderGUI(float partialTicks)
-	{
-		this.renderListeners.all().onRenderGui(this.engineClient.getCurrentScreen());
-	}
-	
-	/**
-	 * Called immediately after the world/camera transform is initialised
-	 * 
-	 * @param pass
-	 * @param timeSlice 
-	 * @param partialTicks 
-	 */
-	void onSetupCameraTransform(int pass, float partialTicks, long timeSlice)
-	{
-		this.renderListeners.all().onSetupCameraTransform();
-		this.preRenderListeners.all().onSetupCameraTransform(partialTicks, pass, timeSlice);
-	}
-	
-	/**
-	 * Called immediately before the chat log is rendered
-	 * 
-	 * @param chatGui 
-	 * @param partialTicks 
-	 */
-	void onRenderChat(GuiNewChat chatGui, float partialTicks)
-	{
-		this.chatRenderListeners.all().onPreRenderChat(this.screenWidth, this.screenHeight, chatGui);
-	}
-	
-	/**
-	 * Called immediately after the chat log is rendered
-	 * 
-	 * @param chatGui 
-	 * @param partialTicks 
-	 */
-	void postRenderChat(GuiNewChat chatGui, float partialTicks)
-	{
-		GuiNewChat chat = this.engineClient.getChatGUI();
-		this.chatRenderListeners.all().onPostRenderChat(this.screenWidth, this.screenHeight, chat);
-	}
-	
-	/**
-	 * Callback when about to render the HUD
-	 */
-	void onRenderHUD(float partialTicks)
-	{
-		this.hudRenderListeners.all().onPreRenderHUD(this.screenWidth, this.screenHeight);
-	}
-	
-	/**
-	 * Callback when the HUD has just been rendered
-	 */
-	void postRenderHUD(float partialTicks)
-	{
-		this.hudRenderListeners.all().onPostRenderHUD(this.screenWidth, this.screenHeight);
-	}
-	
-	/**
-	 * Callback from the tick hook, called every frame when the timer is updated
-	 */
-	void onTimerUpdate()
-	{
-		Minecraft minecraft = this.engine.getClient();
-		this.loopListeners.all().onRunGameLoop(minecraft);
-	}
-	
-	/**
-	 * Callback from the tick hook, ticks all tickable mods
-	 */
-	void onTick()
-	{
-		this.profiler.endStartSection("litemods");
-		
-		Timer minecraftTimer = ((IMinecraft)this.engine.getClient()).getTimer();
-		float partialTicks = minecraftTimer.renderPartialTicks;
-		boolean clock = minecraftTimer.elapsedTicks > 0;
-		
-		Minecraft minecraft = this.engine.getClient();
-		
-		// Flag indicates whether we are in game at the moment
-		Entity renderViewEntity = minecraft.getRenderViewEntity(); // TODO OBF MCPTEST func_175606_aa - getRenderViewEntity
-		boolean inGame = renderViewEntity != null && renderViewEntity.worldObj != null;
-		
-		this.profiler.startSection("loader");
-		super.onTick(clock, partialTicks, inGame);
-
-		int mouseX = Mouse.getX() * this.screenWidth / minecraft.displayWidth;
-		int mouseY = this.screenHeight - Mouse.getY() * this.screenHeight / minecraft.displayHeight - 1;
-		this.profiler.endStartSection("postrender");
-		super.onPostRender(mouseX, mouseY, partialTicks);
-		this.profiler.endSection();
-		
-		// Iterate tickable mods
-		this.tickListeners.all().onTick(minecraft, partialTicks, inGame, clock);
-		
-		// Detected world change
-		int worldHashCode = (minecraft.theWorld != null) ? minecraft.theWorld.hashCode() : 0;
-		if (worldHashCode != this.worldHashCode)
-		{
-			this.worldHashCode = worldHashCode;
-			super.onWorldChanged(minecraft.theWorld);
-		}
-	}
-
-	/**
-	 * @param packet
-	 * @param message
-	 */
-	void onSendChatMessage(C01PacketChatMessage packet, String message)
-	{
-		this.outboundChatListeners.all().onSendChatMessage(packet, message);
-	}
-	
-	/**
-	 * @param message
-	 */
-	void onSendChatMessage(EventInfo<EntityPlayerSP> e, String message)
-	{
-		if (!this.outboundChatFilters.all().onSendChatMessage(message))
-		{
-			e.cancel();
-		}
-	}
-
-	/**
-	 * @param framebuffer
-	 */
-	void preRenderFBO(Framebuffer framebuffer)
-	{
-		this.frameBufferListeners.all().preRenderFBO(framebuffer);
-	}
-
-	/**
-	 * @param framebuffer
-	 * @param width
-	 * @param height
-	 */
-	void onRenderFBO(Framebuffer framebuffer, int width, int height)
-	{
-		this.frameBufferListeners.all().onRenderFBO(framebuffer, width, height);
-	}
-
-	/**
-	 * @param framebuffer
-	 */
-	void postRenderFBO(Framebuffer framebuffer)
-	{
-		this.frameBufferListeners.all().postRenderFBO(framebuffer);
-	}
-
-	/**
-	 * @param partialTicks
-	 * @param timeSlice
-	 */
-	void onRenderWorld(float partialTicks, long timeSlice)
-	{
-		this.preRenderListeners.all().onRenderWorld(partialTicks);
-		this.renderListeners.all().onRenderWorld();
-	}
-	
-	/**
-	 * @param partialTicks
-	 * @param pass
-	 * @param timeSlice
-	 */
-	void onRenderSky(float partialTicks, int pass, long timeSlice)
-	{
-		this.preRenderListeners.all().onRenderSky(partialTicks, pass);
-	}
-	
-	/**
-	 * @param partialTicks
-	 * @param pass
-	 * @param renderGlobal
-	 */
-	void onRenderClouds(float partialTicks, int pass, RenderGlobal renderGlobal)
-	{
-		this.preRenderListeners.all().onRenderClouds(partialTicks, pass, renderGlobal);
-	}
-	
-	/**
-	 * @param partialTicks
-	 * @param pass
-	 * @param timeSlice
-	 */
-	void onRenderTerrain(float partialTicks, int pass, long timeSlice)
-	{
-		this.preRenderListeners.all().onRenderTerrain(partialTicks, pass);
-	}
-
-	/**
-	 * @param e
-	 * @param name
-	 * @param width
-	 * @param height
-	 * @param fbo
-	 */
-	void onScreenshot(ReturnEventInfo<ScreenShotHelper, IChatComponent> e, String name, int width, int height, Framebuffer fbo)
-	{
-		ReturnValue<IChatComponent> ret = new ReturnValue<IChatComponent>(e.getReturnValue());
-		
-		if (!this.screenshotListeners.all().onSaveScreenshot(name, width, height, fbo, ret))
-		{
-			e.setReturnValue(ret.get());
-		}
-	}
-
-	/**
-	 * @param source
-	 * @param entity
-	 * @param xPos
-	 * @param yPos
-	 * @param zPos
-	 * @param yaw
-	 * @param partialTicks
-	 * @param render 
-	 */
-	public void onRenderEntity(RenderManager source, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks, Render render)
-	{
-		this.entityRenderListeners.all().onRenderEntity(render, entity, xPos, yPos, zPos, yaw, partialTicks);
-	}
-
-	/**
-	 * @param source
-	 * @param entity
-	 * @param xPos
-	 * @param yPos
-	 * @param zPos
-	 * @param yaw
-	 * @param partialTicks
-	 * @param render 
-	 */
-	public void onPostRenderEntity(RenderManager source, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks, Render render)
-	{
-		this.entityRenderListeners.all().onPostRenderEntity(render, entity, xPos, yPos, zPos, yaw, partialTicks);
-	}
+    private static LiteLoaderEventBrokerClient instance;
+
+    /**
+     * Reference to the game
+     */
+    protected final GameEngineClient engineClient;
+
+    /**
+     * Current screen width
+     */
+    private int screenWidth = 854;
+
+    /**
+     * Current screen height
+     */
+    private int screenHeight = 480;
+
+    /**
+     * 
+     */
+    private boolean wasFullScreen = false;
+
+    /**
+     * Hash code of the current world. We don't store the world reference here because we don't want
+     * to mess with world GC by mistake
+     */
+    private int worldHashCode = 0;
+
+    private FastIterableDeque<Tickable>             tickListeners;
+    private FastIterableDeque<GameLoopListener>     loopListeners         = new HandlerList<GameLoopListener>(GameLoopListener.class);
+    private FastIterableDeque<RenderListener>       renderListeners       = new HandlerList<RenderListener>(RenderListener.class);
+    private FastIterableDeque<PreRenderListener>    preRenderListeners    = new HandlerList<PreRenderListener>(PreRenderListener.class);
+    private FastIterableDeque<PostRenderListener>   postRenderListeners   = new HandlerList<PostRenderListener>(PostRenderListener.class);
+    private FastIterableDeque<HUDRenderListener>    hudRenderListeners    = new HandlerList<HUDRenderListener>(HUDRenderListener.class);
+    private FastIterableDeque<ChatRenderListener>   chatRenderListeners   = new HandlerList<ChatRenderListener>(ChatRenderListener.class);
+    private FastIterableDeque<OutboundChatListener> outboundChatListeners = new HandlerList<OutboundChatListener>(OutboundChatListener.class);
+    private FastIterableDeque<ViewportListener>     viewportListeners     = new HandlerList<ViewportListener>(ViewportListener.class);
+    private FastIterableDeque<FrameBufferListener>  frameBufferListeners  = new HandlerList<FrameBufferListener>(FrameBufferListener.class);
+    private FastIterableDeque<InitCompleteListener> initListeners         = new HandlerList<InitCompleteListener>(InitCompleteListener.class);
+    private FastIterableDeque<OutboundChatFilter>   outboundChatFilters   = new HandlerList<OutboundChatFilter>(OutboundChatFilter.class, ReturnLogicOp.AND);
+    private FastIterableDeque<ScreenshotListener>   screenshotListeners   = new HandlerList<ScreenshotListener>(ScreenshotListener.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
+    private FastIterableDeque<EntityRenderListener> entityRenderListeners = new HandlerList<EntityRenderListener>(EntityRenderListener.class);
+
+    @SuppressWarnings("cast")
+    public LiteLoaderEventBrokerClient(LiteLoader loader, GameEngineClient engine, LoaderProperties properties)
+    {
+        super(loader, engine, properties);
+
+        LiteLoaderEventBrokerClient.instance = this;
+
+        this.engineClient = (GameEngineClient)engine;
+        this.tickListeners = new ProfilingHandlerList<Tickable>(Tickable.class, this.engineClient.getProfiler());
+    }
+
+    static LiteLoaderEventBrokerClient getInstance()
+    {
+        return LiteLoaderEventBrokerClient.instance;
+    }
+
+    @Override
+    public void onResourceManagerReload(IResourceManager resourceManager)
+    {
+        LoadingProgress.setMessage("Reloading Resources...");
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.InterfaceProvider#registerInterfaces(com.mumfrey.liteloader.core.InterfaceRegistrationDelegate)
+     */
+    @Override
+    public void registerInterfaces(InterfaceRegistrationDelegate delegate)
+    {
+        super.registerInterfaces(delegate);
+
+        delegate.registerInterface(Tickable.class);
+        delegate.registerInterface(GameLoopListener.class);
+        delegate.registerInterface(RenderListener.class);
+        delegate.registerInterface(PreRenderListener.class);
+        delegate.registerInterface(PostRenderListener.class);
+        delegate.registerInterface(HUDRenderListener.class);
+        delegate.registerInterface(ChatRenderListener.class);
+        delegate.registerInterface(OutboundChatListener.class);
+        delegate.registerInterface(ViewportListener.class);
+        delegate.registerInterface(FrameBufferListener.class);
+        delegate.registerInterface(InitCompleteListener.class);
+        delegate.registerInterface(OutboundChatFilter.class);
+        delegate.registerInterface(ScreenshotListener.class);
+        delegate.registerInterface(EntityRenderListener.class);
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.InterfaceProvider#initProvider()
+     */
+    @Override
+    public void initProvider()
+    {
+    }
+
+    /**
+     * @param tickable
+     */
+    public void addTickListener(Tickable tickable)
+    {
+        this.tickListeners.add(tickable);
+    }
+
+    /**
+     * @param loopListener
+     */
+    public void addLoopListener(GameLoopListener loopListener)
+    {
+        this.loopListeners.add(loopListener);
+    }
+
+    /**
+     * @param initCompleteListener
+     */
+    public void addInitListener(InitCompleteListener initCompleteListener)
+    {
+        this.initListeners.add(initCompleteListener);
+    }
+
+    /**
+     * @param renderListener
+     */
+    public void addRenderListener(RenderListener renderListener)
+    {
+        this.renderListeners.add(renderListener);
+    }
+
+    /**
+     * @param preRenderListener
+     */
+    public void addPreRenderListener(PreRenderListener preRenderListener)
+    {
+        this.preRenderListeners.add(preRenderListener);
+    }
+
+    /**
+     * @param postRenderListener
+     */
+    public void addPostRenderListener(PostRenderListener postRenderListener)
+    {
+        this.postRenderListeners.add(postRenderListener);
+    }
+
+    /**
+     * @param chatRenderListener
+     */
+    public void addChatRenderListener(ChatRenderListener chatRenderListener)
+    {
+        this.chatRenderListeners.add(chatRenderListener);
+    }
+
+    /**
+     * @param hudRenderListener
+     */
+    public void addHUDRenderListener(HUDRenderListener hudRenderListener)
+    {
+        this.hudRenderListeners.add(hudRenderListener);
+    }
+
+    /**
+     * @param outboundChatListener
+     */
+    public void addOutboundChatListener(OutboundChatListener outboundChatListener)
+    {
+        this.outboundChatListeners.add(outboundChatListener);
+    }
+
+    /**
+     * @param outboundChatFilter
+     */
+    public void addOutboundChatFiler(OutboundChatFilter outboundChatFilter)
+    {
+        this.outboundChatFilters.add(outboundChatFilter);
+    }
+
+    /**
+     * @param viewportListener
+     */
+    public void addViewportListener(ViewportListener viewportListener)
+    {
+        this.viewportListeners.add(viewportListener);
+    }
+
+    /**
+     * @param frameBufferListener
+     */
+    public void addFrameBufferListener(FrameBufferListener frameBufferListener)
+    {
+        this.frameBufferListeners.add(frameBufferListener);
+    }
+
+    /**
+     * @param screenshotListener
+     */
+    public void addScreenshotListener(ScreenshotListener screenshotListener)
+    {
+        this.screenshotListeners.add(screenshotListener);
+    }
+
+    /**
+     * @param entityRenderListener
+     */
+    public void addEntityRenderListener(EntityRenderListener entityRenderListener)
+    {
+        this.entityRenderListeners.add(entityRenderListener);
+    }
+
+    /**
+     * Late initialisation callback
+     */
+    @Override
+    protected void onStartupComplete()
+    {
+        this.engine.getResources().refreshResources(false);
+
+        for (InitCompleteListener initMod : this.initListeners)
+        {
+            try
+            {
+                LoadingProgress.setMessage("Calling late init for mod %s...", initMod.getName());
+                LiteLoaderLogger.info("Calling late init for mod %s", initMod.getName());
+                initMod.onInitCompleted(this.engine.getClient(), this.loader);
+            }
+            catch (Throwable th)
+            {
+                this.mods.onLateInitFailed(initMod, th);
+                LiteLoaderLogger.warning(th, "Error calling late init for mod %s", initMod.getName());
+            }
+        }
+
+        this.onResize(this.engineClient.getClient());
+
+        super.onStartupComplete();
+    }
+
+    public void onResize(Minecraft minecraft)
+    {
+        ScaledResolution currentResolution = this.engineClient.getScaledResolution();
+        this.screenWidth = currentResolution.getScaledWidth();
+        this.screenHeight = currentResolution.getScaledHeight();
+
+        if (this.wasFullScreen != minecraft.isFullScreen())
+        {
+            this.viewportListeners.all().onFullScreenToggled(minecraft.isFullScreen());
+        }
+
+        this.wasFullScreen = minecraft.isFullScreen();
+        this.viewportListeners.all().onViewportResized(currentResolution, minecraft.displayWidth, minecraft.displayHeight);
+    }
+
+    /**
+     * Callback from the tick hook, pre render
+     */
+    void onRender()
+    {
+        this.renderListeners.all().onRender();
+    }
+
+    /**
+     * Callback from the tick hook, post render entities
+     * 
+     * @param partialTicks
+     * @param timeSlice 
+     */
+    void postRenderEntities(float partialTicks, long timeSlice)
+    {
+        this.postRenderListeners.all().onPostRenderEntities(partialTicks);
+    }
+
+    /**
+     * Callback from the tick hook, post render
+     * 
+     * @param partialTicks 
+     * @param timeSlice 
+     */
+    void postRender(float partialTicks, long timeSlice)
+    {
+        ((IEntityRenderer)this.engineClient.getClient().entityRenderer).setupCamera(partialTicks, 0);
+        this.postRenderListeners.all().onPostRender(partialTicks);
+    }
+
+    /**
+     * Called immediately before the current GUI is rendered
+     */
+    void preRenderGUI(float partialTicks)
+    {
+        this.renderListeners.all().onRenderGui(this.engineClient.getCurrentScreen());
+    }
+
+    /**
+     * Called immediately after the world/camera transform is initialised
+     * 
+     * @param pass
+     * @param timeSlice 
+     * @param partialTicks 
+     */
+    void onSetupCameraTransform(int pass, float partialTicks, long timeSlice)
+    {
+        this.renderListeners.all().onSetupCameraTransform();
+        this.preRenderListeners.all().onSetupCameraTransform(partialTicks, pass, timeSlice);
+    }
+
+    /**
+     * Called immediately before the chat log is rendered
+     * 
+     * @param chatGui 
+     * @param partialTicks 
+     */
+    void onRenderChat(GuiNewChat chatGui, float partialTicks)
+    {
+        this.chatRenderListeners.all().onPreRenderChat(this.screenWidth, this.screenHeight, chatGui);
+    }
+
+    /**
+     * Called immediately after the chat log is rendered
+     * 
+     * @param chatGui 
+     * @param partialTicks 
+     */
+    void postRenderChat(GuiNewChat chatGui, float partialTicks)
+    {
+        GuiNewChat chat = this.engineClient.getChatGUI();
+        this.chatRenderListeners.all().onPostRenderChat(this.screenWidth, this.screenHeight, chat);
+    }
+
+    /**
+     * Callback when about to render the HUD
+     */
+    void onRenderHUD(float partialTicks)
+    {
+        this.hudRenderListeners.all().onPreRenderHUD(this.screenWidth, this.screenHeight);
+    }
+
+    /**
+     * Callback when the HUD has just been rendered
+     */
+    void postRenderHUD(float partialTicks)
+    {
+        this.hudRenderListeners.all().onPostRenderHUD(this.screenWidth, this.screenHeight);
+    }
+
+    /**
+     * Callback from the tick hook, called every frame when the timer is updated
+     */
+    void onTimerUpdate()
+    {
+        Minecraft minecraft = this.engine.getClient();
+        this.loopListeners.all().onRunGameLoop(minecraft);
+    }
+
+    /**
+     * Callback from the tick hook, ticks all tickable mods
+     */
+    void onTick()
+    {
+        this.profiler.endStartSection("litemods");
+
+        Timer minecraftTimer = ((IMinecraft)this.engine.getClient()).getTimer();
+        float partialTicks = minecraftTimer.renderPartialTicks;
+        boolean clock = minecraftTimer.elapsedTicks > 0;
+
+        Minecraft minecraft = this.engine.getClient();
+
+        // Flag indicates whether we are in game at the moment
+        Entity renderViewEntity = minecraft.getRenderViewEntity(); // TODO OBF MCPTEST func_175606_aa - getRenderViewEntity
+        boolean inGame = renderViewEntity != null && renderViewEntity.worldObj != null;
+
+        this.profiler.startSection("loader");
+        super.onTick(clock, partialTicks, inGame);
+
+        int mouseX = Mouse.getX() * this.screenWidth / minecraft.displayWidth;
+        int mouseY = this.screenHeight - Mouse.getY() * this.screenHeight / minecraft.displayHeight - 1;
+        this.profiler.endStartSection("postrender");
+        super.onPostRender(mouseX, mouseY, partialTicks);
+        this.profiler.endSection();
+
+        // Iterate tickable mods
+        this.tickListeners.all().onTick(minecraft, partialTicks, inGame, clock);
+
+        // Detected world change
+        int worldHashCode = (minecraft.theWorld != null) ? minecraft.theWorld.hashCode() : 0;
+        if (worldHashCode != this.worldHashCode)
+        {
+            this.worldHashCode = worldHashCode;
+            super.onWorldChanged(minecraft.theWorld);
+        }
+    }
+
+    /**
+     * @param packet
+     * @param message
+     */
+    void onSendChatMessage(C01PacketChatMessage packet, String message)
+    {
+        this.outboundChatListeners.all().onSendChatMessage(packet, message);
+    }
+
+    /**
+     * @param message
+     */
+    void onSendChatMessage(EventInfo<EntityPlayerSP> e, String message)
+    {
+        if (!this.outboundChatFilters.all().onSendChatMessage(message))
+        {
+            e.cancel();
+        }
+    }
+
+    /**
+     * @param framebuffer
+     */
+    void preRenderFBO(Framebuffer framebuffer)
+    {
+        this.frameBufferListeners.all().preRenderFBO(framebuffer);
+    }
+
+    /**
+     * @param framebuffer
+     * @param width
+     * @param height
+     */
+    void onRenderFBO(Framebuffer framebuffer, int width, int height)
+    {
+        this.frameBufferListeners.all().onRenderFBO(framebuffer, width, height);
+    }
+
+    /**
+     * @param framebuffer
+     */
+    void postRenderFBO(Framebuffer framebuffer)
+    {
+        this.frameBufferListeners.all().postRenderFBO(framebuffer);
+    }
+
+    /**
+     * @param partialTicks
+     * @param timeSlice
+     */
+    void onRenderWorld(float partialTicks, long timeSlice)
+    {
+        this.preRenderListeners.all().onRenderWorld(partialTicks);
+        this.renderListeners.all().onRenderWorld();
+    }
+
+    /**
+     * @param partialTicks
+     * @param pass
+     * @param timeSlice
+     */
+    void onRenderSky(float partialTicks, int pass, long timeSlice)
+    {
+        this.preRenderListeners.all().onRenderSky(partialTicks, pass);
+    }
+
+    /**
+     * @param partialTicks
+     * @param pass
+     * @param renderGlobal
+     */
+    void onRenderClouds(float partialTicks, int pass, RenderGlobal renderGlobal)
+    {
+        this.preRenderListeners.all().onRenderClouds(partialTicks, pass, renderGlobal);
+    }
+
+    /**
+     * @param partialTicks
+     * @param pass
+     * @param timeSlice
+     */
+    void onRenderTerrain(float partialTicks, int pass, long timeSlice)
+    {
+        this.preRenderListeners.all().onRenderTerrain(partialTicks, pass);
+    }
+
+    /**
+     * @param e
+     * @param name
+     * @param width
+     * @param height
+     * @param fbo
+     */
+    void onScreenshot(ReturnEventInfo<ScreenShotHelper, IChatComponent> e, String name, int width, int height, Framebuffer fbo)
+    {
+        ReturnValue<IChatComponent> ret = new ReturnValue<IChatComponent>(e.getReturnValue());
+
+        if (!this.screenshotListeners.all().onSaveScreenshot(name, width, height, fbo, ret))
+        {
+            e.setReturnValue(ret.get());
+        }
+    }
+
+    /**
+     * @param source
+     * @param entity
+     * @param xPos
+     * @param yPos
+     * @param zPos
+     * @param yaw
+     * @param partialTicks
+     * @param render 
+     */
+    public void onRenderEntity(RenderManager source, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks, Render render)
+    {
+        this.entityRenderListeners.all().onRenderEntity(render, entity, xPos, yPos, zPos, yaw, partialTicks);
+    }
+
+    /**
+     * @param source
+     * @param entity
+     * @param xPos
+     * @param yPos
+     * @param zPos
+     * @param yaw
+     * @param partialTicks
+     * @param render 
+     */
+    public void onPostRenderEntity(RenderManager source, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks, Render render)
+    {
+        this.entityRenderListeners.all().onPostRenderEntity(render, entity, xPos, yPos, zPos, yaw, partialTicks);
+    }
 }
@@ -27,261 +27,261 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  */
 public class LiteLoaderPanelManager implements PanelManager<GuiScreen>
 {
-	private final LoaderEnvironment environment;
-	
-	/**
-	 * Loader Properties adapter 
-	 */
-	private final LoaderProperties properties;
-
-	private LiteLoaderMods mods;
-
-	private ConfigManager configManager;
-
-	private Minecraft minecraft;
-
-	/**
-	 * Setting which determines whether we show the "mod info" screen tab in the main menu
-	 */
-	private boolean displayModInfoScreenTab = true;
-	
-	/**
-	 * Don't hide t
-	 */
-	private boolean tabAlwaysExpanded = false;
-	
-	/**
-	 * Override for the "mod info" tab setting, so that mods which want to handle the mod info themselves
-	 * can temporarily disable the function without having to change the underlying property
-	 */
-	private boolean hideModInfoScreenTab = false;
-
-	private boolean checkForUpdate = false;
-	
-	private String notification;
-	
-	/**
-	 * Active "mod info" screen, drawn as an overlay when in the main menu and made the active screen if
-	 * the user clicks the tab
-	 */
-	private GuiLiteLoaderPanel panelHost;
-	
-	/**
-	 * @param environment
-	 * @param properties
-	 */
-	@SuppressWarnings("unchecked")
-	public LiteLoaderPanelManager(GameEngine<?, ?> engine, LoaderEnvironment environment, LoaderProperties properties)
-	{
-		this.environment = environment;
-		this.properties  = properties;
-		this.minecraft   = ((GameEngine<Minecraft, ?>)engine).getClient();
-		
-		this.displayModInfoScreenTab = this.properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_MOD_INFO_SCREEN, true);
-		this.tabAlwaysExpanded = this.properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_NO_HIDE_TAB, false);
-		
-		if (this.properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_FORCE_UPDATE, false))
-		{
-			int updateCheckInterval = this.properties.getIntegerProperty(LoaderProperties.OPTION_UPDATE_CHECK_INTR) + 1;
-			LiteLoaderLogger.debug("Force update is TRUE, updateCheckInterval = %d", updateCheckInterval);
-			
-			if (updateCheckInterval > 10)
-			{
-				LiteLoaderLogger.debug("Forcing update check!");
-				this.checkForUpdate = true;
-				updateCheckInterval = 0;
-			}
-			
-			this.properties.setIntegerProperty(LoaderProperties.OPTION_UPDATE_CHECK_INTR, updateCheckInterval);
-			this.properties.writeProperties();
-		}
-	}
-	
-	@Override
-	public void init(LiteLoaderMods mods, ConfigManager configManager)
-	{
-		this.mods          = mods;
-		this.configManager = configManager;
-	}
-	
-	@Override
-	public void onStartupComplete()
-	{
-		if (this.checkForUpdate)
-		{
-			LiteLoaderVersion.getUpdateSite().beginUpdateCheck();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.TickObserver#onTick(boolean, float, boolean)
-	 */
-	@Override
-	public void onTick(boolean clock, float partialTicks, boolean inGame)
-	{
-		if (clock && this.panelHost != null && this.minecraft.currentScreen != this.panelHost)
-		{
-			this.panelHost.updateScreen();
-		}
-		
-		if (clock && this.checkForUpdate)
-		{
-			LiteLoaderUpdateSite updateSite = LiteLoaderVersion.getUpdateSite();
-			if (!updateSite.isCheckInProgress() && updateSite.isCheckComplete())
-			{
-				LiteLoaderLogger.debug("Scheduled update check completed, success=%s", updateSite.isCheckSucceess());
-				this.checkForUpdate = false;
-				if (updateSite.isCheckSucceess() && updateSite.isUpdateAvailable())
-				{
-					this.setNotification(I18n.format("gui.notifications.updateavailable"));
-				}
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.PostRenderObserver#onPostRender(int, int, float)
-	 */
-	@Override
-	public void onPostRender(int mouseX, int mouseY, float partialTicks)
-	{
-		if (this.mods == null) return;
-		
-		boolean tabHidden = this.isTabHidden() && this.minecraft.currentScreen instanceof GuiMainMenu;
-		
-		if (this.isPanelSupportedOnScreen(this.minecraft.currentScreen) && ((this.displayModInfoScreenTab && !tabHidden) || (this.panelHost != null && this.panelHost.isOpen())))
-		{
-			// If we're at the main menu, prepare the overlay
-			if (this.panelHost == null || this.panelHost.getScreen() != this.minecraft.currentScreen)
-			{
-				this.panelHost = new GuiLiteLoaderPanel(this.minecraft, this.minecraft.currentScreen, this.mods, this.environment, this.properties, this.configManager, !tabHidden);
-				if (this.notification != null)
-				{
-					this.panelHost.setNotification(this.notification);
-				}
-			}
-
-			this.minecraft.entityRenderer.setupOverlayRendering();
-			this.panelHost.drawScreen(mouseX, mouseY, partialTicks, this.tabAlwaysExpanded);
-		}
-		else if (this.minecraft.currentScreen != this.panelHost && this.panelHost != null)
-		{
-			// If we're in any other screen, kill the overlay
-			this.panelHost.release();
-			this.panelHost = null;
-		}
-		else if (this.isPanelSupportedOnScreen(this.minecraft.currentScreen) && Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) && Keyboard.isKeyDown(Keyboard.KEY_TAB))
-		{
-			this.displayLiteLoaderPanel(this.minecraft.currentScreen);
-		}
-	}
-
-	/**
-	 * Set the "mod info" screen tab to hidden, regardless of the property setting
-	 */
-	@Override
-	public void hideTab()
-	{
-		this.hideModInfoScreenTab = true;
-	}
-	
-	private boolean isTabHidden()
-	{
-		return this.hideModInfoScreenTab && this.getStartupErrorCount() == 0 && this.notification == null;
-	}
-	
-	/**
-	 * Set whether the "mod info" screen tab should be shown in the main menu
-	 */
-	@Override
-	public void setTabVisible(boolean show)
-	{
-		this.displayModInfoScreenTab = show;
-		this.properties.setBooleanProperty(LoaderProperties.OPTION_MOD_INFO_SCREEN, show);
-		this.properties.writeProperties();
-	}
-	
-	/**
-	 * Get whether the "mod info" screen tab is shown in the main menu
-	 */
-	@Override
-	public boolean isTabVisible()
-	{
-		return this.displayModInfoScreenTab;
-	}
-	
-	@Override
-	public void setTabAlwaysExpanded(boolean expand)
-	{
-		this.tabAlwaysExpanded = expand;
-		this.properties.setBooleanProperty(LoaderProperties.OPTION_NO_HIDE_TAB, expand);
-		this.properties.writeProperties();
-	}
-	
-	@Override
-	public boolean isTabAlwaysExpanded()
-	{
-		return this.tabAlwaysExpanded;
-	}
-	
-	@Override
-	public void setForceUpdateEnabled(boolean forceUpdate)
-	{
-		this.properties.setBooleanProperty(LoaderProperties.OPTION_FORCE_UPDATE, forceUpdate);
-		this.properties.writeProperties();
-	}
-	
-	@Override
-	public boolean isForceUpdateEnabled()
-	{
-		return this.properties.getBooleanProperty(LoaderProperties.OPTION_FORCE_UPDATE);
-	}
-	
-	/**
-	 * Display the liteloader panel over the specified GUI
-	 * 
-	 * @param parentScreen
-	 */
-	@Override
-	public void displayLiteLoaderPanel(GuiScreen parentScreen)
-	{
-		if (this.isPanelSupportedOnScreen(parentScreen))
-		{
-			this.panelHost = new GuiLiteLoaderPanel(this.minecraft, parentScreen, this.mods, this.environment, this.properties, this.configManager, !this.isTabHidden());
-			this.minecraft.displayGuiScreen(this.panelHost);
-		}
-	}
-	
-	@Override
-	public int getStartupErrorCount()
-	{
-		return this.mods.getStartupErrorCount();
-	}
-	
-	@Override
-	public int getCriticalErrorCount()
-	{
-		return this.mods.getCriticalErrorCount();
-	}
-
-	@Override
-	public void setNotification(String notification)
-	{
-		LiteLoaderLogger.debug("Setting notification: " + notification);
-		this.notification = notification;
-		
-		if (this.panelHost != null)
-		{
-			this.panelHost.setNotification(notification);
-		}
-	}
-	
-	private boolean isPanelSupportedOnScreen(GuiScreen guiScreen)
-	{
-		return (
-			guiScreen instanceof GuiMainMenu ||
-			guiScreen instanceof GuiIngameMenu ||
-			guiScreen instanceof GuiOptions
-		);
-	}
+    private final LoaderEnvironment environment;
+
+    /**
+     * Loader Properties adapter 
+     */
+    private final LoaderProperties properties;
+
+    private LiteLoaderMods mods;
+
+    private ConfigManager configManager;
+
+    private Minecraft minecraft;
+
+    /**
+     * Setting which determines whether we show the "mod info" screen tab in the main menu
+     */
+    private boolean displayModInfoScreenTab = true;
+
+    /**
+     * Don't hide t
+     */
+    private boolean tabAlwaysExpanded = false;
+
+    /**
+     * Override for the "mod info" tab setting, so that mods which want to handle the mod info themselves
+     * can temporarily disable the function without having to change the underlying property
+     */
+    private boolean hideModInfoScreenTab = false;
+
+    private boolean checkForUpdate = false;
+
+    private String notification;
+
+    /**
+     * Active "mod info" screen, drawn as an overlay when in the main menu and made the active screen if
+     * the user clicks the tab
+     */
+    private GuiLiteLoaderPanel panelHost;
+
+    /**
+     * @param environment
+     * @param properties
+     */
+    @SuppressWarnings("unchecked")
+    public LiteLoaderPanelManager(GameEngine<?, ?> engine, LoaderEnvironment environment, LoaderProperties properties)
+    {
+        this.environment = environment;
+        this.properties  = properties;
+        this.minecraft   = ((GameEngine<Minecraft, ?>)engine).getClient();
+
+        this.displayModInfoScreenTab = this.properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_MOD_INFO_SCREEN, true);
+        this.tabAlwaysExpanded = this.properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_NO_HIDE_TAB, false);
+
+        if (this.properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_FORCE_UPDATE, false))
+        {
+            int updateCheckInterval = this.properties.getIntegerProperty(LoaderProperties.OPTION_UPDATE_CHECK_INTR) + 1;
+            LiteLoaderLogger.debug("Force update is TRUE, updateCheckInterval = %d", updateCheckInterval);
+
+            if (updateCheckInterval > 10)
+            {
+                LiteLoaderLogger.debug("Forcing update check!");
+                this.checkForUpdate = true;
+                updateCheckInterval = 0;
+            }
+
+            this.properties.setIntegerProperty(LoaderProperties.OPTION_UPDATE_CHECK_INTR, updateCheckInterval);
+            this.properties.writeProperties();
+        }
+    }
+
+    @Override
+    public void init(LiteLoaderMods mods, ConfigManager configManager)
+    {
+        this.mods          = mods;
+        this.configManager = configManager;
+    }
+
+    @Override
+    public void onStartupComplete()
+    {
+        if (this.checkForUpdate)
+        {
+            LiteLoaderVersion.getUpdateSite().beginUpdateCheck();
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.TickObserver#onTick(boolean, float, boolean)
+     */
+    @Override
+    public void onTick(boolean clock, float partialTicks, boolean inGame)
+    {
+        if (clock && this.panelHost != null && this.minecraft.currentScreen != this.panelHost)
+        {
+            this.panelHost.updateScreen();
+        }
+
+        if (clock && this.checkForUpdate)
+        {
+            LiteLoaderUpdateSite updateSite = LiteLoaderVersion.getUpdateSite();
+            if (!updateSite.isCheckInProgress() && updateSite.isCheckComplete())
+            {
+                LiteLoaderLogger.debug("Scheduled update check completed, success=%s", updateSite.isCheckSucceess());
+                this.checkForUpdate = false;
+                if (updateSite.isCheckSucceess() && updateSite.isUpdateAvailable())
+                {
+                    this.setNotification(I18n.format("gui.notifications.updateavailable"));
+                }
+            }
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.PostRenderObserver#onPostRender(int, int, float)
+     */
+    @Override
+    public void onPostRender(int mouseX, int mouseY, float partialTicks)
+    {
+        if (this.mods == null) return;
+
+        boolean tabHidden = this.isTabHidden() && this.minecraft.currentScreen instanceof GuiMainMenu;
+
+        if (this.isPanelSupportedOnScreen(this.minecraft.currentScreen) && ((this.displayModInfoScreenTab && !tabHidden) || (this.panelHost != null && this.panelHost.isOpen())))
+        {
+            // If we're at the main menu, prepare the overlay
+            if (this.panelHost == null || this.panelHost.getScreen() != this.minecraft.currentScreen)
+            {
+                this.panelHost = new GuiLiteLoaderPanel(this.minecraft, this.minecraft.currentScreen, this.mods, this.environment, this.properties, this.configManager, !tabHidden);
+                if (this.notification != null)
+                {
+                    this.panelHost.setNotification(this.notification);
+                }
+            }
+
+            this.minecraft.entityRenderer.setupOverlayRendering();
+            this.panelHost.drawScreen(mouseX, mouseY, partialTicks, this.tabAlwaysExpanded);
+        }
+        else if (this.minecraft.currentScreen != this.panelHost && this.panelHost != null)
+        {
+            // If we're in any other screen, kill the overlay
+            this.panelHost.release();
+            this.panelHost = null;
+        }
+        else if (this.isPanelSupportedOnScreen(this.minecraft.currentScreen) && Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) && Keyboard.isKeyDown(Keyboard.KEY_TAB))
+        {
+            this.displayLiteLoaderPanel(this.minecraft.currentScreen);
+        }
+    }
+
+    /**
+     * Set the "mod info" screen tab to hidden, regardless of the property setting
+     */
+    @Override
+    public void hideTab()
+    {
+        this.hideModInfoScreenTab = true;
+    }
+
+    private boolean isTabHidden()
+    {
+        return this.hideModInfoScreenTab && this.getStartupErrorCount() == 0 && this.notification == null;
+    }
+
+    /**
+     * Set whether the "mod info" screen tab should be shown in the main menu
+     */
+    @Override
+    public void setTabVisible(boolean show)
+    {
+        this.displayModInfoScreenTab = show;
+        this.properties.setBooleanProperty(LoaderProperties.OPTION_MOD_INFO_SCREEN, show);
+        this.properties.writeProperties();
+    }
+
+    /**
+     * Get whether the "mod info" screen tab is shown in the main menu
+     */
+    @Override
+    public boolean isTabVisible()
+    {
+        return this.displayModInfoScreenTab;
+    }
+
+    @Override
+    public void setTabAlwaysExpanded(boolean expand)
+    {
+        this.tabAlwaysExpanded = expand;
+        this.properties.setBooleanProperty(LoaderProperties.OPTION_NO_HIDE_TAB, expand);
+        this.properties.writeProperties();
+    }
+
+    @Override
+    public boolean isTabAlwaysExpanded()
+    {
+        return this.tabAlwaysExpanded;
+    }
+
+    @Override
+    public void setForceUpdateEnabled(boolean forceUpdate)
+    {
+        this.properties.setBooleanProperty(LoaderProperties.OPTION_FORCE_UPDATE, forceUpdate);
+        this.properties.writeProperties();
+    }
+
+    @Override
+    public boolean isForceUpdateEnabled()
+    {
+        return this.properties.getBooleanProperty(LoaderProperties.OPTION_FORCE_UPDATE);
+    }
+
+    /**
+     * Display the liteloader panel over the specified GUI
+     * 
+     * @param parentScreen
+     */
+    @Override
+    public void displayLiteLoaderPanel(GuiScreen parentScreen)
+    {
+        if (this.isPanelSupportedOnScreen(parentScreen))
+        {
+            this.panelHost = new GuiLiteLoaderPanel(this.minecraft, parentScreen, this.mods, this.environment, this.properties, this.configManager, !this.isTabHidden());
+            this.minecraft.displayGuiScreen(this.panelHost);
+        }
+    }
+
+    @Override
+    public int getStartupErrorCount()
+    {
+        return this.mods.getStartupErrorCount();
+    }
+
+    @Override
+    public int getCriticalErrorCount()
+    {
+        return this.mods.getCriticalErrorCount();
+    }
+
+    @Override
+    public void setNotification(String notification)
+    {
+        LiteLoaderLogger.debug("Setting notification: " + notification);
+        this.notification = notification;
+
+        if (this.panelHost != null)
+        {
+            this.panelHost.setNotification(notification);
+        }
+    }
+
+    private boolean isPanelSupportedOnScreen(GuiScreen guiScreen)
+    {
+        return (
+                guiScreen instanceof GuiMainMenu ||
+                guiScreen instanceof GuiIngameMenu ||
+                guiScreen instanceof GuiOptions
+                );
+    }
 }
@@ -43,212 +43,212 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  */
 public class PacketEventsClient extends PacketEvents
 {
-	private static RealmsServer joiningRealm;
-	
-	private FastIterableDeque<JoinGameListener> joinGameListeners = new HandlerList<JoinGameListener>(JoinGameListener.class);
-	private FastIterableDeque<ChatListener> chatListeners = new HandlerList<ChatListener>(ChatListener.class);
-	private FastIterableDeque<ChatFilter> chatFilters = new HandlerList<ChatFilter>(ChatFilter.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
-	private FastIterableDeque<PreJoinGameListener> preJoinGameListeners = new HandlerList<PreJoinGameListener>(PreJoinGameListener.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
-	private FastIterableDeque<PostLoginListener> postLoginListeners = new HandlerList<PostLoginListener>(PostLoginListener.class);
-
-	@Override
-	public void registerInterfaces(InterfaceRegistrationDelegate delegate)
-	{
-		super.registerInterfaces(delegate);
-		
-		delegate.registerInterface(JoinGameListener.class);
-		delegate.registerInterface(ChatListener.class);
-		delegate.registerInterface(ChatFilter.class);
-		delegate.registerInterface(PreJoinGameListener.class);
-		delegate.registerInterface(PostLoginListener.class);
-	}
-	
-	/**
-	 * @param joinGameListener
-	 */
-	public void registerJoinGameListener(JoinGameListener joinGameListener)
-	{
-		this.joinGameListeners.add(joinGameListener);
-	}
-
-	/**
-	 * @param chatFilter
-	 */
-	public void registerChatFilter(ChatFilter chatFilter)
-	{
-		this.chatFilters.add(chatFilter);
-	}
-	
-	/**
-	 * @param chatListener
-	 */
-	public void registerChatListener(ChatListener chatListener)
-	{
-		if (chatListener instanceof ChatFilter)
-		{
-			LiteLoaderLogger.warning("Interface error initialising mod '%1s'. A mod implementing ChatFilter and ChatListener is not supported! Remove one of these interfaces", chatListener.getName());
-		}
-		else
-		{
-			this.chatListeners.add(chatListener);
-		}
-	}
-	
-	/**
-	 * @param joinGameListener
-	 */
-	public void registerPreJoinGameListener(PreJoinGameListener joinGameListener)
-	{
-		this.preJoinGameListeners.add(joinGameListener);
-	}
-
-	/**
-	 * @param postLoginListener
-	 */
-	public void registerPostLoginListener(PostLoginListener postLoginListener)
-	{
-		this.postLoginListeners.add(postLoginListener);
-	}
-
-	public static void onJoinRealm(EventInfo<RealmsMainScreen> e, long arg1, RealmsServer server)
-	{
-		PacketEventsClient.joiningRealm = server;
-	}
-	
-	@Override
-	protected IThreadListener getPacketContextListener(Packets.Context context)
-	{
-		if (context == Packets.Context.SERVER)
-		{
-			return MinecraftServer.getServer();
-		}
-		
-		return Minecraft.getMinecraft();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.core.PacketEvents#handlePacket(com.mumfrey.liteloader.common.transformers.PacketEventInfo, net.minecraft.network.INetHandler, net.minecraft.network.play.server.S01PacketJoinGame)
-	 */
-	@Override
-	protected void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, S01PacketJoinGame packet)
-	{
-		if (this.preJoinGame(e, netHandler, packet))
-		{
-			return;
-		}
-		
-		((INetHandlerPlayClient)netHandler).handleJoinGame(packet);
-		super.handlePacket(e, netHandler, packet);
-		
-		this.postJoinGame(e, netHandler, packet);
-	}
-
-	/**
-	 * @param e
-	 * @param netHandler
-	 * @param packet
-	 * @throws EventCancellationException
-	 */
-	private boolean preJoinGame(PacketEventInfo<Packet> e, INetHandler netHandler, S01PacketJoinGame packet) throws EventCancellationException
-	{
-		if (!(netHandler instanceof INetHandlerPlayClient))
-		{
-			return true;
-		}
-		
-		e.cancel();
-
-		return !this.preJoinGameListeners.all().onPreJoinGame(netHandler, packet);
-	}
-
-	/**
-	 * @param e
-	 * @param netHandler
-	 * @param packet
-	 */
-	private void postJoinGame(PacketEventInfo<Packet> e, INetHandler netHandler, S01PacketJoinGame packet)
-	{
-		this.joinGameListeners.all().onJoinGame(netHandler, packet, Minecraft.getMinecraft().getCurrentServerData(), PacketEventsClient.joiningRealm);
-		PacketEventsClient.joiningRealm = null;
-		
-		ClientPluginChannels clientPluginChannels = LiteLoader.getClientPluginChannels();
-		if (clientPluginChannels instanceof ClientPluginChannelsClient)
-		{
-			((ClientPluginChannelsClient)clientPluginChannels).onJoinGame(netHandler, packet);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.core.PacketEvents#handlePacket(com.mumfrey.liteloader.common.transformers.PacketEventInfo, net.minecraft.network.INetHandler, net.minecraft.network.login.server.S02PacketLoginSuccess)
-	 */
-	@Override
-	protected void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, S02PacketLoginSuccess packet)
-	{
-		if (netHandler instanceof INetHandlerLoginClient)
-		{
-			INetHandlerLoginClient netHandlerLoginClient = (INetHandlerLoginClient)netHandler;
-			
-			ClientPluginChannels clientPluginChannels = LiteLoader.getClientPluginChannels();
-			if (clientPluginChannels instanceof ClientPluginChannelsClient)
-			{
-				((ClientPluginChannelsClient)clientPluginChannels).onPostLogin(netHandlerLoginClient, packet);
-			}
-			
-			this.postLoginListeners.all().onPostLogin(netHandlerLoginClient, packet);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.core.PacketEvents#handlePacket(com.mumfrey.liteloader.common.transformers.PacketEventInfo, net.minecraft.network.INetHandler, net.minecraft.network.play.server.S02PacketChat)
-	 */
-	@Override
-	protected void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, S02PacketChat packet)
-	{
-		if (packet.getChatComponent() == null)
-			return;
-		
-		IChatComponent originalChat = packet.getChatComponent();
-		IChatComponent chat = originalChat;
-		String message = chat.getFormattedText();
-		
-		// Chat filters get a stab at the chat first, if any filter returns false the chat is discarded
-		for (ChatFilter chatFilter : this.chatFilters)
-		{
-			ReturnValue<IChatComponent> ret = new ReturnValue<IChatComponent>();
-			
-			if (chatFilter.onChat(chat, message, ret))
-			{
-				if (ret.isSet())
-				{
-					chat = ret.get();
-					if (chat == null)
-					{
-						chat = new ChatComponentText("");
-					}
-					message = chat.getFormattedText();
-				}
-			}
-			else
-			{
-				e.cancel();
-				return;
-			}
-		}
-		
-		if (chat != originalChat)
-		{
-			try
-			{
-				chat = ChatUtilities.convertLegacyCodes(chat);
-				PrivateFieldsClient.chatMessage.set(packet, chat);
-			}
-			catch (Exception ex)
-			{
-				ex.printStackTrace();
-			}
-		}
-		
-		// Chat listeners get the chat if no filter removed it
-		this.chatListeners.all().onChat(chat, message);
-	}
+    private static RealmsServer joiningRealm;
+
+    private FastIterableDeque<JoinGameListener> joinGameListeners = new HandlerList<JoinGameListener>(JoinGameListener.class);
+    private FastIterableDeque<ChatListener> chatListeners = new HandlerList<ChatListener>(ChatListener.class);
+    private FastIterableDeque<ChatFilter> chatFilters = new HandlerList<ChatFilter>(ChatFilter.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
+    private FastIterableDeque<PreJoinGameListener> preJoinGameListeners = new HandlerList<PreJoinGameListener>(PreJoinGameListener.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
+    private FastIterableDeque<PostLoginListener> postLoginListeners = new HandlerList<PostLoginListener>(PostLoginListener.class);
+
+    @Override
+    public void registerInterfaces(InterfaceRegistrationDelegate delegate)
+    {
+        super.registerInterfaces(delegate);
+
+        delegate.registerInterface(JoinGameListener.class);
+        delegate.registerInterface(ChatListener.class);
+        delegate.registerInterface(ChatFilter.class);
+        delegate.registerInterface(PreJoinGameListener.class);
+        delegate.registerInterface(PostLoginListener.class);
+    }
+
+    /**
+     * @param joinGameListener
+     */
+    public void registerJoinGameListener(JoinGameListener joinGameListener)
+    {
+        this.joinGameListeners.add(joinGameListener);
+    }
+
+    /**
+     * @param chatFilter
+     */
+    public void registerChatFilter(ChatFilter chatFilter)
+    {
+        this.chatFilters.add(chatFilter);
+    }
+
+    /**
+     * @param chatListener
+     */
+    public void registerChatListener(ChatListener chatListener)
+    {
+        if (chatListener instanceof ChatFilter)
+        {
+            LiteLoaderLogger.warning("Interface error initialising mod '%1s'. A mod implementing ChatFilter and ChatListener is not supported! Remove one of these interfaces", chatListener.getName());
+        }
+        else
+        {
+            this.chatListeners.add(chatListener);
+        }
+    }
+
+    /**
+     * @param joinGameListener
+     */
+    public void registerPreJoinGameListener(PreJoinGameListener joinGameListener)
+    {
+        this.preJoinGameListeners.add(joinGameListener);
+    }
+
+    /**
+     * @param postLoginListener
+     */
+    public void registerPostLoginListener(PostLoginListener postLoginListener)
+    {
+        this.postLoginListeners.add(postLoginListener);
+    }
+
+    public static void onJoinRealm(EventInfo<RealmsMainScreen> e, long arg1, RealmsServer server)
+    {
+        PacketEventsClient.joiningRealm = server;
+    }
+
+    @Override
+    protected IThreadListener getPacketContextListener(Packets.Context context)
+    {
+        if (context == Packets.Context.SERVER)
+        {
+            return MinecraftServer.getServer();
+        }
+
+        return Minecraft.getMinecraft();
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.core.PacketEvents#handlePacket(com.mumfrey.liteloader.common.transformers.PacketEventInfo, net.minecraft.network.INetHandler, net.minecraft.network.play.server.S01PacketJoinGame)
+     */
+    @Override
+    protected void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, S01PacketJoinGame packet)
+    {
+        if (this.preJoinGame(e, netHandler, packet))
+        {
+            return;
+        }
+
+        ((INetHandlerPlayClient)netHandler).handleJoinGame(packet);
+        super.handlePacket(e, netHandler, packet);
+
+        this.postJoinGame(e, netHandler, packet);
+    }
+
+    /**
+     * @param e
+     * @param netHandler
+     * @param packet
+     * @throws EventCancellationException
+     */
+    private boolean preJoinGame(PacketEventInfo<Packet> e, INetHandler netHandler, S01PacketJoinGame packet) throws EventCancellationException
+    {
+        if (!(netHandler instanceof INetHandlerPlayClient))
+        {
+            return true;
+        }
+
+        e.cancel();
+
+        return !this.preJoinGameListeners.all().onPreJoinGame(netHandler, packet);
+    }
+
+    /**
+     * @param e
+     * @param netHandler
+     * @param packet
+     */
+    private void postJoinGame(PacketEventInfo<Packet> e, INetHandler netHandler, S01PacketJoinGame packet)
+    {
+        this.joinGameListeners.all().onJoinGame(netHandler, packet, Minecraft.getMinecraft().getCurrentServerData(), PacketEventsClient.joiningRealm);
+        PacketEventsClient.joiningRealm = null;
+
+        ClientPluginChannels clientPluginChannels = LiteLoader.getClientPluginChannels();
+        if (clientPluginChannels instanceof ClientPluginChannelsClient)
+        {
+            ((ClientPluginChannelsClient)clientPluginChannels).onJoinGame(netHandler, packet);
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.core.PacketEvents#handlePacket(com.mumfrey.liteloader.common.transformers.PacketEventInfo, net.minecraft.network.INetHandler, net.minecraft.network.login.server.S02PacketLoginSuccess)
+     */
+    @Override
+    protected void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, S02PacketLoginSuccess packet)
+    {
+        if (netHandler instanceof INetHandlerLoginClient)
+        {
+            INetHandlerLoginClient netHandlerLoginClient = (INetHandlerLoginClient)netHandler;
+
+            ClientPluginChannels clientPluginChannels = LiteLoader.getClientPluginChannels();
+            if (clientPluginChannels instanceof ClientPluginChannelsClient)
+            {
+                ((ClientPluginChannelsClient)clientPluginChannels).onPostLogin(netHandlerLoginClient, packet);
+            }
+
+            this.postLoginListeners.all().onPostLogin(netHandlerLoginClient, packet);
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.core.PacketEvents#handlePacket(com.mumfrey.liteloader.common.transformers.PacketEventInfo, net.minecraft.network.INetHandler, net.minecraft.network.play.server.S02PacketChat)
+     */
+    @Override
+    protected void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, S02PacketChat packet)
+    {
+        if (packet.getChatComponent() == null)
+            return;
+
+        IChatComponent originalChat = packet.getChatComponent();
+        IChatComponent chat = originalChat;
+        String message = chat.getFormattedText();
+
+        // Chat filters get a stab at the chat first, if any filter returns false the chat is discarded
+        for (ChatFilter chatFilter : this.chatFilters)
+        {
+            ReturnValue<IChatComponent> ret = new ReturnValue<IChatComponent>();
+
+            if (chatFilter.onChat(chat, message, ret))
+            {
+                if (ret.isSet())
+                {
+                    chat = ret.get();
+                    if (chat == null)
+                    {
+                        chat = new ChatComponentText("");
+                    }
+                    message = chat.getFormattedText();
+                }
+            }
+            else
+            {
+                e.cancel();
+                return;
+            }
+        }
+
+        if (chat != originalChat)
+        {
+            try
+            {
+                chat = ChatUtilities.convertLegacyCodes(chat);
+                PrivateFieldsClient.chatMessage.set(packet, chat);
+            }
+            catch (Exception ex)
+            {
+                ex.printStackTrace();
+            }
+        }
+
+        // Chat listeners get the chat if no filter removed it
+        this.chatListeners.all().onChat(chat, message);
+    }
 }
@@ -24,92 +24,92 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  */
 public class ResourceObserver implements ModLoadObserver
 {
-	private final Map<String, IResourcePack> resourcePacks = new HashMap<String, IResourcePack>();
-	
-	public ResourceObserver()
-	{
-	}
-
-	@Override
-	public void onModLoaded(LiteMod mod)
-	{
-	}
-	
-	@SuppressWarnings("unchecked")
-	@Override
-	public void onPostModLoaded(ModInfo<LoadableMod<?>> handle)
-	{
-		if (!handle.hasContainer()) return;
-		
-		LoadableMod<?> container = handle.getContainer();
-		String modName = handle.getMod().getName();
-		
-		if (modName == null) return;
-		
-		if (container.hasResources())
-		{
-			LiteLoaderLogger.info("Adding \"%s\" to active resource pack set", container.getLocation());
-			IResourcePack resourcePack = this.initResourcePack(container, modName);
-			Resources<IResourceManager, IResourcePack> resources = (Resources<IResourceManager, IResourcePack>)LiteLoader.getGameEngine().getResources();
-			if (resources.registerResourcePack(resourcePack))
-			{
-				LiteLoaderLogger.info("Successfully added \"%s\" to active resource pack set", container.getLocation());
-			}
-		}
-	}
-	
-	public IResourcePack initResourcePack(LoadableMod<?> container, String name)
-	{
-		IResourcePack resourcePack = this.getResourcePack(container);
-		
-		if (resourcePack == null)
-		{
-			if (container.isDirectory())
-			{
-				LiteLoaderLogger.info("Setting up \"%s/%s\" as mod resource pack with identifier \"%s\"", container.toFile().getParentFile().getName(), container.getName(), name);
-				resourcePack = new ModResourcePackDir(name, container.toFile());
-			}
-			else
-			{
-				LiteLoaderLogger.info("Setting up \"%s\" as mod resource pack with identifier \"%s\"", container.getName(), name);
-				resourcePack = new ModResourcePack(name, container.toFile());
-			}
-			
-			this.setResourcePack(container, resourcePack);
-		}
-		
-		return resourcePack;
-	}
-
-	private IResourcePack getResourcePack(LoadableMod<?> container)
-	{
-		String path = container.getLocation();
-		return this.resourcePacks.get(path);
-	}
-	
-	private void setResourcePack(LoadableMod<?> container, IResourcePack resourcePack)
-	{
-		String path = container.getLocation();
-		this.resourcePacks.put(path, resourcePack);
-	}
-
-	@Override
-	public void onModLoadFailed(LoadableMod<?> container, String identifier, String reason, Throwable th)
-	{
-	}
-
-	@Override
-	public void onPreInitMod(LiteMod mod)
-	{
-	}
-
-	@Override
-	public void onPostInitMod(LiteMod mod)
-	{
-	}
-
-	@Override
-	public void onMigrateModConfig(LiteMod mod, File newConfigPath, File oldConfigPath)
-	{
-	}
+    private final Map<String, IResourcePack> resourcePacks = new HashMap<String, IResourcePack>();
+
+    public ResourceObserver()
+    {
+    }
+
+    @Override
+    public void onModLoaded(LiteMod mod)
+    {
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void onPostModLoaded(ModInfo<LoadableMod<?>> handle)
+    {
+        if (!handle.hasContainer()) return;
+
+        LoadableMod<?> container = handle.getContainer();
+        String modName = handle.getMod().getName();
+
+        if (modName == null) return;
+
+        if (container.hasResources())
+        {
+            LiteLoaderLogger.info("Adding \"%s\" to active resource pack set", container.getLocation());
+            IResourcePack resourcePack = this.initResourcePack(container, modName);
+            Resources<IResourceManager, IResourcePack> resources = (Resources<IResourceManager, IResourcePack>)LiteLoader.getGameEngine().getResources();
+            if (resources.registerResourcePack(resourcePack))
+            {
+                LiteLoaderLogger.info("Successfully added \"%s\" to active resource pack set", container.getLocation());
+            }
+        }
+    }
+
+    public IResourcePack initResourcePack(LoadableMod<?> container, String name)
+    {
+        IResourcePack resourcePack = this.getResourcePack(container);
+
+        if (resourcePack == null)
+        {
+            if (container.isDirectory())
+            {
+                LiteLoaderLogger.info("Setting up \"%s/%s\" as mod resource pack with identifier \"%s\"", container.toFile().getParentFile().getName(), container.getName(), name);
+                resourcePack = new ModResourcePackDir(name, container.toFile());
+            }
+            else
+            {
+                LiteLoaderLogger.info("Setting up \"%s\" as mod resource pack with identifier \"%s\"", container.getName(), name);
+                resourcePack = new ModResourcePack(name, container.toFile());
+            }
+
+            this.setResourcePack(container, resourcePack);
+        }
+
+        return resourcePack;
+    }
+
+    private IResourcePack getResourcePack(LoadableMod<?> container)
+    {
+        String path = container.getLocation();
+        return this.resourcePacks.get(path);
+    }
+
+    private void setResourcePack(LoadableMod<?> container, IResourcePack resourcePack)
+    {
+        String path = container.getLocation();
+        this.resourcePacks.put(path, resourcePack);
+    }
+
+    @Override
+    public void onModLoadFailed(LoadableMod<?> container, String identifier, String reason, Throwable th)
+    {
+    }
+
+    @Override
+    public void onPreInitMod(LiteMod mod)
+    {
+    }
+
+    @Override
+    public void onPostInitMod(LiteMod mod)
+    {
+    }
+
+    @Override
+    public void onMigrateModConfig(LiteMod mod, File newConfigPath, File oldConfigPath)
+    {
+    }
 }
@@ -14,79 +14,79 @@ import com.mumfrey.liteloader.common.Resources;
 public class ResourcesClient implements Resources<IResourceManager, IResourcePack>
 {
-	private final Minecraft engine = Minecraft.getMinecraft();
-	
-	/**
-	 * Registered resource packs 
-	 */
-	private final Map<String, IResourcePack> registeredResourcePacks = new HashMap<String, IResourcePack>();
+    private final Minecraft engine = Minecraft.getMinecraft();
-	/**
-	 * True while initialising mods if we need to do a resource manager reload once the process is completed
-	 */
-	private boolean pendingResourceReload;
+    /**
+     * Registered resource packs 
+     */
+    private final Map<String, IResourcePack> registeredResourcePacks = new HashMap<String, IResourcePack>();
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.common.GameEngine#refreshResources(boolean)
-	 */
-	@Override
-	public void refreshResources(boolean force)
-	{
-		if (this.pendingResourceReload || force)
-		{
-			LoadingProgress.setMessage("Reloading Resources...");
-			this.pendingResourceReload = false;
-			this.engine.refreshResources();
-		}
-	}
+    /**
+     * True while initialising mods if we need to do a resource manager reload once the process is completed
+     */
+    private boolean pendingResourceReload;
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.common.GameEngine#getResourceManager()
-	 */
-	@Override
-	public IResourceManager getResourceManager()
-	{
-		return this.engine.getResourceManager();
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.common.GameEngine#registerResourcePack(net.minecraft.client.resources.IResourcePack)
-	 */
-	@Override
-	public boolean registerResourcePack(IResourcePack resourcePack)
-	{
-		if (!this.registeredResourcePacks.containsKey(resourcePack.getPackName()))
-		{
-			this.pendingResourceReload = true;
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.common.GameEngine#refreshResources(boolean)
+     */
+    @Override
+    public void refreshResources(boolean force)
+    {
+        if (this.pendingResourceReload || force)
+        {
+            LoadingProgress.setMessage("Reloading Resources...");
+            this.pendingResourceReload = false;
+            this.engine.refreshResources();
+        }
+    }
-			List<IResourcePack> defaultResourcePacks = ((IMinecraft)this.engine).getDefaultResourcePacks();
-			if (!defaultResourcePacks.contains(resourcePack))
-			{
-				defaultResourcePacks.add(resourcePack);
-				this.registeredResourcePacks.put(resourcePack.getPackName(), resourcePack);
-				return true;
-			}
-		}
-		
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.common.GameEngine#unRegisterResourcePack(net.minecraft.client.resources.IResourcePack)
-	 */
-	@Override
-	public boolean unRegisterResourcePack(IResourcePack resourcePack)
-	{
-		if (this.registeredResourcePacks.containsValue(resourcePack))
-		{
-			this.pendingResourceReload = true;
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.common.GameEngine#getResourceManager()
+     */
+    @Override
+    public IResourceManager getResourceManager()
+    {
+        return this.engine.getResourceManager();
+    }
-			List<IResourcePack> defaultResourcePacks = ((IMinecraft)this.engine).getDefaultResourcePacks();
-			this.registeredResourcePacks.remove(resourcePack.getPackName());
-			defaultResourcePacks.remove(resourcePack);
-			return true;
-		}
-		
-		return false;
-	}
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.common.GameEngine#registerResourcePack(net.minecraft.client.resources.IResourcePack)
+     */
+    @Override
+    public boolean registerResourcePack(IResourcePack resourcePack)
+    {
+        if (!this.registeredResourcePacks.containsKey(resourcePack.getPackName()))
+        {
+            this.pendingResourceReload = true;
+
+            List<IResourcePack> defaultResourcePacks = ((IMinecraft)this.engine).getDefaultResourcePacks();
+            if (!defaultResourcePacks.contains(resourcePack))
+            {
+                defaultResourcePacks.add(resourcePack);
+                this.registeredResourcePacks.put(resourcePack.getPackName(), resourcePack);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.common.GameEngine#unRegisterResourcePack(net.minecraft.client.resources.IResourcePack)
+     */
+    @Override
+    public boolean unRegisterResourcePack(IResourcePack resourcePack)
+    {
+        if (this.registeredResourcePacks.containsValue(resourcePack))
+        {
+            this.pendingResourceReload = true;
+
+            List<IResourcePack> defaultResourcePacks = ((IMinecraft)this.engine).getDefaultResourcePacks();
+            this.registeredResourcePacks.remove(resourcePack.getPackName());
+            defaultResourcePacks.remove(resourcePack);
+            return true;
+        }
+
+        return false;
+    }
 }
@@ -16,112 +16,112 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  */
 public class SoundHandlerReloadInhibitor
 {
-	/**
-	 * Resource Manager
-	 */
-	private SimpleReloadableResourceManager resourceManager;
-	
-	/**
-	 * Sound manager
-	 */
-	private SoundHandler soundHandler;
-	
-	/**
-	 * True if inhibition is currently active
-	 */
-	private boolean inhibited;
-	
-	/**
-	 * So that we can re-insert the sound manager at the same index, we store the index we remove it from
-	 */
-	private int storedIndex;
-	
-	SoundHandlerReloadInhibitor(SimpleReloadableResourceManager resourceManager, SoundHandler soundHandler)
-	{
-		this.resourceManager = resourceManager;
-		this.soundHandler = soundHandler;
-	}
-	
-	/**
-	 * Inhibit the sound manager reload notification
-	 * 
-	 * @return true if inhibit was applied
-	 */
-	public boolean inhibit()
-	{
-		try
-		{
-			if (!this.inhibited)
-			{
-				List<IResourceManagerReloadListener> reloadListeners = PrivateFieldsClient.reloadListeners.get(this.resourceManager);
-				if (reloadListeners != null)
-				{
-					this.storedIndex = reloadListeners.indexOf(this.soundHandler);
-					if (this.storedIndex > -1)
-					{
-						LiteLoaderLogger.info("Inhibiting sound handler reload");
-						reloadListeners.remove(this.soundHandler);
-						this.inhibited = true;
-						return true;
-					}
-				}
-			}
-		}
-		catch (Exception ex)
-		{
-			LiteLoaderLogger.warning("Error inhibiting sound handler reload");
-		}
-		
-		return false;
-	}
-	
-	/**
-	 * Remove the sound manager reload inhibit
-	 * 
-	 * @param reload True to reload the sound manager now
-	 * @return true if the sound manager was successfully restored
-	 */
-	public boolean unInhibit(boolean reload)
-	{
-		try
-		{
-			if (this.inhibited)
-			{
-				List<IResourceManagerReloadListener> reloadListeners = PrivateFieldsClient.reloadListeners.get(this.resourceManager);
-				if (reloadListeners != null)
-				{
-					if (this.storedIndex > -1)
-					{
-						reloadListeners.add(this.storedIndex, this.soundHandler);
-					}
-					else
-					{
-						reloadListeners.add(this.soundHandler);
-					}
-
-					LiteLoaderLogger.info("Sound handler reload inhibit removed");
-					
-					if (reload)
-					{
-						LiteLoaderLogger.info("Reloading sound handler");
-						this.soundHandler.onResourceManagerReload(this.resourceManager);
-					}
-
-					this.inhibited = false;
-					return true;
-				}
-			}
-		}
-		catch (Exception ex)
-		{
-			LiteLoaderLogger.warning("Error removing sound handler reload inhibit");
-		}
-		
-		return false;
-	}
-
-	public boolean isInhibited()
-	{
-		return this.inhibited;
-	}
+    /**
+     * Resource Manager
+     */
+    private SimpleReloadableResourceManager resourceManager;
+
+    /**
+     * Sound manager
+     */
+    private SoundHandler soundHandler;
+
+    /**
+     * True if inhibition is currently active
+     */
+    private boolean inhibited;
+
+    /**
+     * So that we can re-insert the sound manager at the same index, we store the index we remove it from
+     */
+    private int storedIndex;
+
+    SoundHandlerReloadInhibitor(SimpleReloadableResourceManager resourceManager, SoundHandler soundHandler)
+    {
+        this.resourceManager = resourceManager;
+        this.soundHandler = soundHandler;
+    }
+
+    /**
+     * Inhibit the sound manager reload notification
+     * 
+     * @return true if inhibit was applied
+     */
+    public boolean inhibit()
+    {
+        try
+        {
+            if (!this.inhibited)
+            {
+                List<IResourceManagerReloadListener> reloadListeners = PrivateFieldsClient.reloadListeners.get(this.resourceManager);
+                if (reloadListeners != null)
+                {
+                    this.storedIndex = reloadListeners.indexOf(this.soundHandler);
+                    if (this.storedIndex > -1)
+                    {
+                        LiteLoaderLogger.info("Inhibiting sound handler reload");
+                        reloadListeners.remove(this.soundHandler);
+                        this.inhibited = true;
+                        return true;
+                    }
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            LiteLoaderLogger.warning("Error inhibiting sound handler reload");
+        }
+
+        return false;
+    }
+
+    /**
+     * Remove the sound manager reload inhibit
+     * 
+     * @param reload True to reload the sound manager now
+     * @return true if the sound manager was successfully restored
+     */
+    public boolean unInhibit(boolean reload)
+    {
+        try
+        {
+            if (this.inhibited)
+            {
+                List<IResourceManagerReloadListener> reloadListeners = PrivateFieldsClient.reloadListeners.get(this.resourceManager);
+                if (reloadListeners != null)
+                {
+                    if (this.storedIndex > -1)
+                    {
+                        reloadListeners.add(this.storedIndex, this.soundHandler);
+                    }
+                    else
+                    {
+                        reloadListeners.add(this.soundHandler);
+                    }
+
+                    LiteLoaderLogger.info("Sound handler reload inhibit removed");
+
+                    if (reload)
+                    {
+                        LiteLoaderLogger.info("Reloading sound handler");
+                        this.soundHandler.onResourceManagerReload(this.resourceManager);
+                    }
+
+                    this.inhibited = false;
+                    return true;
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            LiteLoaderLogger.warning("Error removing sound handler reload inhibit");
+        }
+
+        return false;
+    }
+
+    public boolean isInhibited()
+    {
+        return this.inhibited;
+    }
 }
@@ -6,23 +6,23 @@ import com.mumfrey.liteloader.api.TranslationProvider;
 public class Translator implements TranslationProvider
 {
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.TranslationProvider#translate(java.lang.String, java.lang.Object[])
-	 */
-	@Override
-	public String translate(String key, Object... args)
-	{
-		// TODO doesn't currently honour the contract of TranslationProvider::translate, should return null if translation is missing
-		return I18n.format(key, args);
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.TranslationProvider#translate(java.lang.String, java.lang.String, java.lang.Object[])
-	 */
-	@Override
-	public String translate(String locale, String key, Object... args)
-	{
-		// TODO doesn't currently honour the contract of TranslationProvider::translate, should return null if translation is missing
-		return I18n.format(key, args);
-	}
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.TranslationProvider#translate(java.lang.String, java.lang.Object[])
+     */
+    @Override
+    public String translate(String key, Object... args)
+    {
+        // TODO doesn't currently honour the contract of TranslationProvider::translate, should return null if translation is missing
+        return I18n.format(key, args);
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.TranslationProvider#translate(java.lang.String, java.lang.String, java.lang.Object[])
+     */
+    @Override
+    public String translate(String locale, String key, Object... args)
+    {
+        // TODO doesn't currently honour the contract of TranslationProvider::translate, should return null if translation is missing
+        return I18n.format(key, args);
+    }
 }
@@ -17,120 +17,120 @@ import com.mumfrey.liteloader.util.render.Icon;
  */
 public class LiteLoaderBrandingProvider implements BrandingProvider
 {
-	public static final int BRANDING_COLOUR = 0xFF4785D1;
-
-	public static final ResourceLocation ABOUT_TEXTURE = new ResourceLocation("liteloader", "textures/gui/about.png");
-	public static final IconAbsolute LOGO_COORDS = new IconAbsolute(LiteLoaderBrandingProvider.ABOUT_TEXTURE, "logo", 128, 40, 0, 0, 256, 80);
-	public static final IconAbsolute ICON_COORDS = new IconAbsolute(LiteLoaderBrandingProvider.ABOUT_TEXTURE, "chicken", 32, 45, 0, 80, 64, 170);
-	public static final IconAbsolute TWITTER_AVATAR_COORDS = new IconAbsolute(LiteLoaderBrandingProvider.ABOUT_TEXTURE, "twitter_avatar", 32, 32, 192, 80, 256, 144);
-	
-	public static final URI LITELOADER_URI = URI.create("http://www.liteloader.com/");
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.BrandingProvider#getPriority()
-	 */
-	@Override
-	public int getPriority()
-	{
-		return -1000;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.BrandingProvider#getDisplayName()
-	 */
-	@Override
-	public String getDisplayName()
-	{
-		return "LiteLoader " + I18n.format("gui.about.versiontext", LiteLoader.getVersion());
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.BrandingProvider#getCopyrightText()
-	 */
-	@Override
-	public String getCopyrightText()
-	{
-		return "Copyright (c) 2012-2014 Adam Mummery-Smith";
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.BrandingProvider#getHomepage()
-	 */
-	@Override
-	public URI getHomepage()
-	{
-		return LiteLoaderBrandingProvider.LITELOADER_URI;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.BrandingProvider#getBrandingColour()
-	 */
-	@Override
-	public int getBrandingColour()
-	{
-		return LiteLoaderBrandingProvider.BRANDING_COLOUR;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.BrandingProvider#getLogoResource()
-	 */
-	@Override
-	public ResourceLocation getLogoResource()
-	{
-		return LiteLoaderBrandingProvider.ABOUT_TEXTURE;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.BrandingProvider#getLogoCoords()
-	 */
-	@Override
-	public Icon getLogoCoords()
-	{
-		return LiteLoaderBrandingProvider.LOGO_COORDS; 
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.BrandingProvider#getIconResource()
-	 */
-	@Override
-	public ResourceLocation getIconResource()
-	{
-		return LiteLoaderBrandingProvider.ABOUT_TEXTURE;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.BrandingProvider#getIconCoords()
-	 */
-	@Override
-	public Icon getIconCoords()
-	{
-		return LiteLoaderBrandingProvider.ICON_COORDS; 
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.BrandingProvider#getTwitterUserName()
-	 */
-	@Override
-	public String getTwitterUserName()
-	{
-		return "therealeq2";
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.BrandingProvider#getTwitterAvatarResource()
-	 */
-	@Override
-	public ResourceLocation getTwitterAvatarResource()
-	{
-		return LiteLoaderBrandingProvider.ABOUT_TEXTURE;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.BrandingProvider#getTwitterAvatarCoords()
-	 */
-	@Override
-	public Icon getTwitterAvatarCoords()
-	{
-		return LiteLoaderBrandingProvider.TWITTER_AVATAR_COORDS; 
-	}
+    public static final int BRANDING_COLOUR = 0xFF4785D1;
+
+    public static final ResourceLocation ABOUT_TEXTURE = new ResourceLocation("liteloader", "textures/gui/about.png");
+    public static final IconAbsolute LOGO_COORDS = new IconAbsolute(LiteLoaderBrandingProvider.ABOUT_TEXTURE, "logo", 128, 40, 0, 0, 256, 80);
+    public static final IconAbsolute ICON_COORDS = new IconAbsolute(LiteLoaderBrandingProvider.ABOUT_TEXTURE, "chicken", 32, 45, 0, 80, 64, 170);
+    public static final IconAbsolute TWITTER_AVATAR_COORDS = new IconAbsolute(LiteLoaderBrandingProvider.ABOUT_TEXTURE, "twitter_avatar", 32, 32, 192, 80, 256, 144);
+
+    public static final URI LITELOADER_URI = URI.create("http://www.liteloader.com/");
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.BrandingProvider#getPriority()
+     */
+    @Override
+    public int getPriority()
+    {
+        return -1000;
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.BrandingProvider#getDisplayName()
+     */
+    @Override
+    public String getDisplayName()
+    {
+        return "LiteLoader " + I18n.format("gui.about.versiontext", LiteLoader.getVersion());
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.BrandingProvider#getCopyrightText()
+     */
+    @Override
+    public String getCopyrightText()
+    {
+        return "Copyright (c) 2012-2014 Adam Mummery-Smith";
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.BrandingProvider#getHomepage()
+     */
+    @Override
+    public URI getHomepage()
+    {
+        return LiteLoaderBrandingProvider.LITELOADER_URI;
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.BrandingProvider#getBrandingColour()
+     */
+    @Override
+    public int getBrandingColour()
+    {
+        return LiteLoaderBrandingProvider.BRANDING_COLOUR;
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.BrandingProvider#getLogoResource()
+     */
+    @Override
+    public ResourceLocation getLogoResource()
+    {
+        return LiteLoaderBrandingProvider.ABOUT_TEXTURE;
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.BrandingProvider#getLogoCoords()
+     */
+    @Override
+    public Icon getLogoCoords()
+    {
+        return LiteLoaderBrandingProvider.LOGO_COORDS; 
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.BrandingProvider#getIconResource()
+     */
+    @Override
+    public ResourceLocation getIconResource()
+    {
+        return LiteLoaderBrandingProvider.ABOUT_TEXTURE;
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.BrandingProvider#getIconCoords()
+     */
+    @Override
+    public Icon getIconCoords()
+    {
+        return LiteLoaderBrandingProvider.ICON_COORDS; 
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.BrandingProvider#getTwitterUserName()
+     */
+    @Override
+    public String getTwitterUserName()
+    {
+        return "therealeq2";
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.BrandingProvider#getTwitterAvatarResource()
+     */
+    @Override
+    public ResourceLocation getTwitterAvatarResource()
+    {
+        return LiteLoaderBrandingProvider.ABOUT_TEXTURE;
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.BrandingProvider#getTwitterAvatarCoords()
+     */
+    @Override
+    public Icon getTwitterAvatarCoords()
+    {
+        return LiteLoaderBrandingProvider.TWITTER_AVATAR_COORDS; 
+    }
 }
@@ -26,126 +26,126 @@ import com.mumfrey.liteloader.transformers.event.json.ModEvents;
  */
 public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI
 {
-	private static final String PKG_LITELOADER_CLIENT = LiteLoaderCoreAPI.PKG_LITELOADER + ".client";
-
-	private static final String[] requiredTransformers = {
-		LiteLoaderCoreAPI.PKG_LITELOADER + ".transformers.event.EventProxyTransformer",
-		LiteLoaderCoreAPI.PKG_LITELOADER + ".launch.LiteLoaderTransformer",
-		LiteLoaderCoreAPIClient.PKG_LITELOADER_CLIENT + ".transformers.CrashReportTransformer"
-	};
-	
-	private static final String[] requiredDownstreamTransformers = {
-		LiteLoaderCoreAPI.PKG_LITELOADER_COMMON + ".transformers.LiteLoaderPacketTransformer",
-		LiteLoaderCoreAPIClient.PKG_LITELOADER_CLIENT + ".transformers.LiteLoaderEventInjectionTransformer",
-		LiteLoaderCoreAPIClient.PKG_LITELOADER_CLIENT + ".transformers.MinecraftTransformer",
-		LiteLoaderCoreAPI.PKG_LITELOADER + ".transformers.event.json.ModEventInjectionTransformer"
-	};
-	
-	private ObjectFactory<Minecraft, IntegratedServer> objectFactory;
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.LiteAPI#getRequiredTransformers()
-	 */
-	@Override
-	public String[] getRequiredTransformers()
-	{
-		return LiteLoaderCoreAPIClient.requiredTransformers;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.LiteAPI#getRequiredDownstreamTransformers()
-	 */
-	@Override
-	public String[] getRequiredDownstreamTransformers()
-	{
-		return LiteLoaderCoreAPIClient.requiredDownstreamTransformers;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.LiteAPI#getCustomisationProviders()
-	 */
-	@Override
-	public List<CustomisationProvider> getCustomisationProviders()
-	{
-		return ImmutableList.<CustomisationProvider>of
-		(
-			new LiteLoaderBrandingProvider(),
-			new LiteLoaderModInfoDecorator(),
-			new Translator()
-		);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.LiteAPI#getCoreProviders()
-	 */
-	@Override
-	public List<CoreProvider> getCoreProviders()
-	{
-		return ImmutableList.<CoreProvider>of
-		(
-			new LiteLoaderCoreProviderClient(this.properties),
-			LiteLoader.getInput()
-		);
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.LiteAPI#getInterfaceProviders()
-	 */
-	@Override
-	public List<InterfaceProvider> getInterfaceProviders()
-	{
-		ObjectFactory<?, ?> objectFactory = this.getObjectFactory();
-		
-		return ImmutableList.<InterfaceProvider>of
-		(
-			objectFactory.getEventBroker(),
-			objectFactory.getPacketEventBroker(),
-			objectFactory.getClientPluginChannels(),
-			objectFactory.getServerPluginChannels(),
-			MessageBus.getInstance()
-		);
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.LiteAPI#getPreInitObservers()
-	 */
-	@Override
-	public List<Observer> getPreInitObservers()
-	{
-		return ImmutableList.<Observer>of
-		(
-			new ModEvents()
-		);
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.LiteAPI#getObservers()
-	 */
-	@Override
-	public List<Observer> getObservers()
-	{
-		ObjectFactory<?, ?> objectFactory = this.getObjectFactory();
-		
-		return ImmutableList.<Observer>of
-		(
-			new ResourceObserver(),
-			objectFactory.getPanelManager(),
-			objectFactory.getEventBroker()
-		);
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.core.api.LiteLoaderCoreAPI#getObjectFactory()
-	 */
-	@Override
-	public ObjectFactory<?, ?> getObjectFactory()
-	{
-		if (this.objectFactory == null)
-		{
-			this.objectFactory = new ObjectFactoryClient(this.environment, this.properties);
-		}	
-		
-		return this.objectFactory;
-	}
+    private static final String PKG_LITELOADER_CLIENT = LiteLoaderCoreAPI.PKG_LITELOADER + ".client";
+
+    private static final String[] requiredTransformers = {
+            LiteLoaderCoreAPI.PKG_LITELOADER + ".transformers.event.EventProxyTransformer",
+            LiteLoaderCoreAPI.PKG_LITELOADER + ".launch.LiteLoaderTransformer",
+            LiteLoaderCoreAPIClient.PKG_LITELOADER_CLIENT + ".transformers.CrashReportTransformer"
+    };
+
+    private static final String[] requiredDownstreamTransformers = {
+            LiteLoaderCoreAPI.PKG_LITELOADER_COMMON + ".transformers.LiteLoaderPacketTransformer",
+            LiteLoaderCoreAPIClient.PKG_LITELOADER_CLIENT + ".transformers.LiteLoaderEventInjectionTransformer",
+            LiteLoaderCoreAPIClient.PKG_LITELOADER_CLIENT + ".transformers.MinecraftTransformer",
+            LiteLoaderCoreAPI.PKG_LITELOADER + ".transformers.event.json.ModEventInjectionTransformer"
+    };
+
+    private ObjectFactory<Minecraft, IntegratedServer> objectFactory;
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.LiteAPI#getRequiredTransformers()
+     */
+    @Override
+    public String[] getRequiredTransformers()
+    {
+        return LiteLoaderCoreAPIClient.requiredTransformers;
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.LiteAPI#getRequiredDownstreamTransformers()
+     */
+    @Override
+    public String[] getRequiredDownstreamTransformers()
+    {
+        return LiteLoaderCoreAPIClient.requiredDownstreamTransformers;
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.LiteAPI#getCustomisationProviders()
+     */
+    @Override
+    public List<CustomisationProvider> getCustomisationProviders()
+    {
+        return ImmutableList.<CustomisationProvider>of
+                (
+                        new LiteLoaderBrandingProvider(),
+                        new LiteLoaderModInfoDecorator(),
+                        new Translator()
+                        );
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.LiteAPI#getCoreProviders()
+     */
+    @Override
+    public List<CoreProvider> getCoreProviders()
+    {
+        return ImmutableList.<CoreProvider>of
+                (
+                        new LiteLoaderCoreProviderClient(this.properties),
+                        LiteLoader.getInput()
+                        );
+    }
+
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.LiteAPI#getInterfaceProviders()
+     */
+    @Override
+    public List<InterfaceProvider> getInterfaceProviders()
+    {
+        ObjectFactory<?, ?> objectFactory = this.getObjectFactory();
+
+        return ImmutableList.<InterfaceProvider>of
+                (
+                        objectFactory.getEventBroker(),
+                        objectFactory.getPacketEventBroker(),
+                        objectFactory.getClientPluginChannels(),
+                        objectFactory.getServerPluginChannels(),
+                        MessageBus.getInstance()
+                        );
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.LiteAPI#getPreInitObservers()
+     */
+    @Override
+    public List<Observer> getPreInitObservers()
+    {
+        return ImmutableList.<Observer>of
+                (
+                        new ModEvents()
+                        );
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.LiteAPI#getObservers()
+     */
+    @Override
+    public List<Observer> getObservers()
+    {
+        ObjectFactory<?, ?> objectFactory = this.getObjectFactory();
+
+        return ImmutableList.<Observer>of
+                (
+                        new ResourceObserver(),
+                        objectFactory.getPanelManager(),
+                        objectFactory.getEventBroker()
+                        );
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.core.api.LiteLoaderCoreAPI#getObjectFactory()
+     */
+    @Override
+    public ObjectFactory<?, ?> getObjectFactory()
+    {
+        if (this.objectFactory == null)
+        {
+            this.objectFactory = new ObjectFactoryClient(this.environment, this.properties);
+        }	
+
+        return this.objectFactory;
+    }
 }
@@ -19,89 +19,89 @@ import com.mumfrey.liteloader.util.render.IconTextured;
  */
 public class LiteLoaderModInfoDecorator implements ModInfoDecorator
 {
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.ModInfoDecorator#addIcons(com.mumfrey.liteloader.core.ModInfo, java.util.List)
-	 */
-	@Override
-	public void addIcons(final ModInfo<?> mod, List<IconTextured> icons)
-	{
-		if (mod.hasTweakClass())
-		{
-			icons.add(new IconAbsoluteClickable(LiteLoaderBrandingProvider.ABOUT_TEXTURE, I18n.format("gui.mod.providestweak"), 12, 12, 158, 80, 170, 92){
-				@Override
-				public void onClicked(Object source, Object container)
-				{
-					if (container instanceof GuiModListPanel)
-					{
-						((GuiModListPanel)container).displayModHelpMessage(mod, "gui.mod.providestweak", "gui.mod.help.tweak");
-					}
-				}
-			});
-		}
-		
-		if (mod.hasEventTransformers())
-		{
-			icons.add(new IconAbsoluteClickable(LiteLoaderBrandingProvider.ABOUT_TEXTURE, I18n.format("gui.mod.providesevents"), 12, 12, 170, 92, 182, 104){
-				@Override
-				public void onClicked(Object source, Object container)
-				{
-					if (container instanceof GuiModListPanel)
-					{
-						((GuiModListPanel)container).displayModHelpMessage(mod, "gui.mod.providesevents", "gui.mod.help.events");
-					}
-				}
-			});
-		}
-		
-		if (mod.hasClassTransformers())
-		{
-			icons.add(new IconAbsoluteClickable(LiteLoaderBrandingProvider.ABOUT_TEXTURE, I18n.format("gui.mod.providestransformer"), 12, 12, 170, 80, 182, 92){
-				@Override
-				public void onClicked(Object source, Object container)
-				{
-					if (container instanceof GuiModListPanel)
-					{
-						((GuiModListPanel)container).displayModHelpMessage(mod, "gui.mod.providestransformer", "gui.mod.help.transformer");
-					}
-				}
-			});
-		}
-		
-		if (mod.usesAPI())
-		{
-			icons.add(new IconAbsolute(LiteLoaderBrandingProvider.ABOUT_TEXTURE, I18n.format("gui.mod.usingapi"), 12, 12, 122, 92, 134, 104));
-		}
-		
-		List<Throwable> startupErrors = mod.getStartupErrors();
-		if (startupErrors != null && startupErrors.size() > 0)
-		{
-			icons.add(new IconAbsoluteClickable(LiteLoaderBrandingProvider.ABOUT_TEXTURE, I18n.format("gui.mod.startuperror", startupErrors.size()), 12, 12, 134, 92, 146, 104){
-				@Override
-				public void onClicked(Object source, Object container)
-				{
-					if (source instanceof GuiLiteLoaderPanel)
-					{
-						((GuiLiteLoaderPanel)source).showErrorPanel(mod);
-					}
-				}
-			});
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.ModInfoDecorator#modifyStatusText(com.mumfrey.liteloader.core.ModInfo, java.lang.String)
-	 */
-	@Override
-	public String modifyStatusText(ModInfo<?> mod, String statusText)
-	{
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.api.ModInfoDecorator#onDrawListEntry(int, int, float, int, int, int, int, boolean, com.mumfrey.liteloader.core.ModInfo, int, int, int)
-	 */
-	@Override
-	public void onDrawListEntry(int mouseX, int mouseY, float partialTicks, int xPosition, int yPosition, int width, int height, boolean selected, ModInfo<?> mod, int gradientColour, int titleColour, int statusColour)
-	{
-	}
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.ModInfoDecorator#addIcons(com.mumfrey.liteloader.core.ModInfo, java.util.List)
+     */
+    @Override
+    public void addIcons(final ModInfo<?> mod, List<IconTextured> icons)
+    {
+        if (mod.hasTweakClass())
+        {
+            icons.add(new IconAbsoluteClickable(LiteLoaderBrandingProvider.ABOUT_TEXTURE, I18n.format("gui.mod.providestweak"), 12, 12, 158, 80, 170, 92){
+                @Override
+                public void onClicked(Object source, Object container)
+                {
+                    if (container instanceof GuiModListPanel)
+                    {
+                        ((GuiModListPanel)container).displayModHelpMessage(mod, "gui.mod.providestweak", "gui.mod.help.tweak");
+                    }
+                }
+            });
+        }
+
+        if (mod.hasEventTransformers())
+        {
+            icons.add(new IconAbsoluteClickable(LiteLoaderBrandingProvider.ABOUT_TEXTURE, I18n.format("gui.mod.providesevents"), 12, 12, 170, 92, 182, 104){
+                @Override
+                public void onClicked(Object source, Object container)
+                {
+                    if (container instanceof GuiModListPanel)
+                    {
+                        ((GuiModListPanel)container).displayModHelpMessage(mod, "gui.mod.providesevents", "gui.mod.help.events");
+                    }
+                }
+            });
+        }
+
+        if (mod.hasClassTransformers())
+        {
+            icons.add(new IconAbsoluteClickable(LiteLoaderBrandingProvider.ABOUT_TEXTURE, I18n.format("gui.mod.providestransformer"), 12, 12, 170, 80, 182, 92){
+                @Override
+                public void onClicked(Object source, Object container)
+                {
+                    if (container instanceof GuiModListPanel)
+                    {
+                        ((GuiModListPanel)container).displayModHelpMessage(mod, "gui.mod.providestransformer", "gui.mod.help.transformer");
+                    }
+                }
+            });
+        }
+
+        if (mod.usesAPI())
+        {
+            icons.add(new IconAbsolute(LiteLoaderBrandingProvider.ABOUT_TEXTURE, I18n.format("gui.mod.usingapi"), 12, 12, 122, 92, 134, 104));
+        }
+
+        List<Throwable> startupErrors = mod.getStartupErrors();
+        if (startupErrors != null && startupErrors.size() > 0)
+        {
+            icons.add(new IconAbsoluteClickable(LiteLoaderBrandingProvider.ABOUT_TEXTURE, I18n.format("gui.mod.startuperror", startupErrors.size()), 12, 12, 134, 92, 146, 104){
+                @Override
+                public void onClicked(Object source, Object container)
+                {
+                    if (source instanceof GuiLiteLoaderPanel)
+                    {
+                        ((GuiLiteLoaderPanel)source).showErrorPanel(mod);
+                    }
+                }
+            });
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.ModInfoDecorator#modifyStatusText(com.mumfrey.liteloader.core.ModInfo, java.lang.String)
+     */
+    @Override
+    public String modifyStatusText(ModInfo<?> mod, String statusText)
+    {
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see com.mumfrey.liteloader.api.ModInfoDecorator#onDrawListEntry(int, int, float, int, int, int, int, boolean, com.mumfrey.liteloader.core.ModInfo, int, int, int)
+     */
+    @Override
+    public void onDrawListEntry(int mouseX, int mouseY, float partialTicks, int xPosition, int yPosition, int width, int height, boolean selected, ModInfo<?> mod, int gradientColour, int titleColour, int statusColour)
+    {
+    }
 }