PacketTransformers are deprecated, adding PacketHandler framework

Mumfrey
1 parent c24f0490
Showing 29 changed files with 879 additions and 527 deletions
java/client/com/mumfrey/liteloader/client/CallbackProxyClient.java
java/client/com/mumfrey/liteloader/client/ClientEvents.java
java/client/com/mumfrey/liteloader/client/PacketEventsClient.java
java/client/com/mumfrey/liteloader/client/api/LiteLoaderCoreAPIClient.java
java/client/com/mumfrey/liteloader/client/api/ObjectFactoryClient.java
java/client/com/mumfrey/liteloader/client/transformers/ChatPacketTransformer.java
java/client/com/mumfrey/liteloader/client/transformers/CustomPayloadPacketTransformer.java
java/client/com/mumfrey/liteloader/client/transformers/JoinGamePacketTransformer.java
java/client/com/mumfrey/liteloader/client/transformers/LiteLoaderEventInjectionTransformer.java
java/client/com/mumfrey/liteloader/client/transformers/LoginSuccessPacketTransformer.java
java/client/com/mumfrey/liteloader/client/transformers/ServerChatPacketTransformer.java
java/client/com/mumfrey/liteloader/client/transformers/ServerCustomPayloadPacketTransformer.java
java/common/com/mumfrey/liteloader/PacketHandler.java
java/common/com/mumfrey/liteloader/api/LiteAPI.java
java/common/com/mumfrey/liteloader/api/manager/APIAdapter.java
java/common/com/mumfrey/liteloader/common/transformers/LiteLoaderPacketTransformer.java
java/common/com/mumfrey/liteloader/common/transformers/PacketEvent.java
java/common/com/mumfrey/liteloader/common/transformers/PacketEventInfo.java
java/common/com/mumfrey/liteloader/core/Events.java
java/common/com/mumfrey/liteloader/core/PacketEvents.java
@@ -7,25 +7,12 @@ import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.shader.Framebuffer;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.network.INetHandler;
 import net.minecraft.network.NetworkManager;
-import net.minecraft.network.login.INetHandlerLoginClient;
-import net.minecraft.network.login.server.S02PacketLoginSuccess;
-import net.minecraft.network.play.INetHandlerPlayClient;
-import net.minecraft.network.play.INetHandlerPlayServer;
-import net.minecraft.network.play.client.C01PacketChatMessage;
-import net.minecraft.network.play.client.C17PacketCustomPayload;
-import net.minecraft.network.play.server.S01PacketJoinGame;
-import net.minecraft.network.play.server.S02PacketChat;
-import net.minecraft.network.play.server.S3FPacketCustomPayload;
 import net.minecraft.server.integrated.IntegratedServer;
 import net.minecraft.server.management.ServerConfigurationManager;
 import net.minecraft.world.WorldSettings;
 import com.mojang.authlib.GameProfile;
-import com.mumfrey.liteloader.core.ClientPluginChannels;
-import com.mumfrey.liteloader.core.LiteLoader;
-import com.mumfrey.liteloader.core.ServerPluginChannels;
 import com.mumfrey.liteloader.transformers.event.EventInfo;
 import com.mumfrey.liteloader.transformers.event.ReturnEventInfo;
@@ -49,83 +36,6 @@ public class CallbackProxyClient
 	private static boolean renderingFBO;
-	public static void handleLoginSuccessPacket(INetHandler netHandler, S02PacketLoginSuccess packet)
-	{
-		((INetHandlerLoginClient)netHandler).handleLoginSuccess(packet);
-		CallbackProxyClient.events.onPostLogin((INetHandlerLoginClient)netHandler, packet);
-	}
-	
-	/**
-	 * S02PacketChat::processPacket()
-	 * 
-	 * @param netHandler
-	 * @param packet
-	 */
-	public static void handleChatPacket(INetHandler netHandler, S02PacketChat packet)
-	{
-		if (CallbackProxyClient.events.onChat(packet))
-		{
-			((INetHandlerPlayClient)netHandler).handleChat(packet);
-		}
-	}
-	
-	/**
-	 * S02PacketChat::processPacket()
-	 * 
-	 * @param netHandler
-	 * @param packet
-	 */
-	public static void handleServerChatPacket(INetHandler netHandler, C01PacketChatMessage packet)
-	{
-		if (CallbackProxyClient.events.onServerChat((INetHandlerPlayServer)netHandler, packet))
-		{
-			((INetHandlerPlayServer)netHandler).processChatMessage(packet);
-		}
-	}
-	
-	/**
-	 * S01PacketJoinGame::processPacket()
-	 * 
-	 * @param netHandler
-	 * @param packet
-	 */
-	public static void handleJoinGamePacket(INetHandler netHandler, S01PacketJoinGame packet)
-	{
-		if (CallbackProxyClient.events.onPreJoinGame(netHandler, packet))
-		{
-			((INetHandlerPlayClient)netHandler).handleJoinGame(packet);
-			CallbackProxyClient.events.onJoinGame(netHandler, packet);
-		}
-	}
-	
-	/**
-	 * S3FPacketCustomPayload::processPacket()
-	 * 
-	 * @param netHandler
-	 * @param packet
-	 */
-	public static void handleCustomPayloadPacket(INetHandler netHandler, S3FPacketCustomPayload packet)
-	{
-		((INetHandlerPlayClient)netHandler).handleCustomPayload(packet);;
-		
-		ClientPluginChannels pluginChannels = LiteLoader.getClientPluginChannels();
-		pluginChannels.onPluginChannelMessage(packet);
-	}
-	
-	/**
-	 * C17PacketCustomPayload::processPacket()
-	 * 
-	 * @param netHandler
-	 * @param packet
-	 */
-	public static void handleCustomPayloadPacket(INetHandler netHandler, C17PacketCustomPayload packet)
-	{
-		((INetHandlerPlayServer)netHandler).processVanilla250Packet(packet);;
-		
-		ServerPluginChannels pluginChannels = LiteLoader.getServerPluginChannels();
-		pluginChannels.onPluginChannelMessage((INetHandlerPlayServer)netHandler, packet);
-	}
-	
 	public static void onStartupComplete(EventInfo<Minecraft> e)
 	{
 		CallbackProxyClient.events = ClientEvents.getInstance();
@@ -5,15 +5,9 @@ import net.minecraft.client.entity.EntityClientPlayerMP;
 import net.minecraft.client.gui.GuiNewChat;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.shader.Framebuffer;
-import net.minecraft.network.INetHandler;
-import net.minecraft.network.login.INetHandlerLoginClient;
-import net.minecraft.network.login.server.S02PacketLoginSuccess;
 import net.minecraft.network.play.client.C01PacketChatMessage;
-import net.minecraft.network.play.server.S01PacketJoinGame;
-import net.minecraft.network.play.server.S02PacketChat;
 import net.minecraft.profiler.Profiler;
 import net.minecraft.server.integrated.IntegratedServer;
-import net.minecraft.util.IChatComponent;
 import net.minecraft.util.Timer;
 import org.lwjgl.input.Mouse;
@@ -23,7 +17,6 @@ import com.mumfrey.liteloader.client.gen.GenProfiler;
 import com.mumfrey.liteloader.client.overlays.IMinecraft;
 import com.mumfrey.liteloader.client.util.PrivateFields;
 import com.mumfrey.liteloader.common.LoadingProgress;
-import com.mumfrey.liteloader.core.ClientPluginChannels;
 import com.mumfrey.liteloader.core.Events;
 import com.mumfrey.liteloader.core.InterfaceRegistrationDelegate;
 import com.mumfrey.liteloader.core.LiteLoader;
@@ -90,15 +83,10 @@ public class ClientEvents extends Events&lt;Minecraft, IntegratedServer&gt;
 	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<ChatListener>         chatListeners         = new HandlerList<ChatListener>(ChatListener.class);
-	private FastIterableDeque<PostLoginListener>    postLoginListeners    = new HandlerList<PostLoginListener>(PostLoginListener.class);
-	private FastIterableDeque<JoinGameListener>     joinGameListeners     = new HandlerList<JoinGameListener>(JoinGameListener.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<ChatFilter>           chatFilters           = new HandlerList<ChatFilter>(ChatFilter.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
-	private FastIterableDeque<PreJoinGameListener>  preJoinGameListeners  = new HandlerList<PreJoinGameListener>(PreJoinGameListener.class, ReturnLogicOp.OR);
 	private FastIterableDeque<OutboundChatFilter>   outboundChatFilters   = new HandlerList<OutboundChatFilter>(OutboundChatFilter.class, ReturnLogicOp.AND);
 	@SuppressWarnings("cast")
@@ -141,15 +129,10 @@ public class ClientEvents extends Events&lt;Minecraft, IntegratedServer&gt;
 		delegate.registerInterface(PostRenderListener.class);
 		delegate.registerInterface(HUDRenderListener.class);
 		delegate.registerInterface(ChatRenderListener.class);
-		delegate.registerInterface(ChatListener.class);
-		delegate.registerInterface(PostLoginListener.class);
-		delegate.registerInterface(JoinGameListener.class);
 		delegate.registerInterface(OutboundChatListener.class);
 		delegate.registerInterface(ViewportListener.class);
 		delegate.registerInterface(FrameBufferListener.class);
 		delegate.registerInterface(InitCompleteListener.class);
-		delegate.registerInterface(ChatFilter.class);
-		delegate.registerInterface(PreJoinGameListener.class);
 		delegate.registerInterface(OutboundChatFilter.class);
 	}
@@ -235,43 +218,6 @@ public class ClientEvents extends Events&lt;Minecraft, IntegratedServer&gt;
 	}
 	/**
-	 * @deprecated use LiteLoader.getInterfaceManager().registerListener(listener); instead
-	 * @param chatFilter
-	 */
-	@Deprecated
-	@Override
-	public void addChatFilter(Object chatFilter)
-	{
-		if (chatFilter instanceof ChatFilter)
-		{
-			this.addChatFilter((ChatFilter)chatFilter);
-		}
-	}
-
-	/**
-	 * @param chatFilter
-	 */
-	public void addChatFilter(ChatFilter chatFilter)
-	{
-		this.chatFilters.add(chatFilter);
-	}
-	
-	/**
-	 * @param chatListener
-	 */
-	public void addChatListener(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 chatRenderListener
 	 */
 	public void addChatRenderListener(ChatRenderListener chatRenderListener)
@@ -286,30 +232,6 @@ public class ClientEvents extends Events&lt;Minecraft, IntegratedServer&gt;
 	{
 		this.hudRenderListeners.add(hudRenderListener);
 	}
-	
-	/**
-	 * @param postLoginListener
-	 */
-	public void addPreJoinGameListener(PostLoginListener postLoginListener)
-	{
-		this.postLoginListeners.add(postLoginListener);
-	}
-	
-	/**
-	 * @param joinGameListener
-	 */
-	public void addPreJoinGameListener(PreJoinGameListener joinGameListener)
-	{
-		this.preJoinGameListeners.add(joinGameListener);
-	}
-	
-	/**
-	 * @param joinGameListener
-	 */
-	public void addJoinGameListener(JoinGameListener joinGameListener)
-	{
-		this.joinGameListeners.add(joinGameListener);
-	}
 	/**
 	 * @param outboundChatListener
@@ -548,41 +470,6 @@ public class ClientEvents extends Events&lt;Minecraft, IntegratedServer&gt;
 		this.profiler.endSection();
 	}
-	
-	/**
-	 * Callback from the chat hook
-	 * 
-	 * @param chatPacket
-	 * @return
-	 */
-	boolean onChat(S02PacketChat chatPacket)
-	{
-		if (chatPacket.func_148915_c() == null)
-			return true;
-		
-		IChatComponent chat = chatPacket.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
-		for (ChatFilter chatFilter : this.chatFilters)
-		{
-			if (chatFilter.onChat(chatPacket, chat, message))
-			{
-				chat = chatPacket.func_148915_c();
-				message = chat.getFormattedText();
-			}
-			else
-			{
-				return false;
-			}
-		}
-		
-		// Chat listeners get the chat if no filter removed it
-		this.chatListeners.all().onChat(chat, message);
-		
-		return true;
-	}
 	/**
 	 * @param packet
@@ -605,53 +492,6 @@ public class ClientEvents extends Events&lt;Minecraft, IntegratedServer&gt;
 	}
 	/**
-	 * @param netHandler
-	 * @param loginPacket
-	 */
-	void onPostLogin(INetHandlerLoginClient netHandler, S02PacketLoginSuccess loginPacket)
-	{
-		ClientPluginChannels clientPluginChannels = LiteLoader.getClientPluginChannels();
-		if (clientPluginChannels instanceof ClientPluginChannelsClient)
-		{
-			((ClientPluginChannelsClient)clientPluginChannels).onPostLogin(netHandler, loginPacket);
-		}
-
-		this.postLoginListeners.all().onPostLogin(netHandler, loginPacket);
-	}
-	
-	/**
-	 * Pre join game callback from the login hook
-	 * 
-	 * @param netHandler
-	 * @param hookLogin
-	 * @return
-	 */
-	boolean onPreJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
-	{
-		return !this.preJoinGameListeners.all().onPreJoinGame(netHandler, loginPacket);
-	}
-	
-	/**
-	 * Callback from the join game hook
-	 * 
-	 * @param netHandler
-	 * @param loginPacket
-	 */
-	@Override
-	protected void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
-	{
-		super.onJoinGame(netHandler, loginPacket);
-		
-		ClientPluginChannels clientPluginChannels = LiteLoader.getClientPluginChannels();
-		if (clientPluginChannels instanceof ClientPluginChannelsClient)
-		{
-			((ClientPluginChannelsClient)clientPluginChannels).onJoinGame(netHandler, loginPacket);
-		}
-		
-		this.joinGameListeners.all().onJoinGame(netHandler, loginPacket);
-	}
-
-	/**
 	 * @param framebuffer
 	 */
 	void preRenderFBO(Framebuffer framebuffer)
+package com.mumfrey.liteloader.client;
+
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+import net.minecraft.network.login.INetHandlerLoginClient;
+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.IChatComponent;
+
+import com.mumfrey.liteloader.ChatFilter;
+import com.mumfrey.liteloader.ChatListener;
+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.InterfaceRegistrationDelegate;
+import com.mumfrey.liteloader.core.LiteLoader;
+import com.mumfrey.liteloader.core.PacketEvents;
+import com.mumfrey.liteloader.core.event.HandlerList;
+import com.mumfrey.liteloader.core.event.HandlerList.ReturnLogicOp;
+import com.mumfrey.liteloader.interfaces.FastIterableDeque;
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
+
+/**
+ * Client-side packet event handlers
+ * 
+ * @author Adam Mummery-Smith
+ */
+public class PacketEventsClient extends PacketEvents
+{
+	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.OR);
+	private FastIterableDeque<PostLoginListener> postLoginListeners = new HandlerList<PostLoginListener>(PostLoginListener.class);
+
+	@Override
+	public void registerInterfaces(InterfaceRegistrationDelegate delegate)
+	{
+		super.registerInterfaces(delegate);
+		
+		delegate.registerInterface(ChatListener.class);
+		delegate.registerInterface(ChatFilter.class);
+		delegate.registerInterface(PreJoinGameListener.class);
+		delegate.registerInterface(PostLoginListener.class);
+	}
+
+	/**
+	 * @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);
+	}
+	
+	/* (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 (!(netHandler instanceof INetHandlerPlayClient))
+		{
+			return;
+		}
+		
+		e.cancel();
+
+		if (this.preJoinGameListeners.all().onPreJoinGame(netHandler, packet))
+		{
+			return;
+		}
+		
+		((INetHandlerPlayClient)netHandler).handleJoinGame(packet);
+		
+		super.handlePacket(e, netHandler, packet);
+		
+		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.func_148915_c() == null)
+			return;
+		
+		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
+		for (ChatFilter chatFilter : this.chatFilters)
+		{
+			if (chatFilter.onChat(packet, chat, message))
+			{
+				chat = packet.func_148915_c();
+				message = chat.getFormattedText();
+			}
+			else
+			{
+				e.cancel();
+				return;
+			}
+		}
+		
+		// Chat listeners get the chat if no filter removed it
+		this.chatListeners.all().onChat(chat, message);
+	}
+}
@@ -32,18 +32,12 @@ public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI
 	};
 	private static final String[] requiredDownstreamTransformers = {
+		LiteLoaderCoreAPI.PKG_LITELOADER_COMMON + ".transformers.LiteLoaderPacketTransformer",
 		LiteLoaderCoreAPIClient.PKG_LITELOADER_CLIENT + ".transformers.LiteLoaderEventInjectionTransformer",
 		LiteLoaderCoreAPIClient.PKG_LITELOADER_CLIENT + ".transformers.MinecraftOverlayTransformer"
 	};
-	private static final String[] defaultPacketTransformers = {
-		LiteLoaderCoreAPIClient.PKG_LITELOADER_CLIENT + ".transformers.LoginSuccessPacketTransformer",
-		LiteLoaderCoreAPIClient.PKG_LITELOADER_CLIENT + ".transformers.ChatPacketTransformer",
-		LiteLoaderCoreAPIClient.PKG_LITELOADER_CLIENT + ".transformers.JoinGamePacketTransformer",
-		LiteLoaderCoreAPIClient.PKG_LITELOADER_CLIENT + ".transformers.CustomPayloadPacketTransformer",
-		LiteLoaderCoreAPIClient.PKG_LITELOADER_CLIENT + ".transformers.ServerChatPacketTransformer",
-		LiteLoaderCoreAPIClient.PKG_LITELOADER_CLIENT + ".transformers.ServerCustomPayloadPacketTransformer"
-	};
+	private static final String[] defaultPacketTransformers = {};
 	private ObjectFactory<Minecraft, IntegratedServer> objectFactory;
@@ -112,6 +106,7 @@ public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI
 		return ImmutableList.<InterfaceProvider>of
 		(
 			objectFactory.getEventBroker(),
+			objectFactory.getPacketEventBroker(),
 			objectFactory.getClientPluginChannels(),
 			objectFactory.getServerPluginChannels(),
 			MessageBus.getInstance()
@@ -8,11 +8,13 @@ import com.mumfrey.liteloader.client.ClientEvents;
 import com.mumfrey.liteloader.client.ClientPluginChannelsClient;
 import com.mumfrey.liteloader.client.GameEngineClient;
 import com.mumfrey.liteloader.client.LiteLoaderPanelManager;
+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.LiteLoader;
+import com.mumfrey.liteloader.core.PacketEvents;
 import com.mumfrey.liteloader.core.ServerPluginChannels;
 import com.mumfrey.liteloader.interfaces.PanelManager;
 import com.mumfrey.liteloader.interfaces.ObjectFactory;
@@ -33,6 +35,8 @@ class ObjectFactoryClient implements ObjectFactory&lt;Minecraft, IntegratedServer&gt;
 	private LoaderProperties properties;
 	private ClientEvents clientEvents;
+	
+	private PacketEventsClient clientPacketEvents;
 	private GameEngineClient engine;
@@ -60,6 +64,17 @@ class ObjectFactoryClient implements ObjectFactory&lt;Minecraft, IntegratedServer&gt;
 	}
 	@Override
+	public PacketEvents getPacketEventBroker()
+	{
+		if (this.clientPacketEvents == null)
+		{
+			this.clientPacketEvents = new PacketEventsClient();
+		}
+		
+		return this.clientPacketEvents;
+	}
+	
+	@Override
 	public GameEngine<Minecraft, IntegratedServer> getGameEngine()
 	{
 		if (this.engine == null)
-package com.mumfrey.liteloader.client.transformers;
-
-import com.mumfrey.liteloader.core.runtime.Obf;
-import com.mumfrey.liteloader.transformers.PacketTransformer;
-
-/**
- * Transformer for S02PacketChat
- *
- * @author Adam Mummery-Smith
- */
-public class ChatPacketTransformer extends PacketTransformer
-{
-	private static boolean injected = false;
-	
-	public ChatPacketTransformer()
-	{
-		super(Obf.S02PacketChat, Obf.CallbackProxyClient.name, "handleChatPacket", 1000);
-	}
-
-	@Override
-	protected void notifyInjectionFailed()
-	{
-	}
-	
-	@Override
-	protected void notifyInjected()
-	{
-		ChatPacketTransformer.injected = true;
-	}
-	
-	public static boolean isInjected()
-	{
-		return ChatPacketTransformer.injected;
-	}
-}
-package com.mumfrey.liteloader.client.transformers;
-
-import com.mumfrey.liteloader.core.runtime.Obf;
-import com.mumfrey.liteloader.transformers.PacketTransformer;
-
-/**
- * Transformer for S3FPacketCustomPayload
- *
- * @author Adam Mummery-Smith
- */
-public class CustomPayloadPacketTransformer extends PacketTransformer
-{
-	private static boolean injected = false;
-	
-	public CustomPayloadPacketTransformer()
-	{
-		super(Obf.S3FPacketCustomPayload, Obf.CallbackProxyClient.name, "handleCustomPayloadPacket", 1000);
-	}
-
-	@Override
-	protected void notifyInjectionFailed()
-	{
-	}
-	
-	@Override
-	protected void notifyInjected()
-	{
-		CustomPayloadPacketTransformer.injected = true;
-	}
-	
-	public static boolean isInjected()
-	{
-		return CustomPayloadPacketTransformer.injected;
-	}
-}
-package com.mumfrey.liteloader.client.transformers;
-
-import com.mumfrey.liteloader.core.runtime.Obf;
-import com.mumfrey.liteloader.transformers.PacketTransformer;
-
-/**
- * Transformer for S01PacketJoinGame
- *
- * @author Adam Mummery-Smith
- */
-public class JoinGamePacketTransformer extends PacketTransformer
-{
-	private static boolean injected = false;
-	
-	public JoinGamePacketTransformer()
-	{
-		super(Obf.S01PacketJoinGame, Obf.CallbackProxyClient.name, "handleJoinGamePacket", 1000);
-	}
-	
-	@Override
-	protected void notifyInjectionFailed()
-	{
-	}
-	
-	@Override
-	protected void notifyInjected()
-	{
-		JoinGamePacketTransformer.injected = true;
-	}
-	
-	public static boolean isInjected()
-	{
-		return JoinGamePacketTransformer.injected;
-	}
-}
 \ No newline at end of file
 package com.mumfrey.liteloader.client.transformers;
+import static com.mumfrey.liteloader.core.runtime.Methods.*;
+import static com.mumfrey.liteloader.transformers.event.InjectionPoint.*;
+
 import com.mumfrey.liteloader.core.runtime.Obf;
 import com.mumfrey.liteloader.transformers.event.Event;
 import com.mumfrey.liteloader.transformers.event.EventInjectionTransformer;
@@ -10,9 +13,6 @@ import com.mumfrey.liteloader.transformers.event.inject.BeforeReturn;
 import com.mumfrey.liteloader.transformers.event.inject.BeforeStringInvoke;
 import com.mumfrey.liteloader.transformers.event.inject.MethodHead;
-import static com.mumfrey.liteloader.core.runtime.Methods.*;
-import static com.mumfrey.liteloader.transformers.event.InjectionPoint.after;
-
 public class LiteLoaderEventInjectionTransformer extends EventInjectionTransformer
 {
 	@Override
-package com.mumfrey.liteloader.client.transformers;
-
-import com.mumfrey.liteloader.core.runtime.Obf;
-import com.mumfrey.liteloader.transformers.PacketTransformer;
-
-/**
- * Transformer for S02PacketLoginSuccess
- *
- * @author Adam Mummery-Smith
- */
-public class LoginSuccessPacketTransformer extends PacketTransformer
-{
-	private static boolean injected = false;
-	
-	public LoginSuccessPacketTransformer()
-	{
-		super(Obf.S02PacketLoginSuccess, Obf.CallbackProxyClient.name, "handleLoginSuccessPacket", 1000);
-	}
-	
-	@Override
-	protected void notifyInjectionFailed()
-	{
-	}
-	
-	@Override
-	protected void notifyInjected()
-	{
-		LoginSuccessPacketTransformer.injected = true;
-	}
-	
-	public static boolean isInjected()
-	{
-		return LoginSuccessPacketTransformer.injected;
-	}
-}
 \ No newline at end of file
-package com.mumfrey.liteloader.client.transformers;
-
-import com.mumfrey.liteloader.core.runtime.Obf;
-import com.mumfrey.liteloader.transformers.PacketTransformer;
-
-/**
- * Transformer for S02PacketChat
- *
- * @author Adam Mummery-Smith
- */
-public class ServerChatPacketTransformer extends PacketTransformer
-{
-	private static boolean injected = false;
-	
-	public ServerChatPacketTransformer()
-	{
-		super(Obf.C01PacketChatMessage, Obf.CallbackProxyClient.name, "handleServerChatPacket", 1000);
-	}
-
-	@Override
-	protected void notifyInjectionFailed()
-	{
-	}
-	
-	@Override
-	protected void notifyInjected()
-	{
-		ServerChatPacketTransformer.injected = true;
-	}
-	
-	public static boolean isInjected()
-	{
-		return ServerChatPacketTransformer.injected;
-	}
-}
-package com.mumfrey.liteloader.client.transformers;
-
-import com.mumfrey.liteloader.core.runtime.Obf;
-import com.mumfrey.liteloader.transformers.PacketTransformer;
-
-/**
- * Transformer for C17PacketCustomPayload
- *
- * @author Adam Mummery-Smith
- */
-public class ServerCustomPayloadPacketTransformer extends PacketTransformer
-{
-	private static boolean injected = false;
-	
-	public ServerCustomPayloadPacketTransformer()
-	{
-		super(Obf.C17PacketCustomPayload, Obf.CallbackProxyClient.name, "handleCustomPayloadPacket", 1000);
-	}
-
-	@Override
-	protected void notifyInjectionFailed()
-	{
-	}
-	
-	@Override
-	protected void notifyInjected()
-	{
-		ServerCustomPayloadPacketTransformer.injected = true;
-	}
-	
-	public static boolean isInjected()
-	{
-		return ServerCustomPayloadPacketTransformer.injected;
-	}
-}
+package com.mumfrey.liteloader;
+
+import java.util.List;
+
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.Packet;
+
+/**
+ * Interface for mods which want to handle raw packets
+ * 
+ * @author Adam Mummery-Smith
+ */
+public interface PacketHandler extends LiteMod
+{
+	/**
+	 * Get list of packets to handle
+	 */
+	public List<Class<? extends Packet>> getHandledPackets(); 
+
+	/**
+	 * @param netHandler
+	 * @param packet
+	 * @return
+	 */
+	public abstract boolean handlePacket(INetHandler netHandler, Packet packet);
+}
@@ -59,7 +59,10 @@ public interface LiteAPI
 	/**
 	 * Should return an array of required packet transformer names, these transformers will be injected UPSTREAM. Can return null.
+	 * 
+	 * Deprecated - will be removed in 1.8
 	 */
+	@Deprecated
 	public abstract String[] getPacketTransformers();
 	/**
@@ -27,6 +27,7 @@ public interface APIAdapter
 	/**
 	 * Aggregate and return required packet transformers from all registered APIs
 	 */
+	@Deprecated
 	public abstract List<String> getPacketTransformers();
 	/**
+package com.mumfrey.liteloader.common.transformers;
+
+import com.mumfrey.liteloader.core.runtime.Obf;
+import com.mumfrey.liteloader.core.runtime.Packets;
+import com.mumfrey.liteloader.transformers.event.EventInjectionTransformer;
+import com.mumfrey.liteloader.transformers.event.InjectionPoint;
+import com.mumfrey.liteloader.transformers.event.MethodInfo;
+import com.mumfrey.liteloader.transformers.event.inject.MethodHead;
+
+public class LiteLoaderPacketTransformer extends EventInjectionTransformer
+{
+	@Override
+	protected void addEvents()
+	{
+		InjectionPoint methodHead = new MethodHead();
+		MethodInfo handlePacket = new MethodInfo(Obf.PacketEvents, "handlePacket");
+		
+		for (Packets packet : Packets.packets)
+		{
+			MethodInfo processPacket = new MethodInfo(packet, Obf.processPacket, Void.TYPE, Obf.INetHandler);
+			this.addEvent(new PacketEvent(packet), processPacket, methodHead).addListener(handlePacket);
+		}
+	}
+}
+package com.mumfrey.liteloader.common.transformers;
+
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.InsnNode;
+import org.objectweb.asm.tree.IntInsnNode;
+import org.objectweb.asm.tree.LdcInsnNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.VarInsnNode;
+
+import com.mumfrey.liteloader.core.runtime.Obf;
+import com.mumfrey.liteloader.core.runtime.Packets;
+import com.mumfrey.liteloader.transformers.event.Event;
+import com.mumfrey.liteloader.transformers.event.EventInfo;
+
+/**
+ * Special event used to hook all packets
+ * 
+ * @author Adam Mummery-Smith
+ */
+public class PacketEvent extends Event
+{
+	/**
+	 * Soft index for this packet, used as a lookup for speed when determining handlers
+	 */
+	private int packetIndex;
+	
+	PacketEvent(Packets packet)
+	{
+		super("on" + packet.getShortName(), true, 1000);
+		this.packetIndex = packet.getIndex();
+	}
+	
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.transformers.event.Event#getEventInfoClassName()
+	 */
+	@Override
+	public String getEventInfoClassName()
+	{
+		return "com/mumfrey/liteloader/common/transformers/PacketEventInfo";
+	}
+	
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.transformers.event.Event#invokeEventInfoConstructor(org.objectweb.asm.tree.InsnList, boolean)
+	 */
+	@Override
+	protected int invokeEventInfoConstructor(InsnList insns, boolean cancellable)
+	{
+		int ctorMAXS = 0;
+		
+		insns.add(new LdcInsnNode(this.name)); ctorMAXS++;
+		insns.add(this.methodIsStatic ? new InsnNode(Opcodes.ACONST_NULL) : new VarInsnNode(Opcodes.ALOAD, 0)); ctorMAXS++;
+		insns.add(new InsnNode(cancellable ? Opcodes.ICONST_1 : Opcodes.ICONST_0)); ctorMAXS++;
+		insns.add(new IntInsnNode(Opcodes.BIPUSH, this.packetIndex));
+		insns.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, this.eventInfoClass, Obf.constructor.name, EventInfo.getConstructorDescriptor().replace(")", "I)"), false));
+		
+		return ctorMAXS;
+	}
+}
+package com.mumfrey.liteloader.common.transformers;
+
+import com.mumfrey.liteloader.transformers.event.EventInfo;
+
+import net.minecraft.network.Packet;
+
+public class PacketEventInfo<S extends Packet> extends EventInfo<S>
+{
+	private final int packetId;
+
+	@SuppressWarnings("unchecked")
+	public PacketEventInfo(String name, Object source, boolean cancellable, int packetId)
+	{
+		super(name, (S)source, cancellable);
+		
+		this.packetId = packetId;
+	}
+	
+	public int getPacketId()
+	{
+		return this.packetId;
+	}
+}
@@ -5,12 +5,7 @@ import net.minecraft.client.resources.IResourceManagerReloadListener;
 import net.minecraft.command.ICommandManager;
 import net.minecraft.command.ServerCommandManager;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.network.INetHandler;
-import net.minecraft.network.NetHandlerPlayServer;
 import net.minecraft.network.NetworkManager;
-import net.minecraft.network.play.INetHandlerPlayServer;
-import net.minecraft.network.play.client.C01PacketChatMessage;
-import net.minecraft.network.play.server.S01PacketJoinGame;
 import net.minecraft.profiler.Profiler;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.management.ServerConfigurationManager;
@@ -29,7 +24,6 @@ import com.mumfrey.liteloader.api.Listener;
 import com.mumfrey.liteloader.common.GameEngine;
 import com.mumfrey.liteloader.common.LoadingProgress;
 import com.mumfrey.liteloader.core.event.HandlerList;
-import com.mumfrey.liteloader.core.event.HandlerList.ReturnLogicOp;
 import com.mumfrey.liteloader.interfaces.FastIterable;
 import com.mumfrey.liteloader.launch.LoaderProperties;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
@@ -60,11 +54,6 @@ public abstract class Events&lt;TClient, TServer extends MinecraftServer&gt; implement
 	protected LiteLoaderMods mods;
 	/**
-	 * List of mods which can filter server chat
-	 */
-	private FastIterable<ServerChatFilter> serverChatFilters = new HandlerList<ServerChatFilter>(ServerChatFilter.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
-	
-	/**
 	 * List of mods which provide server commands
 	 */
 	private FastIterable<ServerCommandProvider> serverCommandProviders = new HandlerList<ServerCommandProvider>(ServerCommandProvider.class);
@@ -134,10 +123,8 @@ public abstract class Events&lt;TClient, TServer extends MinecraftServer&gt; implement
 	@Override
 	public void registerInterfaces(InterfaceRegistrationDelegate delegate)
 	{
-		delegate.registerInterface(ServerChatFilter.class);
 		delegate.registerInterface(ServerCommandProvider.class);
 		delegate.registerInterface(ServerPlayerListener.class);
-		
 		delegate.registerInterface(CommonPluginChannelListener.class);
 	}
@@ -155,14 +142,6 @@ public abstract class Events&lt;TClient, TServer extends MinecraftServer&gt; implement
 	}
 	/**
-	 * @param serverChatFilter
-	 */
-	public void addServerChatFilter(ServerChatFilter serverChatFilter)
-	{
-		this.serverChatFilters.add(serverChatFilter);
-	}
-
-	/**
 	 * @param serverCommandProvider
 	 */
 	public void addServerCommandProvider(ServerCommandProvider serverCommandProvider)
@@ -183,20 +162,6 @@ public abstract class Events&lt;TClient, TServer extends MinecraftServer&gt; implement
 	{
 		LoadingProgress.setMessage("Reloading Resources...");
 	}
-	
-	/**
-	 * Callback from the chat hook
-	 * @param netHandler 
-	 * 
-	 * @param chatPacket
-	 * @return
-	 */
-	public boolean onServerChat(INetHandlerPlayServer netHandler, C01PacketChatMessage chatPacket)
-	{
-		EntityPlayerMP player = netHandler instanceof NetHandlerPlayServer ? ((NetHandlerPlayServer)netHandler).playerEntity : null;
-		
-		return this.serverChatFilters.all().onChat(player, chatPacket, chatPacket.func_149439_c());
-	}
 	/**
 	 * @param instance
@@ -292,11 +257,6 @@ public abstract class Events&lt;TClient, TServer extends MinecraftServer&gt; implement
 		this.loader.onWorldChanged(world);
 	}
-	protected void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
-	{
-		this.loader.onJoinGame(netHandler, loginPacket);
-	}
-
 	/**
 	 * @deprecated use LiteLoader.getInterfaceManager().registerListener(listener); instead
 	 * @param chatFilter
+package com.mumfrey.liteloader.core;
+
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.Packet;
+import net.minecraft.network.login.server.S02PacketLoginSuccess;
+import net.minecraft.network.play.client.C01PacketChatMessage;
+import net.minecraft.network.play.client.C17PacketCustomPayload;
+import net.minecraft.network.play.server.S01PacketJoinGame;
+import net.minecraft.network.play.server.S02PacketChat;
+import net.minecraft.network.play.server.S3FPacketCustomPayload;
+
+import com.mumfrey.liteloader.JoinGameListener;
+import com.mumfrey.liteloader.PacketHandler;
+import com.mumfrey.liteloader.ServerChatFilter;
+import com.mumfrey.liteloader.api.InterfaceProvider;
+import com.mumfrey.liteloader.api.Listener;
+import com.mumfrey.liteloader.common.transformers.PacketEventInfo;
+import com.mumfrey.liteloader.core.event.HandlerList;
+import com.mumfrey.liteloader.core.event.HandlerList.ReturnLogicOp;
+import com.mumfrey.liteloader.core.runtime.Packets;
+import com.mumfrey.liteloader.interfaces.FastIterable;
+import com.mumfrey.liteloader.interfaces.FastIterableDeque;
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
+
+/**
+ * Packet event handling
+ *
+ * @author Adam Mummery-Smith
+ */
+public abstract class PacketEvents implements InterfaceProvider
+{
+	protected static PacketEvents instance;
+	
+	class PacketHandlerList extends HandlerList<PacketHandler>
+	{
+		private static final long serialVersionUID = 1L;
+		PacketHandlerList() { super(PacketHandler.class, ReturnLogicOp.AND_BREAK_ON_FALSE); }
+	}
+	
+	/**
+	 * Reference to the loader instance
+	 */
+	protected final LiteLoader loader;
+
+	private PacketHandlerList packetHandlers[] = new PacketHandlerList[Packets.count()];
+	
+	private FastIterable<ServerChatFilter> serverChatFilters = new HandlerList<ServerChatFilter>(ServerChatFilter.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
+	private FastIterableDeque<JoinGameListener> joinGameListeners = new HandlerList<JoinGameListener>(JoinGameListener.class);
+	
+	private final int loginSuccessPacketId  = Packets.S02PacketLoginSuccess.getIndex();
+	private final int serverChatPacketId    = Packets.S02PacketChat.getIndex();
+	private final int clientChatPacketId    = Packets.C01PacketChatMessage.getIndex();
+	private final int joinGamePacketId      = Packets.S01PacketJoinGame.getIndex();
+	private final int serverPayloadPacketId = Packets.S3FPacketCustomPayload.getIndex();
+	private final int clientPayloadPacketId = Packets.C17PacketCustomPayload.getIndex();
+	
+	public PacketEvents()
+	{
+		PacketEvents.instance = this;
+		this.loader = LiteLoader.getInstance();
+	}
+	
+	@Override
+	public Class<? extends Listener> getListenerBaseType()
+	{
+		return Listener.class;
+	}
+
+	@Override
+	public void registerInterfaces(InterfaceRegistrationDelegate delegate)
+	{
+		delegate.registerInterface(PacketHandler.class);
+		delegate.registerInterface(JoinGameListener.class);
+		delegate.registerInterface(ServerChatFilter.class);
+	}
+
+	@Override
+	public void initProvider()
+	{
+	}
+	
+	/**
+	 * @param joinGameListener
+	 */
+	public void registerJoinGameListener(JoinGameListener joinGameListener)
+	{
+		this.joinGameListeners.add(joinGameListener);
+	}
+
+	/**
+	 * @param serverChatFilter
+	 */
+	public void registerServerChatFilter(ServerChatFilter serverChatFilter)
+	{
+		this.serverChatFilters.add(serverChatFilter);
+	}
+
+	public void registerPacketHandler(PacketHandler handler)
+	{
+		List<Class<? extends Packet>> handledPackets = handler.getHandledPackets();
+		if (handledPackets != null)
+		{
+			for (Class<? extends Packet> packetClass : handledPackets)
+			{
+				String packetClassName = packetClass.getName();
+				int packetId = Packets.indexOf(packetClassName);
+				if (packetId == -1 || packetId >= this.packetHandlers.length)
+				{
+					LiteLoaderLogger.warning("PacketHandler %s attempted to register a handler for unupported packet class %s", handler.getName(), packetClassName);
+					continue;
+				}
+				
+				if (this.packetHandlers[packetId] == null)
+				{
+					this.packetHandlers[packetId] = new PacketHandlerList();
+				}
+				
+				this.packetHandlers[packetId].add(handler);
+			}
+		}
+	}
+	
+	public static void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler)
+	{
+		PacketEvents.instance.handlePacket(e, netHandler, e.getPacketId());
+	}
+		
+	private void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, int packetId)
+	{
+		this.handlePacketEvent(e, netHandler, packetId);
+		
+		if (this.packetHandlers[packetId] == null || e.isCancelled())
+		{
+			return;
+		}
+		
+		if (!this.packetHandlers[packetId].all().handlePacket(netHandler, e.getSource()))
+		{
+			e.cancel();
+		}
+	}
+
+	/**
+	 * @param e
+	 * @param netHandler
+	 * @param packetId
+	 * @param packet
+	 */
+	protected void handlePacketEvent(PacketEventInfo<Packet> e, INetHandler netHandler, int packetId)
+	{
+		Packet packet = e.getSource();
+
+		if (packetId == this.loginSuccessPacketId)
+		{
+			this.handlePacket(e, netHandler, (S02PacketLoginSuccess)packet);
+			return;
+		}
+		
+		if (packetId == this.serverChatPacketId)
+		{
+			this.handlePacket(e, netHandler, (S02PacketChat)packet);
+			return;
+		}
+		
+		if (packetId == this.clientChatPacketId)
+		{
+			this.handlePacket(e, netHandler, (C01PacketChatMessage)packet);
+			return;
+		}
+		
+		if (packetId == this.joinGamePacketId)
+		{
+			this.handlePacket(e, netHandler, (S01PacketJoinGame)packet);
+			return;
+		}
+		
+		if (packetId == this.serverPayloadPacketId)
+		{
+			this.handlePacket(e, netHandler, (S3FPacketCustomPayload)packet);
+			return;
+		}
+		
+		if (packetId == this.clientPayloadPacketId)
+		{
+			this.handlePacket(e, netHandler, (C17PacketCustomPayload)packet);
+			return;
+		}
+	}
+	
+	/**
+	 * @param e
+	 * @param netHandler
+	 * @param packet
+	 */
+	protected abstract void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, S02PacketLoginSuccess packet);
+	
+	/**
+	 * S02PacketChat::processPacket()
+	 * 
+	 * @param netHandler
+	 * @param packet
+	 */
+	protected abstract void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, S02PacketChat packet);
+	
+	/**
+	 * S02PacketChat::processPacket()
+	 * 
+	 * @param netHandler
+	 * @param packet
+	 */
+	protected void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, C01PacketChatMessage packet)
+	{
+		EntityPlayerMP player = netHandler instanceof NetHandlerPlayServer ? ((NetHandlerPlayServer)netHandler).playerEntity : null;
+		
+		if (!this.serverChatFilters.all().onChat(player, packet, packet.func_149439_c()))
+		{
+			e.cancel();
+		}
+	}
+	
+	/**
+	 * S01PacketJoinGame::processPacket()
+	 * 
+	 * @param netHandler
+	 * @param packet
+	 */
+	protected void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, S01PacketJoinGame packet)
+	{
+		this.loader.onJoinGame(netHandler, packet);
+		this.joinGameListeners.all().onJoinGame(netHandler, packet);
+	}
+	
+	/**
+	 * S3FPacketCustomPayload::processPacket()
+	 * 
+	 * @param netHandler
+	 * @param packet
+	 */
+	protected void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, S3FPacketCustomPayload packet)
+	{
+		LiteLoader.getClientPluginChannels().onPluginChannelMessage(packet);
+	}
+	
+	/**
+	 * C17PacketCustomPayload::processPacket()
+	 * 
+	 * @param netHandler
+	 * @param packet
+	 */
+	protected void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, C17PacketCustomPayload packet)
+	{
+		LiteLoader.getServerPluginChannels().onPluginChannelMessage(netHandler, packet);
+	}
+}
 package com.mumfrey.liteloader.core;
 import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.INetHandler;
 import net.minecraft.network.NetHandlerPlayServer;
 import net.minecraft.network.play.INetHandlerPlayServer;
 import net.minecraft.network.play.client.C17PacketCustomPayload;
@@ -97,11 +98,11 @@ public class ServerPluginChannels extends PluginChannels&lt;ServerPluginChannelList
 	/**
 	 * Callback for the plugin channel hook
-	 * @param netHandler 
 	 * 
+	 * @param netHandler 
 	 * @param customPayload
 	 */
-	public void onPluginChannelMessage(INetHandlerPlayServer netHandler, C17PacketCustomPayload customPayload)
+	public void onPluginChannelMessage(INetHandler netHandler, C17PacketCustomPayload customPayload)
 	{
 		if (customPayload != null && customPayload.func_149559_c() != null)
 		{
@@ -21,6 +21,7 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 public abstract class LiteLoaderCoreAPI implements LiteAPI
 {
 	protected static final String PKG_LITELOADER = "com.mumfrey.liteloader";
+	protected static final String PKG_LITELOADER_COMMON = LiteLoaderCoreAPI.PKG_LITELOADER + ".common";
 	protected LoaderEnvironment environment;
@@ -733,7 +733,7 @@ public class HandlerList&lt;T&gt; extends LinkedList&lt;T&gt; implements FastIterableDeque&lt;T
 			{
 				method.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0));
 				method.instructions.add(new VarInsnNode(Opcodes.ALOAD, 1));
-				method.instructions.add(new IntInsnNode(Opcodes.BIPUSH, handlerIndex));
+				method.instructions.add(handlerIndex > Short.MAX_VALUE ? new LdcInsnNode(new Integer(handlerIndex)) : new IntInsnNode(Opcodes.SIPUSH, handlerIndex));
 				method.instructions.add(new MethodInsnNode(Opcodes.INVOKEINTERFACE, "java/util/List", "get", "(I)Ljava/lang/Object;", true));
 				method.instructions.add(new TypeInsnNode(Opcodes.CHECKCAST, this.typeRef));
 				method.instructions.add(new FieldInsnNode(Opcodes.PUTFIELD, classNode.name, HandlerListClassLoader.HANDLER_VAR_PREFIX + handlerIndex, "L" + this.typeRef + ";"));
@@ -19,6 +19,7 @@ public class Obf
 	public static final Obf                   EventProxy = new Obf("com.mumfrey.liteloader.core.event.EventProxy"                      );
 	public static final Obf                  HandlerList = new Obf("com.mumfrey.liteloader.core.event.HandlerList"                     );
 	public static final Obf             BakedHandlerList = new Obf("com.mumfrey.liteloader.core.event.HandlerList$BakedHandlerList"    );
+	public static final Obf                 PacketEvents = new Obf("com.mumfrey.liteloader.core.PacketEvents"                          );
 	public static final Obf                   LoadingBar = new Obf("com.mumfrey.liteloader.client.gui.startup.LoadingBar"              );
 	public static final Obf                  GameProfile = new Obf("com.mojang.authlib.GameProfile"                                    );
 	public static final Obf                MinecraftMain = new Obf("net.minecraft.client.main.Main"                                    );
@@ -33,13 +34,7 @@ public class Obf
 	public static final Obf                    GuiIngame = new Obf("net.minecraft.client.gui.GuiIngame",                         "bbv" );
 	public static final Obf                     Profiler = new Obf("net.minecraft.profiler.Profiler",                            "qi"  );
 	public static final Obf                CrashReport$6 = new Obf("net.minecraft.crash.CrashReport$6",                          "h"   );
-	public static final Obf            S01PacketJoinGame = new Obf("net.minecraft.network.play.server.S01PacketJoinGame",        "hd"  );
-	public static final Obf        S02PacketLoginSuccess = new Obf("net.minecraft.network.login.server.S02PacketLoginSuccess",   "js"  );
-	public static final Obf                S02PacketChat = new Obf("net.minecraft.network.play.server.S02PacketChat",            "gj"  );
-	public static final Obf       S3FPacketCustomPayload = new Obf("net.minecraft.network.play.server.S3FPacketCustomPayload",   "gr"  );
 	public static final Obf                  INetHandler = new Obf("net.minecraft.network.INetHandler",                          "fb"  );
-	public static final Obf         C01PacketChatMessage = new Obf("net.minecraft.network.play.client.C01PacketChatMessage",     "ir"  );
-	public static final Obf       C17PacketCustomPayload = new Obf("net.minecraft.network.play.client.C17PacketCustomPayload",   "iz"  );
 	public static final Obf             IntegratedServer = new Obf("net.minecraft.server.integrated.IntegratedServer",           "bsx" );
 	public static final Obf                WorldSettings = new Obf("net.minecraft.world.WorldSettings",                          "ahj" );
 	public static final Obf   ServerConfigurationManager = new Obf("net.minecraft.server.management.ServerConfigurationManager", "oi"  );
@@ -52,6 +47,15 @@ public class Obf
 	public static final Obf                  FrameBuffer = new Obf("net.minecraft.client.shader.Framebuffer",                    "bmg" );
 	public static final Obf                   GuiNewChat = new Obf("net.minecraft.client.gui.GuiNewChat",                        "bcc" );
+	// Packets
+	// -----------------------------------------------------------------------------------------
+	@Deprecated public static final Obf      S01PacketJoinGame = Packets.S01PacketJoinGame;
+	@Deprecated public static final Obf  S02PacketLoginSuccess = Packets.S02PacketLoginSuccess;
+	@Deprecated public static final Obf          S02PacketChat = Packets.S02PacketChat;
+	@Deprecated public static final Obf S3FPacketCustomPayload = Packets.S3FPacketCustomPayload;
+	@Deprecated public static final Obf   C01PacketChatMessage = Packets.C01PacketChatMessage;
+	@Deprecated public static final Obf C17PacketCustomPayload = Packets.C17PacketCustomPayload;
+
 	// Fields
 	// -----------------------------------------------------------------------------------------
 	public static final Obf            minecraftProfiler = new Obf("field_71424_I",                                              "z"   ); // Minecraft/mcProfiler
+package com.mumfrey.liteloader.core.runtime;
+
+/**
+ * Packet obfuscation table
+ *
+ * @author Adam Mummery-Smith
+ * TODO Obfuscation 1.7.10
+ */
+@SuppressWarnings("hiding")
+public class Packets extends Obf
+{
+	public static final Packets S08PacketPlayerPosLook             = new Packets("net.minecraft.network.play.server.S08PacketPlayerPosLook",                           "fu");
+	public static final Packets S0EPacketSpawnObject               = new Packets("net.minecraft.network.play.server.S0EPacketSpawnObject",                             "fw");
+	public static final Packets S11PacketSpawnExperienceOrb        = new Packets("net.minecraft.network.play.server.S11PacketSpawnExperienceOrb",                      "fx");
+	public static final Packets S2CPacketSpawnGlobalEntity         = new Packets("net.minecraft.network.play.server.S2CPacketSpawnGlobalEntity",                       "fy");
+	public static final Packets S0FPacketSpawnMob                  = new Packets("net.minecraft.network.play.server.S0FPacketSpawnMob",                                "fz");
+	public static final Packets S10PacketSpawnPainting             = new Packets("net.minecraft.network.play.server.S10PacketSpawnPainting",                           "ga");
+	public static final Packets S0CPacketSpawnPlayer               = new Packets("net.minecraft.network.play.server.S0CPacketSpawnPlayer",                             "gb");
+	public static final Packets S0BPacketAnimation                 = new Packets("net.minecraft.network.play.server.S0BPacketAnimation",                               "gc");
+	public static final Packets S37PacketStatistics                = new Packets("net.minecraft.network.play.server.S37PacketStatistics",                              "gd");
+	public static final Packets S25PacketBlockBreakAnim            = new Packets("net.minecraft.network.play.server.S25PacketBlockBreakAnim",                          "ge");
+	public static final Packets S35PacketUpdateTileEntity          = new Packets("net.minecraft.network.play.server.S35PacketUpdateTileEntity",                        "gf");
+	public static final Packets S24PacketBlockAction               = new Packets("net.minecraft.network.play.server.S24PacketBlockAction",                             "gg");
+	public static final Packets S23PacketBlockChange               = new Packets("net.minecraft.network.play.server.S23PacketBlockChange",                             "gh");
+	public static final Packets S3APacketTabComplete               = new Packets("net.minecraft.network.play.server.S3APacketTabComplete",                             "gi");
+	public static final Packets S02PacketChat                      = new Packets("net.minecraft.network.play.server.S02PacketChat",                                    "gj");
+	public static final Packets S22PacketMultiBlockChange          = new Packets("net.minecraft.network.play.server.S22PacketMultiBlockChange",                        "gk");
+	public static final Packets S32PacketConfirmTransaction        = new Packets("net.minecraft.network.play.server.S32PacketConfirmTransaction",                      "gl");
+	public static final Packets S2EPacketCloseWindow               = new Packets("net.minecraft.network.play.server.S2EPacketCloseWindow",                             "gm");
+	public static final Packets S2DPacketOpenWindow                = new Packets("net.minecraft.network.play.server.S2DPacketOpenWindow",                              "gn");
+	public static final Packets S30PacketWindowItems               = new Packets("net.minecraft.network.play.server.S30PacketWindowItems",                             "go");
+	public static final Packets S31PacketWindowProperty            = new Packets("net.minecraft.network.play.server.S31PacketWindowProperty",                          "gp");
+	public static final Packets S2FPacketSetSlot                   = new Packets("net.minecraft.network.play.server.S2FPacketSetSlot",                                 "gq");
+	public static final Packets S3FPacketCustomPayload             = new Packets("net.minecraft.network.play.server.S3FPacketCustomPayload",                           "gr");
+	public static final Packets S40PacketDisconnect                = new Packets("net.minecraft.network.play.server.S40PacketDisconnect",                              "gs");
+	public static final Packets S19PacketEntityStatus              = new Packets("net.minecraft.network.play.server.S19PacketEntityStatus",                            "gt");
+	public static final Packets S27PacketExplosion                 = new Packets("net.minecraft.network.play.server.S27PacketExplosion",                               "gu");
+	public static final Packets S2BPacketChangeGameState           = new Packets("net.minecraft.network.play.server.S2BPacketChangeGameState",                         "gv");
+	public static final Packets S00PacketKeepAlive                 = new Packets("net.minecraft.network.play.server.S00PacketKeepAlive",                               "gw");
+	public static final Packets S21PacketChunkData                 = new Packets("net.minecraft.network.play.server.S21PacketChunkData",                               "gx");
+	public static final Packets S21PacketChunkData$Extracted       = new Packets("net.minecraft.network.play.server.S21PacketChunkData$Extracted",                     "gy");
+	public static final Packets S26PacketMapChunkBulk              = new Packets("net.minecraft.network.play.server.S26PacketMapChunkBulk",                            "gz");
+	public static final Packets S28PacketEffect                    = new Packets("net.minecraft.network.play.server.S28PacketEffect",                                  "ha");
+	public static final Packets S2APacketParticles                 = new Packets("net.minecraft.network.play.server.S2APacketParticles",                               "hb");
+	public static final Packets S29PacketSoundEffect               = new Packets("net.minecraft.network.play.server.S29PacketSoundEffect",                             "hc");
+	public static final Packets S01PacketJoinGame                  = new Packets("net.minecraft.network.play.server.S01PacketJoinGame",                                "hd");
+	public static final Packets S34PacketMaps                      = new Packets("net.minecraft.network.play.server.S34PacketMaps",                                    "he");
+	public static final Packets S14PacketEntity                    = new Packets("net.minecraft.network.play.server.S14PacketEntity",                                  "hf");
+	public static final Packets S15PacketEntityRelMove             = new Packets("net.minecraft.network.play.server.S14PacketEntity$S15PacketEntityRelMove",           "hg");
+	public static final Packets S17PacketEntityLookMove            = new Packets("net.minecraft.network.play.server.S14PacketEntity$S17PacketEntityLookMove",          "hh");
+	public static final Packets S16PacketEntityLook                = new Packets("net.minecraft.network.play.server.S14PacketEntity$S16PacketEntityLook",              "hi");
+	public static final Packets S36PacketSignEditorOpen            = new Packets("net.minecraft.network.play.server.S36PacketSignEditorOpen",                          "hj");
+	public static final Packets S39PacketPlayerAbilities           = new Packets("net.minecraft.network.play.server.S39PacketPlayerAbilities",                         "hk");
+	public static final Packets S38PacketPlayerListItem            = new Packets("net.minecraft.network.play.server.S38PacketPlayerListItem",                          "ho");
+	public static final Packets S0APacketUseBed                    = new Packets("net.minecraft.network.play.server.S0APacketUseBed",                                  "hp");
+	public static final Packets S13PacketDestroyEntities           = new Packets("net.minecraft.network.play.server.S13PacketDestroyEntities",                         "hq");
+	public static final Packets S1EPacketRemoveEntityEffect        = new Packets("net.minecraft.network.play.server.S1EPacketRemoveEntityEffect",                      "hr");
+	public static final Packets S07PacketRespawn                   = new Packets("net.minecraft.network.play.server.S07PacketRespawn",                                 "hs");
+	public static final Packets S19PacketEntityHeadLook            = new Packets("net.minecraft.network.play.server.S19PacketEntityHeadLook",                          "ht");
+	public static final Packets S09PacketHeldItemChange            = new Packets("net.minecraft.network.play.server.S09PacketHeldItemChange",                          "hu");
+	public static final Packets S3DPacketDisplayScoreboard         = new Packets("net.minecraft.network.play.server.S3DPacketDisplayScoreboard",                       "hv");
+	public static final Packets S1CPacketEntityMetadata            = new Packets("net.minecraft.network.play.server.S1CPacketEntityMetadata",                          "hw");
+	public static final Packets S1BPacketEntityAttach              = new Packets("net.minecraft.network.play.server.S1BPacketEntityAttach",                            "hx");
+	public static final Packets S12PacketEntityVelocity            = new Packets("net.minecraft.network.play.server.S12PacketEntityVelocity",                          "hy");
+	public static final Packets S04PacketEntityEquipment           = new Packets("net.minecraft.network.play.server.S04PacketEntityEquipment",                         "hz");
+	public static final Packets S1FPacketSetExperience             = new Packets("net.minecraft.network.play.server.S1FPacketSetExperience",                           "ia");
+	public static final Packets S06PacketUpdateHealth              = new Packets("net.minecraft.network.play.server.S06PacketUpdateHealth",                            "ib");
+	public static final Packets S3BPacketScoreboardObjective       = new Packets("net.minecraft.network.play.server.S3BPacketScoreboardObjective",                     "ic");
+	public static final Packets S3EPacketTeams                     = new Packets("net.minecraft.network.play.server.S3EPacketTeams",                                   "id");
+	public static final Packets S3CPacketUpdateScore               = new Packets("net.minecraft.network.play.server.S3CPacketUpdateScore",                             "ie");
+	public static final Packets S05PacketSpawnPosition             = new Packets("net.minecraft.network.play.server.S05PacketSpawnPosition",                           "ig");
+	public static final Packets S03PacketTimeUpdate                = new Packets("net.minecraft.network.play.server.S03PacketTimeUpdate",                              "ih");
+	public static final Packets S33PacketUpdateSign                = new Packets("net.minecraft.network.play.server.S33PacketUpdateSign",                              "ii");
+	public static final Packets S0DPacketCollectItem               = new Packets("net.minecraft.network.play.server.S0DPacketCollectItem",                             "ij");
+	public static final Packets S18PacketEntityTeleport            = new Packets("net.minecraft.network.play.server.S18PacketEntityTeleport",                          "ik");
+	public static final Packets S20PacketEntityProperties          = new Packets("net.minecraft.network.play.server.S20PacketEntityProperties",                        "il");
+	public static final Packets S20PacketEntityProperties$Snapshot = new Packets("net.minecraft.network.play.server.S20PacketEntityProperties$Snapshot",               "im");
+	public static final Packets S1DPacketEntityEffect              = new Packets("net.minecraft.network.play.server.S1DPacketEntityEffect",                            "in");
+	public static final Packets C0APacketAnimation                 = new Packets("net.minecraft.network.play.client.C0APacketAnimation",                               "ip");
+	public static final Packets C14PacketTabComplete               = new Packets("net.minecraft.network.play.client.C14PacketTabComplete",                             "iq");
+	public static final Packets C01PacketChatMessage               = new Packets("net.minecraft.network.play.client.C01PacketChatMessage",                             "ir");
+	public static final Packets C16PacketClientStatus              = new Packets("net.minecraft.network.play.client.C16PacketClientStatus",                            "is");
+	public static final Packets C16PacketClientStatus$EnumState    = new Packets("net.minecraft.network.play.client.C16PacketClientStatus$EnumState",                  "it");
+	public static final Packets C15PacketClientSettings            = new Packets("net.minecraft.network.play.client.C15PacketClientSettings",                          "iu");
+	public static final Packets C0FPacketConfirmTransaction        = new Packets("net.minecraft.network.play.client.C0FPacketConfirmTransaction",                      "iv");
+	public static final Packets C11PacketEnchantItem               = new Packets("net.minecraft.network.play.client.C11PacketEnchantItem",                             "iw");
+	public static final Packets C0EPacketClickWindow               = new Packets("net.minecraft.network.play.client.C0EPacketClickWindow",                             "ix");
+	public static final Packets C0DPacketCloseWindow               = new Packets("net.minecraft.network.play.client.C0DPacketCloseWindow",                             "iy");
+	public static final Packets C17PacketCustomPayload             = new Packets("net.minecraft.network.play.client.C17PacketCustomPayload",                           "iz");
+	public static final Packets C02PacketUseEntity                 = new Packets("net.minecraft.network.play.client.C02PacketUseEntity",                               "ja");
+	public static final Packets C02PacketUseEntity$Action          = new Packets("net.minecraft.network.play.client.C02PacketUseEntity$Action",                        "jb");
+	public static final Packets C00PacketKeepAlive                 = new Packets("net.minecraft.network.play.client.C00PacketKeepAlive",                               "jc");
+	public static final Packets C03PacketPlayer                    = new Packets("net.minecraft.network.play.client.C03PacketPlayer",                                  "jd");
+	public static final Packets C04PacketPlayerPosition            = new Packets("net.minecraft.network.play.client.C03PacketPlayer$C04PacketPlayerPosition",          "je");
+	public static final Packets C06PacketPlayerPosLook             = new Packets("net.minecraft.network.play.client.C03PacketPlayer$C06PacketPlayerPosLook",           "jf");
+	public static final Packets C05PacketPlayerLook                = new Packets("net.minecraft.network.play.client.C03PacketPlayer$C05PacketPlayerLook",              "jg");
+	public static final Packets C13PacketPlayerAbilities           = new Packets("net.minecraft.network.play.client.C13PacketPlayerAbilities",                         "jh");
+	public static final Packets C07PacketPlayerDigging             = new Packets("net.minecraft.network.play.client.C07PacketPlayerDigging",                           "ji");
+	public static final Packets C0BPacketEntityAction              = new Packets("net.minecraft.network.play.client.C0BPacketEntityAction",                            "jj");
+	public static final Packets C0CPacketInput                     = new Packets("net.minecraft.network.play.client.C0CPacketInput",                                   "jk");
+	public static final Packets C09PacketHeldItemChange            = new Packets("net.minecraft.network.play.client.C09PacketHeldItemChange",                          "jl");
+	public static final Packets C10PacketCreativeInventoryAction   = new Packets("net.minecraft.network.play.client.C10PacketCreativeInventoryAction",                 "jm");
+	public static final Packets C12PacketUpdateSign                = new Packets("net.minecraft.network.play.client.C12PacketUpdateSign",                              "jn");
+	public static final Packets C08PacketPlayerBlockPlacement      = new Packets("net.minecraft.network.play.client.C08PacketPlayerBlockPlacement",                    "jo");
+	public static final Packets C00Handshake                       = new Packets("net.minecraft.network.handshake.client.C00Handshake",                                "jp");
+	public static final Packets S02PacketLoginSuccess              = new Packets("net.minecraft.network.login.server.S02PacketLoginSuccess",                           "js");
+	public static final Packets S01PacketEncryptionRequest         = new Packets("net.minecraft.network.login.server.S01PacketEncryptionRequest",                      "jt");
+	public static final Packets S00PacketDisconnect                = new Packets("net.minecraft.network.login.server.S00PacketDisconnect",                             "ju");
+	public static final Packets C00PacketLoginStart                = new Packets("net.minecraft.network.login.client.C00PacketLoginStart",                             "jw");
+	public static final Packets C01PacketEncryptionResponse        = new Packets("net.minecraft.network.login.client.C01PacketEncryptionResponse",                     "jx");
+	public static final Packets S01PacketPong                      = new Packets("net.minecraft.network.status.server.S01PacketPong",                                  "jz");
+	public static final Packets S00PacketServerInfo                = new Packets("net.minecraft.network.status.server.S00PacketServerInfo",                            "ka");
+
+	public static final Packets[] packets = new Packets[] {
+		S08PacketPlayerPosLook,
+		S0EPacketSpawnObject,
+		S11PacketSpawnExperienceOrb,
+		S2CPacketSpawnGlobalEntity,
+		S0FPacketSpawnMob,
+		S10PacketSpawnPainting,
+		S0CPacketSpawnPlayer,
+		S0BPacketAnimation,
+		S37PacketStatistics,
+		S25PacketBlockBreakAnim,
+		S35PacketUpdateTileEntity,
+		S24PacketBlockAction,
+		S23PacketBlockChange,
+		S3APacketTabComplete,
+		S02PacketChat,
+		S22PacketMultiBlockChange,
+		S32PacketConfirmTransaction,
+		S2EPacketCloseWindow,
+		S2DPacketOpenWindow,
+		S30PacketWindowItems,
+		S31PacketWindowProperty,
+		S2FPacketSetSlot,
+		S3FPacketCustomPayload,
+		S40PacketDisconnect,
+		S19PacketEntityStatus,
+		S27PacketExplosion,
+		S2BPacketChangeGameState,
+		S00PacketKeepAlive,
+		S21PacketChunkData,
+		S21PacketChunkData$Extracted,
+		S26PacketMapChunkBulk,
+		S28PacketEffect,
+		S2APacketParticles,
+		S29PacketSoundEffect,
+		S01PacketJoinGame,
+		S34PacketMaps,
+		S14PacketEntity,
+		S15PacketEntityRelMove,
+		S17PacketEntityLookMove,
+		S16PacketEntityLook,
+		S36PacketSignEditorOpen,
+		S39PacketPlayerAbilities,
+		S38PacketPlayerListItem,
+		S0APacketUseBed,
+		S13PacketDestroyEntities,
+		S1EPacketRemoveEntityEffect,
+		S07PacketRespawn,
+		S19PacketEntityHeadLook,
+		S09PacketHeldItemChange,
+		S3DPacketDisplayScoreboard,
+		S1CPacketEntityMetadata,
+		S1BPacketEntityAttach,
+		S12PacketEntityVelocity,
+		S04PacketEntityEquipment,
+		S1FPacketSetExperience,
+		S06PacketUpdateHealth,
+		S3BPacketScoreboardObjective,
+		S3EPacketTeams,
+		S3CPacketUpdateScore,
+		S05PacketSpawnPosition,
+		S03PacketTimeUpdate,
+		S33PacketUpdateSign,
+		S0DPacketCollectItem,
+		S18PacketEntityTeleport,
+		S20PacketEntityProperties,
+		S20PacketEntityProperties$Snapshot,
+		S1DPacketEntityEffect,
+		C0APacketAnimation,
+		C14PacketTabComplete,
+		C01PacketChatMessage,
+		C16PacketClientStatus,
+		C16PacketClientStatus$EnumState,
+		C15PacketClientSettings,
+		C0FPacketConfirmTransaction,
+		C11PacketEnchantItem,
+		C0EPacketClickWindow,
+		C0DPacketCloseWindow,
+		C17PacketCustomPayload,
+		C02PacketUseEntity,
+		C02PacketUseEntity$Action,
+		C00PacketKeepAlive,
+		C03PacketPlayer,
+		C04PacketPlayerPosition,
+		C06PacketPlayerPosLook,
+		C05PacketPlayerLook,
+		C13PacketPlayerAbilities,
+		C07PacketPlayerDigging,
+		C0BPacketEntityAction,
+		C0CPacketInput,
+		C09PacketHeldItemChange,
+		C10PacketCreativeInventoryAction,
+		C12PacketUpdateSign,
+		C08PacketPlayerBlockPlacement,
+		C00Handshake,
+		S02PacketLoginSuccess,
+		S01PacketEncryptionRequest,
+		S00PacketDisconnect,
+		C00PacketLoginStart,
+		C01PacketEncryptionResponse,
+		S01PacketPong,
+		S00PacketServerInfo
+	};
+	
+	private static int nextPacketIndex;
+	
+	private final String shortName;
+	
+	private final int index;
+	
+	private Packets(String seargeName, String obfName)
+	{
+		super(seargeName, obfName);
+		
+		this.shortName = seargeName.substring(Math.max(seargeName.lastIndexOf('.'), seargeName.lastIndexOf('$')) + 1);
+		this.index = Packets.nextPacketIndex++;
+	}
+	
+	public int getIndex()
+	{
+		return this.index;
+	}
+	
+	public String getShortName()
+	{
+		return this.shortName;
+	}
+
+	public static int indexOf(String packetClassName)
+	{
+		for (Packets packet : Packets.packets)
+		{
+			if (packet.name.equals(packetClassName) || packet.shortName.equals(packetClassName) || packet.obf.equals(packetClassName)) return packet.index;
+		}
+		
+		return -1;
+	}
+	
+	public static int count()
+	{
+		return Packets.nextPacketIndex;
+	}
+}
@@ -5,6 +5,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.PacketEvents;
 import com.mumfrey.liteloader.core.ServerPluginChannels;
 import com.mumfrey.liteloader.permissions.PermissionsManagerClient;
 import com.mumfrey.liteloader.permissions.PermissionsManagerServer;
@@ -21,6 +22,8 @@ public interface ObjectFactory&lt;TClient, TServer extends MinecraftServer&gt;
 {
 	public abstract Events<TClient, TServer> getEventBroker();
+	public abstract PacketEvents getPacketEventBroker();
+	
 	public abstract GameEngine<TClient, TServer> getGameEngine();
 	public abstract PanelManager<?> getPanelManager();
@@ -203,7 +203,7 @@ public class ClassTransformerManager
 	 * @param classLoader
 	 * @param transformers
 	 */
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "deprecation" })
 	private void sieveAndSortPacketTransformers(LaunchClassLoader classLoader, Set<String> transformers)
 	{
 		LiteLoaderLogger.info("Sorting registered packet transformers by priority");
@@ -323,6 +323,7 @@ public class LiteLoaderTweaker implements ITweaker
 	public void injectIntoClassLoader(LaunchClassLoader classLoader)
 	{
 		classLoader.addClassLoaderExclusion("com.mumfrey.liteloader.core.runtime.Obf");
+		classLoader.addClassLoaderExclusion("com.mumfrey.liteloader.core.runtime.Packets");
 		LiteLoaderTweaker.instance.transformerManager.injectUpstreamTransformers(classLoader);
@@ -95,7 +95,7 @@ public class Event implements Comparable&lt;Event&gt;
 	protected Set<MethodInfo> pendingInjections;
-	Event(String name, boolean cancellable, int priority)
+	protected Event(String name, boolean cancellable, int priority)
 	{
 		this.name = name.toLowerCase();
 		this.priority = priority;
@@ -216,7 +216,7 @@ public class Event implements Comparable&lt;Event&gt;
 		this.methodReturnType = Type.getReturnType(method.desc);
 		this.methodMAXS       = method.maxStack;
 		this.methodIsStatic   = (method.access & Opcodes.ACC_STATIC) == Opcodes.ACC_STATIC;
-		this.eventInfoClass   = EventInfo.getEventInfoClassName(this.methodReturnType).replace('.', '/');
+		this.eventInfoClass   = this.getEventInfoClassName();
 		this.eventDescriptor  = String.format("(L%s;%s)V", this.eventInfoClass, method.desc.substring(1, method.desc.indexOf(')')));
 	}
@@ -306,10 +306,7 @@ 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++;
-		insns.add(new LdcInsnNode(this.name)); ctorMAXS++;
-		insns.add(this.methodIsStatic ? new InsnNode(Opcodes.ACONST_NULL) : new VarInsnNode(Opcodes.ALOAD, 0)); ctorMAXS++;
-		insns.add(new InsnNode(cancellable ? Opcodes.ICONST_1 : Opcodes.ICONST_0)); ctorMAXS++;
-		insns.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, this.eventInfoClass, Obf.constructor.name, EventInfo.getConstructorDescriptor(), false));
+		ctorMAXS += invokeEventInfoConstructor(insns, cancellable);
 		insns.add(new VarInsnNode(Opcodes.ASTORE, eventInfoVar));
 		// Call the event handler method in the proxy
@@ -330,6 +327,23 @@ public class Event implements Comparable&lt;Event&gt;
 		return handler;
 	}
+	protected int invokeEventInfoConstructor(InsnList insns, boolean cancellable)
+	{
+		int ctorMAXS = 0;
+		
+		insns.add(new LdcInsnNode(this.name)); ctorMAXS++;
+		insns.add(this.methodIsStatic ? new InsnNode(Opcodes.ACONST_NULL) : new VarInsnNode(Opcodes.ALOAD, 0)); ctorMAXS++;
+		insns.add(new InsnNode(cancellable ? Opcodes.ICONST_1 : Opcodes.ICONST_0)); ctorMAXS++;
+		insns.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, this.eventInfoClass, Obf.constructor.name, EventInfo.getConstructorDescriptor(), false));
+		
+		return ctorMAXS;
+	}
+
+	protected String getEventInfoClassName()
+	{
+		return EventInfo.getEventInfoClassName(this.methodReturnType).replace('.', '/');
+	}
+
 	/**
 	 * if (e.isCancelled()) return e.getReturnValue();
 	 *