diff --git a/package.json b/package.json index bde7622..e9c4d83 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "lodash.merge": "^4.3.0", "minecraft-data": "^2.14.0", "prismarine-nbt": "^1.0.0", - "protodef": "^1.3.0", + "protodef": "^1.5.1", "readable-stream": "^2.0.5", "ursa-purejs": "^0.0.3", "uuid-1345": "^0.99.6", diff --git a/src/transforms/serializer.js b/src/transforms/serializer.js index 5f8e9be..35f1a09 100644 --- a/src/transforms/serializer.js +++ b/src/transforms/serializer.js @@ -9,15 +9,6 @@ const states = require("../states"); const merge=require("lodash.merge"); const get=require("lodash.get"); -function recursiveAddTypes(protocol,protocolData,path) -{ - if(protocolData===undefined) - return; - if(protocolData.types) - protocol.addTypes(protocolData.types); - recursiveAddTypes(protocol,get(protocolData,path.shift()),path); -} - const protocols={}; function createProtocol(state,direction,version,customPackets) @@ -25,10 +16,10 @@ function createProtocol(state,direction,version,customPackets) const key=state+";"+direction+";"+version; if(protocols[key]) return protocols[key]; - const proto = new ProtoDef(); + const proto = new ProtoDef(false); proto.addTypes(minecraft); const mcData=require("minecraft-data")(version); - recursiveAddTypes(proto,merge(mcData.protocol,get(customPackets,[mcData.version.majorVersion])),[state,direction]); + proto.addProtocol(merge(mcData.protocol,get(customPackets,[mcData.version.majorVersion])),[state,direction]); protocols[key]=proto; return proto; }