From eefb113b4cb7918b7492619a494c3f3db1af1caf Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Fri, 22 Jan 2016 12:42:04 +0100 Subject: [PATCH] use uuid-1345 instead of 3 uuid packages, fix #297 --- package.json | 2 -- src/createClient.js | 4 ++-- src/datatypes/minecraft.js | 7 ++++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index fa9508a..fd3abd5 100644 --- a/package.json +++ b/package.json @@ -44,12 +44,10 @@ "dependencies": { "buffer-equal": "0.0.1", "minecraft-data": "^0.16.1", - "node-uuid": "~1.4.1", "prismarine-nbt": "0.1.0", "protodef": "0.2.5", "readable-stream": "^1.1.0", "ursa-purejs": "0.0.3", - "uuid": "^2.0.1", "uuid-1345": "^0.99.6", "yggdrasil": "0.1.0" }, diff --git a/src/createClient.js b/src/createClient.js index 8867249..83dc1b7 100644 --- a/src/createClient.js +++ b/src/createClient.js @@ -8,7 +8,7 @@ var yggdrasil = require('yggdrasil')({}); var yggserver = require('yggdrasil').server({}); var states = require("./states"); var debug = require("./debug"); -var uuid = require('uuid'); +var UUID = require('uuid-1345'); module.exports=createClient; @@ -31,7 +31,7 @@ function createClient(options) { assert.ok(options, "options is required"); var port = options.port || 25565; var host = options.host || 'localhost'; - var clientToken = options.clientToken || uuid.v4(); + var clientToken = options.clientToken || UUID.v4().toString(); var accessToken; assert.ok(options.username, "username is required"); diff --git a/src/datatypes/minecraft.js b/src/datatypes/minecraft.js index 2b89b46..956212f 100644 --- a/src/datatypes/minecraft.js +++ b/src/datatypes/minecraft.js @@ -1,5 +1,5 @@ var nbt = require('prismarine-nbt'); -var uuid = require('node-uuid'); +var UUID = require('uuid-1345'); module.exports = { 'UUID': [readUUID, writeUUID, 16], @@ -11,13 +11,14 @@ module.exports = { function readUUID(buffer, offset) { return { - value: uuid.unparse(buffer, offset), + value: UUID.stringify(buffer.slice(offset,16)), size: 16 }; } function writeUUID(value, buffer, offset) { - uuid.parse(value, buffer, offset); + var buf=UUID.parse(value); + buf.copy(buffer,offset); return offset + 16; }