diff --git a/data/protocol.json b/data/protocol.json index 4a56eb3..eabfec7 100644 --- a/data/protocol.json +++ b/data/protocol.json @@ -6,6 +6,12 @@ "countType":"i16" } ], + "lstring": [ + "pstring", + { + "countType":"li16" + } + ], "shapeless_recipe": [ "container", [ @@ -221,26 +227,39 @@ { "compareTo": "$compareTo", "fields": { - "0": "i8", - "1": "i16", - "2": "i32", - "3": "f32", - "4": "string", - "5": "slot", + "0": "li8", + "1": "li16", + "2": "li32", + "3": "lf32", + "4": "lstring", + "5": ["container",[ + { + "name":"blockId", + "type":"li16" + }, + { + "name":"itemCount", + "type":"li8" + }, + { + "name":"itemDamage", + "type":"li16" + } + ]], "6": [ "container", [ { "name": "x", - "type": "i32" + "type": "li32" }, { "name": "y", - "type": "i32" + "type": "li32" }, { "name": "z", - "type": "i32" + "type": "li32" } ] ], @@ -249,19 +268,19 @@ [ { "name": "pitch", - "type": "f32" + "type": "lf32" }, { "name": "yaw", - "type": "f32" + "type": "lf32" }, { "name": "roll", - "type": "f32" + "type": "lf32" } ] ], - "8": "i64" + "8": "li64" } } ], diff --git a/package.json b/package.json index 5cbaa4b..489bbcb 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,9 @@ ], "license": "MIT", "dependencies": { - "prismarine-nbt": "^0.2.2", + "prismarine-nbt": "^1.0.0", "protodef": "^1.2.0", - "raknet": "^1.6.2", + "raknet": "^1.6.4", "uuid-1345": "^0.99.6" }, "devDependencies": {}, diff --git a/src/datatypes/minecraft.js b/src/datatypes/minecraft.js index ee49bf9..53f8fe2 100644 --- a/src/datatypes/minecraft.js +++ b/src/datatypes/minecraft.js @@ -19,15 +19,15 @@ function writeUUID(value, buffer, offset) { } function readNbt(buffer, offset) { - return nbt.proto.read(buffer,offset,"nbt"); + return nbt.protoLE.read(buffer,offset,"nbt"); } function writeNbt(value, buffer, offset) { - return nbt.proto.write(value,buffer,offset,"nbt"); + return nbt.protoLE.write(value,buffer,offset,"nbt"); } function sizeOfNbt(value) { - return nbt.proto.sizeOf(value,"nbt"); + return nbt.protoLE.sizeOf(value,"nbt"); } function readEntityMetadata(buffer, offset, _ref) {