Merge branch 'next' into release

Author: zardoy

package.json

@@ -157,7 +157,7 @@
     "mc-assets": "^0.2.72",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer#gen-the-master",
-    "mineflayer-mouse": "^0.1.25",
+    "mineflayer-mouse": "^0.1.26",
     "npm-run-all": "^4.1.5",
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
@@ -238,5 +238,5 @@
     "ignorePatchFailures": false,
     "allowUnusedPatches": false
   },
-  "packageManager": "pnpm@10.8.0+sha512.0e82714d1b5b43c74610193cb20734897c1d00de89d0e18420aebc5977fa13d780a9cb05734624e81ebd81cc876cd464794850641c48b9544326b5622ca29971"
+  "packageManager": "pnpm@10.32.1"
 }

pnpm-lock.yaml

@@ -649,32 +649,34 @@ export async function connect (connectOptions: ConnectOptions) {
       bot._client.emit('connect')
     } else {
       const setupConnectHandlers = () => {
-        Socket.prototype['handleStringMessage'] = function (message: string) {
+        bot._client.socket['handleStringMessage'] = function (message: string) {
           if (message.startsWith('proxy-message') || message.startsWith('proxy-command:')) { // for future
             return false
           }
           if (message.startsWith('proxy-shutdown:')) {
+            console.log('Got current connection proxy shutdown message', message)
             lastKnownKickReason = message.slice('proxy-shutdown:'.length)
             return false
           }
           return true
         }
+        const closeUnknownReason = () => {
+          if (!bot || ended) return
+          bot.emit('end', lastKnownKickReason ?? 'WebSocket connection closed with unknown reason')
+        }
+
         bot._client.socket.on('connect', () => {
           console.log('Proxy WebSocket connection established')
           //@ts-expect-error
           bot._client.socket._ws.addEventListener('close', () => {
             console.log('WebSocket connection closed')
             setTimeout(() => {
-              if (bot) {
-                bot.emit('end', 'WebSocket connection closed with unknown reason')
-              }
+              closeUnknownReason()
             }, 1000)
           })
           bot._client.socket.on('close', () => {
             setTimeout(() => {
-              if (bot) {
-                bot.emit('end', 'WebSocket connection closed with unknown reason')
-              }
+              closeUnknownReason()
             })
           })
         })

src/index.ts

@@ -18,7 +18,7 @@ const gameModes = ['survival', 'creative'/* , 'adventure', 'spectator' */]
 export const creatingWorldState = proxy({
   title: '',
   type: worldTypes[0],
-  gameMode: gameModes[0],
+  gameMode: 'creative',
   version: '',
   plugins: [] as string[]
 })
@@ -69,10 +69,12 @@ const CreateWorldBase = ({ cancelClick, createClick, customizeClick, versions, d
       {/* <Button onClick={() => customizeClick()} disabled>
         Customize
       </Button> */}
-      <Button onClick={() => {
-        const index = gameModes.indexOf(gameMode)
-        creatingWorldState.gameMode = gameModes[index === gameModes.length - 1 ? 0 : index + 1]
-      }}
+      <Button
+        onClick={() => {
+          const index = gameModes.indexOf(gameMode)
+          creatingWorldState.gameMode = gameModes[index === gameModes.length - 1 ? 0 : index + 1]
+        }}
+        disabled
       >
         Game Mode: {gameMode}
       </Button>