added 2 new listeners, some refactoring and minor bugfixes

Mumfrey
1 parent d34ad93d
Showing 29 changed files with 398 additions and 209 deletions
debug/obfuscation.properties
java/client/com/mumfrey/liteloader/ChatFilter.java
java/client/com/mumfrey/liteloader/ChatListener.java
java/client/com/mumfrey/liteloader/EntityRenderListener.java
java/client/com/mumfrey/liteloader/ScreenshotListener.java
java/client/com/mumfrey/liteloader/client/CallbackProxyClient.java
java/client/com/mumfrey/liteloader/client/EventsClient.java → java/client/com/mumfrey/liteloader/client/LiteLoaderEventBrokerClient.java
java/client/com/mumfrey/liteloader/client/PacketEventsClient.java
java/client/com/mumfrey/liteloader/client/api/ObjectFactoryClient.java
java/client/com/mumfrey/liteloader/client/gui/GuiPanel.java
java/client/com/mumfrey/liteloader/client/gui/GuiPanelAbout.java
java/client/com/mumfrey/liteloader/client/gui/GuiPanelConfigContainer.java
java/client/com/mumfrey/liteloader/client/gui/GuiPanelError.java
java/client/com/mumfrey/liteloader/client/gui/GuiPanelLiteLoaderLog.java
java/client/com/mumfrey/liteloader/client/gui/GuiPanelMods.java
java/client/com/mumfrey/liteloader/client/gui/GuiScrollPanel.java
java/client/com/mumfrey/liteloader/client/transformers/LiteLoaderEventInjectionTransformer.java
java/common/com/mumfrey/liteloader/core/LiteLoader.java
java/common/com/mumfrey/liteloader/core/Events.java → java/common/com/mumfrey/liteloader/core/LiteLoaderEventBroker.java
java/common/com/mumfrey/liteloader/core/LiteLoaderVersion.java
@@ -24,4 +24,8 @@ func_147612_c=bindFramebufferTexture
 func_146230_a=drawChat
 func_179086_m=clear
 func_175068_a=renderWorldPass
-func_148256_e=getProfile
 \ No newline at end of file
+func_148256_e=getProfile
+func_148260_a=saveScreenshot
+func_148822_b=isFramebufferEnabled
+func_147939_a=doRenderEntity
+func_76986_a=doRender
 \ No newline at end of file
 package com.mumfrey.liteloader;
-import net.minecraft.network.play.server.S02PacketChat;
+import com.mumfrey.liteloader.core.LiteLoaderEventBroker.ReturnValue;
+
 import net.minecraft.util.IChatComponent;
@@ -14,10 +15,11 @@ public interface ChatFilter extends LiteMod
 	/**
 	 * Chat filter function, return false to filter this packet, true to pass the packet
 	 * 
-	 * @param chatPacket Chat packet to examine
 	 * @param chat ChatMessageComponent parsed from the chat packet
 	 * @param message Chat message parsed from the chat message component
+	 * @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(S02PacketChat chatPacket, IChatComponent chat, String message);
+	public abstract boolean onChat(IChatComponent chat, String message, ReturnValue<IChatComponent> newMessage);
 }
@@ -13,7 +13,7 @@ public interface ChatListener extends LiteMod
 	/**
 	 * Handle an inbound message
 	 * 
-	 * @param chat ChatMessageComponent parsed from the chat packet
+	 * @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);
+package com.mumfrey.liteloader;
+
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.entity.Entity;
+
+/**
+ * Interface for mods which want to receive callbacks when entities are rendered into the world
+ *  
+ * @author Adam Mummery-Smith
+ */
+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 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);
+}
+package com.mumfrey.liteloader;
+
+import net.minecraft.client.shader.Framebuffer;
+import net.minecraft.util.IChatComponent;
+
+import com.mumfrey.liteloader.core.LiteLoaderEventBroker.ReturnValue;
+
+/**
+ * Interface for mods which want to handle or inhibit the saving of screenshots
+ * 
+ * @author Adam Mummery-Smith
+ */
+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);
+}
 package com.mumfrey.liteloader.client;
+import java.io.File;
 import java.util.UUID;
 import net.minecraft.client.Minecraft;
@@ -7,12 +8,17 @@ import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.GuiIngame;
 import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.shader.Framebuffer;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.server.integrated.IntegratedServer;
 import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ScreenShotHelper;
 import net.minecraft.util.Session;
 import net.minecraft.world.WorldSettings;
@@ -29,12 +35,7 @@ import com.mumfrey.liteloader.transformers.event.ReturnEventInfo;
  */
 public class CallbackProxyClient
 {
-	/**
-	 * Tick clock, sent as a flag to the core onTick so that mods know it's a new tick
-	 */
-	private static boolean clock = false;
-	
-	private static EventsClient events;
+	private static LiteLoaderEventBrokerClient eventBroker;
 	private static boolean fboEnabled;
@@ -42,147 +43,145 @@ public class CallbackProxyClient
 	public static void onStartupComplete(EventInfo<Minecraft> e)
 	{
-		CallbackProxyClient.events = EventsClient.getInstance();
+		CallbackProxyClient.eventBroker = LiteLoaderEventBrokerClient.getInstance();
-		if (CallbackProxyClient.events == null)
+		if (CallbackProxyClient.eventBroker == 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.events.onStartupComplete();
+		CallbackProxyClient.eventBroker.onStartupComplete();
 	}
 	public static void onTimerUpdate(EventInfo<Minecraft> e)
 	{
-		CallbackProxyClient.events.onTimerUpdate();
+		CallbackProxyClient.eventBroker.onTimerUpdate();
 	}
 	public static void newTick(EventInfo<Minecraft> e)
 	{
-		CallbackProxyClient.clock = true;
 	}
 	public static void onTick(EventInfo<Minecraft> e)
 	{
-		CallbackProxyClient.events.onTick(CallbackProxyClient.clock);
-		CallbackProxyClient.clock = false;
+		CallbackProxyClient.eventBroker.onTick();
 	}
 	public static void onRender(EventInfo<Minecraft> e)
 	{
-		CallbackProxyClient.events.onRender();
+		CallbackProxyClient.eventBroker.onRender();
 	}
 	public static void preRenderGUI(EventInfo<EntityRenderer> e, float partialTicks)
 	{
-		CallbackProxyClient.events.preRenderGUI(partialTicks);
+		CallbackProxyClient.eventBroker.preRenderGUI(partialTicks);
 	}
 	public static void onSetupCameraTransform(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
 	{
-		CallbackProxyClient.events.onSetupCameraTransform(partialTicks, timeSlice);
+		CallbackProxyClient.eventBroker.onSetupCameraTransform(partialTicks, timeSlice);
 	}
 	public static void postRenderEntities(EventInfo<EntityRenderer> e, int pass, float partialTicks, long timeSlice)
 	{
-		CallbackProxyClient.events.postRenderEntities(partialTicks, timeSlice);
+		CallbackProxyClient.eventBroker.postRenderEntities(partialTicks, timeSlice);
 	}
 	public static void postRender(EventInfo<EntityRenderer> e, float partialTicks, long timeSlice)
 	{
-		CallbackProxyClient.events.postRender(partialTicks, timeSlice);
+		CallbackProxyClient.eventBroker.postRender(partialTicks, timeSlice);
 	}
 	public static void onRenderHUD(EventInfo<EntityRenderer> e, float partialTicks)
 	{
-		CallbackProxyClient.events.onRenderHUD(partialTicks);
+		CallbackProxyClient.eventBroker.onRenderHUD(partialTicks);
 	}
 	public static void onRenderChat(EventInfo<GuiIngame> e, float partialTicks)
 	{
-		CallbackProxyClient.events.onRenderChat(e.getSource().getChatGUI(), partialTicks);
+		CallbackProxyClient.eventBroker.onRenderChat(e.getSource().getChatGUI(), partialTicks);
 	}
 	public static void postRenderChat(EventInfo<GuiIngame> e, float partialTicks)
 	{
-		CallbackProxyClient.events.postRenderChat(e.getSource().getChatGUI(), partialTicks);
+		CallbackProxyClient.eventBroker.postRenderChat(e.getSource().getChatGUI(), partialTicks);
 	}
 	public static void postRenderHUD(EventInfo<EntityRenderer> e, float partialTicks)
 	{
-		CallbackProxyClient.events.postRenderHUD(partialTicks);
+		CallbackProxyClient.eventBroker.postRenderHUD(partialTicks);
 	}
 	public static void IntegratedServerCtor(EventInfo<IntegratedServer> e, Minecraft minecraft, String folderName, String worldName, WorldSettings worldSettings)
 	{
-		CallbackProxyClient.events.onStartServer(e.getSource(), folderName, worldName, worldSettings);
+		CallbackProxyClient.eventBroker.onStartServer(e.getSource(), folderName, worldName, worldSettings);
 	}
 	public static void onInitializePlayerConnection(EventInfo<ServerConfigurationManager> e, NetworkManager netManager, EntityPlayerMP player)
 	{
-		CallbackProxyClient.events.onInitializePlayerConnection(e.getSource(), netManager, player);
+		CallbackProxyClient.eventBroker.onInitializePlayerConnection(e.getSource(), netManager, player);
 	}
 	public static void onPlayerLogin(EventInfo<ServerConfigurationManager> e, EntityPlayerMP player)
 	{
-		CallbackProxyClient.events.onPlayerLogin(e.getSource(), player);
+		CallbackProxyClient.eventBroker.onPlayerLogin(e.getSource(), player);
 	}
 	public static void onPlayerLogout(EventInfo<ServerConfigurationManager> e, EntityPlayerMP player)
 	{
-		CallbackProxyClient.events.onPlayerLogout(e.getSource(), player);
+		CallbackProxyClient.eventBroker.onPlayerLogout(e.getSource(), player);
 	}
 	public static void onSpawnPlayer(ReturnEventInfo<ServerConfigurationManager, EntityPlayerMP> e, GameProfile profile)
 	{
-		CallbackProxyClient.events.onSpawnPlayer(e.getSource(), e.getReturnValue(), profile);
+		CallbackProxyClient.eventBroker.onSpawnPlayer(e.getSource(), e.getReturnValue(), profile);
 	}
 	public static void onRespawnPlayer(ReturnEventInfo<ServerConfigurationManager, EntityPlayerMP> e, EntityPlayerMP oldPlayer, int dimension, boolean won)
 	{
-		CallbackProxyClient.events.onRespawnPlayer(e.getSource(), e.getReturnValue(), oldPlayer, dimension, won);
+		CallbackProxyClient.eventBroker.onRespawnPlayer(e.getSource(), e.getReturnValue(), oldPlayer, dimension, won);
 	}
 	public static void onOutboundChat(EventInfo<EntityPlayerSP> e, String message)
 	{
-		CallbackProxyClient.events.onSendChatMessage(e, message);
+		CallbackProxyClient.eventBroker.onSendChatMessage(e, message);
 	}
 	public static void onResize(EventInfo<Minecraft> e)
 	{
-		if (CallbackProxyClient.events == null) return;
-		CallbackProxyClient.events.onResize(e.getSource());
+		if (CallbackProxyClient.eventBroker == null) return;
+		CallbackProxyClient.eventBroker.onResize(e.getSource());
 	}
 	public static void preRenderFBO(EventInfo<Minecraft> e)
 	{
-		if (CallbackProxyClient.events == null) return;
+		if (CallbackProxyClient.eventBroker == null) return;
 		CallbackProxyClient.fboEnabled = OpenGlHelper.isFramebufferEnabled();
 		if (CallbackProxyClient.fboEnabled)
 		{
 			CallbackProxyClient.renderingFBO = true;
-			CallbackProxyClient.events.preRenderFBO(e.getSource().getFramebuffer());
+			CallbackProxyClient.eventBroker.preRenderFBO(e.getSource().getFramebuffer());
 		}
 	}
 	public static void postRenderFBO(EventInfo<Minecraft> e)
 	{
-		if (CallbackProxyClient.events == null) return;
+		if (CallbackProxyClient.eventBroker == null) return;
 		CallbackProxyClient.renderingFBO = false;
 		if (CallbackProxyClient.fboEnabled)
 		{
-			CallbackProxyClient.events.postRenderFBO(e.getSource().getFramebuffer());
+			CallbackProxyClient.eventBroker.postRenderFBO(e.getSource().getFramebuffer());
 		}
 	}
 	public static void renderFBO(EventInfo<Framebuffer> e, int width, int height, boolean flag)
 	{
-		if (CallbackProxyClient.events == null) return;
+		if (CallbackProxyClient.eventBroker == null) return;
 		if (CallbackProxyClient.renderingFBO)
 		{
-			CallbackProxyClient.events.onRenderFBO(e.getSource(), width, height);
+			CallbackProxyClient.eventBroker.onRenderFBO(e.getSource(), width, height);
 		}
 		CallbackProxyClient.renderingFBO = false;
@@ -190,7 +189,22 @@ public class CallbackProxyClient
 	public static void onRenderWorld(EventInfo<EntityRenderer> e, float partialTicks, long timeSlice)
 	{
-		CallbackProxyClient.events.onRenderWorld(partialTicks, timeSlice);
+		CallbackProxyClient.eventBroker.onRenderWorld(partialTicks, timeSlice);
+	}
+	
+	public static void onSaveScreenshot(ReturnEventInfo<ScreenShotHelper, IChatComponent> e, File gameDir, String name, int width, int height, Framebuffer fbo)
+	{
+		CallbackProxyClient.eventBroker.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.eventBroker.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.eventBroker.onPostRenderEntity(e.getSource(), entity, xPos, yPos, zPos, yaw, partialTicks, render);
 	}
 	/**
@@ -4,28 +4,22 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.GuiNewChat;
 import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.shader.Framebuffer;
 import net.minecraft.entity.Entity;
 import net.minecraft.network.play.client.C01PacketChatMessage;
 import net.minecraft.server.integrated.IntegratedServer;
+import net.minecraft.util.IChatComponent;
+import net.minecraft.util.ScreenShotHelper;
 import net.minecraft.util.Timer;
 import org.lwjgl.input.Mouse;
-import com.mumfrey.liteloader.ChatRenderListener;
-import com.mumfrey.liteloader.FrameBufferListener;
-import com.mumfrey.liteloader.GameLoopListener;
-import com.mumfrey.liteloader.HUDRenderListener;
-import com.mumfrey.liteloader.InitCompleteListener;
-import com.mumfrey.liteloader.OutboundChatFilter;
-import com.mumfrey.liteloader.OutboundChatListener;
-import com.mumfrey.liteloader.PostRenderListener;
-import com.mumfrey.liteloader.RenderListener;
-import com.mumfrey.liteloader.Tickable;
-import com.mumfrey.liteloader.ViewportListener;
+import com.mumfrey.liteloader.*;
 import com.mumfrey.liteloader.client.overlays.IMinecraft;
 import com.mumfrey.liteloader.common.LoadingProgress;
-import com.mumfrey.liteloader.core.Events;
+import com.mumfrey.liteloader.core.LiteLoaderEventBroker;
 import com.mumfrey.liteloader.core.InterfaceRegistrationDelegate;
 import com.mumfrey.liteloader.core.LiteLoader;
 import com.mumfrey.liteloader.core.event.HandlerList;
@@ -33,11 +27,12 @@ import com.mumfrey.liteloader.core.event.HandlerList.ReturnLogicOp;
 import com.mumfrey.liteloader.interfaces.FastIterableDeque;
 import com.mumfrey.liteloader.launch.LoaderProperties;
 import com.mumfrey.liteloader.transformers.event.EventInfo;
+import com.mumfrey.liteloader.transformers.event.ReturnEventInfo;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
-public class EventsClient extends Events<Minecraft, IntegratedServer>
+public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker<Minecraft, IntegratedServer>
 {	
-	private static EventsClient instance;
+	private static LiteLoaderEventBrokerClient instance;
 	/**
 	 * Reference to the game
@@ -45,21 +40,6 @@ public class EventsClient extends Events&lt;Minecraft, IntegratedServer&gt;
 	protected final GameEngineClient engineClient;
 	/**
-	 * Reference to the minecraft timer
-	 */
-	private Timer minecraftTimer;
-	
-	/**
-	 * Flags which keep track of whether hooks have been applied
-	 */
-	private boolean lateInitDone;
-
-	/**
-	 * ScaledResolution used by the pre-chat and post-chat render callbacks
-	 */
-	private ScaledResolution currentResolution;
-	
-	/**
 	 * Current screen width
 	 */
 	private int screenWidth = 854;
@@ -91,20 +71,22 @@ public class EventsClient extends Events&lt;Minecraft, IntegratedServer&gt;
 	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 EventsClient(LiteLoader loader, GameEngineClient engine, LoaderProperties properties)
+	public LiteLoaderEventBrokerClient(LiteLoader loader, GameEngineClient engine, LoaderProperties properties)
 	{
 		super(loader, engine, properties);
-		EventsClient.instance = this;
+		LiteLoaderEventBrokerClient.instance = this;
 		this.engineClient = (GameEngineClient)engine;
 	}
-	static EventsClient getInstance()
+	static LiteLoaderEventBrokerClient getInstance()
 	{
-		return EventsClient.instance;
+		return LiteLoaderEventBrokerClient.instance;
 	}
 	/* (non-Javadoc)
@@ -126,6 +108,8 @@ public class EventsClient extends Events&lt;Minecraft, IntegratedServer&gt;
 		delegate.registerInterface(FrameBufferListener.class);
 		delegate.registerInterface(InitCompleteListener.class);
 		delegate.registerInterface(OutboundChatFilter.class);
+		delegate.registerInterface(ScreenshotListener.class);
+		delegate.registerInterface(EntityRenderListener.class);
 	}
 	/* (non-Javadoc)
@@ -223,6 +207,22 @@ public class EventsClient extends Events&lt;Minecraft, IntegratedServer&gt;
 	{
 		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
@@ -232,23 +232,18 @@ public class EventsClient extends Events&lt;Minecraft, IntegratedServer&gt;
 	{
 		this.engine.refreshResources(false);
-		if (!this.lateInitDone)
+		for (InitCompleteListener initMod : this.initListeners)
 		{
-			this.lateInitDone = true;
-			
-			for (InitCompleteListener initMod : this.initListeners)
+			try
 			{
-				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());
-				}
+				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());
 			}
 		}
@@ -259,9 +254,9 @@ public class EventsClient extends Events&lt;Minecraft, IntegratedServer&gt;
 	public void onResize(Minecraft minecraft)
 	{
-		this.currentResolution = this.engineClient.getScaledResolution();
-		this.screenWidth = this.currentResolution.getScaledWidth();
-		this.screenHeight = this.currentResolution.getScaledHeight();
+		ScaledResolution currentResolution = this.engineClient.getScaledResolution();
+		this.screenWidth = currentResolution.getScaledWidth();
+		this.screenHeight = currentResolution.getScaledHeight();
 		if (this.wasFullScreen != minecraft.isFullScreen())
 		{
@@ -269,7 +264,7 @@ public class EventsClient extends Events&lt;Minecraft, IntegratedServer&gt;
 		}
 		this.wasFullScreen = minecraft.isFullScreen();
-		this.viewportListeners.all().onViewportResized(this.currentResolution, minecraft.displayWidth, minecraft.displayHeight);
+		this.viewportListeners.all().onViewportResized(currentResolution, minecraft.displayWidth, minecraft.displayHeight);
 	}
 	/**
@@ -286,9 +281,8 @@ public class EventsClient extends Events&lt;Minecraft, IntegratedServer&gt;
 	 * @param timeSlice 
 	 * @param partialTicks2 
 	 */
-	void postRenderEntities(float partialTicks2, long timeSlice)
+	void postRenderEntities(float partialTicks, long timeSlice)
 	{
-		float partialTicks = (this.minecraftTimer != null) ? this.minecraftTimer.elapsedPartialTicks : 0.0F;
 		this.postRenderListeners.all().onPostRenderEntities(partialTicks);
 	}
@@ -298,9 +292,8 @@ public class EventsClient extends Events&lt;Minecraft, IntegratedServer&gt;
 	 * @param timeSlice 
 	 * @param partialTicks2 
 	 */
-	void postRender(float partialTicks2, long timeSlice)
+	void postRender(float partialTicks, long timeSlice)
 	{
-		float partialTicks = (this.minecraftTimer != null) ? this.minecraftTimer.elapsedPartialTicks : 0.0F;
 		this.postRenderListeners.all().onPostRender(partialTicks);
 	}
@@ -376,24 +369,13 @@ public class EventsClient extends Events&lt;Minecraft, IntegratedServer&gt;
 	 * 
 	 * @param clock True if this is a new tick (otherwise it's just a new frame)
 	 */
-	void onTick(boolean clock)
+	void onTick()
 	{
 		this.profiler.startSection("litemods");
-		float partialTicks = 0.0F;
-		
-		// Try to get the minecraft timer object and determine the value of the
-		// partialTicks
-		if (clock || this.minecraftTimer == null)
-		{
-			this.minecraftTimer = ((IMinecraft)this.engine.getClient()).getTimer();
-		}
-		// Hooray, we got the timer reference
-		if (this.minecraftTimer != null)
-		{
-			partialTicks = this.minecraftTimer.renderPartialTicks;
-			clock = this.minecraftTimer.elapsedTicks > 0;
-		}
+		Timer minecraftTimer = ((IMinecraft)this.engine.getClient()).getTimer();
+		float partialTicks = minecraftTimer.renderPartialTicks;
+		boolean clock = minecraftTimer.elapsedTicks > 0;
 		Minecraft minecraft = this.engine.getClient();
@@ -414,18 +396,11 @@ public class EventsClient extends Events&lt;Minecraft, IntegratedServer&gt;
 		this.tickListeners.all().onTick(minecraft, partialTicks, inGame, clock);
 		// Detected world change
-		if (minecraft.theWorld != null)
+		int worldHashCode = (minecraft.theWorld != null) ? minecraft.theWorld.hashCode() : 0;
+		if (worldHashCode != this.worldHashCode)
 		{
-			if (minecraft.theWorld.hashCode() != this.worldHashCode)
-			{
-				this.worldHashCode = minecraft.theWorld.hashCode();
-				super.onWorldChanged(minecraft.theWorld);
-			}
-		}
-		else
-		{
-			this.worldHashCode = 0;
-			super.onWorldChanged(null);
+			this.worldHashCode = worldHashCode;
+			super.onWorldChanged(minecraft.theWorld);
 		}
 		this.profiler.endSection();
@@ -481,8 +456,55 @@ public class EventsClient extends Events&lt;Minecraft, IntegratedServer&gt;
 	 * @param partialTicks
 	 * @param timeSlice
 	 */
-	public void onRenderWorld(float partialTicks, long timeSlice)
+	void onRenderWorld(float partialTicks, long timeSlice)
 	{
 		this.renderListeners.all().onRenderWorld();
 	}
+	
+	/**
+	 * @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);
+	}
 }
@@ -7,6 +7,7 @@ import net.minecraft.network.login.server.S02PacketLoginSuccess;
 import net.minecraft.network.play.INetHandlerPlayClient;
 import net.minecraft.network.play.server.S01PacketJoinGame;
 import net.minecraft.network.play.server.S02PacketChat;
+import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.IChatComponent;
 import com.mumfrey.liteloader.ChatFilter;
@@ -15,6 +16,7 @@ import com.mumfrey.liteloader.PostLoginListener;
 import com.mumfrey.liteloader.PreJoinGameListener;
 import com.mumfrey.liteloader.common.transformers.PacketEventInfo;
 import com.mumfrey.liteloader.core.ClientPluginChannels;
+import com.mumfrey.liteloader.core.LiteLoaderEventBroker.ReturnValue;
 import com.mumfrey.liteloader.core.InterfaceRegistrationDelegate;
 import com.mumfrey.liteloader.core.LiteLoader;
 import com.mumfrey.liteloader.core.PacketEvents;
@@ -146,14 +148,22 @@ public class PacketEventsClient extends PacketEvents
 		IChatComponent chat = packet.func_148915_c();
 		String message = chat.getFormattedText();
-		// Chat filters get a stab at the chat first, if any filter returns
-		// false the chat is discarded
+		// Chat filters get a stab at the chat first, if any filter returns false the chat is discarded
 		for (ChatFilter chatFilter : this.chatFilters)
 		{
-			if (chatFilter.onChat(packet, chat, message))
+			ReturnValue<IChatComponent> ret = new ReturnValue<IChatComponent>();
+			
+			if (chatFilter.onChat(chat, message, ret))
 			{
-				chat = packet.func_148915_c();
-				message = chat.getFormattedText();
+				if (ret.isSet())
+				{
+					chat = ret.get();
+					if (chat == null)
+					{
+						chat = new ChatComponentText("");
+					}
+					message = chat.getFormattedText();
+				}
 			}
 			else
 			{
@@ -4,7 +4,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.server.integrated.IntegratedServer;
-import com.mumfrey.liteloader.client.EventsClient;
+import com.mumfrey.liteloader.client.LiteLoaderEventBrokerClient;
 import com.mumfrey.liteloader.client.ClientPluginChannelsClient;
 import com.mumfrey.liteloader.client.GameEngineClient;
 import com.mumfrey.liteloader.client.LiteLoaderPanelManager;
@@ -12,7 +12,7 @@ import com.mumfrey.liteloader.client.PacketEventsClient;
 import com.mumfrey.liteloader.client.gui.startup.LoadingBar;
 import com.mumfrey.liteloader.common.GameEngine;
 import com.mumfrey.liteloader.core.ClientPluginChannels;
-import com.mumfrey.liteloader.core.Events;
+import com.mumfrey.liteloader.core.LiteLoaderEventBroker;
 import com.mumfrey.liteloader.core.LiteLoader;
 import com.mumfrey.liteloader.core.PacketEvents;
 import com.mumfrey.liteloader.core.ServerPluginChannels;
@@ -34,7 +34,7 @@ class ObjectFactoryClient implements ObjectFactory&lt;Minecraft, IntegratedServer&gt;
 	private LoaderProperties properties;
-	private EventsClient clientEvents;
+	private LiteLoaderEventBrokerClient clientEvents;
 	private PacketEventsClient clientPacketEvents;
@@ -53,11 +53,11 @@ class ObjectFactoryClient implements ObjectFactory&lt;Minecraft, IntegratedServer&gt;
 	}
 	@Override
-	public Events<Minecraft, IntegratedServer> getEventBroker()
+	public LiteLoaderEventBroker<Minecraft, IntegratedServer> getEventBroker()
 	{
 		if (this.clientEvents == null)
 		{
-			this.clientEvents = new EventsClient(LiteLoader.getInstance(), (GameEngineClient)this.getGameEngine(), this.properties);
+			this.clientEvents = new LiteLoaderEventBrokerClient(LiteLoader.getInstance(), (GameEngineClient)this.getGameEngine(), this.properties);
 		}
 		return this.clientEvents;
@@ -2,7 +2,6 @@ package com.mumfrey.liteloader.client.gui;
 import static com.mumfrey.liteloader.gl.GL.*;
-import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
@@ -125,7 +124,7 @@ public abstract class GuiPanel extends Gui
 	 * @param mouseY
 	 * @param mouseButton
 	 */
-	void mousePressed(int mouseX, int mouseY, int mouseButton) throws IOException
+	void mousePressed(int mouseX, int mouseY, int mouseButton)
 	{
 		if (mouseButton == 0)
 		{
 package com.mumfrey.liteloader.client.gui;
-import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
@@ -216,7 +215,7 @@ class GuiPanelAbout extends GuiPanel implements ScrollPanelContent
 	}
 	@Override
-	void mousePressed(int mouseX, int mouseY, int mouseButton) throws IOException
+	void mousePressed(int mouseX, int mouseY, int mouseButton)
 	{
 		this.scrollPane.mousePressed(mouseX, mouseY, mouseButton);
@@ -2,9 +2,6 @@ package com.mumfrey.liteloader.client.gui;
 import static com.mumfrey.liteloader.gl.GL.*;
 import static com.mumfrey.liteloader.gl.GLClippingPlanes.*;
-
-import java.io.IOException;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.resources.I18n;
@@ -218,10 +215,9 @@ class GuiPanelConfigContainer extends GuiPanel implements ConfigPanelHost
 	 * @param mouseX
 	 * @param mouseY
 	 * @param mouseButton
-	 * @throws IOException 
 	 */
 	@Override
-	void mousePressed(int mouseX, int mouseY, int mouseButton) throws IOException
+	void mousePressed(int mouseX, int mouseY, int mouseButton)
 	{
 		if (mouseButton == 0)
 		{
 package com.mumfrey.liteloader.client.gui;
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
@@ -131,7 +130,7 @@ public class GuiPanelError extends GuiPanel implements ScrollPanelContent
 	}
 	@Override
-	void mousePressed(int mouseX, int mouseY, int mouseButton) throws IOException
+	void mousePressed(int mouseX, int mouseY, int mouseButton)
 	{
 		this.scrollPane.mousePressed(mouseX, mouseY, mouseButton);
 		super.mousePressed(mouseX, mouseY, mouseButton);
@@ -2,7 +2,6 @@ package com.mumfrey.liteloader.client.gui;
 import static com.mumfrey.liteloader.gl.GL.*;
-import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
@@ -333,10 +332,9 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
 	 * @param mouseX
 	 * @param mouseY
 	 * @param mouseButton
-	 * @throws IOException 
 	 */
 	@Override
-	void mousePressed(int mouseX, int mouseY, int mouseButton) throws IOException
+	void mousePressed(int mouseX, int mouseY, int mouseButton)
 	{
 		this.scrollPane.mousePressed(mouseX, mouseY, mouseButton);
@@ -3,7 +3,6 @@ package com.mumfrey.liteloader.client.gui;
 import static com.mumfrey.liteloader.gl.GL.*;
 import static com.mumfrey.liteloader.gl.GLClippingPlanes.*;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -164,7 +163,7 @@ public class GuiPanelMods extends GuiPanel
 	}
 	@Override
-	void mousePressed(int mouseX, int mouseY, int mouseButton) throws IOException
+	void mousePressed(int mouseX, int mouseY, int mouseButton)
 	{
 		if (mouseButton == 0)
 		{
@@ -2,9 +2,6 @@ package com.mumfrey.liteloader.client.gui;
 import static com.mumfrey.liteloader.gl.GL.*;
 import static com.mumfrey.liteloader.gl.GLClippingPlanes.*;
-
-import java.io.IOException;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
@@ -142,7 +139,7 @@ class GuiScrollPanel extends GuiPanel
 	}
 	@Override
-	public void mousePressed(int mouseX, int mouseY, int mouseButton) throws IOException
+	public void mousePressed(int mouseX, int mouseY, int mouseButton)
 	{
 		mouseY += this.scrollBar.getValue() - this.top;
 		mouseX -= this.left;
@@ -51,6 +51,9 @@ public class LiteLoaderEventInjectionTransformer extends EventInjectionTransform
 		Event onRespawnPlayer                  = Event.getOrCreate("onRespawnPlayer",              false);
 		Event onStartupComplete                = Event.getOrCreate("onStartupComplete",            false);
 		Event onSessionProfileBad              = Event.getOrCreate("onSessionProfileBad",          true);
+		Event onSaveScreenshot                 = Event.getOrCreate("onSaveScreenshot",             true);
+		Event onRenderEntity                   = Event.getOrCreate("onRenderEntity",               false);
+		Event onPostRenderEntity               = Event.getOrCreate("onPostRenderEntity",           false);
 		// Injection Points
 		InjectionPoint methodHead              = new MethodHead();
@@ -62,6 +65,8 @@ public class LiteLoaderEventInjectionTransformer extends EventInjectionTransform
 		InjectionPoint beforeRender            = new BeforeInvoke(updateCameraAndRender);
 		InjectionPoint beforeDrawChat          = new BeforeInvoke(drawChat);
 		InjectionPoint beforeEndProfiler       = new BeforeInvoke(endSection);
+		InjectionPoint beforeIsFBOEnabled      = new BeforeInvoke(isFramebufferEnabled);
+		InjectionPoint beforeRenderEntity      = new BeforeInvoke(doRender).setCaptureLocals(true);
 		InjectionPoint beforeTickProfiler      = new BeforeStringInvoke("tick",         startSection);
 		InjectionPoint beforeCenterProfiler    = new BeforeStringInvoke("center",       startSection);
 		InjectionPoint beforeRenderProfiler    = new BeforeStringInvoke("gameRenderer", endStartSection);
@@ -95,6 +100,9 @@ public class LiteLoaderEventInjectionTransformer extends EventInjectionTransform
 		this.add(onSpawnPlayer,                spawnPlayer,                (methodReturn),            "onSpawnPlayer");
 		this.add(onRespawnPlayer,              respawnPlayer,              (methodReturn),            "onRespawnPlayer");
 		this.add(onStartupComplete,            startGame,                  (methodReturn),            "onStartupComplete");
+		this.add(onSaveScreenshot,             saveScreenshot,             (beforeIsFBOEnabled),      "onSaveScreenshot");
+		this.add(onRenderEntity,               doRenderEntity,             (beforeRenderEntity),      "onRenderEntity");
+		this.add(onPostRenderEntity,           doRenderEntity,        after(beforeRenderEntity),      "onPostRenderEntity");
 		// Compatibility handlers
 		this.add(onSessionProfileBad,          getProfile,                 (beforeNewGameProfile),    "generateOfflineUUID");
@@ -143,7 +143,7 @@ public final class LiteLoader
 	/**
 	 * Event manager
 	 */
-	private Events<?, ?> events;
+	private LiteLoaderEventBroker<?, ?> events;
 	/**
 	 * Plugin channel manager 
@@ -33,9 +33,45 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  * @param <TClient> Type of the client runtime, "Minecraft" on client and null on the server
  * @param <TServer> Type of the server runtime, "IntegratedServer" on the client, "MinecraftServer" on the server 
  */
-public abstract class Events<TClient, TServer extends MinecraftServer> implements InterfaceProvider, IResourceManagerReloadListener
+public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftServer> implements InterfaceProvider, IResourceManagerReloadListener
 {
 	/**
+	 * @author Adam Mummery-Smith
+	 *
+	 * @param <T>
+	 */
+	public static class ReturnValue<T>
+	{
+		private T value;
+		private boolean isSet;
+		
+		public ReturnValue(T value)
+		{
+			this.value = value;
+		}
+
+		public ReturnValue()
+		{
+		}
+		
+		public boolean isSet()
+		{
+			return this.isSet;
+		}
+		
+		public T get()
+		{
+			return this.value;
+		}
+		
+		public void set(T value)
+		{
+			this.isSet = true;
+			this.value = value;
+		}
+	}
+	
+	/**
 	 * Reference to the loader instance
 	 */
 	protected final LiteLoader loader;
@@ -61,14 +97,14 @@ public abstract class Events&lt;TClient, TServer extends MinecraftServer&gt; implement
 	 * List of mods which monitor server player events
 	 */
 	private FastIterable<ServerPlayerListener> serverPlayerListeners = new HandlerList<ServerPlayerListener>(ServerPlayerListener.class);
-
+	
 	/**
 	 * Package private ctor
 	 * 
 	 * @param loader
 	 * @param minecraft
 	 */
-	public Events(LiteLoader loader, GameEngine<TClient, TServer> engine, LoaderProperties properties)
+	public LiteLoaderEventBroker(LiteLoader loader, GameEngine<TClient, TServer> engine, LoaderProperties properties)
 	{
 		this.loader   = loader;
 		this.engine   = engine;
@@ -37,7 +37,7 @@ public enum LiteLoaderVersion
 	MC_1_7_10_R1(28, 1404673785, "1.7.10", "1.7.10_01", "1.7.10"),
 	MC_1_7_10_R2(29, 1405369406, "1.7.10", "1.7.10_02", "1.7.10"),
 	MC_1_7_10_R3(30, 1407687918, "1.7.10", "1.7.10_03", "1.7.10", "1.7.10_03"),
-	MC_1_7_10_R4(31, 0,          "1.7.10", "1.7.10_04", "1.7.10", "1.7.10_03", "1.7.10_04"),
+	MC_1_7_10_R4(31, 1412718533, "1.7.10", "1.7.10_04", "1.7.10", "1.7.10_03", "1.7.10_04"),
 	MC_1_8_0_R0(32, 0,          "1.8.0",  "1.8.0",     "1.8", "1.8.0");
 	/**
@@ -146,7 +146,12 @@ public final class EventProxy
 		}
 		tpl.append(")\n\t    {\n\t        // handler code here\n\t    }");
-		return tpl.toString();
+		String template = tpl.toString();
+		if (template.contains(", ReturnType>"))
+		{
+			template = template.replace("static void", "static <ReturnType> void");
+		}
+		return template;
 	}
 	private static boolean appendTypeName(StringBuilder tpl, Type type, String sourceClass)
@@ -160,7 +165,7 @@ public final class EventProxy
 				String typeName = type.getClassName();
 				typeName = typeName.substring(typeName.lastIndexOf('.') + 1);
 				tpl.append(typeName);
-				if (typeName.endsWith("ReturnEventInfo")) tpl.append('<').append(sourceClass).append(", ?>");
+				if (typeName.endsWith("ReturnEventInfo")) tpl.append('<').append(sourceClass).append(", ReturnType>");
 				else if (typeName.endsWith("EventInfo")) tpl.append('<').append(sourceClass).append('>');
 				return false;
 			default:
@@ -25,6 +25,7 @@ import org.objectweb.asm.tree.*;
 import com.mumfrey.liteloader.Priority;
 import com.mumfrey.liteloader.core.runtime.Obf;
 import com.mumfrey.liteloader.interfaces.FastIterableDeque;
+import com.mumfrey.liteloader.transformers.ByteCodeUtilities;
 import com.mumfrey.liteloader.util.SortableValue;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
@@ -923,7 +924,7 @@ public class HandlerList&lt;T&gt; extends LinkedList&lt;T&gt; implements FastIterableDeque&lt;T
 			boolean isOrOperation = this.logicOp.isOr();
 			boolean breakOnMatch = this.logicOp.breakOnMatch();
 			int initialValue = isOrOperation && (!this.logicOp.assumeTrue() || this.size > 0) ? Opcodes.ICONST_0 : Opcodes.ICONST_1;
-			int localIndex = this.getFirstLocalIndex(args);
+			int localIndex = ByteCodeUtilities.getArgsSize(args);
 			method.instructions.add(new InsnNode(initialValue));
 			method.instructions.add(new VarInsnNode(Opcodes.ISTORE, localIndex));
@@ -984,13 +985,6 @@ public class HandlerList&lt;T&gt; extends LinkedList&lt;T&gt; implements FastIterableDeque&lt;T
 			return argNumber;
 		}
-		private int getFirstLocalIndex(Type[] args)
-		{
-			int argNumber = 1;
-			for (Type type : args) argNumber += type.getSize();
-			return argNumber;
-		}
-
 		/**
 		 * @param baseName
 		 * @param typeName
 package com.mumfrey.liteloader.core.runtime;
+import java.io.File;
+
 import com.mumfrey.liteloader.transformers.event.MethodInfo;
 /**
@@ -29,6 +31,11 @@ public abstract class Methods
 	public static final MethodInfo respawnPlayer          = new MethodInfo(Obf.ServerConfigurationManager, Obf.respawnPlayer,                Obf.EntityPlayerMP, Obf.EntityPlayerMP, Integer.TYPE, Boolean.TYPE);
 	public static final MethodInfo glClear                = new MethodInfo(Obf.GlStateManager,             Obf.clear,                        Void.TYPE, Integer.TYPE);
 	public static final MethodInfo getProfile             = new MethodInfo(Obf.Session,                    Obf.getProfile,                   Obf.GameProfile);
+	public static final MethodInfo saveScreenshot         = new MethodInfo(Obf.ScreenShotHelper,           Obf.saveScreenshot,               Obf.IChatComponent, File.class, String.class, Integer.TYPE, Integer.TYPE, Obf.FrameBuffer);
+	public static final MethodInfo isFramebufferEnabled   = new MethodInfo(Obf.OpenGlHelper,               Obf.isFramebufferEnabled,         Boolean.TYPE);
+	public static final MethodInfo doRenderEntity         = new MethodInfo(Obf.RenderManager,              Obf.doRenderEntity,               Boolean.TYPE, Obf.Entity, Double.TYPE, Double.TYPE, Double.TYPE, Float.TYPE, Float.TYPE, Boolean.TYPE);
+	public static final MethodInfo doRender               = new MethodInfo(Obf.Render,                     Obf.doRender,                     Void.TYPE, Obf.Entity, Double.TYPE, Double.TYPE, Double.TYPE, Float.TYPE, Float.TYPE);
+	public static final MethodInfo doRenderShadowAndFire  = new MethodInfo(Obf.Render,                     Obf.doRenderShadowAndFire,        Void.TYPE, Obf.Entity, Double.TYPE, Double.TYPE, Double.TYPE, Float.TYPE, Float.TYPE);
 	public static final MethodInfo startSection           = new MethodInfo(Obf.Profiler,                   Obf.startSection,                 Void.TYPE, String.class);
 	public static final MethodInfo endSection             = new MethodInfo(Obf.Profiler,                   Obf.endSection,                   Void.TYPE);
@@ -51,6 +51,12 @@ public class Obf
 	public static final Obf                   GuiNewChat = new Obf("net.minecraft.client.gui.GuiNewChat",                        "buh" );
 	public static final Obf               GlStateManager = new Obf("net.minecraft.client.renderer.GlStateManager",               "cjm" );
 	public static final Obf                      Session = new Obf("net.minecraft.util.Session",                                 "btw" );
+	public static final Obf               IChatComponent = new Obf("net.minecraft.util.IChatComponent",                          "ho"  );
+	public static final Obf             ScreenShotHelper = new Obf("net.minecraft.util.ScreenShotHelper",                        "btt" );
+	public static final Obf                 OpenGlHelper = new Obf("net.minecraft.client.renderer.OpenGlHelper",                 "dax" );
+	public static final Obf                       Entity = new Obf("net.minecraft.entity.Entity",                                "wv"  );
+	public static final Obf                RenderManager = new Obf("net.minecraft.client.renderer.entity.RenderManager",         "cpt" );
+	public static final Obf                       Render = new Obf("net.minecraft.client.renderer.entity.Render",                "cpu" );
 	// Fields
 	// -----------------------------------------------------------------------------------------
@@ -94,6 +100,11 @@ public class Obf
 	public static final Obf                        clear = new Obf("func_179086_m",                                              "m"   );
 	public static final Obf              renderWorldPass = new Obf("func_175068_a",                                              "a"   );
 	public static final Obf                   getProfile = new Obf("func_148256_e",                                              "a"   );
+	public static final Obf               saveScreenshot = new Obf("func_148260_a",                                              "a"   );
+	public static final Obf         isFramebufferEnabled = new Obf("func_148822_b",                                              "i"   );
+	public static final Obf               doRenderEntity = new Obf("func_147939_a",                                              "a"   );
+	public static final Obf                     doRender = new Obf("func_76986_a",                                               "a"   );
+	public static final Obf        doRenderShadowAndFire = new Obf("func_76979_b",                                               "b"   );
 	public static final int MCP = 0;
 	public static final int SRG = 1;
@@ -4,7 +4,7 @@ import net.minecraft.server.MinecraftServer;
 import com.mumfrey.liteloader.common.GameEngine;
 import com.mumfrey.liteloader.core.ClientPluginChannels;
-import com.mumfrey.liteloader.core.Events;
+import com.mumfrey.liteloader.core.LiteLoaderEventBroker;
 import com.mumfrey.liteloader.core.PacketEvents;
 import com.mumfrey.liteloader.core.ServerPluginChannels;
 import com.mumfrey.liteloader.permissions.PermissionsManagerClient;
@@ -20,7 +20,7 @@ import com.mumfrey.liteloader.permissions.PermissionsManagerServer;
  */
 public interface ObjectFactory<TClient, TServer extends MinecraftServer>
 {
-	public abstract Events<TClient, TServer> getEventBroker();
+	public abstract LiteLoaderEventBroker<TClient, TServer> getEventBroker();
 	public abstract PacketEvents getPacketEventBroker();
 package com.mumfrey.liteloader.modconfig;
-import java.io.IOException;
 /**
  * Interface for mod config panels to implement
@@ -61,7 +60,7 @@ public interface ConfigPanel
 	 * @param mouseY
 	 * @param mouseButton
 	 */
-	public abstract void mousePressed(ConfigPanelHost host, int mouseX, int mouseY, int mouseButton) throws IOException;
+	public abstract void mousePressed(ConfigPanelHost host, int mouseX, int mouseY, int mouseButton);
 	/**
 	 * Called when a mouse button is released
@@ -74,6 +74,49 @@ public abstract class ByteCodeUtilities
 			}
 		}
 	}
+	
+	/**
+	 * Get the first variable index in the supplied method which is not an argument or "this" reference, this corresponds
+	 * to the size of the arguments passed in to the method plus an extra spot for "this" if the method is non-static 
+	 * 
+	 * @param method
+	 * @return
+	 */
+	public static int getFirstNonArgLocalIndex(MethodNode method)
+	{
+		return ByteCodeUtilities.getFirstNonArgLocalIndex(Type.getArgumentTypes(method.desc), (method.access & Opcodes.ACC_STATIC) == 0);
+	}
+	
+	/**
+	 * Get the first non-arg variable index based on the supplied arg array and whether to include the "this" reference,
+	 * this corresponds to the size of the arguments passed in to the method plus an extra spot for "this" is specified 
+
+	 * @param args
+	 * @param includeThis
+	 * @return
+	 */
+	public static int getFirstNonArgLocalIndex(Type[] args, boolean includeThis)
+	{
+		return ByteCodeUtilities.getArgsSize(args) + (includeThis ? 1 : 0);
+	}
+	
+	/**
+	 * Get the size of the specified args array in local variable terms (eg. doubles and longs take two spaces)
+	 * 
+	 * @param args
+	 * @return
+	 */
+	public static int getArgsSize(Type[] args)
+	{
+		int size = 0;
+		
+		for (Type type : args)
+		{
+			size += type.getSize();
+		}
+		
+		return size;
+	}
 	/**
 	 * Attempts to identify available locals at an arbitrary point in the bytecode specified by node.
@@ -121,8 +164,7 @@ public abstract class ByteCodeUtilities
 				FrameNode frameNode = (FrameNode)insn;
 				// localPos tracks the location in the frame node's locals list, which doesn't leave space for TOP entries
-				int localPos = 0;
-				for (int framePos = 0; framePos < frame.length; framePos++)
+				for (int localPos = 0, framePos = 0; framePos < frame.length; framePos++, localPos++)
 				{
 					// Get the local at the current position in the FrameNode's locals list
 					final Object localType = (localPos < frameNode.local.size()) ? frameNode.local.get(localPos) : null;
@@ -163,8 +205,6 @@ public abstract class ByteCodeUtilities
 					{
 						throw new RuntimeException("Invalid value " + localType + " in locals array at position " + localPos + " in " + classNode.name + "." + method.name + method.desc);
 					}
-					
-					localPos++;
 				}
 			}
 			else if (insn instanceof VarInsnNode)
@@ -312,11 +312,11 @@ public class Event implements Comparable&lt;Event&gt;
 		// Pre-flight checks
 		this.validate(injectionPoint, cancellable, globalEventID);
-		Type[] argumentTypes = Type.getArgumentTypes(this.method.desc);
-		int initialFrameSize = argumentTypes.length + (this.methodIsStatic ? 0 : 1);
+		Type[] arguments = Type.getArgumentTypes(this.method.desc);
+		int initialFrameSize = ByteCodeUtilities.getFirstNonArgLocalIndex(arguments, !this.methodIsStatic);
 		boolean doCaptureLocals = captureLocals && locals != null && locals.length > initialFrameSize;
-		String eventDescriptor = this.generateEventDescriptor(doCaptureLocals, locals, argumentTypes, initialFrameSize);
+		String eventDescriptor = this.generateEventDescriptor(doCaptureLocals, locals, arguments, initialFrameSize);
 		// Create the handler delegate method
 		MethodNode handler = new MethodNode(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_SYNTHETIC, Event.getHandlerName(globalEventID), eventDescriptor, null, null);
@@ -324,7 +324,7 @@ public class Event implements Comparable&lt;Event&gt;
 		LiteLoaderLogger.debug("Event %s is spawning handler %s in class %s", this.name, handler.name, Event.getActiveProxyRef());
-		int ctorMAXS = 0, invokeMAXS = argumentTypes.length + (doCaptureLocals ? locals.length - initialFrameSize : 0);
+		int ctorMAXS = 0, invokeMAXS = arguments.length + (doCaptureLocals ? locals.length - initialFrameSize : 0);
 		int eventInfoVar = this.method.maxLocals++;
 		InsnList insns = new InsnList();
@@ -332,12 +332,12 @@ public class Event implements Comparable&lt;Event&gt;
 		// Instance the EventInfo for this event
 		insns.add(new TypeInsnNode(Opcodes.NEW, this.eventInfoClass)); ctorMAXS++;
 		insns.add(new InsnNode(Opcodes.DUP)); ctorMAXS++; invokeMAXS++;
-		ctorMAXS += invokeEventInfoConstructor(insns, cancellable);
+		ctorMAXS += this.invokeEventInfoConstructor(insns, cancellable);
 		insns.add(new VarInsnNode(Opcodes.ASTORE, eventInfoVar));
 		// Call the event handler method in the proxy
 		insns.add(new VarInsnNode(Opcodes.ALOAD, eventInfoVar));
-		ByteCodeUtilities.loadArgs(argumentTypes, insns, this.methodIsStatic ? 0 : 1);
+		ByteCodeUtilities.loadArgs(arguments, insns, this.methodIsStatic ? 0 : 1);
 		if (doCaptureLocals)
 		{
 			ByteCodeUtilities.loadLocals(locals, insns, initialFrameSize);
@@ -474,6 +474,14 @@ public class Event implements Comparable&lt;Event&gt;
 	}
 	/**
+	 * Get currently registered listeners for this event
+	 */
+	public Set<MethodInfo> getListeners()
+	{
+		return Collections.<MethodInfo>unmodifiableSet(this.listeners);
+	}
+	
+	/**
 	 * Get an event by name (case insensitive)
 	 * 
 	 * @param eventName
@@ -487,28 +495,6 @@ public class Event implements Comparable&lt;Event&gt;
 		return null;
 	}
-
-	/**
-	 * Get all of the listeners for an event by name
-	 * 
-	 * @param eventName
-	 * @return
-	 */
-	static Set<MethodInfo> getEventListeners(String eventName)
-	{
-		return Event.getEventListeners(Event.getEvent(eventName));
-	}
-	
-	/**
-	 * Get all of an event's listeners
-	 * 
-	 * @param event
-	 * @return
-	 */
-	static Set<MethodInfo> getEventListeners(Event event)
-	{
-		return event == null ? null : Collections.unmodifiableSet(event.listeners);
-	}
 	/**
 	 * Populates the event proxy class with delegating methods for all injected events 
@@ -10,7 +10,6 @@ import java.util.Set;
 import java.util.TreeSet;
 import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.ClassNode;
@@ -283,7 +282,7 @@ public final class EventTransformer extends ClassTransformer
 						injection.setLocals(locals);
 						if (injectionPoint.logLocals())
 						{
-							int startPos = ((method.access & Opcodes.ACC_STATIC) == 0 ? 1 : 0) + Type.getArgumentTypes(method.desc).length;
+							int startPos = ByteCodeUtilities.getFirstNonArgLocalIndex(method);
 							LiteLoaderLogger.debug(ClassTransformer.HORIZONTAL_RULE);
 							LiteLoaderLogger.debug("Logging local variables for " + injectionPoint.getClass().getSimpleName());