From 62e66be053990d1578ede16f5e58aefd390195b1 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Thu, 3 Jan 2013 21:42:35 -0500
Subject: [PATCH] writePacket -> write

---
 README.md                            |  7 +++----
 examples/{echo.js => client_echo.js} |  2 +-
 index.js                             | 14 +++++++-------
 test/test.js                         |  6 +++---
 4 files changed, 14 insertions(+), 15 deletions(-)
 rename examples/{echo.js => client_echo.js} (91%)

diff --git a/README.md b/README.md
index cf914ec..90c2ac2 100644
--- a/README.md
+++ b/README.md
@@ -25,9 +25,7 @@ Supports Minecraft version 1.4.7pre
 
 ## Usage
 
-### Echo example
-
-Listen for chat messages and echo them back.
+### Echo client example
 
 ```js
 var mc = require('minecraft-protocol');
@@ -39,8 +37,9 @@ var client = mc.createClient({
   password: "12345678",       // online-mode=true servers
 });
 client.on(0x03, function(packet) {
+  // Listen for chat messages and echo them back.
   if (packet.message.indexOf(client.session.username) !== -1) return;
-  client.writePacket(0x03, {
+  client.write(0x03, {
     message: packet.message,
   });
 });
diff --git a/examples/echo.js b/examples/client_echo.js
similarity index 91%
rename from examples/echo.js
rename to examples/client_echo.js
index 35d29b8..1b2b05f 100644
--- a/examples/echo.js
+++ b/examples/client_echo.js
@@ -14,5 +14,5 @@ client.on(0x03, function(packet) {
   var username = match[1];
   var msg = match[2];
   if (username === client.username) return;
-  client.writePacket(0x03, {message: msg});
+  client.write(0x03, {message: msg});
 });
diff --git a/index.js b/index.js
index c1afa4d..b2989e3 100644
--- a/index.js
+++ b/index.js
@@ -26,7 +26,7 @@ function createClient(options) {
   var client = new Client();
   client.username = options.username;
   client.on('connect', function() {
-    client.writePacket(0x02, {
+    client.write(0x02, {
       protocolVersion: packets.meta.protocolVersion,
       username: options.username,
       serverHost: host,
@@ -34,14 +34,14 @@ function createClient(options) {
     });
   });
   client.on(0x00, onKeepAlive);
-  client.on(0xFC, onEncryptionKeyResponse);
-  client.on(0xFD, onEncryptionKeyRequest);
+  client.once(0xFC, onEncryptionKeyResponse);
+  client.once(0xFD, onEncryptionKeyRequest);
   client.connect(port, host);
 
   return client;
 
   function onKeepAlive(packet) {
-    client.writePacket(0x00, {
+    client.write(0x00, {
       keepAliveId: packet.keepAliveId
     });
   }
@@ -120,7 +120,7 @@ function createClient(options) {
         var encryptedVerifyTokenBuffer = new Buffer(encryptedVerifyToken, 'base64');
         client.cipher = crypto.createCipheriv('aes-128-cfb8', sharedSecret, sharedSecret);
         client.decipher = crypto.createDecipheriv('aes-128-cfb8', sharedSecret, sharedSecret);
-        client.writePacket(0xfc, {
+        client.write(0xfc, {
           sharedSecret: encryptedSharedSecretBuffer,
           verifyToken: encryptedVerifyTokenBuffer,
         });
@@ -132,7 +132,7 @@ function createClient(options) {
     assert.strictEqual(packet.sharedSecret.length, 0);
     assert.strictEqual(packet.verifyToken.length, 0);
     client.encryptionEnabled = true;
-    client.writePacket(0xcd, { payload: 0 });
+    client.write(0xcd, { payload: 0 });
   }
 }
 
@@ -179,7 +179,7 @@ Client.prototype.end = function() {
   this.socket.end();
 };
 
-Client.prototype.writePacket = function(packetId, params) {
+Client.prototype.write = function(packetId, params) {
   var buffer = createPacketBuffer(packetId, params);
   var out = this.encryptionEnabled ? new Buffer(this.cipher.update(buffer), 'binary') : buffer;
   this.socket.write(out);
diff --git a/test/test.js b/test/test.js
index c7803d1..821bafc 100644
--- a/test/test.js
+++ b/test/test.js
@@ -128,7 +128,7 @@ describe("minecraft protocol", function() {
         assert.strictEqual(packet.difficulty, 1);
         assert.strictEqual(packet.dimension, 0);
         assert.strictEqual(packet.gameMode, 0);
-        client.writePacket(0x03, {
+        client.write(0x03, {
           message: "hello everyone; I have logged in."
         });
       });
@@ -162,7 +162,7 @@ describe("minecraft protocol", function() {
           assert.strictEqual(packet.difficulty, 1);
           assert.strictEqual(packet.dimension, 0);
           assert.strictEqual(packet.gameMode, 0);
-          client.writePacket(0x03, {
+          client.write(0x03, {
             message: "hello everyone; I have logged in."
           });
       });
@@ -200,7 +200,7 @@ describe("minecraft protocol", function() {
         username: process.env.MC_USERNAME,
       });
       client.on(0x01, function(packet) {
-        client.writePacket(0x03, {
+        client.write(0x03, {
           message: "hello everyone; I have logged in."
         });
       });