remove interfaces

proxy/src/main/java/net/minecraft/network/play/client/C00PacketKeepAlive.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class C00PacketKeepAlive implements Packet<INetHandlerPlayServer>
+public class C00PacketKeepAlive implements Packet<NetHandlerPlayServer>
 {
     private int key;
 
@@ -22,7 +22,7 @@ public class C00PacketKeepAlive implements Packet<INetHandlerPlayServer>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processKeepAlive(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C01PacketChatMessage.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class C01PacketChatMessage implements Packet<INetHandlerPlayServer>
+public class C01PacketChatMessage implements Packet<NetHandlerPlayServer>
 {
     private String message;
 
@@ -43,7 +43,7 @@ public class C01PacketChatMessage implements Packet<INetHandlerPlayServer>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processChatMessage(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C02PacketUseEntity.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class C02PacketUseEntity implements Packet<INetHandlerPlayServer>
+public class C02PacketUseEntity implements Packet<NetHandlerPlayServer>
 {
     private int entityId;
     private C02PacketUseEntity.Action action;
@@ -49,7 +49,7 @@ public class C02PacketUseEntity implements Packet<INetHandlerPlayServer>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processUseEntity(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C03PacketPlayer.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class C03PacketPlayer implements Packet<INetHandlerPlayServer>
+public class C03PacketPlayer implements Packet<NetHandlerPlayServer>
 {
     protected double x;
     protected double y;
@@ -20,7 +20,7 @@ public class C03PacketPlayer implements Packet<INetHandlerPlayServer>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processPlayer(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C07PacketPlayerDigging.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.BlockPos;
 
-public class C07PacketPlayerDigging implements Packet<INetHandlerPlayServer>
+public class C07PacketPlayerDigging implements Packet<NetHandlerPlayServer>
 {
     private BlockPos position;
     private byte facing;
@@ -36,7 +36,7 @@ public class C07PacketPlayerDigging implements Packet<INetHandlerPlayServer>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processPlayerDigging(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.java

@@ -2,13 +2,13 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.BlockPos;
 import proxy.util.ItemStack;
 
-public class C08PacketPlayerBlockPlacement implements Packet<INetHandlerPlayServer>
+public class C08PacketPlayerBlockPlacement implements Packet<NetHandlerPlayServer>
 {
     private BlockPos position;
     private int placedBlockDirection;
@@ -46,7 +46,7 @@ public class C08PacketPlayerBlockPlacement implements Packet<INetHandlerPlayServ
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processPlayerBlockPlacement(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C09PacketHeldItemChange.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class C09PacketHeldItemChange implements Packet<INetHandlerPlayServer>
+public class C09PacketHeldItemChange implements Packet<NetHandlerPlayServer>
 {
     private int slotId;
 
@@ -29,7 +29,7 @@ public class C09PacketHeldItemChange implements Packet<INetHandlerPlayServer>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processHeldItemChange(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C0APacketAnimation.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class C0APacketAnimation implements Packet<INetHandlerPlayServer>
+public class C0APacketAnimation implements Packet<NetHandlerPlayServer>
 {
     /**
      * Reads the raw packet data from the data stream.
@@ -25,7 +25,7 @@ public class C0APacketAnimation implements Packet<INetHandlerPlayServer>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleAnimation(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C0BPacketEntityAction.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class C0BPacketEntityAction implements Packet<INetHandlerPlayServer>
+public class C0BPacketEntityAction implements Packet<NetHandlerPlayServer>
 {
     private int entityID;
     private C0BPacketEntityAction.Action action;
@@ -35,7 +35,7 @@ public class C0BPacketEntityAction implements Packet<INetHandlerPlayServer>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processEntityAction(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C0CPacketInput.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class C0CPacketInput implements Packet<INetHandlerPlayServer>
+public class C0CPacketInput implements Packet<NetHandlerPlayServer>
 {
     private float strafeSpeed;
     private float forwardSpeed;
@@ -50,7 +50,7 @@ public class C0CPacketInput implements Packet<INetHandlerPlayServer>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processInput(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C0DPacketCloseWindow.java

@@ -2,18 +2,18 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class C0DPacketCloseWindow implements Packet<INetHandlerPlayServer>
+public class C0DPacketCloseWindow implements Packet<NetHandlerPlayServer>
 {
     private int windowId;
 
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processCloseWindow(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C0EPacketClickWindow.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.ItemStack;
 
-public class C0EPacketClickWindow implements Packet<INetHandlerPlayServer>
+public class C0EPacketClickWindow implements Packet<NetHandlerPlayServer>
 {
     private int windowId;
     private int slotId;
@@ -19,7 +19,7 @@ public class C0EPacketClickWindow implements Packet<INetHandlerPlayServer>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processClickWindow(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C0FPacketConfirmTransaction.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class C0FPacketConfirmTransaction implements Packet<INetHandlerPlayServer>
+public class C0FPacketConfirmTransaction implements Packet<NetHandlerPlayServer>
 {
     private int windowId;
     private short uid;
@@ -15,7 +15,7 @@ public class C0FPacketConfirmTransaction implements Packet<INetHandlerPlayServer
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processConfirmTransaction(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C10PacketCreativeInventoryAction.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.ItemStack;
 
-public class C10PacketCreativeInventoryAction implements Packet<INetHandlerPlayServer>
+public class C10PacketCreativeInventoryAction implements Packet<NetHandlerPlayServer>
 {
     private int slotId;
     private ItemStack stack;
@@ -15,7 +15,7 @@ public class C10PacketCreativeInventoryAction implements Packet<INetHandlerPlayS
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processCreativeInventoryAction(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C11PacketEnchantItem.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class C11PacketEnchantItem implements Packet<INetHandlerPlayServer>
+public class C11PacketEnchantItem implements Packet<NetHandlerPlayServer>
 {
     private int windowId;
     private int button;
@@ -14,7 +14,7 @@ public class C11PacketEnchantItem implements Packet<INetHandlerPlayServer>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processEnchantItem(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C12PacketUpdateSign.java

@@ -2,13 +2,13 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.BlockPos;
 import proxy.util.ChatComponent;
 
-public class C12PacketUpdateSign implements Packet<INetHandlerPlayServer>
+public class C12PacketUpdateSign implements Packet<NetHandlerPlayServer>
 {
     private BlockPos pos;
     private ChatComponent[] lines;
@@ -47,7 +47,7 @@ public class C12PacketUpdateSign implements Packet<INetHandlerPlayServer>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processUpdateSign(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C13PacketPlayerAbilities.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class C13PacketPlayerAbilities implements Packet<INetHandlerPlayServer>
+public class C13PacketPlayerAbilities implements Packet<NetHandlerPlayServer>
 {
     private boolean invulnerable;
     private boolean flying;
@@ -64,7 +64,7 @@ public class C13PacketPlayerAbilities implements Packet<INetHandlerPlayServer>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processPlayerAbilities(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C14PacketTabComplete.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.BlockPos;
 
-public class C14PacketTabComplete implements Packet<INetHandlerPlayServer>
+public class C14PacketTabComplete implements Packet<NetHandlerPlayServer>
 {
     private String message;
     private BlockPos targetBlock;
@@ -59,7 +59,7 @@ public class C14PacketTabComplete implements Packet<INetHandlerPlayServer>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processTabComplete(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C15PacketClientSettings.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class C15PacketClientSettings implements Packet<INetHandlerPlayServer>
+public class C15PacketClientSettings implements Packet<NetHandlerPlayServer>
 {
     private String lang;
     private int view;
@@ -41,7 +41,7 @@ public class C15PacketClientSettings implements Packet<INetHandlerPlayServer>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processClientSettings(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C16PacketClientStatus.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class C16PacketClientStatus implements Packet<INetHandlerPlayServer>
+public class C16PacketClientStatus implements Packet<NetHandlerPlayServer>
 {
     private C16PacketClientStatus.EnumState status;
 
@@ -29,7 +29,7 @@ public class C16PacketClientStatus implements Packet<INetHandlerPlayServer>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processClientStatus(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C17PacketCustomPayload.java

@@ -5,11 +5,11 @@ import io.netty.buffer.Unpooled;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class C17PacketCustomPayload implements Packet<INetHandlerPlayServer>
+public class C17PacketCustomPayload implements Packet<NetHandlerPlayServer>
 {
     private String channel;
     private PacketBuffer data;
@@ -44,7 +44,7 @@ public class C17PacketCustomPayload implements Packet<INetHandlerPlayServer>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.processVanilla250Packet(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C18PacketSpectate.java

@@ -3,11 +3,11 @@ package net.minecraft.network.play.client;
 import java.io.IOException;
 import java.util.UUID;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class C18PacketSpectate implements Packet<INetHandlerPlayServer>
+public class C18PacketSpectate implements Packet<NetHandlerPlayServer>
 {
     private UUID id;
 
@@ -30,7 +30,7 @@ public class C18PacketSpectate implements Packet<INetHandlerPlayServer>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleSpectate(this);
     }

proxy/src/main/java/net/minecraft/network/play/client/C19PacketResourcePackStatus.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.client;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayServer;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class C19PacketResourcePackStatus implements Packet<INetHandlerPlayServer>
+public class C19PacketResourcePackStatus implements Packet<NetHandlerPlayServer>
 {
     private String hash;
     private C19PacketResourcePackStatus.Action status;
@@ -32,7 +32,7 @@ public class C19PacketResourcePackStatus implements Packet<INetHandlerPlayServer
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayServer handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleResourcePackStatus(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S00PacketKeepAlive.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S00PacketKeepAlive implements Packet<INetHandlerPlayClient>
+public class S00PacketKeepAlive implements Packet<NetHandlerPlayServer>
 {
     private int id;
 
@@ -22,7 +22,7 @@ public class S00PacketKeepAlive implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleKeepAlive(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S01PacketJoinGame.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S01PacketJoinGame implements Packet<INetHandlerPlayClient>
+public class S01PacketJoinGame implements Packet<NetHandlerPlayServer>
 {
     private int entityId;
     private boolean hardcoreMode;
@@ -74,7 +74,7 @@ public class S01PacketJoinGame implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleJoinGame(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S02PacketChat.java

@@ -2,13 +2,13 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.ChatComponent;
 import proxy.util.ChatComponentText;
 
-public class S02PacketChat implements Packet<INetHandlerPlayClient>
+public class S02PacketChat implements Packet<NetHandlerPlayServer>
 {
     private ChatComponent chatComponent;
     private byte type;
@@ -44,7 +44,7 @@ public class S02PacketChat implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleChat(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S03PacketTimeUpdate.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S03PacketTimeUpdate implements Packet<INetHandlerPlayClient>
+public class S03PacketTimeUpdate implements Packet<NetHandlerPlayServer>
 {
     private long totalWorldTime;
     private long worldTime;
@@ -52,7 +52,7 @@ public class S03PacketTimeUpdate implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleTimeUpdate(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S04PacketEntityEquipment.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.ItemStack;
 
-public class S04PacketEntityEquipment implements Packet<INetHandlerPlayClient>
+public class S04PacketEntityEquipment implements Packet<NetHandlerPlayServer>
 {
     private int entityID;
     private int equipmentSlot;
@@ -36,7 +36,7 @@ public class S04PacketEntityEquipment implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleEntityEquipment(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S05PacketSpawnPosition.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.BlockPos;
 
-public class S05PacketSpawnPosition implements Packet<INetHandlerPlayClient>
+public class S05PacketSpawnPosition implements Packet<NetHandlerPlayServer>
 {
     private BlockPos spawnBlockPos;
 
@@ -30,7 +30,7 @@ public class S05PacketSpawnPosition implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleSpawnPosition(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S06PacketUpdateHealth.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S06PacketUpdateHealth implements Packet<INetHandlerPlayClient>
+public class S06PacketUpdateHealth implements Packet<NetHandlerPlayServer>
 {
     private float health;
     private int foodLevel;
@@ -35,7 +35,7 @@ public class S06PacketUpdateHealth implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleUpdateHealth(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S07PacketRespawn.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S07PacketRespawn implements Packet<INetHandlerPlayClient>
+public class S07PacketRespawn implements Packet<NetHandlerPlayServer>
 {
     private int dimensionID;
     private byte difficulty;
@@ -28,7 +28,7 @@ public class S07PacketRespawn implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleRespawn(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S08PacketPlayerPosLook.java

@@ -5,11 +5,11 @@ import java.util.Collections;
 import java.util.EnumSet;
 import java.util.Set;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S08PacketPlayerPosLook implements Packet<INetHandlerPlayClient>
+public class S08PacketPlayerPosLook implements Packet<NetHandlerPlayServer>
 {
     private double x;
     private double y;
@@ -61,7 +61,7 @@ public class S08PacketPlayerPosLook implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handlePlayerPosLook(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S09PacketHeldItemChange.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S09PacketHeldItemChange implements Packet<INetHandlerPlayClient>
+public class S09PacketHeldItemChange implements Packet<NetHandlerPlayServer>
 {
     private int heldItemHotbarIndex;
 
@@ -29,7 +29,7 @@ public class S09PacketHeldItemChange implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleHeldItemChange(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S0APacketUseBed.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.BlockPos;
 
-public class S0APacketUseBed implements Packet<INetHandlerPlayClient>
+public class S0APacketUseBed implements Packet<NetHandlerPlayServer>
 {
     private int playerID;
     private BlockPos bedPos;
@@ -33,7 +33,7 @@ public class S0APacketUseBed implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleUseBed(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S0BPacketAnimation.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S0BPacketAnimation implements Packet<INetHandlerPlayClient>
+public class S0BPacketAnimation implements Packet<NetHandlerPlayServer>
 {
     private int entityId;
     private int type;
@@ -32,7 +32,7 @@ public class S0BPacketAnimation implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleAnimation(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S0CPacketSpawnPlayer.java

@@ -4,13 +4,13 @@ import java.io.IOException;
 import java.util.List;
 import java.util.UUID;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.DataWatcher;
 import proxy.util.MathHelper;
 
-public class S0CPacketSpawnPlayer implements Packet<INetHandlerPlayClient>
+public class S0CPacketSpawnPlayer implements Packet<NetHandlerPlayServer>
 {
     private int entityId;
     private UUID playerId;
@@ -73,7 +73,7 @@ public class S0CPacketSpawnPlayer implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleSpawnPlayer(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S0DPacketCollectItem.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S0DPacketCollectItem implements Packet<INetHandlerPlayClient>
+public class S0DPacketCollectItem implements Packet<NetHandlerPlayServer>
 {
     private int collectedItemEntityId;
     private int entityId;
@@ -32,7 +32,7 @@ public class S0DPacketCollectItem implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleCollectItem(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S0EPacketSpawnObject.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S0EPacketSpawnObject implements Packet<INetHandlerPlayClient>
+public class S0EPacketSpawnObject implements Packet<NetHandlerPlayServer>
 {
     private int entityId;
     private int x;
@@ -67,7 +67,7 @@ public class S0EPacketSpawnObject implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleSpawnObject(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S0FPacketSpawnMob.java

@@ -3,12 +3,12 @@ package net.minecraft.network.play.server;
 import java.io.IOException;
 import java.util.List;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.DataWatcher;
 
-public class S0FPacketSpawnMob implements Packet<INetHandlerPlayClient>
+public class S0FPacketSpawnMob implements Packet<NetHandlerPlayServer>
 {
     private int entityId;
     private int type;
@@ -64,7 +64,7 @@ public class S0FPacketSpawnMob implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleSpawnMob(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S10PacketSpawnPainting.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.BlockPos;
 
-public class S10PacketSpawnPainting implements Packet<INetHandlerPlayClient>
+public class S10PacketSpawnPainting implements Packet<NetHandlerPlayServer>
 {
     private int entityID;
     private BlockPos position;
@@ -39,7 +39,7 @@ public class S10PacketSpawnPainting implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleSpawnPainting(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S11PacketSpawnExperienceOrb.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S11PacketSpawnExperienceOrb implements Packet<INetHandlerPlayClient>
+public class S11PacketSpawnExperienceOrb implements Packet<NetHandlerPlayServer>
 {
     private int entityID;
     private int posX;
@@ -41,7 +41,7 @@ public class S11PacketSpawnExperienceOrb implements Packet<INetHandlerPlayClient
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleSpawnExperienceOrb(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S12PacketEntityVelocity.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S12PacketEntityVelocity implements Packet<INetHandlerPlayClient>
+public class S12PacketEntityVelocity implements Packet<NetHandlerPlayServer>
 {
     private int entityID;
     private int motionX;
@@ -38,7 +38,7 @@ public class S12PacketEntityVelocity implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleEntityVelocity(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S13PacketDestroyEntities.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S13PacketDestroyEntities implements Packet<INetHandlerPlayClient>
+public class S13PacketDestroyEntities implements Packet<NetHandlerPlayServer>
 {
     private int[] entityIDs;
 
@@ -39,7 +39,7 @@ public class S13PacketDestroyEntities implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleDestroyEntities(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S14PacketEntity.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S14PacketEntity implements Packet<INetHandlerPlayClient>
+public class S14PacketEntity implements Packet<NetHandlerPlayServer>
 {
     protected int entityId;
     protected byte posX;
@@ -36,7 +36,7 @@ public class S14PacketEntity implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleEntityMovement(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S18PacketEntityTeleport.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S18PacketEntityTeleport implements Packet<INetHandlerPlayClient>
+public class S18PacketEntityTeleport implements Packet<NetHandlerPlayServer>
 {
     private int entityId;
     private int posX;
@@ -47,7 +47,7 @@ public class S18PacketEntityTeleport implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleEntityTeleport(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S19PacketEntityHeadLook.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S19PacketEntityHeadLook implements Packet<INetHandlerPlayClient>
+public class S19PacketEntityHeadLook implements Packet<NetHandlerPlayServer>
 {
     private int entityId;
     private byte yaw;
@@ -32,7 +32,7 @@ public class S19PacketEntityHeadLook implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleEntityHeadLook(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S19PacketEntityStatus.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S19PacketEntityStatus implements Packet<INetHandlerPlayClient>
+public class S19PacketEntityStatus implements Packet<NetHandlerPlayServer>
 {
     private int entityId;
     private byte logicOpcode;
@@ -32,7 +32,7 @@ public class S19PacketEntityStatus implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleEntityStatus(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S1BPacketEntityAttach.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S1BPacketEntityAttach implements Packet<INetHandlerPlayClient>
+public class S1BPacketEntityAttach implements Packet<NetHandlerPlayServer>
 {
     private int leash;
     private int entityId;
@@ -35,7 +35,7 @@ public class S1BPacketEntityAttach implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleEntityAttach(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S1CPacketEntityMetadata.java

@@ -3,12 +3,12 @@ package net.minecraft.network.play.server;
 import java.io.IOException;
 import java.util.List;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.DataWatcher;
 
-public class S1CPacketEntityMetadata implements Packet<INetHandlerPlayClient>
+public class S1CPacketEntityMetadata implements Packet<NetHandlerPlayServer>
 {
     private int entityId;
     private List<DataWatcher.WatchableObject> field_149378_b;
@@ -34,7 +34,7 @@ public class S1CPacketEntityMetadata implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleEntityMetadata(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S1DPacketEntityEffect.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S1DPacketEntityEffect implements Packet<INetHandlerPlayClient>
+public class S1DPacketEntityEffect implements Packet<NetHandlerPlayServer>
 {
     private int entityId;
     private byte effectId;
@@ -41,7 +41,7 @@ public class S1DPacketEntityEffect implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleEntityEffect(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S1EPacketRemoveEntityEffect.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S1EPacketRemoveEntityEffect implements Packet<INetHandlerPlayClient>
+public class S1EPacketRemoveEntityEffect implements Packet<NetHandlerPlayServer>
 {
     private int entityId;
     private int effectId;
@@ -32,7 +32,7 @@ public class S1EPacketRemoveEntityEffect implements Packet<INetHandlerPlayClient
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleRemoveEntityEffect(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S1FPacketSetExperience.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S1FPacketSetExperience implements Packet<INetHandlerPlayClient>
+public class S1FPacketSetExperience implements Packet<NetHandlerPlayServer>
 {
     private float field_149401_a;
     private int totalExperience;
@@ -35,7 +35,7 @@ public class S1FPacketSetExperience implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleSetExperience(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S20PacketEntityProperties.java

@@ -7,11 +7,11 @@ import java.util.UUID;
 
 import com.google.common.collect.Lists;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S20PacketEntityProperties implements Packet<INetHandlerPlayClient>
+public class S20PacketEntityProperties implements Packet<NetHandlerPlayServer>
 {
     private int entityId;
     private final List<S20PacketEntityProperties.Snapshot> field_149444_b = Lists.<S20PacketEntityProperties.Snapshot>newArrayList();
@@ -67,7 +67,7 @@ public class S20PacketEntityProperties implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleEntityProperties(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S21PacketChunkData.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S21PacketChunkData implements Packet<INetHandlerPlayClient>
+public class S21PacketChunkData implements Packet<NetHandlerPlayServer>
 {
     private int chunkX;
     private int chunkZ;
@@ -41,7 +41,7 @@ public class S21PacketChunkData implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleChunkData(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S22PacketMultiBlockChange.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S22PacketMultiBlockChange implements Packet<INetHandlerPlayClient>
+public class S22PacketMultiBlockChange implements Packet<NetHandlerPlayServer>
 {
     private int chunkPosCoordX;
     private int chunkPosCoordZ;
@@ -46,7 +46,7 @@ public class S22PacketMultiBlockChange implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleMultiBlockChange(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S23PacketBlockChange.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.BlockPos;
 
-public class S23PacketBlockChange implements Packet<INetHandlerPlayClient>
+public class S23PacketBlockChange implements Packet<NetHandlerPlayServer>
 {
     private BlockPos blockPosition;
     private int blockState;
@@ -33,7 +33,7 @@ public class S23PacketBlockChange implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleBlockChange(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S24PacketBlockAction.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.BlockPos;
 
-public class S24PacketBlockAction implements Packet<INetHandlerPlayClient>
+public class S24PacketBlockAction implements Packet<NetHandlerPlayServer>
 {
     private BlockPos blockPosition;
     private int instrument;
@@ -39,7 +39,7 @@ public class S24PacketBlockAction implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleBlockAction(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S25PacketBlockBreakAnim.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.BlockPos;
 
-public class S25PacketBlockBreakAnim implements Packet<INetHandlerPlayClient>
+public class S25PacketBlockBreakAnim implements Packet<NetHandlerPlayServer>
 {
     private int breakerId;
     private BlockPos position;
@@ -36,7 +36,7 @@ public class S25PacketBlockBreakAnim implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleBlockBreakAnim(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S26PacketMapChunkBulk.java

@@ -3,11 +3,11 @@ package net.minecraft.network.play.server;
 import java.io.IOException;
 import java.util.Arrays;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S26PacketMapChunkBulk implements Packet<INetHandlerPlayClient>
+public class S26PacketMapChunkBulk implements Packet<NetHandlerPlayServer>
 {
     private int[] xPositions;
     private int[] zPositions;
@@ -79,7 +79,7 @@ public class S26PacketMapChunkBulk implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleMapChunkBulk(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S27PacketExplosion.java

@@ -5,12 +5,12 @@ import java.util.List;
 
 import com.google.common.collect.Lists;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.BlockPos;
 
-public class S27PacketExplosion implements Packet<INetHandlerPlayClient>
+public class S27PacketExplosion implements Packet<NetHandlerPlayServer>
 {
     private double posX;
     private double posY;
@@ -81,7 +81,7 @@ public class S27PacketExplosion implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleExplosion(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S28PacketEffect.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.BlockPos;
 
-public class S28PacketEffect implements Packet<INetHandlerPlayClient>
+public class S28PacketEffect implements Packet<NetHandlerPlayServer>
 {
     private int soundType;
     private BlockPos soundPos;
@@ -39,7 +39,7 @@ public class S28PacketEffect implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleEffect(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S29PacketSoundEffect.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S29PacketSoundEffect implements Packet<INetHandlerPlayClient>
+public class S29PacketSoundEffect implements Packet<NetHandlerPlayServer>
 {
     private String soundName;
     private int posX;
@@ -44,7 +44,7 @@ public class S29PacketSoundEffect implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleSoundEffect(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S2APacketParticles.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S2APacketParticles implements Packet<INetHandlerPlayClient>
+public class S2APacketParticles implements Packet<NetHandlerPlayServer>
 {
     private int particleType;
     private float xCoord;
@@ -70,7 +70,7 @@ public class S2APacketParticles implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleParticles(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S2BPacketChangeGameState.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S2BPacketChangeGameState implements Packet<INetHandlerPlayClient>
+public class S2BPacketChangeGameState implements Packet<NetHandlerPlayServer>
 {
     private int state;
     private float field_149141_c;
@@ -42,7 +42,7 @@ public class S2BPacketChangeGameState implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleChangeGameState(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S2CPacketSpawnGlobalEntity.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S2CPacketSpawnGlobalEntity implements Packet<INetHandlerPlayClient>
+public class S2CPacketSpawnGlobalEntity implements Packet<NetHandlerPlayServer>
 {
     private int entityId;
     private int x;
@@ -41,7 +41,7 @@ public class S2CPacketSpawnGlobalEntity implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleSpawnGlobalEntity(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S2DPacketOpenWindow.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.ChatComponent;
 
-public class S2DPacketOpenWindow implements Packet<INetHandlerPlayClient>
+public class S2DPacketOpenWindow implements Packet<NetHandlerPlayServer>
 {
     private int windowId;
     private String inventoryType;
@@ -18,7 +18,7 @@ public class S2DPacketOpenWindow implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleOpenWindow(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S2EPacketCloseWindow.java

@@ -2,18 +2,18 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S2EPacketCloseWindow implements Packet<INetHandlerPlayClient>
+public class S2EPacketCloseWindow implements Packet<NetHandlerPlayServer>
 {
     private int windowId;
 
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleCloseWindow(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S2FPacketSetSlot.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.ItemStack;
 
-public class S2FPacketSetSlot implements Packet<INetHandlerPlayClient>
+public class S2FPacketSetSlot implements Packet<NetHandlerPlayServer>
 {
     private int windowId;
     private int slot;
@@ -16,7 +16,7 @@ public class S2FPacketSetSlot implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleSetSlot(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S30PacketWindowItems.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.ItemStack;
 
-public class S30PacketWindowItems implements Packet<INetHandlerPlayClient>
+public class S30PacketWindowItems implements Packet<NetHandlerPlayServer>
 {
     private int windowId;
     private ItemStack[] itemStacks;
@@ -44,7 +44,7 @@ public class S30PacketWindowItems implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleWindowItems(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S31PacketWindowProperty.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S31PacketWindowProperty implements Packet<INetHandlerPlayClient>
+public class S31PacketWindowProperty implements Packet<NetHandlerPlayServer>
 {
     private int windowId;
     private int varIndex;
@@ -15,7 +15,7 @@ public class S31PacketWindowProperty implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleWindowProperty(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S32PacketConfirmTransaction.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S32PacketConfirmTransaction implements Packet<INetHandlerPlayClient>
+public class S32PacketConfirmTransaction implements Packet<NetHandlerPlayServer>
 {
     private int windowId;
     private short actionNumber;
@@ -15,7 +15,7 @@ public class S32PacketConfirmTransaction implements Packet<INetHandlerPlayClient
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleConfirmTransaction(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S33PacketUpdateSign.java

@@ -2,14 +2,14 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.BlockPos;
 import proxy.util.ChatComponent;
 import proxy.util.ChatComponentText;
 
-public class S33PacketUpdateSign implements Packet<INetHandlerPlayClient>
+public class S33PacketUpdateSign implements Packet<NetHandlerPlayServer>
 {
     private BlockPos blockPos;
     private ChatComponent[] lines;
@@ -53,7 +53,7 @@ public class S33PacketUpdateSign implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleUpdateSign(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S34PacketMaps.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S34PacketMaps implements Packet<INetHandlerPlayClient>
+public class S34PacketMaps implements Packet<NetHandlerPlayServer>
 {
 	private static class Vec4b
 	{
@@ -109,7 +109,7 @@ public class S34PacketMaps implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleMaps(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S35PacketUpdateTileEntity.java

@@ -3,12 +3,12 @@ package net.minecraft.network.play.server;
 import java.io.IOException;
 
 import proxy.nbt.NBTTagCompound;
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.BlockPos;
 
-public class S35PacketUpdateTileEntity implements Packet<INetHandlerPlayClient>
+public class S35PacketUpdateTileEntity implements Packet<NetHandlerPlayServer>
 {
     private BlockPos blockPos;
     private int metadata;
@@ -37,7 +37,7 @@ public class S35PacketUpdateTileEntity implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleUpdateTileEntity(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S36PacketSignEditorOpen.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.BlockPos;
 
-public class S36PacketSignEditorOpen implements Packet<INetHandlerPlayClient>
+public class S36PacketSignEditorOpen implements Packet<NetHandlerPlayServer>
 {
     private BlockPos signPosition;
     
@@ -22,7 +22,7 @@ public class S36PacketSignEditorOpen implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleSignEditorOpen(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S37PacketStatistics.java

@@ -6,18 +6,18 @@ import java.util.Map.Entry;
 
 import com.google.common.collect.Maps;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S37PacketStatistics implements Packet<INetHandlerPlayClient>
+public class S37PacketStatistics implements Packet<NetHandlerPlayServer>
 {
     private Map<String, Integer> field_148976_a;
 
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleStatistics(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S38PacketPlayerListItem.java

@@ -6,14 +6,14 @@ import com.google.common.collect.Lists;
 import java.io.IOException;
 import java.util.List;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.ChatComponent;
 import proxy.util.GameProfile;
 import proxy.util.Property;
 
-public class S38PacketPlayerListItem implements Packet<INetHandlerPlayClient>
+public class S38PacketPlayerListItem implements Packet<NetHandlerPlayServer>
 {
     private S38PacketPlayerListItem.Action action;
     private final List<S38PacketPlayerListItem.AddPlayerData> players = Lists.<S38PacketPlayerListItem.AddPlayerData>newArrayList();
@@ -186,7 +186,7 @@ public class S38PacketPlayerListItem implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handlePlayerListItem(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S39PacketPlayerAbilities.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S39PacketPlayerAbilities implements Packet<INetHandlerPlayClient>
+public class S39PacketPlayerAbilities implements Packet<NetHandlerPlayServer>
 {
     private boolean invulnerable;
     private boolean flying;
@@ -78,7 +78,7 @@ public class S39PacketPlayerAbilities implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handlePlayerAbilities(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S3APacketTabComplete.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S3APacketTabComplete implements Packet<INetHandlerPlayClient>
+public class S3APacketTabComplete implements Packet<NetHandlerPlayServer>
 {
     private String[] matches;
 
@@ -48,7 +48,7 @@ public class S3APacketTabComplete implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleTabComplete(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S3BPacketScoreboardObjective.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S3BPacketScoreboardObjective implements Packet<INetHandlerPlayClient>
+public class S3BPacketScoreboardObjective implements Packet<NetHandlerPlayServer>
 {
     private String objectiveName;
     private String objectiveValue;
@@ -46,7 +46,7 @@ public class S3BPacketScoreboardObjective implements Packet<INetHandlerPlayClien
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleScoreboardObjective(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S3CPacketUpdateScore.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S3CPacketUpdateScore implements Packet<INetHandlerPlayClient>
+public class S3CPacketUpdateScore implements Packet<NetHandlerPlayServer>
 {
     private String name = "";
     private String objective = "";
@@ -46,7 +46,7 @@ public class S3CPacketUpdateScore implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleUpdateScore(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S3DPacketDisplayScoreboard.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S3DPacketDisplayScoreboard implements Packet<INetHandlerPlayClient>
+public class S3DPacketDisplayScoreboard implements Packet<NetHandlerPlayServer>
 {
     private int position;
     private String scoreName;
@@ -32,7 +32,7 @@ public class S3DPacketDisplayScoreboard implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleDisplayScoreboard(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S3EPacketTeams.java

@@ -5,11 +5,11 @@ import java.util.Collection;
 
 import com.google.common.collect.Lists;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S3EPacketTeams implements Packet<INetHandlerPlayClient>
+public class S3EPacketTeams implements Packet<NetHandlerPlayServer>
 {
     private String name = "";
     private String displayName = "";
@@ -89,7 +89,7 @@ public class S3EPacketTeams implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleTeams(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S3FPacketCustomPayload.java

@@ -3,11 +3,11 @@ package net.minecraft.network.play.server;
 import io.netty.buffer.ByteBuf;
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S3FPacketCustomPayload implements Packet<INetHandlerPlayClient>
+public class S3FPacketCustomPayload implements Packet<NetHandlerPlayServer>
 {
     private String channel;
     private PacketBuffer data;
@@ -57,7 +57,7 @@ public class S3FPacketCustomPayload implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleCustomPayload(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S40PacketDisconnect.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.ChatComponent;
 
-public class S40PacketDisconnect implements Packet<INetHandlerPlayClient>
+public class S40PacketDisconnect implements Packet<NetHandlerPlayServer>
 {
     private ChatComponent reason;
 
@@ -39,7 +39,7 @@ public class S40PacketDisconnect implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleDisconnect(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S41PacketServerDifficulty.java

@@ -2,18 +2,18 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S41PacketServerDifficulty implements Packet<INetHandlerPlayClient>
+public class S41PacketServerDifficulty implements Packet<NetHandlerPlayServer>
 {
     private byte difficulty;
 
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleServerDifficulty(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S42PacketCombatEvent.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S42PacketCombatEvent implements Packet<INetHandlerPlayClient>
+public class S42PacketCombatEvent implements Packet<NetHandlerPlayServer>
 {
     public S42PacketCombatEvent.Event eventType;
     public int field_179774_b;
@@ -57,7 +57,7 @@ public class S42PacketCombatEvent implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleCombatEvent(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S43PacketCamera.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S43PacketCamera implements Packet<INetHandlerPlayClient>
+public class S43PacketCamera implements Packet<NetHandlerPlayServer>
 {
     private int entityId;
 
@@ -29,7 +29,7 @@ public class S43PacketCamera implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleCamera(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S44PacketWorldBorder.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S44PacketWorldBorder implements Packet<INetHandlerPlayClient>
+public class S44PacketWorldBorder implements Packet<NetHandlerPlayServer>
 {
     private S44PacketWorldBorder.Action action;
     private int size;
@@ -109,7 +109,7 @@ public class S44PacketWorldBorder implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleWorldBorder(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S45PacketTitle.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.ChatComponent;
 
-public class S45PacketTitle implements Packet<INetHandlerPlayClient>
+public class S45PacketTitle implements Packet<NetHandlerPlayServer>
 {
     private S45PacketTitle.Type type;
     private ChatComponent message;
@@ -81,7 +81,7 @@ public class S45PacketTitle implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleTitle(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S46PacketSetCompressionLevel.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S46PacketSetCompressionLevel implements Packet<INetHandlerPlayClient>
+public class S46PacketSetCompressionLevel implements Packet<NetHandlerPlayServer>
 {
     private int threshold;
 
@@ -29,7 +29,7 @@ public class S46PacketSetCompressionLevel implements Packet<INetHandlerPlayClien
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleSetCompressionLevel(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S47PacketPlayerListHeaderFooter.java

@@ -2,12 +2,12 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 import proxy.util.ChatComponent;
 
-public class S47PacketPlayerListHeaderFooter implements Packet<INetHandlerPlayClient>
+public class S47PacketPlayerListHeaderFooter implements Packet<NetHandlerPlayServer>
 {
     private ChatComponent header;
     private ChatComponent footer;
@@ -43,7 +43,7 @@ public class S47PacketPlayerListHeaderFooter implements Packet<INetHandlerPlayCl
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handlePlayerListHeaderFooter(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S48PacketResourcePackSend.java

@@ -2,11 +2,11 @@ package net.minecraft.network.play.server;
 
 import java.io.IOException;
 
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S48PacketResourcePackSend implements Packet<INetHandlerPlayClient>
+public class S48PacketResourcePackSend implements Packet<NetHandlerPlayServer>
 {
     private String url;
     private String hash;
@@ -32,7 +32,7 @@ public class S48PacketResourcePackSend implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleResourcePack(this);
     }

proxy/src/main/java/net/minecraft/network/play/server/S49PacketUpdateEntityNBT.java

@@ -3,11 +3,11 @@ package net.minecraft.network.play.server;
 import java.io.IOException;
 
 import proxy.nbt.NBTTagCompound;
-import proxy.network.INetHandlerPlayClient;
+import proxy.network.NetHandlerPlayServer;
 import proxy.network.Packet;
 import proxy.network.PacketBuffer;
 
-public class S49PacketUpdateEntityNBT implements Packet<INetHandlerPlayClient>
+public class S49PacketUpdateEntityNBT implements Packet<NetHandlerPlayServer>
 {
     private int entityId;
     private NBTTagCompound tagCompound;
@@ -33,7 +33,7 @@ public class S49PacketUpdateEntityNBT implements Packet<INetHandlerPlayClient>
     /**
      * Passes this Packet on to the NetHandler for processing.
      */
-    public void processPacket(INetHandlerPlayClient handler)
+    public void processPacket(NetHandlerPlayServer handler)
     {
         handler.handleEntityNBT(this);
     }

proxy/src/main/java/proxy/network/INetHandler.java

@@ -4,4 +4,6 @@ import proxy.util.ChatComponent;
 
 public interface INetHandler {
 	void onDisconnect(NetworkManager connection, ChatComponent reason);
+    default void update(NetworkManager connection) {
+    }
 }

proxy/src/main/java/proxy/network/INetHandlerPlayClient.java

@@ -1,384 +0,0 @@
-package proxy.network;
-
-import net.minecraft.network.play.server.S00PacketKeepAlive;
-import net.minecraft.network.play.server.S01PacketJoinGame;
-import net.minecraft.network.play.server.S02PacketChat;
-import net.minecraft.network.play.server.S03PacketTimeUpdate;
-import net.minecraft.network.play.server.S04PacketEntityEquipment;
-import net.minecraft.network.play.server.S05PacketSpawnPosition;
-import net.minecraft.network.play.server.S06PacketUpdateHealth;
-import net.minecraft.network.play.server.S07PacketRespawn;
-import net.minecraft.network.play.server.S08PacketPlayerPosLook;
-import net.minecraft.network.play.server.S09PacketHeldItemChange;
-import net.minecraft.network.play.server.S0APacketUseBed;
-import net.minecraft.network.play.server.S0BPacketAnimation;
-import net.minecraft.network.play.server.S0CPacketSpawnPlayer;
-import net.minecraft.network.play.server.S0DPacketCollectItem;
-import net.minecraft.network.play.server.S0EPacketSpawnObject;
-import net.minecraft.network.play.server.S0FPacketSpawnMob;
-import net.minecraft.network.play.server.S10PacketSpawnPainting;
-import net.minecraft.network.play.server.S11PacketSpawnExperienceOrb;
-import net.minecraft.network.play.server.S12PacketEntityVelocity;
-import net.minecraft.network.play.server.S13PacketDestroyEntities;
-import net.minecraft.network.play.server.S14PacketEntity;
-import net.minecraft.network.play.server.S18PacketEntityTeleport;
-import net.minecraft.network.play.server.S19PacketEntityHeadLook;
-import net.minecraft.network.play.server.S19PacketEntityStatus;
-import net.minecraft.network.play.server.S1BPacketEntityAttach;
-import net.minecraft.network.play.server.S1CPacketEntityMetadata;
-import net.minecraft.network.play.server.S1DPacketEntityEffect;
-import net.minecraft.network.play.server.S1EPacketRemoveEntityEffect;
-import net.minecraft.network.play.server.S1FPacketSetExperience;
-import net.minecraft.network.play.server.S20PacketEntityProperties;
-import net.minecraft.network.play.server.S21PacketChunkData;
-import net.minecraft.network.play.server.S22PacketMultiBlockChange;
-import net.minecraft.network.play.server.S23PacketBlockChange;
-import net.minecraft.network.play.server.S24PacketBlockAction;
-import net.minecraft.network.play.server.S25PacketBlockBreakAnim;
-import net.minecraft.network.play.server.S26PacketMapChunkBulk;
-import net.minecraft.network.play.server.S27PacketExplosion;
-import net.minecraft.network.play.server.S28PacketEffect;
-import net.minecraft.network.play.server.S29PacketSoundEffect;
-import net.minecraft.network.play.server.S2APacketParticles;
-import net.minecraft.network.play.server.S2BPacketChangeGameState;
-import net.minecraft.network.play.server.S2CPacketSpawnGlobalEntity;
-import net.minecraft.network.play.server.S2DPacketOpenWindow;
-import net.minecraft.network.play.server.S2EPacketCloseWindow;
-import net.minecraft.network.play.server.S2FPacketSetSlot;
-import net.minecraft.network.play.server.S30PacketWindowItems;
-import net.minecraft.network.play.server.S31PacketWindowProperty;
-import net.minecraft.network.play.server.S32PacketConfirmTransaction;
-import net.minecraft.network.play.server.S33PacketUpdateSign;
-import net.minecraft.network.play.server.S34PacketMaps;
-import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
-import net.minecraft.network.play.server.S36PacketSignEditorOpen;
-import net.minecraft.network.play.server.S37PacketStatistics;
-import net.minecraft.network.play.server.S38PacketPlayerListItem;
-import net.minecraft.network.play.server.S39PacketPlayerAbilities;
-import net.minecraft.network.play.server.S3APacketTabComplete;
-import net.minecraft.network.play.server.S3BPacketScoreboardObjective;
-import net.minecraft.network.play.server.S3CPacketUpdateScore;
-import net.minecraft.network.play.server.S3DPacketDisplayScoreboard;
-import net.minecraft.network.play.server.S3EPacketTeams;
-import net.minecraft.network.play.server.S3FPacketCustomPayload;
-import net.minecraft.network.play.server.S40PacketDisconnect;
-import net.minecraft.network.play.server.S41PacketServerDifficulty;
-import net.minecraft.network.play.server.S42PacketCombatEvent;
-import net.minecraft.network.play.server.S43PacketCamera;
-import net.minecraft.network.play.server.S44PacketWorldBorder;
-import net.minecraft.network.play.server.S45PacketTitle;
-import net.minecraft.network.play.server.S46PacketSetCompressionLevel;
-import net.minecraft.network.play.server.S47PacketPlayerListHeaderFooter;
-import net.minecraft.network.play.server.S48PacketResourcePackSend;
-import net.minecraft.network.play.server.S49PacketUpdateEntityNBT;
-
-public interface INetHandlerPlayClient extends INetHandler
-{
-    /**
-     * Spawns an instance of the objecttype indicated by the packet and sets its position and momentum
-     */
-    void handleSpawnObject(S0EPacketSpawnObject packetIn);
-
-    /**
-     * Spawns an experience orb and sets its value (amount of XP)
-     */
-    void handleSpawnExperienceOrb(S11PacketSpawnExperienceOrb packetIn);
-
-    /**
-     * Handles globally visible entities. Used in vanilla for lightning bolts
-     */
-    void handleSpawnGlobalEntity(S2CPacketSpawnGlobalEntity packetIn);
-
-    /**
-     * Spawns the mob entity at the specified location, with the specified rotation, momentum and type. Updates the
-     * entities Datawatchers with the entity metadata specified in the packet
-     */
-    void handleSpawnMob(S0FPacketSpawnMob packetIn);
-
-    /**
-     * May create a scoreboard objective, remove an objective from the scoreboard or update an objectives' displayname
-     */
-    void handleScoreboardObjective(S3BPacketScoreboardObjective packetIn);
-
-    /**
-     * Handles the spawning of a painting object
-     */
-    void handleSpawnPainting(S10PacketSpawnPainting packetIn);
-
-    /**
-     * Handles the creation of a nearby player entity, sets the position and held item
-     */
-    void handleSpawnPlayer(S0CPacketSpawnPlayer packetIn);
-
-    /**
-     * Renders a specified animation: Waking up a player, a living entity swinging its currently held item, being hurt
-     * or receiving a critical hit by normal or magical means
-     */
-    void handleAnimation(S0BPacketAnimation packetIn);
-
-    /**
-     * Updates the players statistics or achievements
-     */
-    void handleStatistics(S37PacketStatistics packetIn);
-
-    /**
-     * Updates all registered IWorldAccess instances with destroyBlockInWorldPartially
-     */
-    void handleBlockBreakAnim(S25PacketBlockBreakAnim packetIn);
-
-    /**
-     * Creates a sign in the specified location if it didn't exist and opens the GUI to edit its text
-     */
-    void handleSignEditorOpen(S36PacketSignEditorOpen packetIn);
-
-    /**
-     * Updates the NBTTagCompound metadata of instances of the following entitytypes: Mob spawners, command blocks,
-     * beacons, skulls, flowerpot
-     */
-    void handleUpdateTileEntity(S35PacketUpdateTileEntity packetIn);
-
-    /**
-     * Triggers Block.onBlockEventReceived, which is implemented in BlockPistonBase for extension/retraction, BlockNote
-     * for setting the instrument (including audiovisual feedback) and in BlockContainer to set the number of players
-     * accessing a (Ender)Chest
-     */
-    void handleBlockAction(S24PacketBlockAction packetIn);
-
-    /**
-     * Updates the block and metadata and generates a blockupdate (and notify the clients)
-     */
-    void handleBlockChange(S23PacketBlockChange packetIn);
-
-    /**
-     * Prints a chatmessage in the chat GUI
-     */
-    void handleChat(S02PacketChat packetIn);
-
-    /**
-     * Displays the available command-completion options the server knows of
-     */
-    void handleTabComplete(S3APacketTabComplete packetIn);
-
-    /**
-     * Received from the servers PlayerManager if between 1 and 64 blocks in a chunk are changed. If only one block
-     * requires an update, the server sends S23PacketBlockChange and if 64 or more blocks are changed, the server sends
-     * S21PacketChunkData
-     */
-    void handleMultiBlockChange(S22PacketMultiBlockChange packetIn);
-
-    /**
-     * Updates the worlds MapStorage with the specified MapData for the specified map-identifier and invokes a
-     * MapItemRenderer for it
-     */
-    void handleMaps(S34PacketMaps packetIn);
-
-    /**
-     * Verifies that the server and client are synchronized with respect to the inventory/container opened by the player
-     * and confirms if it is the case.
-     */
-    void handleConfirmTransaction(S32PacketConfirmTransaction packetIn);
-
-    /**
-     * Resets the ItemStack held in hand and closes the window that is opened
-     */
-    void handleCloseWindow(S2EPacketCloseWindow packetIn);
-
-    /**
-     * Handles the placement of a specified ItemStack in a specified container/inventory slot
-     */
-    void handleWindowItems(S30PacketWindowItems packetIn);
-
-    /**
-     * Displays a GUI by ID. In order starting from id 0: Chest, Workbench, Furnace, Dispenser, Enchanting table,
-     * Brewing stand, Villager merchant, Beacon, Anvil, Hopper, Dropper, Horse
-     */
-    void handleOpenWindow(S2DPacketOpenWindow packetIn);
-
-    /**
-     * Sets the progressbar of the opened window to the specified value
-     */
-    void handleWindowProperty(S31PacketWindowProperty packetIn);
-
-    /**
-     * Handles pickin up an ItemStack or dropping one in your inventory or an open (non-creative) container
-     */
-    void handleSetSlot(S2FPacketSetSlot packetIn);
-
-    /**
-     * Handles packets that have room for a channel specification. Vanilla implemented channels are "MC|TrList" to
-     * acquire a MerchantRecipeList trades for a villager merchant, "MC|Brand" which sets the server brand? on the
-     * player instance and finally "MC|RPack" which the server uses to communicate the identifier of the default server
-     * resourcepack for the client to load.
-     */
-    void handleCustomPayload(S3FPacketCustomPayload packetIn);
-
-    /**
-     * Closes the network channel
-     */
-    void handleDisconnect(S40PacketDisconnect packetIn);
-
-    /**
-     * Retrieves the player identified by the packet, puts him to sleep if possible (and flags whether all players are
-     * asleep)
-     */
-    void handleUseBed(S0APacketUseBed packetIn);
-
-    /**
-     * Invokes the entities' handleUpdateHealth method which is implemented in LivingBase (hurt/death),
-     * MinecartMobSpawner (spawn delay), FireworkRocket & MinecartTNT (explosion), IronGolem (throwing,...), Witch
-     * (spawn particles), Zombie (villager transformation), Animal (breeding mode particles), Horse (breeding/smoke
-     * particles), Sheep (...), Tameable (...), Villager (particles for breeding mode, angry and happy), Wolf (...)
-     */
-    void handleEntityStatus(S19PacketEntityStatus packetIn);
-
-    void handleEntityAttach(S1BPacketEntityAttach packetIn);
-
-    /**
-     * Initiates a new explosion (sound, particles, drop spawn) for the affected blocks indicated by the packet.
-     */
-    void handleExplosion(S27PacketExplosion packetIn);
-
-    void handleChangeGameState(S2BPacketChangeGameState packetIn);
-
-    void handleKeepAlive(S00PacketKeepAlive packetIn);
-
-    /**
-     * Updates the specified chunk with the supplied data, marks it for re-rendering and lighting recalculation
-     */
-    void handleChunkData(S21PacketChunkData packetIn);
-
-    void handleMapChunkBulk(S26PacketMapChunkBulk packetIn);
-
-    void handleEffect(S28PacketEffect packetIn);
-
-    /**
-     * Registers some server properties (gametype,hardcore-mode,terraintype,difficulty,player limit), creates a new
-     * WorldClient and sets the player initial dimension
-     */
-    void handleJoinGame(S01PacketJoinGame packetIn);
-
-    /**
-     * Updates the specified entity's position by the specified relative moment and absolute rotation. Note that
-     * subclassing of the packet allows for the specification of a subset of this data (e.g. only rel. position, abs.
-     * rotation or both).
-     */
-    void handleEntityMovement(S14PacketEntity packetIn);
-
-    /**
-     * Handles changes in player positioning and rotation such as when travelling to a new dimension, (re)spawning,
-     * mounting horses etc. Seems to immediately reply to the server with the clients post-processing perspective on the
-     * player positioning
-     */
-    void handlePlayerPosLook(S08PacketPlayerPosLook packetIn);
-
-    /**
-     * Spawns a specified number of particles at the specified location with a randomized displacement according to
-     * specified bounds
-     */
-    void handleParticles(S2APacketParticles packetIn);
-
-    void handlePlayerAbilities(S39PacketPlayerAbilities packetIn);
-
-    void handlePlayerListItem(S38PacketPlayerListItem packetIn);
-
-    /**
-     * Locally eliminates the entities. Invoked by the server when the items are in fact destroyed, or the player is no
-     * longer registered as required to monitor them. The latter  happens when distance between the player and item
-     * increases beyond a certain treshold (typically the viewing distance)
-     */
-    void handleDestroyEntities(S13PacketDestroyEntities packetIn);
-
-    void handleRemoveEntityEffect(S1EPacketRemoveEntityEffect packetIn);
-
-    void handleRespawn(S07PacketRespawn packetIn);
-
-    /**
-     * Updates the direction in which the specified entity is looking, normally this head rotation is independent of the
-     * rotation of the entity itself
-     */
-    void handleEntityHeadLook(S19PacketEntityHeadLook packetIn);
-
-    /**
-     * Updates which hotbar slot of the player is currently selected
-     */
-    void handleHeldItemChange(S09PacketHeldItemChange packetIn);
-
-    /**
-     * Removes or sets the ScoreObjective to be displayed at a particular scoreboard position (list, sidebar, below
-     * name)
-     */
-    void handleDisplayScoreboard(S3DPacketDisplayScoreboard packetIn);
-
-    /**
-     * Invoked when the server registers new proximate objects in your watchlist or when objects in your watchlist have
-     * changed -> Registers any changes locally
-     */
-    void handleEntityMetadata(S1CPacketEntityMetadata packetIn);
-
-    /**
-     * Sets the velocity of the specified entity to the specified value
-     */
-    void handleEntityVelocity(S12PacketEntityVelocity packetIn);
-
-    void handleEntityEquipment(S04PacketEntityEquipment packetIn);
-
-    void handleSetExperience(S1FPacketSetExperience packetIn);
-
-    void handleUpdateHealth(S06PacketUpdateHealth packetIn);
-
-    /**
-     * Updates a team managed by the scoreboard: Create/Remove the team registration, Register/Remove the player-team-
-     * memberships, Set team displayname/prefix/suffix and/or whether friendly fire is enabled
-     */
-    void handleTeams(S3EPacketTeams packetIn);
-
-    /**
-     * Either updates the score with a specified value or removes the score for an objective
-     */
-    void handleUpdateScore(S3CPacketUpdateScore packetIn);
-
-    void handleSpawnPosition(S05PacketSpawnPosition packetIn);
-
-    void handleTimeUpdate(S03PacketTimeUpdate packetIn);
-
-    /**
-     * Updates a specified sign with the specified text lines
-     */
-    void handleUpdateSign(S33PacketUpdateSign packetIn);
-
-    void handleSoundEffect(S29PacketSoundEffect packetIn);
-
-    void handleCollectItem(S0DPacketCollectItem packetIn);
-
-    /**
-     * Updates an entity's position and rotation as specified by the packet
-     */
-    void handleEntityTeleport(S18PacketEntityTeleport packetIn);
-
-    /**
-     * Updates en entity's attributes and their respective modifiers, which are used for speed bonusses (player
-     * sprinting, animals fleeing, baby speed), weapon/tool attackDamage, hostiles followRange randomization, zombie
-     * maxHealth and knockback resistance as well as reinforcement spawning chance.
-     */
-    void handleEntityProperties(S20PacketEntityProperties packetIn);
-
-    void handleEntityEffect(S1DPacketEntityEffect packetIn);
-
-    void handleCombatEvent(S42PacketCombatEvent packetIn);
-
-    void handleServerDifficulty(S41PacketServerDifficulty packetIn);
-
-    void handleCamera(S43PacketCamera packetIn);
-
-    void handleWorldBorder(S44PacketWorldBorder packetIn);
-
-    void handleTitle(S45PacketTitle packetIn);
-
-    void handleSetCompressionLevel(S46PacketSetCompressionLevel packetIn);
-
-    void handlePlayerListHeaderFooter(S47PacketPlayerListHeaderFooter packetIn);
-
-    void handleResourcePack(S48PacketResourcePackSend packetIn);
-
-    void handleEntityNBT(S49PacketUpdateEntityNBT packetIn);
-}

proxy/src/main/java/proxy/network/INetHandlerPlayServer.java

@@ -1,143 +0,0 @@
-package proxy.network;
-
-import net.minecraft.network.play.client.C00PacketKeepAlive;
-import net.minecraft.network.play.client.C01PacketChatMessage;
-import net.minecraft.network.play.client.C02PacketUseEntity;
-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.C09PacketHeldItemChange;
-import net.minecraft.network.play.client.C0APacketAnimation;
-import net.minecraft.network.play.client.C0BPacketEntityAction;
-import net.minecraft.network.play.client.C0CPacketInput;
-import net.minecraft.network.play.client.C0DPacketCloseWindow;
-import net.minecraft.network.play.client.C0EPacketClickWindow;
-import net.minecraft.network.play.client.C0FPacketConfirmTransaction;
-import net.minecraft.network.play.client.C10PacketCreativeInventoryAction;
-import net.minecraft.network.play.client.C11PacketEnchantItem;
-import net.minecraft.network.play.client.C12PacketUpdateSign;
-import net.minecraft.network.play.client.C13PacketPlayerAbilities;
-import net.minecraft.network.play.client.C14PacketTabComplete;
-import net.minecraft.network.play.client.C15PacketClientSettings;
-import net.minecraft.network.play.client.C16PacketClientStatus;
-import net.minecraft.network.play.client.C17PacketCustomPayload;
-import net.minecraft.network.play.client.C18PacketSpectate;
-import net.minecraft.network.play.client.C19PacketResourcePackStatus;
-
-public interface INetHandlerPlayServer extends INetHandler
-{
-    void handleAnimation(C0APacketAnimation packetIn);
-
-    /**
-     * Process chat messages (broadcast back to clients) and commands (executes)
-     */
-    void processChatMessage(C01PacketChatMessage packetIn);
-
-    /**
-     * Retrieves possible tab completions for the requested command string and sends them to the client
-     */
-    void processTabComplete(C14PacketTabComplete packetIn);
-
-    /**
-     * Processes the client status updates: respawn attempt from player, opening statistics or achievements, or
-     * acquiring 'open inventory' achievement
-     */
-    void processClientStatus(C16PacketClientStatus packetIn);
-
-    /**
-     * Updates serverside copy of client settings: language, render distance, chat visibility, chat colours, difficulty,
-     * and whether to show the cape
-     */
-    void processClientSettings(C15PacketClientSettings packetIn);
-
-    /**
-     * Received in response to the server requesting to confirm that the client-side open container matches the servers'
-     * after a mismatched container-slot manipulation. It will unlock the player's ability to manipulate the container
-     * contents
-     */
-    void processConfirmTransaction(C0FPacketConfirmTransaction packetIn);
-
-    /**
-     * Enchants the item identified by the packet given some convoluted conditions (matching window, which
-     * should/shouldn't be in use?)
-     */
-    void processEnchantItem(C11PacketEnchantItem packetIn);
-
-    /**
-     * Executes a container/inventory slot manipulation as indicated by the packet. Sends the serverside result if they
-     * didn't match the indicated result and prevents further manipulation by the player until he confirms that it has
-     * the same open container/inventory
-     */
-    void processClickWindow(C0EPacketClickWindow packetIn);
-
-    /**
-     * Processes the client closing windows (container)
-     */
-    void processCloseWindow(C0DPacketCloseWindow packetIn);
-
-    /**
-     * Synchronizes serverside and clientside book contents and signing
-     */
-    void processVanilla250Packet(C17PacketCustomPayload packetIn);
-
-    /**
-     * Processes interactions ((un)leashing, opening command block GUI) and attacks on an entity with players currently
-     * equipped item
-     */
-    void processUseEntity(C02PacketUseEntity packetIn);
-
-    /**
-     * Updates a players' ping statistics
-     */
-    void processKeepAlive(C00PacketKeepAlive packetIn);
-
-    /**
-     * Processes clients perspective on player positioning and/or orientation
-     */
-    void processPlayer(C03PacketPlayer packetIn);
-
-    /**
-     * Processes a player starting/stopping flying
-     */
-    void processPlayerAbilities(C13PacketPlayerAbilities packetIn);
-
-    /**
-     * Processes the player initiating/stopping digging on a particular spot, as well as a player dropping items?. (0:
-     * initiated, 1: reinitiated, 2? , 3-4 drop item (respectively without or with player control), 5: stopped; x,y,z,
-     * side clicked on;)
-     */
-    void processPlayerDigging(C07PacketPlayerDigging packetIn);
-
-    /**
-     * Processes a range of action-types: sneaking, sprinting, waking from sleep, opening the inventory or setting jump
-     * height of the horse the player is riding
-     */
-    void processEntityAction(C0BPacketEntityAction packetIn);
-
-    /**
-     * Processes player movement input. Includes walking, strafing, jumping, sneaking; excludes riding and toggling
-     * flying/sprinting
-     */
-    void processInput(C0CPacketInput packetIn);
-
-    /**
-     * Updates which quickbar slot is selected
-     */
-    void processHeldItemChange(C09PacketHeldItemChange packetIn);
-
-    /**
-     * Update the server with an ItemStack in a slot.
-     */
-    void processCreativeInventoryAction(C10PacketCreativeInventoryAction packetIn);
-
-    void processUpdateSign(C12PacketUpdateSign packetIn);
-
-    /**
-     * Processes block placement and block activation (anvil, furnace, etc.)
-     */
-    void processPlayerBlockPlacement(C08PacketPlayerBlockPlacement packetIn);
-
-    void handleSpectate(C18PacketSpectate packetIn);
-
-    void handleResourcePackStatus(C19PacketResourcePackStatus packetIn);
-}

proxy/src/main/java/proxy/network/NetHandlerLoginServer.java

@@ -10,10 +10,9 @@ import net.minecraft.network.login.server.S03PacketEnableCompression;
 import proxy.Proxy;
 import proxy.util.ChatComponent;
 import proxy.util.ChatComponentText;
-import proxy.util.ITickable;
 import proxy.util.Log;
 
-public class NetHandlerLoginServer implements INetHandler, ITickable {
+public class NetHandlerLoginServer implements INetHandler {
 	private static enum LoginState {
 		INIT, WAITING, DONE;
 	}

proxy/src/main/java/proxy/network/NetHandlerPlayServer.java

@@ -112,11 +112,10 @@ import proxy.util.ChatColor;
 import proxy.util.ChatComponent;
 import proxy.util.ChatComponentText;
 import proxy.util.User;
-import proxy.util.ITickable;
 import proxy.util.ItemStack;
 import proxy.util.Log;
 
-public class NetHandlerPlayServer implements INetHandlerPlayServer, INetHandlerPlayClient, ITickable {
+public class NetHandlerPlayServer implements INetHandler {
 	public class ProxyLoginHandler implements INetHandler {
 		public void handleEncryptionRequest(S01PacketEncryptionRequest packetIn) {
 			NetHandlerPlayServer.this.server.closeChannel(new ChatComponentText("Online mode auth request received"));

proxy/src/main/java/proxy/network/NetworkManager.java

@@ -31,7 +31,6 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import proxy.util.ChatComponent;
 import proxy.util.ChatComponentText;
-import proxy.util.ITickable;
 import proxy.util.LazyLoadBase;
 import proxy.util.Log;
 
@@ -56,16 +55,9 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet>
     private final Queue<NetworkManager.InboundHandlerTuplePacketListener> outboundPacketsQueue = new ConcurrentLinkedQueue<NetworkManager.InboundHandlerTuplePacketListener>();
     private final ReentrantReadWriteLock readWriteLock = new ReentrantReadWriteLock();
 
-    /** The active channel */
     private Channel channel;
-
-    /** The address of the remote party */
     private SocketAddress socketAddress;
-
-    /** The INetHandler instance responsible for processing received packets */
     private INetHandler packetListener;
-
-    /** A String indicating why the network has shutdown. */
     private ChatComponent terminationReason;
     private boolean disconnected;
 
@@ -277,12 +269,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet>
     public void processReceivedPackets()
     {
         this.flushOutboundQueue();
-
+        if(this.packetListener != null)
-        if (this.packetListener instanceof ITickable)
+            this.packetListener.update(this);
-        {
-            ((ITickable)this.packetListener).update(this);
-        }
-
         this.channel.flush();
     }