diff --git a/examples/client_echo.js b/examples/client_echo.js index e456f9e..2657f75 100644 --- a/examples/client_echo.js +++ b/examples/client_echo.js @@ -4,13 +4,14 @@ var client = mc.createClient({ password: process.env.MC_PASSWORD, }); client.on('connect', function() { - console.info("connected"); + console.info('connected'); }); client.on(0x03, function(packet) { - var match = packet.message.match(/^<(.+?)> (.*)$/); - if (! match) return; - var username = match[1]; - var msg = match[2]; - if (username === client.username) return; - client.write(0x03, {message: msg}); + var jsonMsg = JSON.parse(packet.message); + if (jsonMsg.translate == 'chat.type.announcement' || jsonMsg.translate == 'chat.type.text') { + var username = jsonMsg.using[0]; + var msg = jsonMsg.using[1]; + if (username === client.username) return; + client.write(0x03, {message: msg}); + } }); diff --git a/examples/server.js b/examples/server.js index a19b781..4a28371 100644 --- a/examples/server.js +++ b/examples/server.js @@ -42,23 +42,34 @@ server.on('login', function(client) { client.on(0x03, function(data) { var message = '<'+client.username+'>' + ' ' + data.message; - broadcast(message); + broadcast(message, client, client.username); console.log(message); }); }); server.on('error', function(error) { - console.log('Error:', error); + console.log('Error:', error); }); server.on('listening', function() { - console.log('Server listening on port', server.socketServer.address().port); + console.log('Server listening on port', server.socketServer.address().port); }); -function broadcast(message, exclude) { - var client; +function broadcast(message, exclude, username) { + var client, translate, username; + translate = username ? 'chat.type.announcement' : 'chat.type.text'; + username = username || 'Server'; for (var clientId in server.clients) { client = server.clients[clientId]; - if (client !== exclude) client.write(0x03, { message: message }); + if (client !== exclude) { + var msg = { + translate: translate, + using: [ + username, + 'Hello, world!' + ] + }; + client.write(0x03, { message: JSON.stringify(msg) }); + } } } diff --git a/examples/server_helloworld.js b/examples/server_helloworld.js index 6fd19ce..ed7191c 100644 --- a/examples/server_helloworld.js +++ b/examples/server_helloworld.js @@ -33,13 +33,20 @@ server.on('login', function(client) { onGround: true }); - client.write(0x03, { message: 'Hello, world!' }); + var msg = { + translate: 'chat.type.announcement', + using: [ + 'Server', + 'Hello, world!' + ] + }; + client.write(0x03, { message: JSON.stringify(msg) }); }); server.on('error', function(error) { - console.log('Error:', error); + console.log('Error:', error); }); server.on('listening', function() { - console.log('Server listening on port', server.socketServer.address().port); + console.log('Server listening on port', server.socketServer.address().port); });