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

Merge pull request #324 from rom1504/one_uuid

Browse Source 
use uuid-1345 instead of 3 uuid packages, fix #297
This commit is contained in:
Romain Beaumont 2016-01-22 12:46:44 +01:00
commit fbbfd40bc6
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -44,12 +44,10 @@
"dependencies": { "dependencies": {
"buffer-equal": "0.0.1", "buffer-equal": "0.0.1",
"minecraft-data": "^0.16.1", "minecraft-data": "^0.16.1",
"node-uuid": "~1.4.1",
"prismarine-nbt": "0.1.0", "prismarine-nbt": "0.1.0",
"protodef": "0.2.5", "protodef": "0.2.5",
"readable-stream": "^1.1.0", "readable-stream": "^1.1.0",
"ursa-purejs": "0.0.3", "ursa-purejs": "0.0.3",
"uuid": "^2.0.1",
"uuid-1345": "^0.99.6", "uuid-1345": "^0.99.6",
"yggdrasil": "0.1.0" "yggdrasil": "0.1.0"
}, },

4
src/createClient.js
View File

@ -8,7 +8,7 @@ var yggdrasil = require('yggdrasil')({});
var yggserver = require('yggdrasil').server({}); var yggserver = require('yggdrasil').server({});
var states = require("./states"); var states = require("./states");
var debug = require("./debug"); var debug = require("./debug");
var uuid = require('uuid'); var UUID = require('uuid-1345');
module.exports=createClient; module.exports=createClient;
@ -31,7 +31,7 @@ function createClient(options) {
assert.ok(options, "options is required"); assert.ok(options, "options is required");
var port = options.port || 25565; var port = options.port || 25565;
var host = options.host || 'localhost'; var host = options.host || 'localhost';
var clientToken = options.clientToken || uuid.v4(); var clientToken = options.clientToken || UUID.v4().toString();
var accessToken; var accessToken;
assert.ok(options.username, "username is required"); assert.ok(options.username, "username is required");

7
src/datatypes/minecraft.js
View File

@ -1,5 +1,5 @@
var nbt = require('prismarine-nbt'); var nbt = require('prismarine-nbt');
var uuid = require('node-uuid'); var UUID = require('uuid-1345');
module.exports = { module.exports = {
'UUID': [readUUID, writeUUID, 16], 'UUID': [readUUID, writeUUID, 16],
@ -11,13 +11,14 @@ module.exports = {
function readUUID(buffer, offset) { function readUUID(buffer, offset) {
return { return {
value: uuid.unparse(buffer, offset), value: UUID.stringify(buffer.slice(offset,16)),
size: 16 size: 16
}; };
} }
function writeUUID(value, buffer, offset) { function writeUUID(value, buffer, offset) {
uuid.parse(value, buffer, offset); var buf=UUID.parse(value);
buf.copy(buffer,offset);
return offset + 16; return offset + 16;
} }