Merge pull request #87 from Enchoseon/experimental/1.19.4

merge Experimental/1.19.4

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
 
       - uses: pnpm/action-setup@v2
         name: Install pnpm
@@ -45,4 +45,4 @@ jobs:
         run: pnpm install
 
       - name: Run test
-        run: pnpm run test
+        run: pnpm run test

.npmrc

@@ -0,0 +1 @@
+auto-install-peers=false

README.md

@@ -34,7 +34,7 @@
 
 ### Quick Start
 
-1. Clone the latest release: `git clone https://github.com/Enchoseon/2based2wait --branch v1.0.4 --depth 1 && cd 2based2wait`
+1. Clone the latest pre-release: `git clone https://github.com/Enchoseon/2based2wait --branch v1.0.5-beta.2 --depth 1 && cd 2based2wait`
 2. Install dependencies: `pnpm install --prod`
 3. Configure your proxy: 
 	- Duplicate the `default-config.json` template file and rename it to `config.json`

docs/configuration-guide.md

@@ -44,6 +44,7 @@
   - <span id='server-port'></span>**[port](#user-content-server-port)** <samp>`{type: number}`</samp> <samp>`{default: 25565}`</samp> : Port of the server to connect to
 
 <span id='proxy'></span>**[proxy](#user-content-proxy)** <samp>`{type: object}`</samp> : Settings for how you connect to the proxy
+  - <span id='proxy-active'></span>**[active](#user-content-proxy-active)** <samp>`{type: boolean}`</samp> <samp>`{default: true}`</samp> : Whether to allow players to control the account by connecting through a tunnel
   - <span id='proxy-whitelist'></span>**[whitelist](#user-content-proxy-whitelist)** <samp>`{type: array}`</samp> : Playernames of accounts that are allowed to connect to the proxy
   - <span id='proxy-onlinemode'></span>**[onlineMode](#user-content-proxy-onlinemode)** <samp>`{type: boolean}`</samp> <samp>`{default: true}`</samp> : Whether to enable online-mode on the proxy. This probably should never be touched
   - <span id='proxy-loopbackaddress'></span>**[loopbackAddress](#user-content-proxy-loopbackaddress)** <samp>`{type: string}`</samp> <samp>`{default: "127.0.0.1"}`</samp> : Loopback address to connect to the proxy. (options: '127.0.0.1', 'localhost', '0.0.0.0', '::1')
@@ -75,6 +76,8 @@
     - <span id='mineflayer-antiafk-chatting'></span>**[chatting](#user-content-mineflayer-antiafk-chatting)** <samp>`{type: boolean}`</samp> <samp>`{default: false}`</samp> : Whether the proxy will chat
     - <span id='mineflayer-antiafk-chatmessages'></span>**[chatMessages](#user-content-mineflayer-antiafk-chatmessages)** <samp>`{type: array}`</samp> <samp>`{default: ["!pt","!queue"]}`</samp> : Chat messages that the proxy will send if chatting is enabled
     - <span id='mineflayer-antiafk-chatinterval'></span>**[chatInterval](#user-content-mineflayer-antiafk-chatinterval)** <samp>`{type: number}`</samp> <samp>`{default: 690420}`</samp> : Time (in milliseconds) between each chat message
+  - <span id='mineflayer-autototem'></span>**[autoTotem](#user-content-mineflayer-autototem)** <samp>`{type: object}`</samp> : Settings for autototem
+    - <span id='mineflayer-autototem-interval'></span>**[interval](#user-content-mineflayer-autototem-interval)** <samp>`{type: number}`</samp> <samp>`{default: 50}`</samp> : Time (in milliseconds) between each totem equip attempt
 
 <span id='experimental'></span>**[experimental](#user-content-experimental)** <samp>`{type: object}`</samp> : Settings for experimental features that may be more unstable in resource usage and/or server and version parity
   - <span id='experimental-spoofplayerinfo'></span>**[spoofPlayerInfo](#user-content-experimental-spoofplayerinfo)** <samp>`{type: object}`</samp>
@@ -109,6 +112,8 @@
       - <span id='experimental-worlddownloader-compression-windowbits'></span>**[windowBits](#user-content-experimental-worlddownloader-compression-windowbits)** <samp>`{type: number}`</samp> <samp>`{default: 15}`</samp> : How much memory to allocate to the history buffer between 8 and 15. Higher values result in better compression ratio at the expense of memory usage
   - <span id='experimental-maxthreadpool'></span>**[maxThreadpool](#user-content-experimental-maxthreadpool)** <samp>`{type: object}`</samp>
     - <span id='experimental-maxthreadpool-active'></span>**[active](#user-content-experimental-maxthreadpool-active)** <samp>`{type: boolean}`</samp> <samp>`{default: true}`</samp> : Whether to set UV_THREADPOOL_SIZE to use all possible CPU logic cores
+  - <span id='experimental-syncgamestate'></span>**[syncGamestate](#user-content-experimental-syncgamestate)** <samp>`{type: object}`</samp>
+    - <span id='experimental-syncgamestate-active'></span>**[active](#user-content-experimental-syncgamestate-active)** <samp>`{type: boolean}`</samp> <samp>`{default: true}`</samp> : Send fake packets to attempt to sync gamestate
 
 <span id='waitforcontrollerbeforeconnect'></span>**[waitForControllerBeforeConnect](#user-content-waitforcontrollerbeforeconnect)** <samp>`{type: boolean}`</samp> <samp>`{default: false}`</samp> : Whether the proxy will wait for someone to take control before it connects to the server
 

package.json

@@ -1,44 +1,46 @@
-{
-  "name": "2based2wait",
-  "version": "1.0.5-beta.1",
-  "description": "Lightweight and extensible proxy for 2B2T.",
-  "main": "proxy.js",
-  "scripts": {
-    "test": "mocha --exit --bail",
-    "testLocal": "CI=true mocha --exit --bail",
-    "start": "node proxy.js",
-    "supervisor": "supervisor -n success proxy.js",
-    "supervisorAllGasNoBrakes": "supervisor proxy.js",
-    "generate-documentation": "node proxy.js --documentation",
-    "process-archives": "node ./scripts/processArchives.js",
-    "update-ngrok-binary": "node ./scripts/updateNgrokBinary.js",
-    "debug-info": "node ./scripts/debugFetch.js",
-    "lint": "eslint --ext .js"
-  },
-  "author": "Enchoseon",
-  "license": "GPL-2.0",
-  "dependencies": {
-    "@rob9315/mcproxy": "^1.0.0",
-    "deepmerge": "^4.3.0",
-    "joi": "^17.6.0",
-    "json5": "^2.2.3",
-    "minecraft-data": "^3.26.0",
-    "minecraft-protocol": "^1.40.3",
-    "mineflayer-antiafk": "github:Etiaro/mineflayer-antiafk",
-    "mineflayer-auto-eat": "^3.3.0",
-    "ngrok": "^4.3.1",
-    "node-fetch": "^2.6.9",
-    "node-notifier": "^10.0.1",
-    "prismarine-chat": "^1.8.0",
-    "prismarine-provider-anvil": "^2.7.0"
-  },
-  "devDependencies": {
-    "eslint": "^8.33.0",
-    "eslint-plugin-jsdoc": "^39.8.0",
-    "mocha": "^10.2.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Enchoseon/2based2wait.git"
-  }
-}
+{
+  "name": "2based2wait",
+  "version": "1.0.5-beta.1",
+  "description": "Lightweight and extensible proxy for 2B2T.",
+  "main": "proxy.js",
+  "scripts": {
+    "test": "mocha --exit --bail",
+    "testLocal": "CI=true mocha --exit --bail",
+    "start": "node proxy.js",
+    "supervisor": "supervisor -n success proxy.js",
+    "supervisorAllGasNoBrakes": "supervisor proxy.js",
+    "generate-documentation": "node proxy.js --documentation",
+    "process-archives": "node ./scripts/processArchives.js",
+    "update-ngrok-binary": "node ./scripts/updateNgrokBinary.js",
+    "debug-info": "node ./scripts/debugFetch.js",
+    "lint": "eslint --ext .js"
+  },
+  "author": "Enchoseon",
+  "license": "GPL-2.0",
+  "dependencies": {
+    "@icetank/mcproxy": "^1.0.6",
+    "deepmerge": "^4.3.1",
+    "joi": "^17.12.2",
+    "json5": "^2.2.3",
+    "minecraft-data": "^3.62.0",
+    "minecraft-protocol": "^1.47.0",
+    "mineflayer": "^4.20.0",
+    "mineflayer-antiafk": "github:Etiaro/mineflayer-antiafk",
+    "mineflayer-auto-eat": "^3.3.6",
+    "ngrok": "^4.3.3",
+    "node-fetch": "^2.7.0",
+    "node-notifier": "^10.0.1",
+    "prismarine-chat": "^1.10.0",
+    "prismarine-provider-anvil": "^2.7.0",
+    "typescript": "^5.3.3"
+  },
+  "devDependencies": {
+    "eslint": "^8.57.0",
+    "eslint-plugin-jsdoc": "^39.9.1",
+    "mocha": "^10.3.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Enchoseon/2based2wait.git"
+  }
+}