Massive renaming update in nms. If you bypassed Bukkit, you will likely break.

Also minimized all the nms diffs and generic cleanups all around.

src/main/java/net/minecraft/server/Packet3Chat.java

@@ -2,11 +2,12 @@ package net.minecraft.server;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
+
 import java.io.IOException; // CraftBukkit
 
 public class Packet3Chat extends Packet {
 
-    public String a;
+    public String message;
 
     public Packet3Chat() {}
 
@@ -17,15 +18,15 @@ public class Packet3Chat extends Packet {
         }
         // CraftBukkit end */
 
-        this.a = s;
+        this.message = s;
     }
 
     public void a(DataInputStream datainputstream) throws IOException { // CraftBukkit
-        this.a = a(datainputstream, 119);
+        this.message = a(datainputstream, 119);
     }
 
     public void a(DataOutputStream dataoutputstream) throws IOException { // CraftBukkit
-        a(this.a, dataoutputstream);
+        a(this.message, dataoutputstream);
     }
 
     public void a(NetHandler nethandler) {
@@ -33,6 +34,6 @@ public class Packet3Chat extends Packet {
     }
 
     public int a() {
-        return this.a.length();
+        return this.message.length();
     }
 }