Update CraftBukkit to 1.6.1

src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java

@@ -1,5 +1,6 @@
 package org.bukkit.craftbukkit.command;
 
+import net.minecraft.server.ChatMessage;
 import net.minecraft.server.RemoteControlCommandListener;
 import org.bukkit.command.RemoteConsoleCommandSender;
 
@@ -9,7 +10,7 @@ public class CraftRemoteConsoleCommandSender extends ServerCommandSender impleme
     }
 
     public void sendMessage(String message) {
-        RemoteControlCommandListener.instance.sendMessage(message + "\n"); // Send a newline after each message, to preserve formatting.
+        RemoteControlCommandListener.instance.sendMessage(ChatMessage.d(message + "\n")); // Send a newline after each message, to preserve formatting.
     }
 
     public void sendMessage(String[] messages) {

src/main/java/org/bukkit/craftbukkit/command/ServerCommandListener.java

@@ -2,9 +2,11 @@ package org.bukkit.craftbukkit.command;
 
 import java.lang.reflect.Method;
 
+import net.minecraft.server.ChatMessage;
 import net.minecraft.server.ChunkCoordinates;
 import net.minecraft.server.ICommandListener;
 import net.minecraft.server.LocaleLanguage;
+import net.minecraft.server.World;
 
 import org.bukkit.command.CommandSender;
 
@@ -18,8 +20,8 @@ public class ServerCommandListener implements ICommandListener {
         this.prefix = parts[parts.length - 1];
     }
 
-    public void sendMessage(String msg) {
-        this.commandSender.sendMessage(msg);
+    public void sendMessage(ChatMessage chatmessage) {
+        this.commandSender.sendMessage(chatmessage.toString());
     }
 
     public CommandSender getSender() {
@@ -36,10 +38,6 @@ public class ServerCommandListener implements ICommandListener {
         return this.prefix;
     }
 
-    public String a(String s, Object... aobject) {
-        return LocaleLanguage.a().a(s, aobject);
-    }
-
     public boolean a(int i, String s) {
         return true;
     }
@@ -47,4 +45,8 @@ public class ServerCommandListener implements ICommandListener {
     public ChunkCoordinates b() {
         return new ChunkCoordinates(0, 0, 0);
     }
+
+    public World f_() {
+        return null;
+    }
 }