prismarine-proxy 1.0.0 → 1.1.2

package/HISTORY.md

@@ -1,5 +1,17 @@
 ## History
 
+### 1.1.2
+
+- Update mcdata
+
+### 1.1.1
+
+- Fix bug with InstantConnectProxy to make connecting possible
+
+### 1.1.0
+
+- Make InstantConnectProxy use `minecraft-packets` to generate some packets
+
 ### 1.0.0
 
 - Added InstantConnectProxy (@u9g)

package/README.md

@@ -13,7 +13,7 @@ Provide features to build low and high level proxies, see https://github.com/Pri
 Example of use case :
 * client side proxies :
   * make yourself a bot : do pathfinding like a bot, auto dig things, ...
-  * share your world view with a friend using prismarine-view
+  * share your world view with a friend using prismarine-viewer
 * server side proxies :
   * act as a proxy with many vanilla client servers, with portals or commands to switch
   * change things in server behavior : forbid going to some places, change the blocks, ...
@@ -36,7 +36,7 @@ const login = ['my@email.com', 'mypassword']
 
 const proxy = new InstantConnectProxy({
   loginHandler: (client) => { // client object has a username object, so you can store usernames with their respective logins
-    return { username: login[0], password: password[1] } // the login the proxy will connect to the server with
+    return { username: login[0], password: login[1] } // the login the proxy will connect to the server with
   },
   serverOptions: { // options for the local server shown to the vanilla client
     version: '1.8.9'
@@ -58,4 +58,4 @@ proxy.on('outgoing', (data, meta, toClient, toServer) => { // packets outgoing f
 })
 ```
 
-The name of the particles can be found [here](https://minecraft-data.prismarine.js.org/) , make sure to select the version you are playing on at the top then click protocol, more info about packets can be found [here](wiki.vg/Protocol) , make sure to select the version you are working with
+The name of the particles can be found [here](https://minecraft-data.prismarine.js.org/) , make sure to select the version you are playing on at the top then click protocol, more info about packets can be found [here](https://wiki.vg/Protocol) , make sure to select the version you are working with

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "prismarine-proxy",
-  "version": "1.0.0",
+  "version": "1.1.2",
   "description": "Provide features to build proxies using Prismarine modules",
   "main": "index.js",
   "scripts": {
-    "test": "jest --verbose",
-    "pretest": "npm run lint && require-self",
-    "prepare": "npm install require-self && require-self",
+    "test": "mocha --reporter spec --exit",
+    "pretest": "npm run lint",
     "lint": "standard",
     "fix": "standard --fix"
   },
@@ -25,13 +24,14 @@
   },
   "homepage": "https://github.com/PrismarineJS/prismarine-proxy#readme",
   "devDependencies": {
-    "jest": "^27.0.4",
-    "standard": "^16.0.1",
-    "prismarine-proxy": "file:."
+    "mocha": "^9.1.3",
+    "prismarine-proxy": "file:.",
+    "standard": "^16.0.1"
   },
   "dependencies": {
     "debug": "^4.3.1",
-    "minecraft-protocol": "^1.13.0",
-    "require-self": "^0.2.3"
+    "minecraft-data": "^3.0.0",
+    "minecraft-packets": "^1.5.0",
+    "minecraft-protocol": "^1.13.0"
   }
 }

package/src/instant_connect_proxy.js

@@ -1,6 +1,17 @@
 const EventEmitter = require('events')
 const { createServer, createClient } = require('minecraft-protocol')
+const packets = require('minecraft-packets').pc
+const mcDataLoader = require('minecraft-data')
 const PLAY_STATE = 'play'
+const verMap = {
+  '1.8.8': '1.8',
+  '1.8.9': '1.8'
+}
+function getPacket (ver, name) {
+  if (!packets[ver]) throw new Error(`Packets for version ${ver} aren't stored. This can be fixed by dumping them adding them to the verMap if similar packets are stored.`)
+  const packet = packets[ver]['from-server'][name][0].json
+  return packet
+}
 class InstantConnectProxy extends EventEmitter {
   constructor (options) {
     super()
@@ -16,15 +27,10 @@ class InstantConnectProxy extends EventEmitter {
 
   onLogin (toClient) {
     // until the proxyClient logs in, lets send a login packet
-    toClient.write('login', {
-      entityId: toClient.id,
-      gameMode: 0,
-      dimension: 0,
-      difficulty: 1,
-      maxPlayers: 20,
-      levelType: 'default',
-      reducedDebugInfo: false
-    })
+    const mcData = mcDataLoader(toClient.version)
+    const mcVersion = mcData.version.minecraftVersion
+    const ver = verMap[mcVersion] ?? mcVersion
+    toClient.write('login', { ...getPacket(ver, 'login'), entityId: toClient.id })
 
     const toServer = createClient({
       ...this.options.clientOptions,
@@ -37,19 +43,13 @@ class InstantConnectProxy extends EventEmitter {
     toServer.on('login', (data) => {
       if (!this.clientIsOnline(toClient)) return
       this.emit('start', toClient, toServer)
-      const dimension = data.dimension === 0 ? -1 : 0
-      toClient.write('respawn', {
-        dimension,
-        difficulty: data.difficulty,
-        gamemode: data.gameMode,
-        levelType: data.levelType
-      })
-      toClient.write('respawn', {
-        dimension: data.dimension,
-        difficulty: data.difficulty,
-        gamemode: data.gameMode,
-        levelType: data.levelType
-      })
+      // https://github.com/VelocityPowered/Velocity/blob/aa210b3544556c46776976cddc45deb4ace9bb68/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java#L437
+      let dimension = data.dimension
+      if (mcData.isOlderThan('1.16')) {
+        dimension = data.dimension === 0 ? -1 : 0
+      }
+      toClient.write('respawn', { ...data, dimension })
+      toClient.write('respawn', data)
     })
 
     toClient.on('packet', (data, meta) => {

package/test/basic.test.js

@@ -1,7 +1,7 @@
-/* eslint-env jest */
+/* eslint-env mocha */
 
 describe('works', () => {
-  test('it works', () => {
+  it('it works', () => {
     console.log('done !')
   })
 })