Merge branch 'master' into dependabot/npm_and_yarn/got-14.0.0

.github/workflows/ci.yml

@@ -11,16 +11,12 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-version: [12.x]
-
     steps:
     - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
+    - name: Use Node.js 18.x
       uses: actions/setup-node@v1
       with:
-        node-version: ${{ matrix.node-version }}
+        node-version: 18.x
     - run: npm install
     - run: npm test
 
@@ -36,10 +32,11 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v1
       with:
-        node-version: 14.x
-    - uses: actions/setup-java@v1
+        node-version: 18.x
+    - name: Setup Java JDK
+      uses: actions/[email protected]
       with:
-        java-version: 1.8
+        java-version: 17
         java-package: jre
     - run: npm install
     - name: Use Dumper

.github/workflows/make-comment.yml

@@ -20,7 +20,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v1
       with:
-        node-version: 14.x
+        node-version: 18.x
     - name: Download artifact
       uses: dawidd6/action-download-artifact@v2
       with:

.github/workflows/pr-workflow.yml

@@ -29,10 +29,11 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v1
       with:
-        node-version: 14.x
-    - uses: actions/setup-java@v1
+        node-version: 18.x
+    - name: Setup Java JDK
+      uses: actions/[email protected]
       with:
-        java-version: 1.8
+        java-version: 17
         java-package: jre
     - run: npm install
     - name: Use Dumper

.github/workflows/publish.yml

@@ -13,13 +13,20 @@ jobs:
     - name: Set up Node.js
       uses: actions/setup-node@master
       with:
-        node-version: 10.0.0
-    - name: Publish if version has been updated
-      uses: pascalgn/npm-publish-action@4f4bf159e299f65d21cd1cbd96fc5d53228036df
-      with: # All of theses inputs are optional
-        tag_name: "%s"
-        tag_message: "%s"
-        commit_pattern: "^Release (\\S+)"
-      env: # More info about the environment variables in the README
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Leave this as is, it's automatically generated
-        NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} # You need to set this in your repo settings
+        node-version: 18.0.0
+    - id: publish
+      uses: JS-DevTools/npm-publish@v1
+      with:
+        token: ${{ secrets.NPM_AUTH_TOKEN }}
+    - name: Create Release
+      if: steps.publish.outputs.type != 'none'
+      id: create_release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ steps.publish.outputs.version }}
+        release_name: Release ${{ steps.publish.outputs.version }}
+        body: ${{ steps.publish.outputs.version }}
+        draft: false
+        prerelease: false

HISTORY.md

@@ -1,5 +1,21 @@
 ## History
 
+### 1.6.1
+* [update publish action](https://github.com/PrismarineJS/prismarine-packet-dumper/commit/7aa5bcfdb51be87b48aac3f6c7e4a55a5d909e46) (thanks @rom1504)
+
+### 1.6.0
+* [Update java and node versions (#79)](https://github.com/PrismarineJS/prismarine-packet-dumper/commit/6da2bfb5c2b2f8302e0916b633365d740e91974f) (thanks @rom1504)
+* [Trigger CI](https://github.com/PrismarineJS/prismarine-packet-dumper/commit/2d6585a5e1822f404db1b15dcc0bfaaf0a4e258e) (thanks @rom1504)
+* [Add command gh workflow allowing to use release command in comments (#77)](https://github.com/PrismarineJS/prismarine-packet-dumper/commit/ed26074fe60f6bb48e32025523ecc5ef86f6341a) (thanks @rom1504)
+* [Bump got from 12.6.1 to 13.0.0 (#75)](https://github.com/PrismarineJS/prismarine-packet-dumper/commit/dc2ec246c9d6650f6f265a1b594bfe4606632804) (thanks @dependabot[bot])
+* [Update ci.yml](https://github.com/PrismarineJS/prismarine-packet-dumper/commit/ba22d9a3ac74e5ffa20c5b0a5ac2c955a6638859) (thanks @u9g)
+* [Bump standard from 16.0.4 to 17.0.0 (#73)](https://github.com/PrismarineJS/prismarine-packet-dumper/commit/91f04942ba611826cb7fb365b50628ad70905a1d) (thanks @dependabot[bot])
+* [Bump mocha from 9.2.2 to 10.0.0 (#74)](https://github.com/PrismarineJS/prismarine-packet-dumper/commit/5a4d2974b6011ebd70412d2e727fa8b7760dcb38) (thanks @dependabot[bot])
+* [Bump mineflayer from 3.18.0 to 4.0.0 (#72)](https://github.com/PrismarineJS/prismarine-packet-dumper/commit/04c5a88588c4a9b3497fb0b5c76378d91bf7f22c) (thanks @dependabot[bot])
+* [Bump got from 11.8.3 to 12.0.0 (#71)](https://github.com/PrismarineJS/prismarine-packet-dumper/commit/be35480f7d55b74c2d179384bdf2f5c144ed19e1) (thanks @dependabot[bot])
+* [jest -> mocha](https://github.com/PrismarineJS/prismarine-packet-dumper/commit/6fd3e6336e5532af7b17be075aeafcf2e0997f79) (thanks @rom1504)
+* [Put correct folder for the packets dumped (#69)](https://github.com/PrismarineJS/prismarine-packet-dumper/commit/73649196e0a75cef2d7443ac1ed69ffc32127a69) (thanks @u9g)
+
 ### 1.5.1
 
 * add hashbang to metricAggregator

README.md

@@ -73,3 +73,4 @@ How to use:
 4. you should now have a file called README.md in the root of the packets/ directory
 
 ### For rest: TODO, for now, see jsdoc
+

bin/clientProxy.js

@@ -43,7 +43,7 @@ const srv = createServer({
   'online-mode': false,
   port: 25566,
   keepAlive: false,
-  version: version
+  version
 })
 srv.on('login', function (client) {
   const addr = client.socket.remoteAddress
@@ -62,11 +62,11 @@ srv.on('login', function (client) {
     if (!endedTargetClient) { targetClient.end('Error') }
   })
   const targetClient = createClient({
-    host: host,
-    port: port,
+    host,
+    port,
     username: client.username,
     keepAlive: false,
-    version: version
+    version
   })
   const fromServKindCounter = {}
   const fromServKindPromise = {}

lib/generate-packets.js

@@ -111,6 +111,7 @@ async function triggerMap (server, bot, mcData) {
   const mapRecieved = once(bot.inventory, 'updateSlot')
   server.writeServer(`give ${bot.username} map\n`)
   await mapRecieved
+  await wait(500)
   const map = once(bot._client, 'map')
   bot.equip(bot.inventory.slots.find(x => x?.name === 'map'), 'hand')
   bot.activateItem()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "prismarine-packet-dumper",
-  "version": "1.5.1",
+  "version": "1.6.1",
   "description": "Automatically dump packets from a Minecraft server",
   "main": "index.js",
   "scripts": {