AstralTransRocketries/node-minecraft-protocol
1
0
Fork 0
mirror of https://github.com/unmojang/node-minecraft-protocol.git synced 2025-09-30 14:41:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

transform play numerical ids to names, remove most entity metadata test values for compatibility

Browse Source
This commit is contained in:
Romain Beaumont 2015-09-12 20:04:25 +02:00
parent 498d9f2c81
commit 9804d0983b
4 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/createClient.js
View File

@ -45,7 +45,7 @@ function createClient(options) {
var client = new Client(false); var client = new Client(false);
client.on('connect', onConnect); client.on('connect', onConnect);
if(keepAlive) client.on([states.PLAY, 0x00], onKeepAlive); if(keepAlive) client.on('keep_alive', onKeepAlive);
client.once([states.LOGIN, 0x01], onEncryptionKeyRequest); client.once([states.LOGIN, 0x01], onEncryptionKeyRequest);
client.once([states.LOGIN, 0x02], onLogin); client.once([states.LOGIN, 0x02], onLogin);
client.once("compress", onCompressionRequest); client.once("compress", onCompressionRequest);

4
src/createServer.js
View File

@ -64,7 +64,7 @@ function createServer(options) {
client.end('KeepAliveTimeout'); client.end('KeepAliveTimeout');
return; return;
} }
client.write(0x00, { client.write('keep_alive', {
keepAliveId: Math.floor(Math.random() * 2147483648) keepAliveId: Math.floor(Math.random() * 2147483648)
}); });
} }
@ -77,7 +77,7 @@ function createServer(options) {
keepAlive = true; keepAlive = true;
lastKeepAlive = new Date(); lastKeepAlive = new Date();
keepAliveTimer = setInterval(keepAliveLoop, checkTimeoutInterval); keepAliveTimer = setInterval(keepAliveLoop, checkTimeoutInterval);
client.on(0x00, onKeepAlive); client.on('keep_alive', onKeepAlive);
} }
function onEnd() { function onEnd() {

2
src/server.js
View File

@ -26,7 +26,7 @@ Server.prototype.listen = function(port, host) {
client._end = client.end; client._end = client.end;
client.end = function end(endReason) { client.end = function end(endReason) {
if(client.state === states.PLAY) { if(client.state === states.PLAY) {
client.write(0x40, {reason: endReason}); client.write('kick_disconnect', {reason: endReason});
} else if(client.state === states.LOGIN) { } else if(client.state === states.LOGIN) {
client.write(0x00, {reason: endReason}); client.write(0x00, {reason: endReason});
} }

43
test/test.js
View File

@ -115,14 +115,7 @@ var values = {
}, },
'long': [0, 1], 'long': [0, 1],
'entityMetadata': [ 'entityMetadata': [
{key: 17, value: 0, type: 0}, {key: 17, value: 0, type: 0}
{key: 0, value: 257, type: 1},
{key: 16, value: 626, type: 2},
{key: 1, value: 0.15, type: 3},
{key: 19, value: "Some string", type: 4},
//{key: 18, value: {}, type: 5}, Slot is a pain, I'll do it later
{key: 18, value: { x: 0, y: 0, z: 0 }, type: 6},
{key: 18, value: { pitch: 0.5, yaw: 0.7, roll: 12.4 }, type: 7},
], ],
'objectData': { 'objectData': {
intField: 9, intField: 9,
@ -408,7 +401,7 @@ describe("client", function() {
assert.strictEqual(packet.difficulty, 1); assert.strictEqual(packet.difficulty, 1);
assert.strictEqual(packet.dimension, 0); assert.strictEqual(packet.dimension, 0);
assert.strictEqual(packet.gameMode, 0); assert.strictEqual(packet.gameMode, 0);
client.write(0x01, { client.write('chat', {
message: "hello everyone; I have logged in." message: "hello everyone; I have logged in."
}); });
}); });
@ -460,12 +453,12 @@ describe("client", function() {
var client = mc.createClient({ var client = mc.createClient({
username: 'Player', username: 'Player',
}); });
client.on([states.PLAY, 0x01], function(packet) { client.on("login", function(packet) {
client.write(0x01, { client.write("chat", {
message: "hello everyone; I have logged in." message: "hello everyone; I have logged in."
}); });
}); });
client.on([states.PLAY, 0x02], function(packet) { client.on("chat", function(packet) {
var message = JSON.parse(packet.message); var message = JSON.parse(packet.message);
assert.strictEqual(message.translate, "chat.type.text"); assert.strictEqual(message.translate, "chat.type.text");
/*assert.deepEqual(message["with"][0], { /*assert.deepEqual(message["with"][0], {
@ -598,7 +591,7 @@ describe("mc-server", function() {
broadcast(client.username + ' left the game.', client); broadcast(client.username + ' left the game.', client);
if(client.username === 'player2') server.close(); if(client.username === 'player2') server.close();
}); });
client.write(0x01, { client.write('login', {
entityId: client.id, entityId: client.id,
levelType: 'default', levelType: 'default',
gameMode: 1, gameMode: 1,
@ -607,7 +600,7 @@ describe("mc-server", function() {
maxPlayers: server.maxPlayers, maxPlayers: server.maxPlayers,
reducedDebugInfo: 0 reducedDebugInfo: 0
}); });
client.on([states.PLAY, 0x01], function(packet) { client.on('chat', function(packet) {
var message = '<' + client.username + '>' + ' ' + packet.message; var message = '<' + client.username + '>' + ' ' + packet.message;
broadcast(message); broadcast(message);
}); });
@ -615,32 +608,32 @@ describe("mc-server", function() {
server.on('close', done); server.on('close', done);
server.on('listening', function() { server.on('listening', function() {
var player1 = mc.createClient({username: 'player1', host: '127.0.0.1'}); var player1 = mc.createClient({username: 'player1', host: '127.0.0.1'});
player1.on([states.PLAY, 0x01], function(packet) { player1.on('login', function(packet) {
assert.strictEqual(packet.gameMode, 1); assert.strictEqual(packet.gameMode, 1);
assert.strictEqual(packet.levelType, 'default'); assert.strictEqual(packet.levelType, 'default');
assert.strictEqual(packet.dimension, 0); assert.strictEqual(packet.dimension, 0);
assert.strictEqual(packet.difficulty, 2); assert.strictEqual(packet.difficulty, 2);
player1.once(0x02, function(packet) { player1.once('chat', function(packet) {
assert.strictEqual(packet.message, '{"text":"player2 joined the game."}'); assert.strictEqual(packet.message, '{"text":"player2 joined the game."}');
player1.once(0x02, function(packet) { player1.once('chat', function(packet) {
assert.strictEqual(packet.message, '{"text":"<player2> hi"}'); assert.strictEqual(packet.message, '{"text":"<player2> hi"}');
player2.once(0x02, fn); player2.once('chat', fn);
function fn(packet) { function fn(packet) {
if(/<player2>/.test(packet.message)) { if(/<player2>/.test(packet.message)) {
player2.once(0x02, fn); player2.once('chat', fn);
return; return;
} }
assert.strictEqual(packet.message, '{"text":"<player1> hello"}'); assert.strictEqual(packet.message, '{"text":"<player1> hello"}');
player1.once(0x02, function(packet) { player1.once('chat', function(packet) {
assert.strictEqual(packet.message, '{"text":"player2 left the game."}'); assert.strictEqual(packet.message, '{"text":"player2 left the game."}');
player1.end(); player1.end();
}); });
player2.end(); player2.end();
} }
player1.write(0x01, {message: "hello"}); player1.write('chat', {message: "hello"});
}); });
player2.write(0x01, {message: "hi"}); player2.write('chat', {message: "hi"});
}); });
var player2 = mc.createClient({username: 'player2', host: '127.0.0.1'}); var player2 = mc.createClient({username: 'player2', host: '127.0.0.1'});
}); });
@ -652,7 +645,7 @@ describe("mc-server", function() {
if(!server.clients.hasOwnProperty(clientId)) continue; if(!server.clients.hasOwnProperty(clientId)) continue;
client = server.clients[clientId]; client = server.clients[clientId];
if(client !== exclude) client.write(0x02, {message: JSON.stringify({text: message}), position: 0}); if(client !== exclude) client.write('chat', {message: JSON.stringify({text: message}), position: 0});
} }
} }
}); });
@ -692,7 +685,7 @@ describe("mc-server", function() {
assert.strictEqual(reason, 'ServerShutdown'); assert.strictEqual(reason, 'ServerShutdown');
resolve(); resolve();
}); });
client.write(0x01, { client.write('login', {
entityId: client.id, entityId: client.id,
levelType: 'default', levelType: 'default',
gameMode: 1, gameMode: 1,
@ -707,7 +700,7 @@ describe("mc-server", function() {
}); });
server.on('listening', function() { server.on('listening', function() {
var client = mc.createClient({username: 'lalalal', host: '127.0.0.1'}); var client = mc.createClient({username: 'lalalal', host: '127.0.0.1'});
client.on([states.PLAY, 0x01], function() { client.on('login', function() {
server.close(); server.close();
}); });
}); });