AstralTransRocketries/node-minecraft-protocol
1
0
Fork 0
mirror of https://github.com/unmojang/node-minecraft-protocol.git synced 2025-09-29 06:03:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update client/forgeHandshake.js to be installable as module

Browse Source
This commit is contained in:
deathcap 2016-01-27 20:42:15 -08:00
parent 0ab5b6150d
commit 069a79ba3e
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/client_forge/client_forge.js
View File

@ -1,5 +1,5 @@
var mc = require('minecraft-protocol'); var mc = require('minecraft-protocol');
var fml = require('../../dist/client/forgeHandshake'); // TODO: separate module var forgeHandshake = require('../../dist/client/forgeHandshake'); // TODO: what's with 'dist' here?
if(process.argv.length < 4 || process.argv.length > 6) { if(process.argv.length < 4 || process.argv.length > 6) {
console.log("Usage : node echo.js <host> <port> [<name>] [<password>]"); console.log("Usage : node echo.js <host> <port> [<name>] [<password>]");
@ -25,18 +25,13 @@ mc.ping({host, port}, function(err, response) {
console.log('Using forgeMods:',forgeMods); console.log('Using forgeMods:',forgeMods);
var client = mc.createClient({ var client = mc.createClient({
tagHost: '\0FML\0', // signifies client supports FML/Forge tagHost: '\0FML\0', // passed to src/client/setProtocol.js, signifies client supports FML/Forge TODO: refactor into src/client/forgeHandshake.js, let it set it, but earliest enough(pause)
// Client/server mods installed on the client
// if not specified, pings server and uses its list
/*
forgeMods:
*/
host: host, host: host,
port: port, port: port,
username: username, username: username,
password: password password: password
}); });
client.forgeMods = forgeMods; // for fmlHandshakeStep TODO: refactor forgeHandshake(client, {forgeMods});
client.on('connect', function() { client.on('connect', function() {
console.info('connected'); console.info('connected');
@ -57,13 +52,6 @@ mc.ping({host, port}, function(err, response) {
} }
}); });
client.on('custom_payload', function(packet) {
// TODO: channel registration tracking in NMP, https://github.com/PrismarineJS/node-minecraft-protocol/pull/328
if (packet.channel === 'FML|HS') {
fml.fmlHandshakeStep(client, packet.data);
}
});
client.on('forgeMods', function(mods) { client.on('forgeMods', function(mods) {
console.log('Received forgeMods event:',mods); console.log('Received forgeMods event:',mods);
}); });

13
src/client/forgeHandshake.js
View File

@ -172,7 +172,7 @@ var FMLHandshakeClientState = {
COMPLETE: 5, COMPLETE: 5,
}; };
function fmlHandshakeStep(client, data) function fmlHandshakeStep(client, data, options)
{ {
var parsed = proto.parsePacketBuffer('FML|HS', data); var parsed = proto.parsePacketBuffer('FML|HS', data);
debug('FML|HS',parsed); debug('FML|HS',parsed);
@ -205,7 +205,7 @@ function fmlHandshakeStep(client, data)
debug('Sending client modlist'); debug('Sending client modlist');
var modList = proto.createPacketBuffer('FML|HS', { var modList = proto.createPacketBuffer('FML|HS', {
discriminator: 'ModList', discriminator: 'ModList',
mods: client.forgeMods || [] mods: options.forgeMods || []
}); });
client.write('custom_payload', { client.write('custom_payload', {
channel: 'FML|HS', channel: 'FML|HS',
@ -263,6 +263,11 @@ function fmlHandshakeStep(client, data)
} }
} }
module.exports = { module.exports = function(client, options) {
fmlHandshakeStep client.on('custom_payload', function(packet) {
// TODO: channel registration tracking in NMP, https://github.com/PrismarineJS/node-minecraft-protocol/pull/328
if (packet.channel === 'FML|HS') {
fmlHandshakeStep(client, packet.data, options);
}
});
}; };