Initial update to 1.9

Mumfrey
1 parent 7347bfef
Showing 62 changed files with 960 additions and 733 deletions
gradle.properties
src/client/java/com/mumfrey/liteloader/ChatFilter.java
src/client/java/com/mumfrey/liteloader/ChatListener.java
src/client/java/com/mumfrey/liteloader/JoinGameListener.java
src/client/java/com/mumfrey/liteloader/OutboundChatListener.java
src/client/java/com/mumfrey/liteloader/PostLoginListener.java
src/client/java/com/mumfrey/liteloader/ScreenshotListener.java
src/client/java/com/mumfrey/liteloader/client/ClientPluginChannelsClient.java
src/client/java/com/mumfrey/liteloader/client/ClientProxy.java
src/client/java/com/mumfrey/liteloader/client/LiteLoaderCoreProviderClient.java
src/client/java/com/mumfrey/liteloader/client/LiteLoaderEventBrokerClient.java
src/client/java/com/mumfrey/liteloader/client/PacketEventsClient.java
src/client/java/com/mumfrey/liteloader/client/ducks/IIntIdentityHashBiMap.java
src/client/java/com/mumfrey/liteloader/client/ducks/INamespacedRegistry.java → src/client/java/com/mumfrey/liteloader/client/ducks/IMutableRegistry.java
src/client/java/com/mumfrey/liteloader/client/ducks/IObjectIntIdentityMap.java
src/client/java/com/mumfrey/liteloader/client/ducks/IRegistrySimple.java
src/client/java/com/mumfrey/liteloader/client/gui/GuiLiteLoaderPanel.java
src/client/java/com/mumfrey/liteloader/client/gui/startup/LoadingBar.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinEntityRenderer.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinGuiIngame.java
@@ -5,6 +5,6 @@ description=LiteLoader
 url=http://www.liteloader.com
 organization=LiteLoader
 buildType=SNAPSHOT
-buildVersion=1.8.9
-mcVersion=1.8.9
-mcMappings=snapshot_20160204
 \ No newline at end of file
+buildVersion=1.9
+mcVersion=1.9
+mcMappings=snapshot_20160411
 \ No newline at end of file
@@ -2,7 +2,7 @@ package com.mumfrey.liteloader;
  
 import com.mumfrey.liteloader.core.LiteLoaderEventBroker.ReturnValue;
  
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.text.ITextComponent;
  
  
 /**
@@ -23,5 +23,5 @@ public interface ChatFilter extends LiteMod
      * 
      * @return True to keep the packet, false to discard
      */
-    public abstract boolean onChat(IChatComponent chat, String message, ReturnValue<IChatComponent> newMessage);
+    public abstract boolean onChat(ITextComponent chat, String message, ReturnValue<ITextComponent> newMessage);
 }
 package com.mumfrey.liteloader;
  
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.text.ITextComponent;
  
  
 /**
@@ -13,8 +13,8 @@ public interface ChatListener extends LiteMod
     /**
      * Handle an inbound message
      * 
-     * @param chat IChatComponent parsed from the chat packet
+     * @param chat ITextComponent parsed from the chat packet
      * @param message Chat message parsed from the chat message component
      */
-    public abstract void onChat(IChatComponent chat, String message);
+    public abstract void onChat(ITextComponent chat, String message);
 }
@@ -2,7 +2,7 @@ package com.mumfrey.liteloader;
  
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.network.INetHandler;
-import net.minecraft.network.play.server.S01PacketJoinGame;
+import net.minecraft.network.play.server.SPacketJoinGame;
  
 import com.mojang.realmsclient.dto.RealmsServer;
  
@@ -25,5 +25,5 @@ public interface JoinGameListener extends LiteMod
      * @param realmsServer If connecting to a realm, a reference to the
      *      RealmsServer object
      */
-    public abstract void onJoinGame(INetHandler netHandler, S01PacketJoinGame joinGamePacket, ServerData serverData, RealmsServer realmsServer);
+    public abstract void onJoinGame(INetHandler netHandler, SPacketJoinGame joinGamePacket, ServerData serverData, RealmsServer realmsServer);
 }
 package com.mumfrey.liteloader;
  
-import net.minecraft.network.play.client.C01PacketChatMessage;
+import net.minecraft.network.play.client.CPacketChatMessage;
  
 /**
  * Interface for mods which want to monitor outbound chat
@@ -16,5 +16,5 @@ public interface OutboundChatListener extends LiteMod
      * @param packet
      * @param message
      */
-    public abstract void onSendChatMessage(C01PacketChatMessage packet, String message);
+    public abstract void onSendChatMessage(CPacketChatMessage packet, String message);
 }
 package com.mumfrey.liteloader;
  
 import net.minecraft.network.login.INetHandlerLoginClient;
-import net.minecraft.network.login.server.S02PacketLoginSuccess;
+import net.minecraft.network.login.server.SPacketLoginSuccess;
  
 /**
  *
@@ -17,5 +17,5 @@ public interface PostLoginListener extends LiteMod
      * @param netHandler
      * @param packet
      */
-    public abstract void onPostLogin(INetHandlerLoginClient netHandler, S02PacketLoginSuccess packet);
+    public abstract void onPostLogin(INetHandlerLoginClient netHandler, SPacketLoginSuccess packet);
 }
 package com.mumfrey.liteloader;
  
 import net.minecraft.client.shader.Framebuffer;
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.text.ITextComponent;
  
 import com.mumfrey.liteloader.core.LiteLoaderEventBroker.ReturnValue;
  
@@ -24,5 +24,5 @@ public interface ScreenshotListener extends LiteMod
      * @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);
+    public boolean onSaveScreenshot(String screenshotName, int width, int height, Framebuffer fbo, ReturnValue<ITextComponent> message);
 }
@@ -9,11 +9,11 @@ import net.minecraft.network.INetHandler;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.network.login.INetHandlerLoginClient;
-import net.minecraft.network.login.server.S02PacketLoginSuccess;
+import net.minecraft.network.login.server.SPacketLoginSuccess;
 import net.minecraft.network.play.INetHandlerPlayClient;
-import net.minecraft.network.play.client.C17PacketCustomPayload;
-import net.minecraft.network.play.server.S01PacketJoinGame;
-import net.minecraft.network.play.server.S3FPacketCustomPayload;
+import net.minecraft.network.play.client.CPacketCustomPayload;
+import net.minecraft.network.play.server.SPacketJoinGame;
+import net.minecraft.network.play.server.SPacketCustomPayload;
  
 /**
  * Handler for client plugin channels
@@ -26,7 +26,7 @@ public class ClientPluginChannelsClient extends ClientPluginChannels
      * @param netHandler
      * @param loginPacket
      */
-    void onPostLogin(INetHandlerLoginClient netHandler, S02PacketLoginSuccess loginPacket)
+    void onPostLogin(INetHandlerLoginClient netHandler, SPacketLoginSuccess loginPacket)
     {
         this.clearPluginChannels(netHandler);
     }
@@ -35,7 +35,7 @@ public class ClientPluginChannelsClient extends ClientPluginChannels
      * @param netHandler
      * @param loginPacket
      */
-    void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
+    void onJoinGame(INetHandler netHandler, SPacketJoinGame loginPacket)
     {
         this.sendRegisteredPluginChannels(netHandler);
     }
@@ -46,7 +46,7 @@ public class ClientPluginChannelsClient extends ClientPluginChannels
      * @param customPayload
      */
     @Override
-    public void onPluginChannelMessage(S3FPacketCustomPayload customPayload)
+    public void onPluginChannelMessage(SPacketCustomPayload customPayload)
     {
         if (customPayload != null && customPayload.getChannelName() != null)
         {
@@ -67,11 +67,11 @@ public class ClientPluginChannelsClient extends ClientPluginChannels
         if (netHandler instanceof INetHandlerLoginClient)
         {
             NetworkManager networkManager = ((IClientNetLoginHandler)netHandler).getNetMgr();
-            networkManager.sendPacket(new C17PacketCustomPayload(CHANNEL_REGISTER, registrationData));
+            networkManager.sendPacket(new CPacketCustomPayload(CHANNEL_REGISTER, registrationData));
         }
         else if (netHandler instanceof INetHandlerPlayClient)
         {
-            ClientPluginChannelsClient.dispatch(new C17PacketCustomPayload(CHANNEL_REGISTER, registrationData));
+            ClientPluginChannelsClient.dispatch(new CPacketCustomPayload(CHANNEL_REGISTER, registrationData));
         }
     }
  
@@ -95,14 +95,14 @@ public class ClientPluginChannelsClient extends ClientPluginChannels
             throw new UnregisteredChannelException(channel);
         }
  
-        C17PacketCustomPayload payload = new C17PacketCustomPayload(channel, data);
+        CPacketCustomPayload payload = new CPacketCustomPayload(channel, data);
         return ClientPluginChannelsClient.dispatch(payload);
     }
  
     /**
      * @param payload
      */
-    static boolean dispatch(C17PacketCustomPayload payload)
+    static boolean dispatch(CPacketCustomPayload payload)
     {
         try
         {
@@ -16,7 +16,7 @@ import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.shader.Framebuffer;
 import net.minecraft.entity.Entity;
 import net.minecraft.server.integrated.IntegratedServer;
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.text.ITextComponent;
 import net.minecraft.world.WorldSettings;
  
 /**
@@ -165,7 +165,7 @@ public abstract class ClientProxy extends Proxy
         ClientProxy.broker.onRenderTerrain(partialTicks, pass, timeSlice);
     }
  
-    public static void onSaveScreenshot(CallbackInfoReturnable<IChatComponent> ci, File gameDir, String name, int width, int height,
+    public static void onSaveScreenshot(CallbackInfoReturnable<ITextComponent> ci, File gameDir, String name, int width, int height,
             Framebuffer fbo)
     {
         ClientProxy.broker.onScreenshot(ci, name, width, height, fbo);
@@ -5,7 +5,7 @@ import net.minecraft.client.resources.IResourceManager;
 import net.minecraft.client.resources.IResourcePack;
 import net.minecraft.client.resources.SimpleReloadableResourceManager;
 import net.minecraft.network.INetHandler;
-import net.minecraft.network.play.server.S01PacketJoinGame;
+import net.minecraft.network.play.server.SPacketJoinGame;
 import net.minecraft.world.World;
  
 import com.mumfrey.liteloader.api.CoreProvider;
@@ -85,7 +85,7 @@ public class LiteLoaderCoreProviderClient implements CoreProvider
     }
  
     @Override
-    public void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
+    public void onJoinGame(INetHandler netHandler, SPacketJoinGame loginPacket)
     {
     }
  
@@ -4,7 +4,20 @@ import org.lwjgl.input.Mouse;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
  
-import com.mumfrey.liteloader.*;
+import com.mumfrey.liteloader.ChatRenderListener;
+import com.mumfrey.liteloader.EntityRenderListener;
+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.PreRenderListener;
+import com.mumfrey.liteloader.RenderListener;
+import com.mumfrey.liteloader.ScreenshotListener;
+import com.mumfrey.liteloader.Tickable;
+import com.mumfrey.liteloader.ViewportListener;
 import com.mumfrey.liteloader.client.overlays.IEntityRenderer;
 import com.mumfrey.liteloader.client.overlays.IMinecraft;
 import com.mumfrey.liteloader.common.LoadingProgress;
@@ -28,10 +41,10 @@ import net.minecraft.client.resources.IResourceManager;
 import net.minecraft.client.resources.IResourceManagerReloadListener;
 import net.minecraft.client.shader.Framebuffer;
 import net.minecraft.entity.Entity;
-import net.minecraft.network.play.client.C01PacketChatMessage;
+import net.minecraft.network.play.client.CPacketChatMessage;
 import net.minecraft.server.integrated.IntegratedServer;
-import net.minecraft.util.IChatComponent;
 import net.minecraft.util.Timer;
+import net.minecraft.util.text.ITextComponent;
  
 public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker<Minecraft, IntegratedServer> implements IResourceManagerReloadListener
 {
@@ -434,7 +447,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * @param packet
      * @param message
      */
-    void onSendChatMessage(C01PacketChatMessage packet, String message)
+    void onSendChatMessage(CPacketChatMessage packet, String message)
     {
         this.outboundChatListeners.all().onSendChatMessage(packet, message);
     }
@@ -522,9 +535,9 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * @param height
      * @param fbo
      */
-    void onScreenshot(CallbackInfoReturnable<IChatComponent> ci, String name, int width, int height, Framebuffer fbo)
+    void onScreenshot(CallbackInfoReturnable<ITextComponent> ci, String name, int width, int height, Framebuffer fbo)
     {
-        ReturnValue<IChatComponent> ret = new ReturnValue<IChatComponent>(ci.getReturnValue());
+        ReturnValue<ITextComponent> ret = new ReturnValue<ITextComponent>(ci.getReturnValue());
  
         if (!this.screenshotListeners.all().onSaveScreenshot(name, width, height, fbo, ret))
         {
@@ -21,13 +21,12 @@ import net.minecraft.client.Minecraft;
 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.login.server.SPacketLoginSuccess;
 import net.minecraft.network.play.INetHandlerPlayClient;
-import net.minecraft.network.play.server.S01PacketJoinGame;
-import net.minecraft.network.play.server.S02PacketChat;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.IChatComponent;
+import net.minecraft.network.play.server.SPacketJoinGame;
+import net.minecraft.network.play.server.SPacketChat;
+import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.IThreadListener;
  
 /**
@@ -115,22 +114,23 @@ public class PacketEventsClient extends PacketEvents
     @Override
     protected IThreadListener getPacketContextListener(Packets.Context context)
     {
+        Minecraft minecraft = Minecraft.getMinecraft();
         if (context == Packets.Context.SERVER)
         {
-            return MinecraftServer.getServer();
+            return minecraft.getIntegratedServer();
         }
  
-        return Minecraft.getMinecraft();
+        return minecraft;
     }
  
     /* (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)
+     *      net.minecraft.network.play.server.SPacketJoinGame)
      */
     @Override
-    protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, S01PacketJoinGame packet)
+    protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, SPacketJoinGame packet)
     {
         if (this.preJoinGame(e, netHandler, packet))
         {
@@ -149,7 +149,7 @@ public class PacketEventsClient extends PacketEvents
      * @param packet
      * @throws EventCancellationException
      */
-    private boolean preJoinGame(PacketEventInfo<Packet<?>> e, INetHandler netHandler, S01PacketJoinGame packet) throws EventCancellationException
+    private boolean preJoinGame(PacketEventInfo<Packet<?>> e, INetHandler netHandler, SPacketJoinGame packet) throws EventCancellationException
     {
         if (!(netHandler instanceof INetHandlerPlayClient))
         {
@@ -166,7 +166,7 @@ public class PacketEventsClient extends PacketEvents
      * @param netHandler
      * @param packet
      */
-    private void postJoinGame(PacketEventInfo<Packet<?>> e, INetHandler netHandler, S01PacketJoinGame packet)
+    private void postJoinGame(PacketEventInfo<Packet<?>> e, INetHandler netHandler, SPacketJoinGame packet)
     {
         this.joinGameListeners.all().onJoinGame(netHandler, packet, Minecraft.getMinecraft().getCurrentServerData(), PacketEventsClient.joiningRealm);
         PacketEventsClient.joiningRealm = null;
@@ -185,7 +185,7 @@ public class PacketEventsClient extends PacketEvents
      *      net.minecraft.network.login.server.S02PacketLoginSuccess)
      */
     @Override
-    protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, S02PacketLoginSuccess packet)
+    protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, SPacketLoginSuccess packet)
     {
         if (netHandler instanceof INetHandlerLoginClient)
         {
@@ -208,21 +208,21 @@ public class PacketEventsClient extends PacketEvents
      *      net.minecraft.network.play.server.S02PacketChat)
      */
     @Override
-    protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, S02PacketChat packet)
+    protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, SPacketChat packet)
     {
         if (packet.getChatComponent() == null)
         {
             return;
         }
  
-        IChatComponent originalChat = packet.getChatComponent();
-        IChatComponent chat = originalChat;
+        ITextComponent originalChat = packet.getChatComponent();
+        ITextComponent chat = originalChat;
         String message = chat.getFormattedText();
  
         // Chat filters get a stab at the chat first, if any filter returns false the chat is discarded
         for (ChatFilter chatFilter : this.chatFilters)
         {
-            ReturnValue<IChatComponent> ret = new ReturnValue<IChatComponent>();
+            ReturnValue<ITextComponent> ret = new ReturnValue<ITextComponent>();
  
             if (chatFilter.onChat(chat, message, ret))
             {
@@ -231,7 +231,7 @@ public class PacketEventsClient extends PacketEvents
                     chat = ret.get();
                     if (chat == null)
                     {
-                        chat = new ChatComponentText("");
+                        chat = new TextComponentString("");
                     }
                     message = chat.getFormattedText();
                 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
+package com.mumfrey.liteloader.client.ducks;
+
+public interface IIntIdentityHashBiMap<V>
+{
+    public abstract void removeObject(V object);
+}
 package com.mumfrey.liteloader.client.ducks;
  
-public interface INamespacedRegistry
+public interface IMutableRegistry<K, V>
 {
-    public abstract IObjectIntIdentityMap getUnderlyingMap();
+    public abstract V removeObjectFromRegistry(K key);
 }
-package com.mumfrey.liteloader.client.ducks;
-
-import java.util.IdentityHashMap;
-import java.util.List;
-
-public interface IObjectIntIdentityMap
-{
-    public abstract <V> IdentityHashMap<V, Integer> getIdentityMap();
-
-    public abstract <V> List<V> getObjectList();
-}
-package com.mumfrey.liteloader.client.ducks;
-
-import java.util.Map;
-
-public interface IRegistrySimple<K, V>
-{
-    public abstract Map<K, V> getRegistryObjects();
-}
 package com.mumfrey.liteloader.client.gui;
  
 import static com.mumfrey.liteloader.gl.GL.*;
-import static net.minecraft.client.renderer.vertex.DefaultVertexFormats.*;
  
 import java.io.IOException;
 import java.util.ArrayList;
@@ -32,7 +31,7 @@ import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiMainMenu;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.util.ResourceLocation;
  
@@ -790,8 +789,8 @@ public class GuiLiteLoaderPanel extends GuiScreen
         glColor4f(1.0F, 1.0F, 1.0F, alpha);
  
         Tessellator tessellator = Tessellator.getInstance();
-        WorldRenderer worldRenderer = tessellator.getWorldRenderer();
-        worldRenderer.begin(GL_QUADS, POSITION_TEX);
+        VertexBuffer worldRenderer = tessellator.getBuffer();
+        worldRenderer.begin(GL_QUADS, VF_POSITION_TEX);
         worldRenderer.pos(x + 0,     y + height, 0).tex(u , v2).endVertex();
         worldRenderer.pos(x + width, y + height, 0).tex(u2, v2).endVertex();
         worldRenderer.pos(x + width, y + 0,      0).tex(u2, v ).endVertex();
 package com.mumfrey.liteloader.client.gui.startup;
  
 import static com.mumfrey.liteloader.gl.GL.*;
-import static net.minecraft.client.renderer.vertex.DefaultVertexFormats.*;
  
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -15,7 +14,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.texture.DynamicTexture;
 import net.minecraft.client.renderer.texture.ITextureObject;
 import net.minecraft.client.renderer.texture.TextureManager;
@@ -255,13 +254,13 @@ public class LoadingBar extends LoadingProgress
  
         this.textureManager.bindTexture(this.textureLocation);
         Tessellator tessellator = Tessellator.getInstance();
-        WorldRenderer worldRenderer = tessellator.getWorldRenderer();
-        worldRenderer.begin(GL_QUADS, POSITION);
+        VertexBuffer vertexBuffer = tessellator.getBuffer();
+        vertexBuffer.begin(GL_QUADS, VF_POSITION);
         glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-        worldRenderer.pos(0.0D,        scaledHeight, 0.0D).endVertex();
-        worldRenderer.pos(scaledWidth, scaledHeight, 0.0D).endVertex();
-        worldRenderer.pos(scaledWidth, 0.0D,         0.0D).endVertex();
-        worldRenderer.pos(0.0D,        0.0D,         0.0D).endVertex();
+        vertexBuffer.pos(0.0D,        scaledHeight, 0.0D).endVertex();
+        vertexBuffer.pos(scaledWidth, scaledHeight, 0.0D).endVertex();
+        vertexBuffer.pos(scaledWidth, 0.0D,         0.0D).endVertex();
+        vertexBuffer.pos(0.0D,        0.0D,         0.0D).endVertex();
         tessellator.draw();
  
         glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
@@ -274,11 +273,11 @@ public class LoadingBar extends LoadingProgress
         int v2 = 256;
  
         float texMapScale = 0.00390625F;
-        worldRenderer.begin(GL_QUADS, POSITION_TEX);
-        worldRenderer.pos(left + 0,  top + v2, 0.0D).tex((u1 + 0)  * texMapScale, (v1 + v2) * texMapScale).endVertex();
-        worldRenderer.pos(left + u2, top + v2, 0.0D).tex((u1 + u2) * texMapScale, (v1 + v2) * texMapScale).endVertex();
-        worldRenderer.pos(left + u2, top + 0,  0.0D).tex((u1 + u2) * texMapScale, (v1 + 0)  * texMapScale).endVertex();
-        worldRenderer.pos(left + 0,  top + 0,  0.0D).tex((u1 + 0)  * texMapScale, (v1 + 0)  * texMapScale).endVertex();
+        vertexBuffer.begin(GL_QUADS, VF_POSITION_TEX);
+        vertexBuffer.pos(left + 0,  top + v2, 0.0D).tex((u1 + 0)  * texMapScale, (v1 + v2) * texMapScale).endVertex();
+        vertexBuffer.pos(left + u2, top + v2, 0.0D).tex((u1 + u2) * texMapScale, (v1 + v2) * texMapScale).endVertex();
+        vertexBuffer.pos(left + u2, top + 0,  0.0D).tex((u1 + u2) * texMapScale, (v1 + 0)  * texMapScale).endVertex();
+        vertexBuffer.pos(left + 0,  top + 0,  0.0D).tex((u1 + 0)  * texMapScale, (v1 + 0)  * texMapScale).endVertex();
         tessellator.draw();
  
         glEnableTexture2D();
@@ -319,25 +318,25 @@ public class LoadingBar extends LoadingProgress
 //        tessellator.addVertex(0.0D,               scaledHeight - (scaledHeight / 3), 0.0D);
 //        tessellator.draw();
  
-        worldRenderer.begin(GL_QUADS, POSITION);
+        vertexBuffer.begin(GL_QUADS, VF_POSITION);
         float luma = this.barLuma / 255.0F;
         glColor4f(luma, luma, luma, 0.5F);
-        worldRenderer.pos(0.0D,               scaledHeight,             0.0D).endVertex();
-        worldRenderer.pos(0.0D + scaledWidth, scaledHeight,             0.0D).endVertex();
-        worldRenderer.pos(0.0D + scaledWidth, scaledHeight - barHeight, 0.0D).endVertex();
-        worldRenderer.pos(0.0D,               scaledHeight - barHeight, 0.0D).endVertex();
+        vertexBuffer.pos(0.0D,               scaledHeight,             0.0D).endVertex();
+        vertexBuffer.pos(0.0D + scaledWidth, scaledHeight,             0.0D).endVertex();
+        vertexBuffer.pos(0.0D + scaledWidth, scaledHeight - barHeight, 0.0D).endVertex();
+        vertexBuffer.pos(0.0D,               scaledHeight - barHeight, 0.0D).endVertex();
         tessellator.draw();
  
         barHeight -= 1;
  
-        worldRenderer.begin(GL_QUADS, POSITION_COLOR);
+        vertexBuffer.begin(GL_QUADS, VF_POSITION_COLOR);
         float r2 = this.r2 / 255.0F;
         float g2 = this.g2 / 255.0F;
         float b2 = this.b2 / 255.0F;
-        worldRenderer.pos(1.0D + barWidth * progress, scaledHeight - 1,         1.0D).color(r2, g2, b2, 1.0F).endVertex();
-        worldRenderer.pos(1.0D + barWidth * progress, scaledHeight - barHeight, 1.0D).color(r2, g2, b2, 1.0F).endVertex();
-        worldRenderer.pos(1.0D,                       scaledHeight - barHeight, 1.0D).color(0.0F, 0.0F, 0.0F, 1.0F).endVertex();
-        worldRenderer.pos(1.0D,                       scaledHeight - 1,         1.0D).color(0.0F, 0.0F, 0.0F, 1.0F).endVertex();
+        vertexBuffer.pos(1.0D + barWidth * progress, scaledHeight - 1,         1.0D).color(r2, g2, b2, 1.0F).endVertex();
+        vertexBuffer.pos(1.0D + barWidth * progress, scaledHeight - barHeight, 1.0D).color(r2, g2, b2, 1.0F).endVertex();
+        vertexBuffer.pos(1.0D,                       scaledHeight - barHeight, 1.0D).color(0.0F, 0.0F, 0.0F, 1.0F).endVertex();
+        vertexBuffer.pos(1.0D,                       scaledHeight - 1,         1.0D).color(0.0F, 0.0F, 0.0F, 1.0F).endVertex();
         tessellator.draw();
  
         glAlphaFunc(GL_GREATER, 0.1F);
@@ -17,7 +17,7 @@ import net.minecraft.util.ResourceLocation;
 @Mixin(EntityRenderer.class)
 public abstract class MixinEntityRenderer implements IEntityRenderer
 {
-    @Shadow private static ResourceLocation[] shaderResourceLocations;
+    @Shadow private static ResourceLocation[] SHADERS_TEXTURES;
     @Shadow private boolean useShader;
     @Shadow private int shaderIndex;
  
@@ -139,7 +139,7 @@ public abstract class MixinEntityRenderer implements IEntityRenderer
     @Override
     public ResourceLocation[] getShaders()
     {
-        return MixinEntityRenderer.shaderResourceLocations;
+        return MixinEntityRenderer.SHADERS_TEXTURES;
     }
  
     @Override
 package com.mumfrey.liteloader.client.mixin;
  
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -16,7 +17,7 @@ import net.minecraft.client.gui.GuiNewChat;
 @Mixin(GuiIngame.class)
 public abstract class MixinGuiIngame extends Gui
 {
-    @Shadow private GuiNewChat persistantChatGUI;
+    @Shadow @Final private GuiNewChat persistantChatGUI;
  
     @Inject(method = "renderGameOverlay(F)V", at = @At(
         value = "INVOKE",
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
+package com.mumfrey.liteloader.client.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import com.mumfrey.liteloader.client.ducks.IIntIdentityHashBiMap;
+
+import net.minecraft.util.IntIdentityHashBiMap;
+
+@Mixin(IntIdentityHashBiMap.class)
+public abstract class MixinIntIdentityHashBiMap<V> implements IIntIdentityHashBiMap<V>
+{
+    @Shadow private static final Object field_186817_a = null;
+    @Shadow private V[] objectArray;
+    @Shadow private int[] intKeys;
+    @Shadow private V[] intToObjects;
+    @Shadow private int field_186821_e;
+    @Shadow private int mapSize;
+    
+    @Shadow private int func_186816_b(V object, int hash)
+    {
+        return -1;
+    }
+    
+    @Shadow private int hashObject(V object)
+    {
+        return -1;
+    }
+
+    @Override
+    public void removeObject(V object)
+    {
+        int index = this.func_186816_b(object, this.hashObject(object));
+        int intKey = this.intKeys[index];
+        this.objectArray[index] = null;
+        this.intKeys[index] = 0;
+        this.intToObjects[intKey] = null;
+    }
+}
@@ -6,11 +6,15 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Surrogate;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  
+import com.mojang.authlib.GameProfileRepository;
+import com.mojang.authlib.minecraft.MinecraftSessionService;
+import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
 import com.mumfrey.liteloader.client.ClientProxy;
  
 import net.minecraft.client.Minecraft;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.integrated.IntegratedServer;
+import net.minecraft.server.management.PlayerProfileCache;
 import net.minecraft.world.WorldSettings;
  
 @Mixin(IntegratedServer.class)
@@ -18,7 +22,7 @@ public abstract class MixinIntegratedServer extends MinecraftServer
 {
     public MixinIntegratedServer()
     {
-        super(null, null);
+        super(null, null, null, null, null, null, null);
     }
  
     @Inject(
@@ -26,7 +30,8 @@ public abstract class MixinIntegratedServer extends MinecraftServer
         at = @At("RETURN"),
         remap = false
     )
-    private void onConstructed(Minecraft mcIn, String folderName, String worldName, WorldSettings settings, CallbackInfo ci)
+    private void onConstructed(Minecraft mcIn, String folderName, String worldName, WorldSettings settings, YggdrasilAuthenticationService authSrv,
+            MinecraftSessionService sessionSrv, GameProfileRepository profileRepo, PlayerProfileCache profileCache, CallbackInfo ci)
     {
         ClientProxy.onCreateIntegratedServer((IntegratedServer)(Object)this, folderName, worldName, settings);
     }
-package com.mumfrey.liteloader.client.mixin;
-
-import java.util.IdentityHashMap;
-import java.util.List;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import com.mumfrey.liteloader.client.ducks.IObjectIntIdentityMap;
-
-import net.minecraft.util.ObjectIntIdentityMap;
-
-@Mixin(ObjectIntIdentityMap.class)
-public abstract class MixinObjectIntIdentityMap<T> implements IObjectIntIdentityMap
-{
-    @Shadow private IdentityHashMap<T, Integer> identityMap;
-    @Shadow private List<T> objectList;
-    
-    @SuppressWarnings("unchecked")
-    @Override
-    public <V> IdentityHashMap<V, Integer> getIdentityMap()
-    {
-        return (IdentityHashMap<V, Integer>)this.identityMap;
-    }
-    
-    @SuppressWarnings("unchecked")
-    @Override
-    public <V> List<V> getObjectList()
-    {
-        return (List<V>)this.objectList;
-    }
-}
 package com.mumfrey.liteloader.client.mixin;
  
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
  
-import com.mumfrey.liteloader.client.ducks.INamespacedRegistry;
-import com.mumfrey.liteloader.client.ducks.IObjectIntIdentityMap;
+import com.mumfrey.liteloader.client.ducks.IIntIdentityHashBiMap;
  
-import net.minecraft.util.ObjectIntIdentityMap;
-import net.minecraft.util.RegistryNamespaced;
-import net.minecraft.util.RegistrySimple;
+import net.minecraft.util.IntIdentityHashBiMap;
+import net.minecraft.util.registry.RegistryNamespaced;
  
 @Mixin(RegistryNamespaced.class)
-public abstract class MixinRegistryNamespaced<K, V> extends RegistrySimple<K, V> implements INamespacedRegistry
+public abstract class MixinRegistryNamespaced<K, V> extends MixinRegistrySimple<K, V>
 {
-    @Shadow protected ObjectIntIdentityMap<V> underlyingIntegerMap;
-    
+    @Shadow @Final protected IntIdentityHashBiMap<V> underlyingIntegerMap;
+
+    @SuppressWarnings("unchecked")
     @Override
-    public IObjectIntIdentityMap getUnderlyingMap()
+    public V removeObjectFromRegistry(K key)
     {
-        return (IObjectIntIdentityMap)this.underlyingIntegerMap;
+        V removed = super.removeObjectFromRegistry(key);
+        System.err.println("====================================================================================================");
+        System.err.println("====================================================================================================");
+        System.err.println("Removed object: " + removed);
+        if (removed != null && this.underlyingIntegerMap instanceof IIntIdentityHashBiMap)
+        {
+            System.err.println("Removing  " + removed + "  from underlying int map");
+            ((IIntIdentityHashBiMap<V>)this.underlyingIntegerMap).removeObject(removed);
+        }
+        System.err.println("====================================================================================================");
+        System.err.println("====================================================================================================");
+        return removed;
     }
 }
@@ -2,21 +2,30 @@ package com.mumfrey.liteloader.client.mixin;
  
 import java.util.Map;
  
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
  
-import com.mumfrey.liteloader.client.ducks.IRegistrySimple;
+import com.mumfrey.liteloader.client.ducks.IMutableRegistry;
  
-import net.minecraft.util.RegistrySimple;
+import net.minecraft.util.registry.RegistrySimple;
  
 @Mixin(RegistrySimple.class)
-public abstract class MixinRegistrySimple<K, V> implements IRegistrySimple<K, V>
+public abstract class MixinRegistrySimple<K, V> implements IMutableRegistry<K, V>
 {
-    @Shadow protected Map<K, V> registryObjects;
+    @Shadow private Object[] values;
+    @Shadow @Final protected Map<K, V> registryObjects;
  
     @Override
-    public Map<K, V> getRegistryObjects()
+    public V removeObjectFromRegistry(K key)
     {
-        return this.registryObjects;
+        System.err.println("====================================================================================================");
+        System.err.println("====================================================================================================");
+        System.err.println("removeObjectFromRegistry: " + key);
+        System.err.println("====================================================================================================");
+        System.err.println("====================================================================================================");
+        
+        this.values = null;
+        return this.registryObjects.remove(key);
     }
 }
@@ -25,7 +25,7 @@ public abstract class MixinRenderManager implements IRenderManager
         return this.entityRenderMap;
     }
  
-    @Redirect(method = "doRenderEntity(Lnet/minecraft/entity/Entity;DDDFFZ)Z", at = @At(
+    @Redirect(method = "doRenderEntity(Lnet/minecraft/entity/Entity;DDDFFZ)V", at = @At(
         value = "INVOKE",
         target = "Lnet/minecraft/client/renderer/entity/Render;doRender(Lnet/minecraft/entity/Entity;DDDFF)V"
     ))
@@ -10,22 +10,24 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import com.mumfrey.liteloader.client.ClientProxy;
  
 import net.minecraft.client.shader.Framebuffer;
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.ScreenShotHelper;
  
 @Mixin(ScreenShotHelper.class)
 public abstract class MixinScreenShotHelper
 {
     @Inject(
-        method = "saveScreenshot(Ljava/io/File;Ljava/lang/String;IILnet/minecraft/client/shader/Framebuffer;)Lnet/minecraft/util/IChatComponent;",
+        method = "saveScreenshot(Ljava/io/File;Ljava/lang/String;IILnet/minecraft/client/shader/Framebuffer;)"
+                + "Lnet/minecraft/util/text/ITextComponent;",
         at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/client/renderer/OpenGlHelper;isFramebufferEnabled()Z",
+            target = "Lnet/minecraft/util/ScreenShotHelper;createScreenshot(IILnet/minecraft/client/shader/Framebuffer;)"
+                    + "Ljava/awt/image/BufferedImage;",
             ordinal = 0
         ),
         cancellable = true
     )
-    private static void onSaveScreenshot(File gameDir, String name, int width, int height, Framebuffer fbo, CallbackInfoReturnable<IChatComponent> ci)
+    private static void onSaveScreenshot(File gameDir, String name, int width, int height, Framebuffer fbo, CallbackInfoReturnable<ITextComponent> ci)
     {
         ClientProxy.onSaveScreenshot(ci, gameDir, name, width, height, fbo);
     }
@@ -6,7 +6,11 @@ import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
  
 import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.GlStateManager.CullFace;
+import net.minecraft.client.renderer.GlStateManager.FogMode;
 import net.minecraft.client.renderer.GlStateManager.TexGen;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.client.renderer.vertex.VertexFormat;
  
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.util.glu.GLU;
@@ -42,6 +46,20 @@ import org.lwjgl.util.glu.GLU;
  */
 public class GL
 {
+    // Vertex Formats
+    public static final VertexFormat VF_BLOCK = DefaultVertexFormats.BLOCK;
+    public static final VertexFormat VF_ITEM = DefaultVertexFormats.ITEM;
+    public static final VertexFormat VF_OLDMODEL_POSITION_TEX_NORMAL = DefaultVertexFormats.OLDMODEL_POSITION_TEX_NORMAL;
+    public static final VertexFormat VF_PARTICLE_POSITION_TEX_COLOR_LMAP = DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP;
+    public static final VertexFormat VF_POSITION = DefaultVertexFormats.POSITION;
+    public static final VertexFormat VF_POSITION_COLOR = DefaultVertexFormats.POSITION_COLOR;
+    public static final VertexFormat VF_POSITION_TEX = DefaultVertexFormats.POSITION_TEX;
+    public static final VertexFormat VF_POSITION_NORMAL = DefaultVertexFormats.POSITION_NORMAL;
+    public static final VertexFormat VF_POSITION_TEX_COLOR = DefaultVertexFormats.POSITION_TEX_COLOR;
+    public static final VertexFormat VF_POSITION_TEX_NORMAL = DefaultVertexFormats.POSITION_TEX_NORMAL;
+    public static final VertexFormat VF_POSITION_TEX_LMAP_COLOR = DefaultVertexFormats.POSITION_TEX_LMAP_COLOR;
+    public static final VertexFormat VF_POSITION_TEX_COLOR_NORMAL = DefaultVertexFormats.POSITION_TEX_COLOR_NORMAL;
+    
     // GL11
     public static final int GL_ACCUM = 0x100;
     public static final int GL_LOAD = 0x101;
@@ -943,7 +961,7 @@ public class GL
         GlStateManager.disableFog();
     }
  
-    public static void glSetFogMode(int mode)
+    public static void glSetFogMode(FogMode mode)
     {
         GlStateManager.setFog(mode);
     }
@@ -988,7 +1006,7 @@ public class GL
         GlStateManager.disableCull();
     }
  
-    public static void glCullFace(int mode)
+    public static void glCullFace(CullFace mode)
     {
         GlStateManager.cullFace(mode);
     }
@@ -2,15 +2,15 @@ package com.mumfrey.liteloader.util;
  
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.util.IdentityHashMap;
-import java.util.List;
 import java.util.Map;
  
 import org.lwjgl.LWJGLException;
 import org.lwjgl.opengl.Display;
 import org.lwjgl.opengl.DisplayMode;
  
-import com.mumfrey.liteloader.client.ducks.*;
+import com.mumfrey.liteloader.client.ducks.IMutableRegistry;
+import com.mumfrey.liteloader.client.ducks.IRenderManager;
+import com.mumfrey.liteloader.client.ducks.ITileEntityRendererDispatcher;
 import com.mumfrey.liteloader.client.overlays.IMinecraft;
 import com.mumfrey.liteloader.client.util.PrivateFieldsClient;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
@@ -26,7 +26,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.RegistrySimple;
 import net.minecraft.util.ResourceLocation;
  
 /**
@@ -106,24 +105,32 @@ public abstract class ModUtilities
      * @param blockName Block identifier
      * @param block Block to register
      * @param force Force insertion even if the operation is blocked by FMl
+     * 
+     * @deprecated Register blocks directly with the registry
      */
+    @SuppressWarnings("unchecked")
+    @Deprecated
     public static void addBlock(int blockId, ResourceLocation blockName, Block block, boolean force)
     {
-        Block existingBlock = Block.blockRegistry.getObject(blockName);
-
+        boolean exists = Block.REGISTRY.containsKey(blockName);
+        Block existingBlock = Block.REGISTRY.getObject(blockName);
+        
         try
         {
-            Block.blockRegistry.register(blockId, blockName, block);
+            Block.REGISTRY.register(blockId, blockName, block);
         }
         catch (IllegalArgumentException ex)
         {
             if (!force) throw new IllegalArgumentException("Could not register block '" + blockName + "', the operation was blocked by FML.", ex);
  
-            ModUtilities.removeObjectFromRegistry(Block.blockRegistry, blockName);
-            Block.blockRegistry.register(blockId, blockName, block);
+            if (Block.REGISTRY instanceof IMutableRegistry)
+            {
+                ((IMutableRegistry<ResourceLocation, Block>)Block.REGISTRY).removeObjectFromRegistry(blockName);
+                Block.REGISTRY.register(blockId, blockName, block);
+            }
         }
  
-        if (existingBlock != null)
+        if (exists)
         {
             try
             {
@@ -154,24 +161,32 @@ public abstract class ModUtilities
      * @param itemName Item identifier
      * @param item Item to register
      * @param force Force insertion even if the operation is blocked by FMl
+     * 
+     * @deprecated Register items directly with the registry
      */
+    @SuppressWarnings("unchecked")
+    @Deprecated
     public static void addItem(int itemId, ResourceLocation itemName, Item item, boolean force)
     {
-        Item existingItem = Item.itemRegistry.getObject(itemName);
-
+        boolean exists = Item.REGISTRY.containsKey(itemName);
+        Item existingItem = Item.REGISTRY.getObject(itemName);
+        
         try
         {
-            Item.itemRegistry.register(itemId, itemName, item);
+            Item.REGISTRY.register(itemId, itemName, item);
         }
         catch (IllegalArgumentException ex)
         {
             if (!force) throw new IllegalArgumentException("Could not register item '" + itemName + "', the operation was blocked by FML.", ex);
  
-            ModUtilities.removeObjectFromRegistry(Block.blockRegistry, itemName);
-            Item.itemRegistry.register(itemId, itemName, item);
+            if (Block.REGISTRY instanceof IMutableRegistry)
+            {
+                ((IMutableRegistry<ResourceLocation, Block>)Item.REGISTRY).removeObjectFromRegistry(itemName);
+                Item.REGISTRY.register(itemId, itemName, item);
+            }
         }
  
-        if (existingItem != null)
+        if (exists)
         {
             try
             {
@@ -208,41 +223,6 @@ public abstract class ModUtilities
         }
     }
  
-    private static <K, V> V removeObjectFromRegistry(RegistrySimple<K, V> registry, K key)
-    {
-        if (registry == null) return null;
-
-        IObjectIntIdentityMap underlyingIntegerMap = null;
-
-        if (registry instanceof INamespacedRegistry)
-        {
-            underlyingIntegerMap = ((INamespacedRegistry)registry).getUnderlyingMap(); 
-        }
-
-        @SuppressWarnings("unchecked")
-        Map<K, V> registryObjects = ((IRegistrySimple<K, V>)registry).getRegistryObjects();
-        if (registryObjects != null)
-        {
-            V existingValue = registryObjects.get(key);
-            if (existingValue != null)
-            {
-                registryObjects.remove(key);
-
-                if (underlyingIntegerMap != null)
-                {
-                    IdentityHashMap<V, Integer> identityMap = underlyingIntegerMap.<V>getIdentityMap();
-                    List<V> objectList = underlyingIntegerMap.<V>getObjectList();
-                    if (identityMap != null) identityMap.remove(existingValue);
-                    if (objectList != null) objectList.remove(existingValue);
-                }
-
-                return existingValue;
-            }
-        }
-
-        return null;
-    }
-
     private static void setFinalStaticField(Field field, Object value)
             throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException
     {
@@ -20,7 +20,8 @@
         "MixinTileEntityRendererDispatcher",
         "MixinSimpleReloadableResourceManager",
         "MixinSoundHandler",
-        "MixinGuiTextField"
+        "MixinGuiTextField",
+        "MixinIntIdentityHashBiMap"
     ],
     "injectors": {
         "defaultRequire": 1
 package com.mumfrey.liteloader;
  
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.util.BlockPos;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.MovingObjectPosition.MovingObjectType;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.RayTraceResult.Type;
  
 /**
  * Interface for mods which want to observe the player's "interaction" status
@@ -36,7 +38,7 @@ public interface PlayerInteractionListener extends LiteMod
      *      without hitting anything (eg. the player clicked the sky)
      */
     public abstract void onPlayerClickedAir(EntityPlayerMP player, MouseButton button, BlockPos tracePos, EnumFacing traceSideHit,
-            MovingObjectType traceHitType);
+            Type traceHitType);
  
     /**
      * Calls when the player clicks and hits a block, usually indicates that the
@@ -45,8 +47,17 @@ public interface PlayerInteractionListener extends LiteMod
      * to proceed, or false to cancel the action. Cancelling the action does not
      * prevent further handlers from receiving the event.
      * 
+     * <p><b>Important Note:</b> <em>This event is raised <b>twice</b> for a
+     * given click when an <tt>OFF_HAND</tt> item is equipped and use of the
+     * <tt>MAIN_HAND</tt> item returns a result of type <tt>PASS</tt>.</em> For
+     * example if the player is holding a sword in their main hand, and a block
+     * in their off hand, right-clicking on a block may <tt>PASS</tt> (if the
+     * block is not usable) which will cause fall-through to the off hand.</p>
+     * 
      * @param player Player
      * @param button Mouse button that was pressed, left = dig, right = interact
+     * @param hand Hand used for the operation
+     * @param stack ItemStack being used for the operation, <b>may be null</b>
      * @param hitPos Block which was *hit*. Note that block placement will
      *      normally be at hitPos.offset(sideHit) 
      * @param sideHit Side of the block which was hit
@@ -54,5 +65,15 @@ public interface PlayerInteractionListener extends LiteMod
      *      still inhibit the action), return false to cancel the action (other
      *      listeners will still be notified)
      */
-    public abstract boolean onPlayerClickedBlock(EntityPlayerMP player, MouseButton button, BlockPos hitPos, EnumFacing sideHit);
+    public abstract boolean onPlayerClickedBlock(EntityPlayerMP player, MouseButton button, EnumHand hand, ItemStack stack, BlockPos hitPos,
+            EnumFacing sideHit);
+    
+    /**
+     * Called when the player swaps items in hand
+     * 
+     * @param player Player
+     * @return true to allow the action to be processed, false to cancel the
+     *      action
+     */
+    public abstract boolean onPlayerSwapItems(EntityPlayerMP player);
 }
 package com.mumfrey.liteloader;
  
 import net.minecraft.network.INetHandler;
-import net.minecraft.network.play.server.S01PacketJoinGame;
+import net.minecraft.network.play.server.SPacketJoinGame;
  
  
 /**
@@ -20,5 +20,5 @@ public interface PreJoinGameListener extends LiteMod
      * @param joinGamePacket Join game packet
      * @return true to allow login to continue, false to cancel login
      */
-    public abstract boolean onPreJoinGame(INetHandler netHandler, S01PacketJoinGame joinGamePacket);
+    public abstract boolean onPreJoinGame(INetHandler netHandler, SPacketJoinGame joinGamePacket);
 }
 package com.mumfrey.liteloader;
  
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.network.play.client.C01PacketChatMessage;
+import net.minecraft.network.play.client.CPacketChatMessage;
  
 /**
  * Interface for mods which can filter inbound chat
@@ -18,5 +18,5 @@ public interface ServerChatFilter extends LiteMod
      * @param message Chat message
      * @return True to keep the packet, false to discard
      */
-    public abstract boolean onChat(EntityPlayerMP player, C01PacketChatMessage chatPacket, String message);
+    public abstract boolean onChat(EntityPlayerMP player, CPacketChatMessage chatPacket, String message);
 }
 package com.mumfrey.liteloader.api;
  
 import net.minecraft.network.INetHandler;
-import net.minecraft.network.play.server.S01PacketJoinGame;
+import net.minecraft.network.play.server.SPacketJoinGame;
  
 import com.mumfrey.liteloader.common.GameEngine;
 import com.mumfrey.liteloader.core.LiteLoaderMods;
@@ -59,5 +59,5 @@ public interface CoreProvider extends TickObserver, WorldObserver, ShutdownObser
      * @param netHandler
      * @param loginPacket
      */
-    public abstract void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket);
+    public abstract void onJoinGame(INetHandler netHandler, SPacketJoinGame loginPacket);
 }
 package com.mumfrey.liteloader.common.ducks;
  
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.text.ITextComponent;
  
 public interface IChatPacket
 {
-    public abstract IChatComponent getChatComponent();
+    public abstract ITextComponent getChatComponent();
  
-    public abstract void setChatComponent(IChatComponent chatComponent);
+    public abstract void setChatComponent(ITextComponent chatComponent);
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
+package com.mumfrey.liteloader.common.ducks;
+
+import net.minecraft.util.math.Vec3d;
+
+public interface ITeleportHandler
+{
+    public abstract int beginTeleport(Vec3d location);
+}
@@ -5,9 +5,9 @@ import org.spongepowered.asm.mixin.Shadow;
  
 import com.mumfrey.liteloader.common.ducks.IPacketClientSettings;
  
-import net.minecraft.network.play.client.C15PacketClientSettings;
+import net.minecraft.network.play.client.CPacketClientSettings;
  
-@Mixin(C15PacketClientSettings.class)
+@Mixin(CPacketClientSettings.class)
 public abstract class MixinC15PacketClientSettings implements IPacketClientSettings
 {
     @Shadow private int view;
-package com.mumfrey.liteloader.common.mixin;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import com.mumfrey.liteloader.core.Proxy;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.server.management.ItemInWorldManager;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.world.World;
-
-@Mixin(ItemInWorldManager.class)
-public abstract class MixinItemInWorldManager
-{
-    @Inject(
-        method = "onBlockClicked(Lnet/minecraft/util/BlockPos;Lnet/minecraft/util/EnumFacing;)V",
-        cancellable = true,
-        at = @At("HEAD")
-    )
-    private void onBlockClicked(BlockPos pos, EnumFacing side, CallbackInfo ci)
-    {
-        Proxy.onBlockClicked(ci, (ItemInWorldManager)(Object)this, pos, side);
-    }
-    
-    @Inject(
-        method = "activateBlockOrUseItem(Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/world/World;Lnet/minecraft/item/ItemStack;"
-                + "Lnet/minecraft/util/BlockPos;Lnet/minecraft/util/EnumFacing;FFF)Z",
-        cancellable = true,
-        at = @At("HEAD")
-    )
-    private void onUseItem(EntityPlayer player, World worldIn, ItemStack stack, BlockPos pos, EnumFacing side, float offsetX, float offsetY,
-            float offsetZ, CallbackInfoReturnable<Boolean> cir)
-    {
-        Proxy.onUseItem(cir, player, worldIn, stack, pos, side, offsetX, offsetY, offsetZ);
-    }
-}
@@ -2,27 +2,32 @@ package com.mumfrey.liteloader.common.mixin;
  
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.At.Shift;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Surrogate;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
  
+import com.mumfrey.liteloader.common.ducks.ITeleportHandler;
 import com.mumfrey.liteloader.core.Proxy;
  
 import net.minecraft.network.NetHandlerPlayServer;
-import net.minecraft.network.play.client.C03PacketPlayer;
-import net.minecraft.network.play.client.C07PacketPlayerDigging;
-import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement;
-import net.minecraft.network.play.client.C0APacketAnimation;
+import net.minecraft.network.play.client.CPacketAnimation;
+import net.minecraft.network.play.client.CPacketPlayer;
+import net.minecraft.network.play.client.CPacketPlayerBlockPlacement;
+import net.minecraft.network.play.client.CPacketPlayerDigging;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.WorldServer;
  
 @Mixin(NetHandlerPlayServer.class)
-public abstract class MixinNetHandlerPlayServer
+public abstract class MixinNetHandlerPlayServer implements ITeleportHandler
 {
+    @Shadow private int teleportId;
+    @Shadow private Vec3d field_184362_y;
+    
     @Inject(
-        method = "processPlayerBlockPlacement(Lnet/minecraft/network/play/client/C08PacketPlayerBlockPlacement;)V",
+        method = "processPlayerBlockPlacement(Lnet/minecraft/network/play/client/CPacketPlayerBlockPlacement;)V",
         cancellable = true,
         at = @At(
             value = "INVOKE",
@@ -31,13 +36,13 @@ public abstract class MixinNetHandlerPlayServer
                     + "(Lnet/minecraft/network/Packet;Lnet/minecraft/network/INetHandler;Lnet/minecraft/util/IThreadListener;)V"
         )
     )
-    private void onPlaceBlock(C08PacketPlayerBlockPlacement packetIn, CallbackInfo ci)
+    private void onPlaceBlock(CPacketPlayerBlockPlacement packetIn, CallbackInfo ci)
     {
         Proxy.onPlaceBlock(ci, (NetHandlerPlayServer)(Object)this, packetIn);
     }
  
     @Inject(
-        method = "handleAnimation(Lnet/minecraft/network/play/client/C0APacketAnimation;)V",
+        method = "handleAnimation(Lnet/minecraft/network/play/client/CPacketAnimation;)V",
         cancellable = true,
         at = @At(
             value = "INVOKE",
@@ -46,13 +51,13 @@ public abstract class MixinNetHandlerPlayServer
                     + "(Lnet/minecraft/network/Packet;Lnet/minecraft/network/INetHandler;Lnet/minecraft/util/IThreadListener;)V"
         )
     )
-    private void onClickedAir(C0APacketAnimation packetIn, CallbackInfo ci)
+    private void onClickedAir(CPacketAnimation packetIn, CallbackInfo ci)
     {
         Proxy.onClickedAir(ci, (NetHandlerPlayServer)(Object)this, packetIn);
     }
  
     @Inject(
-        method = "processPlayerDigging(Lnet/minecraft/network/play/client/C07PacketPlayerDigging;)V",
+        method = "processPlayerDigging(Lnet/minecraft/network/play/client/CPacketPlayerDigging;)V",
         cancellable = true,
         at = @At(
             value = "INVOKE",
@@ -61,31 +66,37 @@ public abstract class MixinNetHandlerPlayServer
                     + "(Lnet/minecraft/network/Packet;Lnet/minecraft/network/INetHandler;Lnet/minecraft/util/IThreadListener;)V"
         )
     )
-    private void onPlayerDigging(C07PacketPlayerDigging packetIn, CallbackInfo ci)
+    private void onPlayerDigging(CPacketPlayerDigging packetIn, CallbackInfo ci)
     {
         Proxy.onPlayerDigging(ci, (NetHandlerPlayServer)(Object)this, packetIn);
     }
  
     @Inject(
-        method = "processPlayer(Lnet/minecraft/network/play/client/C03PacketPlayer;)V",
+        method = "processPlayer(Lnet/minecraft/network/play/client/CPacketPlayer;)V",
         cancellable = true,
         locals = LocalCapture.CAPTURE_FAILHARD,
         at = @At(
             value = "FIELD",
             opcode = Opcodes.GETFIELD,
             target = "Lnet/minecraft/entity/player/EntityPlayerMP;posY:D",
-            ordinal = 4
+            ordinal = 3
         )
     )
-    private void onPlayerMoved(C03PacketPlayer packetIn, CallbackInfo ci, WorldServer world, double oldPosX, double oldPosY, double oldPosZ,
-            double deltaMoveSq, double deltaX, double deltaY, double deltaZ)
+    private void onPlayerMoved(CPacketPlayer packetIn, CallbackInfo ci, WorldServer world)
     {
-        Proxy.onPlayerMoved(ci, (NetHandlerPlayServer)(Object)this, packetIn, world, oldPosX, oldPosY, oldPosZ, deltaMoveSq, deltaX, deltaY, deltaZ);
+        Proxy.onPlayerMoved(ci, (NetHandlerPlayServer)(Object)this, packetIn, world);
     }
  
-    @Surrogate
-    private void onPlayerMoved(C03PacketPlayer packetIn, CallbackInfo ci, WorldServer world, double oldPosX, double oldPosY, double oldPosZ)
+    @Override
+    public int beginTeleport(Vec3d location)
     {
-        Proxy.onPlayerMoved(ci, (NetHandlerPlayServer)(Object)this, packetIn, world, oldPosX, oldPosY, oldPosZ);
+        this.field_184362_y = location;
+
+        if (++this.teleportId == Integer.MAX_VALUE)
+        {
+            this.teleportId = 0;
+        }
+        
+        return this.teleportId;
     }
 }
+package com.mumfrey.liteloader.common.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import com.mumfrey.liteloader.core.Proxy;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.server.management.PlayerInteractionManager;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.world.World;
+
+@Mixin(PlayerInteractionManager.class)
+public abstract class MixinPlayerInteractionManager
+{
+    @Inject(
+        method = "onBlockClicked(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;)V",
+        cancellable = true,
+        at = @At("HEAD")
+    )
+    private void onBlockClicked(BlockPos pos, EnumFacing side, CallbackInfo ci)
+    {
+        Proxy.onBlockClicked(ci, (PlayerInteractionManager)(Object)this, pos, side);
+    }
+    
+    @Inject(
+        method = "processRightClickBlock(Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/world/World;Lnet/minecraft/item/ItemStack;"
+                + "Lnet/minecraft/util/EnumHand;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;FFF)"
+                + "Lnet/minecraft/util/EnumActionResult;",
+        cancellable = true,
+        at = @At("HEAD")
+    )
+    private void onRightClickBlock(EntityPlayer player, World worldIn, ItemStack stack, EnumHand hand, BlockPos pos, EnumFacing side,
+            float offsetX, float offsetY, float offsetZ, CallbackInfoReturnable<EnumActionResult> cir)
+    {
+        Proxy.onRightClickBlock(cir, player, worldIn, stack, hand, pos, side, offsetX, offsetY, offsetZ);
+    }
+    
+//    @Inject(
+//            method = "processRightClickBlock(Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/world/World;Lnet/minecraft/item/ItemStack;"
+//                    + "Lnet/minecraft/util/EnumHand;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;FFF)"
+//                    + "Lnet/minecraft/util/EnumActionResult;",
+//                    cancellable = true,
+//                    at = @At("RETURN")
+//            )
+//    private void postRightClickBlock(EntityPlayer player, World worldIn, ItemStack stack, EnumHand hand, BlockPos pos, EnumFacing side,
+//            float offsetX, float offsetY, float offsetZ, CallbackInfoReturnable<EnumActionResult> cir)
+//    {
+//        Proxy.postRightClickBlock(cir, player, worldIn, stack, hand, pos, side, offsetX, offsetY, offsetZ);
+//    }
+    
+    @Inject(
+            method = "processRightClick(Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/world/World;Lnet/minecraft/item/ItemStack;"
+                    + "Lnet/minecraft/util/EnumHand;)Lnet/minecraft/util/EnumActionResult;",
+                    cancellable = true,
+                    at = @At("HEAD")
+            )
+    private void onRightClick(EntityPlayer player, World worldIn, ItemStack stack, EnumHand hand, CallbackInfoReturnable<EnumActionResult> cir)
+    {
+        Proxy.onRightClick(cir, player, worldIn, stack, hand);
+    }
+}
@@ -13,10 +13,10 @@ import com.mumfrey.liteloader.core.Proxy;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.NetHandlerPlayServer;
 import net.minecraft.network.NetworkManager;
-import net.minecraft.server.management.ServerConfigurationManager;
+import net.minecraft.server.management.PlayerList;
  
-@Mixin(ServerConfigurationManager.class)
-public abstract class MixinServerConfigurationManager
+@Mixin(PlayerList.class)
+public abstract class MixinPlayerList
 {
     @Inject(
         method = "initializeConnectionToPlayer(Lnet/minecraft/network/NetworkManager;Lnet/minecraft/entity/player/EntityPlayerMP;)V",
@@ -24,26 +24,26 @@ public abstract class MixinServerConfigurationManager
     )
     private void onInitializePlayerConnection(NetworkManager netManager, EntityPlayerMP player, CallbackInfo ci)
     {
-        Proxy.onInitializePlayerConnection((ServerConfigurationManager)(Object)this, netManager, player);
+        Proxy.onInitializePlayerConnection((PlayerList)(Object)this, netManager, player);
     }
  
     // Because, forge
     @Surrogate
     private void onInitializePlayerConnection(NetworkManager netManager, EntityPlayerMP player, NetHandlerPlayServer nhps, CallbackInfo ci)
     {
-        Proxy.onInitializePlayerConnection((ServerConfigurationManager)(Object)this, netManager, player);
+        Proxy.onInitializePlayerConnection((PlayerList)(Object)this, netManager, player);
     }
  
     @Inject(method = "playerLoggedIn(Lnet/minecraft/entity/player/EntityPlayerMP;)V", at = @At("RETURN"))
     private void onPlayerLogin(EntityPlayerMP player, CallbackInfo ci)
     {
-        Proxy.onPlayerLogin((ServerConfigurationManager)(Object)this, player);
+        Proxy.onPlayerLogin((PlayerList)(Object)this, player);
     }
  
     @Inject(method = "playerLoggedOut(Lnet/minecraft/entity/player/EntityPlayerMP;)V", at = @At("RETURN"))
     private void onPlayerLogout(EntityPlayerMP player, CallbackInfo ci)
     {
-        Proxy.onPlayerLogout((ServerConfigurationManager)(Object)this, player);
+        Proxy.onPlayerLogout((PlayerList)(Object)this, player);
     }
  
     @Inject(
@@ -53,7 +53,7 @@ public abstract class MixinServerConfigurationManager
     )
     private void onSpawnPlayer(GameProfile profile, CallbackInfoReturnable<EntityPlayerMP> cir)
     {
-        Proxy.onSpawnPlayer(cir, (ServerConfigurationManager)(Object)this, profile);
+        Proxy.onSpawnPlayer(cir, (PlayerList)(Object)this, profile);
     }
  
     @Inject(
@@ -63,6 +63,6 @@ public abstract class MixinServerConfigurationManager
     )
     private void onRespawnPlayer(EntityPlayerMP player, int dimension, boolean conqueredEnd, CallbackInfoReturnable<EntityPlayerMP> cir)
     {
-        Proxy.onRespawnPlayer(cir, (ServerConfigurationManager)(Object)this, player, dimension, conqueredEnd);
+        Proxy.onRespawnPlayer(cir, (PlayerList)(Object)this, player, dimension, conqueredEnd);
     }
 }
@@ -5,22 +5,22 @@ import org.spongepowered.asm.mixin.Shadow;
  
 import com.mumfrey.liteloader.common.ducks.IChatPacket;
  
-import net.minecraft.network.play.server.S02PacketChat;
-import net.minecraft.util.IChatComponent;
+import net.minecraft.network.play.server.SPacketChat;
+import net.minecraft.util.text.ITextComponent;
  
-@Mixin(S02PacketChat.class)
+@Mixin(SPacketChat.class)
 public abstract class MixinS02PacketChat implements IChatPacket
 {
-    @Shadow private IChatComponent chatComponent;
+    @Shadow private ITextComponent chatComponent;
  
     @Override
-    public IChatComponent getChatComponent()
+    public ITextComponent getChatComponent()
     {
         return this.chatComponent;
     }
  
     @Override
-    public void setChatComponent(IChatComponent chatComponent)
+    public void setChatComponent(ITextComponent chatComponent)
     {
         this.chatComponent = chatComponent;
     }
 package com.mumfrey.liteloader.common.transformers;
  
+import java.util.HashSet;
+import java.util.Set;
+
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.InsnNode;
@@ -20,6 +23,8 @@ import com.mumfrey.liteloader.transformers.event.EventInfo;
  */
 public class PacketEvent extends Event
 {
+    private static Set<String> names = new HashSet<String>();
+    
     /**
      * Soft index for this packet, used as a lookup for speed when determining
      * handlers.
@@ -28,7 +33,7 @@ public class PacketEvent extends Event
  
     PacketEvent(Packets packet)
     {
-        super("on" + packet.getShortName(), true, 1000);
+        super(PacketEvent.getPacketEventName(packet), true, 1000);
         this.packetIndex = packet.getIndex();
         this.verbose = false;
     }
@@ -62,4 +67,26 @@ public class PacketEvent extends Event
  
         return ctorMAXS;
     }
+
+    private static String getPacketEventName(Packets packet)
+    {
+        String baseName = "on" + packet.getShortName();
+        if (!PacketEvent.names.contains(baseName))
+        {
+            PacketEvent.names.add(baseName);
+            return baseName;
+        }
+        
+        for (int ordinal = 1; ordinal < 33; ordinal++)
+        {
+            String offsetName = String.format("%s#%d", baseName, ordinal);
+            if (!PacketEvent.names.contains(offsetName))
+            {
+                PacketEvent.names.add(offsetName);
+                return offsetName;
+            }
+        }
+        
+        throw new IllegalArgumentException("Too many packet events with the same name: " + baseName);
+    }
 }
@@ -2,7 +2,7 @@ package com.mumfrey.liteloader.core;
  
 import net.minecraft.network.INetHandler;
 import net.minecraft.network.PacketBuffer;
-import net.minecraft.network.play.server.S3FPacketCustomPayload;
+import net.minecraft.network.play.server.SPacketCustomPayload;
  
 import com.mumfrey.liteloader.PluginChannelListener;
 import com.mumfrey.liteloader.api.Listener;
@@ -76,7 +76,7 @@ public abstract class ClientPluginChannels extends PluginChannels&lt;PluginChannelL
      * 
      * @param customPayload
      */
-    public abstract void onPluginChannelMessage(S3FPacketCustomPayload customPayload);
+    public abstract void onPluginChannelMessage(SPacketCustomPayload customPayload);
  
     /**
      * @param channel
@@ -40,7 +40,7 @@ import net.minecraft.crash.CrashReportCategory;
 import net.minecraft.launchwrapper.LaunchClassLoader;
 import net.minecraft.network.EnumConnectionState;
 import net.minecraft.network.INetHandler;
-import net.minecraft.network.play.server.S01PacketJoinGame;
+import net.minecraft.network.play.server.SPacketJoinGame;
 import net.minecraft.profiler.Profiler;
 import net.minecraft.world.World;
  
@@ -880,7 +880,7 @@ public final class LiteLoader
      * @param netHandler
      * @param loginPacket
      */
-    void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
+    void onJoinGame(INetHandler netHandler, SPacketJoinGame loginPacket)
     {
         if (this.permissionsManagerClient != null)
         {
@@ -14,6 +14,7 @@ import com.mumfrey.liteloader.api.ShutdownObserver;
 import com.mumfrey.liteloader.common.GameEngine;
 import com.mumfrey.liteloader.common.LoadingProgress;
 import com.mumfrey.liteloader.common.ducks.IPacketClientSettings;
+import com.mumfrey.liteloader.common.ducks.ITeleportHandler;
 import com.mumfrey.liteloader.core.event.HandlerList;
 import com.mumfrey.liteloader.core.event.HandlerList.ReturnLogicOp;
 import com.mumfrey.liteloader.interfaces.FastIterable;
@@ -25,20 +26,22 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 import net.minecraft.command.ICommandManager;
 import net.minecraft.command.ServerCommandManager;
 import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
 import net.minecraft.network.NetHandlerPlayServer;
 import net.minecraft.network.NetworkManager;
-import net.minecraft.network.play.client.C03PacketPlayer;
-import net.minecraft.network.play.client.C15PacketClientSettings;
-import net.minecraft.network.play.server.S08PacketPlayerPosLook;
-import net.minecraft.network.play.server.S08PacketPlayerPosLook.EnumFlags;
-import net.minecraft.network.play.server.S23PacketBlockChange;
+import net.minecraft.network.play.client.CPacketPlayer;
+import net.minecraft.network.play.client.CPacketClientSettings;
+import net.minecraft.network.play.server.SPacketPlayerPosLook;
+import net.minecraft.network.play.server.SPacketPlayerPosLook.EnumFlags;
+import net.minecraft.network.play.server.SPacketBlockChange;
 import net.minecraft.profiler.Profiler;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.management.ItemInWorldManager;
-import net.minecraft.server.management.ServerConfigurationManager;
-import net.minecraft.util.BlockPos;
+import net.minecraft.server.management.PlayerInteractionManager;
+import net.minecraft.server.management.PlayerList;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.MovingObjectPosition.MovingObjectType;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.RayTraceResult.Type;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
 import net.minecraft.world.WorldSettings;
@@ -95,7 +98,8 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
         LEFT_CLICK,
         LEFT_CLICK_BLOCK,
         PLACE_BLOCK_MAYBE,
-        DIG_BLOCK_MAYBE
+        DIG_BLOCK_MAYBE,
+        DIG_BLOCK_END
     }
  
     /**
@@ -310,7 +314,7 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
      * @param player
      * @param profile
      */
-    public void onSpawnPlayer(ServerConfigurationManager scm, EntityPlayerMP player, GameProfile profile)
+    public void onSpawnPlayer(PlayerList scm, EntityPlayerMP player, GameProfile profile)
     {
         this.serverPlayerListeners.all().onPlayerConnect(player, profile);
         PlayerEventState playerState = this.getPlayerState(player);
@@ -321,7 +325,7 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
      * @param scm
      * @param player
      */
-    public void onPlayerLogin(ServerConfigurationManager scm, EntityPlayerMP player)
+    public void onPlayerLogin(PlayerList scm, EntityPlayerMP player)
     {
         LiteLoader.getServerPluginChannels().onPlayerJoined(player);
     }
@@ -331,7 +335,7 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
      * @param netManager
      * @param player
      */
-    public void onInitializePlayerConnection(ServerConfigurationManager scm, NetworkManager netManager, EntityPlayerMP player)
+    public void onInitializePlayerConnection(PlayerList scm, NetworkManager netManager, EntityPlayerMP player)
     {
         this.serverPlayerListeners.all().onPlayerLoggedIn(player);
     }
@@ -343,7 +347,7 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
      * @param dimension
      * @param won
      */
-    public void onRespawnPlayer(ServerConfigurationManager scm, EntityPlayerMP player, EntityPlayerMP oldPlayer, int dimension, boolean won)
+    public void onRespawnPlayer(PlayerList scm, EntityPlayerMP player, EntityPlayerMP oldPlayer, int dimension, boolean won)
     {
         this.serverPlayerListeners.all().onPlayerRespawn(player, oldPlayer, dimension, won);
     }
@@ -352,7 +356,7 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
      * @param scm
      * @param player
      */
-    public void onPlayerLogout(ServerConfigurationManager scm, EntityPlayerMP player)
+    public void onPlayerLogout(PlayerList scm, EntityPlayerMP player)
     {
         this.serverPlayerListeners.all().onPlayerLogout(player);
         this.removePlayer(player);
@@ -389,29 +393,29 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
         this.serverTickListeners.all().onTick(server);
     }
  
-    public boolean onPlaceBlock(NetHandlerPlayServer netHandler, EntityPlayerMP playerMP, BlockPos pos, EnumFacing facing)
+    public boolean onPlaceBlock(NetHandlerPlayServer netHandler, EntityPlayerMP player, EnumHand hand, BlockPos pos, EnumFacing facing)
     {
-        if (!this.onPlayerInteract(InteractType.PLACE_BLOCK_MAYBE, playerMP, pos, facing))
+        if (!this.onPlayerInteract(InteractType.PLACE_BLOCK_MAYBE, player, hand, player.getHeldItem(hand), pos, facing))
         {
-            S23PacketBlockChange cancellation = new S23PacketBlockChange(playerMP.worldObj, pos.offset(facing));
+            SPacketBlockChange cancellation = new SPacketBlockChange(player.worldObj, pos.offset(facing));
             netHandler.playerEntity.playerNetServerHandler.sendPacket(cancellation);
-            playerMP.sendContainerToPlayer(playerMP.inventoryContainer);
+            player.sendContainerToPlayer(player.inventoryContainer);
             return false;
         }
  
         return true;
     }
  
-    public boolean onClickedAir(NetHandlerPlayServer netHandler)
+    public boolean onClickedAir(InteractType action, EntityPlayerMP player, EnumHand hand)
     {
-        return this.onPlayerInteract(InteractType.LEFT_CLICK, netHandler.playerEntity, null, EnumFacing.SOUTH);
+        return this.onPlayerInteract(action, player, hand, player.getHeldItem(hand), null, EnumFacing.SOUTH);
     }
  
-    public boolean onPlayerDigging(NetHandlerPlayServer netHandler, BlockPos pos, EntityPlayerMP playerMP)
+    public boolean onPlayerDigging(InteractType action, EntityPlayerMP player, NetHandlerPlayServer netHandler, BlockPos pos)
     {
-        if (!this.onPlayerInteract(InteractType.DIG_BLOCK_MAYBE, playerMP, pos, EnumFacing.SOUTH))
+        if (!this.onPlayerInteract(action, player, EnumHand.MAIN_HAND, player.getHeldItemMainhand(), pos, EnumFacing.SOUTH))
         {
-            S23PacketBlockChange cancellation = new S23PacketBlockChange(playerMP.worldObj, pos);
+            SPacketBlockChange cancellation = new SPacketBlockChange(player.worldObj, pos);
             netHandler.playerEntity.playerNetServerHandler.sendPacket(cancellation);
             return false;
         }
@@ -419,80 +423,68 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
         return true;
     }
  
-    public boolean onUseItem(BlockPos pos, EnumFacing side, EntityPlayerMP playerMP)
+    public boolean onUseItem(EntityPlayerMP player, EnumHand hand, ItemStack stack, BlockPos pos, EnumFacing side)
     {
-        if (!this.onPlayerInteract(InteractType.PLACE_BLOCK_MAYBE, playerMP, pos, side))
+        if (!this.onPlayerInteract(InteractType.PLACE_BLOCK_MAYBE, player, hand, stack, pos, side))
         {
-            S23PacketBlockChange cancellation = new S23PacketBlockChange(playerMP.worldObj, pos);
-            playerMP.playerNetServerHandler.sendPacket(cancellation);
+            SPacketBlockChange cancellation = new SPacketBlockChange(player.worldObj, pos);
+            player.playerNetServerHandler.sendPacket(cancellation);
             return false;
         }
  
         return true;
     }
  
-    public boolean onBlockClicked(BlockPos pos, EnumFacing side, ItemInWorldManager manager)
+    public boolean onBlockClicked(BlockPos pos, EnumFacing side, PlayerInteractionManager manager)
     {
-        if (!this.onPlayerInteract(InteractType.LEFT_CLICK_BLOCK, manager.thisPlayerMP, pos, side))
+        EntityPlayerMP player = manager.thisPlayerMP;
+        if (!this.onPlayerInteract(InteractType.LEFT_CLICK_BLOCK, player, EnumHand.MAIN_HAND, player.getHeldItemMainhand(), pos, side))
         {
-            S23PacketBlockChange cancellation = new S23PacketBlockChange(manager.theWorld, pos);
-            manager.thisPlayerMP.playerNetServerHandler.sendPacket(cancellation);
+            SPacketBlockChange cancellation = new SPacketBlockChange(manager.theWorld, pos);
+            player.playerNetServerHandler.sendPacket(cancellation);
             return false;
         }
  
         return true;
     }
+    
+    public boolean onPlayerInteract(InteractType action, EntityPlayerMP player, EnumHand hand, ItemStack stack, BlockPos position, EnumFacing side)
+    {
+        return this.getPlayerState(player).onPlayerInteract(action, player, hand, stack, position, side);
+    }
  
-    public boolean onPlayerInteract(InteractType action, EntityPlayerMP player, BlockPos position, EnumFacing side)
+    public boolean onPlayerSwapItems(EntityPlayerMP player)
     {
-        PlayerEventState eventState = this.getPlayerState(player);
-        return eventState.onPlayerInteract(action, player, position, side);
+        return this.playerInteractionListeners.all().onPlayerSwapItems(player);
     }
  
-    void onPlayerClickedAir(EntityPlayerMP player, MouseButton button, BlockPos tracePos, EnumFacing traceSideHit, MovingObjectType traceHitType)
+    void onPlayerClickedAir(EntityPlayerMP player, MouseButton button, EnumHand hand, BlockPos tracePos, EnumFacing traceSideHit, Type traceHitType)
     {
         this.playerInteractionListeners.all().onPlayerClickedAir(player, button, tracePos, traceSideHit, traceHitType);
     }
  
-    boolean onPlayerClickedBlock(EntityPlayerMP player, MouseButton button, BlockPos hitPos, EnumFacing sideHit)
+    boolean onPlayerClickedBlock(EntityPlayerMP player, MouseButton button, EnumHand hand, ItemStack stack, BlockPos hitPos, EnumFacing sideHit)
     {
-        return this.playerInteractionListeners.all().onPlayerClickedBlock(player, button, hitPos, sideHit);
+        return this.playerInteractionListeners.all().onPlayerClickedBlock(player, button, hand, stack, hitPos, sideHit);
     }
  
-    public boolean onPlayerMove(NetHandlerPlayServer netHandler, C03PacketPlayer packet, EntityPlayerMP playerMP, WorldServer world)
+    public boolean onPlayerMove(NetHandlerPlayServer netHandler, CPacketPlayer packet, EntityPlayerMP player, WorldServer world)
     {
-        Position from = new Position(playerMP, true);
-
-        double toX = playerMP.posX;
-        double toY = playerMP.posY;
-        double toZ = playerMP.posZ;
-        float toYaw = playerMP.rotationYaw;
-        float toPitch = playerMP.rotationPitch;
-
-        if (packet.isMoving())
-        {
-            toX = packet.getPositionX();
-            toY = packet.getPositionY();
-            toZ = packet.getPositionZ();
-        }
-
-        if (packet.getRotating())
-        {
-            toYaw = packet.getYaw();
-            toPitch = packet.getPitch();
-        }
-
-        Position to = new Position(toX, toY, toZ, toYaw, toPitch);
+        Position from = new Position(player, true);
+        Position to = new Position(packet.getX(player.posX), packet.getY(player.posY), packet.getZ(player.posZ),
+                packet.getYaw(player.rotationYaw), packet.getPitch(player.rotationPitch));
+        
         ReturnValue<Position> pos = new ReturnValue<Position>(to);
  
-        if (!this.playerMoveListeners.all().onPlayerMove(playerMP, from, to, pos))
+        if (!this.playerMoveListeners.all().onPlayerMove(player, from, to, pos))
         {
-            playerMP.setPositionAndRotation(from.xCoord, from.yCoord, from.zCoord, playerMP.prevRotationYaw, playerMP.prevRotationPitch);
-            playerMP.playerNetServerHandler.sendPacket(new S08PacketPlayerPosLook(from.xCoord, from.yCoord, from.zCoord,
-                    playerMP.prevRotationYaw, playerMP.prevRotationPitch, Collections.<EnumFlags>emptySet()));
+            int teleportId = ((ITeleportHandler)player.playerNetServerHandler).beginTeleport(from);
+            player.setPositionAndRotation(from.xCoord, from.yCoord, from.zCoord, player.prevRotationYaw, player.prevRotationPitch);
+            player.playerNetServerHandler.sendPacket(new SPacketPlayerPosLook(from.xCoord, from.yCoord, from.zCoord,
+                    player.prevRotationYaw, player.prevRotationPitch, Collections.<EnumFlags>emptySet(), teleportId));
             return false;
         }
-
+        
         if (pos.isSet())
         {
             Position newPos = pos.get();
@@ -503,7 +495,7 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
         return true;
     }
  
-    void onPlayerSettingsReceived(EntityPlayerMP player, C15PacketClientSettings packet)
+    void onPlayerSettingsReceived(EntityPlayerMP player, CPacketClientSettings packet)
     {
         PlayerEventState playerState = this.getPlayerState(player);
         playerState.setTraceDistance(((IPacketClientSettings)packet).getViewDistance());
@@ -7,7 +7,7 @@ import java.util.Set;
  * LiteLoader version table
  *
  * @author Adam Mummery-Smith
- * @version 1.8.0_00
+ * @version 1.9.0_00
  */
 public enum LiteLoaderVersion
 {
@@ -39,12 +39,13 @@ public enum LiteLoaderVersion
     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, 1414368553, "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",    "1.8.0",     "1.8", "1.8.0"),
-    MC_1_8_9_R0(34, 0,           "1.8.9",  "1.8.9",     "1.8.9", "1.8.9");
+    MC_1_8_9_R0(34, 0,           "1.8.9",  "1.8.9",     "1.8.9"),
+    MC_1_9_0_R0(35, 0,           "1.9",    "1.9.0",     "1.9.0");
  
     /**
      * Current loader version
      */
-    public static final LiteLoaderVersion CURRENT = LiteLoaderVersion.MC_1_8_9_R0;
+    public static final LiteLoaderVersion CURRENT = LiteLoaderVersion.MC_1_9_0_R0;
  
     private static final LiteLoaderUpdateSite updateSite = new LiteLoaderUpdateSite(LiteLoaderVersion.CURRENT.getMinecraftVersion(),
                                                                                     LiteLoaderVersion.CURRENT.getReleaseTimestamp());
@@ -67,7 +68,9 @@ public enum LiteLoaderVersion
         this.loaderVersion = loaderVersion;
  
         for (String supportedVersion : supportedVersions)
+        {
             this.supportedVersions.add(supportedVersion);
+        }
     }
  
     public int getLoaderRevision()
@@ -6,13 +6,13 @@ 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.C15PacketClientSettings;
-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.network.login.server.SPacketLoginSuccess;
+import net.minecraft.network.play.client.CPacketChatMessage;
+import net.minecraft.network.play.client.CPacketClientSettings;
+import net.minecraft.network.play.client.CPacketCustomPayload;
+import net.minecraft.network.play.server.SPacketJoinGame;
+import net.minecraft.network.play.server.SPacketChat;
+import net.minecraft.network.play.server.SPacketCustomPayload;
 import net.minecraft.util.IThreadListener;
  
 import com.mumfrey.liteloader.PacketHandler;
@@ -58,13 +58,13 @@ public abstract class PacketEvents implements InterfaceProvider
     private FastIterable<ServerChatFilter> serverChatFilters = new HandlerList<ServerChatFilter>(ServerChatFilter.class,
                                                                                                     ReturnLogicOp.AND_BREAK_ON_FALSE);
  
-    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();
-    private final int clientSettingsPacketId = Packets.C15PacketClientSettings.getIndex();
+    private final int loginSuccessPacketId   = Packets.SPacketLoginSuccess.getIndex();
+    private final int serverChatPacketId     = Packets.SPacketChat.getIndex();
+    private final int clientChatPacketId     = Packets.CPacketChatMessage.getIndex();
+    private final int joinGamePacketId       = Packets.SPacketJoinGame.getIndex();
+    private final int serverPayloadPacketId  = Packets.SPacketCustomPayload.getIndex();
+    private final int clientPayloadPacketId  = Packets.CPacketCustomPayload.getIndex();
+    private final int clientSettingsPacketId = Packets.CPacketClientSettings.getIndex();
  
     /**
      * ctor
@@ -182,7 +182,7 @@ public abstract class PacketEvents implements InterfaceProvider
  
         if (packetId == this.loginSuccessPacketId)
         {
-            this.handlePacket(e, netHandler, (S02PacketLoginSuccess)packet);
+            this.handlePacket(e, netHandler, (SPacketLoginSuccess)packet);
         }
     }
  
@@ -196,40 +196,40 @@ public abstract class PacketEvents implements InterfaceProvider
     protected boolean handlePacketEvent(PacketEventInfo<Packet<?>> e, INetHandler netHandler, int packetId)
     {
         Packet<?> packet = e.getSource();
-
+        
         if (packetId == this.serverChatPacketId)
         {
-            this.handlePacket(e, netHandler, (S02PacketChat)packet);
+            this.handlePacket(e, netHandler, (SPacketChat)packet);
             return true;
         }
  
         if (packetId == this.clientChatPacketId)
         {
-            this.handlePacket(e, netHandler, (C01PacketChatMessage)packet);
+            this.handlePacket(e, netHandler, (CPacketChatMessage)packet);
             return true;
         }
  
         if (packetId == this.joinGamePacketId)
         {
-            this.handlePacket(e, netHandler, (S01PacketJoinGame)packet);
+            this.handlePacket(e, netHandler, (SPacketJoinGame)packet);
             return true;
         }
  
         if (packetId == this.serverPayloadPacketId)
         {
-            this.handlePacket(e, netHandler, (S3FPacketCustomPayload)packet);
+            this.handlePacket(e, netHandler, (SPacketCustomPayload)packet);
             return true;
         }
  
         if (packetId == this.clientPayloadPacketId)
         {
-            this.handlePacket(e, netHandler, (C17PacketCustomPayload)packet);
+            this.handlePacket(e, netHandler, (CPacketCustomPayload)packet);
             return true;
         }
  
         if (packetId == this.clientSettingsPacketId)
         {
-            this.handlePacket(e, netHandler, (C15PacketClientSettings)packet);
+            this.handlePacket(e, netHandler, (CPacketClientSettings)packet);
             return true;
         }
  
@@ -241,7 +241,7 @@ public abstract class PacketEvents implements InterfaceProvider
      * @param netHandler
      * @param packet
      */
-    protected abstract void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, S02PacketLoginSuccess packet);
+    protected abstract void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, SPacketLoginSuccess packet);
  
     /**
      * S02PacketChat::processPacket()
@@ -249,7 +249,7 @@ public abstract class PacketEvents implements InterfaceProvider
      * @param netHandler
      * @param packet
      */
-    protected abstract void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, S02PacketChat packet);
+    protected abstract void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, SPacketChat packet);
  
     /**
      * S02PacketChat::processPacket()
@@ -257,7 +257,7 @@ public abstract class PacketEvents implements InterfaceProvider
      * @param netHandler
      * @param packet
      */
-    protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, C01PacketChatMessage packet)
+    protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, CPacketChatMessage packet)
     {
         EntityPlayerMP player = netHandler instanceof NetHandlerPlayServer ? ((NetHandlerPlayServer)netHandler).playerEntity : null;
  
@@ -268,12 +268,12 @@ public abstract class PacketEvents implements InterfaceProvider
     }
  
     /**
-     * S01PacketJoinGame::processPacket()
+     * SPacketJoinGame::processPacket()
      * 
      * @param netHandler
      * @param packet
      */
-    protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, S01PacketJoinGame packet)
+    protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, SPacketJoinGame packet)
     {
         this.loader.onJoinGame(netHandler, packet);
     }
@@ -284,7 +284,7 @@ public abstract class PacketEvents implements InterfaceProvider
      * @param netHandler
      * @param packet
      */
-    protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, S3FPacketCustomPayload packet)
+    protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, SPacketCustomPayload packet)
     {
         LiteLoader.getClientPluginChannels().onPluginChannelMessage(packet);
     }
@@ -295,7 +295,7 @@ public abstract class PacketEvents implements InterfaceProvider
      * @param netHandler
      * @param packet
      */
-    protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, C17PacketCustomPayload packet)
+    protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, CPacketCustomPayload packet)
     {
         LiteLoader.getServerPluginChannels().onPluginChannelMessage(netHandler, packet);
     }
@@ -307,7 +307,7 @@ public abstract class PacketEvents implements InterfaceProvider
      * @param netHandler
      * @param packet
      */
-    private void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, C15PacketClientSettings packet)
+    private void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, CPacketClientSettings packet)
     {
         if (netHandler instanceof NetHandlerPlayServer)
         {
@@ -3,11 +3,13 @@ package com.mumfrey.liteloader.core;
 import java.lang.ref.WeakReference;
  
 import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.util.MovingObjectPosition.MovingObjectType;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.RayTraceResult.Type;
  
 import com.mumfrey.liteloader.PlayerInteractionListener.MouseButton;
 import com.mumfrey.liteloader.core.LiteLoaderEventBroker.InteractType;
@@ -27,8 +29,11 @@ public class PlayerEventState implements IEventState
     private int suppressRightTicks; 
     private boolean leftClick;
     private boolean rightClick;
+    private boolean digging;
+    
+    private EnumHand hand = EnumHand.MAIN_HAND;
  
-    private MovingObjectPosition hit;
+    private RayTraceResult hit;
  
     private String locale = "en_US";
  
@@ -73,14 +78,16 @@ public class PlayerEventState implements IEventState
     @Override
     public void onTick(MinecraftServer server)
     {
-        if (this.leftClick && this.suppressLeftTicks == 0)
+        if (this.leftClick && this.suppressLeftTicks == 0 && !this.digging)
         {
-            this.broker.onPlayerClickedAir(this.getPlayer(), MouseButton.LEFT, this.hit.getBlockPos(), this.hit.sideHit, this.hit.typeOfHit);
+            this.broker.onPlayerClickedAir(this.getPlayer(), MouseButton.LEFT, this.hand,
+                    this.hit.getBlockPos(), this.hit.sideHit, this.hit.typeOfHit);
         }
  
         if (this.rightClick && this.suppressRightTicks == 0)
         {
-            this.broker.onPlayerClickedAir(this.getPlayer(), MouseButton.RIGHT, this.hit.getBlockPos(), this.hit.sideHit,  this.hit.typeOfHit);
+            this.broker.onPlayerClickedAir(this.getPlayer(), MouseButton.RIGHT, this.hand,
+                    this.hit.getBlockPos(), this.hit.sideHit,  this.hit.typeOfHit);
         }
  
         if (this.suppressLeftTicks > 0) this.suppressLeftTicks--;
@@ -90,18 +97,33 @@ public class PlayerEventState implements IEventState
         this.rightClick = false;
     }
  
-    public boolean onPlayerInteract(InteractType action, EntityPlayerMP player, BlockPos position, EnumFacing side)
+    public boolean onPlayerInteract(InteractType action, EntityPlayerMP player, EnumHand hand, ItemStack stack, BlockPos position, EnumFacing side)
     {
+        if (action == InteractType.DIG_BLOCK_MAYBE && !player.isCreative())
+        {
+            this.digging = true;
+        }
+        
+        if (action == InteractType.DIG_BLOCK_END)
+        {
+            this.digging = false;
+            this.suppressLeftTicks++;
+            return true;
+        }
+        
         this.hit = EntityUtilities.rayTraceFromEntity(player, this.traceDistance, 0.0F);
  
         if (action == InteractType.LEFT_CLICK)
         {
             this.leftClick = true;
+            this.hand = hand;
             return true;
         }
  
         if (action == InteractType.RIGHT_CLICK)
         {
+            this.digging = false;
+            this.hand = hand;
             this.rightClick = true;
             return true;
         }
@@ -109,29 +131,34 @@ public class PlayerEventState implements IEventState
         if ((action == InteractType.LEFT_CLICK_BLOCK || action == InteractType.DIG_BLOCK_MAYBE) && this.suppressLeftTicks == 0)
         {
             this.suppressLeftTicks += 2;
-            return this.broker.onPlayerClickedBlock(player, MouseButton.LEFT, position, side);
+            return this.broker.onPlayerClickedBlock(player, MouseButton.LEFT, hand, stack, position, side);
         }
  
         if (action == InteractType.PLACE_BLOCK_MAYBE)
         {
-            if (this.suppressRightTicks > 0)
+            this.digging = false;
+
+            if (this.suppressRightTicks > 0 && (this.suppressRightTicks != 1 && hand != this.hand))
             {
                 return true;
             }
  
             if (position.toLong() == PlayerEventState.MISS)
             {
-                MovingObjectPosition actualHit = EntityUtilities.rayTraceFromEntity(player, player.capabilities.isCreativeMode ? 5.0 : 4.5, 0.0F);
-                if (actualHit.typeOfHit == MovingObjectType.MISS)
+                RayTraceResult actualHit = EntityUtilities.rayTraceFromEntity(player, player.capabilities.isCreativeMode ? 5.0 : 4.5, 0.0F);
+                if (actualHit.typeOfHit == Type.MISS)
                 {
+                    this.digging = false;
+                    this.hand = hand;
                     this.rightClick = true;
                     return true;
                 }
             }
  
+            this.hand = hand;
             this.suppressRightTicks++;
             this.suppressLeftTicks++;
-            return this.broker.onPlayerClickedBlock(player, MouseButton.RIGHT, position, side);
+            return this.broker.onPlayerClickedBlock(player, MouseButton.RIGHT, hand, stack, position, side);
         }
  
         return true;
@@ -4,21 +4,25 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
  
 import com.mojang.authlib.GameProfile;
+import com.mumfrey.liteloader.core.LiteLoaderEventBroker.InteractType;
  
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.NetHandlerPlayServer;
 import net.minecraft.network.NetworkManager;
-import net.minecraft.network.play.client.C03PacketPlayer;
-import net.minecraft.network.play.client.C07PacketPlayerDigging;
-import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement;
-import net.minecraft.network.play.client.C0APacketAnimation;
+import net.minecraft.network.play.client.CPacketAnimation;
+import net.minecraft.network.play.client.CPacketPlayer;
+import net.minecraft.network.play.client.CPacketPlayerBlockPlacement;
+import net.minecraft.network.play.client.CPacketPlayerDigging;
+import net.minecraft.network.play.client.CPacketPlayerDigging.Action;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.management.ItemInWorldManager;
-import net.minecraft.server.management.ServerConfigurationManager;
-import net.minecraft.util.BlockPos;
+import net.minecraft.server.management.PlayerInteractionManager;
+import net.minecraft.server.management.PlayerList;
+import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
  
@@ -39,27 +43,27 @@ public abstract class Proxy
         }
     }
  
-    public static void onInitializePlayerConnection(ServerConfigurationManager source, NetworkManager netManager, EntityPlayerMP player)
+    public static void onInitializePlayerConnection(PlayerList source, NetworkManager netManager, EntityPlayerMP player)
     {
         Proxy.broker.onInitializePlayerConnection(source, netManager, player);
     }
  
-    public static void onPlayerLogin(ServerConfigurationManager source, EntityPlayerMP player)
+    public static void onPlayerLogin(PlayerList source, EntityPlayerMP player)
     {
         Proxy.broker.onPlayerLogin(source, player);
     }
  
-    public static void onPlayerLogout(ServerConfigurationManager source, EntityPlayerMP player)
+    public static void onPlayerLogout(PlayerList source, EntityPlayerMP player)
     {
         Proxy.broker.onPlayerLogout(source, player);
     }
  
-    public static void onSpawnPlayer(CallbackInfoReturnable<EntityPlayerMP> cir, ServerConfigurationManager source, GameProfile profile)
+    public static void onSpawnPlayer(CallbackInfoReturnable<EntityPlayerMP> cir, PlayerList source, GameProfile profile)
     {
         Proxy.broker.onSpawnPlayer(source, cir.getReturnValue(), profile);
     }
  
-    public static void onRespawnPlayer(CallbackInfoReturnable<EntityPlayerMP> cir, ServerConfigurationManager source, EntityPlayerMP oldPlayer,
+    public static void onRespawnPlayer(CallbackInfoReturnable<EntityPlayerMP> cir, PlayerList source, EntityPlayerMP oldPlayer,
             int dimension, boolean won)
     {
         Proxy.broker.onRespawnPlayer(source, cir.getReturnValue(), oldPlayer, dimension, won);
@@ -70,49 +74,87 @@ public abstract class Proxy
         Proxy.broker.onServerTick(mcServer);
     }
  
-    public static void onPlaceBlock(CallbackInfo ci, NetHandlerPlayServer netHandler, C08PacketPlayerBlockPlacement packet)
+    public static void onPlaceBlock(CallbackInfo ci, NetHandlerPlayServer netHandler, CPacketPlayerBlockPlacement packet)
     {
-        if (!Proxy.broker.onPlaceBlock(netHandler, netHandler.playerEntity, packet.getPosition(),
-                EnumFacing.getFront(packet.getPlacedBlockDirection())))
-        {
-            ci.cancel();
-        }
+        // Potentially not needed any more
+//        if (!Proxy.broker.onPlaceBlock(netHandler, netHandler.playerEntity, packet.getPosition(),
+//                EnumFacing.getFront(packet.getPlacedBlockDirection())))
+//        {
+//            ci.cancel();
+//        }
     }
  
-    public static void onClickedAir(CallbackInfo ci, NetHandlerPlayServer netHandler, C0APacketAnimation packet)
+    public static void onClickedAir(CallbackInfo ci, NetHandlerPlayServer netHandler, CPacketAnimation packet)
     {
-        if (!Proxy.broker.onClickedAir(netHandler))
+        if (!Proxy.broker.onClickedAir(InteractType.LEFT_CLICK, netHandler.playerEntity, packet.getHand()))
         {
             ci.cancel();
         }
     }
  
-    public static void onPlayerDigging(CallbackInfo ci, NetHandlerPlayServer netHandler, C07PacketPlayerDigging packet)
+    public static void onPlayerDigging(CallbackInfo ci, NetHandlerPlayServer netHandler, CPacketPlayerDigging packet)
     {
-        if (packet.getStatus() == C07PacketPlayerDigging.Action.START_DESTROY_BLOCK)
+        Action action = packet.getAction();
+        EntityPlayerMP player = netHandler.playerEntity;
+        if (action == Action.START_DESTROY_BLOCK)
+        {
+            if (!Proxy.broker.onPlayerDigging(InteractType.DIG_BLOCK_MAYBE, player, netHandler, packet.getPosition()))
+            {
+                ci.cancel();
+            }
+        }
+        else if (action == Action.ABORT_DESTROY_BLOCK || action == Action.STOP_DESTROY_BLOCK)
+        {
+            Proxy.broker.onPlayerDigging(InteractType.DIG_BLOCK_END, player, netHandler, packet.getPosition());
+        }
+        else if (action == Action.SWAP_HELD_ITEMS)
         {
-            if (!Proxy.broker.onPlayerDigging(netHandler, packet.getPosition(), netHandler.playerEntity))
+            if (!Proxy.broker.onPlayerSwapItems(player))
             {
                 ci.cancel();
             }
         }
     }
  
-    public static void onUseItem(CallbackInfoReturnable<Boolean> ci, EntityPlayer player, World world, ItemStack itemStack, BlockPos pos,
-            EnumFacing side, float par8, float par9, float par10)
+    public static void onRightClickBlock(CallbackInfoReturnable<EnumActionResult> ci, EntityPlayer player, World world, ItemStack stack,
+            EnumHand hand, BlockPos pos, EnumFacing side, float offsetX, float offsetY, float offsetZ)
+    {
+        if (!(player instanceof EntityPlayerMP))
+        {
+            return;
+        }
+
+        if (!Proxy.broker.onUseItem((EntityPlayerMP)player, hand, stack, pos, side))
+        {
+            ci.setReturnValue(EnumActionResult.FAIL);
+        }
+    }
+
+    public static void postRightClickBlock(CallbackInfoReturnable<EnumActionResult> cir, EntityPlayer player, World world, ItemStack stack,
+            EnumHand hand, BlockPos pos, EnumFacing side, float offsetX, float offsetY, float offsetZ)
+    {
+        if (!(player instanceof EntityPlayerMP))
+        {
+            return;
+        }
+        
+        System.err.printf("@@ postRightClickBlock: %s\n", cir.getReturnValue());
+    }
+
+    public static void onRightClick(CallbackInfoReturnable<EnumActionResult> cir, EntityPlayer player, World worldIn, ItemStack stack, EnumHand hand)
     {
         if (!(player instanceof EntityPlayerMP))
         {
             return;
         }
  
-        if (!Proxy.broker.onUseItem(pos, side, (EntityPlayerMP)player))
+        if (!Proxy.broker.onClickedAir(InteractType.RIGHT_CLICK, (EntityPlayerMP)player, hand))
         {
-            ci.setReturnValue(false);
+            cir.setReturnValue(EnumActionResult.FAIL);
         }
     }
  
-    public static void onBlockClicked(CallbackInfo ci, ItemInWorldManager manager, BlockPos pos, EnumFacing side)
+    public static void onBlockClicked(CallbackInfo ci, PlayerInteractionManager manager, BlockPos pos, EnumFacing side)
     {
         if (!Proxy.broker.onBlockClicked(pos, side, manager))
         {
@@ -120,7 +162,7 @@ public abstract class Proxy
         }
     }
  
-    public static void onPlayerMoved(CallbackInfo ci, NetHandlerPlayServer netHandler, C03PacketPlayer packet, WorldServer world, double oldPosX,
+    public static void onPlayerMoved(CallbackInfo ci, NetHandlerPlayServer netHandler, CPacketPlayer packet, WorldServer world, double oldPosX,
             double oldPosY, double oldPosZ)
     {
         if (!Proxy.broker.onPlayerMove(netHandler, packet, netHandler.playerEntity, world))
@@ -129,8 +171,7 @@ public abstract class Proxy
         }
     }
  
-    public static void onPlayerMoved(CallbackInfo ci, NetHandlerPlayServer netHandler, C03PacketPlayer packet, WorldServer world, double oldPosX,
-            double oldPosY, double oldPosZ, double deltaMoveSq, double deltaX, double deltaY, double deltaZ)
+    public static void onPlayerMoved(CallbackInfo ci, NetHandlerPlayServer netHandler, CPacketPlayer packet, WorldServer world)
     {
         if (!Proxy.broker.onPlayerMove(netHandler, packet, netHandler.playerEntity, world))
         {
@@ -4,8 +4,8 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.INetHandler;
 import net.minecraft.network.NetHandlerPlayServer;
 import net.minecraft.network.PacketBuffer;
-import net.minecraft.network.play.client.C17PacketCustomPayload;
-import net.minecraft.network.play.server.S3FPacketCustomPayload;
+import net.minecraft.network.play.client.CPacketCustomPayload;
+import net.minecraft.network.play.server.SPacketCustomPayload;
  
 import com.mumfrey.liteloader.ServerPluginChannelListener;
 import com.mumfrey.liteloader.api.Listener;
@@ -99,7 +99,7 @@ public class ServerPluginChannels extends PluginChannels&lt;ServerPluginChannelList
      * @param netHandler 
      * @param customPayload
      */
-    public void onPluginChannelMessage(INetHandler netHandler, C17PacketCustomPayload customPayload)
+    public void onPluginChannelMessage(INetHandler netHandler, CPacketCustomPayload customPayload)
     {
         if (customPayload != null && customPayload.getChannelName() != null)
         {
@@ -195,7 +195,7 @@ public class ServerPluginChannels extends PluginChannels&lt;ServerPluginChannelList
      */
     private void sendRegistrationData(EntityPlayerMP recipient, PacketBuffer registrationData)
     {
-        ServerPluginChannels.dispatch(recipient, new S3FPacketCustomPayload(CHANNEL_REGISTER, registrationData));
+        ServerPluginChannels.dispatch(recipient, new SPacketCustomPayload(CHANNEL_REGISTER, registrationData));
     }
  
     /**
@@ -237,7 +237,7 @@ public class ServerPluginChannels extends PluginChannels&lt;ServerPluginChannelList
             throw new UnregisteredChannelException(channel);
         }
  
-        S3FPacketCustomPayload payload = new S3FPacketCustomPayload(channel, data);
+        SPacketCustomPayload payload = new SPacketCustomPayload(channel, data);
         return ServerPluginChannels.dispatch(recipient, payload);
     }
  
@@ -245,7 +245,7 @@ public class ServerPluginChannels extends PluginChannels&lt;ServerPluginChannelList
      * @param recipient
      * @param payload
      */
-    static boolean dispatch(EntityPlayerMP recipient, S3FPacketCustomPayload payload)
+    static boolean dispatch(EntityPlayerMP recipient, SPacketCustomPayload payload)
     {
         try
         {
@@ -12,7 +12,7 @@ import org.spongepowered.asm.obfuscation.SrgMethod;
  * Centralised obfuscation table for LiteLoader
  *
  * @author Adam Mummery-Smith
- * TODO Obfuscation 1.8.9
+ * TODO Obfuscation 1.9
  */
 public class Obf
 {
@@ -38,14 +38,14 @@ public class Obf
  
     // Classes
     // -----------------------------------------------------------------------------------------
-    public static final Obf                    Minecraft = new Obf("net.minecraft.client.Minecraft",                             "ave" );
-    public static final Obf               EntityRenderer = new Obf("net.minecraft.client.renderer.EntityRenderer",               "bfk" );
-    public static final Obf                       Blocks = new Obf("net.minecraft.init.Blocks",                                  "afi" );
+    public static final Obf                    Minecraft = new Obf("net.minecraft.client.Minecraft",                             "bcf" );
+    public static final Obf               EntityRenderer = new Obf("net.minecraft.client.renderer.EntityRenderer",               "bng" );
+    public static final Obf                       Blocks = new Obf("net.minecraft.init.Blocks",                                  "aju" );
     public static final Obf                CrashReport$6 = new Obf("net.minecraft.crash.CrashReport$6",                          "b$6" );
     public static final Obf                  INetHandler = new Obf("net.minecraft.network.INetHandler",                          "ep"  );
-    public static final Obf                        Items = new Obf("net.minecraft.init.Items",                                   "zy"  );
-    public static final Obf                     Profiler = new Obf("net.minecraft.profiler.Profiler",                            "ny"  );
-    public static final Obf                   TileEntity = new Obf("net.minecraft.tileentity.TileEntity",                        "akw" );
+    public static final Obf                        Items = new Obf("net.minecraft.init.Items",                                   "ads" );
+    public static final Obf                     Profiler = new Obf("net.minecraft.profiler.Profiler",                            "oo"  );
+    public static final Obf                   TileEntity = new Obf("net.minecraft.tileentity.TileEntity",                        "apw" );
  
     // Fields
     // -----------------------------------------------------------------------------------------
@@ -54,11 +54,11 @@ public class Obf
  
     // Methods
     // -----------------------------------------------------------------------------------------
-    public static final Obf                    startGame = new Obf(Obf.Minecraft,                   "func_71384_a",              "am"  );
+    public static final Obf                    startGame = new Obf(Obf.Minecraft,                   "func_71384_a",              "an"  );
     public static final Obf                 startSection = new Obf(Obf.Profiler,                    "func_76320_a",              "a"   );
     public static final Obf                   endSection = new Obf(Obf.Profiler,                    "func_76319_b",              "b"   );
     public static final Obf              endStartSection = new Obf(Obf.Profiler,                    "func_76318_c",              "c"   );
-    public static final Obf                processPacket = new Obf(Packets.S12PacketEntityVelocity, "func_148833_a",             "a"   );
+    public static final Obf                processPacket = new Obf(Packets.SPacketEntityVelocity,   "func_148833_a",             "a"   );
  
     // CHECKSTYLE:ON
  
@@ -7,7 +7,7 @@ import java.util.Map;
  * Packet obfuscation table
  *
  * @author Adam Mummery-Smith
- * TODO Obfuscation 1.8.9
+ * TODO Obfuscation 1.9
  */
 public final class Packets extends Obf
 {
@@ -32,232 +32,246 @@ public final class Packets extends Obf
  
     private static Map<String, Packets> packetMap = new HashMap<String, Packets>();
  
-    public static Packets S08PacketPlayerPosLook           = new Packets("net.minecraft.network.play.server.S08PacketPlayerPosLook",                    "fi", Context.CLIENT);
-    public static Packets S0EPacketSpawnObject             = new Packets("net.minecraft.network.play.server.S0EPacketSpawnObject",                      "fk", Context.CLIENT);
-    public static Packets S11PacketSpawnExperienceOrb      = new Packets("net.minecraft.network.play.server.S11PacketSpawnExperienceOrb",               "fl", Context.CLIENT);
-    public static Packets S2CPacketSpawnGlobalEntity       = new Packets("net.minecraft.network.play.server.S2CPacketSpawnGlobalEntity",                "fm", Context.CLIENT);
-    public static Packets S0FPacketSpawnMob                = new Packets("net.minecraft.network.play.server.S0FPacketSpawnMob",                         "fn", Context.CLIENT);
-    public static Packets S10PacketSpawnPainting           = new Packets("net.minecraft.network.play.server.S10PacketSpawnPainting",                    "fo", Context.CLIENT);
-    public static Packets S0CPacketSpawnPlayer             = new Packets("net.minecraft.network.play.server.S0CPacketSpawnPlayer",                      "fp", Context.CLIENT);
-    public static Packets S0BPacketAnimation               = new Packets("net.minecraft.network.play.server.S0BPacketAnimation",                        "fq", Context.CLIENT);
-    public static Packets S37PacketStatistics              = new Packets("net.minecraft.network.play.server.S37PacketStatistics",                       "fr", Context.CLIENT);
-    public static Packets S25PacketBlockBreakAnim          = new Packets("net.minecraft.network.play.server.S25PacketBlockBreakAnim",                   "fs", Context.CLIENT);
-    public static Packets S35PacketUpdateTileEntity        = new Packets("net.minecraft.network.play.server.S35PacketUpdateTileEntity",                 "ft", Context.CLIENT);
-    public static Packets S24PacketBlockAction             = new Packets("net.minecraft.network.play.server.S24PacketBlockAction",                      "fu", Context.CLIENT);
-    public static Packets S23PacketBlockChange             = new Packets("net.minecraft.network.play.server.S23PacketBlockChange",                      "fv", Context.CLIENT);
-    public static Packets S41PacketServerDifficulty        = new Packets("net.minecraft.network.play.server.S41PacketServerDifficulty",                 "fw", Context.CLIENT);
-    public static Packets S3APacketTabComplete             = new Packets("net.minecraft.network.play.server.S3APacketTabComplete",                      "fx", Context.CLIENT);
-    public static Packets S02PacketChat                    = new Packets("net.minecraft.network.play.server.S02PacketChat",                             "fy", Context.CLIENT);
-    public static Packets S22PacketMultiBlockChange        = new Packets("net.minecraft.network.play.server.S22PacketMultiBlockChange",                 "fz", Context.CLIENT);
-    public static Packets S32PacketConfirmTransaction      = new Packets("net.minecraft.network.play.server.S32PacketConfirmTransaction",               "ga", Context.CLIENT);
-    public static Packets S2EPacketCloseWindow             = new Packets("net.minecraft.network.play.server.S2EPacketCloseWindow",                      "gb", Context.CLIENT);
-    public static Packets S2DPacketOpenWindow              = new Packets("net.minecraft.network.play.server.S2DPacketOpenWindow",                       "gc", Context.CLIENT);
-    public static Packets S30PacketWindowItems             = new Packets("net.minecraft.network.play.server.S30PacketWindowItems",                      "gd", Context.CLIENT);
-    public static Packets S31PacketWindowProperty          = new Packets("net.minecraft.network.play.server.S31PacketWindowProperty",                   "ge", Context.CLIENT);
-    public static Packets S2FPacketSetSlot                 = new Packets("net.minecraft.network.play.server.S2FPacketSetSlot",                          "gf", Context.CLIENT);
-    public static Packets S3FPacketCustomPayload           = new Packets("net.minecraft.network.play.server.S3FPacketCustomPayload",                    "gg", Context.CLIENT);
-    public static Packets S40PacketDisconnect              = new Packets("net.minecraft.network.play.server.S40PacketDisconnect",                       "gh", Context.CLIENT);
-    public static Packets S19PacketEntityStatus            = new Packets("net.minecraft.network.play.server.S19PacketEntityStatus",                     "gi", Context.CLIENT);
-    public static Packets S49PacketUpdateEntityNBT         = new Packets("net.minecraft.network.play.server.S49PacketUpdateEntityNBT",                  "gj", Context.CLIENT);
-    public static Packets S27PacketExplosion               = new Packets("net.minecraft.network.play.server.S27PacketExplosion",                        "gk", Context.CLIENT);
-    public static Packets S46PacketSetCompressionLevel     = new Packets("net.minecraft.network.play.server.S46PacketSetCompressionLevel",              "gl", Context.CLIENT);
-    public static Packets S2BPacketChangeGameState         = new Packets("net.minecraft.network.play.server.S2BPacketChangeGameState",                  "gm", Context.CLIENT);
-    public static Packets S00PacketKeepAlive               = new Packets("net.minecraft.network.play.server.S00PacketKeepAlive",                        "gn", Context.CLIENT);
-    public static Packets S21PacketChunkData               = new Packets("net.minecraft.network.play.server.S21PacketChunkData",                        "go", Context.CLIENT);
-    public static Packets S26PacketMapChunkBulk            = new Packets("net.minecraft.network.play.server.S26PacketMapChunkBulk",                     "gp", Context.CLIENT);
-    public static Packets S28PacketEffect                  = new Packets("net.minecraft.network.play.server.S28PacketEffect",                           "gq", Context.CLIENT);
-    public static Packets S2APacketParticles               = new Packets("net.minecraft.network.play.server.S2APacketParticles",                        "gr", Context.CLIENT);
-    public static Packets S29PacketSoundEffect             = new Packets("net.minecraft.network.play.server.S29PacketSoundEffect",                      "gs", Context.CLIENT);
-    public static Packets S01PacketJoinGame                = new Packets("net.minecraft.network.play.server.S01PacketJoinGame",                         "gt", Context.CLIENT);
-    public static Packets S34PacketMaps                    = new Packets("net.minecraft.network.play.server.S34PacketMaps",                             "gu", Context.CLIENT);
-    public static Packets S14PacketEntity                  = new Packets("net.minecraft.network.play.server.S14PacketEntity",                           "gv", Context.CLIENT);
-    public static Packets S15PacketEntityRelMove           = new Packets("net.minecraft.network.play.server.S14PacketEntity$S15PacketEntityRelMove",    "gv$a", Context.CLIENT);
-    public static Packets S17PacketEntityLookMove          = new Packets("net.minecraft.network.play.server.S14PacketEntity$S17PacketEntityLookMove",   "gv$b", Context.CLIENT);
-    public static Packets S16PacketEntityLook              = new Packets("net.minecraft.network.play.server.S14PacketEntity$S16PacketEntityLook",       "gv$c", Context.CLIENT);
-    public static Packets S36PacketSignEditorOpen          = new Packets("net.minecraft.network.play.server.S36PacketSignEditorOpen",                   "gw", Context.CLIENT);
-    public static Packets S39PacketPlayerAbilities         = new Packets("net.minecraft.network.play.server.S39PacketPlayerAbilities",                  "gx", Context.CLIENT);
-    public static Packets S42PacketCombatEvent             = new Packets("net.minecraft.network.play.server.S42PacketCombatEvent",                      "gy", Context.CLIENT);
-    public static Packets S38PacketPlayerListItem          = new Packets("net.minecraft.network.play.server.S38PacketPlayerListItem",                   "gz", Context.CLIENT);
-    public static Packets S0APacketUseBed                  = new Packets("net.minecraft.network.play.server.S0APacketUseBed",                           "ha", Context.CLIENT);
-    public static Packets S13PacketDestroyEntities         = new Packets("net.minecraft.network.play.server.S13PacketDestroyEntities",                  "hb", Context.CLIENT);
-    public static Packets S1EPacketRemoveEntityEffect      = new Packets("net.minecraft.network.play.server.S1EPacketRemoveEntityEffect",               "hc", Context.CLIENT);
-    public static Packets S48PacketResourcePackSend        = new Packets("net.minecraft.network.play.server.S48PacketResourcePackSend",                 "hd", Context.CLIENT);
-    public static Packets S07PacketRespawn                 = new Packets("net.minecraft.network.play.server.S07PacketRespawn",                          "he", Context.CLIENT);
-    public static Packets S19PacketEntityHeadLook          = new Packets("net.minecraft.network.play.server.S19PacketEntityHeadLook",                   "hf", Context.CLIENT);
-    public static Packets S44PacketWorldBorder             = new Packets("net.minecraft.network.play.server.S44PacketWorldBorder",                      "hg", Context.CLIENT);
-    public static Packets S43PacketCamera                  = new Packets("net.minecraft.network.play.server.S43PacketCamera",                           "hh", Context.CLIENT);
-    public static Packets S09PacketHeldItemChange          = new Packets("net.minecraft.network.play.server.S09PacketHeldItemChange",                   "hi", Context.CLIENT);
-    public static Packets S3DPacketDisplayScoreboard       = new Packets("net.minecraft.network.play.server.S3DPacketDisplayScoreboard",                "hj", Context.CLIENT);
-    public static Packets S1CPacketEntityMetadata          = new Packets("net.minecraft.network.play.server.S1CPacketEntityMetadata",                   "hk", Context.CLIENT);
-    public static Packets S1BPacketEntityAttach            = new Packets("net.minecraft.network.play.server.S1BPacketEntityAttach",                     "hl", Context.CLIENT);
-    public static Packets S12PacketEntityVelocity          = new Packets("net.minecraft.network.play.server.S12PacketEntityVelocity",                   "hm", Context.CLIENT);
-    public static Packets S04PacketEntityEquipment         = new Packets("net.minecraft.network.play.server.S04PacketEntityEquipment",                  "hn", Context.CLIENT);
-    public static Packets S1FPacketSetExperience           = new Packets("net.minecraft.network.play.server.S1FPacketSetExperience",                    "ho", Context.CLIENT);
-    public static Packets S06PacketUpdateHealth            = new Packets("net.minecraft.network.play.server.S06PacketUpdateHealth",                     "hp", Context.CLIENT);
-    public static Packets S3BPacketScoreboardObjective     = new Packets("net.minecraft.network.play.server.S3BPacketScoreboardObjective",              "hq", Context.CLIENT);
-    public static Packets S3EPacketTeams                   = new Packets("net.minecraft.network.play.server.S3EPacketTeams",                            "hr", Context.CLIENT);
-    public static Packets S3CPacketUpdateScore             = new Packets("net.minecraft.network.play.server.S3CPacketUpdateScore",                      "hs", Context.CLIENT);
-    public static Packets S05PacketSpawnPosition           = new Packets("net.minecraft.network.play.server.S05PacketSpawnPosition",                    "ht", Context.CLIENT);
-    public static Packets S03PacketTimeUpdate              = new Packets("net.minecraft.network.play.server.S03PacketTimeUpdate",                       "hu", Context.CLIENT);
-    public static Packets S45PacketTitle                   = new Packets("net.minecraft.network.play.server.S45PacketTitle",                            "hv", Context.CLIENT);
-    public static Packets S33PacketUpdateSign              = new Packets("net.minecraft.network.play.server.S33PacketUpdateSign",                       "hw", Context.CLIENT);
-    public static Packets S47PacketPlayerListHeaderFooter  = new Packets("net.minecraft.network.play.server.S47PacketPlayerListHeaderFooter",           "hx", Context.CLIENT);
-    public static Packets S0DPacketCollectItem             = new Packets("net.minecraft.network.play.server.S0DPacketCollectItem",                      "hy", Context.CLIENT);
-    public static Packets S18PacketEntityTeleport          = new Packets("net.minecraft.network.play.server.S18PacketEntityTeleport",                   "hz", Context.CLIENT);
-    public static Packets S20PacketEntityProperties        = new Packets("net.minecraft.network.play.server.S20PacketEntityProperties",                 "ia", Context.CLIENT);
-    public static Packets S1DPacketEntityEffect            = new Packets("net.minecraft.network.play.server.S1DPacketEntityEffect",                     "ib", Context.CLIENT);
-    public static Packets C14PacketTabComplete             = new Packets("net.minecraft.network.play.client.C14PacketTabComplete",                      "id", Context.SERVER);
-    public static Packets C01PacketChatMessage             = new Packets("net.minecraft.network.play.client.C01PacketChatMessage",                      "ie", Context.SERVER);
-    public static Packets C16PacketClientStatus            = new Packets("net.minecraft.network.play.client.C16PacketClientStatus",                     "ig", Context.SERVER);
-    public static Packets C15PacketClientSettings          = new Packets("net.minecraft.network.play.client.C15PacketClientSettings",                   "ih", Context.SERVER);
-    public static Packets C0FPacketConfirmTransaction      = new Packets("net.minecraft.network.play.client.C0FPacketConfirmTransaction",               "ii", Context.SERVER);
-    public static Packets C11PacketEnchantItem             = new Packets("net.minecraft.network.play.client.C11PacketEnchantItem",                      "ij", Context.SERVER);
-    public static Packets C0EPacketClickWindow             = new Packets("net.minecraft.network.play.client.C0EPacketClickWindow",                      "ik", Context.SERVER);
-    public static Packets C0DPacketCloseWindow             = new Packets("net.minecraft.network.play.client.C0DPacketCloseWindow",                      "il", Context.SERVER);
-    public static Packets C17PacketCustomPayload           = new Packets("net.minecraft.network.play.client.C17PacketCustomPayload",                    "im", Context.SERVER);
-    public static Packets C02PacketUseEntity               = new Packets("net.minecraft.network.play.client.C02PacketUseEntity",                        "in", Context.SERVER);
-    public static Packets C00PacketKeepAlive               = new Packets("net.minecraft.network.play.client.C00PacketKeepAlive",                        "io", Context.SERVER);
-    public static Packets C03PacketPlayer                  = new Packets("net.minecraft.network.play.client.C03PacketPlayer",                           "ip", Context.SERVER);
-    public static Packets C04PacketPlayerPosition          = new Packets("net.minecraft.network.play.client.C03PacketPlayer$C04PacketPlayerPosition",   "ip$a", Context.SERVER);
-    public static Packets C06PacketPlayerPosLook           = new Packets("net.minecraft.network.play.client.C03PacketPlayer$C06PacketPlayerPosLook",    "ip$b", Context.SERVER);
-    public static Packets C05PacketPlayerLook              = new Packets("net.minecraft.network.play.client.C03PacketPlayer$C05PacketPlayerLook",       "ip$c", Context.SERVER);
-    public static Packets C13PacketPlayerAbilities         = new Packets("net.minecraft.network.play.client.C13PacketPlayerAbilities",                  "iq", Context.SERVER);
-    public static Packets C07PacketPlayerDigging           = new Packets("net.minecraft.network.play.client.C07PacketPlayerDigging",                    "ir", Context.SERVER);
-    public static Packets C0BPacketEntityAction            = new Packets("net.minecraft.network.play.client.C0BPacketEntityAction",                     "is", Context.SERVER);
-    public static Packets C0CPacketInput                   = new Packets("net.minecraft.network.play.client.C0CPacketInput",                            "it", Context.SERVER);
-    public static Packets C19PacketResourcePackStatus      = new Packets("net.minecraft.network.play.client.C19PacketResourcePackStatus",               "iu", Context.SERVER);
-    public static Packets C09PacketHeldItemChange          = new Packets("net.minecraft.network.play.client.C09PacketHeldItemChange",                   "iv", Context.SERVER);
-    public static Packets C10PacketCreativeInventoryAction = new Packets("net.minecraft.network.play.client.C10PacketCreativeInventoryAction",          "iw", Context.SERVER);
-    public static Packets C12PacketUpdateSign              = new Packets("net.minecraft.network.play.client.C12PacketUpdateSign",                       "ix", Context.SERVER);
-    public static Packets C0APacketAnimation               = new Packets("net.minecraft.network.play.client.C0APacketAnimation",                        "iy", Context.SERVER);
-    public static Packets C18PacketSpectate                = new Packets("net.minecraft.network.play.client.C18PacketSpectate",                         "iz", Context.SERVER);
-    public static Packets C08PacketPlayerBlockPlacement    = new Packets("net.minecraft.network.play.client.C08PacketPlayerBlockPlacement",             "ja", Context.SERVER);
-    public static Packets C00Handshake                     = new Packets("net.minecraft.network.handshake.client.C00Handshake",                         "jc", Context.SERVER);
-    public static Packets S02PacketLoginSuccess            = new Packets("net.minecraft.network.login.server.S02PacketLoginSuccess",                    "jg", Context.CLIENT);
-    public static Packets S01PacketEncryptionRequest       = new Packets("net.minecraft.network.login.server.S01PacketEncryptionRequest",               "jh", Context.CLIENT);
-    public static Packets S03PacketEnableCompression       = new Packets("net.minecraft.network.login.server.S03PacketEnableCompression",               "ji", Context.CLIENT);
-    public static Packets S00PacketDisconnect              = new Packets("net.minecraft.network.login.server.S00PacketDisconnect",                      "jj", Context.CLIENT);
-    public static Packets C00PacketLoginStart              = new Packets("net.minecraft.network.login.client.C00PacketLoginStart",                      "jl", Context.SERVER);
-    public static Packets C01PacketEncryptionResponse      = new Packets("net.minecraft.network.login.client.C01PacketEncryptionResponse",              "jm", Context.SERVER);
-    public static Packets S01PacketPong                    = new Packets("net.minecraft.network.status.server.S01PacketPong",                           "jq", Context.CLIENT);
-    public static Packets S00PacketServerInfo              = new Packets("net.minecraft.network.status.server.S00PacketServerInfo",                     "jr", Context.CLIENT);
-    public static Packets C01PacketPing                    = new Packets("net.minecraft.network.status.client.C01PacketPing",                           "ju", Context.SERVER);
-    public static Packets C00PacketServerQuery             = new Packets("net.minecraft.network.status.client.C00PacketServerQuery",                    "jv", Context.SERVER);
+    public static Packets SPacketSpawnObject                      = new Packets("net/minecraft/network/play/server/SPacketSpawnObject",                      "fj",   Context.CLIENT);
+    public static Packets SPacketSpawnExperienceOrb               = new Packets("net/minecraft/network/play/server/SPacketSpawnExperienceOrb",               "fk",   Context.CLIENT);
+    public static Packets SPacketSpawnGlobalEntity                = new Packets("net/minecraft/network/play/server/SPacketSpawnGlobalEntity",                "fl",   Context.CLIENT);
+    public static Packets SPacketSpawnMob                         = new Packets("net/minecraft/network/play/server/SPacketSpawnMob",                         "fm",   Context.CLIENT);
+    public static Packets SPacketSpawnPainting                    = new Packets("net/minecraft/network/play/server/SPacketSpawnPainting",                    "fn",   Context.CLIENT);
+    public static Packets SPacketSpawnPlayer                      = new Packets("net/minecraft/network/play/server/SPacketSpawnPlayer",                      "fo",   Context.CLIENT);
+    public static Packets SPacketAnimation                        = new Packets("net/minecraft/network/play/server/SPacketAnimation",                        "fp",   Context.CLIENT);
+    public static Packets SPacketStatistics                       = new Packets("net/minecraft/network/play/server/SPacketStatistics",                       "fq",   Context.CLIENT);
+    public static Packets SPacketBlockBreakAnim                   = new Packets("net/minecraft/network/play/server/SPacketBlockBreakAnim",                   "fr",   Context.CLIENT);
+    public static Packets SPacketUpdateTileEntity                 = new Packets("net/minecraft/network/play/server/SPacketUpdateTileEntity",                 "fs",   Context.CLIENT);
+    public static Packets SPacketBlockAction                      = new Packets("net/minecraft/network/play/server/SPacketBlockAction",                      "ft",   Context.CLIENT);
+    public static Packets SPacketBlockChange                      = new Packets("net/minecraft/network/play/server/SPacketBlockChange",                      "fu",   Context.CLIENT);
+    public static Packets SPacketUpdateEntityNBT                  = new Packets("net/minecraft/network/play/server/SPacketUpdateEntityNBT",                  "fv",   Context.CLIENT);
+    public static Packets SPacketServerDifficulty                 = new Packets("net/minecraft/network/play/server/SPacketServerDifficulty",                 "fw",   Context.CLIENT);
+    public static Packets SPacketTabComplete                      = new Packets("net/minecraft/network/play/server/SPacketTabComplete",                      "fx",   Context.CLIENT);
+    public static Packets SPacketChat                             = new Packets("net/minecraft/network/play/server/SPacketChat",                             "fy",   Context.CLIENT);
+    public static Packets SPacketMultiBlockChange                 = new Packets("net/minecraft/network/play/server/SPacketMultiBlockChange",                 "fz",   Context.CLIENT);
+    public static Packets SPacketConfirmTransaction               = new Packets("net/minecraft/network/play/server/SPacketConfirmTransaction",               "ga",   Context.CLIENT);
+    public static Packets SPacketCloseWindow                      = new Packets("net/minecraft/network/play/server/SPacketCloseWindow",                      "gb",   Context.CLIENT);
+    public static Packets SPacketOpenWindow                       = new Packets("net/minecraft/network/play/server/SPacketOpenWindow",                       "gc",   Context.CLIENT);
+    public static Packets SPacketWindowItems                      = new Packets("net/minecraft/network/play/server/SPacketWindowItems",                      "gd",   Context.CLIENT);
+    public static Packets SPacketWindowProperty                   = new Packets("net/minecraft/network/play/server/SPacketWindowProperty",                   "ge",   Context.CLIENT);
+    public static Packets SPacketSetSlot                          = new Packets("net/minecraft/network/play/server/SPacketSetSlot",                          "gf",   Context.CLIENT);
+    public static Packets SPacketCooldown                         = new Packets("net/minecraft/network/play/server/SPacketCooldown",                         "gg",   Context.CLIENT);
+    public static Packets SPacketCustomPayload                    = new Packets("net/minecraft/network/play/server/SPacketCustomPayload",                    "gh",   Context.CLIENT);
+    public static Packets SPacketCustomSound                      = new Packets("net/minecraft/network/play/server/SPacketCustomSound",                      "gi",   Context.CLIENT);
+    public static Packets SPacketDisconnectPlay                   = new Packets("net/minecraft/network/play/server/SPacketDisconnect",                       "gj",   Context.CLIENT);
+    public static Packets SPacketEntityStatus                     = new Packets("net/minecraft/network/play/server/SPacketEntityStatus",                     "gk",   Context.CLIENT);
+    public static Packets SPacketExplosion                        = new Packets("net/minecraft/network/play/server/SPacketExplosion",                        "gl",   Context.CLIENT);
+    public static Packets SPacketUnloadChunk                      = new Packets("net/minecraft/network/play/server/SPacketUnloadChunk",                      "gm",   Context.CLIENT);
+    public static Packets SPacketChangeGameState                  = new Packets("net/minecraft/network/play/server/SPacketChangeGameState",                  "gn",   Context.CLIENT);
+    public static Packets SPacketKeepAlive                        = new Packets("net/minecraft/network/play/server/SPacketKeepAlive",                        "go",   Context.CLIENT);
+    public static Packets SPacketChunkData                        = new Packets("net/minecraft/network/play/server/SPacketChunkData",                        "gp",   Context.CLIENT);
+    public static Packets SPacketEffect                           = new Packets("net/minecraft/network/play/server/SPacketEffect",                           "gq",   Context.CLIENT);
+    public static Packets SPacketParticles                        = new Packets("net/minecraft/network/play/server/SPacketParticles",                        "gr",   Context.CLIENT);
+    public static Packets SPacketJoinGame                         = new Packets("net/minecraft/network/play/server/SPacketJoinGame",                         "gs",   Context.CLIENT);
+    public static Packets SPacketMaps                             = new Packets("net/minecraft/network/play/server/SPacketMaps",                             "gt",   Context.CLIENT);
+    public static Packets SPacketEntity                           = new Packets("net/minecraft/network/play/server/SPacketEntity",                           "gu",   Context.CLIENT);
+    public static Packets S15PacketEntityRelMove                  = new Packets("net/minecraft/network/play/server/SPacketEntity$S15PacketEntityRelMove",    "gu$a", Context.CLIENT);
+    public static Packets S17PacketEntityLookMove                 = new Packets("net/minecraft/network/play/server/SPacketEntity$S17PacketEntityLookMove",   "gu$b", Context.CLIENT);
+    public static Packets S16PacketEntityLook                     = new Packets("net/minecraft/network/play/server/SPacketEntity$S16PacketEntityLook",       "gu$c", Context.CLIENT);
+    public static Packets SPacketMoveVehicle                      = new Packets("net/minecraft/network/play/server/SPacketMoveVehicle",                      "gv",   Context.CLIENT);
+    public static Packets SPacketSignEditorOpen                   = new Packets("net/minecraft/network/play/server/SPacketSignEditorOpen",                   "gw",   Context.CLIENT);
+    public static Packets SPacketPlayerAbilities                  = new Packets("net/minecraft/network/play/server/SPacketPlayerAbilities",                  "gx",   Context.CLIENT);
+    public static Packets SPacketCombatEvent                      = new Packets("net/minecraft/network/play/server/SPacketCombatEvent",                      "gy",   Context.CLIENT);
+    public static Packets SPacketPlayerListItem                   = new Packets("net/minecraft/network/play/server/SPacketPlayerListItem",                   "gz",   Context.CLIENT);
+    public static Packets SPacketPlayerPosLook                    = new Packets("net/minecraft/network/play/server/SPacketPlayerPosLook",                    "ha",   Context.CLIENT);
+    public static Packets SPacketUseBed                           = new Packets("net/minecraft/network/play/server/SPacketUseBed",                           "hb",   Context.CLIENT);
+    public static Packets SPacketDestroyEntities                  = new Packets("net/minecraft/network/play/server/SPacketDestroyEntities",                  "hc",   Context.CLIENT);
+    public static Packets SPacketRemoveEntityEffect               = new Packets("net/minecraft/network/play/server/SPacketRemoveEntityEffect",               "hd",   Context.CLIENT);
+    public static Packets SPacketResourcePackSend                 = new Packets("net/minecraft/network/play/server/SPacketResourcePackSend",                 "he",   Context.CLIENT);
+    public static Packets SPacketRespawn                          = new Packets("net/minecraft/network/play/server/SPacketRespawn",                          "hf",   Context.CLIENT);
+    public static Packets SPacketEntityHeadLook                   = new Packets("net/minecraft/network/play/server/SPacketEntityHeadLook",                   "hg",   Context.CLIENT);
+    public static Packets SPacketWorldBorder                      = new Packets("net/minecraft/network/play/server/SPacketWorldBorder",                      "hh",   Context.CLIENT);
+    public static Packets SPacketCamera                           = new Packets("net/minecraft/network/play/server/SPacketCamera",                           "hi",   Context.CLIENT);
+    public static Packets SPacketHeldItemChange                   = new Packets("net/minecraft/network/play/server/SPacketHeldItemChange",                   "hj",   Context.CLIENT);
+    public static Packets SPacketDisplayObjective                 = new Packets("net/minecraft/network/play/server/SPacketDisplayObjective",                 "hk",   Context.CLIENT);
+    public static Packets SPacketEntityMetadata                   = new Packets("net/minecraft/network/play/server/SPacketEntityMetadata",                   "hl",   Context.CLIENT);
+    public static Packets SPacketEntityAttach                     = new Packets("net/minecraft/network/play/server/SPacketEntityAttach",                     "hm",   Context.CLIENT);
+    public static Packets SPacketEntityVelocity                   = new Packets("net/minecraft/network/play/server/SPacketEntityVelocity",                   "hn",   Context.CLIENT);
+    public static Packets C00Handshake                            = new Packets("net/minecraft/network/handshake/client/C00Handshake",                       "jj",   Context.SERVER);
+    public static Packets SPacketEntityEquipment                  = new Packets("net/minecraft/network/play/server/SPacketEntityEquipment",                  "ho",   Context.CLIENT);
+    public static Packets SPacketSetExperience                    = new Packets("net/minecraft/network/play/server/SPacketSetExperience",                    "hp",   Context.CLIENT);
+    public static Packets SPacketUpdateHealth                     = new Packets("net/minecraft/network/play/server/SPacketUpdateHealth",                     "hq",   Context.CLIENT);
+    public static Packets SPacketScoreboardObjective              = new Packets("net/minecraft/network/play/server/SPacketScoreboardObjective",              "hr",   Context.CLIENT);
+    public static Packets SPacketSetPassengers                    = new Packets("net/minecraft/network/play/server/SPacketSetPassengers",                    "hs",   Context.CLIENT);
+    public static Packets SPacketTeams                            = new Packets("net/minecraft/network/play/server/SPacketTeams",                            "ht",   Context.CLIENT);
+    public static Packets SPacketUpdateScore                      = new Packets("net/minecraft/network/play/server/SPacketUpdateScore",                      "hu",   Context.CLIENT);
+    public static Packets SPacketSpawnPosition                    = new Packets("net/minecraft/network/play/server/SPacketSpawnPosition",                    "hv",   Context.CLIENT);
+    public static Packets SPacketTimeUpdate                       = new Packets("net/minecraft/network/play/server/SPacketTimeUpdate",                       "hw",   Context.CLIENT);
+    public static Packets SPacketTitle                            = new Packets("net/minecraft/network/play/server/SPacketTitle",                            "hx",   Context.CLIENT);
+    public static Packets SPacketUpdateSign                       = new Packets("net/minecraft/network/play/server/SPacketUpdateSign",                       "hy",   Context.CLIENT);
+    public static Packets SPacketSoundEffect                      = new Packets("net/minecraft/network/play/server/SPacketSoundEffect",                      "hz",   Context.CLIENT);
+    public static Packets SPacketPlayerListHeaderFooter           = new Packets("net/minecraft/network/play/server/SPacketPlayerListHeaderFooter",           "ia",   Context.CLIENT);
+    public static Packets SPacketCollectItem                      = new Packets("net/minecraft/network/play/server/SPacketCollectItem",                      "ib",   Context.CLIENT);
+    public static Packets SPacketEntityTeleport                   = new Packets("net/minecraft/network/play/server/SPacketEntityTeleport",                   "ic",   Context.CLIENT);
+    public static Packets SPacketEntityProperties                 = new Packets("net/minecraft/network/play/server/SPacketEntityProperties",                 "id",   Context.CLIENT);
+    public static Packets SPacketEntityEffect                     = new Packets("net/minecraft/network/play/server/SPacketEntityEffect",                     "ie",   Context.CLIENT);
+    public static Packets CPacketConfirmTeleport                  = new Packets("net/minecraft/network/play/client/CPacketConfirmTeleport",                  "ih",   Context.SERVER);
+    public static Packets CPacketTabComplete                      = new Packets("net/minecraft/network/play/client/CPacketTabComplete",                      "ii",   Context.SERVER);
+    public static Packets CPacketChatMessage                      = new Packets("net/minecraft/network/play/client/CPacketChatMessage",                      "ij",   Context.SERVER);
+    public static Packets CPacketClientStatus                     = new Packets("net/minecraft/network/play/client/CPacketClientStatus",                     "ik",   Context.SERVER);
+    public static Packets CPacketClientSettings                   = new Packets("net/minecraft/network/play/client/CPacketClientSettings",                   "il",   Context.SERVER);
+    public static Packets CPacketConfirmTransaction               = new Packets("net/minecraft/network/play/client/CPacketConfirmTransaction",               "im",   Context.SERVER);
+    public static Packets CPacketEnchantItem                      = new Packets("net/minecraft/network/play/client/CPacketEnchantItem",                      "in",   Context.SERVER);
+    public static Packets CPacketClickWindow                      = new Packets("net/minecraft/network/play/client/CPacketClickWindow",                      "io",   Context.SERVER);
+    public static Packets CPacketCloseWindow                      = new Packets("net/minecraft/network/play/client/CPacketCloseWindow",                      "ip",   Context.SERVER);
+    public static Packets CPacketCustomPayload                    = new Packets("net/minecraft/network/play/client/CPacketCustomPayload",                    "iq",   Context.SERVER);
+    public static Packets CPacketUseEntity                        = new Packets("net/minecraft/network/play/client/CPacketUseEntity",                        "ir",   Context.SERVER);
+    public static Packets CPacketKeepAlive                        = new Packets("net/minecraft/network/play/client/CPacketKeepAlive",                        "is",   Context.SERVER);
+    public static Packets CPacketPlayer                           = new Packets("net/minecraft/network/play/client/CPacketPlayer",                           "it",   Context.SERVER);
+    public static Packets C04PacketPlayerPosition                 = new Packets("net/minecraft/network/play/client/CPacketPlayer$C04PacketPlayerPosition",   "it$a", Context.SERVER);
+    public static Packets C06PacketPlayerPosLook                  = new Packets("net/minecraft/network/play/client/CPacketPlayer$C06PacketPlayerPosLook",    "it$b", Context.SERVER);
+    public static Packets C05PacketPlayerLook                     = new Packets("net/minecraft/network/play/client/CPacketPlayer$C05PacketPlayerLook",       "it$c", Context.SERVER);
+    public static Packets CPacketVehicleMove                      = new Packets("net/minecraft/network/play/client/CPacketVehicleMove",                      "iu",   Context.SERVER);
+    public static Packets CPacketSteerBoat                        = new Packets("net/minecraft/network/play/client/CPacketSteerBoat",                        "iv",   Context.SERVER);
+    public static Packets CPacketPlayerAbilities                  = new Packets("net/minecraft/network/play/client/CPacketPlayerAbilities",                  "iw",   Context.SERVER);
+    public static Packets CPacketPlayerDigging                    = new Packets("net/minecraft/network/play/client/CPacketPlayerDigging",                    "ix",   Context.SERVER);
+    public static Packets CPacketEntityAction                     = new Packets("net/minecraft/network/play/client/CPacketEntityAction",                     "iy",   Context.SERVER);
+    public static Packets CPacketInput                            = new Packets("net/minecraft/network/play/client/CPacketInput",                            "iz",   Context.SERVER);
+    public static Packets CPacketResourcePackStatus               = new Packets("net/minecraft/network/play/client/CPacketResourcePackStatus",               "ja",   Context.SERVER);
+    public static Packets CPacketHeldItemChange                   = new Packets("net/minecraft/network/play/client/CPacketHeldItemChange",                   "jb",   Context.SERVER);
+    public static Packets CPacketCreativeInventoryAction          = new Packets("net/minecraft/network/play/client/CPacketCreativeInventoryAction",          "jc",   Context.SERVER);
+    public static Packets CPacketUpdateSign                       = new Packets("net/minecraft/network/play/client/CPacketUpdateSign",                       "jd",   Context.SERVER);
+    public static Packets CPacketAnimation                        = new Packets("net/minecraft/network/play/client/CPacketAnimation",                        "je",   Context.SERVER);
+    public static Packets CPacketSpectate                         = new Packets("net/minecraft/network/play/client/CPacketSpectate",                         "jf",   Context.SERVER);
+    public static Packets CPacketPlayerTryUseItem                 = new Packets("net/minecraft/network/play/client/CPacketPlayerTryUseItem",                 "jg",   Context.SERVER);
+    public static Packets CPacketPlayerBlockPlacement             = new Packets("net/minecraft/network/play/client/CPacketPlayerBlockPlacement",             "jh",   Context.SERVER);
+    public static Packets SPacketLoginSuccess                     = new Packets("net/minecraft/network/login/server/SPacketLoginSuccess",                    "jn",   Context.CLIENT);
+    public static Packets SPacketEncryptionRequest                = new Packets("net/minecraft/network/login/server/SPacketEncryptionRequest",               "jo",   Context.CLIENT);
+    public static Packets SPacketEnableCompression                = new Packets("net/minecraft/network/login/server/SPacketEnableCompression",               "jp",   Context.CLIENT);
+    public static Packets SPacketDisconnectLogin                  = new Packets("net/minecraft/network/login/server/SPacketDisconnect",                      "jq",   Context.CLIENT);
+    public static Packets CPacketLoginStart                       = new Packets("net/minecraft/network/login/client/CPacketLoginStart",                      "js",   Context.SERVER);
+    public static Packets CPacketEncryptionResponse               = new Packets("net/minecraft/network/login/client/CPacketEncryptionResponse",              "jt",   Context.SERVER);
+    public static Packets SPacketPong                             = new Packets("net/minecraft/network/status/server/SPacketPong",                           "jx",   Context.CLIENT);
+    public static Packets SPacketServerInfo                       = new Packets("net/minecraft/network/status/server/SPacketServerInfo",                     "jy",   Context.CLIENT);
+    public static Packets CPacketPing                             = new Packets("net/minecraft/network/status/client/CPacketPing",                           "kb",   Context.SERVER);
+    public static Packets CPacketServerQuery                      = new Packets("net/minecraft/network/status/client/CPacketServerQuery",                    "kc",   Context.SERVER);
  
     // CHECKSTYLE:ON
  
     public static final Packets[] packets = new Packets[] {
-            S08PacketPlayerPosLook,
-            S0EPacketSpawnObject,
-            S11PacketSpawnExperienceOrb,
-            S2CPacketSpawnGlobalEntity,
-            S0FPacketSpawnMob,
-            S10PacketSpawnPainting,
-            S0CPacketSpawnPlayer,
-            S0BPacketAnimation,
-            S37PacketStatistics,
-            S25PacketBlockBreakAnim,
-            S35PacketUpdateTileEntity,
-            S24PacketBlockAction,
-            S23PacketBlockChange,
-            S41PacketServerDifficulty,
-            S3APacketTabComplete,
-            S02PacketChat,
-            S22PacketMultiBlockChange,
-            S32PacketConfirmTransaction,
-            S2EPacketCloseWindow,
-            S2DPacketOpenWindow,
-            S30PacketWindowItems,
-            S31PacketWindowProperty,
-            S2FPacketSetSlot,
-            S3FPacketCustomPayload,
-            S40PacketDisconnect,
-            S19PacketEntityStatus,
-            S49PacketUpdateEntityNBT,
-            S27PacketExplosion,
-            S46PacketSetCompressionLevel,
-            S2BPacketChangeGameState,
-            S00PacketKeepAlive,
-            S21PacketChunkData,
-            S26PacketMapChunkBulk,
-            S28PacketEffect,
-            S2APacketParticles,
-            S29PacketSoundEffect,
-            S01PacketJoinGame,
-            S34PacketMaps,
-            S14PacketEntity,
+            SPacketSpawnObject,
+            SPacketSpawnExperienceOrb,
+            SPacketSpawnGlobalEntity,
+            SPacketSpawnMob,
+            SPacketSpawnPainting,
+            SPacketSpawnPlayer,
+            SPacketAnimation,
+            SPacketStatistics,
+            SPacketBlockBreakAnim,
+            SPacketUpdateTileEntity,
+            SPacketBlockAction,
+            SPacketBlockChange,
+            SPacketUpdateEntityNBT,
+            SPacketServerDifficulty,
+            SPacketTabComplete,
+            SPacketChat,
+            SPacketMultiBlockChange,
+            SPacketConfirmTransaction,
+            SPacketCloseWindow,
+            SPacketOpenWindow,
+            SPacketWindowItems,
+            SPacketWindowProperty,
+            SPacketSetSlot,
+            SPacketCooldown,
+            SPacketCustomPayload,
+            SPacketCustomSound,
+            SPacketDisconnectPlay,
+            SPacketEntityStatus,
+            SPacketExplosion,
+            SPacketUnloadChunk,
+            SPacketChangeGameState,
+            SPacketKeepAlive,
+            SPacketChunkData,
+            SPacketEffect,
+            SPacketParticles,
+            SPacketJoinGame,
+            SPacketMaps,
+            SPacketEntity,
             S15PacketEntityRelMove,
             S17PacketEntityLookMove,
             S16PacketEntityLook,
-            S36PacketSignEditorOpen,
-            S39PacketPlayerAbilities,
-            S42PacketCombatEvent,
-            S38PacketPlayerListItem,
-            S0APacketUseBed,
-            S13PacketDestroyEntities,
-            S1EPacketRemoveEntityEffect,
-            S48PacketResourcePackSend,
-            S07PacketRespawn,
-            S19PacketEntityHeadLook,
-            S44PacketWorldBorder,
-            S43PacketCamera,
-            S09PacketHeldItemChange,
-            S3DPacketDisplayScoreboard,
-            S1CPacketEntityMetadata,
-            S1BPacketEntityAttach,
-            S12PacketEntityVelocity,
-            S04PacketEntityEquipment,
-            S1FPacketSetExperience,
-            S06PacketUpdateHealth,
-            S3BPacketScoreboardObjective,
-            S3EPacketTeams,
-            S3CPacketUpdateScore,
-            S05PacketSpawnPosition,
-            S03PacketTimeUpdate,
-            S45PacketTitle,
-            S33PacketUpdateSign,
-            S47PacketPlayerListHeaderFooter,
-            S0DPacketCollectItem,
-            S18PacketEntityTeleport,
-            S20PacketEntityProperties,
-            S1DPacketEntityEffect,
-            C14PacketTabComplete,
-            C01PacketChatMessage,
-            C16PacketClientStatus,
-            C15PacketClientSettings,
-            C0FPacketConfirmTransaction,
-            C11PacketEnchantItem,
-            C0EPacketClickWindow,
-            C0DPacketCloseWindow,
-            C17PacketCustomPayload,
-            C02PacketUseEntity,
-            C00PacketKeepAlive,
-            C03PacketPlayer,
+            SPacketMoveVehicle,
+            SPacketSignEditorOpen,
+            SPacketPlayerAbilities,
+            SPacketCombatEvent,
+            SPacketPlayerListItem,
+            SPacketPlayerPosLook,
+            SPacketUseBed,
+            SPacketDestroyEntities,
+            SPacketRemoveEntityEffect,
+            SPacketResourcePackSend,
+            SPacketRespawn,
+            SPacketEntityHeadLook,
+            SPacketWorldBorder,
+            SPacketCamera,
+            SPacketHeldItemChange,
+            SPacketDisplayObjective,
+            SPacketEntityMetadata,
+            SPacketEntityAttach,
+            SPacketEntityVelocity,
+            C00Handshake,
+            SPacketEntityEquipment,
+            SPacketSetExperience,
+            SPacketUpdateHealth,
+            SPacketScoreboardObjective,
+            SPacketSetPassengers,
+            SPacketTeams,
+            SPacketUpdateScore,
+            SPacketSpawnPosition,
+            SPacketTimeUpdate,
+            SPacketTitle,
+            SPacketUpdateSign,
+            SPacketSoundEffect,
+            SPacketPlayerListHeaderFooter,
+            SPacketCollectItem,
+            SPacketEntityTeleport,
+            SPacketEntityProperties,
+            SPacketEntityEffect,
+            CPacketConfirmTeleport,
+            CPacketTabComplete,
+            CPacketChatMessage,
+            CPacketClientStatus,
+            CPacketClientSettings,
+            CPacketConfirmTransaction,
+            CPacketEnchantItem,
+            CPacketClickWindow,
+            CPacketCloseWindow,
+            CPacketCustomPayload,
+            CPacketUseEntity,
+            CPacketKeepAlive,
+            CPacketPlayer,
             C04PacketPlayerPosition,
             C06PacketPlayerPosLook,
             C05PacketPlayerLook,
-            C13PacketPlayerAbilities,
-            C07PacketPlayerDigging,
-            C0BPacketEntityAction,
-            C0CPacketInput,
-            C19PacketResourcePackStatus,
-            C09PacketHeldItemChange,
-            C10PacketCreativeInventoryAction,
-            C12PacketUpdateSign,
-            C0APacketAnimation,
-            C18PacketSpectate,
-            C08PacketPlayerBlockPlacement,
-            C00Handshake,
-            S02PacketLoginSuccess,
-            S01PacketEncryptionRequest,
-            S03PacketEnableCompression,
-            S00PacketDisconnect,
-            C00PacketLoginStart,
-            C01PacketEncryptionResponse,
-            S01PacketPong,
-            S00PacketServerInfo,
-            C01PacketPing,
-            C00PacketServerQuery,
+            CPacketVehicleMove,
+            CPacketSteerBoat,
+            CPacketPlayerAbilities,
+            CPacketPlayerDigging,
+            CPacketEntityAction,
+            CPacketInput,
+            CPacketResourcePackStatus,
+            CPacketHeldItemChange,
+            CPacketCreativeInventoryAction,
+            CPacketUpdateSign,
+            CPacketAnimation,
+            CPacketSpectate,
+            CPacketPlayerTryUseItem,
+            CPacketPlayerBlockPlacement,
+            SPacketLoginSuccess,
+            SPacketEncryptionRequest,
+            SPacketEnableCompression,
+            SPacketDisconnectLogin,
+            CPacketLoginStart,
+            CPacketEncryptionResponse,
+            SPacketPong,
+            SPacketServerInfo,
+            CPacketPing,
+            CPacketServerQuery,
     };
  
     private static int nextPacketIndex;
@@ -270,9 +284,9 @@ public final class Packets extends Obf
  
     private Packets(String seargeName, String obfName, Context context)
     {
-        super(seargeName, obfName);
-
-        this.shortName = seargeName.substring(Math.max(seargeName.lastIndexOf('.'), seargeName.lastIndexOf('$')) + 1);
+        super(seargeName.replace('/', '.'), obfName);
+        
+        this.shortName = Packets.getShortName(seargeName);
         this.index = Packets.nextPacketIndex++;
         Packets.packetMap.put(this.shortName, this);
         this.context = context;
@@ -318,4 +332,11 @@ public final class Packets extends Obf
     {
         return Packets.packetMap.get(name);
     }
+
+    private static String getShortName(String className)
+    {
+        String simpleName = className.substring(Math.max(className.lastIndexOf('/'), className.lastIndexOf('$')) + 1);
+        String baseName = simpleName.replaceAll("^[CS]([0-9A-F]{2})?Packet", "");
+        return baseName + "Packet";
+    }
 }
@@ -33,8 +33,8 @@ public class LiteLoaderTweaker implements ITweaker
     public static final int ENV_TYPE_CLIENT = 0;
     public static final int ENV_TYPE_DEDICATEDSERVER = 1;
  
-    // TODO Version - 1.8.9
-    public static final String VERSION = "1.8.9";
+    // TODO Version - 1.9
+    public static final String VERSION = "1.9";
  
     protected static final String bootstrapClassName = "com.mumfrey.liteloader.core.LiteLoaderBootstrap";
  
@@ -14,7 +14,7 @@ import java.util.TreeSet;
 import net.eq2online.permissions.ReplicatedPermissionsContainer;
 import net.minecraft.network.INetHandler;
 import net.minecraft.network.PacketBuffer;
-import net.minecraft.network.play.server.S01PacketJoinGame;
+import net.minecraft.network.play.server.SPacketJoinGame;
  
 import com.mumfrey.liteloader.LiteMod;
 import com.mumfrey.liteloader.Permissible;
@@ -185,7 +185,7 @@ public final class PermissionsManagerClient implements PermissionsManager, Plugi
         this.registeredClientPermissions.put(mod, new TreeSet<String>());
     }
  
-    public void onJoinGame(INetHandler netHandler, S01PacketJoinGame joinGamePacket)
+    public void onJoinGame(INetHandler netHandler, SPacketJoinGame joinGamePacket)
     {
         this.clearServerPermissions();
         this.scheduleRefresh();
@@ -207,7 +207,9 @@ public final class PermissionsManagerClient implements PermissionsManager, Plugi
         this.serverPermissions.clear();
  
         for (Permissible permissible : this.permissibles)
+        {
             permissible.onPermissionsCleared(this);
+        }
     }
  
     /**
@@ -216,7 +218,9 @@ public final class PermissionsManagerClient implements PermissionsManager, Plugi
     protected void sendPermissionQueries()
     {
         for (Permissible mod : this.registeredClientMods.values())
+        {
             this.sendPermissionQuery(mod);
+        }
     }
  
     /**
@@ -27,7 +27,6 @@ import com.mumfrey.liteloader.transformers.ClassTransformer;
 import com.mumfrey.liteloader.transformers.ObfProvider;
 import com.mumfrey.liteloader.transformers.access.AccessorTransformer;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
-import com.mumfrey.liteloader.util.log.LiteLoaderLogger.Verbosity;
  
 /**
  * EventTransformer is the spiritual successor to the
@@ -379,8 +378,7 @@ public final class EventTransformer extends ClassTransformer
     {
         Event head = injection.getHead();
  
-        Verbosity verbosity = head.isVerbose() ? Verbosity.NORMAL : Verbosity.VERBOSE;
-        LiteLoaderLogger.info(verbosity, "Injecting %s[x%d] in %s in %s", head.getName(), injection.size(), method.name,
+        LiteLoaderLogger.debug("Injecting %s[x%d] in %s in %s", head.getName(), injection.size(), method.name,
                 ClassTransformer.getSimpleClassName(classNode));
  
         MethodNode handler = head.inject(injectionPoint, injection.isCancellable(), this.globalEventID, injection.captureLocals(),
@@ -2,10 +2,10 @@ package com.mumfrey.liteloader.util;
  
 import java.util.List;
  
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.ChatStyle;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.Style;
+import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.TextFormatting;
  
 /**
  * Utility functions for chat
@@ -20,7 +20,7 @@ public abstract class ChatUtilities
     {
         StringBuilder formattingCodes = new StringBuilder();
  
-        for (EnumChatFormatting chatFormat : EnumChatFormatting.values())
+        for (TextFormatting chatFormat : TextFormatting.values())
         {
             formattingCodes.append(chatFormat.toString().charAt(1));
         }
@@ -36,13 +36,13 @@ public abstract class ChatUtilities
      * @param code Code
      * @return chat style
      */
-    public static ChatStyle getChatStyleFromCode(char code)
+    public static Style getChatStyleFromCode(char code)
     {
         int pos = ChatUtilities.formattingCodeLookup.indexOf(code);
         if (pos < 0) return null;
-        EnumChatFormatting format = EnumChatFormatting.values()[pos];
+        TextFormatting format = TextFormatting.values()[pos];
  
-        ChatStyle style = new ChatStyle();
+        Style style = new Style();
         if (format.isColor())
         {
             style.setColor(format);
@@ -67,12 +67,12 @@ public abstract class ChatUtilities
      * Convert a component containing text formatted with legacy codes to a
      * native ChatComponent structure.
      */
-    public static IChatComponent convertLegacyCodes(IChatComponent chat)
+    public static ITextComponent convertLegacyCodes(ITextComponent chat)
     {
         return ChatUtilities.covertCodesInPlace(chat);
     }
  
-    private static List<IChatComponent> covertCodesInPlace(List<IChatComponent> siblings)
+    private static List<ITextComponent> covertCodesInPlace(List<ITextComponent> siblings)
     {
         for (int index = 0; index < siblings.size(); index++)
         {
@@ -82,21 +82,21 @@ public abstract class ChatUtilities
         return siblings;
     }
  
-    private static IChatComponent covertCodesInPlace(IChatComponent component)
+    private static ITextComponent covertCodesInPlace(ITextComponent component)
     {
-        IChatComponent newComponent = null;
-        if (component instanceof ChatComponentText)
+        ITextComponent newComponent = null;
+        if (component instanceof TextComponentString)
         {
-            ChatComponentText textComponent = (ChatComponentText)component;
-            ChatStyle style = textComponent.getChatStyle();
-            String text = textComponent.getChatComponentText_TextValue();
+            TextComponentString textComponent = (TextComponentString)component;
+            Style style = textComponent.getStyle();
+            String text = textComponent.getFormattedText();
  
             int pos = text.indexOf('\247');
             while (pos > -1 && text != null)
             {
                 if (pos < text.length() - 1)
                 {
-                    IChatComponent head = new ChatComponentText(pos > 0 ? text.substring(0, pos) : "").setChatStyle(style);
+                    ITextComponent head = new TextComponentString(pos > 0 ? text.substring(0, pos) : "").setStyle(style);
                     style = ChatUtilities.getChatStyleFromCode(text.charAt(pos + 1));
                     text = text.substring(pos + 2);
                     newComponent = (newComponent == null) ? head : newComponent.appendSibling(head);
@@ -110,7 +110,7 @@ public abstract class ChatUtilities
  
             if (text != null)
             {
-                IChatComponent tail = new ChatComponentText(text).setChatStyle(style);
+                ITextComponent tail = new TextComponentString(text).setStyle(style);
                 newComponent = (newComponent == null) ? tail : newComponent.appendSibling(tail);
             }
         }
@@ -121,7 +121,7 @@ public abstract class ChatUtilities
             return component;
         }
  
-        for (IChatComponent oldSibling : ChatUtilities.covertCodesInPlace((List<IChatComponent>)component.getSiblings()))
+        for (ITextComponent oldSibling : ChatUtilities.covertCodesInPlace((List<ITextComponent>)component.getSiblings()))
         {
             newComponent.appendSibling(oldSibling);
         }
 package com.mumfrey.liteloader.util;
  
 import net.minecraft.entity.Entity;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.util.Vec3;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Vec3d;
  
 public abstract class EntityUtilities
 {
-    public static MovingObjectPosition rayTraceFromEntity(Entity entity, double traceDistance, float partialTicks)
+    public static RayTraceResult rayTraceFromEntity(Entity entity, double traceDistance, float partialTicks)
     {
-        Vec3 var4 = EntityUtilities.getPositionEyes(entity, partialTicks);
-        Vec3 var5 = entity.getLook(partialTicks);
-        Vec3 var6 = var4.addVector(var5.xCoord * traceDistance, var5.yCoord * traceDistance, var5.zCoord * traceDistance);
+        Vec3d var4 = EntityUtilities.getPositionEyes(entity, partialTicks);
+        Vec3d var5 = entity.getLook(partialTicks);
+        Vec3d var6 = var4.addVector(var5.xCoord * traceDistance, var5.yCoord * traceDistance, var5.zCoord * traceDistance);
         return entity.worldObj.rayTraceBlocks(var4, var6, false, false, true);
     }
  
-    public static Vec3 getPositionEyes(Entity entity, float partialTicks)
+    public static Vec3d getPositionEyes(Entity entity, float partialTicks)
     {
         if (partialTicks == 1.0F)
         {
-            return new Vec3(entity.posX, entity.posY + entity.getEyeHeight(), entity.posZ);
+            return new Vec3d(entity.posX, entity.posY + entity.getEyeHeight(), entity.posZ);
         }
  
         double interpX = entity.prevPosX + (entity.posX - entity.prevPosX) * partialTicks;
         double interpY = entity.prevPosY + (entity.posY - entity.prevPosY) * partialTicks + entity.getEyeHeight();
         double interpZ = entity.prevPosZ + (entity.posZ - entity.prevPosZ) * partialTicks;
-        return new Vec3(interpX, interpY, interpZ);
+        return new Vec3d(interpX, interpY, interpZ);
     }
 }
@@ -2,7 +2,7 @@ package com.mumfrey.liteloader.util;
  
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.network.INetHandler;
-import net.minecraft.network.play.server.S01PacketJoinGame;
+import net.minecraft.network.play.server.SPacketJoinGame;
 import net.minecraft.world.World;
  
 import com.mumfrey.liteloader.api.CoreProvider;
@@ -77,7 +77,7 @@ public abstract class Input implements CoreProvider
     }
  
     @Override
-    public void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
+    public void onJoinGame(INetHandler netHandler, SPacketJoinGame loginPacket)
     {
     }
  
@@ -3,7 +3,7 @@ package com.mumfrey.liteloader.util;
 import net.minecraft.launchwrapper.IClassTransformer;
 import net.minecraft.launchwrapper.Launch;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
  
 import com.mumfrey.liteloader.core.runtime.Obf;
  
 package com.mumfrey.liteloader.util;
  
 import net.minecraft.entity.Entity;
-import net.minecraft.util.Vec3;
+import net.minecraft.util.math.Vec3d;
  
 /**
  * A 3D vector position with rotation as well
  * 
  * @author Adam Mummery-Smith
  */
-public class Position extends Vec3
+public class Position extends Vec3d
 {
     public final float yaw;
  
@@ -5,9 +5,9 @@
     "refmap": "mixins.liteloader.core.refmap.json",
     "mixins": [
         "MixinMinecraftServer",
-        "MixinServerConfigurationManager",
+        "MixinPlayerList",
         "MixinNetHandlerPlayServer",
-        "MixinItemInWorldManager",
+        "MixinPlayerInteractionManager",
         "MixinC15PacketClientSettings",
         "MixinS02PacketChat"
     ],