From 3d3916bb937424ae1c55eca8da32fbf351e60e0a Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Sun, 26 Feb 2017 19:46:17 +0100 Subject: [PATCH 1/5] some fixes for last protodef --- package.json | 2 +- src/client/pluginChannels.js | 2 +- src/transforms/serializer.js | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0ace9ce..15fc393 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "lodash.merge": "^4.3.0", "minecraft-data": "^2.11.0", "prismarine-nbt": "^1.0.0", - "protodef": "^1.2.3", + "protodef": "^1.3.0", "readable-stream": "^2.0.5", "ursa-purejs": "^0.0.3", "uuid-1345": "^0.99.6", diff --git a/src/client/pluginChannels.js b/src/client/pluginChannels.js index 92500ae..4b8b87a 100644 --- a/src/client/pluginChannels.js +++ b/src/client/pluginChannels.js @@ -7,7 +7,7 @@ module.exports = function(client, options) { var proto = new ProtoDef(); proto.addTypes(mcdata.protocol.types); proto.addTypes(minecraft); - proto.addTypes({'registerarr': [readDumbArr, writeDumbArr, sizeOfDumbArr]}); + proto.addType('registerarr',[readDumbArr, writeDumbArr, sizeOfDumbArr]); client.registerChannel = registerChannel; client.unregisterChannel = unregisterChannel; diff --git a/src/transforms/serializer.js b/src/transforms/serializer.js index d5dcafa..5f8e9be 100644 --- a/src/transforms/serializer.js +++ b/src/transforms/serializer.js @@ -18,12 +18,18 @@ function recursiveAddTypes(protocol,protocolData,path) recursiveAddTypes(protocol,get(protocolData,path.shift()),path); } +const protocols={}; + function createProtocol(state,direction,version,customPackets) { + const key=state+";"+direction+";"+version; + if(protocols[key]) + return protocols[key]; const proto = new ProtoDef(); proto.addTypes(minecraft); const mcData=require("minecraft-data")(version); recursiveAddTypes(proto,merge(mcData.protocol,get(customPackets,[mcData.version.majorVersion])),[state,direction]); + protocols[key]=proto; return proto; } From ce1ee7d7e35652907a2e99dc676b99aa74c445f2 Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Sun, 26 Feb 2017 19:48:37 +0100 Subject: [PATCH 2/5] Release 1.1.2 --- HISTORY.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index bd486a2..9e6bd2d 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ # History +## 1.1.2 + +* use last protodef + ## 1.1.1 * update to yggdrasil 0.2.0 diff --git a/package.json b/package.json index 15fc393..90ee069 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "minecraft-protocol", - "version": "1.1.1", + "version": "1.1.2", "description": "Parse and serialize minecraft packets, plus authentication and encryption.", "main": "index.js", "repository": { From 3ff7ac64c12f4bc99d2605c7527e7518ac2b3502 Mon Sep 17 00:00:00 2001 From: deathcap Date: Tue, 16 Feb 2016 23:13:23 -0800 Subject: [PATCH 3/5] Remove babel/gulp in favor of native ES6 --- .gitignore | 1 - browser.js | 1 - circle.yml | 2 +- gulpfile.js | 31 ------------------------------- index.js | 1 - package.json | 14 ++++---------- 6 files changed, 5 insertions(+), 45 deletions(-) delete mode 100644 browser.js delete mode 100644 gulpfile.js delete mode 100644 index.js diff --git a/.gitignore b/.gitignore index 45981f3..be85d62 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ node_modules test/npm-debug.log test/server -dist/ diff --git a/browser.js b/browser.js deleted file mode 100644 index e696e23..0000000 --- a/browser.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('./dist/browser.js'); diff --git a/circle.yml b/circle.yml index 824c958..d4c5f41 100644 --- a/circle.yml +++ b/circle.yml @@ -2,7 +2,7 @@ machine: environment: MC_SERVER_JAR_DIR: /home/ubuntu/node-minecraft-protocol/minecraft-server/ node: - version: 4 + version: 6 java: version: openjdk7 dependencies: diff --git a/gulpfile.js b/gulpfile.js deleted file mode 100644 index d3e62ff..0000000 --- a/gulpfile.js +++ /dev/null @@ -1,31 +0,0 @@ -var gulp = require('gulp'); - -var plumber = require('gulp-plumber'); -var babel = require('gulp-babel'); -var options = { - presets: ['es2015'] -}; - -var sourcemaps = require('gulp-sourcemaps'); - -gulp.task('compile', function() { - return gulp - .src('src/**/*.js') - .pipe(plumber({ - errorHandler: function(err) { - console.error(err.stack); - this.emit('end'); - } - })) - .pipe(sourcemaps.init()) - .pipe(babel(options)) - .pipe(plumber.stop()) - .pipe(sourcemaps.write('maps/')) - .pipe(gulp.dest('dist/')); -}); - -gulp.task('watch', function() { - return gulp.watch('src/**/*.js', ['compile']); -}); - -gulp.task('default', ['compile']); diff --git a/index.js b/index.js deleted file mode 100644 index f843a90..0000000 --- a/index.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('./dist/index.js'); diff --git a/package.json b/package.json index 90ee069..c878bc6 100644 --- a/package.json +++ b/package.json @@ -2,13 +2,13 @@ "name": "minecraft-protocol", "version": "1.1.2", "description": "Parse and serialize minecraft packets, plus authentication and encryption.", - "main": "index.js", + "main": "src/index.js", "repository": { "type": "git", "url": "git://github.com/PrismarineJS/node-minecraft-protocol.git" }, "scripts": { - "prepublish": "gulp && require-self", + "prepublish": "require-self", "test": "mocha --recursive --reporter spec" }, "keywords": [ @@ -26,20 +26,14 @@ "engines": { "node": ">=4" }, - "browser": "browser.js", + "browser": "src/browser.js", "devDependencies": { - "babel-preset-es2015": "^6.3.13", "espower-loader": "^1.0.0", - "gulp": "^3.9.0", - "gulp-babel": "^6.1.1", - "gulp-plumber": "^1.0.1", - "gulp-sourcemaps": "^2.0.0", "intelli-espower-loader": "^1.0.0", "minecraft-wrap": "^1.0.0", "mocha": "^3.0.2", "power-assert": "^1.0.0", - "require-self": "^0.1.0", - "source-map-support": "^0.4.0" + "require-self": "^0.1.0" }, "dependencies": { "buffer-equal": "^1.0.0", From c72d0373e87d12e03a84fd1d6308e23a2f3d822b Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Sun, 26 Feb 2017 19:59:56 +0100 Subject: [PATCH 4/5] requires node 6 in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c878bc6..228c2cb 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "author": "Andrew Kelley", "license": "BSD-3-Clause", "engines": { - "node": ">=4" + "node": ">=6" }, "browser": "src/browser.js", "devDependencies": { From 1683d212147f6dba1123e51e3e62e57c719df8c9 Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Sun, 26 Feb 2017 20:07:51 +0100 Subject: [PATCH 5/5] Release 1.1.3 --- HISTORY.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 9e6bd2d..2657248 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ # History +## 1.1.3 + +* requires node 6 + ## 1.1.2 * use last protodef diff --git a/package.json b/package.json index 228c2cb..d752d5c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "minecraft-protocol", - "version": "1.1.2", + "version": "1.1.3", "description": "Parse and serialize minecraft packets, plus authentication and encryption.", "main": "src/index.js", "repository": {